fix: surface close preference save failures

Author: zouyonghe

scripts/ui/close-confirm.test.mjs

@@ -40,3 +40,11 @@ test('close confirm dialog reads close action values from query params instead o
   assert.doesNotMatch(html, /submit\("tray"\)/);
   assert.doesNotMatch(html, /submit\("exit"\)/);
 });
+
+test('close confirm dialog only schedules frontend close fallback for tray actions', async () => {
+  const html = await readHtml();
+
+  assert.match(html, /if \(action === trayAction\) \{/);
+  assert.match(html, /recoveryTimer = window\.setTimeout\(/);
+  assert.match(html, /window\.close\(\);/);
+});

src-tauri/src/bridge/commands.rs

@@ -339,8 +339,12 @@ pub(crate) fn desktop_bridge_submit_close_prompt(
             append_desktop_log,
         ) {
             append_desktop_log(&format!(
-                "failed to persist remembered close action; continuing with selected action: {error}"
+                "failed to persist remembered close action; aborting selected action: {error}"
             ));
+            return BackendBridgeResult {
+                ok: false,
+                reason: Some(error),
+            };
         }
     }
 
@@ -362,6 +366,15 @@ pub(crate) fn desktop_bridge_submit_close_prompt(
             finish_tray_close_prompt_cleanup(cleanup_result, append_desktop_log)
         }
         CloseAction::Exit => {
+            if let Some(prompt_window) =
+                app_handle.get_webview_window(window::close_confirm::CLOSE_CONFIRM_WINDOW_LABEL)
+            {
+                if let Err(error) = prompt_window.close() {
+                    append_desktop_log(&format!(
+                        "Failed to close confirm prompt window before exit: {error}"
+                    ));
+                }
+            }
             crate::lifecycle::events::request_immediate_exit(
                 &app_handle,
                 crate::lifecycle::events::ImmediateExitTrigger::ClosePromptExitAction,

src-tauri/src/close_behavior.rs

@@ -147,8 +147,9 @@ where
 {
     let Some(state_path) = crate::desktop_state::resolve_desktop_state_path(packaged_root_dir)
     else {
-        log("close behavior state path is unavailable; skipping close action persistence");
-        return Ok(());
+        let message = "close behavior state path is unavailable; skipping close action persistence";
+        log(message);
+        return Err(message.to_string());
     };
 
     write_cached_close_action_at_path(action, &state_path, &log)
@@ -379,4 +380,17 @@ mod tests {
             None
         );
     }
+
+    #[test]
+    fn write_cached_close_action_errors_when_state_path_is_unavailable() {
+        let result = super::write_cached_close_action(Some(CloseAction::Tray), None, &noop_log);
+
+        assert_eq!(
+            result,
+            Err(
+                "close behavior state path is unavailable; skipping close action persistence"
+                    .to_string()
+            )
+        );
+    }
 }

ui/close-confirm.html

@@ -243,16 +243,18 @@ <h1 id="title"></h1>
             return;
           }
 
-          recoveryTimer = window.setTimeout(() => {
-            recoveryTimer = null;
-            if (document.visibilityState !== "hidden") {
-              error.textContent = copy.submitStalled;
-              setPending(false);
+          if (action === trayAction) {
+            recoveryTimer = window.setTimeout(() => {
+              recoveryTimer = null;
+              if (document.visibilityState !== "hidden") {
+                error.textContent = copy.submitStalled;
+                setPending(false);
+              }
+            }, 1500);
+
+            if (typeof window.close === "function") {
+              window.close();
             }
-          }, 1500);
-
-          if (typeof window.close === "function") {
-            window.close();
           }
         } catch (_invokeError) {
           error.textContent = copy.submitError;