chore: merge upstream nightly v0.0.43-nightly.20260927.2344 - #25
Merged
chamaquita-d3[bot] merged 53 commits intoSep 27, 2026
Merged
chamaquita-d3[bot] merged 53 commits into
chamaquita-d3[bot] merged 53 commits into
Conversation
…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>
…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>
…ingdotgg#13807) Co-authored-by: Cursor <cursoragent@cursor.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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #24
Merging upstream nightly
v0.0.43-nightly.20260927.2344intocustom-nightlystopped on conflicts in five files. This PR is a--no-ffmerge 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.apps/web/src/components/NoProjectsHero.tsx:5-9CustomBackground(background picture)isElectronfor the draggable desktop titlebar strip (pingdotgg#13713)apps/web/src/components/chat/ComposerSurface.tsx:16-26var(--glass-surface), with the dark/theme glass-surface overrides removedmax-w-3xl→max-w-(--chat-max-width)for the chat width setting (pingdotgg#11594)max-w-(--chat-max-width)apps/web/src/components/chat/MessagesTimeline.tsx:1256-1260overflow-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]apps/web/src/components/settings/SettingsPanels.tsx:657-662activeCustomBackgroundId,customBackgroundEnabledto the restore-defaults dirty checkchatWidth(pingdotgg#11594)apps/web/src/routes/__root.tsx:32-36MascotMoodCoordinator(Dock cat)QueuedMessageSender(pingdotgg#13764)apps/web/src/routes/__root.tsx:238-242<MascotMoodCoordinator /><QueuedMessageSender />pnpm-lock.yamlmerged cleanly. I regenerated it from upstream's lockfile withpnpm install --lockfile-only, and the result was identical to the auto-merged file. I ranvp fmton the resolved files. Nothing else was run locally; checks run in CI.Follow-up: Usage keybinding order (attempt 2)
CI's
Testcheck failed inKeybindingsSettings.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 butusage.openby name, so it was not transitive. Whereusage.openended 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 expectsusage.openafter that block.Resolved by Claude Opus 5.5 in Claude Code (Chamaquita jobs t3code-24-1 and t3code-24-2).
🤖 Generated with Claude Code