Skip to content

fix(fork): merge upstream e2a6267 into patch/release - #151

Merged
fireboltdude1357 merged 386 commits into
patch/releasefrom
fix/release-upstream-e2a6267
Oct 31, 2026
Merged

fireboltdude1357 merged 386 commits into
patch/releasefrom
fix/release-upstream-e2a6267

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/release conflicts with upstream e2a6267 in useUpdateEverything.ts and docs/user/updating.md.

Upstream pingdotgg#27847 removed the web client's wait for npm, so collectServerUpdateTargets lost its third argument and each server now checks that it can install a release before it restarts. The fork never waited on npm. I kept the fork's filter that skips servers with no fork CLI archive, called collectServerUpdateTargets with upstream's two arguments, and restored the SkippedMachine import that upstream dropped. In the docs, I kept the fork's paragraph about GitHub releases and added upstream's sentences about the install check and retrying.

On a scratch stack of upstream e2a6267 with all 18 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (39 of 39) and vp test run on the patches' test files plus updateEverything.logic.test.ts (32 files, 903 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

maria-rcks and others added 30 commits October 30, 2026 15:43
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…ingdotgg#27521)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…rces (pingdotgg#27539)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…tions removed (pingdotgg#21757)

Co-authored-by: Pipyakas <pipyakas@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…abs again (pingdotgg#19456)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Max Nylander <jztmanyl@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…f parsing again (pingdotgg#27480)

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

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d with a Windows host (pingdotgg#19066)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ollers skip work (pingdotgg#27711)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Ben Smith <ben.smith@boardbots.com>
Co-authored-by: GLM-5.3 (Z.ai ACP) <noreply@z.ai>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…creation (pingdotgg#21337)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…tgg#21430)

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>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…tgg#21443)

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>
…ngdotgg#21478)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…minal regardless of path casing (pingdotgg#21545)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
parmartejass and others added 29 commits October 30, 2026 21:44
…g#23695)

Co-authored-by: Tejas Parmar <parmartejas@vanojay.in>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…23436)

Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…#25028)

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…25231)

Co-authored-by: Alex <5401039+PixPMusic@users.noreply.github.com>
…gg#23594)

Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#26937)

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ovider (pingdotgg#27746)

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…mposer layout reads (pingdotgg#27823)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…otgg#27251)

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

Co-authored-by: Scott Van Vliet <782486+svanvliet@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…1378)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…equest screens (pingdotgg#22151)

Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
…g#22497)

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

Co-authored-by: afrojun <1935642+afrojun@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…g#23426)

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

Co-authored-by: Tejas Parmar <parmartejas@vanojay.in>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ase-upstream-e2a6267

# Conflicts:
#	apps/web/src/components/sidebar/useUpdateEverything.ts
#	docs/user/updating.md
@fireboltdude1357
fireboltdude1357 merged commit 062c16b into patch/release Oct 31, 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.