Skip to content

fix(server): follow placeholder branches after checkout updates - #10441

Merged
Yash-Singh1 merged 2 commits into
mainfrom
t3code/fix-sidebar-branch-updates
Sep 7, 2026
Merged

fix(server): follow placeholder branches after checkout updates#10441
Yash-Singh1 merged 2 commits into
mainfrom
t3code/fix-sidebar-branch-updates

Conversation

@Yash-Singh1

@Yash-Singh1 Yash-Singh1 commented Sep 7, 2026

Copy link
Copy Markdown
Collaborator

If you run out of usage for your branch generation model, the placeholder branch can stay for longer.

What Changed

  • Follow a real checked-out branch when a thread still records a saved placeholder branch.
  • Preserve the existing safety check for worktrees shared by another thread.
  • Refresh the associated pull request after adopting the branch.
  • Added regression coverage for placeholder-branch adoption and shared-worktree protection.

Why

Threads can retain a temporary placeholder branch name after automatic branch naming completes. When checkout updates the worktree, the checkpoint reactor should adopt the real branch and refresh its pull request, while avoiding adoption when the worktree is shared.

Checklist

  • This PR is small and focused
  • I explained what changed and why

- Update the thread branch and refresh pull requests when a saved placeholder branch becomes real
- Preserve shared-worktree safety for unrelated branch drift
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XS 0-9 changed lines (additions + deletions). labels Sep 7, 2026
@macroscopeapp

macroscopeapp Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Would Approve

Macroscope's review found this PR approvable — This is a narrowly scoped server bug fix that follows real branches after placeholder checkout updates while preserving detached-checkout and shared-worktree protections. Regression tests cover branch adoption, pull-request refresh, and the safety cases.

Not approved because:

  • Monthly spending limit reached (workspace setting). Approvability relies on correctness review in order to determine eligibility

Review your spending limits in Billing settings. You can add or adjust custom eligibility rules. Learn more.

@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 13.6 KiB 13.6 KiB −17 B (−0.1%) 15.1 KiB
Codex Thread snapshot wire 7.0 KiB 7.0 KiB 0 B (0.0%) 7.3 KiB
Codex Live turn WebSocket wire 6.6 KiB 6.5 KiB −17 B (−0.3%) 7.8 KiB
Codex Live turn WebSocket decoded 57.1 KiB 57.1 KiB 0 B (0.0%) 66.4 KiB
Codex Live turn messages 10 10 0 (0.0%) 21
Claude Total thread wire 13.6 KiB 13.6 KiB +38 B (+0.3%) 15.1 KiB
Claude Thread snapshot wire 7.0 KiB 7.0 KiB −1 B (−0.0%) 7.3 KiB
Claude Live turn WebSocket wire 6.5 KiB 6.6 KiB +39 B (+0.6%) 7.8 KiB
Claude Live turn WebSocket decoded 57.8 KiB 57.9 KiB +44 B (+0.1%) 66.4 KiB
Claude Live turn messages 9 10 +1 (+11.1%) 21

Baseline: efeac14 · PR result: a68c63a · 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: 113.9 KiB
  • Claude decoded thread snapshot: 114.6 KiB

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

@Yash-Singh1
Yash-Singh1 merged commit 1e740e4 into main Sep 7, 2026
25 checks passed
@Yash-Singh1
Yash-Singh1 deleted the t3code/fix-sidebar-branch-updates branch September 7, 2026 01:08
@Yash-Singh1
Yash-Singh1 restored the t3code/fix-sidebar-branch-updates branch September 7, 2026 01:08
github-actions Bot added a commit to omarcresp/t3code-flake that referenced this pull request Sep 7, 2026
## What's Changed
* fix(web): show load balancing note for a single machine by @maria-rcks in pingdotgg/t3code#10433
* fix(server): follow placeholder branches after checkout updates by @Yash-Singh1 in pingdotgg/t3code#10441
* fix(mobile): expand single-line tool details in work logs by @Yash-Singh1 in pingdotgg/t3code#10442
* fix(server): import transcripts with oversized tool records by @Yash-Singh1 in pingdotgg/t3code#10430
* fix(marketing): deploy site with nightly releases by @t3dotgg in pingdotgg/t3code#10443
* fix(web): preserve multiline composer drafts during timeline scrolling by @Yash-Singh1 in pingdotgg/t3code#10444
* fix(server): handle JSON-wrapped titles and verbose Claude output by @Noojuno in pingdotgg/t3code#10446
* fix(marketing): restore continuous endorsement scrolling by @t3dotgg in pingdotgg/t3code#10450
* Revert "fix(marketing): restore continuous endorsement scrolling" by @t3dotgg in pingdotgg/t3code#10454
* fix(marketing): bring back the endorsement marquee by @t3dotgg in pingdotgg/t3code#10455
* chore: enable CodeRabbit automatic reviews by @t3dotgg in pingdotgg/t3code#10457
* fix(codex): keep Spark limits from replacing the main allowance by @Yash-Singh1 in pingdotgg/t3code#10458
* fix(marketing): send 95 nightly downloads to the downloads page by @t3dotgg in pingdotgg/t3code#10460
* fix(web): composer regains focus when you tab back into T3 Code by @t3dotgg in pingdotgg/t3code#10463
* fix(web): keep sidebar drag dividers clear and gestures smooth by @juliusmarminge in pingdotgg/t3code#10453
* fix(server): mark Cursor transport error answers as failed by @shivamhwp in pingdotgg/t3code#10337
* fix(web): clear stuck panel resize cursor by @t3dotgg in pingdotgg/t3code#10461
* fix(web): clarify sidebar drag dividers and empty targets by @juliusmarminge in pingdotgg/t3code#10464
* fix(web): make onboarding a shared multi-computer wizard by @juliusmarminge in pingdotgg/t3code#10465
* fix(shared): redeem reset credits through the hub when it holds the account by @juliusmarminge in pingdotgg/t3code#10462


**Full Changelog**: pingdotgg/t3code@v0.0.39-nightly.20260907.1325...v0.0.39-nightly.20260907.1332

Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.39-nightly.20260907.1332
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS 0-9 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant