Skip to content

fix(fork): merge upstream 4f0b74e into patch/draft-404-reload - #216

Merged
fireboltdude1357 merged 398 commits into
patch/draft-404-reloadfrom
fix/draft-404-reload-upstream-4f0b74e
Nov 9, 2026
Merged

fireboltdude1357 merged 398 commits into
patch/draft-404-reloadfrom
fix/draft-404-reload-upstream-4f0b74e

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/draft-404-reload conflicts with upstream 4f0b74e in packages/client-runtime/src/state/threads.ts and threads-atoms.test.ts.

Upstream pingdotgg#33306 opens threads over the socket without an HTTP round trip. When the server pages snapshots, a cold open tries the socket's bounded snapshot once. If that fails, the next attempt goes over HTTP, which tells a missing thread apart from a failure. The patch's 404 handling lives on that HTTP path: on a 404, the client waits until the shell lists the thread, then loads it again. The two fit together, because a draft the server doesn't have yet fails the socket open and lands on the HTTP path.

  • threads.ts: kept upstream's socketOnly decision and its !socketOnly guard, with the patch's loadSnapshot and 404 retry loop inside the HTTP branch.
  • threads-atoms.test.ts: kept the patch's snapshotUnavailable and snapshotMissing harness options next to upstream's socketSnapshot. The harness's socket answered every fresh subscribe with a snapshot, even for a thread HTTP reported missing. So the patch's "loads a thread that 404ed before the environment shell listed it" test never reached HTTP and timed out. A fresh subscribe to a missing thread now dies the way a failed socket open does, and the client retries over HTTP. No production code changed for this.

On a scratch stack of upstream 4f0b74e with all 23 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41) and vp test run on the 47 test files the patches touch (1179 tests, including all 64 in threads-atoms.test.ts and threads-sync.test.ts) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

MarcoDotIO and others added 30 commits November 6, 2026 04:31
…hat branch's PR (pingdotgg#30563)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…trailing-slash path (pingdotgg#30562)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…when Match case is off (pingdotgg#30569)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… generic failure (pingdotgg#30564)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he rewind (pingdotgg#30652)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#30643)

Co-authored-by: johan vaz <johanvaz@Nathalines-MacBook-Pro.local>
Co-authored-by: GPT-6.1 Sol (Codex) <noreply@openai.com>
…g#30689)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#30719)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
… sequences with intermediates (pingdotgg#30724)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…URLs with a query (pingdotgg#30726)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ken file chips (pingdotgg#30762)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#30834)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#30848)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
maria-rcks and others added 29 commits November 8, 2026 21:18
… blank tile (pingdotgg#21163)

Co-authored-by: T3 Code Test <t3code-test@example.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: shivamhwp <shivamhwp@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…27576)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#21652)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#24933)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…pingdotgg#31998)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#25828)

Co-authored-by: danddanddand <47586871+danddanddand@users.noreply.github.com>
Co-authored-by: whoisaldo <whois.younes@gmail.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: juliusmarminge <julius0216@outlook.com>
Co-authored-by: Claudesaul <139932571+Claudesaul@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#31207)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#27753)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
… Android (pingdotgg#28524)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28125)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… on iPhone Duo (pingdotgg#33213)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#24079)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#21687)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#31739)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t failed (pingdotgg#33291)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d trip (pingdotgg#33306)

Cold thread opens use the bounded socket snapshot once and fall back to HTTP after any failure, defect, or dropped session. Connects reuse a descriptor a check just read, only over HTTPS, only on an id match, within 5 s. Per-frame socket deflate from pingdotgg#33172 was dropped because the iOS socket already negotiates permessage-deflate.

Continues pingdotgg#33172.

Co-authored-by: Bil0000 <62337003+Bil0000@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	packages/client-runtime/src/state/threads-atoms.test.ts
#	packages/client-runtime/src/state/threads.ts
Upstream pingdotgg#33306 opens cold threads over the socket first and falls back to HTTP when that fails. The harness's socket answered with a snapshot even for a thread HTTP reported missing, so the 404 test never reached HTTP.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit a8f80f5 into patch/draft-404-reload Nov 9, 2026
2 checks passed
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.