Pull select upstream fixes (worktree branch-sync, alert layout, marketing) + divergence log#23
Merged
Merged
Conversation
Co-authored-by: codex <codex@users.noreply.github.com> (cherry picked from commit 3201e00)
…ite (pingdotgg#3644) (cherry picked from commit 619b0ec)
(cherry picked from commit ef943a2)
Add UPSTREAM_DIVERGENCE.md as the running log of which upstream (pingdotgg/t3code) changes we pull vs. deliberately skip, and why. Reference it from AGENTS.md with a standing policy to not pull Android / native-mobile changes. Records the 2026-07-12 review through c1ec191: pulled the worktree metadata sync fix (pingdotgg#3822), marketing commit shortcut (pingdotgg#3644), and chat error alert layout fix (pingdotgg#3899); skipped all Android/mobile work and the max/ultra reasoning labels (needs a newer Codex schema than we vendor). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
github-actions
Bot
added
vouch:trusted
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
4 participants
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.
Reviews upstream (
pingdotgg/t3code) throughc1ec1915fand pulls in the non-Android changes worth having, plus a running log to track how we diverge. Rebased onto currentmain.Pulled in (cherry-picked with
-x)expectedBranchoptimistic-concurrency guard so a stale git-status sync can't regress a freshly-generated branch back to a temporary worktree branch, and stops needlessly rewritingworktreePathduring reconcile. Conflicted inGitActionsControl.tsx(our fork'spersistThreadBranchSyncusesupdateThreadMetadata); resolved by keeping our structure and spreading upstream'sresolveThreadBranchMetadataPatch(branch, activeServerThread.branch)into the input so we still gain the guard.mx-auto w-fit max-w-[min(48rem,calc(100%-2rem))], keeping the existing Tooltip.Deliberately skipped
Record<V2ModelListResponse__ReasoningEffort, string>and our vendored Codex schema only goes toxhigh, somax/ultradon't exist yet. Revisit after a Codex schema bump.Divergence log
Adds
UPSTREAM_DIVERGENCE.md— the running record of what we pull vs. skip and why — referenced fromAGENTS.mdwith the standing no-Android policy.Verification
typecheckon contracts + web + server: clean.🤖 Generated with Claude Code