Shell 7: platform-settings-shell-keybinds (#799) #851
Closed
charles
wants to merge 0 commits from
shell-7-platform-settings-shell-keybinds into shell
pull from: shell-7-platform-settings-shell-keybinds
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-11-core-keybinds-actions-combos
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-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!851
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "shell-7-platform-settings-shell-keybinds"
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?
Stacked on: origin/shell-6-core-shell-ports-settings (already merged into shell; nothing extra stacked).
What
settings.tomlgains the desktop shell's tables (spec §5.4), incrates/fluxer-platform/src/settings.rs:[shell]: every switch ofShellSettings::stored, read value by value throughShellSettings::apply_stored(wrong type / unknown value costs only that switch; unknown names ignored; normalised: no tray icon → tray behaviours off).[keybinds]: per original action id (voice_toggle_mute, …) a list of combos{ code, key, ctrl, alt, shift, meta, mouse, modifier_only, both_sides, global }(toml writes them as[[keybinds.<id>]]). Empty list = unbound, no entry = defaults. The unit is the combo: one with a wrongly typed value is dropped whole (read as "no Ctrl" it would bind a different, bare key, possibly global); an entry that is not a list is dropped; unknown ids are kept so a newer version's bindings survive.[notifications.sounds]: name → bool/int/string, value by value.[voice.settings].ptt_key(a DOM code) into[keybinds].voice_push_to_talkwhen that entry is absent; key derived as a US layout would (KeyF→f,Digit4→4, else the code); in-window (global = false) as the old key was; the file is written back at once.[window]unchanged; tables that are not tables load their defaults without setting the file aside.SettingsFilelost its (unused)Debug; a file the parser refuses is now logged with the error's message and line number instead of itsDisplay, which quotes the offending line.Deviations
fluxer-corechange (outside the Files list):Keybinds(Task 11) andNotificationPrefs(Task 14) do not exist yet, and the values must live inLocalSettingsto survive a save. Added opaque carriers inshell/settings.rs:StoredKeybinds(id →Vec<KeyCombo>,DebugprintsStoredKeybinds(…)) andStoredNotificationSounds(name →StoredValue), each withget/set/stored/apply_stored, andLocalSettings::{keybinds, notification_sounds}(boxed). Tasks 11/14 can read these into their models (or swap the field type keepingstored/apply_stored). Noshell/mod.rschange (paths arefluxer_core::shell::settings::…).unread_badgeunder[notifications]; Task 6 put it inShellSettings, so it is written in[shell]with the other switches (existing code wins).tests/settings.rssave_then_load_roundtrips_every_fieldnow sets the push-to-talk binding explicitly (withptt_key = "F8"and no binding, load now migrates it).Tests
crates/fluxer-platform/tests/settings_shell.rs:file_without_tables_loads_defaults,round_trip,bad_value_costs_only_itself,unknown_keys_ignored,previous_version_reads_new_file(copy ofSettingsFileat549892bc),ptt_key_migrated_once,bindings_never_in_debug_or_error(captures the log of a refused file and of wrongly typed bindings), plusno_tray_icon_normalises_on_load.FLUXER_SCREENSHOT_TESTS=1 cargo xtask cigreen locally before merging currentorigin/shell(Shell 18, 41); after the merge fmt, clippy-D warningsand the tests of fluxer-core/fluxer-platform/fluxer-devserver pass. No desktop tests apply; no Windows-specific code.Closes #799
🤖 Generated with Claude Code
https://claude.ai/code/session_0161qMQMsCyJhjYw4gqa6e4K
Independent review: Shell 7 (platform settings:
[shell],[keybinds],[notifications])Reviewed:
git diff 549892bc..origin/shell-7-platform-settings-shell-keybinds(head56062305), limited to this task's files.Gate:
FLUXER_SCREENSHOT_TESTS=1 cargo xtask ciin a clean review worktree: all steps passed (tests/settings_shell.rs: 8/8).Checks
file_without_tables_loads_defaults,round_trip(including saving again giving the same bytes,[window]unchanged),bad_value_costs_only_itself,unknown_keys_ignored,previous_version_reads_new_file(a faithful copy ofSettingsFileat549892bc, checked field by field),ptt_key_migrated_once(and no second copy after the user unbinds),bindings_never_in_debug_or_error(Debug, the parse-error log and the wrong-type logs). There is one extra test,no_tray_icon_normalises_on_load.[window]untouched, a one-timeptt_keycopy that is written back at once throughcomplete && !migrated). Consumes:Keybinds::stored/NotificationPrefs::storeddo not exist yet, so the branch adds the opaque carriersStoredKeybinds/StoredNotificationSoundsandLocalSettings::{keybinds, notification_sounds}in fluxer-core, and this deviation is declared.mousevalue or a non-table value is dropped. Keys are not logged:SettingsFilelostDebug,StoredKeybindsprintsStoredKeybinds(…), a parse error is logged with its message and line only, andtable_or_warnlogs only the table name.fluxer_desktop/src/common/DesktopConfig.ts:110-128, 424-428. Wrong-type-means-default matchessanitizePersistedDesktopWindowBehaviorSettings(:130ff,typeof === 'boolean'). The action ids (voice_toggle_mute,voice_toggle_deafen,voice_push_to_talk) matchfluxer_app/.../keybindings/KeybindScopeUtils.ts. The combo fields matchKeyComboinfeatures/input/state/InputKeybind.ts:151-165(mouseButtonis written asmouse, as spec §5.4 says).tracing::near key data is clean.Findings
unread_badgeis written in[shell], not under[notifications]as spec §5.4 lists it. It follows Task 6'sShellSettingsand is declared. Nothing outside the client reads this file, so the effect is only a mismatch with the spec. Either the spec text or the shape should be changed later.gamepad) are dropped when the file is saved. A combo with a field of an unexpected type is dropped whole, and if every combo of an action is dropped the action is saved as[](unbound) instead of keeping its defaults. A newer version's binding can therefore be lost after the older version saves. The spec only requires that the older version reads the file, so this is not blocking. Unknown action ids are kept, as they should be.fluxer-core(persist.rs,shell/settings.rs). It is unavoidable while Tasks 11 and 14 have not landed, and it is declared. For Task 11 (same wave):Keybindsmust read from or replaceLocalSettings::keybinds: Box<StoredKeybinds>, andVoiceSettings::ptt_keymust become the view of its firstvoice_push_to_talkcombo. Until then aptt_keychanged after the migration is not mirrored into[keybinds], so a change made between the two merges would be overridden once Task 11 makes[keybinds]the source. For Task 14: read or replaceStoredNotificationSounds.VoiceSettingsderivesDebug, which printsptt_key(a key) insideLocalSettings'sDebug. That contradicts spec §12 and belongs to Task 11 (it ownsvoice/settings.rs), so it should be tracked as a follow-up there.Verdict: APPROVED — no blocking findings, local gate green.
Merged into
shellby hand (the merge API returns 405); the commits are in the branch.Independent review (re-run): Shell 7, platform settings
[shell],[keybinds],[notifications]Scope. The requested range
c2bcf238..origin/shell-7-platform-settings-shell-keybindsis empty, because the branch head isc2bcf238and is already onshellthrough merge4189d7d6. So I reviewed what Task 7 actually brought in:git diff 4e19d854 4189d7d6(commits7919e03b,0723d624plus the shell merges). Forgejo marks this PR closed with merged=false because it was merged by hand (see the earlier comment).Checks
crates/fluxer-platform/tests/settings_shell.rs(file_without_tables_loads_defaults,round_tripincluding the byte-for-byte re-save,bad_value_costs_only_itself,unknown_keys_ignored,previous_version_reads_new_fileagainst a copy of the previousSettingsFile,ptt_key_migrated_once,bindings_never_in_debug_or_error), plusno_tray_icon_normalises_on_load. Each asserts what the plan says.[window]is unchanged, and the one-timeptt_keytovoice_push_to_talkcopy is written back at once.LocalSettings::{keybinds, notification_sounds}are consumed onshellby Task 11 (Keybinds), Task 14 (NotificationPrefs::from_stored) and the runtime, and they compile and pass together.SettingsFilelostDebug.StoredKeybindsDebug prints…. The parse-error log now carries only the line number and message.table_or_warnlogs only the table name. A badmouse(u8 try_from) or an over-long key drops that combo and cannot panic. No secrets or paths in the tests.KeyCombofields matchInputKeybind.ts:151-165(key, code?, ctrl/alt/shift/meta, global, mouseButton, modifierOnly, bothSides); (b) the action idsvoice_toggle_mute/voice_toggle_deafen/voice_push_to_talkmatchinput_keybind/KeybindCommands.ts:65-66andRuntimeKeybinds.ts:18-24; (c) the[shell]defaults written on a fresh profile (close_to_tray = true,autostart = false) matchDC/DesktopConfig.ts:110-128and spec §18 Q5.FLUXER_SCREENSHOT_TESTS=1 cargo xtask cionc2bcf238: all steps passed (exit 0, no failures).Findings
persist.rs,shell/settings.rs:StoredKeybinds,StoredNotificationSounds), and the plan does not list Task 7 as a two-crate task. Neither Task 6 nor anything before Task 7 produced theKeybinds::stored/NotificationPrefs::storedthe plan names, so this was needed. Tasks 11 and 14 now build on it. Process note only.unread_badgein[notifications], but it is stored in[shell](throughShellSettings::stored), and a[notifications].unread_badgekey is ignored. The value still round-trips, and no earlier file had it, so no data is lost. The spec text or the code should be brought into line.global = false, keyfforKeyF). Task 11'scombo_from_ptt_nameinstead makes a global combo with key = code. Both match by code, and the in-window choice keeps today's behaviour, so nothing breaks. The two paths just produce different combos for the same key.Verdict: approved. No blocking findings, and the local gate is green.
Pull request closed