Skip to content

Merge upstream v0.0.46-nightly.20261007.2787 into custom-nightly - #61

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

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

Conversation

@chamaquita-d3

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

Copy link
Copy Markdown

Fixes #60

Merges upstream v0.0.46-nightly.20261007.2787 into custom-nightly. Only packages/contracts/src/rpc.ts conflicted; both hunks are additions at the same spot, so both sides are kept.

File:lines Class custom-nightly Upstream Kept Why
packages/contracts/src/rpc.ts:1267-1305 (RPC definitions) disjoint WsVoiceLearnCorrectionsRpc, WsVoiceCreateTranscriptionUrlRpc WsMcpApps{CallTool,ToolInfo,UpdateModelContext,ReadResource}Rpc both Different RPCs added after WsAttachmentsDeleteRpc; neither depends on the other.
packages/contracts/src/rpc.ts:~1931-1940 (WsRpcGroup list) disjoint WsVoiceCreateTranscriptionUrlRpc, WsVoiceLearnCorrectionsRpc four WsMcpApps*Rpc entries both Same reason: separate entries in the group list.

pnpm-lock.yaml merged cleanly; pnpm install --ignore-scripts left it unchanged.

Checks run locally: vp fmt on rpc.ts and tsc --noEmit in packages/contracts (no errors). vp lint crashed with an oxc allocator panic on this machine, so lint is left to CI. Not run (left to CI): server/web typecheck, knip, tests, builds.

🤖 Generated with Claude Code

Bil0000 and others added 14 commits October 7, 2026 09:34
…turn settles (pingdotgg#16878)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…nt is idle (pingdotgg#16486)

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ntrackedFiles=no (pingdotgg#15834)

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

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

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

Co-authored-by: saphid <saphid@users.noreply.github.com>
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 47a82f3 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.2787 conflicts with custom-nightly

8 participants