Skip to content

chore: 🔀 merge upstream nightly v0.0.46-nightly.20261006.2735 - #54

Merged
DiegoJohnsonL merged 78 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.46-nightly.20261006.2735
Oct 6, 2026
Merged

DiegoJohnsonL merged 78 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.46-nightly.20261006.2735

Conversation

@chamaquita-d3

@chamaquita-d3 chamaquita-d3 Bot commented Oct 6, 2026

Copy link
Copy Markdown

Fixes #53

Merges upstream nightly v0.0.46-nightly.20261006.2735 into custom-nightly. Upstream renamed service layers to layerXyz, flattened Services//Layers/ folders and added the server browser; the fork's serve mode, voice transcription and server push were ported onto the new names.

File:lines Class custom-nightly Upstream Kept Why
apps/mobile/src/connection/runtime.ts:14-24 same question, different answers named imports of background-activity/platform, plus serverPushRegistrationLayer * as BackgroundActivity / * as ConnectionPlatform namespace imports Upstream namespace imports + fork's serverPushRegistration import Upstream renamed; fork import is unrelated
apps/mobile/src/connection/runtime.ts:57-66 disjoint connectionLayer merging reporter + server push registration layerConnection using BackgroundActivity.layerReporter layerConnection merging BackgroundActivity.layerReporter and serverPushRegistrationLayer Keeps fork's server push, adopts upstream naming
apps/server/src/http.test.ts:39-43 superseded imports staticAndDevRouteLayer, voiceTranscriptionRouteLayer removed named route imports (uses ServerHttp.*) Dropped the imports; voice test now uses ServerHttp.voiceTranscriptionRouteLayer / layerBrowserApiCors Upstream moved to ServerHttp namespace
apps/server/src/server.ts:29-44 disjoint named http.ts imports incl. voice route withUntracedRequests + ServerHttp namespace Upstream's imports Voice route reached via ServerHttp.voiceTranscriptionRouteLayer
apps/server/src/server.ts:72-78 disjoint voice imports + old Layers/ hydration path new ProviderInstanceRegistryHydration path Both: voice imports + upstream hydration import Different things changed
apps/server/src/server.ts:250-256 disjoint ServeModeLayerLive + diagnostics layer renamed layerResourceDiagnostics layerServeMode + layerResourceDiagnostics Fork's serve mode layer on upstream naming
apps/server/src/server.ts:292-304 disjoint VoiceTranscriptionLayerLive + VCS registry layerVcsDriverRegistry layerVoiceTranscription + layerVcsDriverRegistry Fork's voice layer on upstream naming
apps/server/src/server.ts:673-683 disjoint provide Background/ServeMode/Diagnostics/Usage/Voice layers renamed layers without serve mode/voice Upstream names + layerServeMode + layerVoiceTranscription Keep both
apps/server/src/server.ts:713-729 disjoint routes incl. voice route, device hub proxy, rpc route ServerHttp.layer*, DeviceHubProxy.layer, ServerBrowserStream.routeLayer, Ws.layer Upstream routes + ServerHttp.voiceTranscriptionRouteLayer Keep fork's voice route
apps/server/src/ws.ts:167-174 disjoint ServerPush import + old Services/ paths flattened provider registry paths New paths + ServerPush import Upstream moved files; fork import unrelated
docs/user/remote-access.md:175-251 disjoint "Keep your computer awake (serve mode)" section "Browser on a remote environment" section Both sections Separate topics
packages/contracts/src/environment.ts:211-229 disjoint voiceTranscription, serveModeLidClosed, serveMode capabilities serverBrowser capability All four Independent capability flags

Also fixed fork-only tests (ServeMode.test.ts, RecentThreadMessages.test.ts) to import persistence/Sqlite.ts / layerMemory after upstream's folder flattening. pnpm-lock.yaml auto-merged and pnpm install --lockfile-only made no further changes.

Checks: vp fmt on resolved files. vp lint crashed (oxc allocator) on this 4 GB machine, and typecheck/tests were left to GitHub CI.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits October 5, 2026 16:58
…ndlers (pingdotgg#16232)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…t disconnects (pingdotgg#16266)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ayers (pingdotgg#16267)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gdotgg#16262)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…6231)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…es (pingdotgg#16272)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… 1-point fingerprint first (pingdotgg#16270)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#16280)

Takes over pingdotgg#13841. A PR query refreshes on the server's refresh signal only while something reads it, and the server shares detail, activity, and preview for 60 seconds, or 10 minutes once merged.

Co-authored-by: Wout Stiens <71498452+StiensWout@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…rvice (pingdotgg#16265)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gdotgg#16283)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ers/ folders (pingdotgg#16295)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gg#16307)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ll (pingdotgg#16273)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#16275)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Lakshmi Tanmay <lakshmi@voltcrash.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…3563)

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…et (pingdotgg#13566)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…13567)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…#13568)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…s live beside it (pingdotgg#16340)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…utes map them to HTTP (pingdotgg#16341)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
juliusmarminge and others added 26 commits October 5, 2026 21:43
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gain (pingdotgg#16363)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#16314)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…g#16253)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ingdotgg#16382)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…g#13217)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#16400)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…#16515)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
chamaquita-d3 Bot and others added 2 commits October 6, 2026 21:22
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Fork CI never picked up upstream's Playwright install step, so
ServerBrowserPage.test.ts failed to launch Chromium. The upstream
prefer-catch-tags lint rule also flagged three fork-added catchTag calls.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@DiegoJohnsonL
DiegoJohnsonL merged commit d05ceb4 into custom-nightly Oct 6, 2026
12 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.

Upstream nightly v0.0.46-nightly.20261006.2735 conflicts with custom-nightly