Skip to content

sync(t3x): rebase 51 fork patches onto upstream 50871eb5d (46 commits) - #34

Merged
radroid merged 0 commit into
mainfrom
t3x/sync-20260730
Jul 30, 2026
Merged

sync(t3x): rebase 51 fork patches onto upstream 50871eb5d (46 commits)#34
radroid merged 0 commit into
mainfrom
t3x/sync-20260730

Conversation

@radroid

@radroid radroid commented Jul 30, 2026

Copy link
Copy Markdown
Owner

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.md this was resolved locally rather than via @claude resolve.

Conflicts resolved (4)

File Upstream cause Resolution
apps/web/src/routes/_chat.$environmentId.$threadId.tsx pingdotgg#4830 gated <ChatView> behind a render-state check and removed the renderState !== "ready" early return Kept the overlay a sibling of <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 returned null unless ready.
apps/desktop/src/main.ts pingdotgg#4878 added an ElectronPowerMonitor import on the fork's import line Both imports kept, alphabetical.
apps/web/src/components/settings/SettingsPanels.tsx Upstream added backgroundActivity* to the restore-defaults object All three entries kept.
packages/client-runtime/src/connection/supervisor.ts pingdotgg#4903 (resetRetryState ladder reset) + pingdotgg#4878 (mobile probe/reconnect wakeups) both rewrote code the fork had restructured Six regions merged: the fork's extracted runLivenessProbe now takes a probe-timeout arg (for MOBILE_CONNECTION_PROBE_TIMEOUT) and returns a third "reconnect" outcome for upstream's application-active-reconnect. The fork's tolerance state folded into upstream's resetRetryLadder() 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:
onSend returns into handleQueueComposerSubmission() before the threadDetailLoading check, and
the 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.md gains a "Parallel paths" table so the next sync checks
for it.

Verification

  • vp run typecheck — exit 0
  • vp run lint — exit 0, zero errors
  • vp run test --testTimeout=120000 — exit 0, 0 failures
  • 51/51 patches replayed, none dropped; 0 behind upstream
  • Every one of the 34 seam files retains its fork delta

Landing

Do not use the merge button — this branch replaces main's history. Land with
git push --force-with-lease origin origin/t3x/sync-20260730:main. Rollback point:
af5a21316.

Closes #33

@coderabbitai

coderabbitai Bot commented Jul 30, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 0b98c7c0-6233-4e96-9d01-151363188153

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@radroid
radroid merged commit df500bd into main Jul 30, 2026
2 of 3 checks passed
@radroid
radroid deleted the t3x/sync-20260730 branch July 30, 2026 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[t3x-sync] daily rebase needs attention (verify-failed)

1 participant