chore: sync upstream pingdotgg/t3code#232
Merged
Merged
Conversation
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…om origin main (pingdotgg#4240) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Author
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 2df8d0415c
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
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.
Nightly upstream sync of
pingdotgg/t3code→ forkmain.Synced commits (cherry-picked
c0bb237..62cf461)Conflict resolution
The only files where our resolution could introduce a bug (everything else applied cleanly):
disabledprop line was already identical on both sides (fork had removedenvironmentUnavailableearlier with an explanatory comment; upstream fix(web): keep composer editable while disconnected pingdotgg/t3code#4241 does the full change). Kept upstream's behaviour plus the fork's local comment documenting the queue-while-disconnected rationale.remoteRefEntriesstructure for remote-branch listing; grafted upstream fix: better defaults — Claude 1M context, Codex gpt-5.6, worktrees from origin main pingdotgg/t3code#4240's origin/<default>→isDefaultcomputation onto that structure (defaultBranch !== null && parsedRemoteRef?.remoteName === "origin" && parsedRemoteRef.branchName === defaultBranch). Upstream's combined-branches re-sort hunk applied cleanly.Verification (all green)
vp run typecheck✓vp check✓ (0 errors)vp test run✓ — 703 test files passed, 6547 tests passed / 22 skippedGated by CI + the upstream-sync procedure (no panel autoreview on sync PRs).