feat: Simplify system tray and fix startup settings UI

- Simplify tray menu to only: Active Space, Open, Quit
- Remove unsupported features: export config, refresh servers, create space
- Fix Switch component to use correct CSS variables (--primary)
- Add comprehensive test coverage for startup settings
- Update tray documentation

This addresses user feedback about cluttered tray menu and non-working UI elements.

Author: Mohammod Al Amin Ashik

apps/desktop/src-tauri/src/services/file_watcher.rs

@@ -223,7 +223,6 @@ impl SpaceFileWatcherBuilder {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
 
     #[test]
     fn test_builder_default_space_id() {

apps/desktop/src-tauri/src/tray.rs

@@ -2,9 +2,8 @@
 //!
 //! Provides a system tray icon with quick access to:
 //! - Space switching
-//! - Config export
-//! - Server status
 //! - Open main window
+//! - Quit application
 
 use tauri::{
     menu::{Menu, MenuBuilder, MenuItemBuilder, PredefinedMenuItem, SubmenuBuilder},
@@ -65,36 +64,18 @@ pub fn setup_tray<R: Runtime>(app: &AppHandle<R>) -> tauri::Result<()> {
 
 /// Build the tray menu
 fn build_tray_menu<R: Runtime>(app: &AppHandle<R>) -> tauri::Result<Menu<R>> {
-    // Space submenu
+    // Space submenu (will be populated dynamically)
     let space_submenu = SubmenuBuilder::new(app, "Active Space")
         .text("space_default", "🌐 Default")
-        .separator()
-        .text("create_space", "➕ Create Space...")
-        .build()?;
-
-    // Export submenu
-    let export_submenu = SubmenuBuilder::new(app, "📋 Export Config")
-        .text("export_cursor", "Cursor")
-        .text("export_vscode", "VS Code")
-        .text("export_claude", "Claude Desktop")
         .build()?;
 
-    // Build main menu
+    // Build simplified main menu
     let menu = MenuBuilder::new(app)
-        .item(
-            &MenuItemBuilder::with_id("status", "McpMux 🟢")
-                .enabled(false)
-                .build(app)?,
-        )
-        .separator()
         .item(&space_submenu)
         .separator()
-        .text("refresh", "🔄 Refresh All Servers")
-        .item(&export_submenu)
+        .text("open", "Open McpMux")
         .separator()
-        .text("open", "⚙️ Open McpMux")
-        .item(&PredefinedMenuItem::separator(app)?)
-        .text("quit", "❌ Quit")
+        .text("quit", "Quit")
         .build()?;
 
     Ok(menu)
@@ -110,25 +91,6 @@ fn handle_menu_event<R: Runtime>(app: &AppHandle<R>, event_id: &str) {
             let space_id = id.strip_prefix("space_").unwrap_or("default");
             handle_switch_space(app, space_id);
         }
-        "create_space" => {
-            open_main_window_at(app, "/spaces/new");
-        }
-
-        // Export actions
-        "export_cursor" => {
-            handle_export(app, "cursor");
-        }
-        "export_vscode" => {
-            handle_export(app, "vscode");
-        }
-        "export_claude" => {
-            handle_export(app, "claude");
-        }
-
-        // General actions
-        "refresh" => {
-            handle_refresh_servers(app);
-        }
         "open" => {
             if let Some(window) = app.get_webview_window("main") {
                 let _ = window.show();
@@ -149,34 +111,12 @@ fn handle_menu_event<R: Runtime>(app: &AppHandle<R>, event_id: &str) {
 fn handle_switch_space<R: Runtime>(app: &AppHandle<R>, space_id: &str) {
     info!("Switching to space: {}", space_id);
 
-    // Emit event to frontend
-    let _ = app.emit("tray:switch-space", space_id);
-}
-
-/// Open main window at a specific route
-fn open_main_window_at<R: Runtime>(app: &AppHandle<R>, route: &str) {
+    // Show window and emit event to frontend
     if let Some(window) = app.get_webview_window("main") {
         let _ = window.show();
         let _ = window.set_focus();
-        // Emit navigation event
-        let _ = app.emit("tray:navigate", route);
     }
-}
-
-/// Handle export request
-fn handle_export<R: Runtime>(app: &AppHandle<R>, client_type: &str) {
-    info!("Export config requested for: {}", client_type);
-
-    // Emit event to frontend to handle export
-    let _ = app.emit("tray:export-config", client_type);
-}
-
-/// Handle refresh all servers
-fn handle_refresh_servers<R: Runtime>(app: &AppHandle<R>) {
-    info!("Refresh all servers requested");
-
-    // Emit event to frontend
-    let _ = app.emit("tray:refresh-servers", ());
+    let _ = app.emit("tray:switch-space", space_id);
 }
 
 /// Update tray menu with current spaces
@@ -205,34 +145,15 @@ pub async fn update_tray_spaces<R: Runtime>(
             space_menu = space_menu.text(id, label);
         }
 
-        space_menu = space_menu
-            .separator()
-            .text("create_space", "➕ Create Space...");
-
         let space_submenu = space_menu.build()?;
 
-        // Rebuild full menu
-        let export_submenu = SubmenuBuilder::new(app, "📋 Export Config")
-            .text("export_cursor", "Cursor")
-            .text("export_vscode", "VS Code")
-            .text("export_claude", "Claude Desktop")
-            .build()?;
-
+        // Rebuild simplified menu
         let menu = MenuBuilder::new(app)
-            .item(
-                &MenuItemBuilder::with_id("status", "McpMux 🟢")
-                    .enabled(false)
-                    .build(app)?,
-            )
-            .separator()
             .item(&space_submenu)
             .separator()
-            .text("refresh", "🔄 Refresh All Servers")
-            .item(&export_submenu)
+            .text("open", "Open McpMux")
             .separator()
-            .text("open", "⚙️ Open McpMux")
-            .item(&PredefinedMenuItem::separator(app)?)
-            .text("quit", "❌ Quit")
+            .text("quit", "Quit")
             .build()?;
 
         tray.set_menu(Some(menu))?;

packages/ui/src/components/common/Switch.tsx

@@ -29,8 +29,8 @@ export function Switch({
       onClick={() => !disabled && onCheckedChange(!checked)}
       data-testid={testId}
       className={cn(
-        'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
-        checked ? 'bg-primary-500' : 'bg-surface-secondary',
+        'relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-[rgb(var(--primary))] focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',
+        checked ? 'bg-[rgb(var(--primary))]' : 'bg-surface-secondary',
         className
       )}
     >

tests/e2e/specs/settings.spec.ts

@@ -208,4 +208,89 @@ test.describe('Settings', () => {
       await expect(mainContent).toBeVisible();
     });
   });
+
+  test.describe('Startup & System Tray Settings', () => {
+    test('should display startup settings section', async ({ page }) => {
+      const dashboard = new DashboardPage(page);
+      await dashboard.navigate();
+      
+      await page.locator('nav button:has-text("Settings")').click();
+
+      // Check for startup settings card
+      await expect(page.getByText('Startup & System Tray')).toBeVisible();
+      await expect(page.getByText(/Control how McpMux starts/)).toBeVisible();
+    });
+
+    test('should display all three startup toggles', async ({ page }) => {
+      const dashboard = new DashboardPage(page);
+      await dashboard.navigate();
+      
+      await page.locator('nav button:has-text("Settings")').click();
+
+      // Check all three settings exist
+      await expect(page.getByText('Launch at Startup')).toBeVisible();
+      await expect(page.getByText('Start Minimized')).toBeVisible();
+      await expect(page.getByText('Close to Tray')).toBeVisible();
+    });
+
+    test('should have functional toggle switches', async ({ page }) => {
+      const dashboard = new DashboardPage(page);
+      await dashboard.navigate();
+      
+      await page.locator('nav button:has-text("Settings")').click();
+
+      // Check switches are interactive
+      const autoLaunchSwitch = page.getByTestId('auto-launch-switch');
+      const startMinimizedSwitch = page.getByTestId('start-minimized-switch');
+      const closeToTraySwitch = page.getByTestId('close-to-tray-switch');
+
+      await expect(autoLaunchSwitch).toBeVisible();
+      await expect(startMinimizedSwitch).toBeVisible();
+      await expect(closeToTraySwitch).toBeVisible();
+
+      // All switches should be enabled (except start-minimized might be disabled if auto-launch is off)
+      await expect(autoLaunchSwitch).toBeEnabled();
+      await expect(closeToTraySwitch).toBeEnabled();
+    });
+
+    test('should toggle close to tray setting', async ({ page }) => {
+      const dashboard = new DashboardPage(page);
+      await dashboard.navigate();
+      
+      await page.locator('nav button:has-text("Settings")').click();
+
+      const closeToTraySwitch = page.getByTestId('close-to-tray-switch');
+      
+      // Get initial state
+      const initialState = await closeToTraySwitch.getAttribute('aria-checked');
+      
+      // Toggle the switch
+      await closeToTraySwitch.click();
+      await page.waitForTimeout(500); // Wait for state to update
+      
+      // Verify state changed
+      const newState = await closeToTraySwitch.getAttribute('aria-checked');
+      expect(newState).not.toBe(initialState);
+    });
+
+    test('start minimized should be disabled when auto-launch is off', async ({ page }) => {
+      const dashboard = new DashboardPage(page);
+      await dashboard.navigate();
+      
+      await page.locator('nav button:has-text("Settings")').click();
+
+      const autoLaunchSwitch = page.getByTestId('auto-launch-switch');
+      const startMinimizedSwitch = page.getByTestId('start-minimized-switch');
+      
+      // Ensure auto-launch is off
+      const autoLaunchState = await autoLaunchSwitch.getAttribute('aria-checked');
+      if (autoLaunchState === 'true') {
+        await autoLaunchSwitch.click();
+        await page.waitForTimeout(500);
+      }
+      
+      // Start minimized should be disabled
+      await expect(startMinimizedSwitch).toBeDisabled();
+    });
+  });
 });