🐛 fix: 🐛 fix: auto-regenerate viewer-mode .desktop entries on startup

The previous commit aligned StartupWMClass with the viewer's GTK
application_id, but existing .desktop files on disk retained the old
mismatched value. Users previously had to open each webapp in the
manager and re-save it to apply the correction.

Introduce a one-shot migration, `regenerate_app_mode_desktops`, which
runs on the manager's startup worker thread alongside
`migrate_legacy_desktops`. It regenerates every `AppMode::App` entry
using the standard desktop file builder. Execution is gated by a
`.desktop-wmclass-aligned-v1` marker file in the data directory,
ensuring the migration runs exactly once per user after upgrading.
Browser-mode entries are excluded, as their wm_class derivation was
never affected.

Author: talesam

crates/webapps-core/src/desktop/mod.rs

@@ -95,6 +95,20 @@ mod tests {
         );
     }
 
+    #[test]
+    fn derive_wm_class_app_mode_matches_viewer_application_id() {
+        // Must equal the viewer's GTK application_id so Wayland compositors can
+        // associate the window with the .desktop entry (otherwise the taskbar
+        // shows the raw app_id and a generic icon).
+        let w = app("https://cloud.talesam.org/apps/notes", AppMode::App);
+        let cls = derive_wm_class(&w);
+        let expected = format!(
+            "br.com.biglinux.webapp.{}",
+            desktop_file_id(&w.app_url)
+        );
+        assert_eq!(cls, expected);
+    }
+
     #[test]
     fn derive_wm_class_browser_mode_includes_prefix() {
         let w = app("https://web.whatsapp.com/", AppMode::Browser);

crates/webapps-core/src/desktop/wm_class.rs

@@ -1,17 +1,15 @@
 use crate::models::{AppMode, BrowserId, WebApp};
 
+use super::paths::desktop_file_id;
+
 pub(super) fn derive_wm_class(webapp: &WebApp) -> String {
     match webapp.app_mode {
         AppMode::App => {
-            let app_id = webapp
-                .app_url
-                .replace("https://", "")
-                .replace("http://", "")
-                .replace('/', "_")
-                .chars()
-                .filter(|c| c.is_alphanumeric() || *c == '_' || *c == '-')
-                .collect::<String>();
-            format!("br.com.biglinux.webapp.{app_id}")
+            // Must match the GTK application_id set by the viewer
+            // (`br.com.biglinux.webapp.{desktop_file_id}`), so Wayland compositors
+            // can associate the window with this desktop entry — otherwise the
+            // taskbar falls back to displaying the raw app_id and a generic icon.
+            format!("br.com.biglinux.webapp.{}", desktop_file_id(&webapp.app_url))
         }
         AppMode::Browser => {
             let url_class = browser_url_class(&webapp.app_url);

crates/webapps-manager/src/service/migration/mod.rs

@@ -4,9 +4,20 @@ mod shell;
 use std::fs;
 
 use webapps_core::config;
-use webapps_core::models::{WebApp, WebAppCollection};
+use webapps_core::desktop;
+use webapps_core::models::{AppMode, WebApp, WebAppCollection};
 
-use super::{save_webapps, webapps_json_path};
+use super::{load_webapps, save_webapps, webapps_json_path};
+
+/// Marker indicating the viewer-mode `StartupWMClass` realignment migration ran.
+///
+/// Pre-v4.1 desktop entries for `AppMode::App` set `StartupWMClass` to a value
+/// that included the URL path, while the viewer's GTK `application_id` only
+/// uses the host. The mismatch prevented Wayland compositors from associating
+/// viewer windows with their `.desktop` file, so the taskbar fell back to the
+/// raw `app_id` and a generic icon. This marker records that the one-shot
+/// regeneration has run so we only do it once per user.
+const WMCLASS_MIGRATION_MARKER: &str = ".desktop-wmclass-aligned-v1";
 
 pub fn migrate_legacy_desktops() -> usize {
     let json_path = webapps_json_path();
@@ -24,6 +35,42 @@ pub fn migrate_legacy_desktops() -> usize {
     persist_migrated_webapps(webapps)
 }
 
+/// Regenerate `AppMode::App` desktop entries once, so existing installs pick
+/// up the corrected `StartupWMClass` without the user having to re-save each
+/// webapp in the manager.
+pub fn regenerate_app_mode_desktops() -> usize {
+    let marker = config::data_dir().join(WMCLASS_MIGRATION_MARKER);
+    if marker.exists() {
+        return 0;
+    }
+
+    let collection = load_webapps();
+    let mut regenerated = 0;
+    for app in &collection.webapps {
+        if app.app_mode != AppMode::App {
+            continue;
+        }
+        match desktop::install_desktop_entry(app) {
+            Ok(()) => regenerated += 1,
+            Err(err) => log::warn!(
+                "Regenerate desktop entry for {}: {err}",
+                app.app_name
+            ),
+        }
+    }
+
+    if let Err(err) = fs::create_dir_all(config::data_dir())
+        .and_then(|()| fs::write(&marker, ""))
+    {
+        log::warn!(
+            "Write StartupWMClass migration marker {}: {err}",
+            marker.display()
+        );
+    }
+
+    regenerated
+}
+
 fn collect_legacy_webapps(entries: fs::ReadDir) -> Vec<WebApp> {
     let mut webapps = Vec::new();
 

crates/webapps-manager/src/service/mod.rs

@@ -13,7 +13,7 @@ pub use crud::{
 };
 pub use icons::resolve_icon_path;
 pub use io::{export_webapps, import_webapps};
-pub use migration::migrate_legacy_desktops;
+pub use migration::{migrate_legacy_desktops, regenerate_app_mode_desktops};
 pub use repository::{load_webapps, save_webapps};
 pub use welcome::{mark_welcome_shown, should_show_welcome};
 

crates/webapps-manager/src/window/mod.rs

@@ -76,13 +76,19 @@ pub fn build(app: &adw::Application) {
         ui_async::run_with_result(
             || {
                 let migrated = service::migrate_legacy_desktops();
+                let regenerated = service::regenerate_app_mode_desktops();
                 let webapps = service::load_webapps();
-                (migrated, webapps)
+                (migrated, regenerated, webapps)
             },
-            move |(migrated, webapps): (usize, WebAppCollection)| {
+            move |(migrated, regenerated, webapps): (usize, usize, WebAppCollection)| {
                 if migrated > 0 {
                     log::info!("Migrated {migrated} legacy webapps from .desktop files");
                 }
+                if regenerated > 0 {
+                    log::info!(
+                        "Regenerated {regenerated} viewer-mode .desktop entries (StartupWMClass alignment)"
+                    );
+                }
                 state::apply_webapps(&context_for_load.state, webapps);
                 list::populate_list(&context_for_load);
             },