From e55fc74ba95bf674790849ebdea6d3c282f08e6c Mon Sep 17 00:00:00 2001
From: squarepots <46488165+squarepots@users.noreply.github.com>
Date: Fri, 18 Sep 2026 19:34:41 +0800
Subject: [PATCH 1/3] fix(web): avoid Tauri window access in browser mode

---
 src/App.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 6b11a1e2..f8687ec3 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -65,7 +65,7 @@ type AutoWarmupLedger = Record<
     lastAutoWindowKind?: AutoWarmupWindowKind;
   }
 >;
-const appWindow = getCurrentWindow();
+const getAppWindow = () => getCurrentWindow();
 const isMacOs =
   typeof navigator !== "undefined" &&
   /(Mac|iPhone|iPod|iPad)/i.test(navigator.userAgent);
@@ -388,14 +388,14 @@ function App() {
   const handleTitlebarDrag = useCallback(
     (event: React.MouseEvent<HTMLDivElement>) => {
       if (!isTauriRuntime() || event.button !== 0) return;
-      void appWindow.startDragging();
+      void getAppWindow().startDragging();
     },
     []
   );
 
   const handleTitlebarDoubleClick = useCallback(() => {
     if (!isTauriRuntime()) return;
-    void appWindow.toggleMaximize();
+    void getAppWindow().toggleMaximize();
   }, []);
 
   const toggleMask = (accountId: string) => {
@@ -526,7 +526,7 @@ function App() {
 
     const syncMaximizedState = async () => {
       try {
-        setIsWindowMaximized(await appWindow.isMaximized());
+        setIsWindowMaximized(await getAppWindow().isMaximized());
       } catch (err) {
         console.error("Failed to read window state:", err);
       }
@@ -1354,11 +1354,11 @@ function App() {
             onDoubleClick={handleTitlebarDoubleClick}
             className={`h-full flex-1 select-none cursor-default ${isMacOs ? "ml-18 mr-2" : "mr-3"}`}
           />
-          {!isMacOs && (
+          {isTauriRuntime() && !isMacOs && (
             <div className="flex items-center gap-1">
               <button
                 onClick={() => {
-                  void appWindow.minimize();
+                  void getAppWindow().minimize();
                 }}
                 className="flex h-8 w-8 items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-gray-100"
                 title="Minimize"
@@ -1369,7 +1369,7 @@ function App() {
               </button>
               <button
                 onClick={() => {
-                  void appWindow.toggleMaximize();
+                  void getAppWindow().toggleMaximize();
                 }}
                 className="flex h-8 w-8 items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-gray-100"
                 title={isWindowMaximized ? "Restore" : "Maximize"}
@@ -1387,7 +1387,7 @@ function App() {
               </button>
               <button
                 onClick={() => {
-                  void appWindow.close();
+                  void getAppWindow().close();
                 }}
                 className="flex h-8 w-8 items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-red-500 hover:text-white dark:text-gray-400 dark:hover:bg-red-500 dark:hover:text-white"
                 title="Close"

From cc2b7cb13f53aa79451dba3214c40fe936fb61a3 Mon Sep 17 00:00:00 2001
From: squarepots <46488165+squarepots@users.noreply.github.com>
Date: Fri, 18 Sep 2026 20:41:42 +0800
Subject: [PATCH 2/3] fix(web): guard resize listener behind Tauri runtime

---
 src/App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.tsx b/src/App.tsx
index f8687ec3..f5579c2b 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -534,7 +534,7 @@ function App() {
 
     void syncMaximizedState();
 
-    appWindow
+    getAppWindow()
       .onResized(() => {
         void syncMaximizedState();
       })

From 434700fc6e58f73a43e94dc1f2075516f156bafe Mon Sep 17 00:00:00 2001
From: SquarePots <46488165+squarepots@users.noreply.github.com>
Date: Fri, 18 Sep 2026 23:43:18 +0800
Subject: [PATCH 3/3] fix(web): harden Tauri window boundary

---
 package.json                 |  1 +
 src/App.tsx                  | 20 +++++++++++---------
 src/lib/tauriWindow.ts       | 14 ++++++++++++++
 tests/browserRuntime.test.ts | 21 +++++++++++++++++++++
 4 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 src/lib/tauriWindow.ts
 create mode 100644 tests/browserRuntime.test.ts

diff --git a/package.json b/package.json
index 40c3b87e..68309fb9 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "dev": "vite",
     "build": "tsc && vite build",
     "test:desktop-reopen": "node --experimental-strip-types --test tests/desktopReopen.test.ts",
+    "test:browser-runtime": "node --experimental-strip-types --test tests/browserRuntime.test.ts",
     "test:close-preference": "node --experimental-strip-types --test tests/codexClosePreference.test.ts",
     "test:reset-credits": "node --experimental-strip-types --test tests/resetCredits.test.ts",
     "preview": "vite preview",
diff --git a/src/App.tsx b/src/App.tsx
index f5579c2b..9e836c6c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,4 @@
 import { useState, useEffect, useCallback, useMemo, useRef } from "react";
-import { getCurrentWindow } from "@tauri-apps/api/window";
 import { useAccounts } from "./hooks/useAccounts";
 import { useDesktopReopen } from "./hooks/useDesktopReopen";
 import { useCodexClosePreference } from "./hooks/useCodexClosePreference";
@@ -42,6 +41,7 @@ import {
   type AutoWarmupWindow,
   type AutoWarmupWindowKind,
 } from "./lib/autoWarmupPolicy";
+import { getTauriWindow } from "./lib/tauriWindow";
 import "./App.css";
 
 const AUTO_WARMUP_CHECK_INTERVAL_MS = 30 * 1000;
@@ -65,7 +65,6 @@ type AutoWarmupLedger = Record<
     lastAutoWindowKind?: AutoWarmupWindowKind;
   }
 >;
-const getAppWindow = () => getCurrentWindow();
 const isMacOs =
   typeof navigator !== "undefined" &&
   /(Mac|iPhone|iPod|iPad)/i.test(navigator.userAgent);
@@ -388,14 +387,14 @@ function App() {
   const handleTitlebarDrag = useCallback(
     (event: React.MouseEvent<HTMLDivElement>) => {
       if (!isTauriRuntime() || event.button !== 0) return;
-      void getAppWindow().startDragging();
+      void getTauriWindow()?.startDragging();
     },
     []
   );
 
   const handleTitlebarDoubleClick = useCallback(() => {
     if (!isTauriRuntime()) return;
-    void getAppWindow().toggleMaximize();
+    void getTauriWindow()?.toggleMaximize();
   }, []);
 
   const toggleMask = (accountId: string) => {
@@ -522,11 +521,14 @@ function App() {
   useEffect(() => {
     if (!isTauriRuntime() || isMacOs) return;
 
+    const appWindow = getTauriWindow();
+    if (!appWindow) return;
+
     let unlisten: (() => void) | undefined;
 
     const syncMaximizedState = async () => {
       try {
-        setIsWindowMaximized(await getAppWindow().isMaximized());
+        setIsWindowMaximized(await appWindow.isMaximized());
       } catch (err) {
         console.error("Failed to read window state:", err);
       }
@@ -534,7 +536,7 @@ function App() {
 
     void syncMaximizedState();
 
-    getAppWindow()
+    appWindow
       .onResized(() => {
         void syncMaximizedState();
       })
@@ -1358,7 +1360,7 @@ function App() {
             <div className="flex items-center gap-1">
               <button
                 onClick={() => {
-                  void getAppWindow().minimize();
+                  void getTauriWindow()?.minimize();
                 }}
                 className="flex h-8 w-8 items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-gray-100"
                 title="Minimize"
@@ -1369,7 +1371,7 @@ function App() {
               </button>
               <button
                 onClick={() => {
-                  void getAppWindow().toggleMaximize();
+                  void getTauriWindow()?.toggleMaximize();
                 }}
                 className="flex h-8 w-8 items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900 dark:text-gray-400 dark:hover:bg-gray-800 dark:hover:text-gray-100"
                 title={isWindowMaximized ? "Restore" : "Maximize"}
@@ -1387,7 +1389,7 @@ function App() {
               </button>
               <button
                 onClick={() => {
-                  void getAppWindow().close();
+                  void getTauriWindow()?.close();
                 }}
                 className="flex h-8 w-8 items-center justify-center rounded-md text-gray-500 transition-colors hover:bg-red-500 hover:text-white dark:text-gray-400 dark:hover:bg-red-500 dark:hover:text-white"
                 title="Close"
diff --git a/src/lib/tauriWindow.ts b/src/lib/tauriWindow.ts
new file mode 100644
index 00000000..1ab14b2c
--- /dev/null
+++ b/src/lib/tauriWindow.ts
@@ -0,0 +1,14 @@
+import { getCurrentWindow, type Window as TauriWindow } from "@tauri-apps/api/window";
+
+let cachedWindow: TauriWindow | null = null;
+
+/**
+ * Resolve the Tauri window only inside the Tauri runtime. Browser/LAN mode
+ * must be able to evaluate the React bundle without touching Tauri internals.
+ */
+export function getTauriWindow(): TauriWindow | null {
+  if (typeof window === "undefined" || !("__TAURI_INTERNALS__" in window)) {
+    return null;
+  }
+  return (cachedWindow ??= getCurrentWindow());
+}
diff --git a/tests/browserRuntime.test.ts b/tests/browserRuntime.test.ts
new file mode 100644
index 00000000..7f3d13e6
--- /dev/null
+++ b/tests/browserRuntime.test.ts
@@ -0,0 +1,21 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { getTauriWindow } from "../src/lib/tauriWindow.ts";
+
+test("browser runtime does not resolve a Tauri window", () => {
+  assert.equal(getTauriWindow(), null);
+});
+
+test("a plain browser-like window without Tauri internals remains safe", () => {
+  const previous = Object.getOwnPropertyDescriptor(globalThis, "window");
+  Object.defineProperty(globalThis, "window", {
+    configurable: true,
+    value: {},
+  });
+  try {
+    assert.equal(getTauriWindow(), null);
+  } finally {
+    if (previous) Object.defineProperty(globalThis, "window", previous);
+    else delete (globalThis as { window?: unknown }).window;
+  }
+});