Shell 35: ui-in-window-voice (#827) #898
Closed
charles
wants to merge 0 commits from
shell-35-ui-in-window-voice into shell
pull from: shell-35-ui-in-window-voice
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-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-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!898
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "shell-35-ui-in-window-voice"
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: shell-11-core-keybinds-actions-combos, shell-32-ui-daemon-window-lifecycle (both already contained in origin/shell when this branch was cut; the merges were no-ops)
What this builds (plan Task 35, spec §8.4)
app::window_inputis now the window's event filter: every key and mouse-button event (not left/right click) becomesWindowEvent::Input { input, captured, then }, withinputafluxer_core::shell::ShortcutInputandthenwhat the oldwindow_eventmakes of it.keybinds::dom_code: iced's code names,Super*→Meta*); mouse buttons by DOM number (keybinds::mouse_button_number: 1 middle, 3 back, 4 forward); the layout's character aslayout_key, so "M" follows the layout.keybinds::VoiceKeys(inLocal) runs the coreMatcheroverkeybinds::window_bindings(&App): logged in, the combos ofapp.shell.keybindsfor the armed actions (shell::keybinds::armed), filtered byavailable(Answer/Decline only while a call rings, Toggle soundboard / compact call view only in voice) and bydelivered_by_backend(a back end isStarted, the action is global-capable and the combo's global switch is on; on the portal a hold with a modified trigger stays the window's, spec §8.4). Paused while Settings → Keybinds records.DEFAULTTyping(voice_typing); a press a widget captured counts only with Ctrl or Alt, and its release is dropped too, so a bare-letter push-to-talk key does not fire while typing (as today).keybinds::voice_actions: push-to-talk →UserAction::PttKey(window hold source), push-to-mute →ShellEvent::Shortcut, mute / deafen / disconnect / transmit-mode toggle → the store's actions, answer / decline on the ringing call, the soundboard popout, the compact call's chat (local.call.chat_open, the header's chat button, asCOMPACT_VOICE_CALL_EXPANSION_TOGGLE). A press the voice keys took goes no further (Escape declines a ringing call instead of running the ladder; otherwise the ladder is unchanged). Everything held is let go on focus loss (KeybindManager.ts:889-893).is_ptt_keypath inapp.rsis removed.Tests
crates/fluxer-ui/tests/keybinds_voice.rs(8 tests, throughTestDaemonwith real iced events):ctrl_shift_m_and_d_toggle,ctrl_enter_answers_and_escape_declines_only_while_ringing,soundboard_and_compact_only_in_voice,custom_binding_replaces_default,ptt_hold_and_focus_loss_release,bare_key_not_while_typing,mouse_side_button_binding,not_double_fired_when_backend_active. Seen failing (8/8) with the matcher's output cut off, passing with it.debug_prints_no_held_key(Debug ofVoiceKeysandLocalholding a key and a mouse button prints neither the raw code, decimal or hex, norSome(3)norKeyV; a window input message prints neither code nor text),hold_released_when_no_longer_armed(PTT released on the snapshot that switches to voice activity; the answer chord no longer held once the call stops ringing), and fluxer-corevoice::settings::tests::stored_logo_key_reads_as_the_dom_code. All three seen failing on the merged tree before the fix.FLUXER_SCREENSHOT_TESTS=1 cargo xtask cigreen locally. No desktop-gated tests apply; none run. No screenshots changed.Deviations / notes for the reviewer
crates/fluxer-ui/src/message.rs(one newWindowEvent::Inputvariant), outside the task's Files list; needed to carry the input.ShellEvent::Shortcut(core has no window source for it); the window's matcher releases it on focus loss itself.ShortcutInput/KeyComboare never logged;VoiceKeyshas a manualDebug(the matcher's redacted one, the suppressed actions, onlytaken.len(),finish_non_exhaustive), andWindowEvent::Input'sthenis aThennewtype printingThen(…), so neitherVoiceKeys,Localnor a window message prints a key (spec §12).SuperLeft/SuperRight(the native recorder's earlier names) reads asMetaLeft/MetaRightinVoiceSettings::from_stored(fluxer-core, one place), so it keeps matching after the recorder switched to the DOM names.VoiceKeys::syncalso runs with every snapshot: a hold whose action is no longer armed or available (transmit mode left push-to-talk, the ringing call ended) is released at once, not on the next input.cfg(not(windows))like the other shell suites.Strings copied: none (no new UI text).
Closes #827
🤖 Generated with Claude Code
https://claude.ai/code/session_0161qMQMsCyJhjYw4gqa6e4K
Review: Shell 35 (ui-in-window-voice), commit
2dfe7e52Scope:
git diff d48106dc..origin/shell-35-ui-in-window-voice(README, app.rs, keybinds.rs, message.rs, tests/keybinds_voice.rs).Checked and fine
crates/fluxer-ui/tests/keybinds_voice.rs. They drive real iced events throughTestDaemonand assert the spec §8.1 defaults: Ctrl+Shift+M/D, Ctrl+Enter, Escape, Ctrl+Shift+B, Ctrl+Shift+V, and mouse buttons 3 and 4.is_ptt_keyis removed. Window key and mouse events reach the coreMatcherthrough onedom_codetable. Answer and Decline work only whilecalls.incomingis set. Soundboard and compact view work only in voice. Holds are released onUnfocused. Escape declines while a call rings and skips the ladder; otherwise the ladder runs (the test asserts both).tracing::call is near key data.ShortcutInput's andMatcher'sDebugoutput is redacted.InputKeybind.ts:680-727(defaults and global flags) matches.KeybindManager.ts:457-469(isActionAvailableForLocalShortcut) matches.KeybindManager.ts:880-893(blur releases local holds) matches.FLUXER_SCREENSHOT_TESTS=1 cargo xtask ci-> EXIT=0. The first run failed only onfluxer-platform::update_download::errors_never_contain_the_url(TooLarge vs Network). That test reuses a released port, which another process on this machine can bind, so the failure is unrelated to this diff. The rerun was fully green, keybinds_voice included.Findings
[blocking]
delivered_by_backendtreatsStarted(Portal)as "the portal delivers every global combo", whatever the portal's state (keybinds.rs,delivered_by_backend). Core'swanted()runs the portal whenever it is the session's selection, not only once it is bound. SoPortalState::NotSetUp,Declined,Binding,Reconnecting,ErrorandUnsupportedall exist while the back end runs, and in each of them the portal delivers nothing.set_ptt_keymakes it global, assetPrimaryCustomKeybindCombodoes.is_ptt_keypath, which always worked in the window. It also contradicts the original's strings that core already ships:PTT_NOT_SET_UP("Push-to-talk only works while {productName} is focused until you set up system-wide shortcuts"),PTT_DECLINED, and the row hintWORKS_WHILE_FOCUSED.Bound: an action with no assigned trigger (SYSTEM_WIDE_NOT_ASSIGNED), or with a trigger the desktop changed, loses its in-app key.KeybindManager.ts:592-606,hooksActive && backend !== 'portal').BackendKind::Portal, count a combo as delivered only whenapp.shell.system_shortcuts.portal.stateisBound { triggers }andtriggers.get(action)isSome. Keep the modified-hold exception. Add a test case forStarted(Portal)withNotSetUp.[minor] Two key-name tables. The window now matches
dom_code(SuperLeft->MetaLeft), but the Voice page still records keys withprocessing::key_name(format!("{code:?}"), which givesSuperLeft). A push-to-talk key recorded on Super on the Voice page therefore never fires, though it did before this change. The plan says "through one table":key_nameshould usekeybinds::dom_code(or migrateSuperLeft/SuperRight).[minor] Typing rule vs the original.
voice_typingreturnsDEFAULTfor all ten actions, so a key a widget captured fires only with Ctrl or Alt. The original lets everyvoice_and_videokeybind through from an editable element (KeybindManager.ts:1985-1986,shouldAllowLocalShortcutFromEditable). Two consequences:The plan explicitly keeps only the bare-key push-to-talk rule, so this is a parity gap, not a plan violation. Record it in the PR or open a follow-up issue.
[minor] Misplaced doc comment (app.rs, around
fn voice_events). The new function was inserted betweensend's doc comment andsend.voice_eventsnow carriessend's "Putseventinto the runtime's queue…" text, andsendhas no doc comment.Implementer deviations 1 to 5 (message.rs variant, the captured-as-typing proxy, push-to-mute as
ShellEvent::Shortcut, Super->Meta, Ctrl+E/G/S left to the picker) are acceptable apart from the points above. Deviation 4 is finding 2.Verdict: changes requested (1 blocking: in-window voice keys are dead on an unbound portal).
Review round 1 addressed in
11befa0f(localFLUXER_SCREENSHOT_TESTS=1 cargo xtask cigreen).Blocking,
delivered_by_backendon the portal: fixed. OnStarted(Portal)a combo now counts as delivered only whensystem_shortcuts.portal.stateisBoundandtriggers.get(action)isSome; NotSetUp, Binding, Declined, Reconnecting, Error and Unsupported leave every combo to the window, as does a bound portal for an action without a trigger. The hold-with-modifiers rule is unchanged on top. New testportal_not_bound_leaves_keys_to_the_window(Ctrl+Shift+M and a bare global F8 push-to-talk key across five unbound states, plus bound-without-trigger for mute);not_double_fired_when_backend_activenow binds the portal with triggers for its portal case.Minor, two key-name tables: fixed.
processing::key_namenow goes throughkeybinds::dom_code, so a Super key records asMetaLeft. Testvoice_page_records_keys_as_the_window_matches_them.Minor,
voice_typingparity gap: deferred to follow-up #907 (the original'svoice_and_videosection passes through from editable elements; doing it also replaces thebare_key_not_while_typingtest that pins today's behaviour).Minor, doc comment in
app.rs: fixed; the queue doc is back onsend, andvoice_eventskeeps only its own.README's voice-keys paragraph updated to match.
Independent review, Task 35 (round 2), commit
11befa0fReviewed
git diff d48106dc..origin/shell-35-ui-in-window-voicecold. LocalFLUXER_SCREENSHOT_TESTS=1 cargo xtask cion11befa0f: all steps passed.What checks out:
crates/fluxer-ui/tests/keybinds_voice.rsand assert what the plan says. The round-1 fix (portal_not_bound_leaves_keys_to_the_window, a portal that is bound but has no trigger) is right:delivered_by_backendnow needsStarted(kind), the action to be global-capable,combo.globaland, on the portal, a bound trigger.is_ptt_keyis gone. Keys go through one table (dom_code, whichprocessing::key_nameuses too). Answer/Decline only work whilecalls.incomingis set, and Escape keeps its ladder otherwise. Soundboard and compact view only work in voice. Holds are released onUnfocused. Recording pauses the matcher.fluxer-uidoes I/O.ShortcutInput/KeyComboDebug output is redacted. Notracing::near key data. No secrets.InputKeybind.ts:681-694), Ctrl+Enter / Escape / Ctrl+Shift+B / Ctrl+Shift+V (InputKeybind.ts:697-723), answer/decline gated on an incoming call (KeybindManager.ts:457-468), local holds released on blur (KeybindManager.ts:868-887), and soundboard/compact as press-only handlers (defaultHandlers.ts:273-282).Findings
app.rsWindowEvent::Input, thethenevent is dropped only when the voice keys produced a press (took). Key-repeat presses of a held PTT key make the matcher produce nothing (correctly), sothen(WindowEvent::Key { text: Some("v") }) runs, and the Daily use 37b type-to-start path writes the letter into the composer and focuses it. The base'sis_ptt_keytook every press of the PTT key, repeats included. I reproduced it with a throwaway test on11befa0f(PTT on KeyV, push-to-talk mode, then a press withtext: Some("v")followed by tworepeat: truepresses):first=[PttKey { down: true }],repeats=[ComposerEdited { text: "v" }, ComposerEdited { text: "vv" }]. So talking with a letter or backquote PTT key fills the user's draft once key repeat starts. The suite misses it becausekey_eventalways buildstext: None. Fix: also swallow presses of a key the matcher holds as the press of a matched combo (for example, keep the raw codes of active presses inVoiceKeysand reporttookfor their repeats), and add a test withtext: Some(..)andrepeat: true.delivered_by_backenddecides from the client combo's modifiers, not from the trigger the desktop assigned. The test binds PTT with the portal triggerCTRL+SHIFT+F12, yet expects bare F8 to belong to the portal. Spec §8.4 does not say which one; worth one line in the doc comment, or a question to settle it.COMPACT_VOICE_CALL_EXPANSION_TOGGLEwithcurrentChannelId, and only the open voice channel or DM view listens (GuildChannelView.tsx:263-271). Herelocal.call.chat_openflips whenever the user is in voice, even while another channel is shown.mouse_button_numbermapsButton::Other(n)straight ton. winit'sOthervalues are platform button indices, not DOMMouseEvent.buttonnumbers. This is harmless today (the recorder offers 1, 3 and 4 only), but a combo stored by the original with another number would not match.voice_and_videoshortcuts through from editables,KeybindManager.ts:1985-1987) is tracked in #907. That is fine.Verdict: changes requested. One blocking finding (1). CI is green.
- VoiceKeys::feed answers Fed { events, took }: it remembers the keys and buttons whose press it took until they go up, so their key repeats are taken too and a held bare push-to-talk key no longer types into the composer. - delivered_by_backend reads "a hold with a modified trigger" (spec 8.4) from the trigger the desktop assigned, as the original's triggerHasModifiers does, not from the combo's modifiers. - ToggleCompactCallView toggles the chat only with the voice channel's call open (GuildChannelView.tsx:263-271). - mouse_button_number maps only middle, back and forward; winit's other indices are not DOM numbers. Refs #827 Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0161qMQMsCyJhjYw4gqa6e4KRound 2 review fixes, commit
d47c90a3(cargo xtask ciwith screenshots green locally):VoiceKeys::feednow returnskeybinds::Fed { events, took }. It remembers each key or button whose press it took until that key goes up, so the key repeats of a held push-to-talk key are taken too and never reach the type-to-start path. A focus loss clears the list. New testheld_ptt_key_repeats_do_not_typesends real presses withtext: Some("v")andrepeat: true: noComposerEditedwhile PTT is held, a different key still types, and the same key types normally when PTT is not armed. It failed on11befa0fwith[ComposerEdited { text: "v" }].triggerHasModifiers(SystemShortcutsSection.tsx:269-271: longer than one character and containing+), instead of the combo's modifiers. If the trigger has modifiers, every combo of that hold stays with the window. If the trigger is a bare key, the portal handles the hold. Tests updated: aCTRL+SHIFT+F12trigger leaves bare F8 to the window, and anF9trigger gives the portal both F8 and Ctrl+V.local.call.chat_openwhen the open view is the call of the voice channel the user is in (call::modelisCall). This matchesGuildChannelView.tsx:263-271. The native client has no compact-call chat toggle for DMs, so the shortcut does nothing there. The test now checks both cases: another channel open (no change) and the voice channel open (toggles).Button::Other(_)now maps toNone, so only middle, back and forward (1, 3, 4) can be bound. New testonly_the_dom_mouse_buttons_bind.README updated to match.
Independent review, round 3: Task 35 (ui-in-window-voice) at
d47c90a3Scope:
git diff d48106dc..origin/shell-35-ui-in-window-voice(keybinds.rs, app.rs, message.rs, voice_video/processing.rs, README, tests/keybinds_voice.rs).Gate:
FLUXER_SCREENSHOT_TESTS=1 cargo xtask cirun locally in a fresh review worktree ond47c90a3: all steps passed (EXIT=0). keybinds_voice ran, no failures.Checked and OK
ctrl_shift_m_and_d_toggle,ctrl_enter_answers_and_escape_declines_only_while_ringing,soundboard_and_compact_only_in_voice,custom_binding_replaces_default,ptt_hold_and_focus_loss_release,bare_key_not_while_typing,mouse_side_button_binding,not_double_fired_when_backend_active). There are also new tests for the round-2 fixes:held_ptt_key_repeats_do_not_type,portal_not_bound_leaves_keys_to_the_window,only_the_dom_mouse_buttons_bind.is_ptt_keypath has been removed. Keys and mouse buttons now go through one table (dom_code,mouse_button_number) into the coreMatcheroverarmedactions that areavailableand notdelivered_by_backend. Answer and decline only work while a call rings, so Escape keeps its ladder otherwise. The soundboard and compact view work only in voice. Holds are released onUnfocused.KeybindManager.tsonWindowBlur does (~l.870-893).triggerHasModifiersmatchesSystemShortcutsSection.tsx:269-271(length > 1 && includes('+')).isActionAvailableForLocalShortcut(KeybindManager.ts:457-460) does.tracingnear key data.ShortcutInput,KeyCombo,ModifiersandMatcherkeep their redacted Debug.Findings
VoiceKeysderivesDebug, and that output contains key identifiers (crates/fluxer-ui/src/keybinds.rs,#[derive(Clone, Debug, Default)] pub struct VoiceKeys).taken: Vec<(u32, Option<u8>)>field holdsraw_code, an FNV-1a hash of the DOM code, plus the mouse button number. The hash is trivially reversible over the small set of key codes.Debugoutput". The struct's own doc comment says "ItsDebugprints no key".Local(which derives Debug) now carries this field, so any{:?}ofLocalwould print which key is held.Debugimpl likeMatcher's, e.g. printmatcher,suppressedandtaken.len()and usefinish_non_exhaustive. A one-line test asserting the Debug output of aVoiceKeysholding a key contains no digits of its raw code would also help.SuperLeft/SuperRightare no longer matched (voice_video/processing.rs::key_name).MetaLeft/MetaRight, which matches the original'sKeyboardEvent.code.SuperLeft) silently stops matching.Super*toMeta*when the setting is read, or note it in the PR.VoiceKeys::syncruns fromfeed).PttKey, because the core ignores it outside PTT mode, but worth a comment or a follow-up.Verdict: changes requested. One blocking finding (key data in
Debug, #1). The fix is small. Everything else, CI included, is green.Round 3 findings fixed: all in
a9cab9e5(after merging origin/shell at6a0eac65).VoiceKeys'sDebug: manualDebuginMatcher's style (matcher,suppressed,takenas its length,finish_non_exhaustive). Testdebug_prints_no_held_key(keybinds_voice.rs): with PTT onKeyVand Deafen on mouse Back both held,{:?}ofVoiceKeysand ofLocalcontain neither the raw code (decimal, hex lower and upper), norSome(3), norKeyV. It failed on the derived impl (taken: [(992671918, None), (0, Some(3))]).Audit of the other types this branch added or changed:
WindowEvent::Inputprinted itsthen(aWindowEvent::Key/Chordwith code and text). Itsthenis nowmessage::Then(Box<WindowEvent>), whoseDebugprintsThen(…); the same test checks that a window input message prints neitherKeyVnor"v". Checked and fine:Fed(actions and bools only);ShortcutInput,KeyCombo,Matcher(already redacted);ShortcutEvent(action and pressed only);Local(fine now throughVoiceKeys);processing::key_nameanddom_codereturn values and are never logged. There is notracingand noDisplayin the branch's diff.Older, not this branch's:
WindowEvent::Key/Chord/ChordInandkeybinds::ChordderiveDebugwith code and text (Text chat / Daily use 35), and so doVoiceSettings/VoiceSettingChange::PttKey(core). Untouched here; candidates for a follow-up.SuperLeft/SuperRight: mapped toMetaLeft/MetaRightin one place,VoiceSettings::take_stored(from_stored, fluxer-core), before the keybind sync and the platform's[keybinds]migration read it. Testvoice::settings::tests::stored_logo_key_reads_as_the_dom_code, which failed before the fix.VoiceKeys::syncis now public and runs in the shell'sUiMessage::Snapshothandler, which is where the armed set changes. It is pure and cheap, becauseMatcher::set_bindingsreturns early on an unchanged set. Its releases go throughvoice_actions. Testhold_released_when_no_longer_armedcovers both cases: PTT held, then a snapshot in voice-activity mode givesPttKey { down: false }at once and the key-up later does nothing more; the answer chord held, then the call stops ringing andAnswerCallis no longer held (newVoiceKeys::is_held). It failed before. No change outside the UI crate was needed.Gate:
FLUXER_SCREENSHOT_TESTS=1 dbus-run-session -- cargo xtask cigave==> xtask ci: all steps passed. READMEs (fluxer-ui, fluxer-core) and the PR description are updated.Merged into
shellby hand (the merge API returns 405); the commits are in the branch.Pull request closed