fix: auto-update inconsistency state (#574)

* fix: auto-update inconsistency state

* enable prerelease config

* remove prerelease config

Author: peppescg

main/src/main.ts

@@ -115,6 +115,7 @@ autoUpdater.on('update-downloaded', (_, __, releaseName) => {
 
       if (returnValue.response === 0) {
         log.info('🎯 User clicked: Restart')
+        isUpdateInProgress = true
 
         log.info('🛑 Removing quit listeners to avoid interference')
         app.removeAllListeners('before-quit')
@@ -144,12 +145,14 @@ autoUpdater.on('update-downloaded', (_, __, releaseName) => {
           log.info('🚀 All cleaned up, calling autoUpdater.quitAndInstall()...')
           autoUpdater.quitAndInstall()
         } catch (error) {
+          isUpdateInProgress = false
           log.error('❌ Error during graceful shutdown:', error)
           tray?.destroy()
           app.relaunch()
           app.quit()
         }
       } else {
+        isUpdateInProgress = false
         log.info('⏰ User chose Later - showing toast notification')
         if (mainWindow) {
           mainWindow.webContents.send('update-downloaded')
@@ -169,7 +172,7 @@ autoUpdater.checkForUpdates()
 
 let tray: Tray | null = null
 let isQuitting = false
-
+let isUpdateInProgress = false
 let tearingDown = false
 
 /** Hold the quit, run teardown, then really exit. */
@@ -333,6 +336,7 @@ function createWindow() {
 let mainWindow: BrowserWindow | null = null
 
 app.whenReady().then(async () => {
+  isUpdateInProgress = false
   // Initialize tray first
   try {
     tray = initTray({ toolHiveIsRunning: false }) // Start with false, will update after ToolHive starts
@@ -517,6 +521,7 @@ ipcMain.handle('install-update-and-restart', async () => {
   // This will prevent the graceful shutdown process
   isQuitting = true
   tearingDown = true
+  isUpdateInProgress = true
 
   // Stop ToolHive and servers immediately without graceful shutdown
   try {
@@ -541,6 +546,11 @@ ipcMain.handle('install-update-and-restart', async () => {
   return { success: true }
 })
 
+ipcMain.handle('is-update-in-progress', () => {
+  log.debug(`[is-update-in-progress]: ${isUpdateInProgress}`)
+  return isUpdateInProgress
+})
+
 ipcMain.handle('is-release-build', () => {
   return isOfficialReleaseBuild()
 })

main/src/toolhive-manager.ts

@@ -34,7 +34,11 @@ export function getToolhivePort(): number | undefined {
 }
 
 export function isToolhiveRunning(): boolean {
-  return !!toolhiveProcess && !toolhiveProcess.killed
+  const isRunning = !!toolhiveProcess && !toolhiveProcess.killed
+  log.debug(
+    `[isToolhiveRunning] Process exists: ${!!toolhiveProcess}, Killed: ${toolhiveProcess?.killed}, Port: ${toolhivePort}, Result: ${isRunning}`
+  )
+  return isRunning
 }
 
 function findFreePort(): Promise<number> {
@@ -54,6 +58,10 @@ function findFreePort(): Promise<number> {
 }
 
 export async function startToolhive(tray?: Tray): Promise<void> {
+  log.info(
+    `[startToolhive] Starting - Current state: isRunning=${isToolhiveRunning()}, isRestarting=${isRestarting}`
+  )
+
   if (!existsSync(binPath)) {
     log.error(`ToolHive binary not found at: ${binPath}`)
     return
@@ -71,6 +79,8 @@ export async function startToolhive(tray?: Tray): Promise<void> {
     }
   )
 
+  log.info(`[startToolhive] Process spawned with PID: ${toolhiveProcess.pid}`)
+
   if (tray) {
     updateTrayStatus(tray, !!toolhiveProcess)
   }
@@ -125,10 +135,16 @@ export async function restartToolhive(tray?: Tray): Promise<void> {
 }
 
 export function stopToolhive(): void {
+  log.info(
+    `[stopToolhive] Current state: isRunning=${isToolhiveRunning()}, PID: ${toolhiveProcess?.pid}`
+  )
   if (toolhiveProcess && !toolhiveProcess.killed) {
     log.info('Stopping ToolHive process...')
     toolhiveProcess.kill()
     toolhiveProcess = undefined
+    log.info(`[stopToolhive] Process stopped and reset`)
+  } else {
+    log.info(`[stopToolhive] No process to stop`)
   }
 }
 

preload/src/preload.ts

@@ -15,6 +15,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   showApp: () => ipcRenderer.invoke('show-app'),
   hideApp: () => ipcRenderer.invoke('hide-app'),
   quitApp: () => ipcRenderer.invoke('quit-app'),
+  isUpdateInProgress: () => ipcRenderer.invoke('is-update-in-progress'),
 
   // App version
   getAppVersion: () => ipcRenderer.invoke('get-app-version'),
@@ -100,6 +101,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
 export interface ElectronAPI {
   getAppVersion: () => Promise<string>
   isReleaseBuild: () => Promise<boolean>
+  isUpdateInProgress: () => Promise<boolean>
   getAutoLaunchStatus: () => Promise<boolean>
   setAutoLaunch: (enabled: boolean) => Promise<boolean>
   showApp: () => Promise<void>

renderer/src/routes/__root.tsx

@@ -74,13 +74,27 @@ export const Route = createRootRouteWithContext<{
     log.error(error)
   },
   beforeLoad: async ({ context: { queryClient } }) => {
+    let isUpdateInProgress = false
+
+    try {
+      isUpdateInProgress = await window.electronAPI.isUpdateInProgress()
+      log.info(`[beforeLoad] Update in progress: ${isUpdateInProgress}`)
+    } catch (e) {
+      log.debug(`[beforeLoad] Update check API not available: ${e}`)
+    }
+
+    if (isUpdateInProgress) {
+      log.info(`[beforeLoad] Skipping health API check - update in progress`)
+      return
+    }
+
     await queryClient.ensureQueryData({
       queryKey: ['is-toolhive-running'],
       queryFn: async () => {
         const res = await window.electronAPI.isToolhiveRunning()
         const appVersion = await window.electronAPI.getAppVersion()
         if (!res) {
-          log.error('Error ToolHive is not running')
+          log.error('ToolHive is not running')
         }
         log.info(`ToolHive version ${appVersion} is running`)
         return res