Skip to content

chore: merge upstream nightly v0.0.46-nightly.20261006.2752 - #56

Merged
DiegoJohnsonL merged 31 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.46-nightly.20261006.2752
Oct 7, 2026
Merged

DiegoJohnsonL merged 31 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.46-nightly.20261006.2752

Conversation

@chamaquita-d3

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

Copy link
Copy Markdown

Fixes #55

Merges upstream nightly v0.0.46-nightly.20261006.2752 into custom-nightly (merge commit, tag is an ancestor).

File:lines Class custom-nightly Upstream Kept Why
apps/server/src/serverSettings.ts:~219 (redactServerSettingsForClient return) disjoint returns dictation redacted adds redacted github.tokens both independent settings sections; return includes github and dictation
apps/web/src/components/settings/KeybindingsSettings.logic.test.ts:~266 disjoint backgroundEditor.toggle label assertion view.reopenClosed label assertion both different commands
apps/web/src/components/settings/settingsSearch.ts:~539 disjoint three voice-input search items privacy-policy item both different settings rows
apps/web/src/keybindings.ts:~53 superseded local copy of key-matching helpers (plus Space: " " mapping) helpers moved to @t3tools/shared/keybindings upstream; ported the Space mapping into the shared EVENT_CODE_SHORTCUT_KEYS upstream removed the local helpers; fork's Space addition would otherwise be lost
apps/web/src/routes/__root.tsx:~34 (import) disjoint MascotMoodCoordinator import ReopenClosedViewShortcut import both different components
apps/web/src/routes/__root.tsx:~245 (render) disjoint <MascotMoodCoordinator /> <ReopenClosedViewShortcut /> both different components

Checks: vp fmt could not run locally (no node_modules; installing exceeds the time budget), so I fixed the one formatting spot by hand. pnpm install --lockfile-only left the merged lockfile unchanged. Typecheck, lint, and tests are left to GitHub CI.

🤖 Generated with Claude Code

maria-rcks and others added 29 commits October 6, 2026 14:21
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…dotgg#14825)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ibfuse2 launch failure) (pingdotgg#7765)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#16319)

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…wer reads per PR action (pingdotgg#16322)

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

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

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

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…e a patch arrives (pingdotgg#16033)

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…6335)

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

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

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

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…r requests (pingdotgg#15515)

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
chamaquita-d3 Bot and others added 2 commits October 7, 2026 02:40
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
The 64-parent rotation test used fixed PIDs 1000-1129 and 11000-11129
next to a fixture entry for the real process.pid. When the vitest worker
landed on one of those PIDs, the fake parent was treated as T3 itself
and never signalled, failing with 'retained owned processes'.

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

10 participants