Shell 8: core-tray-model-and (#800) #853
Closed
charles
wants to merge 0 commits from
shell-8-core-tray-model-and into shell
pull from: shell-8-core-tray-model-and
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-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!853
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "shell-8-core-tray-model-and"
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::tray(Desktop shell plan, Task 8; spec §6):tray_model(&App) -> Option<TrayModel>, a pure selector: tooltip (D/DesktopTray.ts:312-315,D/UnreadBadge.ts),indicator(badge not empty),appearance(Coloredwith "Use colored tray icon", elseMono) and the menu in the original's order (D/DesktopTray.ts:407-532): Show / Hide Flaxative · Open settings · — · Status ▸ (radio) · [in voice: — · Mute / Unmute microphone · Deafen / Undeafen · Disconnect from {channel} | Disconnect from voice] · — · [Update Flaxative now] · [Check for updates] · [Copy build info] · — · Restart Flaxative · Quit Flaxative.TrayActionreduced to existing actions or commands:ToggleWindow→Hide/Showfrom the window's visibility,ShowWindow→Show,OpenSettings→Show+OpenSettings(None)(the window commands asked ofshell::windowwithwindow::request(WindowIntent::{Toggle, Show}), which decides and emits them),SetStatus→SetStatus { duration: None },ToggleMute/ToggleDeafen/DisconnectVoice→ToggleSelfMute/ToggleSelfDeaf/LeaveVoice,UpdateNow→UpdateAction::ButtonClicked,CheckForUpdates→UpdateAction::CheckNow,CopyBuildInfo→Effect::Clipboard(Text(..)),Restart→ShellCommand::Restart,Quit→WindowCommand::Quit.shell::tray::syncruns after everyApp::apply:Effect::Shell(ShellCommand::Tray(model))only when the model changed since the last one sent (app.shell.tray_model),RemoveTraywhen it went away.ShellEvent::TrayAvailabilityis stored inapp.shell.tray, which the window rules (Task 9) read.Joined with Task 9 (window rules)
Task 9 landed in
shellfirst with its own window-visibility state and its own "show the hidden window" rules. Per the orchestrator's decision,shell::windowis the single owner of the window's visibility and of every show / hide decision:ShellState::window_visibleand this task's "show when the tray goes away" rule (intray::reduceandtray::sync) are deleted;UserAction::WindowVisibleno longer feeds the tray.app.shell.window.shown()(new accessor: visible and not minimised, from the window'sWindowRequest::Shown/Hidden/Minimizedreports).window::request(shell, WindowIntent::{Show, Toggle}, effects)(new, inwindow.rs); the tray never emitsWindowCommand::Show/Hideitself.app.shell.tray;window::reduce(now run aftertray::reduce) shows a hidden window when it becomes anything butAvailable(new arm), next to its existingShowTrayIcon(false), grace-timer andHiddenrules. Every show cancels the start's tray grace, so a late timer cannot show twice.shell::instance) landed inshellduring the join and answersInstanceMessage::Activate { token }with oneWindowCommand::Raise(un-minimise, show, focus) orActivate(token). TheShowarm first added towindow::reducefor it was dropped so activation is not answered twice; the test asserts exactly one raising command and no extraShow. (Routing Task 10's raise throughwindow::requestis a possible follow-up if the window module should emit it too.)shell::tray::syncruns after Task 13'sbadge::follow, so the tooltip shows the badge the event left.Strings copied from
fluxer_desktop/src/main/MainI18n.ts({appName}= Flaxative):Show {appName},Hide {appName},Open settings,Status,Online,Idle,Do not disturb,Invisible,Mute microphone,Unmute microphone,Deafen,Undeafen,Disconnect from {channel}(channel bidi-isolated with U+2068/U+2069 asisolateBidiText),Disconnect from voice,Update {appName} now,Check for updates,Copy build info,Restart {appName},Quit {appName},Unread messages,Unread messages: {count}.How it was tested
crates/fluxer-core/tests/shell_tray.rs:menu_rows_per_state(logged out, logged in, in voice, muted, deafened, a named channel, a DM call, update offered, updater with nothing offered, hidden window),rows_carry_their_actions,status_radio_follows_presence,tooltip_per_badge,appearance_follows_colored_setting,no_model_without_icon_or_tray,model_emitted_only_on_change,every_action_maps,copy_build_info_of_a_development_build,tray_lost_while_hidden_shows_window_once,tray_icon_turned_off_while_hidden_shows_window_once,tray_show_clicked_shows_window_once,second_instance_activation_raises_window_once,close_to_tray_hide_shows_in_the_menu;every_action_mapschecks the toggle hides, then shows (and shows a minimised window). Seen failing (no module) before the implementation, passing after. The join's tests were seen failing on the plain-merged tree (icon off while hidden sentShowtwice; close-to-trayHideleft the menu at "Hide"; the menu ignoredWindowRequest::Hidden), passing after.tests/shell_window.rs(Task 9):hidden_without_any_tray_is_shown_at_oncenow asserts no window command or timer (the tray's menu changing to "Show" is an expected effect).FLUXER_SCREENSHOT_TESTS=1 cargo xtask cigreen locally. No desktop-only tests in this task (pure core).Deviations and notes for the reviewer
tray.rs:app.rsgets two calls (shell::tray::reducenext toshell::reduce, which returns the follow-up actions the rows stand for;shell::tray::syncafter the reducers).shell::reducetakes only&mut ShellState, so the tray reducer, which needs the updater's build info and returns follow-ups, is called beside it rather than changing its signature (other wave tasks add arms to it).ShellStategainstray_model.tests/shell_ports.rs: the tray actions and availability events, andInstance(Activate), are removed from the "stubs change nothing" inputs, since they now have behaviour.app.shell.tray == None): the runtime (Task 33) reportsTrayAvailabilityfirst,Disabledfor--no-tray. This keeps every existing test's effects unchanged and avoids a tray flash before the settings say "Show tray icon" is off.NoHost/NoWatcherkeep the model so the item stays registered for a host that appears later.WindowState::shown(), the original'sisVisible() && !isMinimized()), from what the window reports; see the join above.VoiceConnection::is_live()(connected, reconnecting, or moving), and the mute / deafen labels follow the user's own switches (LocalVoiceState), as the original'sLocalVoiceState.getSelfMute().UpdateStatus::Available | Ready; "Check for updates" unless the updater isDisabled(development build or no platform), asshouldDisableModuleUpdatesForLaunch.{Channel} Desktop {version|dev} ({commit})fromUpdateState::build(), after the first part offormatClientBuildInfo; the original's OS / Electron parts have no equivalent in core. Task 33 may replace it withdebug_infoif wanted.WindowCommand::Quit(spec §6); Restart usesShellCommand::Restart.Stacked on: origin/shell-6-core-shell-ports-settings (already merged into shell; the merge was a no-op).
Closes #800
🤖 Generated with Claude Code
https://claude.ai/code/session_0161qMQMsCyJhjYw4gqa6e4K
Independent review: Shell 8 (core tray model and actions)
Scope:
git diff 56930ca6..origin/shell-8-core-tray-model-and(567810ff).Local gate:
FLUXER_SCREENSHOT_TESTS=1 cargo xtask ci-> "all steps passed".tests/shell_tray.rs: 10 passed.Checks
menu_rows_per_statecovers logged out, logged in, in voice (plain, muted, deafened), a named channel, a DM call, update offered, updater up to date and a hidden window. The others arestatus_radio_follows_presence,tooltip_per_badge(1,234-style grouping),model_emitted_only_on_change,every_action_maps(iteratesTrayAction::ALL) andtray_lost_while_hidden_shows_window. Four extra tests are also present.shell::tray::tray_model(&App) -> Option<TrayModel>exists. It uses the Task 6TrayItem,TrayActionandTrayAppearanceunchanged.Effect::Shell(ShellCommand::Tray(model))is sent only on change, andRemoveTrayis sent when the model goes away.ShellEvent::TrayAvailabilityis stored inshell.tray. No registry was reordered:ShellStateonly gained two fields at the end.fluxer-corehas no new imports of iced, wgpu, winit, reqwest or tungstenite, and does no I/O. There are no new fixtures. Nothing indexes server data (the channel name is looked up withget, and an empty name falls back). No secrets or paths appear. The test password is a dummy, as in the existing suites.fluxer_desktop/src/main:MainI18n.ts:57-117.buildTrayMenu(DesktopTray.ts:407-532).getTrayToolTip/describeUnreadBadge.:408-411).isolateBidiText. It falls back to "Disconnect from voice" when the channel has no name (DM), asresolveVoiceChannelLabel.DesktopTrayBridge.ts. Set status has no duration, matchingUserSettings.setStatus.NoHost/NoWatcherkeep the model and reveal a hidden window.Disabledremoves the tray. The typed "no tray" string is for Desktop settings in a later task, so there is nothing to check here. Review Focus #5: without a tray, a hidden window is never left hidden, whether the availability is lost or the icon is turned off.Findings
"{Channel} Desktop {version|dev} ({commit})"itself throughEffect::Clipboard. The original copies all offormatClientBuildInfo: desktop and web build, OS and arch, runtimes, locale. Plan Task 33 says this row "uses the existingdebug_info". Task 33 is anapps/fluxer-only task and cannot change this reducer without causing a double write. This should be settled before Task 33 starts. Option 1: Task 33 accepts the core string, optionally extended with an OS line. Option 2: a follow-up makes the core emit aShellCommandfor the runtime to fill. Not blocking: the row exists, works and copies a correct prefix of the original's string.shell.window_visibledefaults totrueand followsUserAction::WindowVisibleplus the tray's own Show and Hide. Task 9's close-to-trayHideand start-hidden decision, and itsWindowRequest::Shown/Hidden, must also update this field (or reportWindowVisible). Otherwise, after close-to-tray or an autostart start-hidden, the first row reads "Hide Flaxative" and a click hides an already hidden window. Task 9 should own and reuse this field rather than add a second one.DesktopTray.ts:597reveals only!isVisible(). Here a minimised window (which counts aswindow_visible == false) is also sentShowwhen the tray goes away. This is harmless and arguably better.VoiceConnection::is_live(), which includes Reconnecting. The original usesconnectedfrom the projection. Keeping "Disconnect" available while reconnecting is reasonable.Verdict: APPROVED. No blocking findings, and the local gate is green. The Copy build info question should be settled before Task 33.
Joined with Task 9 per the orchestrator's decision:
shell::windowis the single owner of the window's visibility and of every show / hide.ShellState::window_visibleand the tray's own "show when the tray goes away" rule (tray::reduce, tray::sync) are deleted. The tray menu label and click readWindowState::shown()(new accessor: visible and not minimised) and ask for a change throughwindow::request(WindowIntent::{Show, Toggle})(new); the tray never emits Show/Hide itself. The tray stores its availability inShellState::tray;window::reduce(now aftertray::reduce) shows a hidden window once when the tray is lost (new arm), next to its existing icon-off, grace and Hidden rules; every show cancels the start grace. Tests intests/shell_tray.rs: exactly one Show for tray lost while hidden, icon turned off while hidden, tray Show clicked; close-to-tray Hide reflected in the menu label; toggle hides and shows. Task 10 landed meanwhile and answers a second instance with oneRaise/Activate(token), so no extra Show is added for activation (asserted: exactly one raising command, no Show). GateFLUXER_SCREENSHOT_TESTS=1 dbus-run-session -- cargo xtask cigreen.Per the orchestrator's decision, Task 9's window module is the single owner of the window's visibility and of every show / hide decision: - `ShellState::window_visible` and the tray's own "show when the tray goes away" rule (tray::reduce and tray::sync) are gone. - The tray's first row and click read `WindowState::shown()` (visible and not minimised) and ask for a change with `window::request(WindowIntent::{Show, Toggle})`; the tray never emits a window command itself. - The tray stores the platform's availability in `ShellState::tray`; the window rules show a hidden window once when it is lost (new), when the icon is turned off, and on a second instance's `Activate` (new, plus `Activate(token)`); every show cancels the start's tray grace. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>Merged into
shellby hand (the merge API returns 405); the commits are in the branch.Independent review: Shell 8 (core tray model and actions)
Scope.
git diff 2cb39185..origin/shell-8-core-tray-model-andis empty: the branch head is2cb39185, already an ancestor oforigin/shell(merged by hand asbaf0a9298). So I reviewed the task's own commits instead (567810ffefeat(core): tray model,88cd55079cargo fmt) as they stand on the branch:crates/fluxer-core/src/shell/tray.rs,tests/shell_tray.rs, and theapp.rs,shell/mod.rsand README hooks. Those files have not changed between the branch andorigin/shell.1. Plan tests. All are present and assert what the plan asks for:
menu_rows_per_state(logged out, logged in, in voice, muted, deafened, named channel, DM call, update offered, updater idle, hidden, minimised),status_radio_follows_presence,tooltip_per_badge(None, Dot, Count 3, 12,345, 0),model_emitted_only_on_change,every_action_maps(iteratesTrayAction::ALL) and the tray-lost test. There are also extra tests: rows carry their actions, appearance, no model without icon or tray, a dev build's build info, and how window rules interact with the tray.2. Interfaces.
tray_model(&App) -> Option<TrayModel>,TrayModel { tooltip, indicator, appearance, menu },TrayAppearance::{Colored, Mono},TrayItem::{Action{label,action,enabled}, Radio{label,action,checked}, Submenu{label,items}, Separator}, and all 12TrayActionvariants exist exactly as the plan names them.ShellEvent::TrayAvailabilityis stored inShellState::tray.Effect::Shell(ShellCommand::Tray(model))is sent only when the model changes, andRemoveTraywhen the model goes away. Tasks 20, 21 and 22 already build on these names inshell.3. Invariants.
tray.rsis pure. It does no I/O and imports no iced, wgpu, winit, reqwest or tokio-tungstenite. It has no panics on server data: a channel name that is missing or empty falls back to "Disconnect from voice", and the badge-count formatting is plain arithmetic. It adds no fixtures. It contains no secrets, tokens or paths.4. Parity spot checks against
fluxer_desktop/src/mainin the fork:MainI18n.ts:57-117exactly. This covers show/hide, open settings, the status rows, mute/unmute, deafen/undeafen, "Disconnect from {channel}" with FSI/PDI isolation, disconnect voice, update now, check for updates, copy build info, restart and quit.getTrayToolTipplusdescribeUnreadBadge: "Flaxative - Unread messages" for the dot and "Unread messages: {count}" for a count. The indicator is on when the badge is not 0.buildTrayMenu(DesktopTray.ts:407-532). Hide shows only when the window is visible and not minimised. Toggle semantics matchtoggleMainWindow. Accounts and custom CSS are absent, as spec §6 says (rows 10 and 12). Showing a hidden window when the tray is lost matchesrevealHiddenWindowIfTrayUnavailable.5. Review Focus 6 (honest capability reporting).
TrayAvailability::{Available, NoHost, NoWatcher, Disabled}is a typed state.NoHostandNoWatcherkeep the model so a host that registers later still works. The user-facing "no system tray" string belongs to Task 38, not this task.6. Gate.
FLUXER_SCREENSHOT_TESTS=1 cargo xtask cion2cb39185: all steps passed (EXIT=0).shell_tray: 14 tests ok.Findings
{Channel} Desktop {version} ({commit}). That is only the first part of the original'sformatClientBuildInfo, which also lists web build, OS/arch, locale and so on. The doc comment says this. It is acceptable for a native client, but it is a deliberate deviation and belongs in the parity list (Task 43).12,345). The original usestoLocaleString(getNativeLocale()). This is fine while the client is English-only.tray_lost_while_hidden_shows_window; on the branch it istray_lost_while_hidden_shows_window_once. It asserts more than the plan asks, so this is cosmetic.Verdict: APPROVED. No blocking findings, and the local gate is green.
Pull request closed