Skip to content

chore: 🔀 merge upstream nightly v0.0.46-nightly.20261005.2689 - #50

Merged
chamaquita-d3[bot] merged 22 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.46-nightly.20261005.2689
Oct 5, 2026
Merged

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

Conversation

@chamaquita-d3

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

Copy link
Copy Markdown

Fixes #49

Merges upstream v0.0.46-nightly.20261005.2689 into custom-nightly; resolves the two conflicts. pnpm-lock.yaml merged cleanly and pnpm install --lockfile-only made no further changes.

File:lines Class custom-nightly Upstream Kept Why
apps/desktop/src/ipc/DesktopIpcHandlers.ts:74-85 (imports) disjoint added setDockMood and background-folder method imports added legacyLocalStorage method imports both Different imports next to each other; all are still used by their handlers.
apps/mobile/src/features/voice-input/VoiceInputProvider.tsx:112-125 (recorder setup) same question, different answers useAudioRecorder hook plus permissionRequestPendingRef lazy recorder via createLazyVoiceRecorder (pingdotgg#15248), recorder created on dictation start upstream's lazy recorder, plus the fork's permissionRequestPendingRef The lazy recorder supersedes the hook. The ref is a separate fork change still used by the permission request and the AppState handler, so it stays.
apps/mobile/src/features/voice-input/VoiceInputProvider.tsx:~170-178 (unmount effect) same question, different answers void controller.dispose() controller.dispose(); recorder.release() upstream's effect, with the fork's void on dispose The recorder must now be released on unmount. void keeps the fork's explicit handling of the dispose promise.

Checks: vp fmt ran on both files. vp lint crashed in oxc (allocator panic) and could not be rerun within the time budget. Typecheck and tests are left to GitHub CI.

🤖 Generated with Claude Code

juliusmarminge and others added 22 commits October 4, 2026 22:32
…ingdotgg#15219)

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ingdotgg#15546)

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

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…#15851)

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

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…of encoding a fallback (pingdotgg#16118)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@chamaquita-d3
chamaquita-d3 Bot merged commit d13e977 into custom-nightly Oct 5, 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.20261005.2689 conflicts with custom-nightly