Skip to content

fix(fork): merge upstream a21b43f into patch/draft-404-reload - #241

Merged
fireboltdude1357 merged 612 commits into
patch/draft-404-reloadfrom
fix/draft-404-reload-upstream-a21b43f
Nov 12, 2026
Merged

fireboltdude1357 merged 612 commits into
patch/draft-404-reloadfrom
fix/draft-404-reload-upstream-a21b43f

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

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

Upstream pingdotgg#25919 now retries a 404'd mounted thread over HTTP, backing off from 250 ms up to 30 s. It doesn't pick the thread up as soon as the environment shell lists it, and it stops for good after a delete event. I rebuilt both files from upstream and put the patch on top of upstream's retry:

  • A 404 retries at the end of the backoff or when the shell lists a new entry, whichever comes first.
  • After a delete event, the thread waits for the shell to list it again.
  • The retriedWith guard stays, so an entry that already missed doesn't load again.

The patch's loadSnapshot loop is gone, since each upstream retry reads the current connection. A reconnect after a miss now retries over HTTP, as upstream intends, so the reconnect half of one sync test is cut. The patch's three sync tests use upstream's httpSnapshots option, and all three time out against upstream's threads.ts alone.

On a scratch stack of upstream a21b43f with all 25 patches and the nine fix branches for this upstream, pnpm install --no-frozen-lockfile, vp run typecheck, and vp test run on the test files the patches touch, plus the upstream tests next to the conflicted files, all pass (50 files, 1379 tests).

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 11, 2026 11:58
…is on the service PATH (pingdotgg#25870)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#18588)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t be resumed (pingdotgg#28195)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…after a screenshot (pingdotgg#25978)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…restored context (pingdotgg#25911)

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

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

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rt (pingdotgg#34513)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
maria-rcks and others added 29 commits November 12, 2026 00:23
…erent calls (pingdotgg#34528)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… gone (pingdotgg#34529)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#34530)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ntained command (pingdotgg#34531)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…dotgg#34532)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…equest (pingdotgg#34533)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…gdotgg#14875)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nishes (pingdotgg#34431)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	packages/client-runtime/src/state/threads-sync.test.ts
#	packages/client-runtime/src/state/threads.ts
@fireboltdude1357
fireboltdude1357 merged commit ef96232 into patch/draft-404-reload Nov 12, 2026
4 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.