[Yash-Singh1]

Problem

After an agent turn merged a branch, the thread could still show stale ahead and behind counts. The turn completion refresh could be skipped when background activity policy paused work.

Change

Always refresh cached remote status at turn completion, without fetching from the remote. This updates divergence after the branch ref changes even when periodic background polling is paused.

Scope and approval

This is a focused fix for stale Git divergence after a merge. The regression test reproduced the stale counts, and the server already has a turn completion refresh for this status.

Verification

The regression test verifies that counts update from 3 ahead and 5 behind to 7 ahead and 0 behind while background work is disabled. All 27 focused tests passed. vp run check:changed passed its format, lint, knip, GraphQL, affected package typecheck, and test checks.

Codex with the Codex harness

[macroscopeapp]

Approvability

Verdict: Approved at db358c6

Macroscope's review found this PR approvable — Turn completion now refreshes PR status and divergence even when background polling is paused. Existing branch guards and locking remain, without enabling upstream fetching or automatic pulls.

^{You can add or adjust custom eligibility rules. Learn more.}

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Codex	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Codex	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	21.5 KiB	21.5 KiB	0 B (0.0%)	24.4 KiB	✅
Codex	Live turn messages	1	1	0 (0.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Claude	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Claude	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.9 KiB	21.9 KiB	0 B (0.0%)	24.4 KiB	✅
Claude	Live turn messages	1	1	0 (0.0%)	8	✅

Baseline: 67eebac · PR result: db358c6 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 108.5 KiB
• Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[coderabbitai]

No actionable comments were generated in the recent review.

Walkthrough

refreshPullRequestStatus now reads remote status after its cache guard, regardless of whether background VCS status work is enabled. Tests check the refreshed status and recovery behavior while background work remains disabled.

Changes: Pull request status refresh

Layer / File(s)	Summary
Refresh status and verify results apps/server/src/vcs/VcsStatusBroadcaster.ts, apps/server/src/vcs/VcsStatusBroadcaster.test.ts	refreshPullRequestStatus no longer checks background-work policy before reading remote status. Tests verify the returned and merged status, the upstream-refresh option, and recovery with background work disabled.

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Possibly related PRs

• pingdotgg/t3code#18842: Adds tests for gating PR refresh after snapshot eviction. This change removes the background-work gate from the same refresh path.

Suggested labels: bugfix, size:M

Suggested reviewers: justyannicc, macroscopeapp, utkarshusername

Merge Risk: Minimal · up to db358

This fixes stale ahead/behind counts after an agent turn merges a branch while background polling is paused. The refresh may wait on a forge lookup when the branch has no PR, but this only delays the status update briefly. No merge-blocking risk remains.

Pre-merge checks: 3 · 1

Failed checks: 1 inconclusive

Check name	Status	Explanation	Resolution
Description check		The description follows the template's main sections. Problem gives the stale ahead/behind symptom and the cause. Change explains that cached remote status now always refreshes at turn completion with…	Add a link to the triaged bug issue or the discussion with explicit maintainer approval, including the approval comment. If there is no prior issue, explain why this small, obvious bug fix qualifies without one. Optionally state anything no…

Passed checks: 3 passed

Check name	Status	Explanation
Title check		The title names the main change: refreshing divergence (ahead/behind counts) after a merged branch ref changes. The changeset removes the background-work gate in refreshPullRequestStatus so the cached…
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

Full details: Title check

Explanation

The title names the main change: refreshing divergence (ahead/behind counts) after a merged branch ref changes. The changeset removes the background-work gate in refreshPullRequestStatus so the cached remote status always refreshes, and the test checks that counts update from 3 ahead/5 behind to 7 ahead/0 behind. The title follows the conventional commit format and is specific enough for a teammate scanning history.

Full details: Description check

Explanation

The description follows the template's main sections. Problem gives the stale ahead/behind symptom and the cause. Change explains that cached remote status now always refreshes at turn completion without fetching. Scope and approval links no issue or maintainer approval and only describes the fix as focused. Verification reports the regression test's observed counts and the 27 passing focused tests, plus the check:changed run. The author did not link a triaged issue or maintainer approval, which the template asks for, so the Scope and approval section is incomplete. The verification section also does not state anything that could not be checked, and it does not cite the exact commands for the focused tests.

Resolution

Add a link to the triaged bug issue or the discussion with explicit maintainer approval, including the approval comment. If there is no prior issue, explain why this small, obvious bug fix qualifies without one. Optionally state anything not checked and name the focused test commands.

Finishing Touches

Generate docstrings

• Commit to this branch
• Create a new PR

Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Recent review info

Run configuration

• Source mode: Auto
• Repository: pingdotgg/t3code
• Branch: t3/sync-ref-after-merge
• File: .coderabbit.config.ts
• Commit: db358c6
• Layers: Repository TS config
• Review profile: CHILL
• Plan: Team
• Run ID: 7049af3d-eec5-4ef3-bffa-2e61d045efd0

Commits

Reviewing files that changed from the base of the PR and between 67eebac and db358c6.

Files selected for processing: 2

• apps/server/src/vcs/VcsStatusBroadcaster.test.ts
• apps/server/src/vcs/VcsStatusBroadcaster.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.