fix: quit will always trigger graceful-exit (#474)

* fix: quit will always trigger graceful-exit

* fix: hide confirmation dialog when close app by traffic lights

* fix: remove confirm in window-control

* fix: system tray show app

* refactor: after review

* fix: leftover

Author: peppescg

main/src/graceful-exit.ts

@@ -6,8 +6,7 @@ import { createClient } from '../../renderer/src/common/api/generated/client'
 import type { WorkloadsWorkload } from '../../renderer/src/common/api/generated/types.gen'
 import Store from 'electron-store'
 import log from './logger'
-
-const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+import { delay } from './util'
 
 // Create a store instance for tracking shutdown servers
 const shutdownStore = new Store({

main/src/main.ts

@@ -32,7 +32,7 @@ import {
   binPath,
 } from './toolhive-manager'
 import log from './logger'
-import { getAppVersion } from './util'
+import { delay, getAppVersion, pollWindowReady } from './util'
 
 import Store from 'electron-store'
 
@@ -101,10 +101,28 @@ export async function blockQuit(source: string, event?: Electron.Event) {
     event.preventDefault()
   }
 
-  // Only send graceful-exit message if mainWindow is still valid
   try {
-    if (mainWindow && !mainWindow.isDestroyed()) {
+    if (!mainWindow || mainWindow.isDestroyed()) {
+      log.info('MainWindow destroyed, recreating for graceful shutdown...')
+      mainWindow = createWindow()
+    }
+
+    if (mainWindow) {
+      log.info('Showing window for graceful shutdown...')
+
+      if (mainWindow.isMinimized()) {
+        mainWindow.restore()
+      }
+
+      mainWindow.show()
+      mainWindow.focus()
+
+      await pollWindowReady(mainWindow)
+
       mainWindow.webContents.send('graceful-exit')
+
+      // Give renderer time to navigate to shutdown page
+      await delay(500)
     }
   } catch (err) {
     log.error('Failed to send graceful-exit message: ', err)
@@ -194,18 +212,16 @@ function createWindow() {
     ...getPlatformSpecificWindowOptions(),
   })
 
-  // Windows: minimise-to-tray instead of close
-  if (process.platform === 'win32') {
-    mainWindow.on('minimize', () => {
-      if (shouldStartHidden || tray) mainWindow.hide()
-    })
-    mainWindow.on('close', (event) => {
-      if (!isQuitting && tray) {
-        event.preventDefault()
-        mainWindow.hide()
-      }
-    })
-  }
+  // minimise-to-tray instead of close
+  mainWindow.on('minimize', () => {
+    if (shouldStartHidden || tray) mainWindow.hide()
+  })
+  mainWindow.on('close', (event) => {
+    if (!isQuitting && tray) {
+      event.preventDefault()
+      mainWindow.hide()
+    }
+  })
 
   // External links → default browser
   mainWindow.webContents.setWindowOpenHandler(({ url }) => {

main/src/system-tray.ts

@@ -202,17 +202,14 @@ const createMenuTemplate = (currentTray: Tray, toolHiveIsRunning: boolean) => [
 
 const createClickHandler = () => {
   let lastClickTime = 0
-  let lastWindowState = false
 
   const isRapidClick = (now: number) => now - lastClickTime < 300
 
   const toggleWindow = (window: BrowserWindow) => {
-    if (lastWindowState) {
+    if (window.isVisible() && !window.isMinimized()) {
       hideWindow(window)
-      lastWindowState = false
     } else {
       showWindowWithFocus(window)
-      lastWindowState = true
     }
   }
 

main/src/util.ts

@@ -1,5 +1,6 @@
-import { app } from 'electron'
+import { app, BrowserWindow } from 'electron'
 import { execSync } from 'node:child_process'
+import log from './logger'
 
 function getVersionFromGit(): string {
   try {
@@ -24,10 +25,25 @@ function getVersionFromGit(): string {
   }
 }
 
+export async function delay(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
 export function getAppVersion(): string {
   if (process.env.SENTRY_RELEASE) {
     return process.env.SENTRY_RELEASE
   }
 
   return getVersionFromGit()
 }
+
+export async function pollWindowReady(window: BrowserWindow): Promise<void> {
+  if (window?.isVisible() && !window.webContents.isLoading()) {
+    log.info('Window is ready and visible')
+    return
+  }
+
+  log.info('Window not ready yet, waiting...')
+  await delay(100)
+  return pollWindowReady(window)
+}

renderer/src/common/components/layout/top-nav/window-controls.tsx

@@ -1,11 +1,9 @@
 import { Button } from '../../ui/button'
 import { Minus, Square, X } from 'lucide-react'
 import { useState, useEffect } from 'react'
-import { useConfirmQuit } from '@/common/hooks/use-confirm-quit'
 
 export function WindowControls() {
   const [isMaximized, setIsMaximized] = useState(false)
-  const confirmQuit = useConfirmQuit()
 
   useEffect(() => {
     // Check initial maximized state
@@ -23,10 +21,7 @@ export function WindowControls() {
   }
 
   const handleClose = async () => {
-    const confirmed = await confirmQuit()
-    if (confirmed) {
-      await window.electronAPI.windowControls.close()
-    }
+    await window.electronAPI.windowControls.close()
   }
 
   // Only show window controls on Windows and Linux (not macOS)
@@ -52,8 +47,8 @@ export function WindowControls() {
       >
         {isMaximized ? (
           <div className="relative size-4">
-            <div className="absolute inset-0 h-3 w-3 border border-current" />
-            <div className="bg-background absolute top-1 left-1 h-3 w-3 border border-current" />
+            <div className="absolute inset-0 size-3 border border-current" />
+            <div className="bg-background absolute top-1 left-1 size-3 border border-current" />
           </div>
         ) : (
           <Square className="size-4" />