Skip to content

fix(fork): merge upstream 9ab1d22 into patch/spawn-host - #273

Merged
fireboltdude1357 merged 416 commits into
patch/spawn-hostfrom
fix/spawn-host-upstream-9ab1d22
Nov 14, 2026
Merged

fireboltdude1357 merged 416 commits into
patch/spawn-hostfrom
fix/spawn-host-upstream-9ab1d22

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/spawn-host conflicts with upstream 9ab1d22 in server.ts, patches/@effect__platform-node-shared@4.1.2.patch and pnpm-lock.yaml.

Upstream pingdotgg#32260 adds SpawnWorker, which keeps Windows process launches off the RPC thread. It brings its own patch to @effect/platform-node-shared with the same layerWithSpawn and SpawnedChildProcess API this patch added, and it also runs taskkill through the injected spawner. In server.ts, one layerSpawner now follows NodeHttpServer and NodeServices so their native spawner can't shadow it.

  • Dependency patch: I took upstream's patch file, lockfile and pnpm-workspace.yaml entry. SpawnHost uses the same API, so the fork's copy is no longer needed. The merge had listed the patch twice in pnpm-workspace.yaml. After pnpm install, the lockfile matches upstream exactly.
  • server.ts: I took upstream's file, so the patch no longer rebuilds the HTTP layer from layerServer, NodeHttpPlatform and Etag; layerSpawner now handles that. layerSpawner picks SpawnHost.layer on Linux and upstream's SpawnWorker.layerServer everywhere else.
  • Kept from the patch: it still provides layerPlatformServices on the outer layerMakeServer pipe, so every layer gets the wrapped spawner.

On a scratch stack of upstream 9ab1d22 with all 26 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41), and vp test run all pass (50 files, 1453 tests). The tests cover the files the patches touch plus SpawnWorker.test.ts.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

StiensWout and others added 30 commits November 14, 2026 01:55
…#36608)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
…ex run (pingdotgg#26555)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ender on every streamed token (pingdotgg#24055)

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

Co-authored-by: greyxp1 <greyxp999@gmail.com>
Co-authored-by: Grey <120752906+greyxp1@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ers install (pingdotgg#35346)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…r chunk (pingdotgg#26934)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…arting" (pingdotgg#36635)

Co-authored-by: Rene Franke <132335976+ReneFr81@users.noreply.github.com>
…otgg#26923)

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

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

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

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: chise <188340668+chisewaguri@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36664)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#36660)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nd Pagedown (pingdotgg#28319)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… bar overlay (pingdotgg#28081)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
voltcrash and others added 29 commits November 14, 2026 11:32
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#36883)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

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

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

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>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#26455)

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

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

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

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

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36906)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…everything until reload (pingdotgg#34537)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#32260)

Co-authored-by: Lakshmi Tanmay <lakshmi@voltcrash.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…mmit (pingdotgg#34662)

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

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…n-host-upstream-9ab1d22

# Conflicts:
#	apps/server/src/server.ts
#	patches/@effect__platform-node-shared@4.1.2.patch
#	pnpm-lock.yaml
@fireboltdude1357
fireboltdude1357 merged commit 094d7d1 into patch/spawn-host Nov 14, 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.