test(startup): validate Windows baseline (#37)

- Issue #37: restore the pre-workaround startup path for an extended packaged smoke comparison.\n- Keep the strengthened stability check while removing only the attempted Windows activation workaround.\n\nRefs #37.

src-tauri/src/extension_server.rs

@@ -308,16 +308,18 @@ async fn download_handler(
         None => return Err(StatusCode::BAD_REQUEST),
     };
 
-    let is_hidden = state
-        .app_handle
-        .get_webview_window("main")
-        .and_then(|window| window.is_visible().ok())
-        .is_some_and(|is_visible| !is_visible);
-    crate::restore_main_window(&state.app_handle);
-    if is_hidden {
-        // Sleep briefly to let the webview wake up from macOS App Nap
-        // otherwise the IPC event emitted immediately after is dropped.
-        tokio::time::sleep(std::time::Duration::from_millis(300)).await;
+    if let Some(window) = state.app_handle.get_webview_window("main") {
+        let is_visible = window.is_visible().unwrap_or(true);
+        if !is_visible {
+            let _ = window.show();
+            let _ = window.set_focus();
+            // Sleep briefly to let the webview wake up from macOS App Nap
+            // otherwise the IPC event emitted immediately after is dropped.
+            tokio::time::sleep(std::time::Duration::from_millis(300)).await;
+        } else {
+            let _ = window.show();
+            let _ = window.set_focus();
+        }
     }
 
     if !wait_for_frontend(&state.frontend_ready).await {

src-tauri/src/lib.rs

@@ -3659,7 +3659,6 @@ pub struct AppState {
 #[derive(Default)]
 struct MainWindowRestoreState {
     requested: AtomicBool,
-    startup_complete: AtomicBool,
 }
 
 #[cfg(target_os = "macos")]
@@ -3955,26 +3954,7 @@ where
         .collect()
 }
 
-pub(crate) fn restore_main_window(app_handle: &tauri::AppHandle) {
-    let startup_complete = app_handle
-        .try_state::<MainWindowRestoreState>()
-        .is_none_or(|state| state.startup_complete.load(Ordering::Acquire));
-    if !startup_complete {
-        if let Some(state) = app_handle.try_state::<MainWindowRestoreState>() {
-            // The first window can be requested by a single-instance callback
-            // or an opened .torrent path while the native host is still being
-            // constructed. Do not touch the HWND until RunEvent::Ready.
-            state.requested.store(true, Ordering::Release);
-            // Ready may have won the transition between the first load and
-            // the request store. Re-check before returning so that request is
-            // serviced by this call instead of being left pending forever.
-            if !state.startup_complete.load(Ordering::Acquire) {
-                return;
-            }
-        } else {
-            return;
-        }
-    }
+fn restore_main_window(app_handle: &tauri::AppHandle) {
     let Some(window) = app_handle.get_webview_window("main") else {
         if let Some(state) = app_handle.try_state::<MainWindowRestoreState>() {
             state.requested.store(true, Ordering::Release);
@@ -3987,24 +3967,6 @@ pub(crate) fn restore_main_window(app_handle: &tauri::AppHandle) {
     let _ = window.set_focus();
 }
 
-fn mark_main_window_startup_complete(app_handle: &tauri::AppHandle) {
-    if let Some(state) = app_handle.try_state::<MainWindowRestoreState>() {
-        state.startup_complete.store(true, Ordering::Release);
-    }
-}
-
-#[cfg(target_os = "windows")]
-fn reveal_main_window(app_handle: &tauri::AppHandle) {
-    if let Some(window) = app_handle.get_webview_window("main") {
-        if let Err(error) = window.set_focusable(true) {
-            log::warn!("Could not make the main window focusable: {error}");
-        }
-        if let Err(error) = window.show() {
-            eprintln!("Failed to reveal the main window: {error}");
-        }
-    }
-}
-
 fn restore_pending_main_window(app_handle: &tauri::AppHandle) {
     if app_handle
         .try_state::<MainWindowRestoreState>()
@@ -18550,17 +18512,6 @@ pub fn run() {
             main_window_builder = main_window_builder
                 .inner_size(startup_size.width as f64, startup_size.height as f64)
                 .prevent_overflow();
-            #[cfg(target_os = "windows")]
-            {
-                // Wry installs its parent WM_SETFOCUS handler while WebView2
-                // is still being initialized. Keep the host hidden and
-                // non-activatable until RunEvent::Ready so Windows cannot
-                // re-enter that handler during native construction.
-                main_window_builder = main_window_builder
-                    .visible(false)
-                    .focused(false)
-                    .focusable(false);
-            }
             main_window_builder
                 .build()
                 .map_err(|error| format!("failed to create main window: {error}"))?;
@@ -19896,13 +19847,6 @@ pub fn run() {
         .build(tauri::generate_context!())
         .expect("error while building tauri application")
         .run(|app_handle, event| match event {
-            tauri::RunEvent::Ready => {
-                mark_main_window_startup_complete(app_handle);
-                #[cfg(target_os = "windows")]
-                reveal_main_window(app_handle);
-                #[cfg(not(target_os = "windows"))]
-                restore_pending_main_window(app_handle);
-            }
             #[cfg(target_os = "macos")]
             tauri::RunEvent::Opened { urls } => {
                 let paths = collect_opened_torrent_paths(

src-tauri/src/properties_window.rs

@@ -439,7 +439,6 @@ pub fn open_download_properties_window(
         .visible(false)
         // A hidden WebView2 must not request focus during construction. The
         // native reveal path focuses it after the window is visible.
-        .focused(false)
         .transparent(true);
     #[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))]
     let builder = builder.decorations(false);

src/App.tsx

@@ -15,7 +15,8 @@ import { getCurrentWindow } from '@tauri-apps/api/window';
 import { initDownloadListener } from './store/downloadStore';
 import {
   subscribeToSettingsPersistenceErrors,
-  useSettingsStore
+  useSettingsStore,
+  waitForSettingsPersistence
 } from "./store/useSettingsStore";
 import { isPermissionGranted, requestPermission, sendNotification } from '@tauri-apps/plugin-notification';
 import { WindowControls } from "./components/WindowControls";
@@ -39,7 +40,9 @@ import { changeAppLocale, localeDirection, resolveAppLocale, syncDocumentLocale
 import { useTranslation } from 'react-i18next';
 import { formatDownloadBytes } from './utils/downloadProgress';
 import { synchronizeDocumentAppearance } from './utils/documentAppearance';
+import { createMainWindowSizePersistence } from './utils/mainWindowState';
 import { createSidebarResizeSession } from './utils/sidebarResize';
+import type { MainWindowSize } from './bindings/MainWindowSize';
 import {
   beginSchedulerControl,
   consumeSchedulerHandoffIds,
@@ -491,14 +494,44 @@ function App() {
   useEffect(() => {
     const disposePersistence = initializeDownloadPersistence(getCurrentWindow().label);
     let active = true;
+    let exitRequested = false;
+    let exiting = false;
+    let settingsHydrated = useSettingsStore.persist.hasHydrated();
+    let latestSizeBeforeHydration: MainWindowSize | null = null;
+    const unlistenSettingsHydration = settingsHydrated
+      ? null
+      : useSettingsStore.persist.onFinishHydration(() => {
+        settingsHydrated = true;
+        const size = latestSizeBeforeHydration;
+        latestSizeBeforeHydration = null;
+        if (size && active && !exitRequested && !exiting) {
+          useSettingsStore.getState().setMainWindowSize(size);
+        }
+      });
+    const mainWindowSizePersistence = createMainWindowSizePersistence({
+      appWindow: getCurrentWindow(),
+      onSize: size => {
+        if (!active || exiting) return;
+        if (!settingsHydrated) {
+          latestSizeBeforeHydration = size;
+          return;
+        }
+        useSettingsStore.getState().setMainWindowSize(size);
+      }
+    });
     let cleanupListeners: (() => void) | null = null;
     let unlistenExit: (() => void) | null = null;
     const exitListener = listen('app-exit-requested', async () => {
+      exitRequested = true;
       try {
+        await mainWindowSizePersistence.flush();
+        await waitForSettingsPersistence();
         await flushDownloadPersistence();
       } catch (error) {
         console.error('Failed to flush download state before exit:', error);
       } finally {
+        exiting = true;
+        latestSizeBeforeHydration = null;
         await invoke('ack_frontend_exit').catch(error => {
           console.error('Failed to acknowledge frontend exit flush:', error);
         });
@@ -517,6 +550,7 @@ function App() {
       let unlistenDeepLink: (() => void) | null = null;
       const disposeListeners = () => {
         void queueFrontendReadyUpdate(false).catch(() => {});
+        mainWindowSizePersistence.dispose();
         unlistenExit?.();
         unlistenExit = null;
         unlistenTerminalState?.();
@@ -722,6 +756,8 @@ function App() {
       cleanupListeners = null;
       unlistenExit?.();
       unlistenExit = null;
+      unlistenSettingsHydration?.();
+      mainWindowSizePersistence.dispose();
       disposePersistence();
     };
   }, [addToast, enqueueAddInput, processExtensionDownload, queueFrontendReadyUpdate]);