chore(upstream): adopt the 2026-08-19 T3 Code batch - #55
Merged
Conversation
…in GitHubPullRequestCli (#7385) Signed-off-by: aoright <102943475+aoright@users.noreply.github.com> (cherry picked from commit 1896f39a38f6fe980ea137fbc402dde8be17b83a)
(cherry picked from commit a87f691bd40c9e3c87715e3ce99ab39a584bdd1e)
(cherry picked from commit f3cb7f509595d304c6e2ccc7afe05c95ec45a7d8)
(cherry picked from commit 3b5d476eb6af9d14efe037e9d163848d6fd048d7)
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com> (cherry picked from commit fda740ad7b28334a6c579d801db22ad8f5914b5f)
(cherry picked from commit 26af903b9bec7f8da56bb5f545d9980d08d418e1)
(cherry picked from commit 636caf4c70345d74c5391cbf9a607a91426a6e39)
… opens (#7437) (cherry picked from commit 6a687ee43bf222672ab8d3f4c0bab3d8d174f79f)
(cherry picked from commit 3a02c9cf1d6767cad60e5056cb5b722931f6cc5d)
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com> (cherry picked from commit bcfd485869a5eb9e97c6d281ac839c1cd7c1bd99)
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com> (cherry picked from commit fe281c5408164250da6688de6fc71ac12d8a9d8f)
… (#7459) Co-authored-by: Claude Fable 5 <noreply@anthropic.com> (cherry picked from commit e7f6a30caba5c390d5bbc9c300de89b68601c057)
…t full speed (#7460) Co-authored-by: Claude Fable 5 <noreply@anthropic.com> (cherry picked from commit efcf7d1ac03e784bdb26843d61ae0ff81c03cec6)
(cherry picked from commit f21b47e52d988839a4e488d9fa98344891a69b7f)
(cherry picked from commit 5ea5a80a83c21c50f97f0851a8bd2cb9871f413a)
(cherry picked from commit 3b8e7bbbe0c49b00630f0c89e931056df679a650)
…477) Co-authored-by: Claude Fable 5 <noreply@anthropic.com> (cherry picked from commit 67e2fe71d937b45384a53c4e0addd9a167aed885)
(cherry picked from commit 36f4314ab768dca3fc20af6ac25e7011b4b0447f)
(cherry picked from commit 7441b36926eb111a193183f98c06aced4f4c3acf)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com> (cherry picked from commit 2aa5f095fc3bb65c00cc4efce66a5473e2d4554a)
The guard adopted in 636caf4c returns before asking GitHub whether the branch has a PR, but returned without `skipped`, so the caller treated it as an authoritative "there is no PR": it called rememberLastKnownPr with a null result, wiping the branch's cached PR, and returned null instead of the fallback. The unpublished-branch guard immediately below returns `skipped: true` for exactly this reason, and its comment says a skipped lookup means "we did not ask", not "there is no PR". This is the same case, so it carries the same flag. A branch whose upstream is later repointed keeps its Merged badge instead of silently losing it. Found by an xhigh review of the 2026-08-19 upstream batch. Worth sending upstream.
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.
Adopts 20 of 22 upstream commits from
82b8a938..2aa5f095as ten change sets.git cherryreported every one absent from Pylon, so nothing was patch-equivalent, and the deferred register was empty going in.The most valuable change is
#7459, which stops probing Grok and OpenCode unless they are turned on and fixes an envelope-vs-configenabledconflict most-restrictively so a user's explicit disable is never silently undone. Two pairs had to be taken in order:#7473/#7477(the second deletesmacArch.tsand supersedes the first) and#7445/#7460(the second exempts cold start from throttling the first introduced).Skipped, both deliberately:
#7421(AUR launcher icons) — Pylon has nopackaging/aurdirectory.#6563(npx t3 triage) — its playbook hardcodespingdotgg/t3code, searches T3's issues, and builds agithub.com/pingdotgg/t3code/issues/newURL, so adopting it as-is would funnel Pylon users' bug reports into T3's tracker. Held for a from-scratch Pylon implementation, which needs a product decision first:pylon-code/pylonis private, so there is no public tracker for a generated issue to land in.Conflicts were resolved Pylon-first.
ThreadCommandSubtitle.tsxkept Pylon's simplifiedWorkspaceIconand dropped upstream's design-review variant toggle while adopting the renames the new palette imports.ChatComposer.tsxhas diverged structurally (4240 lines vs upstream's 2824), so its two-line change was hand-ported. The launchd commit's three conflicts were all branding: upstream's platform-aware behavior kept, Pylon's copy kept.Verification
vp test runglobs nested worktrees under.prime/and.claude/worktrees/, which have nonode_modules, producing ~72 phantom failures while still exiting 0. Pass--exclude '**/.prime/**' --exclude '**/.claude/worktrees/**'for real signal./download); the rest are upstream design tradeoffs, adopted as-is rather than rewritten inside an adoption PR, and recorded in the ledger.One fix on top
7d0a295db— the#7317inherited-upstream guard returned withoutskipped, so the caller treated a deliberate non-lookup as an authoritative "no PR": it wiped the branch's cached PR and returned null instead of the fallback. The unpublished-branch guard immediately below sets that flag for exactly this reason, with a comment saying a skipped lookup means "we did not ask". Worth sending upstream.Two things to decide later
com.t3tools.t3code.service. AGENTS.md forbids renaming compatibility identifiers during adoption, so it was kept — but Pylon and T3 Code are meant to coexist on one machine, and both would now claim the same launchd label and TCC records.#7459is a one-way default flip with no migration.writeSettingsAtomicallystrips values equal to the default, so an install that had Grok on by matching the old default has nothing written for it and comes back disabled. That is the commit's intent, not a regression, but an explicit opt-in was indistinguishable from an untouched default.Model: Claude Opus 5 in Pylon.
Need help on this PR? Tag
@codesmithwith what you need. Autofix is disabled.