Skip to content

chore: 🔀 merge upstream nightly v0.0.46-nightly.20261012.3010 - #85

Merged
chamaquita-d3[bot] merged 70 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.46-nightly.20261012.3010
Oct 12, 2026
Merged

chamaquita-d3[bot] merged 70 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.46-nightly.20261012.3010

Conversation

@chamaquita-d3

@chamaquita-d3 chamaquita-d3 Bot commented Oct 12, 2026 •

Copy link
Copy Markdown

Closes #84

Fixes #84. Merges upstream v0.0.46-nightly.20261012.3010 into custom-nightly with a merge commit. pnpm-lock.yaml is upstream's, reconciled with pnpm install --ignore-scripts.

File:lines Class custom-nightly Upstream Kept Why
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx:528 disjoint voice input gets environmentId and threadId (from the earlier upstream merge) voice label uses selectedProjectLabel (pingdotgg#17611) both The two sides edit different lines of the same call, so the label comes from upstream and the extra fields stay
apps/mobile/src/persistence/mobile-preferences.ts:9 (imports) disjoint PhoneBackground EnvironmentId, PullRequest* types both Union of imports
apps/mobile/src/persistence/mobile-preferences.ts:100 (interface fields) disjoint phone background fields and PhoneBackgroundQuickAdjustPosition helper threadListFilters, pullRequestListFilters (pingdotgg#18476) both Different preference keys; helper moved below the closing brace of the interface
apps/mobile/src/persistence/mobile-preferences.ts:192 (decode type) disjoint phone background keys list filter keys both Different keys
apps/mobile/src/persistence/mobile-preferences.ts:315 (decode body) disjoint phone background decoding list filter decoding both Different keys
apps/web/src/components/CommandPalette.tsx:104 disjoint imports getClientSettings (used by the background editor command) imports prompt-link helpers (pingdotgg#18454) both Different imports, both used
apps/server/src/serverSettings.ts (6 hunks) superseded hand-written secret redact, materialize and persist code for provider env, usage-limit keys, source-control hosts and dictation.apiKey all of that replaced by schema-declared mapSettingsSecrets (pingdotgg#18505) upstream Upstream's refactor makes the old per-secret code moot
apps/server/src/settingsSecrets.ts, packages/contracts/src/settings.ts:908 (fix) fix dictation.apiKey was the one fork-only secret, handled in the removed code no dictation settings fork adapted Marked DictationSettings.apiKey with secretSetting and mapped it in mapSettingsSecrets to the existing dictation-api-key store entry, so stored keys keep working
apps/mobile/src/features/phone-background/PhoneBackgroundRouteScreen.tsx:25,86,429 superseded imports SettingsControlRow for the phone background rows pingdotgg#18511 deleted SettingsControlRow in favour of ListRowLayout upstream The fork file used a component upstream removed, so it now uses ListRowLayout with the same icon, label and trailing control.

I did not run typechecks or builds here. Fork CI does that.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits October 11, 2026 21:25
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…gg#18352)

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#18353)

Co-authored-by: Theo Browne <me@t3.gg>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ider logo (pingdotgg#18401)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d workflow results (pingdotgg#18409)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
…ingdotgg#18419)

Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
…nym (pingdotgg#18279)

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

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Saikrishna1876 and others added 27 commits October 12, 2026 01:53
pingdotgg#18193)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Return exit 125 when the Linux cgroup wrapper target is missing, including when /bin/sh is Bash. Preserve arguments and child exit codes.
…efault (pingdotgg#18461)

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…pstream removed SettingsControlRow

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