Skip to content

fix(fork): merge upstream a21b43f into patch/desktop-update-capability - #238

Merged
fireboltdude1357 merged 1039 commits into
patch/desktop-update-capabilityfrom
fix/desktop-update-capability-upstream-a21b43f
Nov 12, 2026
Merged

fireboltdude1357 merged 1039 commits into
patch/desktop-update-capabilityfrom
fix/desktop-update-capability-upstream-a21b43f

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/desktop-update-capability conflicts with upstream a21b43f in the desktop backend configuration, DesktopUpdates.ts and ServerEnvironment.ts.

Upstream pingdotgg#30804 ships most of this patch: the desktopAppUpdate bootstrap field, and a DesktopState.canInstallUpdates flag that the desktop sets and the server reads. I took upstream's version and dropped the patch's autoUpdateSupport.ts, its main.ts wiring, and the APPIMAGE test fix, which only that code needed. A missing desktopAppUpdate now means "can't update", which is upstream's stricter rule.

Two things upstream lacks are kept:

  • ServerConfig.canRequestDesktopAppUpdate, so DesktopAppUpdate.available also refuses a desktop that can't install. Upstream only stops advertising the capability, so a direct request from MCP or a scheduled task would still go out. It uses upstream's rule, and the patch's server test is back.
  • The "Update all" skip reason now says to update the desktop app on that machine instead of "needs a newer desktop app".

The branch is 5 files and 18 lines over upstream.

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
…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:24
… 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>
…-a21b43f

# Conflicts:
#	apps/desktop/src/backend/DesktopBackendConfiguration.test.ts
#	apps/desktop/src/backend/DesktopBackendConfiguration.ts
#	apps/desktop/src/updates/DesktopUpdates.ts
#	apps/server/src/environment/ServerEnvironment.ts
…lity

Upstream pingdotgg#30804 stops advertising desktopAppUpdate when the desktop cannot
install updates, but DesktopAppUpdate.available still only checked the control
fd, so a direct update request still reached a desktop that cannot install it.
Both now read ServerConfig.canRequestDesktopAppUpdate.

Update all's skip reason now tells the user to update the desktop app on that
machine, which is true for an old desktop and for a distro package.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit 014913a into patch/desktop-update-capability 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.