Skip to content

chore: merge upstream nightly v0.0.43-nightly.20260927.2344 - #25

Merged
chamaquita-d3[bot] merged 53 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.43-nightly.20260927.2344
Sep 27, 2026
Merged

chamaquita-d3[bot] merged 53 commits into
custom-nightlyfrom
chamaquita/upstream-v0.0.43-nightly.20260927.2344

Conversation

@chamaquita-d3

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

Copy link
Copy Markdown

Fixes #24

Merging upstream nightly v0.0.43-nightly.20260927.2344 into custom-nightly stopped on conflicts in five files. This PR is a --no-ff merge of the tag, so the tag stays an ancestor. Every conflict was disjoint, so each one keeps the fork's customization and upstream's change together.

File:lines Class custom-nightly Upstream Kept Why
apps/web/src/components/NoProjectsHero.tsx:5-9 disjoint imports CustomBackground (background picture) imports isElectron for the draggable desktop titlebar strip (pingdotgg#13713) both imports Each import backs a different change in the file, and both changes merged cleanly.
apps/web/src/components/chat/ComposerSurface.tsx:16-26 disjoint glass surface is var(--glass-surface), with the dark/theme glass-surface overrides removed max-w-3xl → max-w-(--chat-max-width) for the chat width setting (pingdotgg#11594) the fork's lines with max-w-(--chat-max-width) Upstream only changed the max width and the fork only changed the surface variables.
apps/web/src/components/chat/MessagesTimeline.tsx:1256-1260 disjoint overflow-x-clip → [contain:inline-size] (glass surfaces) max-w-3xl → max-w-(--chat-max-width) (pingdotgg#11594) max-w-(--chat-max-width) [contain:inline-size] Different classes on the same line.
apps/web/src/components/settings/SettingsPanels.tsx:657-662 disjoint adds activeCustomBackgroundId, customBackgroundEnabled to the restore-defaults dirty check adds chatWidth (pingdotgg#11594) all three These are independent settings. The reset block below already merged cleanly with all of them.
apps/web/src/routes/__root.tsx:32-36 disjoint imports MascotMoodCoordinator (Dock cat) imports QueuedMessageSender (pingdotgg#13764) both imports These are independent root coordinators.
apps/web/src/routes/__root.tsx:238-242 disjoint mounts <MascotMoodCoordinator /> mounts <QueuedMessageSender /> both Same as above.

pnpm-lock.yaml merged cleanly. I regenerated it from upstream's lockfile with pnpm install --lockfile-only, and the result was identical to the auto-merged file. I ran vp fmt on the resolved files. Nothing else was run locally; checks run in CI.

Follow-up: Usage keybinding order (attempt 2)

CI's Test check failed in KeybindingsSettings.logic.test.ts ("orders Usage bindings and command choices like the page"). The comparator from upstream pingdotgg#10158 compared Usage page commands by page order but usage.open by name, so it was not transitive. Where usage.open ended up depended on the input, and the fork's extra default bindings (backgroundEditor.toggle, composer.dictate) moved it. The Usage page commands now sort as one block, in page order, where the first of them would sort by name, so the order no longer depends on the input. The test now expects usage.open after that block.

Resolved by Claude Opus 5.5 in Claude Code (Chamaquita jobs t3code-24-1 and t3code-24-2).

🤖 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 22 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>
…#13736)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…otgg#13935)

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Exotic <118054752+extoci@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Usage page commands compared by page order while usage.open compared by
name, so the sort was not transitive and usage.open moved with the input.
The fork's extra default bindings shifted it and failed the Usage order
test. Page-ordered Usage commands now sort as one block where the first of
them would.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@chamaquita-d3
chamaquita-d3 Bot merged commit 224f0fe into custom-nightly Sep 27, 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.43-nightly.20260927.2344 conflicts with custom-nightly