Skip to content

chore: merge upstream nightly v0.0.46-nightly.20261007.2761 - #59

Merged
chamaquita-d3[bot] merged 27 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.46-nightly.20261007.2761
Oct 7, 2026
Merged

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

Conversation

@chamaquita-d3

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

Copy link
Copy Markdown

Fixes #58

Merges upstream nightly v0.0.46-nightly.20261007.2761 into custom-nightly. Both conflicts were disjoint additions next to each other, so both sides are kept. pnpm-lock.yaml merged cleanly.

File:lines Class custom-nightly Upstream Kept Why
apps/web/src/components/chat/ChatComposer.tsx:~4246 (send callback deps) disjoint added voice dependency added environmentId dependency both Different dependencies of the same hook, so both are needed
apps/web/src/components/settings/SettingsPanels.tsx:1-6 (imports) disjoint imports VoiceInputSettingsSection imports useScopedSettingsWriteAllowed both Independent imports, both still used

Checks: ran vp fmt on both resolved files. Typecheck, lint and tests are left to GitHub CI.

🤖 Generated with Claude Code

CI follow-up: upstream (pingdotgg#15548) replaced the per-handler observeRpcEffect with a group-level RpcInstrumentation middleware, which broke the fork-only VoiceRpc and ServerPush handlers. They now return plain effects, and their four methods have rpc.aggregate labels in RPC_AGGREGATES (server for push, workspace for voice, the values they used before). vp lint crashed locally (oxc allocator panic), so typecheck, lint and tests are left to CI.

maria-rcks and others added 26 commits October 6, 2026 20:50
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ed (pingdotgg#15571)

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

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

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…t found" (pingdotgg#16648)

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

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…g#9786)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…#9788)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…#10298)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…rver (pingdotgg#16718)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…on middleware

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@chamaquita-d3
chamaquita-d3 Bot merged commit f197933 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.20261007.2761 conflicts with custom-nightly

4 participants