chore(owlry-rune): bump version to 0.4.9

- Add Keywords field from desktop files to searchable tags
  (fixes apps like Nautilus not found when searching by legacy name)
- Respect XDG_DATA_DIRS with proper fallbacks for app directories
- Add Flatpak, Snap, and Nix application directory support
- Simplify desktop file launch to use gio directly (guaranteed by GTK4)
- Add desktop notifications for launch failures
- Check desktop file existence before launch attempt

Cargo.lock

@@ -2373,7 +2373,7 @@ dependencies = [
 
 [[package]]
 name = "owlry"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "chrono",
  "clap",
@@ -2402,7 +2402,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-lua"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "chrono",
@@ -2420,7 +2420,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-api"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "serde",
@@ -2428,7 +2428,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-bookmarks"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "dirs",
@@ -2440,7 +2440,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-calculator"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "meval",
@@ -2449,7 +2449,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-clipboard"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "owlry-plugin-api",
@@ -2457,7 +2457,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-emoji"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "owlry-plugin-api",
@@ -2465,7 +2465,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-filesearch"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "dirs",
@@ -2474,7 +2474,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-media"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "owlry-plugin-api",
@@ -2482,7 +2482,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-pomodoro"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "dirs",
@@ -2494,7 +2494,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-scripts"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "dirs",
@@ -2503,7 +2503,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-ssh"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "dirs",
@@ -2512,7 +2512,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-system"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "owlry-plugin-api",
@@ -2520,7 +2520,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-systemd"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "owlry-plugin-api",
@@ -2528,7 +2528,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-weather"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "dirs",
@@ -2541,7 +2541,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-plugin-websearch"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "abi_stable",
  "owlry-plugin-api",
@@ -2549,7 +2549,7 @@ dependencies = [
 
 [[package]]
 name = "owlry-rune"
-version = "0.4.7"
+version = "0.4.9"
 dependencies = [
  "chrono",
  "dirs",

ROADMAP.md

@@ -75,6 +75,24 @@ The script runtimes make this viable without recompiling.
 
 ## Technical Debt
 
+### Split monorepo for user build efficiency
+Currently, a small core fix requires all 16 AUR packages to rebuild (same source tarball). Split into 3 repos:
+
+| Repo | Contents | Versioning |
+|------|----------|------------|
+| `owlry` | Core binary | Independent |
+| `owlry-plugin-api` | ABI interface (crates.io) | Semver, conservative |
+| `owlry-plugins` | 13 plugins + 2 runtimes | Independent per plugin |
+
+**Execution order:**
+1. Publish `owlry-plugin-api` to crates.io
+2. Update monorepo to use crates.io dependency
+3. Create `owlry-plugins` repo, move plugins + runtimes
+4. Slim current repo to core-only
+5. Update AUR PKGBUILDs with new source URLs
+
+**Benefit:** Core bugfix = 1 rebuild. Plugin fix = 1 rebuild. Third-party plugins possible via crates.io.
+
 ### Replace meval with evalexpr
 `meval` depends on `nom v1.2.4` which will be rejected by future Rust versions. Migrate calculator plugin and Lua runtime to `evalexpr` v13+.
 

crates/owlry-lua/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-lua"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-api"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-bookmarks/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-bookmarks"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-calculator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-calculator"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-clipboard/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-clipboard"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-emoji/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-emoji"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-filesearch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-filesearch"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-media/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-media"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-pomodoro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-pomodoro"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-scripts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-scripts"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-ssh/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-ssh"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-system/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-system"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-systemd/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-systemd"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-weather/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-weather"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-plugin-websearch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-plugin-websearch"
-version = "0.4.7"
+version = "0.4.9"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true

crates/owlry-rune/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry-rune"
-version = "0.4.7"
+version = "0.4.9"
 edition = "2024"
 rust-version = "1.90"
 description = "Rune scripting runtime for owlry plugins"

crates/owlry/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "owlry"
-version = "0.4.7"
+version = "0.4.9"
 edition = "2024"
 rust-version = "1.90"
 description = "A lightweight, owl-themed application launcher for Wayland"

crates/owlry/src/paths.rs

@@ -99,23 +99,57 @@ pub fn frecency_file() -> Option<PathBuf> {
 // =============================================================================
 
 /// System data directories for applications (XDG_DATA_DIRS)
+///
+/// Follows the XDG Base Directory Specification:
+/// - $XDG_DATA_HOME/applications (defaults to ~/.local/share/applications)
+/// - $XDG_DATA_DIRS/*/applications (defaults to /usr/local/share:/usr/share)
+/// - Additional Flatpak and Snap directories
 pub fn system_data_dirs() -> Vec<PathBuf> {
     let mut dirs = Vec::new();
+    let mut seen = std::collections::HashSet::new();
 
-    // User data directory first
+    // Helper to add unique directories
+    let mut add_dir = |path: PathBuf| {
+        if seen.insert(path.clone()) {
+            dirs.push(path);
+        }
+    };
+
+    // 1. User data directory first (highest priority)
     if let Some(data) = data_home() {
-        dirs.push(data.join("applications"));
+        add_dir(data.join("applications"));
     }
 
-    // System directories
-    dirs.push(PathBuf::from("/usr/share/applications"));
-    dirs.push(PathBuf::from("/usr/local/share/applications"));
+    // 2. XDG_DATA_DIRS - parse the environment variable
+    // Default per spec: /usr/local/share:/usr/share
+    let xdg_data_dirs = std::env::var("XDG_DATA_DIRS")
+        .unwrap_or_else(|_| "/usr/local/share:/usr/share".to_string());
 
-    // Flatpak directories
-    if let Some(data) = data_home() {
-        dirs.push(data.join("flatpak/exports/share/applications"));
+    for dir in xdg_data_dirs.split(':') {
+        if !dir.is_empty() {
+            add_dir(PathBuf::from(dir).join("applications"));
+        }
     }
-    dirs.push(PathBuf::from("/var/lib/flatpak/exports/share/applications"));
+
+    // 3. Always include standard system directories as fallback
+    // Some environments set XDG_DATA_DIRS without including these
+    add_dir(PathBuf::from("/usr/share/applications"));
+    add_dir(PathBuf::from("/usr/local/share/applications"));
+
+    // 4. Flatpak directories (user and system)
+    if let Some(data) = data_home() {
+        add_dir(data.join("flatpak/exports/share/applications"));
+    }
+    add_dir(PathBuf::from("/var/lib/flatpak/exports/share/applications"));
+
+    // 5. Snap directories
+    add_dir(PathBuf::from("/var/lib/snapd/desktop/applications"));
+
+    // 6. Nix directories (common on NixOS)
+    if let Some(home) = dirs::home_dir() {
+        add_dir(home.join(".nix-profile/share/applications"));
+    }
+    add_dir(PathBuf::from("/run/current-system/sw/share/applications"));
 
     dirs
 }

crates/owlry/src/providers/application.rs

@@ -98,6 +98,15 @@ impl Provider for ApplicationProvider {
         // Empty locale list for default locale
         let locales: &[&str] = &[];
 
+        // Get current desktop environment(s) for OnlyShowIn/NotShowIn filtering
+        // XDG_CURRENT_DESKTOP can be colon-separated (e.g., "ubuntu:GNOME")
+        let current_desktops: Vec<String> = std::env::var("XDG_CURRENT_DESKTOP")
+            .unwrap_or_default()
+            .split(':')
+            .filter(|s| !s.is_empty())
+            .map(|s| s.to_string())
+            .collect();
+
         for path in Iter::new(dirs.into_iter()) {
             let content = match std::fs::read_to_string(&path) {
                 Ok(c) => c,
@@ -125,6 +134,24 @@ impl Provider for ApplicationProvider {
                 continue;
             }
 
+            // Apply OnlyShowIn/NotShowIn filters only if we know the current desktop
+            // If XDG_CURRENT_DESKTOP is not set, show all apps (don't filter)
+            if !current_desktops.is_empty() {
+                // OnlyShowIn: if set, current desktop must be in the list
+                if desktop_entry.only_show_in().is_some_and(|only| {
+                    !current_desktops.iter().any(|de| only.contains(&de.as_str()))
+                }) {
+                    continue;
+                }
+
+                // NotShowIn: if current desktop is in the list, skip
+                if desktop_entry.not_show_in().is_some_and(|not| {
+                    current_desktops.iter().any(|de| not.contains(&de.as_str()))
+                }) {
+                    continue;
+                }
+            }
+
             let name = match desktop_entry.name(locales) {
                 Some(n) => n.to_string(),
                 None => continue,
@@ -135,12 +162,17 @@ impl Provider for ApplicationProvider {
                 None => continue,
             };
 
-            // Extract categories as tags (lowercase for consistency)
-            let tags: Vec<String> = desktop_entry
+            // Extract categories and keywords as tags (lowercase for consistency)
+            let mut tags: Vec<String> = desktop_entry
                 .categories()
                 .map(|cats| cats.into_iter().map(|s| s.to_lowercase()).collect())
                 .unwrap_or_default();
 
+            // Add keywords for searchability (e.g., Nautilus has Name=Files but Keywords contains "nautilus")
+            if let Some(keywords) = desktop_entry.keywords(locales) {
+                tags.extend(keywords.into_iter().map(|s| s.to_lowercase()));
+            }
+
             let item = LaunchItem {
                 id: path.to_string_lossy().to_string(),
                 name,
@@ -157,6 +189,13 @@ impl Provider for ApplicationProvider {
 
         debug!("Found {} applications", self.items.len());
 
+        #[cfg(feature = "dev-logging")]
+        debug!(
+            "XDG_CURRENT_DESKTOP={:?}, scanned dirs count={}",
+            current_desktops,
+            Self::get_application_dirs().len()
+        );
+
         // Sort alphabetically by name
         self.items.sort_by(|a, b| a.name.to_lowercase().cmp(&b.name.to_lowercase()));
     }
@@ -210,4 +249,18 @@ mod tests {
             "bash -c 'echo %u'"
         );
     }
+
+    #[test]
+    fn test_clean_desktop_exec_preserves_env() {
+        // env VAR=value pattern should be preserved
+        assert_eq!(
+            clean_desktop_exec_field("env GDK_BACKEND=x11 UBUNTU_MENUPROXY=0 audacity %F"),
+            "env GDK_BACKEND=x11 UBUNTU_MENUPROXY=0 audacity"
+        );
+        // Multiple env vars
+        assert_eq!(
+            clean_desktop_exec_field("env FOO=bar BAZ=qux myapp %u"),
+            "env FOO=bar BAZ=qux myapp"
+        );
+    }
 }

crates/owlry/src/ui/main_window.rs

@@ -47,6 +47,8 @@ struct LazyLoadState {
 /// Number of items to display initially and per batch
 const INITIAL_RESULTS: usize = 15;
 const LOAD_MORE_BATCH: usize = 10;
+/// Debounce delay for search input (milliseconds)
+const SEARCH_DEBOUNCE_MS: u64 = 50;
 
 pub struct MainWindow {
     window: ApplicationWindow,
@@ -69,6 +71,8 @@ pub struct MainWindow {
     custom_prompt: Option<String>,
     /// Lazy loading state
     lazy_state: Rc<RefCell<LazyLoadState>>,
+    /// Debounce source ID for cancelling pending searches
+    debounce_source: Rc<RefCell<Option<gtk4::glib::SourceId>>>,
 }
 
 impl MainWindow {
@@ -210,6 +214,7 @@ impl MainWindow {
             tab_order,
             custom_prompt,
             lazy_state,
+            debounce_source: Rc::new(RefCell::new(None)),
         };
 
         main_window.setup_signals();
@@ -554,7 +559,7 @@ impl MainWindow {
     }
 
     fn setup_signals(&self) {
-        // Search input handling with prefix detection
+        // Search input handling with prefix detection and debouncing
         let providers = self.providers.clone();
         let results_list = self.results_list.clone();
         let config = self.config.clone();
@@ -565,11 +570,12 @@ impl MainWindow {
         let search_entry_for_change = self.search_entry.clone();
         let submenu_state = self.submenu_state.clone();
         let lazy_state = self.lazy_state.clone();
+        let debounce_source = self.debounce_source.clone();
 
         self.search_entry.connect_changed(move |entry| {
             let raw_query = entry.text();
 
-            // If in submenu, filter the submenu items
+            // If in submenu, filter immediately (no debounce needed for small local lists)
             if submenu_state.borrow().active {
                 let state = submenu_state.borrow();
                 let query = raw_query.to_lowercase();
@@ -607,7 +613,7 @@ impl MainWindow {
                 return;
             }
 
-            // Normal mode: parse prefix and search
+            // Normal mode: update prefix/UI immediately for responsiveness
             let parsed = ProviderFilter::parse_query(&raw_query);
 
             {
@@ -643,53 +649,79 @@ impl MainWindow {
                     .set_placeholder_text(Some(&format!("Search {}...", prefix_name)));
             }
 
-            let cfg = config.borrow();
-            let max_results = cfg.general.max_results;
-            let frecency_weight = cfg.providers.frecency_weight;
-            let use_frecency = cfg.providers.frecency;
-            drop(cfg);
-
-            let results: Vec<LaunchItem> = if use_frecency {
-                providers
-                    .borrow_mut()
-                    .search_with_frecency(&parsed.query, max_results, &filter.borrow(), &frecency.borrow(), frecency_weight, parsed.tag_filter.as_deref())
-                    .into_iter()
-                    .map(|(item, _)| item)
-                    .collect()
-            } else {
-                providers
-                    .borrow()
-                    .search_filtered(&parsed.query, max_results, &filter.borrow())
-                    .into_iter()
-                    .map(|(item, _)| item)
-                    .collect()
-            };
-
-            // Clear existing results
-            while let Some(child) = results_list.first_child() {
-                results_list.remove(&child);
+            // Cancel any pending debounced search
+            if let Some(source_id) = debounce_source.borrow_mut().take() {
+                source_id.remove();
             }
 
-            // Lazy loading: store all results but only display initial batch
-            let initial_count = INITIAL_RESULTS.min(results.len());
-            {
-                let mut lazy = lazy_state.borrow_mut();
-                lazy.all_results = results.clone();
-                lazy.displayed_count = initial_count;
-            }
+            // Clone references for the debounced closure
+            let providers = providers.clone();
+            let results_list = results_list.clone();
+            let config = config.clone();
+            let frecency = frecency.clone();
+            let current_results = current_results.clone();
+            let filter = filter.clone();
+            let lazy_state = lazy_state.clone();
+            let debounce_source_for_closure = debounce_source.clone();
 
-            // Display only initial batch
-            for item in results.iter().take(initial_count) {
-                let row = ResultRow::new(item);
-                results_list.append(&row);
-            }
+            // Schedule debounced search
+            let source_id = gtk4::glib::timeout_add_local_once(
+                std::time::Duration::from_millis(SEARCH_DEBOUNCE_MS),
+                move || {
+                    // Clear the source ID since we're now executing
+                    *debounce_source_for_closure.borrow_mut() = None;
 
-            if let Some(first_row) = results_list.row_at_index(0) {
-                results_list.select_row(Some(&first_row));
-            }
+                    let cfg = config.borrow();
+                    let max_results = cfg.general.max_results;
+                    let frecency_weight = cfg.providers.frecency_weight;
+                    let use_frecency = cfg.providers.frecency;
+                    drop(cfg);
 
-            // current_results holds only what's displayed (for selection/activation)
-            *current_results.borrow_mut() = results.into_iter().take(initial_count).collect();
+                    let results: Vec<LaunchItem> = if use_frecency {
+                        providers
+                            .borrow_mut()
+                            .search_with_frecency(&parsed.query, max_results, &filter.borrow(), &frecency.borrow(), frecency_weight, parsed.tag_filter.as_deref())
+                            .into_iter()
+                            .map(|(item, _)| item)
+                            .collect()
+                    } else {
+                        providers
+                            .borrow()
+                            .search_filtered(&parsed.query, max_results, &filter.borrow())
+                            .into_iter()
+                            .map(|(item, _)| item)
+                            .collect()
+                    };
+
+                    // Clear existing results
+                    while let Some(child) = results_list.first_child() {
+                        results_list.remove(&child);
+                    }
+
+                    // Lazy loading: store all results but only display initial batch
+                    let initial_count = INITIAL_RESULTS.min(results.len());
+                    {
+                        let mut lazy = lazy_state.borrow_mut();
+                        lazy.all_results = results.clone();
+                        lazy.displayed_count = initial_count;
+                    }
+
+                    // Display only initial batch
+                    for item in results.iter().take(initial_count) {
+                        let row = ResultRow::new(item);
+                        results_list.append(&row);
+                    }
+
+                    if let Some(first_row) = results_list.row_at_index(0) {
+                        results_list.select_row(Some(&first_row));
+                    }
+
+                    // current_results holds only what's displayed (for selection/activation)
+                    *current_results.borrow_mut() = results.into_iter().take(initial_count).collect();
+                },
+            );
+
+            *debounce_source.borrow_mut() = Some(source_id);
         });
 
         // Entry activate signal (Enter key in search entry)
@@ -1238,6 +1270,12 @@ impl MainWindow {
     }
 
     fn launch_item(item: &LaunchItem, config: &Config, frecency: &Rc<RefCell<FrecencyStore>>) {
+        // dmenu mode: print selection to stdout instead of executing
+        if matches!(item.provider, ProviderType::Dmenu) {
+            println!("{}", item.name);
+            return;
+        }
+
         // Record this launch for frecency tracking
         if config.providers.frecency {
             frecency.borrow_mut().record_launch(&item.id);
@@ -1248,17 +1286,81 @@ impl MainWindow {
         info!("Launching: {} ({})", item.name, item.command);
 
         #[cfg(feature = "dev-logging")]
-        debug!("[UI] Launch details: terminal={}, provider={:?}", item.terminal, item.provider);
+        debug!("[UI] Launch details: terminal={}, provider={:?}, id={}", item.terminal, item.provider, item.id);
 
-        let cmd = if item.terminal {
-            let terminal = config.general.terminal_command.as_deref().unwrap_or("xterm");
-            format!("{} -e {}", terminal, item.command)
+        // Check if this is a desktop application (has .desktop file as ID)
+        let is_desktop_app = matches!(item.provider, ProviderType::Application)
+            && item.id.ends_with(".desktop");
+
+        // Desktop files should be launched via proper launchers that implement the
+        // freedesktop Desktop Entry spec (D-Bus activation, field codes, env vars, etc.)
+        // We delegate to: uwsm (if configured), gio launch, or gtk-launch as fallback.
+        //
+        // Non-desktop items (commands, plugins) use sh -c for shell execution.
+        let result = if is_desktop_app {
+            Self::launch_desktop_file(&item.id, config)
         } else {
-            item.command.clone()
+            Self::launch_command(&item.command, item.terminal, config)
         };
 
-        // Detect if this is a shell command vs an application launch
-        // Shell commands: playerctl, dbus-send, systemctl, journalctl, or anything with shell operators
+        if let Err(e) = result {
+            let msg = format!("Failed to launch '{}': {}", item.name, e);
+            log::error!("{}", msg);
+            crate::notify::notify("Launch failed", &msg);
+        }
+    }
+
+    /// Launch a .desktop file using gio (GLib's desktop entry launcher).
+    ///
+    /// gio is always available as it's part of glib2, which is a hard dependency
+    /// of GTK4. It handles D-Bus activation, field codes, Terminal flag, etc.
+    /// per the freedesktop Desktop Entry specification.
+    ///
+    /// Optionally wraps with a session manager (uwsm, hyprctl) for proper
+    /// process tracking in Wayland compositors.
+    fn launch_desktop_file(desktop_path: &str, config: &Config) -> std::io::Result<std::process::Child> {
+        use std::path::Path;
+
+        // Check if desktop file exists
+        if !Path::new(desktop_path).exists() {
+            let msg = format!("Desktop file not found: {}", desktop_path);
+            log::error!("{}", msg);
+            crate::notify::notify("Launch failed", &msg);
+            return Err(std::io::Error::new(std::io::ErrorKind::NotFound, msg));
+        }
+
+        match &config.general.launch_wrapper {
+            // With wrapper: wrapper manages the process, gio handles the .desktop file
+            Some(wrapper) if !wrapper.is_empty() => {
+                info!("Launching via {} + gio launch: {}", wrapper, desktop_path);
+                let mut parts: Vec<&str> = wrapper.split_whitespace().collect();
+                let cmd = parts.remove(0);
+                Command::new(cmd)
+                    .args(&parts)
+                    .args(["gio", "launch"])
+                    .arg(desktop_path)
+                    .spawn()
+            }
+            // No wrapper: use gio directly
+            _ => {
+                info!("Launching via gio launch: {}", desktop_path);
+                Command::new("gio")
+                    .args(["launch", desktop_path])
+                    .spawn()
+            }
+        }
+    }
+
+    /// Launch a shell command (for non-desktop items like PATH commands, plugins, etc.)
+    fn launch_command(command: &str, terminal: bool, config: &Config) -> std::io::Result<std::process::Child> {
+        let cmd = if terminal {
+            let terminal_cmd = config.general.terminal_command.as_deref().unwrap_or("xterm");
+            format!("{} -e {}", terminal_cmd, command)
+        } else {
+            command.to_string()
+        };
+
+        // Detect shell commands that shouldn't use a wrapper
         let is_shell_command = cmd.starts_with("playerctl ")
             || cmd.starts_with("dbus-send ")
             || cmd.starts_with("systemctl ")
@@ -1269,28 +1371,19 @@ impl MainWindow {
             || cmd.contains(" > ")
             || cmd.contains(" < ");
 
-        // Use launch wrapper if configured (uwsm, hyprctl, etc.)
-        // But skip wrapper for shell commands - they need sh -c
-        let result = match &config.general.launch_wrapper {
+        match &config.general.launch_wrapper {
             Some(wrapper) if !wrapper.is_empty() && !is_shell_command => {
-                info!("Using launch wrapper: {}", wrapper);
-                // Split wrapper into command and args (e.g., "uwsm app --" -> ["uwsm", "app", "--"])
-                let mut wrapper_parts: Vec<&str> = wrapper.split_whitespace().collect();
-                if wrapper_parts.is_empty() {
-                    Command::new("sh").arg("-c").arg(&cmd).spawn()
-                } else {
-                    let wrapper_cmd = wrapper_parts.remove(0);
-                    Command::new(wrapper_cmd)
-                        .args(&wrapper_parts)
-                        .arg(&cmd)
-                        .spawn()
-                }
+                info!("Launching command via {}: {}", wrapper, cmd);
+                let mut parts: Vec<&str> = wrapper.split_whitespace().collect();
+                let wrapper_cmd = parts.remove(0);
+                Command::new(wrapper_cmd)
+                    .args(&parts)
+                    .args(["sh", "-c", &cmd])
+                    .spawn()
+            }
+            _ => {
+                Command::new("sh").arg("-c").arg(&cmd).spawn()
             }
-            _ => Command::new("sh").arg("-c").arg(&cmd).spawn(),
-        };
-
-        if let Err(e) = result {
-            log::error!("Failed to launch '{}': {}", item.name, e);
         }
     }
 }