merge: sync upstream through ead4ce52a (4 commits) - #428
Merged
Conversation
…tgg#8358) Co-authored-by: Dara Adedeji <daraadedeji07@gmail.com> Co-authored-by: Ahmed Besic <ahmed-besic@users.noreply.github.com> Co-authored-by: Michael Brown <michaeltbrown.mtb@gmail.com> Co-authored-by: Lars Nieuwenhuis <35393046+lnieuwenhuis@users.noreply.github.com> Co-authored-by: Guilherme Barros <gbarros1095@gmail.com> Co-authored-by: PC <pc@localhost> Co-authored-by: 1xpixi <157762409+1xpixi@users.noreply.github.com>
Classic-merge pingdotgg/t3code main into fork/dev (4 commits). 3-way weld where Grok work overlapped: keep fork Kimi usage, Direnv, session-mode pinning, and mid-session set_model; take upstream Grok Build transcript scanning, permission-mode spawn args, skills, and ACP reliability.
patroza
marked this pull request as ready for review
August 27, 2026 07:36
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
2 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.
Why
fork/devwas at4391fb5cc; upstreammainmoved toead4ce52a(4 commits). Classic-merge so deploy keeps upstream as a second parent.origin/maincould not be fast-forwarded: the Protect upstream main ruleset still requires a PR + 4 checks.Upstream range
a3a8cbd60..ead4ce52aWeld (3-way, no whole-file ours/theirs)
Grok work overlapped. Kept both:
updates.jsonlusage scan, permission-mode spawn args, skills discovery, ACP plan capture, turn inactivity timeouts, Codex 0.150 collab events.session/set_model(no new-thread requirement), process-exit recovery,--reasoning-effortspawn flag.Land
gh pr merge <n> --mergeonly — never squash. Lineage guard fails if this lands as a single parent.