Fix quit and install handoff

Author: spaceshipmike

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "setlist",
   "private": true,
-  "version": "0.6.1-beta.9",
+  "version": "0.6.1-beta.10",
   "license": "Apache-2.0",
   "type": "module",
   "workspaces": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@setlist/app",
-  "version": "0.6.1-beta.9",
+  "version": "0.6.1-beta.10",
   "private": true,
   "type": "module",
   "main": "./out/main/index.js",

packages/app/package.json

@@ -6,7 +6,7 @@ import { listPinnedProjects, registerIpcHandlers } from './ipc.js';
 import { initAutoUpdater } from './auto-update.js';
 import { getAppBehaviorPrefs, loadPrefs } from './prefs.js';
 import { installAppMenu, handleMenuCheckForUpdates } from './menu.js';
-import { registerQuitPrompt } from './quit-prompt.js';
+import { isInstallingDownloadedUpdate, registerQuitPrompt } from './quit-prompt.js';
 import { installTray } from './tray.js';
 import {
   getShortcutRegistrationStatuses,
@@ -80,6 +80,15 @@ function quitApp(): void {
   app.quit();
 }
 
+function shouldHideWindowInsteadOfClosing(): boolean {
+  const prefs = getAppBehaviorPrefs();
+  return (
+    prefs.menu_bar_persistence_enabled &&
+    !isQuitting &&
+    !isInstallingDownloadedUpdate()
+  );
+}
+
 function refreshTray(): void {
   installTray({
     showWindow,
@@ -144,17 +153,15 @@ function createWindow(): void {
   });
 
   mainWindow.on('close', (event) => {
-    const prefs = getAppBehaviorPrefs();
-    if (prefs.menu_bar_persistence_enabled && !isQuitting) {
+    if (shouldHideWindowInsteadOfClosing()) {
       event.preventDefault();
       mainWindow?.hide();
       updateDockVisibility();
     }
   });
 
   onPreventableMinimize(mainWindow, (event) => {
-    const prefs = getAppBehaviorPrefs();
-    if (prefs.menu_bar_persistence_enabled) {
+    if (shouldHideWindowInsteadOfClosing()) {
       event.preventDefault();
       mainWindow?.hide();
       updateDockVisibility();
@@ -219,7 +226,11 @@ app.on('will-quit', () => {
 });
 
 app.on('window-all-closed', () => {
-  if (!getAppBehaviorPrefs().menu_bar_persistence_enabled || isQuitting) {
+  if (
+    !getAppBehaviorPrefs().menu_bar_persistence_enabled ||
+    isQuitting ||
+    isInstallingDownloadedUpdate()
+  ) {
     app.quit();
   } else {
     updateDockVisibility();

packages/app/src/main/index.ts

@@ -44,8 +44,11 @@ describe('quit prompt update install flow', () => {
 
   it('direct install marks the update handoff so a follow-up quit is not intercepted', async () => {
     const { app, quitAndInstall, mod } = await loadQuitPrompt();
+    expect(mod.isInstallingDownloadedUpdate()).toBe(false);
+
     expect(mod.installDownloadedUpdate()).toBe(true);
     expect(quitAndInstall).toHaveBeenCalledTimes(1);
+    expect(mod.isInstallingDownloadedUpdate()).toBe(true);
 
     mod.registerQuitPrompt(app as never, () => null);
     const event = { preventDefault: vi.fn() };
@@ -62,6 +65,7 @@ describe('quit prompt update install flow', () => {
     app.emitBeforeQuit(firstEvent);
     expect(firstEvent.preventDefault).toHaveBeenCalledTimes(1);
     expect(quitAndInstall).toHaveBeenCalledTimes(1);
+    expect(mod.isInstallingDownloadedUpdate()).toBe(true);
 
     const secondEvent = { preventDefault: vi.fn() };
     app.emitBeforeQuit(secondEvent);
@@ -79,4 +83,12 @@ describe('quit prompt update install flow', () => {
     expect(quitAndInstall).not.toHaveBeenCalled();
     expect(app.exit).toHaveBeenCalledWith(0);
   });
+
+  it('does not mark install handoff when no update is downloaded', async () => {
+    const { quitAndInstall, mod } = await loadQuitPrompt({ downloaded: false });
+
+    expect(mod.installDownloadedUpdate()).toBe(false);
+    expect(mod.isInstallingDownloadedUpdate()).toBe(false);
+    expect(quitAndInstall).not.toHaveBeenCalled();
+  });
 });

packages/app/src/main/quit-prompt.test.ts

@@ -22,6 +22,10 @@ export function installDownloadedUpdate(): boolean {
   return true;
 }
 
+export function isInstallingDownloadedUpdate(): boolean {
+  return installing;
+}
+
 /**
  * Register a before-quit listener that surfaces the install-or-skip
  * prompt when an update is staged. Must be called once during

packages/app/src/main/quit-prompt.ts

@@ -1,6 +1,6 @@
 {
   "name": "@setlist/cli",
-  "version": "0.6.1-beta.9",
+  "version": "0.6.1-beta.10",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@setlist/core",
-  "version": "0.6.1-beta.9",
+  "version": "0.6.1-beta.10",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@setlist/mcp",
-  "version": "0.6.1-beta.9",
+  "version": "0.6.1-beta.10",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",