Skip to content

chore: merge upstream nightly v0.0.43-nightly.20260926.2318 into custom-nightly - #19

Open
chamaquita-d3[bot] wants to merge 46 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.43-nightly.20260926.2318
Open

chamaquita-d3[bot] wants to merge 46 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.43-nightly.20260926.2318

Conversation

@chamaquita-d3

@chamaquita-d3 chamaquita-d3 Bot commented Sep 26, 2026 •

Copy link
Copy Markdown

Fixes #18

Merging upstream nightly v0.0.43-nightly.20260926.2318 into custom-nightly stopped on conflicts in five files. This PR is that merge (a real merge commit, so the tag stays an ancestor) with every conflicted hunk resolved. Everything git merged cleanly is left as it was.

File:lines Class custom-nightly Upstream Kept Why
apps/web/src/components/NoProjectsHero.tsx:5-6 disjoint imports CustomBackground for the background picture imports isElectron for the new desktop titlebar strip (pingdotgg#13713) both imports Each import is used by its own side's change in the body, which merged cleanly
apps/web/src/components/chat/ComposerSurface.tsx:16-19 disjoint composer glass fill reads the fork's shared --glass-surface token (drops the per-theme --card/--surface-raised overrides) max-w-3xl → max-w-(--chat-max-width) for the new chat width setting (pingdotgg#11594) fork's lines, with upstream's max-w-(--chat-max-width) The two sides edited different classes in the same lines
apps/web/src/components/chat/MessagesTimeline.tsx:1256 disjoint row root overflow-x-clip → [contain:inline-size], so reply bubble blur and shadows are not clipped max-w-3xl → max-w-(--chat-max-width) (pingdotgg#11594) max-w-(--chat-max-width) [contain:inline-size] Different classes on the same line; both behaviors are kept
apps/web/src/components/settings/SettingsPanels.tsx:657-659 disjoint restore-defaults dirty check watches activeCustomBackgroundId, customBackgroundEnabled watches chatWidth (pingdotgg#11594) all three Independent settings in the same list
apps/web/src/routes/__root.tsx:32-33 disjoint imports MascotMoodCoordinator (Dock cat) imports QueuedMessageSender (pingdotgg#13764) both imports Different root coordinators
apps/web/src/routes/__root.tsx:235-236 disjoint mounts <MascotMoodCoordinator /> mounts <QueuedMessageSender /> both, in that order Both are headless coordinators, so order does not matter

pnpm-lock.yaml merged without conflicts. As the task asks, I took upstream's copy and regenerated it with pnpm install --lockfile-only (pnpm 11.10.0) against the merged manifests.

No checks were run locally. Fork CI runs them on this PR.

Resolved by Claude Opus 5.5 in Claude Code.

Follow-up: CI timeout

Upstream's new packages/client-runtime/src/platform/persistence.test.ts samples 2000 generated shells. That took 6.3s on the fork's ubuntu-latest runners and exceeded vitest's default 5s timeout; upstream runs on 8-vCPU Blacksmith runners. The fork doesn't change these schemas. The test now has a 30s timeout, and its assertions are unchanged.

🤖 Generated with Claude Code

t3dotgg and others added 30 commits September 25, 2026 20:20
…gg#13694)

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

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

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…he whole thread list (pingdotgg#13691)

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#13669)

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…otgg#13339)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ents, and idle polls (pingdotgg#13756)

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ates per comparison (pingdotgg#13759)

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
t3dotgg and others added 15 commits September 26, 2026 01:35
…le (pingdotgg#13765)

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

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…th failed repacks (pingdotgg#13812)

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

Co-authored-by: eshaan Sood <eshaansood@192.168.1.14>
Co-authored-by: Gabriel De Andrade <30420087+gabrielelpidio@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…er runners

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

This branch has not been deployed

No deployments
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.43-nightly.20260926.2318 conflicts with custom-nightly