Upstream sync: keyboard chords, system hotkey, Cursor/Gemini, PR polling refactor#203
Merged
Jesssullivan merged 107 commits intomainfrom Apr 11, 2026
Merged
Upstream sync: keyboard chords, system hotkey, Cursor/Gemini, PR polling refactor#203Jesssullivan merged 107 commits intomainfrom
Jesssullivan merged 107 commits intomainfrom
Conversation
…or-keyboard-shortcuts
…st-paste-regression Fix Raycast paste fallback regression
…er-arrow-keys Fix up/down arrow keys in browser surface
…hift-v-paste Fix Cmd+Shift+V paste in browser pane
…hell-integration-zdotdir Fix shell integration (report_pwd) not injected — ZDOTDIR override
# Conflicts: # Resources/shell-integration/cmux-zsh-integration.zsh # Sources/TabManager.swift # Sources/cmuxApp.swift # docs/ghostty-fork.md # ghostty # vendor/bonsplit
…ints, themed split, pane tab fixes)
…ill follow as upstream PR)
The 2-Group approach still timed out on CI. Break into 6 outer Groups (one per settings section) and 3 inner Groups inside the app SettingsCard (~190 lines each instead of 577).
Move each settings section (app, workspaceColors, sidebarAppearance, automation, customCommands+browser, hotkey+shortcuts) into private @ViewBuilder computed properties. The body VStack becomes trivial (6 property references), eliminating the Swift type-checker timeout.
… rows Five fork-specific SettingsCardRow calls were missing the configurationReview parameter added by upstream. Uses .settingsOnly since these are GUI-only settings not exposed in settings.json.
Jesssullivan
force-pushed
the
sid/upstream-sync-next
branch
from
5be7e7b to
56231af
Compare
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
4 participants
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.
Summary
Fork-specific conflict resolutions
GitHubPullRequestRESTPolleractor (563 lines of dead code)configurationReviewparams, Cursor/Gemini settings,GlobalHotkeySection,WarmAgentPoolTest plan