Skip to content

Merge upstream v0.1.6-nightly.20261029.3892 into custom-nightly - #193

Merged
chamaquita-d3[bot] merged 87 commits into
custom-nightlyfrom
chamaquita/upstream-v0.1.6-nightly.20261029.3892
Oct 29, 2026
Merged

chamaquita-d3[bot] merged 87 commits into
custom-nightlyfrom
chamaquita/upstream-v0.1.6-nightly.20261029.3892

Conversation

@chamaquita-d3

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

Copy link
Copy Markdown

Closes #192

Merges upstream v0.1.6-nightly.20261029.3892 into custom-nightly. All three conflicts were disjoint, so both sides are kept. pnpm-lock.yaml is upstream's, reconciled with pnpm install --ignore-scripts.

File:lines Class custom-nightly Upstream Kept Why
apps/server/src/http.test.ts:16-30 (imports) disjoint Stream and HttpBody imports for the dictation upload tests Tracer and the ASSET_ROUTE_PREFIX / ATTACHMENT_UPLOAD_ROUTE_PREFIX imports Both, in a single import list Each side's tests use their own imports
packages/contracts/src/settings.ts:941-1030 disjoint DictationSettings schema Secret provider schemas (SecretProviderId, SecretProviderConfig, SecretProviderConfigWrite, ...) Both, side by side Different settings; the merged ServerSettings and patch already reference both
packages/contracts/src/settings.test.ts:376-547 disjoint ClientSettings custom backgrounds tests ServerSettings project overrides across versions test Both as separate describe blocks Independent tests; the shared closing lines now close each block

Not verified here: the contracts package typechecks, but the server typecheck was OOM-killed on this 4 GB runner, so CI is the first full typecheck and build.

🤖 Generated with Claude Code

t3dotgg and others added 30 commits October 29, 2026 13:07
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…4870)

Co-authored-by: Nathan Shan <nathanielcrush51@gmail.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…_FEATURE_SECRETS (pingdotgg#25709)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#23401)

Co-authored-by: GPT-6.1 Sol <noreply@openai.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>
…ingdotgg#22002)

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

Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
pingdotgg#24015)

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

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

Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…r's PATH repair (pingdotgg#21771)

Co-authored-by: maria-rcks <maria@kuuro.net>
…me (pingdotgg#23771)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
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>
…tgg#23848)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
…es correctly (pingdotgg#23340)

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

Co-authored-by: Jeremiah Jordan <zanson@zanson.org>
Co-authored-by: GPT-6.1-Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#25560)

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

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

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

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

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
…gg#25193)

Co-authored-by: Aditya Garud <153842990+yashranaway@users.noreply.github.com>
maria-rcks and others added 28 commits October 29, 2026 17:58
…#25232)

Co-authored-by: Tristan Knight <18444302+tris203@users.noreply.github.com>
…dotgg#24090)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…out (pingdotgg#24939)

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

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…gdotgg#25219)

Co-authored-by: Tristan Knight <18444302+tris203@users.noreply.github.com>
…ingdotgg#23416)

Signed-off-by: Pujitha Paladugu <10557236+pujitha24@users.noreply.github.com>
Co-authored-by: Pujitha Paladugu <10557236+pujitha24@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ning effort (pingdotgg#24467)

Co-authored-by: maria-rcks <maria@kuuro.net>
…5225)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…otgg#25228)

Co-authored-by: Inaya Yousfi <193243337+inayayousfi@users.noreply.github.com>
…#25220)

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

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Rishabh Bothra <37180068+07rjain@users.noreply.github.com>
…gdotgg#25235)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…otgg#24092)

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: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ncher as another t3 (pingdotgg#22375)

Co-authored-by: Claude Sonnet 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>
…ingdotgg#27063)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#24472)

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