Skip to content

fix(fork): merge upstream bc7fe11 into patch/spawn-host - #268

Merged
fireboltdude1357 merged 280 commits into
patch/spawn-hostfrom
fix/spawn-host-upstream-bc7fe11
Nov 13, 2026
Merged

fireboltdude1357 merged 280 commits into
patch/spawn-hostfrom
fix/spawn-host-upstream-bc7fe11

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/spawn-host conflicts with upstream bc7fe11 in apps/server/src/server.ts.

Upstream pingdotgg#36327 adds NonBlockingSpawner. It wraps whatever ChildProcessSpawner is in context, so a spawn's directory and executable checks can't hang on a dead network mount. The patch replaces the spawner with SpawnHost in layerPlatformServices, and both changes landed on the same lines.

  • In layerPlatformServices, NonBlockingSpawner now wraps SpawnHost: the patch's mergeAll of NodeServices, NodeCrypto and SpawnHost comes first, then upstream's NonBlockingSpawner.
  • Upstream also wraps layerHttpServer in NonBlockingSpawner, because NodeHttpServer.layer outputs NodeServices and its native spawner. The patch already builds that layer from NodeHttpServer.layerServer, NodeHttpPlatform.layer and Etag.layerWeak, without NodeServices. Upstream's wrapper there would only wrap the platform spawner a second time, so I dropped it.
  • I kept upstream's NonBlockingSpawner on runServer unchanged.

On a scratch stack of upstream bc7fe11 with all 26 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41), and vp test run on the test files the patches touch plus NonBlockingSpawner.test.ts all pass (50 files, 1388 tests).

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 12, 2026 16:36
…ingdotgg#26668)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s the updated app out of its T3 home (pingdotgg#26191)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t context (pingdotgg#33428)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…orktrees install (pingdotgg#35740)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 29 commits November 13, 2026 12:31
…ublish (pingdotgg#15015)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… starts the continuation (pingdotgg#36360)

Co-authored-by: Jake Leventhal <15133828+jakeleventhal@users.noreply.github.com>
…nges (pingdotgg#36332)

Co-authored-by: Bilal Irfan <bilalirfancontact@gmail.com>
…36350)

Co-authored-by: Lakshmi Tanmay <lakshmi@voltcrash.com>
…ter rewind (pingdotgg#36367)

Co-authored-by: rihanaws <rihanawsacc@gmail.com>
…n-host-upstream-bc7fe11

# Conflicts:
#	apps/server/src/server.ts
@fireboltdude1357
fireboltdude1357 merged commit 84e70d8 into patch/spawn-host Nov 13, 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.