fix(windows): windows fails to handle events when the dock bar is opened after being closed

Author: ycjcl868

src/main/agent/index.ts

@@ -198,6 +198,7 @@ export class ComputerUseAgent {
         if (!isValidImage) {
           loopCnt -= 1;
           snapshotErrCnt += 1;
+          await sleep(1000);
           continue;
         }
 

src/main/main.ts

@@ -59,19 +59,13 @@ class AppUpdater {
           repo: 'bytedance/UI-TARS-desktop',
           host: 'https://update.electronjs.org',
         },
-        updateInterval: '15 minutes',
+        updateInterval: '20 minutes',
         logger,
       });
     }
   }
 }
 
-ipcMain.on('ipc-example', async (event, arg) => {
-  const msgTemplate = (pingPong: string) => `IPC test: ${pingPong}`;
-  console.log(msgTemplate(arg));
-  event.reply('ipc-example', msgTemplate('pong'));
-});
-
 if (isProd) {
   import('source-map-support').then(({ default: sourceMapSupport }) => {
     sourceMapSupport.install();
@@ -109,9 +103,9 @@ const initializeApp = async () => {
     logger.info('ensureScreenCapturePermission', ensureScreenCapturePermission);
   }
 
-  // if (isDev) {
-  await loadDevDebugTools();
-  // }
+  if (env.isDev) {
+    await loadDevDebugTools();
+  }
 
   logger.info('createTray');
   // Tray
@@ -127,7 +121,7 @@ const initializeApp = async () => {
   });
 
   logger.info('createMainWindow');
-  const mainWindow = createMainWindow();
+  let mainWindow = createMainWindow();
   const settingsWindow = createSettingsWindow({ showInBackground: true });
 
   // Remove this if your app does not use auto updates
@@ -156,7 +150,35 @@ const initializeApp = async () => {
     ...(launcherWindowIns.getWindow() ? [launcherWindowIns.getWindow()!] : []),
   ]);
 
-  app.on('quit', unsubscribe);
+  app.on('window-all-closed', () => {
+    logger.info('window-all-closed');
+    if (!env.isMacOS) {
+      app.quit();
+    }
+  });
+
+  app.on('before-quit', () => {
+    logger.info('before-quit');
+    const windows = BrowserWindow.getAllWindows();
+    windows.forEach((window) => window.destroy());
+  });
+
+  app.on('quit', () => {
+    logger.info('app quit');
+    unsubscribe();
+  });
+
+  app.on('activate', () => {
+    logger.info('app activate');
+    if (!mainWindow || mainWindow.isDestroyed()) {
+      mainWindow = createMainWindow();
+    } else {
+      if (!mainWindow.isVisible()) {
+        mainWindow.show();
+      }
+      mainWindow.focus();
+    }
+  });
 
   logger.info('initializeApp end');
 

src/main/window/index.ts

@@ -2,9 +2,10 @@
  * Copyright (c) 2025 Bytedance, Inc. and its affiliates.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { BrowserWindow, app, ipcMain, screen } from 'electron';
+import { BrowserWindow, screen } from 'electron';
 
 import { logger } from '@main/logger';
+import * as env from '@main/env';
 
 import { createWindow } from './createWindow';
 
@@ -25,53 +26,23 @@ export function show() {
 }
 
 export function createMainWindow() {
-  ipcMain.removeHandler('minimize-window');
-  ipcMain.removeHandler('maximize-window');
-  ipcMain.removeHandler('close-window');
-
   mainWindow = createWindow({
     routerPath: '/',
     width: 430,
     height: 580,
     alwaysOnTop: false,
   });
 
-  ipcMain.handle('minimize-window', () => {
-    mainWindow?.minimize();
-  });
-
-  ipcMain.handle('maximize-window', () => {
-    if (mainWindow?.isMaximized()) {
-      mainWindow?.unmaximize();
-    } else {
-      mainWindow?.maximize();
-    }
-  });
-
-  ipcMain.handle('close-window', async () => {
-    if (mainWindow) {
-      mainWindow.close();
-    }
-  });
-
-  app.on('activate', () => {
-    const windows = BrowserWindow.getAllWindows();
-    const existingWindow = windows.find((win) => !win.isDestroyed());
-
-    if (!existingWindow) {
-      createMainWindow();
+  mainWindow.on('close', (event) => {
+    logger.info('mainWindow closed');
+    if (env.isMacOS) {
+      event.preventDefault();
+      mainWindow?.hide();
     } else {
-      if (!existingWindow.isVisible()) {
-        existingWindow.show();
-      }
-      existingWindow.focus();
+      mainWindow = null;
     }
   });
 
-  mainWindow.on('closed', () => {
-    mainWindow = null;
-  });
-
   return mainWindow;
 }
 
@@ -111,8 +82,14 @@ export function createSettingsWindow(
     showInBackground,
   });
 
-  settingsWindow.on('closed', () => {
-    settingsWindow = null;
+  settingsWindow.on('close', (event) => {
+    if (env.isMacOS) {
+      event.preventDefault();
+      settingsWindow?.hide();
+    } else {
+      settingsWindow = null;
+    }
+
     // if mainWindow is not visible, show it
     if (mainWindow?.isMinimized()) {
       mainWindow?.restore();
@@ -131,7 +108,6 @@ export function createSettingsWindow(
 export async function closeSettingsWindow() {
   if (settingsWindow) {
     settingsWindow.close();
-    settingsWindow = null;
   }
 }
 
@@ -169,7 +145,9 @@ export async function hideWindowBlock<T>(
     return result;
   } finally {
     mainWindow?.setContentProtection(false);
-    mainWindow?.setAlwaysOnTop(false);
+    setTimeout(() => {
+      mainWindow?.setAlwaysOnTop(false);
+    }, 100);
     // restore mainWindow
     if (mainWindow && originalBounds) {
       mainWindow?.setBounds(originalBounds);

src/preload/index.ts

@@ -9,7 +9,7 @@ import type { UTIOPayload } from '@ui-tars/utio';
 
 import type { AppState, LocalStore } from '@main/store/types';
 
-export type Channels = 'ipc-example';
+export type Channels = '';
 
 const electronHandler = {
   ipcRenderer: {
@@ -31,12 +31,6 @@ const electronHandler = {
       ipcRenderer.once(channel, (_event, ...args) => func(...args));
     },
   },
-  // Add window controls
-  windowControls: {
-    minimize: () => ipcRenderer.invoke('minimize-window'),
-    maximize: () => ipcRenderer.invoke('maximize-window'),
-    close: () => ipcRenderer.invoke('close-window'),
-  },
   utio: {
     shareReport: (params: UTIOPayload<'shareReport'>) =>
       ipcRenderer.invoke('utio:shareReport', params),

src/renderer/index.html

@@ -41,10 +41,38 @@
       body {
         overflow: hidden;
       }
+
+      @keyframes spin {
+        0% { transform: rotate(0deg); }
+        100% { transform: rotate(360deg); }
+      }
+
+      .loading-spinner {
+        display: inline-block;
+        width: 30px;
+        height: 30px;
+        border: 3px solid rgba(0, 0, 0, 0.1);
+        border-radius: 50%;
+        border-top-color: #767676;
+        animation: spin 1s ease-in-out infinite;
+        margin: 20px;
+      }
+
+      .loading-container {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        height: 100vh;
+      }
+
   </style>
   </head>
   <body>
-    <div id="root"></div>
+    <div id="root">
+      <div class="loading-container">
+        <div class="loading-spinner"></div>
+      </div>
+    </div>
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>

src/renderer/src/components/ChatInput/index.tsx

@@ -263,6 +263,10 @@ const ChatInput = forwardRef((_props, _ref) => {
     await api.clearHistory();
   };
 
+  const stopRun = async () => {
+    await api.stopRun();
+  };
+
   return (
     <Box p="4" borderTop="1px" borderColor="gray.200">
       <Flex direction="column" h="full">
@@ -389,13 +393,7 @@ const ChatInput = forwardRef((_props, _ref) => {
               )}
               <Button
                 variant="tars-ghost"
-                onClick={
-                  running
-                    ? () => {
-                        // dispatch('STOP_RUN')
-                      }
-                    : startRun
-                }
+                onClick={running ? stopRun : startRun}
                 isDisabled={!running && localInstructions?.trim() === ''}
               >
                 {(() => {

src/renderer/src/main.tsx

@@ -9,10 +9,3 @@ import App from './App';
 const container = document.getElementById('root') as HTMLElement;
 const root = createRoot(container);
 root.render(<App />);
-
-// calling IPC exposed from preload script
-window.electron.ipcRenderer.once('ipc-example', (arg) => {
-  // eslint-disable-next-line no-console
-  console.log(arg);
-});
-window.electron.ipcRenderer.sendMessage('ipc-example', ['ping']);