fix(packaging): preserve desktop integration and Ghostty themes

OneNoted · OneNoted · commit 5d877b9b9d87 · 2026-03-27T18:35:43.000+01:00
diff --git a/assets/taskers.desktop.in b/assets/taskers.desktop.in
@@ -8,5 +8,5 @@ Icon=taskers
 Terminal=false
 Categories=Development;
 StartupNotify=true
-StartupWMClass=taskers
+StartupWMClass=dev.taskers.app
 X-GNOME-UsesNotifications=true
diff --git a/crates/taskers-app/src/main.rs b/crates/taskers-app/src/main.rs
@@ -188,6 +188,11 @@ fn default_true() -> bool {
     true
 }
 
+fn safe_eprintln(message: impl std::fmt::Display) {
+    let mut stderr = io::stderr().lock();
+    let _ = writeln!(stderr, "{message}");
+}
+
 impl TaskersConfig {
     fn load() -> Result<Self> {
         let path = taskers_paths::default_config_path();
@@ -245,7 +250,7 @@ fn main() -> glib::ExitCode {
     let bootstrap = match bootstrap_runtime(None) {
         Ok(bootstrap) => bootstrap,
         Err(error) => {
-            eprintln!("failed to bootstrap Taskers host: {error:?}");
+            safe_eprintln(format!("failed to bootstrap Taskers host: {error:?}"));
             return glib::ExitCode::FAILURE;
         }
     };
@@ -282,7 +287,7 @@ fn build_ui(
     cli: Cli,
 ) {
     if let Err(error) = build_ui_result(app, bootstrap, hold_guard, cli) {
-        eprintln!("failed to launch Taskers host: {error:?}");
+        safe_eprintln(format!("failed to launch Taskers host: {error:?}"));
     }
 }
 
@@ -331,8 +336,10 @@ fn build_ui_result(
         .default_width(1440)
         .default_height(900)
         .build();
+    let app_for_close = app.clone();
     window.connect_close_request(move |_| {
         drop(hold_guard.borrow_mut().take());
+        app_for_close.quit();
         glib::Propagation::Proceed
     });
     let host_widget = host.borrow().widget();
@@ -362,7 +369,7 @@ fn build_ui_result(
             diagnostics.as_ref(),
             DiagnosticRecord::new(DiagnosticCategory::Startup, None, note.clone()),
         );
-        eprintln!("{note}");
+        safe_eprintln(note);
     }
     log_diagnostic(
         diagnostics.as_ref(),
@@ -372,7 +379,7 @@ fn build_ui_result(
             control_server_note.clone(),
         ),
     );
-    eprintln!("{control_server_note}");
+    safe_eprintln(control_server_note);
     log_diagnostic(
         diagnostics.as_ref(),
         DiagnosticRecord::new(
@@ -381,7 +388,7 @@ fn build_ui_result(
             format!("shared shell listening on {shell_url}"),
         ),
     );
-    eprintln!("shared shell listening on {shell_url}");
+    safe_eprintln(format!("shared shell listening on {shell_url}"));
 
     let smoke_script = cli.smoke_script;
     let quit_after_ms = cli.quit_after_ms.unwrap_or(8_000);
@@ -534,7 +541,9 @@ fn process_pending_notifications(
                 .with_pane(notification.pane_id)
                 .with_surface(notification.surface_id),
             );
-            eprintln!("taskers notification delivery update failed: {error:?}");
+            safe_eprintln(format!(
+                "taskers notification delivery update failed: {error:?}"
+            ));
         }
     }
 
@@ -652,7 +661,7 @@ fn persist_settings_if_needed(
                 format!("failed to persist config: {error:?}"),
             ),
         );
-        eprintln!("taskers config save failed: {error:?}");
+        safe_eprintln(format!("taskers config save failed: {error:?}"));
         return;
     }
 
@@ -1030,10 +1039,10 @@ fn run_internal_ghostty_probe(mode: GhosttyProbeMode) -> glib::ExitCode {
             host
         }
         Err(error) => {
-            eprintln!(
+            safe_eprintln(format!(
                 "ghostty {} self-probe failed during host init: {error}",
                 mode.as_arg()
-            );
+            ));
             return glib::ExitCode::FAILURE;
         }
     };
@@ -1053,10 +1062,10 @@ fn run_internal_surface_probe(
 ) -> glib::ExitCode {
     if !gtk::is_initialized_main_thread() {
         if let Err(error) = gtk::init() {
-            eprintln!(
+            safe_eprintln(format!(
                 "ghostty {} self-probe failed during gtk init: {error}",
                 mode.as_arg()
-            );
+            ));
             return glib::ExitCode::FAILURE;
         }
     }
@@ -1084,10 +1093,10 @@ fn run_internal_surface_probe(
     ) {
         Ok(app_state) => app_state,
         Err(error) => {
-            eprintln!(
+            safe_eprintln(format!(
                 "ghostty {} self-probe failed during app state bootstrap: {error}",
                 mode.as_arg()
-            );
+            ));
             return glib::ExitCode::FAILURE;
         }
     };
@@ -1121,10 +1130,10 @@ fn run_internal_surface_probe(
 
     spin_probe_main_context(Duration::from_millis(80));
     if let Err(error) = taskers_host.sync_snapshot(&core.snapshot()) {
-        eprintln!(
+        safe_eprintln(format!(
             "ghostty {} self-probe failed during snapshot sync: {error}",
             mode.as_arg()
-        );
+        ));
         return glib::ExitCode::FAILURE;
     }
 
@@ -1271,7 +1280,7 @@ fn sync_window(
                     format!("host command failed: {error}"),
                 ),
             );
-            eprintln!("taskers host command failed: {error}");
+            safe_eprintln(format!("taskers host command failed: {error}"));
         }
     }
 
@@ -1320,7 +1329,9 @@ fn sync_window(
                     format!("snapshot sync failed: {error}"),
                 ),
             );
-            eprintln!("taskers host sync failed for revision {revision}: {error}");
+            safe_eprintln(format!(
+                "taskers host sync failed for revision {revision}: {error}"
+            ));
         }
         last_revision.set(revision);
     }
@@ -1574,14 +1585,14 @@ fn spawn_control_server(
                     };
                     if let Err(error) = serve_with_handler(listener, handler, pending::<()>()).await
                     {
-                        eprintln!("control server error: {error}");
+                        safe_eprintln(format!("control server error: {error}"));
                     }
                 }
                 Err(error) => {
-                    eprintln!(
+                    safe_eprintln(format!(
                         "control server unavailable at {}: {error}",
                         socket_path.display()
-                    );
+                    ));
                 }
             }
         });
@@ -1649,7 +1660,7 @@ fn launch_liveview_server(core: SharedCore) -> Result<String> {
                 );
 
             if let Err(error) = axum::serve(listener, router.into_make_service()).await {
-                eprintln!("liveview server failed: {error}");
+                safe_eprintln(format!("liveview server failed: {error}"));
             }
         });
     });
@@ -1873,7 +1884,7 @@ impl DiagnosticsWriter {
                 target: DiagnosticsTarget::File(Arc::new(Mutex::new(file))),
             }),
             Err(error) => {
-                eprintln!("taskers diagnostics log path failed: {error}");
+                safe_eprintln(format!("taskers diagnostics log path failed: {error}"));
                 None
             }
         }
diff --git a/crates/taskers-cli/assets/taskers.desktop.in b/crates/taskers-cli/assets/taskers.desktop.in
@@ -9,5 +9,5 @@ Icon=taskers
 Terminal=false
 Categories=Development;
 StartupNotify=true
-StartupWMClass=taskers
+StartupWMClass=dev.taskers.app
 X-GNOME-UsesNotifications=true
diff --git a/crates/taskers-launcher/assets/taskers.desktop.in b/crates/taskers-launcher/assets/taskers.desktop.in
@@ -9,5 +9,5 @@ Icon=taskers
 Terminal=false
 Categories=Development;
 StartupNotify=true
-StartupWMClass=taskers
+StartupWMClass=dev.taskers.app
 X-GNOME-UsesNotifications=true
diff --git a/crates/taskers-launcher/src/lib.rs b/crates/taskers-launcher/src/lib.rs
@@ -233,16 +233,19 @@ impl ManagedInstallation {
         fs::create_dir_all(&xdg_bin_home)
             .with_context(|| format!("failed to create {}", xdg_bin_home.display()))?;
 
+        let desktop_launcher = xdg_bin_home.join("taskers-desktop-launch");
+        write_executable(&desktop_launcher, &desktop_launch_wrapper_contents(&launcher))?;
+
+        let desktop_entry_path = applications_dir.join("dev.taskers.app.desktop");
         let desktop_entry = include_str!(concat!(
             env!("CARGO_MANIFEST_DIR"),
             "/assets/taskers.desktop.in"
         ))
-        .replace("{{EXEC}}", &desktop_exec(&launcher));
-        fs::write(
-            applications_dir.join("dev.taskers.app.desktop"),
-            desktop_entry,
-        )
-        .with_context(|| format!("failed to write {}", applications_dir.display()))?;
+        .replace("{{EXEC}}", &desktop_exec(&desktop_launcher));
+        if should_update_desktop_entry(&desktop_entry_path, &desktop_launcher)? {
+            fs::write(&desktop_entry_path, desktop_entry)
+                .with_context(|| format!("failed to write {}", applications_dir.display()))?;
+        }
         fs::write(
             icons_dir.join("taskers.svg"),
             include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/assets/taskers.svg")),
@@ -298,6 +301,7 @@ fn validate_bundle_layout(bundle_root: &Path) -> bool {
             .join("lib")
             .join("libtaskers_ghostty_bridge.so")
             .is_file()
+        && bundle_root.join("ghostty").join("themes").is_dir()
         && bundle_root.join("terminfo").is_dir()
 }
 
@@ -449,6 +453,32 @@ fn desktop_exec(path: &Path) -> String {
     raw.replace('\\', "\\\\").replace(' ', "\\ ")
 }
 
+fn shell_single_quote(path: &Path) -> String {
+    format!("'{}'", path.display().to_string().replace('\'', "'\"'\"'"))
+}
+
+fn desktop_launch_wrapper_contents(target: &Path) -> String {
+    format!(
+        "#!/bin/sh\nset -eu\nlog_dir=\"${{XDG_CACHE_HOME:-$HOME/.cache}}/taskers\"\nmkdir -p \"$log_dir\"\nexec /usr/bin/setsid -f {target} --diagnostic-log \"$log_dir/desktop-launch-diagnostics.log\" >>\"$log_dir/desktop-launch.log\" 2>&1\n",
+        target = shell_single_quote(target),
+    )
+}
+
+fn should_update_desktop_entry(path: &Path, desktop_launcher: &Path) -> Result<bool> {
+    let Ok(existing) = fs::read_to_string(path) else {
+        return Ok(true);
+    };
+    let Some(existing_exec) = existing
+        .lines()
+        .find_map(|line| line.strip_prefix("Exec="))
+        .map(str::trim)
+    else {
+        return Ok(true);
+    };
+
+    Ok(existing_exec == desktop_exec(desktop_launcher))
+}
+
 fn write_executable(path: &Path, contents: &str) -> Result<()> {
     if let Some(parent) = path.parent() {
         fs::create_dir_all(parent)
@@ -558,12 +588,13 @@ where
 mod tests {
     use super::{
         ArtifactKind, ManagedInstallation, ReleaseArtifact, ReleaseManifest, bundle_root,
-        current_target_triple, default_manifest_url, launcher_path_looks_installed,
-        path_taskers_executable, sha256_path,
+        current_target_triple, default_manifest_url, desktop_exec,
+        desktop_launch_wrapper_contents, launcher_path_looks_installed, path_taskers_executable,
+        sha256_path, should_update_desktop_entry,
     };
     #[cfg(unix)]
     use std::os::unix::fs::symlink;
-    use std::{collections::BTreeMap, ffi::OsString, fs, path::PathBuf};
+    use std::{collections::BTreeMap, ffi::OsString, fs, path::{Path, PathBuf}};
     use tar::Builder;
     use tempfile::tempdir;
     use xz2::write::XzEncoder;
@@ -594,6 +625,7 @@ mod tests {
         let bundle_dir = temp.path().join("bundle");
         fs::create_dir_all(bundle_dir.join("bin")).expect("bin dir");
         fs::create_dir_all(bundle_dir.join("ghostty").join("lib")).expect("ghostty dir");
+        fs::create_dir_all(bundle_dir.join("ghostty").join("themes")).expect("themes dir");
         fs::create_dir_all(bundle_dir.join("terminfo").join("g")).expect("terminfo dir");
         fs::write(
             bundle_dir.join("bin").join("taskers"),
@@ -618,6 +650,14 @@ mod tests {
             "bridge",
         )
         .expect("bridge");
+        fs::write(
+            bundle_dir
+                .join("ghostty")
+                .join("themes")
+                .join("Catppuccin Mocha"),
+            "palette = 0=#1e1e2e\n",
+        )
+        .expect("theme");
         fs::write(
             bundle_dir.join("terminfo").join("g").join("ghostty"),
             "ghostty",
@@ -695,4 +735,43 @@ mod tests {
         let repo_binary = PathBuf::from("/home/notes/Projects/taskers/target/debug/taskers");
         assert!(!launcher_path_looks_installed(&repo_binary));
     }
+
+    #[test]
+    fn preserves_non_launcher_desktop_entry() {
+        let temp = tempdir().expect("tempdir");
+        let desktop_entry = temp.path().join("dev.taskers.app.desktop");
+        fs::write(
+            &desktop_entry,
+            "[Desktop Entry]\nExec=/home/notes/.cargo/bin/taskers-gtk\n",
+        )
+        .expect("desktop entry");
+
+        let launcher = PathBuf::from("/home/notes/.local/bin/taskers");
+        assert!(
+            !should_update_desktop_entry(&desktop_entry, &launcher).expect("decision"),
+        );
+    }
+
+    #[test]
+    fn updates_matching_launcher_desktop_entry() {
+        let temp = tempdir().expect("tempdir");
+        let desktop_entry = temp.path().join("dev.taskers.app.desktop");
+        let launcher = PathBuf::from("/home/notes/.local/bin/taskers-desktop-launch");
+        fs::write(
+            &desktop_entry,
+            format!("[Desktop Entry]\nExec={}\n", desktop_exec(&launcher)),
+        )
+        .expect("desktop entry");
+
+        assert!(should_update_desktop_entry(&desktop_entry, &launcher).expect("decision"));
+    }
+
+    #[test]
+    fn desktop_launch_wrapper_targets_binary_with_log_redirection() {
+        let contents = desktop_launch_wrapper_contents(Path::new("/home/notes/.local/bin/taskers"));
+        assert!(contents.contains("desktop-launch-diagnostics.log"));
+        assert!(contents.contains("desktop-launch.log"));
+        assert!(contents.contains("/usr/bin/setsid -f"));
+        assert!(contents.contains("'/home/notes/.local/bin/taskers'"));
+    }
 }
diff --git a/docs/usage.md b/docs/usage.md
@@ -37,10 +37,9 @@ Taskers still pins a small set of embedded-pane invariants:
 
 - the launch command stays Taskers-owned
 - Ghostty shell integration stays disabled because Taskers provides its own shell wrapper
-- Ghostty window padding stays zero and Taskers adds its own host-side terminal gutter
 - Ghostty Linux cgroup settings stay disabled for embedded panes
 
-That means Ghostty settings such as fonts, theme, colors, cursor behavior, and scrollback should carry over, while window-style and shell-launch behavior remains controlled by Taskers.
+That means Ghostty settings such as fonts, theme, colors, cursor behavior, scrollback, and window padding should carry over, while shell-launch behavior remains controlled by Taskers.
 
 ## A Typical Session
 
diff --git a/scripts/build_ghostty_runtime_bundle.sh b/scripts/build_ghostty_runtime_bundle.sh
@@ -29,9 +29,10 @@ trap cleanup EXIT
     --prefix "$prefix_dir"
 )
 
-mkdir -p "$bundle_dir/ghostty/lib" "$bundle_dir/ghostty/shell-integration" "$bundle_dir/terminfo"
+mkdir -p "$bundle_dir/ghostty/lib" "$bundle_dir/ghostty/shell-integration" "$bundle_dir/ghostty/themes" "$bundle_dir/terminfo"
 cp "$prefix_dir/lib/libtaskers_ghostty_bridge.so" "$bundle_dir/ghostty/lib/"
 cp -R "$prefix_dir/share/ghostty/shell-integration/." "$bundle_dir/ghostty/shell-integration/"
+cp -R "$prefix_dir/share/ghostty/themes/." "$bundle_dir/ghostty/themes/"
 cp -R "$prefix_dir/share/terminfo/." "$bundle_dir/terminfo/"
 printf '%s\n' "$version" > "$bundle_dir/ghostty/.taskers-runtime-version"
 
diff --git a/scripts/build_linux_bundle.sh b/scripts/build_linux_bundle.sh
diff --git a/scripts/install-dev-desktop-entry.sh b/scripts/install-dev-desktop-entry.sh
diff --git a/vendor/ghostty/src/taskers_bridge.zig b/vendor/ghostty/src/taskers_bridge.zig
