sync(t3x): rebase 51 fork patches onto upstream 50871eb5d (46 commits) - #34
Merged
Conversation
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
Local resolution of the escalated daily sync (#33). The range — 46 upstream commits / 51 fork
patches — is larger than the 36/37 range that consumed 81% of the CI resolver's 45-minute budget,
so per
docs/t3x/sync-agent-runbook.mdthis was resolved locally rather than via@claude resolve.Conflicts resolved (4)
apps/web/src/routes/_chat.$environmentId.$threadId.tsx<ChatView>behind a render-state check and removed therenderState !== "ready"early return<ChatView>inside the conditional. Outside it, the overlay would newly render over a blank inset in loading/missing states — it previously could not, because the whole route returnednullunless ready.apps/desktop/src/main.tsElectronPowerMonitorimport on the fork's import lineapps/web/src/components/settings/SettingsPanels.tsxbackgroundActivity*to the restore-defaults objectpackages/client-runtime/src/connection/supervisor.tsresetRetryStateladder reset) + pingdotgg#4878 (mobile probe/reconnect wakeups) both rewrote code the fork had restructuredrunLivenessProbenow takes a probe-timeout arg (forMOBILE_CONNECTION_PROBE_TIMEOUT) and returns a third"reconnect"outcome for upstream'sapplication-active-reconnect. The fork's tolerance state folded into upstream'sresetRetryLadder()so every ladder reset clears it uniformly.Semantic drift found by seam review (no conflict, no test failure)
Upstream pingdotgg#4830 disables sending while a thread's detail loads (
sendDisabledReason: "Messages loading"). The fork's thread outbox is a parallel submit path upstream's guard doesn't reach:onSendreturns intohandleQueueComposerSubmission()before thethreadDetailLoadingcheck, andthe Queue button was gated only on
hasSendableContent. Both now observe the same gate (8b9f74968).This is the class of bug a rebase cannot surface — neither file conflicted and all three verify
steps were already green.
docs/t3x/SEAMS.mdgains a "Parallel paths" table so the next sync checksfor it.
Verification
vp run typecheck— exit 0vp run lint— exit 0, zero errorsvp run test --testTimeout=120000— exit 0, 0 failuresLanding
Do not use the merge button — this branch replaces
main's history. Land withgit push --force-with-lease origin origin/t3x/sync-20260730:main. Rollback point:af5a21316.Closes #33