From 0d8dec9a1dea10db5817404611a16a4858eac6de Mon Sep 17 00:00:00 2001
From: Nishanth <nishanth@tangotech.co.in>
Date: Thu, 20 Aug 2026 13:03:52 +0530
Subject: [PATCH] desktop: make the app buildable on Linux

Everything needed for a Linux build; no CI changes (builds are taken manually).

- keyring: split the backend per target. macOS keeps apple-native; Linux uses
  sync-secret-service (GNOME Keyring / KWallet). db/device_key.rs already uses
  only the portable Entry API, so no code change was needed. Deliberately NOT
  linux-native: that stores in kernel keyutils, which is session-scoped, and a
  lost SQLCipher key means a lost local database.
- bundle: add deb + appimage targets and the PNG icons Linux needs (the icons
  were already in the repo, just unreferenced).
- top-bar: reserve the 92px traffic-light inset on macOS only. titleBarStyle and
  trafficLightPosition are macOS-only options, so on Linux the same inset was
  just an empty gap next to a native GTK title bar.
- RELEASING.md: Linux build/verify steps, incl. the libdbus-1-dev build dep and
  the latest.json clobbering hazard.

Verified from macOS: cargo check passes; cargo metadata --filter-platform shows
keyring+dbus-secret-service resolving for linux with security-framework absent,
and no dbus crates leaking into the darwin graph. tsc clean.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../src/components/shell/top-bar.tsx          | 15 +++--
 apps/desktop/RELEASING.md                     | 61 +++++++++++++++++++
 apps/desktop/src-tauri/Cargo.lock             | 25 ++++++++
 apps/desktop/src-tauri/Cargo.toml             | 15 ++++-
 apps/desktop/src-tauri/tauri.conf.json        | 14 ++++-
 5 files changed, 121 insertions(+), 9 deletions(-)

diff --git a/apps/desktop-ui/src/components/shell/top-bar.tsx b/apps/desktop-ui/src/components/shell/top-bar.tsx
index 9ff57452..c95af373 100644
--- a/apps/desktop-ui/src/components/shell/top-bar.tsx
+++ b/apps/desktop-ui/src/components/shell/top-bar.tsx
@@ -31,11 +31,14 @@ export function TopBar() {
   const user = useAppUser()
 
   // macOS traffic lights are inset into this bar (titleBarStyle: Overlay), so
-  // pad the left only inside the Tauri window. Mounted-guarded to avoid an SSR
-  // hydration mismatch (isDesktop() is false on the server).
-  const [isTauri, setIsTauri] = useState(false)
+  // reserve room for them on the left — but ONLY on macOS. titleBarStyle and
+  // trafficLightPosition are macOS-only options; Linux and Windows keep their
+  // native title bar, so the same inset there is just an empty 92px gap.
+  // Mounted-guarded to avoid an SSR hydration mismatch (isDesktop() is false on
+  // the server).
+  const [isMacDesktop, setIsMacDesktop] = useState(false)
   useEffect(() => {
-    setIsTauri(isDesktop())
+    setIsMacDesktop(isDesktop() && /Mac/i.test(navigator.userAgent))
   }, [])
 
   // macOS hides the traffic lights in fullscreen, so the left inset that
@@ -72,9 +75,9 @@ export function TopBar() {
       data-tauri-drag-region
       className={cn(
         'flex h-14 w-full shrink-0 items-center gap-3 border-b border-border bg-[hsl(var(--surface-2))]',
-        !isTauri ? 'px-4' : 'pr-6',
+        !isMacDesktop ? 'px-4' : 'pr-6',
       )}
-      style={isTauri ? { paddingLeft: isFullscreen ? 16 : 92 } : undefined}
+      style={isMacDesktop ? { paddingLeft: isFullscreen ? 16 : 92 } : undefined}
     >
       {/* Brand → dashboard. Text wordmark in Courier Prime, no logo mark. */}
       <button
diff --git a/apps/desktop/RELEASING.md b/apps/desktop/RELEASING.md
index 2b364ed5..adc943ac 100644
--- a/apps/desktop/RELEASING.md
+++ b/apps/desktop/RELEASING.md
@@ -157,3 +157,64 @@ Actions minutes, so promote deliberately.
   would reject every future update and need a manual reinstall.
 - **Always bump the version** before releasing.
 - **Keep the updater key backed up** — it's critical infrastructure.
+
+---
+
+## Building the Linux app
+
+Linux **cannot be cross-compiled from macOS** — the build links against
+webkit2gtk/GTK system libraries, so it has to run on Linux (a machine, a VM, WSL2,
+or a container). Unlike macOS there is **no signing or notarization**: no Apple
+account, no certificate, no notarytool. You just build and ship the artifacts.
+
+### Build dependencies (Debian/Ubuntu)
+
+```bash
+sudo apt update && sudo apt install -y \
+  libwebkit2gtk-4.1-dev build-essential curl wget file \
+  libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev patchelf \
+  libdbus-1-dev
+```
+
+`libdbus-1-dev` is required by the `dbus-secret-service` crate, which backs the
+Linux keyring (see the platform-split `keyring` dependency in `Cargo.toml`).
+
+### Build
+
+```bash
+pnpm install --frozen-lockfile
+cd apps/desktop
+
+# updater artifacts are signed, so the key must be present
+export TAURI_SIGNING_PRIVATE_KEY="$(cat ~/.tauri/mydevtools-updater.key)"
+export TAURI_SIGNING_PRIVATE_KEY_PASSWORD="$(cat ~/.tauri/mydevtools-updater.password)"
+
+pnpm tauri build --bundles deb,appimage
+# → src-tauri/target/release/bundle/{deb,appimage}/
+```
+
+### Verify before shipping
+
+The keyring is the one thing that can compile fine and still fail at runtime: the
+app fetches the SQLCipher key from the Secret Service at startup, and a headless
+shell has no keyring daemon.
+
+```bash
+sudo apt install -y gnome-keyring dbus-x11
+dbus-run-session -- ./src-tauri/target/release/mydevtools-desktop
+```
+
+Then: create a note → quit → **reboot** → reopen. If the note is still there, the
+key persisted correctly.
+
+### Publishing
+
+Only **AppImage** can self-update — Tauri's updater cannot replace a `.deb`/`.rpm`
+(the package manager owns those files), so AppImage is the auto-updating format and
+`.deb` is a manual-install convenience.
+
+> ⚠️ `latest.json` is shared across platforms. The macOS release writes a manifest
+> containing only the `darwin-*` keys, so uploading a Linux manifest with
+> `--clobber` **erases the macOS entries** (and vice versa) and silently breaks
+> auto-update for the other OS. Merge the platform keys into the existing
+> `latest.json` instead of overwriting it.
diff --git a/apps/desktop/src-tauri/Cargo.lock b/apps/desktop/src-tauri/Cargo.lock
index 9d758e9f..bb69cbe1 100644
--- a/apps/desktop/src-tauri/Cargo.lock
+++ b/apps/desktop/src-tauri/Cargo.lock
@@ -925,6 +925,16 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "dbus-secret-service"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "708b509edf7889e53d7efb0ffadd994cc6c2345ccb62f55cfd6b0682165e4fa6"
+dependencies = [
+ "dbus",
+ "zeroize",
+]
+
 [[package]]
 name = "deranged"
 version = "0.5.8"
@@ -2450,6 +2460,7 @@ version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c"
 dependencies = [
+ "dbus-secret-service",
  "log",
  "security-framework 2.11.1",
  "security-framework 3.7.0",
@@ -6893,6 +6904,20 @@ name = "zeroize"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
+]
 
 [[package]]
 name = "zerotrie"
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index 487b5d5d..29c05e80 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -16,7 +16,6 @@ tauri = { version = "2", features = [] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 rusqlite = { version = "0.32", features = ["bundled-sqlcipher-vendored-openssl"] }
-keyring = { version = "3", features = ["apple-native"] }
 uuid = { version = "1", features = ["v4"] }
 chrono = "0.4"
 rand = "0.8"
@@ -41,6 +40,20 @@ redis = { version = "0.29", features = ["tokio-comp", "tokio-native-tls-comp"] }
 futures-util = "0.3"
 dashmap = "6"
 
+# The keyring backend is the one genuinely platform-specific dependency: the
+# macOS Keychain vs. the Linux Secret Service (GNOME Keyring / KWallet).
+# db/device_key.rs uses only the portable `Entry` API, so the code is identical
+# on both — only the backend feature differs.
+#
+# Linux uses sync-secret-service, NOT linux-native: the latter stores in kernel
+# keyutils, which is session-scoped and can be lost on reboot. The SQLCipher key
+# must persist or the user loses access to their local database.
+[target.'cfg(target_os = "macos")'.dependencies]
+keyring = { version = "3", features = ["apple-native"] }
+
+[target.'cfg(target_os = "linux")'.dependencies]
+keyring = { version = "3", features = ["sync-secret-service"] }
+
 [dev-dependencies]
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
 
diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json
index 67ef1358..ebe8717e 100644
--- a/apps/desktop/src-tauri/tauri.conf.json
+++ b/apps/desktop/src-tauri/tauri.conf.json
@@ -36,11 +36,21 @@
   },
   "bundle": {
     "active": true,
-    "targets": ["app", "dmg"],
+    "targets": ["app", "dmg", "deb", "appimage"],
     "createUpdaterArtifacts": true,
-    "icon": ["icons/icon.icns"],
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns"
+    ],
     "macOS": {
       "minimumSystemVersion": "12.0"
+    },
+    "linux": {
+      "deb": {
+        "depends": []
+      }
     }
   }
 }