feat: align desktop settings with workspace design (#984)

* feat: align desktop settings with workspace design

* fix: address settings review feedback

Author: Siri-Ray

apps/desktop/main/index.ts

@@ -1,15 +1,18 @@
 import { execFileSync } from "node:child_process";
+import { existsSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import * as Sentry from "@sentry/electron/main";
 import {
   BrowserWindow,
   Menu,
   type MenuItemConstructorOptions,
+  Tray,
   app,
   crashReporter,
   dialog,
   globalShortcut,
+  nativeImage,
   nativeTheme,
   powerMonitor,
   powerSaveBlocker,
@@ -62,8 +65,15 @@ import {
   getDefaultPlistDir,
   getLogDir,
   installLaunchdQuitHandler,
+  runTeardownAndExit,
   teardownLaunchdServices,
 } from "./services";
+import {
+  type DesktopShellPreferences,
+  applyDesktopShellPreferencesOnStartup,
+  getDesktopShellPreferences,
+  setDesktopShellPreferencesRuntimeHandler,
+} from "./services/desktop-shell-preferences";
 import { isLaunchdBootstrapEnabled } from "./services/launchd-bootstrap";
 import { ProxyManager } from "./services/proxy-manager";
 import {
@@ -277,6 +287,10 @@ if (sentryDsn) {
 }
 
 let mainWindow: BrowserWindow | null = null;
+let residentTray: Tray | null = null;
+let launchdQuitOptsForResidentEntry:
+  | Parameters<typeof installLaunchdQuitHandler>[0]
+  | null = null;
 let diagnosticsReporter: DesktopDiagnosticsReporter | null = null;
 
 /** True if this is the x86_64 build running under Rosetta 2 on Apple Silicon. */
@@ -946,18 +960,147 @@ function focusMainWindow(): void {
   mainWindow.focus();
 }
 
+function shouldUseResidentEntry(preferences: DesktopShellPreferences): boolean {
+  return !preferences.showInDock;
+}
+
+function resolveTrayIconPath(): string | null {
+  const candidate = resolve(
+    app.isPackaged ? process.resourcesPath : getDesktopAppRoot(),
+    "build",
+    process.platform === "win32" ? "icon.ico" : "icon.png",
+  );
+
+  return existsSync(candidate) ? candidate : null;
+}
+
+function hideMainWindowToBackground(): void {
+  if (!mainWindow || mainWindow.isDestroyed()) {
+    return;
+  }
+
+  mainWindow.hide();
+}
+
+function showMainWindowFromResidentEntry(): void {
+  const preferences = getDesktopShellPreferences();
+
+  if (process.platform === "darwin" && preferences.showInDock) {
+    void app.dock?.show();
+  }
+
+  if (!mainWindow || mainWindow.isDestroyed()) {
+    createMainWindow();
+    return;
+  }
+
+  if (!mainWindow.isVisible()) {
+    mainWindow.show();
+  }
+
+  focusMainWindow();
+}
+
+function destroyResidentTray(): void {
+  residentTray?.destroy();
+  residentTray = null;
+}
+
+function ensureResidentTray(): void {
+  if (residentTray) {
+    return;
+  }
+
+  const trayIconPath = resolveTrayIconPath();
+  if (!trayIconPath) {
+    return;
+  }
+
+  const trayIcon = nativeImage.createFromPath(trayIconPath);
+  if (trayIcon.isEmpty()) {
+    return;
+  }
+
+  if (process.platform === "darwin") {
+    trayIcon.setTemplateImage(true);
+  }
+
+  residentTray = new Tray(trayIcon);
+  residentTray.setToolTip("nexu");
+  residentTray.setContextMenu(
+    Menu.buildFromTemplate([
+      {
+        label: "Open nexu",
+        click: () => {
+          showMainWindowFromResidentEntry();
+        },
+      },
+      {
+        label: "Quit",
+        click: () => {
+          if (app.isPackaged && launchdQuitOptsForResidentEntry) {
+            void runTeardownAndExit(
+              launchdQuitOptsForResidentEntry,
+              "tray-quit",
+            );
+            return;
+          }
+
+          (app as unknown as Record<string, unknown>).__nexuForceQuit = true;
+          app.quit();
+        },
+      },
+    ]),
+  );
+  residentTray.on("click", () => {
+    showMainWindowFromResidentEntry();
+  });
+}
+
+function applyResidentEntryPreferences(
+  preferences: DesktopShellPreferences,
+): void {
+  if (process.platform === "darwin") {
+    app.setActivationPolicy(preferences.showInDock ? "regular" : "accessory");
+  }
+
+  if (process.platform === "win32" && mainWindow && !mainWindow.isDestroyed()) {
+    mainWindow.setSkipTaskbar(!preferences.showInDock);
+  }
+
+  if (shouldUseResidentEntry(preferences)) {
+    ensureResidentTray();
+  } else {
+    destroyResidentTray();
+  }
+}
+
+function shouldHideOnWindowClose(): boolean {
+  if (!app.isPackaged) {
+    return false;
+  }
+
+  if (process.platform === "darwin") {
+    return true;
+  }
+
+  return shouldUseResidentEntry(getDesktopShellPreferences());
+}
+
 app.on("second-instance", () => {
   if (!mainWindow || mainWindow.isDestroyed()) {
     createMainWindow();
     return;
   }
 
+  showMainWindowFromResidentEntry();
   focusMainWindow();
 });
 
 function createMainWindow(): BrowserWindow {
   logLaunchTimeline("main window creation requested");
   const isMacOS = process.platform === "darwin";
+  const shellPreferences = getDesktopShellPreferences();
   const window = new BrowserWindow({
     width: 1280,
     height: 720,
@@ -986,6 +1129,10 @@ function createMainWindow(): BrowserWindow {
     },
   });
 
+  if (process.platform === "win32") {
+    window.setSkipTaskbar(!shellPreferences.showInDock);
+  }
+
   // Disable sandbox for webviews so preload scripts have access to Node.js APIs
   // (needed for contextBridge/ipcRenderer in ESM-built preloads)
   window.webContents.on(
@@ -1108,6 +1255,17 @@ function createMainWindow(): BrowserWindow {
     }
   });
 
+  window.on("close", (event) => {
+    if ((app as unknown as Record<string, unknown>).__nexuForceQuit) {
+      return;
+    }
+
+    if (!launchdResult && shouldHideOnWindowClose()) {
+      event.preventDefault();
+      hideMainWindowToBackground();
+    }
+  });
+
   // During first install / post-update, show the window IMMEDIATELY with a
   // white background — before loadFile, before React, before anything.
   // This eliminates the 10-20s blank screen while the Electron main process
@@ -1284,6 +1442,10 @@ app.whenReady().then(async () => {
     status: "ok",
     detail: app.getVersion(),
   });
+  setDesktopShellPreferencesRuntimeHandler((preferences) => {
+    applyResidentEntryPreferences(preferences);
+  });
+  applyDesktopShellPreferencesOnStartup();
   registerIpcHandlers(
     orchestrator,
     runtimeConfig,
@@ -1380,6 +1542,7 @@ app.whenReady().then(async () => {
       };
       installLaunchdQuitHandler(quitOpts);
       setQuitHandlerOpts(quitOpts);
+      launchdQuitOptsForResidentEntry = quitOpts;
     }
 
     if (app.isPackaged && runtimeConfig.updates.autoUpdateEnabled) {
@@ -1426,6 +1589,9 @@ app.whenReady().then(async () => {
 
 app.on("window-all-closed", () => {
   if (process.platform !== "darwin") {
+    if (shouldUseResidentEntry(getDesktopShellPreferences())) {
+      return;
+    }
     app.quit();
   }
 });

apps/desktop/main/ipc.ts

@@ -17,6 +17,10 @@ import type { DesktopRuntimeConfig } from "../shared/runtime-config";
 import type { DesktopDiagnosticsReporter } from "./desktop-diagnostics";
 import { exportDiagnostics } from "./diagnostics-export";
 import type { RuntimeOrchestrator } from "./runtime/daemon-supervisor";
+import {
+  getDesktopShellPreferences,
+  updateDesktopShellPreferences,
+} from "./services/desktop-shell-preferences";
 import {
   type QuitHandlerOptions,
   runTeardownAndExit,
@@ -425,6 +429,16 @@ export function registerIpcHandlers(
           );
         }
 
+        case "desktop:get-shell-preferences": {
+          return getDesktopShellPreferences();
+        }
+
+        case "desktop:update-shell-preferences": {
+          const typedPayload =
+            payload as HostInvokePayloadMap["desktop:update-shell-preferences"];
+          return updateDesktopShellPreferences(typedPayload);
+        }
+
         case "desktop:get-rewards-status": {
           return fetchControllerJson<
             HostInvokeResultMap["desktop:get-rewards-status"]