Skip to content

Merge upstream v0.1.6-nightly.20261030.3940 into custom-nightly - #199

Merged
chamaquita-d3[bot] merged 32 commits into
custom-nightlyfrom
chamaquita/upstream-v0.1.6-nightly.20261030.3940
Oct 30, 2026
Merged

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

Conversation

@chamaquita-d3

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

Copy link
Copy Markdown

Closes #198

File:lines Class custom-nightly Upstream Kept Why
apps/desktop/src/ipc/channels.ts:21-26 disjoint Added dictation / fn-key setup channels Added TRACKPAD_SCROLL_BEGIN_CHANNEL Both Different channels, adjacent lines
apps/desktop/src/preload.ts:118-124 disjoint setDockMood bridge method onTrackpadScrollBegin listener Both Independent bridge members
packages/contracts/src/ipc.ts:1049-1051 disjoint setDockMood? on DesktopBridge onTrackpadScrollBegin on DesktopBridge Both Matches preload; independent members
apps/web/src/components/AppSidebarLayout.tsx:502-503 disjoint <SidebarPeek /> <HistorySwipeNavigation /> (Electron only) Both Separate sidebar children
apps/web/src/components/chat/TimelineUserMessageRow.tsx:~776-782 disjoint Bubble uses surface-glass [--glass-fill:var(--message-surface)] Bubble background and padding skipped for fileCardsOnly / audioOnly Upstream conditions with fork's glass class Fork restyles the background, upstream decides when it applies
apps/web/src/components/chat/TimelineUserMessageRow.tsx:~660 superseded Image tiles use surface-glass Image grid moved into shared mediaBlock Upstream's mediaBlock with surface-glass on tiles Upstream moved the block, so the fork's one-class change was reapplied there
pnpm-lock.yaml n/a n/a n/a Upstream's lockfile, then pnpm install --ignore-scripts Per task instructions

Typechecked web, desktop, mobile and relay after the merge with no errors.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits October 30, 2026 00:50
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e row (pingdotgg#27420)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ed update (pingdotgg#27418)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#27419)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#27465)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#27513)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…ingdotgg#27521)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…rces (pingdotgg#27539)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT 6.1 Sol <codex@openai.com>
…tions removed (pingdotgg#21757)

Co-authored-by: Pipyakas <pipyakas@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…abs again (pingdotgg#19456)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Max Nylander <jztmanyl@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…f parsing again (pingdotgg#27480)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…put (pingdotgg#27685)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…repository (pingdotgg#24350)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d with a Windows host (pingdotgg#19066)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@chamaquita-d3
chamaquita-d3 Bot merged commit 30fb193 into custom-nightly Oct 30, 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.20261030.3940: make it merge and build on custom-nightly

6 participants