[ai-assisted] Fix app quit shortcut handling

Author: JooHyung Park

src/main.ts

@@ -63,21 +63,46 @@ let mainWindow: BrowserWindow | null = null;
 let tray: TalkToFigmaTray | null = null;
 let serverManager: TalkToFigmaServerManager | null = null;
 let service: TalkToFigmaService | null = null;
+let quitRequested = false;
+let shutdownComplete = false;
 
 const rendererLoaderOptions = {
   devServerUrl: MAIN_WINDOW_VITE_DEV_SERVER_URL,
   rendererName: MAIN_WINDOW_VITE_NAME,
   logger,
 };
 
+const requestAppQuit = async () => {
+  if (quitRequested) {
+    logger.info('Quit already requested');
+    return;
+  }
+
+  quitRequested = true;
+  logger.info('Quit requested');
+
+  try {
+    await shutdownApp({
+      logger,
+      service,
+      tray,
+      flushMCPToolSuccessBatch,
+      trackAppQuit,
+    });
+  } finally {
+    shutdownComplete = true;
+    app.exit(0);
+  }
+};
+
 const createWindow = () => {
   mainWindow = createMainWindow({
     preloadPath: path.join(__dirname, 'preload.cjs'),
     logger,
     loadRenderer: (window) => loadRenderer(window, rendererLoaderOptions),
     registerIpcHandlers,
     setLoggerWindow: setMainWindow,
-    createMenu,
+    createMenu: (window) => createMenu(window, requestAppQuit),
   });
 };
 
@@ -89,7 +114,7 @@ const createTray = () => {
     return;
   }
 
-  tray = new TalkToFigmaTray(serverManager);
+  tray = new TalkToFigmaTray(serverManager, requestAppQuit);
   tray.create();
 
   logger.info('System tray created');
@@ -119,7 +144,7 @@ const initializeServers = (window: BrowserWindow) => {
 
   service.setMenuUpdateCallback(() => {
     if (mainWindow && !mainWindow.isDestroyed()) {
-      createMenu(mainWindow);
+      createMenu(mainWindow, requestAppQuit);
     }
   });
 
@@ -186,7 +211,7 @@ app.on('ready', async () => {
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
     logger.info('All windows closed, quitting app');
-    app.quit();
+    void requestAppQuit();
   }
 });
 
@@ -196,14 +221,13 @@ app.on('activate', () => {
   }
 });
 
-app.on('before-quit', async () => {
-  await shutdownApp({
-    logger,
-    service,
-    tray,
-    flushMCPToolSuccessBatch,
-    trackAppQuit,
-  });
+app.on('before-quit', (event) => {
+  if (shutdownComplete) {
+    return;
+  }
+
+  event.preventDefault();
+  void requestAppQuit();
 });
 
 app.on('will-quit', () => {

src/main/bootstrap/shutdown.ts

@@ -66,7 +66,7 @@ function closeWindows(logger: LoggerLike): void {
         window.webContents.closeDevTools();
       }
       if (!window.isDestroyed()) {
-        window.close();
+        window.destroy();
       }
     } catch (error) {
       logger.error('Error closing window:', { error });

src/main/menu.ts

@@ -14,7 +14,7 @@ import { TalkToFigmaService } from './server/TalkToFigmaService';
  * Create application menu
  * Based on Tray menu structure for consistency
  */
-export function createMenu(mainWindow: BrowserWindow) {
+export function createMenu(mainWindow: BrowserWindow, requestQuit: () => void | Promise<void>) {
   const isMac = process.platform === 'darwin';
   const { canCheckForUpdates } = getUpdateCapabilities();
   const serverManager = TalkToFigmaServerManager.getInstance();
@@ -67,11 +67,33 @@ export function createMenu(mainWindow: BrowserWindow) {
             { role: 'hideOthers' },
             { role: 'unhide' },
             { type: 'separator' },
-            { role: 'quit' }
+            {
+              label: `Quit ${app.name}`,
+              accelerator: 'Command+Q',
+              click: () => {
+                void requestQuit();
+              },
+            }
           ]
         } as MenuItemConstructorOptions]
       : []),
 
+    // File Menu (Windows/Linux)
+    ...(!isMac
+      ? [{
+          label: 'File',
+          submenu: [
+            {
+              label: 'Quit',
+              accelerator: 'Alt+F4',
+              click: () => {
+                void requestQuit();
+              },
+            },
+          ],
+        } as MenuItemConstructorOptions]
+      : []),
+
     // Edit Menu (clipboard shortcuts: cut/copy/paste/select all)
     { role: 'editMenu' },
 

src/main/server/TalkToFigmaTray.ts

@@ -37,10 +37,12 @@ export class TalkToFigmaTray {
   private tray: Tray | null = null;
   private manager: TalkToFigmaServerManager;
   private service: TalkToFigmaService;
+  private requestQuit: () => void | Promise<void>;
 
-  constructor(manager: TalkToFigmaServerManager) {
+  constructor(manager: TalkToFigmaServerManager, requestQuit: () => void | Promise<void> = () => app.quit()) {
     this.manager = manager;
     this.service = TalkToFigmaService.getInstance();
+    this.requestQuit = requestQuit;
 
     // Register this tray to be updated when server status changes
     this.service.setTrayUpdateCallback(() => {
@@ -166,9 +168,8 @@ export class TalkToFigmaTray {
       // ═══ EXIT ═══
       {
         label: 'Quit',
-        click: async () => {
-          await this.manager.stopAll();
-          app.quit();
+        click: () => {
+          void this.requestQuit();
         },
       },
     ];