Shell 11: core-keybinds-actions-combos (#803) #854
Closed
charles
wants to merge 0 commits from
shell-11-core-keybinds-actions-combos into shell
pull from: shell-11-core-keybinds-actions-combos
merge into: charles:shell
charles:main
charles:camera
charles:dailyuse
charles:textchat
charles:fix-1008-idle-in-voice
charles:camera-21-acceptance
charles:feat-1000-app-sounds-output
charles:fix-1001-local-time
charles:camera-20-parity-list-for-the
charles:fix-931-silent-voices
charles:camera-15-ui-settings-voice-video
charles:camera-14-ui-camera-buttons-camera
charles:camera-16-ui-layout-with-cameras
charles:camera-17-core-toggle-camera-shortcut
charles:camera-13-ui-mirrored-video-and
charles:camera-12-appsfluxer-camera-runtime-and
charles:camera-10-capture-camera-on-linux
charles:camera-11-capture-camera-on-windows
charles:camera-9-voice-the-camera-track
charles:camera-7-core-the-own-camera
charles:camera-6-capture-camera-trait-mode
charles:camera-8-core-remote-cameras-tile
charles:camera-3-spike-a-camera-track
charles:camera-4-video-camera-formats-and
charles:camera-18-devserver-camera-scenario
charles:camera-1-spike-capture-linux
charles:camera-5-core-camera-ports-commands
charles:camera-2-spike-capture-windows
charles:camera-plan
charles:shell
charles:fix-925-keybinds-persist
charles:feat-934-935-stream-view
charles:feat-933-stream-output-device
charles:shell-44-acceptance
charles:feat-946-select-message-text
charles:shell-43-parity-list-for-the
charles:fix-589-black-band-linux-sender
charles:shell-37-ui-system-wide-shortcuts
charles:shell-ship
charles:fix-931-voices-silent-after-long-uptime
charles:shell-39-ui-settings-notifications
charles:shell-36-ui-settings-keybinds
charles:shell-16-core-autostart
charles:fix-923-late-publication-next-share
charles:fix-921-share-teardown-publish-race
charles:shell-1-spike-iced-daemon-hide
charles:shell-10-core-instance-messages-tasks
charles:shell-13-core-badge-attention-sound
charles:shell-14-core-notification-settings-inactive
charles:shell-18-platform-desktop-entry-and
charles:shell-2-spike-tray-on-linux
charles:shell-3-spike-wayland-global-shortcuts
charles:shell-41-devserver-shell-scenario
charles:shell-5-spike-overlay-technique-for
charles:shell-6-core-shell-ports-settings
charles:shell-7-platform-settings-shell-keybinds
charles:shell-8-core-tray-model-and
charles:shell-9-core-window-rules-close
charles:fix-913-keep-awake-retry
charles:shell-35-ui-in-window-voice
charles:shell-sync-textchat
charles:shell-34-app-shortcuts-runtime
charles:fix-913-keep-screen-awake
charles:fix-910-deepfilter-windows-timing
charles:shell-33-app-shell-runtime
charles:shell-28-platform-shortcuts-on-wayland
charles:fix-910-deepfilter-late-frame
charles:shell-29-platform-shortcuts-by-direct
charles:shell-27-platform-shortcuts-on-x11
charles:shell-17-platform-single-instance
charles:shell-24-platform-badge-displays-and-24
charles:shell-26-platform-shortcuts-on-windows
charles:shell-21-platform-tray-on-linux
charles:shell-22-platform-tray-on-windows
charles:fix-908-flaky-stream-end-test
charles:shell-30-platform-wayland-activation
charles:shell-38-ui-settings-desktop
charles:shell-19-platform-autostart
charles:shell-25-platform-shortcut-back-end
charles:shell-23-platform-badge-displays-and
charles:shell-40-ui-companion-apps-control
charles:shell-31-statusapi-default-avatars
charles:shell-12-core-system-wide-shortcut
charles:shell-20-platform-tray-trait-icons
charles:shell-32-ui-daemon-window-lifecycle
charles:shell-4-spike-raising-a-wayland
charles:shell-15-core-status-payload-gaps
charles:fix-876-share-resolution-and-bars
charles:shell-42-packaging-windows-shortcuts-and
charles:fix-874-tests-must-not-notify
charles:fix-868-deepfilternet-start
charles:gamenight-plan
charles:fix-867-869-stream-end-soundboard-limits
charles:feat-229-windows-hardware-encoding
charles:fix-857-vaapi-hardware-encoding
charles:fix-849-inert-cards
charles:fix-848-pinned-messages-clickable
charles:shell-plan
charles:fix-764-nvenc-above-720p30
charles:serveradmin
charles:feat-780-forum-archived-filter
charles:serveradmin-35-acceptance
charles:feat-781-no-join-chime-with-entrance-sound
charles:feat-784-rejoin-voice-after-update
charles:fix-779-782-search-dropdown-paste-preview
charles:fix-783-781-dm-rail-entrance-sound
charles:serveradmin-34-parity-screenshots
charles:serveradmin-31-ui-channel-permissions
charles:fix-773-cargo-deny-advisories
charles:serveradmin-33-ui-sudo-delete-transfer
charles:serveradmin-28-ui-members-page
charles:serveradmin-26-ui-role-permissions
charles:serveradmin-30-ui-voice-overview-channel-invites
charles:serveradmin-fix-27-29
charles:serveradmin-25-ui-roles-tab
charles:serveradmin-27-ui-menus-moderation-modals
charles:serveradmin-29-ui-channel-settings
charles:fix-589-stream-top-strip-encode
charles:serveradmin-24-ui-moderation-invites-bans
charles:feat-760-version-in-title
charles:fix-751-stream-audio-pipewire
charles:serveradmin-20-core-menu-rows
charles:fix-752-linux-notification-panic
charles:serveradmin-17-core-overrides
charles:fix-740-updater-always-latest
charles:serveradmin-23-ui-community-settings-overview
charles:serveradmin-12-core-roles
charles:serveradmin-19-core-sudo-delete-transfer
charles:serveradmin-32-ui-sidebar-drag
charles:serveradmin-15-core-members-page
charles:serveradmin-16-core-channel-settings
charles:serveradmin-14-core-bans-invites
charles:fix-615-restore-on-stored-session-start
charles:serveradmin-22-runtime
charles:serveradmin-13-core-member-moderation
charles:serveradmin-18-core-channel-reorder
charles:fix-732-status-api-speaking
charles:serveradmin-10-core-permission-lists
charles:serveradmin-11-core-forms-community
charles:serveradmin-21b-devserver-channels-members-sudo
charles:serveradmin-4-api-community-roles-sudo
charles:serveradmin-9b-core-hierarchy-bulk-events
charles:serveradmin-21a-devserver-community-roles
charles:serveradmin-9a-core-ports
charles:serveradmin-8-form-widgets
charles:serveradmin-5-api-channels-members-bans
charles:serveradmin-7-settings-shell
charles:serveradmin-1-proto-community-roles
charles:serveradmin-3-proto-members-bans-invites
charles:serveradmin-6-reorder-widget
charles:serveradmin-2-proto-channel-admin
charles:fix-706-presence-after-reconnect
charles:fix-615-start-on-last-view
charles:feat-663-create-channel
charles:serveradmin-plan
charles:fix-662-long-text-wrap
charles:fix-660-661-menu-toolbar-paste-focus
charles:fix-620-forum-list-reactions
charles:fix-657-windows-console
charles:fix-622-emoji-in-names
charles:fix-smoke-645-648
charles:fix-614-install-location
charles:dailyuse-41-acceptance
charles:fix/597-copy-id
charles:dailyuse-40-parity-screenshots
charles:dailyuse-35-ui-quick-switcher-keybinds
charles:dailyuse-38-ui-profile-modal
charles:fix/voice-view
charles:fix/side-panel-composer
charles:dailyuse-37b-ui-composer-barriers-blocked
charles:fix/image-viewer
charles:fix/619-picker-flicker
charles:fix/editor-forum-edit
charles:dailyuse-32-ui-status-picker
charles:dailyuse-34b-ui-add-guild-invite-modal
charles:dailyuse-28-app-dailyuse-runtime
charles:dailyuse-36-ui-voice-badge-refusals
charles:fix/594-menu-placement-textchat
charles:fix/589-stream-top-strip
charles:fix/594-menu-placement
charles:dailyuse-39-ui-report-modal
charles:dailyuse-37a-ui-attachment-audio-group-icon
charles:dailyuse-24-core-notification-icon-passive
charles:fix/587-quiet-voice
charles:dailyuse-30-ui-notification-settings-modal
charles:dailyuse-31-ui-user-dm-menus
charles:dailyuse-22b-core-composer-barriers-blocked
charles:dailyuse-22a-core-mark-unread-attachments
charles:dailyuse-29-ui-channel-guild-menus
charles:dailyuse-18-core-user-dm-menus
charles:dailyuse-33-ui-confirm-friends-page
charles:dailyuse-22c-core-trusted-domains-hide-muted
charles:dailyuse-20-core-keyboard-navigation
charles:dailyuse-15-core-friends-blocking
charles:dailyuse-23-core-profile-report-flow
charles:dailyuse-19-core-quick-switcher
charles:dailyuse-14-core-status-idle-presence
charles:dailyuse-17-core-channel-guild-menus
charles:ci/27-linux-cache
charles:dailyuse-37c-ui-trust-links-hide-muted
charles:dailyuse-13-core-honour-mutes
charles:dailyuse-34a-ui-invite-cards-accept
charles:dailyuse-16b-core-create-invites-guilds
charles:dailyuse-12-core-notification-settings-mutes
charles:dailyuse-16a-core-invite-links
charles:dailyuse-25-audio-attachments
charles:dailyuse-21-core-voice-refusals
charles:dailyuse-11b-core-state-skeleton
charles:dailyuse-11a-core-dailyuse-ports
charles:dailyuse-26b-devserver-dailyuse-b
charles:dailyuse-26a-devserver-dailyuse-a
charles:dailyuse-4-api-settings-acks-reports
charles:dailyuse-5-api-relationships-invites-guilds
charles:dailyuse-27-platform-notification-idle
charles:dailyuse-10-highlight-languages
charles:fix-search-focus-hover-emoji
charles:dailyuse-8-context-menu-widget
charles:dailyuse-9-image-load-retry
charles:dailyuse-7-chat-navigation-persistence
charles:dailyuse-2-proto-relationships-invites-reports
charles:dailyuse-1-proto-notification-presence
charles:dailyuse-6-gateway-op12-presence
charles:textchat-next
charles:fix-stream-black
charles:fix-reactions-hover
charles:textchat-68-app-video-playback-runtime
charles:textchat-35-acceptance
charles:textchat-34-parity-screenshots
charles:textchat-74-app-updater-runtime
charles:textchat-67-ui-video-player
charles:textchat-stage-46-47
charles:textchat-47-ui-media-channel
charles:textchat-75-promote-stable-workflow
charles:textchat-46-ui-forum-composer
charles:textchat-73-ui-update-button
charles:textchat-64-media-playback-crate
charles:textchat-stage-43-48
charles:textchat-72-platform-updater
charles:textchat-44-ui-thread-view
charles:textchat-70-release-update-feed
charles:textchat-48-ui-announcements
charles:textchat-45-ui-forum-view
charles:textchat-71-core-updater
charles:textchat-43-ui-sidebar-links-notes
charles:textchat-stage-40
charles:textchat-42-app-channel-types-runtime
charles:textchat-39-core-forums
charles:textchat-40-core-announcements-thread-admin
charles:textchat-60-ui-entrance-sounds
charles:textchat-63-ffmpeg-lgpl-packaging
charles:textchat-stage-batch6
charles:textchat-69-proto-update-manifest
charles:textchat-61-app-soundboard-entrance-runtime
charles:textchat-52-app-audio-devices-runtime
charles:textchat-38-core-channel-routing
charles:soundboard-effect-emoji
charles:status-api-rebind
charles:textchat-28-ui-gif-picker
charles:textchat-41-devserver-channel-types
charles:voice-panel-soundboard
charles:textchat-29-ui-message-actions
charles:textchat-37-api-channel-types
charles:textchat-66-core-video-players
charles:autoupdate-plan
charles:textchat-33-ui-message-list-settings
charles:textchat-32-ui-dms
charles:textchat-62-rename-flaxative
charles:fix-chatcolumn-tree
charles:textchat-65-audio-media-source
charles:textchat-31-ui-threads
charles:textchat-stage-27
charles:textchat-30-ui-search-pins-inbox
charles:textchat-53-ui-audio-sources-menu
charles:textchat-27-ui-expression-picker
charles:textchat-57-core-entrance-library
charles:textchat-36-proto-channel-types
charles:textchat-26-ui-upload-tray
charles:textchat-59-ui-soundboard-popout-parity
charles:textchat-58-audio-sound-edit
charles:textchat-55-proto-api-entrance-library
charles:textchat-25-ui-composer
charles:textchat-56-core-soundboard-parity
charles:rename-video-plan
charles:textchat-stage-25
charles:textchat-stage-23-24
charles:soundboard-plan
charles:textchat-24-ui-message-row
charles:textchat-22-ui-attachments-media
charles:textchat-23-ui-embeds
charles:textchat-14-core-expressions
charles:textchat-21-app-textchat-runtime
charles:textchat-16-core-navigation-read
charles:textchat-17-core-search
charles:textchat-19-core-dms-settings
charles:textchat-stage-13-15-18
charles:textchat-54-livekit-stereo-audio
charles:textchat-50-core-stream-audio-sources
charles:textchat-12-core-uploads
charles:textchat-15-core-message-actions
charles:textchat-11-core-composer
charles:textchat-18-core-threads
charles:textchat-13-core-reactions
charles:textchat-51-audio-pipewire-devices
charles:textchat-49-capture-audio-targets
charles:audio-plan
charles:textchat-plan2
charles:textchat-20-devserver-textchat
charles:textchat-6-api-chat-endpoints
charles:textchat-10-core-chat-ports
charles:textchat-9-ui-code-highlighting
charles:textchat-3-proto-expressions-threads-prefs
charles:textchat-5-api-messages-uploads
charles:textchat-2-proto-chat-requests-events
charles:textchat-8-ui-inline-flow-emoji
charles:screenshare
charles:textchat-7-platform-files-clipboard
charles:textchat-1-proto-message-content
charles:textchat-4-emoji-crate
charles:screenshare-31-acceptance
charles:screenshare-29-parity-screenshots
charles:textchat-plan
charles:screenshare-24-ui-focus-layout
charles:screenshare-27-ui-stream-menu
charles:screenshare-30-packaging-ci
charles:screenshare-21-app-screenshare-runtime
charles:screenshare-22-ui-sidebar-live
charles:screenshare-23-ui-stream-tile
charles:screenshare-26-ui-source-picker
charles:screenshare-28-ui-screenshare-settings
charles:screenshare-13-core-previews
charles:screenshare-12-core-codec-negotiation
charles:screenshare-25-ui-share-controls
charles:screenshare-18-hw-encode-linux
charles:screenshare-19-spike-hw-encode-windows
charles:screenshare-11-core-stream-params
charles:screenshare-20-devserver-screenshare
charles:screenshare-10-core-go-live
charles:screenshare-17-voice-livekit-video
charles:screenshare-14-audio-capture-linux
charles:wip/screenshare-17
charles:screenshare-integration
charles:feat-user-profile
charles:fix-voice-join
charles:feat-entity-images
charles:screenshare-16-voice-video-session
charles:screenshare-9-core-watching
charles:screenshare-5-capture-windows
charles:fix-wire-livekit
charles:screenshare-4-capture-linux
charles:screenshare-15-audio-capture-windows
charles:fix-member-list
charles:screenshare-8-core-stream-ports
charles:fix-live-protocol
charles:screenshare-6-ui-video-widget
charles:screenshare-3-capture-crate
charles:fix-altcha-captcha
charles:screenshare-1-video-frames
charles:screenshare-7-proto-api-streams
charles:screenshare-2-spike-livekit-video
charles:voice
charles:voice-26-acceptance
charles:voice-23-voice-e2ee
charles:voice-25-packaging-ci
charles:voice-13-voice-livekit-interop
charles:voice-24-parity-screenshots
charles:voice-19-ui-soundboard
charles:voice-20-ui-participant-menu
charles:voice-22-ui-dm-calls
charles:voice-21-ui-voice-settings
charles:voice-18-ui-call-view
charles:voice-14-app-voice-runtime
charles:voice-10-core-soundboard
charles:voice-17-ui-voice-panel
charles:voice-9-core-voice-settings-advert
charles:voice-5-audio-clips-chimes
charles:voice-15-devserver-voice
charles:voice-8-core-live-room-volumes
charles:voice-11-core-calls-status
charles:voice-12-voice-session
charles:voice-4-audio-devices-mixer
charles:voice-16-ui-voice-sidebar
charles:voice-7-core-voice-connection
charles:foundation
charles:voice-2-proto-api-soundboard-rtc
charles:voice-6-core-voice-states
charles:voice-3-audio-dsp
charles:voice-1-proto-voice-gateway
charles:task/26-acceptance
charles:task/25-packaging-release
charles:task/24-screenshot-tests
charles:task/20-ui-message-list-composer
charles:task/22-ui-settings-parity
charles:task/18-ui-main-layout
charles:task/23-notifications
charles:task/17-ui-shell-login
charles:task/14-app-runtime
charles:ci/51-windows-disk-space
charles:task/12-platform-persistence
charles:task/13-devserver
charles:task/21-ui-avatar-image-cache
charles:task/10-core-messages-readstate
charles:task/9-core-guilds-channels
charles:task/7-gateway-machine-transport
charles:task/11-core-presence-ui
charles:task/19-ui-rich-text
charles:task/8-core-store-session
charles:task/16-ui-theme-fonts-icons
charles:task/15-status-api
charles:task/4-proto-gateway-events
charles:task/5-openapi-vendor-contract
charles:task/6-api-client
charles:task/3-proto-rest-models
charles:task/2-proto-primitives
charles:task/1-workspace-scaffold
No reviewers
Labels
Clear labels
bug
A bug found while working on something else; steps to reproduce and the commit seen on
ci
Build, CI runners and workflows
follow-up
Deferred reviewer finding, linked from the PR it came from
good-first-task
Small, well-scoped, no cross-crate knowledge needed
parity
Settings/behaviour parity with the Electron client
question
Design question that needs Charles; blocks its task until answered
ready-to-merge
Reviewer approved, foundation merged in, CI green on both runners; waiting for the orchestrator to merge
task
A plan task (one per Foundation plan task)
No labels
bug
ci
follow-up
good-first-task
parity
question
ready-to-merge
task
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".
No due date set.
Dependencies
No dependencies set.
Reference
charles/fluxer-native!854
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "shell-11-core-keybinds-actions-combos"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
What this builds
fluxer-core::shell::keybinds(spec §8.1, §8.2; plan Task 11):ShortcutAction::{id, from_id, label, kind, global_capable, default_combos}with the original's ids, labels and defaults (feat/input/state/InputKeybind.ts:679-728, 851-922; labels fromfeat/input/state/input_keybind/shared.tsandfeat/voice/utils/VoiceMessageDescriptors.ts).ShortcutKind::{Press, Hold}.Keybinds { custom }inapp.shell.keybinds:effective,stored(by id,ALLorder),apply_stored(same entry shape as Task 7'sStoredKeybinds; unknown ids and combos without a trigger skipped),ptt_key/set_ptt_key.Matcher(app.shell.matcher), a port ofD/GlobalShortcutMatcher.ts: the modifier rule, the layout key, numpad by code only, mouse buttons, modifier-only and both sides,reconcileModifierFlags, release keyed on the key that pressed,set_bindingsreleasing changed bindings,reset, andset_paused(releases only while the recorder is open). Two combos of one action press it once and release it on the last.armed(&App)(RuntimeKeybinds.ts:29-36): every press action, plus push-to-talk in push-to-talk mode or push-to-mute in voice activity. The matcher holds the global combos of the armed, global-capable actions, kept in sync after every event.conflicts(&Keybinds)(combosLooseEqual).KeybindAction:Record,Captured,Clear,SetGlobal,ResetDefaults,CancelRecord.ShellEvent::ShortcutInput→ matcher →ShellEvent::Shortcutfollow-ups. A pressedShortcut(matched or from the portal) →ToggleSelfMute,ToggleSelfDeaf,LeaveVoiceor the transmit-mode toggle.Session(Locked | Suspending)andBackend(Stopped | Failed)reset the matcher and release every global hold.voice::transmithold sources (HoldSources.ts):HoldSource::{Window, Global}. Push-to-talk's release delay starts only when the last source lets go, and a focus loss releases only the window's source. Push-to-mute is voice-activity-only, mutes while held (targetMute = held || self_mute, througheffective_muteand the announcedself_mute) and releases at once.UserAction::PttKeystays as the window source.VoiceSettings::ptt_keyis the first push-to-talk combo. A key set on Voice & video, or loaded from an older file, becomes that combo (global, assetPrimaryCustomKeybindCombo). Editing push-to-talk's combos writes the key back throughSetVoiceSetting(PttKey). A mouse button is namedMouse{n}, so push-to-talk still applies with a button-only binding.Strings copied from the original: the ten action labels above ("Toggle mute", "Toggle deafen", "Push to talk", "Push to mute", "Toggle voice activity", "Disconnect from voice", "Answer the incoming call", "Decline the incoming call", "Toggle the soundboard", "Expand or collapse compact call view").
How it was tested
crates/fluxer-core/tests/shell_keybinds.rshas the plan's tests:actions_have_original_ids_and_defaults, thematcher_casestable (bare key with modifiers held, exact modifiers, layout key, numpad, mouse buttons, modifier-only, both sides, a flag-dropped modifier, release after a modifier change, two combos of one action),only_mode_holds_armed,ptt_release_delay_only_on_last_source,push_to_mute_ors_with_self_mute,conflicts_found,ptt_key_setting_is_first_combo,lock_and_backend_stop_release_all, the proptestany_input_sequence_then_reset_leaves_nothing_heldandcombo_debug_prints_no_key. Extra tests:matcher_bindings_changed_while_held_release,press_actions_map_to_voice_actionsandkeybind_actions_edit_the_bindings.voice_settings.rspass unchanged.FLUXER_SCREENSHOT_TESTS=1 cargo xtask cipasses locally. No tests that need a desktop: this is core only.Deviations from the plan
Keybinds.LocalSettings::keybinds(StoredKeybinds) comes from Task 7, which is not in this branch's base. So the keybinds are not read from or written tosettings.tomlhere. Only the push-to-talk key persists, through[voice.settings].ptt_key.Keybinds::apply_storedtakes the same entry shape asStoredKeybinds, so the join is one line on load and one inpersistonce both are onshell.voice/settings.rsis unchanged. The two-wayptt_keysync lives in the keybinds reducer instead.voice/local.rschanged by one line, so thateffective_muteincludes push-to-mute.hookKeyNameToDomCodeaccepts any DOM code of the original's key tables, and those tables belong tofluxer-platform(Task 25). Here, a name shaped like a DOM code stands for one. With back ends that reportlayout_keyonly for single characters (theShortcutInputdoc), the behaviour is the same.tests/shell_ports.rs. The stub-reducer test no longer sends the keybind, shortcut and raw-input events, which now have behaviour. The default-state test ignores the matcher, which holds the default global combos once loaded.Capturedfrom the UI, and back-end capture is Task 12/34'sCapturecommand.Not run here
Nothing is platform-specific, so there is nothing for Charles to check by hand.
Base:
158c90dd(origin/shell, which already contains Task 6). The base gate had one failure, the known flakywindow_input_updates_last_input(#709), which passed on five reruns.Stacked on: shell-6-core-shell-ports-settings (already merged into shell)
Closes #803
🤖 Generated with Claude Code
https://claude.ai/code/session_0161qMQMsCyJhjYw4gqa6e4K
Independent review: Shell 11 (keybinds: actions, combos, matcher, holds)
Reviewed
git diff 158c90dd..origin/shell-11-core-keybinds-actions-combos(head65b860c3) cold.Plan tests: every named test exists in
tests/shell_keybinds.rsand asserts what the plan says:actions_have_original_ids_and_defaults, thematcher_casestable (bare key, exact modifiers, layout key/AZERTY, numpad by code, mouse buttons, modifier-only, both sides, release after a modifier change),only_mode_holds_armed,ptt_release_delay_only_on_last_source,push_to_mute_ors_with_self_mute,conflicts_found,ptt_key_setting_is_first_combo,lock_and_backend_stop_release_all, the proptestany_input_sequence_then_reset_leaves_nothing_heldandcombo_debug_prints_no_key.Interfaces:
ShortcutAction::{ALL, id, label, kind, global_capable, default_combos},Keybinds { custom }withstored/apply_stored/effective,Matcher::{feed, reset},armed(&App),conflicts(&Keybinds),HoldSource::{Window, Global}, theKeybindActionvariants: all present as written.Invariants: core imports nothing forbidden and does no I/O. No
tracingcall near key data.DebugofKeybinds,MatcherandShellStateprints no combo (tested). The only slice index (combos[index + 1..]) is in bounds.apply_storedskips unknown ids and combos with nothing to trigger on, so file data cannot panic.Parity checks against the fork: defaults and
global: true(InputKeybind.ts:679-728, 851-922);bindingFromCombo,keyTriggerMatches,modifiersMatchandhandleKey/handleMouseincl. RELEASE_ONLY (fluxer_desktop/src/main/GlobalShortcutMatcher.ts); the per-mode hold lists (RuntimeKeybinds.ts:29-36); PTT delay on the last source and PTM released at once (HoldSources.ts:36-56); labels (Disconnect from voice,Toggle the soundboard, ...);setPrimaryCustomKeybindComboglobal default (UserVoiceTab.tsx:358-367). All match.The implementer's three questions: (a) the US-layout code for a combo without a code is the original's own
combo.code ?? usLayoutKeyToDomCode(combo.key), so it is correct. (b) Follow-up ordering is sound: matchedShortcutEvents are applied after the input event, soreduce_transmittakes the holds andkeybinds::reducethe press actions, in that order. On lock and back-end stop, transmit releases first and the matcher-reset releases that follow do nothing. (c) Positional source ids: see finding 1.Review Focus 2/3 (this task's part): every global hold is released on lock, suspend and back-end stop or failure, including portal-only holds that never went through the matcher. The proptest covers reset.
Findings
Matcher::set_bindingskeys a press on its position in the binding list. The original keys it onsourceIdplusbindingSignature. So when an earlier action's global combos change while a hold is down, a still-held binding whose combo did not change is released. Example: toggling Toggle mute's "Global shortcut" while push-to-talk is held starts the PTT release delay. The original keeps it held. This errs towards releasing, never towards sticking, and needs a settings edit mid-hold. It can be fixed by comparing the new list's equalBinding(action, trigger and modifiers) instead of the one at the same index.Keybindsis not yet joined toLocalSettings([keybinds]comes from Task 7, same wave), and nofollow-upissue for the join is linked from this PR. CLAUDE.md requires one before merge. Until the join, a PTT combo with modifiers, modifier-only or both-sides is rebuilt from the bareptt_keycode at the next start (theLoadedsync). No UI can create such combos before Task 36, so no user data is lost today.Session(Locked | Suspending)andBackend(Stopped)release theGlobalsource only. A window PTT key still held relies onWindowFocus(false)to be released. The plan's "release everything" is met for global holds. The window source is Task 35's (focus loss), so this is recorded only.VoiceSettings::ptt_keycan now beMouse{n}. Until Task 35 replacesis_ptt_key, the in-window path and the Voice & video field treat it as an unmatched key name. This is harmless, but the field displays it raw.Gate:
FLUXER_SCREENSHOT_TESTS=1 cargo xtask ciin a fresh review worktree: all steps passed (exit 0;shell_keybinds13 tests + proptest ok).Verdict: APPROVED (0 blocking, 5 minor; please open the follow-up issue for finding 2 before merge).
Merged into
shellby hand (the merge API returns 405); the commits are in the branch.Independent re-review: Shell 11 (keybinds: actions, combos, matcher, holds)
Scope:
git diff 158c90dd6..origin/shell-11-core-keybinds-actions-combos(head26a635c05), Task 11's own commits80a9222ec,65b860c30,d215c7968,26a635c05. The Task 1 and Task 9 code that was merged in was not reviewed here.Gate:
FLUXER_SCREENSHOT_TESTS=1 cargo xtask ciin a fresh review worktree: all steps passed (exit 0).shell_keybinds: 13 of 13 pass.What I checked
actions_have_original_ids_and_defaults, thematcher_casestable (bare key with modifiers, exact modifiers, layout key (AZERTY), numpad, mouse buttons, modifier-only, both sides, release after a modifier change, and the extras: stale flags, two combos of one action),only_mode_holds_armed,ptt_release_delay_only_on_last_source,push_to_mute_ors_with_self_mute,conflicts_found,ptt_key_setting_is_first_combo,lock_and_backend_stop_release_all(Locked, Suspending, Stopped, Failed), the proptestany_input_sequence_then_reset_leaves_nothing_held, andcombo_debug_prints_no_key.ShortcutAction::{ALL, id, from_id, label, kind, global_capable, default_combos},ShortcutKind::{Press, Hold},Keybinds { custom }witheffective/stored/apply_stored,Matcher::{feed, reset, set_bindings, set_paused, is_held},armed(&App),conflicts(&Keybinds) -> Vec<(action, action)>,HoldSource::{Window, Global}, and theKeybindActionvariants all exist as the plan writes them.KeyCombohas the plan's ten fields.fluxer-core. Notracing,logorprintlnin the diff.DebugofKeybindsandMatcherprints no combo, andMatcher's prints only counts and actions. No new fixtures, no secrets.global: truefor mute and deafen:InputKeybind.ts:679-728, 851-922. Ctrl+Shift+M/D global; Ctrl+Enter, Escape, Ctrl+Shift+B, Ctrl+Shift+V withKeyV; emptykeyfor push-to-talk, push-to-mute, toggle voice activity and disconnect.VoiceMessageDescriptors.tsand the*_DESCRIPTORs ("Toggle deafen", "Disconnect from voice", "Expand or collapse compact call view", ...).HOLD_ACTIONS_FOR_PTT_MODE/_VOICE_ACTIVITY_MODE:RuntimeKeybinds.ts:29-36.D/GlobalShortcutMatcher.ts:modifiersMatch,keyTriggerMatches,heldModifierCode,reconcileModifierFlags,releaseUnsatisfiedModifierOnly,satisfiedModifierOnlyBindings,isModifierOnlySatisfied,releaseAlland the RELEASE_ONLY policy are ported line for line.Findings
crates/fluxer-core/src/shell/keybinds.rsMatcher::set_bindings: a held binding is identified by its position in the list, while the original usessourceIdplusbindingSignature. Suppose push-to-talk is held through a global combo and the user edits an earlier action's combos (for example, removes Toggle mute's). Push-to-talk's binding moves to a new index, so it is released and is not pressed again until the key is pressed again. This was raised in the first review. It is rare and fails safe (the mic mutes), so it is not blocking.shell:LocalSettings::keybinds(StoredKeybinds, Shell 7) is read and written byfluxer-platformbut is never joined toapp.shell.keybinds. Nothing callsKeybinds::apply_storedwith it on load, and keybind edits are never written back. Every binding recorded in Settings -> Keybinds except the push-to-talk key is therefore lost at restart. The README of this PR states the deferral, but no follow-up issue existed, so I opened #925 (labelfollow-up, milestone Desktop shell). It must land before Task 36 (Settings -> Keybinds) is usable.code(for examplekey: "é",code: None) has noptt_keyname. The edit then setsVoiceSettings::ptt_keytoNone, which turns push-to-talk off (ptt_activeneeds a key), even though the combo is still bound. Back ends always report acode, so this is an edge case.crates/fluxer-core/README.mdstill says push-to-mute is "Not carried over", but the Keybinds section added below it now implements push-to-mute. Raised before.voice/settings.rsas modified.ptt_keyis instead kept in sync by the keybind reducer (onLoadedandSetVoiceSetting(PttKey)). The behaviour asked for ("reads and writes the first custom PushToTalk combo") holds and is tested. Recorded only so the deviation is visible.Verdict: APPROVED (0 blocking, 5 minor; gate green). Deferred work: #925.
Pull request closed