Skip to content

Merge upstream v0.1.4-nightly.20261028.3841 - #189

Merged
chamaquita-d3[bot] merged 14 commits into
custom-nightlyfrom
chamaquita/upstream-v0.1.4-nightly.20261028.3841
Oct 28, 2026
Merged

chamaquita-d3[bot] merged 14 commits into
custom-nightlyfrom
chamaquita/upstream-v0.1.4-nightly.20261028.3841

Conversation

@chamaquita-d3

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

Copy link
Copy Markdown

Closes #188

Merges upstream v0.1.4-nightly.20261028.3841 into custom-nightly.

File:lines Class custom-nightly Upstream Kept Why
apps/server/src/settingsSecrets.ts:169-183 disjoint no simlockDeviceHosts mapping adds the simlockDeviceHosts secret mapping both Upstream's Simlock mapping sits beside the fork's dictation and EAS mappings; neither touches the other.
apps/server/src/settingsSecrets.ts:189-195 disjoint returns dictation and easDeviceHosts returns easDeviceHosts and simlockDeviceHosts dictation, easDeviceHosts, simlockDeviceHosts Union of the returned fields; the fork's dictation is kept and upstream's simlockDeviceHosts is added.
pnpm-lock.yaml superseded fork lockfile upstream lockfile upstream Took upstream's file, then pnpm install --ignore-scripts reconciled it with the merged manifests.

tsc --noEmit passes for apps/server, apps/web and packages/contracts. No other fix was needed.

🤖 Generated with Claude Code

t3dotgg and others added 14 commits October 28, 2026 05:41
…installs (pingdotgg#26458)

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

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…er's edge (pingdotgg#26597)

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

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

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…1.4-nightly.20261028.3841

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@chamaquita-d3
chamaquita-d3 Bot merged commit 9257317 into custom-nightly Oct 28, 2026
7 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.1.4-nightly.20261028.3841: make it merge and build on custom-nightly

6 participants