Repository navigation
fix(server): keep branch status retries accurate - #1027
Merged
Merged
Conversation
JustYannicc
temporarily deployed
to
cloud-preview
October 18, 2026 00:40 — with
GitHub Actions
Inactive
This was referenced Oct 18, 2026
This branch was previously deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
Two branch-switch cases remain after #923: a tag with the branch's name can change the shortened symbolic-ref result, and a discarded remote lookup can become a cached known-null result that prevents later retries.
Change
Backport pingdotgg/t3code@2f13197384b2c788cb96821e503f2a75ae3cdf2d. Read the full symbolic ref and strip only
refs/heads/, preserving literal branch names such asheads/release. When a branch changes during a lookup, return the refreshed local state and leave the remote result unknown so later status and turn-end refreshes can retry.Local-first publication is preserved. The explicit refresh RPC still waits for remote completion and can still trigger a slow-request toast.
Scope and approval
Follow-up to #923 and #779, requested after upstream review. The four-file correction is carried from pingdotgg/t3code#21046; the existing Signalbox worktree guard is preserved. When syncing that PR, take the upstream version and reconcile this carry.
Verification
vp test run apps/server/src/git/GitWorkflowService.test.ts apps/server/src/vcs/VcsStatusBroadcaster.test.ts --maxWorkers=1: 40 passed. A real temporary Git repository covers colliding tag/branch names; gated lookup tests cover retries through bothgetStatusandrefreshPullRequestStatusafter a branch switch.Independent review found no issues against the exact four-file backport and confirmed that the same correction is carried into the patched-app source.
Independent review: GPT 6.1 Sol xhigh (Opus unavailable: rate-limited at 2026-10-17 15:47:05 UTC).
Implementation: GPT 6.1 Sol through the Codex harness in T3 Code; backported from the upstream fix.