Rebase fork onto upstream 89c5a19 and refresh FORK.md - #9
Merged
Conversation
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.
Important
Do not click Merge. GitHub reports this PR as conflicting (
mergeable_state: dirty) and that is expected:mainstill holds the pre-rebase fork commits (ead4077), and this branch holds the same changes replayed onto a new upstream base with new SHAs. There is no sane merge between the two.This PR exists for review only. Once approved, the intended integration is a force-push of
claude/dazzling-clarke-vxb3p2ontomain, rewritingmain's history to the new upstream base — the same procedure used for the 2026-07-23 reset. The pre-rebase tipead4077and the older lineage (pre-reset-main-2026-07-23/8744b86) both remain on the remote as recovery points.Because of this, the "197 changed files / +16,725 −1,824" figure above is
main-vs-branch and is mostly upstream's own 36 commits. The fork-authored diff is the 37 files listed below.What Changed
Rebases this fork's five commits from base
b41e89eontopingdotgg/t3codemainat89c5a19(fix(dev): skip browser-blocked ports (pingdotgg#4608)), taking in 36 upstream commits. Replayed withgit rebase --onto; no textual conflicts.Fork commits after the replay:
6829ccbf186a73bef9432646dcbe2fa5c7d529dd99Net fork diff vs upstream is unchanged in shape: 37 files, ~7.1k added lines.
FORK.md — added a fork-purpose paragraph and a last-rebase marker, restructured
Dropped / now upstreaminto Superseded changes with a table pairing each dropped change to the upstream change that replaced it, and reconciled a contradiction the file had been carrying (entries 1, 8, 10 were listed as Active with "keep" verdicts while also appearing under Dropped). Entry numbers are stable IDs tied to the original commits, so the Active list now documents its gaps rather than renumbering.README.md — the fork banner had gone stale, advertising two superseded changes (Windows path-with-spaces builds, hover timestamps). Rewritten to match, and to separate what is on
mainfrom what is still on the unmergedpr/*branches.Why
A clean replay is not the same as a correct one, so every active FORK.md entry was re-checked against the incoming range:
data-testid="new-thread-button"and the environment-label tooltip this entry added — but still hover/focus-gates it on desktop (opacity-0→group-hover/project-header:opacity-100), always-visible only undermax-sm. The intent survives; the tooltip half is upstream's now. Flagged to re-derive from upstream's currentSidebar.tsxinstead of re-applying the stale hunk.TODO.mdis moot —TODO.mdis no longer in upstream's tree at all.edb1240(fix(cli): publish nightly branded favicons pingdotgg/t3code#4372), which reworked thecli.tsbuild spawn to hardcodeshell: false— independently arriving at exactly this fork's fix. Entry 8 is superseded byformatChatTimestampTooltip.89c5a19rather than the staleada410bmarker.Verification at
89c5a19(node 24.18.0, pnpm 11.10.0):pnpm install --frozen-lockfile— clean. This is the load-bearing check: upstream rewrote ~145 lines ofpnpm-lock.yamland reshuffled thepnpm-workspace.yamlcatalogs in this range (Clerk upgrade, Upgrade Clerk packages and Expo integration pingdotgg/t3code#4440) while the fork adds its own@github/copilot*importer entries, and a lockfile that replayed badly is the most likely silent breakage in a rebase that reports no conflicts.pnpm run typecheck— 0 errors across all 15 packages (suggestion-level Effect hints only, several pre-existing upstream).pnpm run test— 294/295.The one failing test is pre-existing upstream and environmental, not a rebase regression
packages/shared/src/Net.test.ts→ "findAvailablePort returns preferred when it is free".Upstream's
isPortAvailableOnLoopbackrequires a port to be bindable on both127.0.0.1and::1, andcanListenOnHostonly treatsEADDRNOTAVAILas "available". On an IPv6-less host::1returnsEAFNOSUPPORT, so the preferred port is judged unavailable andfindAvailablePortfalls back to a different port, failing the assertion.The verification container has no IPv6 (confirmed directly: binding
::1returnsEAFNOSUPPORT). This is upstream code the fork does not touch —git diff upstream/main HEAD -- packages/shared/is empty — and it arrived with pingdotgg#4608. Recorded in FORK.md's verification note so it is not chased again on the next rebase.Checklist