Skip to content

fix(server): keep branch status retries accurate - #1027

Merged
JustYannicc merged 1 commit into
mainfrom
fix/779-git-branch-retry-followup
Oct 18, 2026
Merged

JustYannicc merged 1 commit into
mainfrom
fix/779-git-branch-retry-followup

Conversation

@JustYannicc

Copy link
Copy Markdown
Owner

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 as heads/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

  • Both defects reproduced before the upstream correction.
  • 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 both getStatus and refreshPullRequestStatus after a branch switch.
  • Server-package typecheck, four-file lint and formatting checks pass.
  • The patched app's matching source also passes all 40 tests. No live GitHub, desktop or browser verification was performed.

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.

This branch was previously deployed

1 inactive deployment
cloud-preview — 317cde53 Deployed Oct 18, 2026 by JustYannicc via Delete preview cloud #54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant