fix(desktop): persist window size and position

apps/desktop/src-tauri/src/lib.rs

@@ -338,7 +338,8 @@ pub async fn main() {
         .plugin(tauri_plugin_js::init())
         .plugin(
             tauri_plugin_window_state::Builder::default()
-                .skip_initial_state("main")
+                .with_state_flags(tauri_plugin_windows::persisted_window_state_flags())
+                .with_denylist(&["composer"])
                 .build(),
         )
         .plugin(tauri_plugin_transcription::init())

apps/desktop/src/shared/main/chat-panels.test.tsx

@@ -515,6 +515,64 @@ describe("MainChatPanels", () => {
     expect(mocks.windowRestoreWidth).toHaveBeenCalledTimes(1);
   });
 
+  it("does not restore window width when leaving a meeting for settings with chat still open", () => {
+    mocks.chatMode = "RightPanelOpen";
+    mocks.currentTab = { type: "sessions" };
+    mocks.leftSidebarExpanded = true;
+    mockPanelWidths({
+      bodyPanelWidth: 700,
+      leftSidebarWidth: 200,
+      rightPanelWidth: 120,
+    });
+
+    const renderPanels = () => (
+      <MainChatPanels>
+        <div data-left-sidebar-chrome />
+        <div data-chat-floating-anchor>
+          <div data-session-surface />
+        </div>
+      </MainChatPanels>
+    );
+    const { rerender } = render(renderPanels());
+
+    expect(mocks.windowExpandWidth).toHaveBeenCalled();
+    mocks.windowRestoreWidth.mockClear();
+
+    mocks.currentTab = { type: "settings" };
+    rerender(renderPanels());
+
+    expect(mocks.windowRestoreWidth).not.toHaveBeenCalled();
+  });
+
+  it("restores window width when docked chat closes while the sidebar stays open", () => {
+    mocks.chatMode = "RightPanelOpen";
+    mocks.currentTab = { type: "sessions" };
+    mocks.leftSidebarExpanded = true;
+    mockPanelWidths({
+      bodyPanelWidth: 700,
+      leftSidebarWidth: 200,
+      rightPanelWidth: 120,
+    });
+
+    const renderPanels = () => (
+      <MainChatPanels>
+        <div data-left-sidebar-chrome />
+        <div data-chat-floating-anchor>
+          <div data-session-surface />
+        </div>
+      </MainChatPanels>
+    );
+    const { rerender } = render(renderPanels());
+
+    expect(mocks.windowExpandWidth).toHaveBeenCalled();
+    mocks.windowRestoreWidth.mockClear();
+
+    mocks.chatMode = "FloatingClosed";
+    rerender(renderPanels());
+
+    expect(mocks.windowRestoreWidth).toHaveBeenCalledTimes(1);
+  });
+
   it("collapses the left sidebar when a window resize would make the note surface narrower than 500px", () => {
     mocks.currentTab = { type: "sessions" };
     mocks.leftSidebarExpanded = true;

apps/desktop/src/shared/main/chat-panels.tsx

@@ -177,10 +177,18 @@ function useNoteSurfaceWindowWidthGuard({
   useLayoutEffect(() => {
     const previousState = previousStateRef.current;
     const hasOpenPanel = enabled && (leftPanelOpen || rightPanelOpen);
+    const rightPanelJustClosed =
+      previousState.rightPanelOpen && !rightPanelOpen;
+
+    if (
+      rightPanelJustClosed ||
+      (enabled && !leftPanelOpen && !rightPanelOpen)
+    ) {
+      restoreWidthExpansions();
+    }
 
     if (!hasOpenPanel) {
       previousStateRef.current = { enabled, leftPanelOpen, rightPanelOpen };
-      restoreWidthExpansions();
       return;
     }
 

plugins/windows/src/ext.rs

@@ -359,12 +359,6 @@ impl AppWindow {
         }
 
         if let Some(window) = self.get(app) {
-            if matches!(self, Self::Main) {
-                use tauri_plugin_window_state::{StateFlags, WindowExt};
-
-                let _ = window.restore_state(StateFlags::SIZE | StateFlags::POSITION);
-            }
-
             self.ensure_visible(app, &window);
             window.show()?;
             window.set_focus()?;
@@ -385,7 +379,7 @@ impl AppWindow {
         use tauri_plugin_window_state::{StateFlags, WindowExt};
 
         let state_flags = if matches!(self, Self::Main) {
-            StateFlags::SIZE | StateFlags::POSITION
+            crate::persisted_window_state_flags()
         } else {
             StateFlags::SIZE
         };

plugins/windows/src/lib.rs

@@ -11,15 +11,20 @@ pub use ext::{Windows, WindowsPluginExt};
 pub use tab::*;
 pub use window::*;
 
-const PLUGIN_NAME: &str = "windows";
-
 use std::collections::HashMap;
 use std::sync::{
     Mutex,
     atomic::{AtomicBool, AtomicU64, Ordering},
 };
 use std::time::{Duration, Instant};
 
+const PLUGIN_NAME: &str = "windows";
+
+pub fn persisted_window_state_flags() -> tauri_plugin_window_state::StateFlags {
+    use tauri_plugin_window_state::StateFlags;
+    StateFlags::SIZE | StateFlags::POSITION | StateFlags::MAXIMIZED
+}
+
 const WEBVIEW_RECOVERY_GRACE_PERIOD: Duration = Duration::from_secs(10);
 
 #[derive(Clone, Copy)]
@@ -307,8 +312,8 @@ pub fn init() -> tauri::plugin::TauriPlugin<tauri::Wry> {
         })
         .on_event(move |app, event| {
             if let tauri::RunEvent::ExitRequested { .. } = event {
-                use tauri_plugin_window_state::{AppHandleExt, StateFlags};
-                let _ = app.save_window_state(StateFlags::SIZE);
+                use tauri_plugin_window_state::AppHandleExt;
+                let _ = app.save_window_state(persisted_window_state_flags());
             }
         })
         .build()
@@ -394,6 +399,19 @@ mod test {
         assert!(expansions.0.lock().unwrap().is_empty());
     }
 
+    #[test]
+    fn persisted_window_state_includes_size_and_position() {
+        use tauri_plugin_window_state::StateFlags;
+
+        let flags = persisted_window_state_flags();
+        assert!(flags.contains(StateFlags::SIZE));
+        assert!(flags.contains(StateFlags::POSITION));
+        assert!(flags.contains(StateFlags::MAXIMIZED));
+        assert!(!flags.contains(StateFlags::VISIBLE));
+        assert!(!flags.contains(StateFlags::DECORATIONS));
+        assert!(!flags.contains(StateFlags::FULLSCREEN));
+    }
+
     #[test]
     fn saved_frame_take_consumes_window_entry() {
         let frames = SavedFrames::default();

plugins/windows/src/window/v1.rs

@@ -1,5 +1,7 @@
 use crate::WindowImpl;
 
+const MAIN_WINDOW_WIDTH: f64 = 910.0;
+const MAIN_WINDOW_HEIGHT: f64 = 600.0;
 const NOTE_WINDOW_WIDTH: f64 = 720.0;
 const NOTE_WINDOW_HEIGHT: f64 = 820.0;
 const NOTE_WINDOW_POSITION_TOLERANCE: f64 = 1.0;
@@ -201,10 +203,9 @@ impl WindowImpl for AppWindow {
                     .window_builder(app, "/app")
                     .maximizable(true)
                     .minimizable(true)
-                    .min_inner_size(500.0, 500.0);
-                let window = builder.build()?;
-                window.set_size(LogicalSize::new(910.0, 600.0))?;
-                window
+                    .min_inner_size(500.0, 500.0)
+                    .inner_size(MAIN_WINDOW_WIDTH, MAIN_WINDOW_HEIGHT);
+                builder.build()?
             }
             Self::Composer => {
                 let builder = self
@@ -226,10 +227,9 @@ impl WindowImpl for AppWindow {
                     .window_builder(app, format!("/app/note/{encoded_id}"))
                     .maximizable(true)
                     .minimizable(true)
-                    .min_inner_size(420.0, 500.0);
-                let window = builder.build()?;
-                window.set_size(LogicalSize::new(NOTE_WINDOW_WIDTH, NOTE_WINDOW_HEIGHT))?;
-                window
+                    .min_inner_size(420.0, 500.0)
+                    .inner_size(NOTE_WINDOW_WIDTH, NOTE_WINDOW_HEIGHT);
+                builder.build()?
             }
         };