pingdotgg · Chrono-byte · Apr 18, 2026 · Apr 18, 2026 · Apr 20, 2026 · Apr 20, 2026
diff --git a/.codex b/.codex
diff --git a/apps/desktop/src/desktopSettings.test.ts b/apps/desktop/src/desktopSettings.test.ts
@@ -9,6 +9,7 @@ import {
   readDesktopSettings,
   resolveDefaultDesktopSettings,
   setDesktopServerExposurePreference,
+  setDesktopTitleBarModePreference,
   setDesktopUpdateChannelPreference,
   writeDesktopSettings,
 } from "./desktopSettings.ts";
@@ -37,6 +38,7 @@ describe("desktopSettings", () => {
       serverExposureMode: "local-only",
       updateChannel: "nightly",
       updateChannelConfiguredByUser: false,
+      titleBarMode: "custom",
     });
   });
 
@@ -47,12 +49,14 @@ describe("desktopSettings", () => {
       serverExposureMode: "network-accessible",
       updateChannel: "latest",
       updateChannelConfiguredByUser: true,
+      titleBarMode: "native",
     });
 
     expect(readDesktopSettings(settingsPath, "0.0.17")).toEqual({
       serverExposureMode: "network-accessible",
       updateChannel: "latest",
       updateChannelConfiguredByUser: true,
+      titleBarMode: "native",
     });
   });
 
@@ -63,13 +67,15 @@ describe("desktopSettings", () => {
           serverExposureMode: "local-only",
           updateChannel: "latest",
           updateChannelConfiguredByUser: false,
+          titleBarMode: "custom",
         },
         "network-accessible",
       ),
     ).toEqual({
       serverExposureMode: "network-accessible",
       updateChannel: "latest",
       updateChannelConfiguredByUser: false,
+      titleBarMode: "custom",
     });
   });
 
@@ -80,13 +86,34 @@ describe("desktopSettings", () => {
           serverExposureMode: "local-only",
           updateChannel: "latest",
           updateChannelConfiguredByUser: false,
+          titleBarMode: "custom",
         },
         "nightly",
       ),
     ).toEqual({
       serverExposureMode: "local-only",
       updateChannel: "nightly",
       updateChannelConfiguredByUser: true,
+      titleBarMode: "custom",
+    });
+  });
+
+  it("persists the requested titlebar mode", () => {
+    expect(
+      setDesktopTitleBarModePreference(
+        {
+          serverExposureMode: "local-only",
+          updateChannel: "latest",
+          updateChannelConfiguredByUser: false,
+          titleBarMode: "custom",
+        },
+        "native",
+      ),
+    ).toEqual({
+      serverExposureMode: "local-only",
+      updateChannel: "latest",
+      updateChannelConfiguredByUser: false,
+      titleBarMode: "native",
     });
   });
 
@@ -105,6 +132,7 @@ describe("desktopSettings", () => {
       serverExposureMode: "local-only",
       updateChannel: "nightly",
       updateChannelConfiguredByUser: false,
+      titleBarMode: "custom",
     });
   });
 
@@ -123,6 +151,7 @@ describe("desktopSettings", () => {
       serverExposureMode: "local-only",
       updateChannel: "nightly",
       updateChannelConfiguredByUser: false,
+      titleBarMode: "custom",
     });
   });
 
@@ -142,6 +171,7 @@ describe("desktopSettings", () => {
       serverExposureMode: "local-only",
       updateChannel: "latest",
       updateChannelConfiguredByUser: true,
+      titleBarMode: "custom",
     });
   });
 });
diff --git a/apps/desktop/src/desktopSettings.ts b/apps/desktop/src/desktopSettings.ts
@@ -1,19 +1,25 @@
 import * as FS from "node:fs";
 import * as Path from "node:path";
-import type { DesktopServerExposureMode, DesktopUpdateChannel } from "@t3tools/contracts";
+import type {
+  DesktopServerExposureMode,
+  DesktopTitleBarMode,
+  DesktopUpdateChannel,
+} from "@t3tools/contracts";
 
 import { resolveDefaultDesktopUpdateChannel } from "./updateChannels.ts";
 
 export interface DesktopSettings {
   readonly serverExposureMode: DesktopServerExposureMode;
   readonly updateChannel: DesktopUpdateChannel;
   readonly updateChannelConfiguredByUser: boolean;
+  readonly titleBarMode: DesktopTitleBarMode;
 }
 
 export const DEFAULT_DESKTOP_SETTINGS: DesktopSettings = {
   serverExposureMode: "local-only",
   updateChannel: "latest",
   updateChannelConfiguredByUser: false,
+  titleBarMode: "custom",
 };
 
 export function resolveDefaultDesktopSettings(appVersion: string): DesktopSettings {
@@ -46,6 +52,18 @@ export function setDesktopUpdateChannelPreference(
   };
 }
 
+export function setDesktopTitleBarModePreference(
+  settings: DesktopSettings,
+  requestedMode: DesktopTitleBarMode,
+): DesktopSettings {
+  return settings.titleBarMode === requestedMode
+    ? settings
+    : {
+        ...settings,
+        titleBarMode: requestedMode,
+      };
+}
+
 export function readDesktopSettings(settingsPath: string, appVersion: string): DesktopSettings {
   const defaultSettings = resolveDefaultDesktopSettings(appVersion);
 
@@ -59,6 +77,7 @@ export function readDesktopSettings(settingsPath: string, appVersion: string): D
       readonly serverExposureMode?: unknown;
       readonly updateChannel?: unknown;
       readonly updateChannelConfiguredByUser?: unknown;
+      readonly titleBarMode?: unknown;
     };
     const parsedUpdateChannel =
       parsed.updateChannel === "nightly" || parsed.updateChannel === "latest"
@@ -77,6 +96,7 @@ export function readDesktopSettings(settingsPath: string, appVersion: string): D
           ? parsedUpdateChannel
           : defaultSettings.updateChannel,
       updateChannelConfiguredByUser,
+      titleBarMode: parsed.titleBarMode === "native" ? "native" : "custom",
     };
   } catch {
     return defaultSettings;

diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
@@ -22,6 +22,7 @@ import type { MenuItemConstructorOptions, OpenDialogOptions } from "electron";
 import type {
   ClientSettings,
   DesktopTheme,
+  DesktopTitleBarMode,
   DesktopAppBranding,
   DesktopServerExposureMode,
   DesktopServerExposureState,
@@ -41,6 +42,7 @@ import {
   DEFAULT_DESKTOP_SETTINGS,
   readDesktopSettings,
   setDesktopServerExposurePreference,
+  setDesktopTitleBarModePreference,
   setDesktopUpdateChannelPreference,
   writeDesktopSettings,
 } from "./desktopSettings.ts";
@@ -102,6 +104,8 @@ const SET_SAVED_ENVIRONMENT_SECRET_CHANNEL = "desktop:set-saved-environment-secr
 const REMOVE_SAVED_ENVIRONMENT_SECRET_CHANNEL = "desktop:remove-saved-environment-secret";
 const GET_SERVER_EXPOSURE_STATE_CHANNEL = "desktop:get-server-exposure-state";
 const SET_SERVER_EXPOSURE_MODE_CHANNEL = "desktop:set-server-exposure-mode";
+const GET_TITLE_BAR_MODE_CHANNEL = "desktop:get-titlebar-mode";
+const SET_TITLE_BAR_MODE_CHANNEL = "desktop:set-titlebar-mode";
 const BASE_DIR = process.env.T3CODE_HOME?.trim() || Path.join(OS.homedir(), ".t3");
 const STATE_DIR = Path.join(BASE_DIR, "userdata");
 const DESKTOP_SETTINGS_PATH = Path.join(STATE_DIR, "desktop-settings.json");
@@ -435,6 +439,14 @@ function getSafeTheme(rawTheme: unknown): DesktopTheme | null {
   return null;
 }
 
+function getSafeTitleBarMode(rawMode: unknown): DesktopTitleBarMode | null {
+  if (rawMode === "custom" || rawMode === "native") {
+    return rawMode;
+  }
+
+  return null;
+}
+
 async function waitForBackendHttpReady(
   baseUrl: string,
   options?: Parameters<typeof waitForHttpReady>[1],
@@ -1669,6 +1681,26 @@ function registerIpcHandlers(): void {
     return nextState;
   });
 
+  ipcMain.removeHandler(GET_TITLE_BAR_MODE_CHANNEL);
+  ipcMain.handle(GET_TITLE_BAR_MODE_CHANNEL, async () => desktopSettings.titleBarMode);
+
+  ipcMain.removeHandler(SET_TITLE_BAR_MODE_CHANNEL);
+  ipcMain.handle(SET_TITLE_BAR_MODE_CHANNEL, async (_event, rawMode: unknown) => {
+    const mode = getSafeTitleBarMode(rawMode);
+    if (!mode) {
+      throw new Error("Invalid titlebar mode input.");
+    }
+
+    if (desktopSettings.titleBarMode === mode) {
+      return mode;
+    }
+
+    desktopSettings = setDesktopTitleBarModePreference(desktopSettings, mode);
+    writeDesktopSettings(DESKTOP_SETTINGS_PATH, desktopSettings);
+    relaunchDesktopApp(`titleBarMode=${mode}`);
+    return mode;
+  });
+
   ipcMain.removeHandler(PICK_FOLDER_CHANNEL);
   ipcMain.handle(PICK_FOLDER_CHANNEL, async (_event, rawOptions: unknown) => {
     const owner = BrowserWindow.getFocusedWindow() ?? mainWindow;
@@ -1879,6 +1911,10 @@ function getInitialWindowBackgroundColor(): string {
 }
 
 function getWindowTitleBarOptions(): WindowTitleBarOptions {
+  if (desktopSettings.titleBarMode === "native") {
+    return {};
+  }
+
   if (process.platform === "darwin") {
     return {
       titleBarStyle: "hiddenInset",

diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts
@@ -24,6 +24,8 @@ const SET_SAVED_ENVIRONMENT_SECRET_CHANNEL = "desktop:set-saved-environment-secr
 const REMOVE_SAVED_ENVIRONMENT_SECRET_CHANNEL = "desktop:remove-saved-environment-secret";
 const GET_SERVER_EXPOSURE_STATE_CHANNEL = "desktop:get-server-exposure-state";
 const SET_SERVER_EXPOSURE_MODE_CHANNEL = "desktop:set-server-exposure-mode";
+const GET_TITLE_BAR_MODE_CHANNEL = "desktop:get-titlebar-mode";
+const SET_TITLE_BAR_MODE_CHANNEL = "desktop:set-titlebar-mode";
 
 contextBridge.exposeInMainWorld("desktopBridge", {
   getAppBranding: () => {
@@ -53,6 +55,8 @@ contextBridge.exposeInMainWorld("desktopBridge", {
     ipcRenderer.invoke(REMOVE_SAVED_ENVIRONMENT_SECRET_CHANNEL, environmentId),
   getServerExposureState: () => ipcRenderer.invoke(GET_SERVER_EXPOSURE_STATE_CHANNEL),
   setServerExposureMode: (mode) => ipcRenderer.invoke(SET_SERVER_EXPOSURE_MODE_CHANNEL, mode),
+  getTitleBarMode: () => ipcRenderer.invoke(GET_TITLE_BAR_MODE_CHANNEL),
+  setTitleBarMode: (mode) => ipcRenderer.invoke(SET_TITLE_BAR_MODE_CHANNEL, mode),
   pickFolder: (options) => ipcRenderer.invoke(PICK_FOLDER_CHANNEL, options),
   confirm: (message) => ipcRenderer.invoke(CONFIRM_CHANNEL, message),
   setTheme: (theme) => ipcRenderer.invoke(SET_THEME_CHANNEL, theme),

diff --git a/apps/web/src/components/settings/SettingsPanels.browser.tsx b/apps/web/src/components/settings/SettingsPanels.browser.tsx
@@ -23,6 +23,21 @@
 import { ConnectionsSettings } from "./ConnectionsSettings";
 import { GeneralSettingsPanel } from "./SettingsPanels";
 
+vi.mock("../../env", () => {
+  // Export a runtime getter for `isElectron` so tests that don't provide a
+  // QueryClientProvider can keep rendering the simpler AboutVersionTitle,
+  // while tests that set up a desktop bridge/nativeApi will exercise the
+  // full AboutVersionSection which calls `useQueryClient()`.
+  return {
+    get isElectron() {
+      return (
+        typeof window !== "undefined" &&
+        (window.desktopBridge !== undefined || window.nativeApi !== undefined)
+      );
+    },
+  };
+});
+
 const authAccessHarness = vi.hoisted(() => {
   type Snapshot = AuthAccessSnapshot;
   let snapshot: Snapshot = {
@@ -260,6 +275,8 @@
   readonly serverExposureState?: Awaited<ReturnType<DesktopBridge["getServerExposureState"]>>;
   readonly setServerExposureMode?: DesktopBridge["setServerExposureMode"];
   readonly setUpdateChannel?: DesktopBridge["setUpdateChannel"];
+  readonly titleBarMode?: Awaited<ReturnType<DesktopBridge["getTitleBarMode"]>>;
+  readonly setTitleBarMode?: DesktopBridge["setTitleBarMode"];
 }): DesktopBridge => {
   const idleUpdateState: DesktopUpdateState = {
     enabled: false,
@@ -310,6 +327,8 @@
     pickFolder: vi.fn().mockResolvedValue(null),
     confirm: vi.fn().mockResolvedValue(false),
     setTheme: vi.fn().mockResolvedValue(undefined),
+    getTitleBarMode: vi.fn().mockResolvedValue(overrides?.titleBarMode ?? "custom"),
+    setTitleBarMode: overrides?.setTitleBarMode ?? vi.fn().mockImplementation(async (mode) => mode),
     showContextMenu: vi.fn().mockResolvedValue(null),
     openExternal: vi.fn().mockResolvedValue(true),
     onMenuAction: () => () => {},
@@ -453,6 +472,28 @@
       .toBeInTheDocument();
   });
 
+  it("changes desktop titlebar mode after confirmation", async () => {
+    const desktopBridge = createDesktopBridgeStub({
+      titleBarMode: "custom",
+    });
+    vi.mocked(desktopBridge.confirm).mockResolvedValue(true);
+    window.desktopBridge = desktopBridge;
+    setServerConfigSnapshot(createBaseServerConfig());
+
+    mounted = await render(
+      <AppAtomRegistryProvider>
+        <GeneralSettingsPanel />
+      </AppAtomRegistryProvider>,
+    );
+
+    await expect.element(page.getByLabelText("Window titlebar mode")).toBeInTheDocument();
+    await page.getByLabelText("Window titlebar mode").click();
+    await page.getByText("Native", { exact: true }).click();
+    await vi.waitFor(() => {
+      expect(desktopBridge.setTitleBarMode).toHaveBeenCalledWith("native");
+    });
+  });
+
   it("creates and shows a pairing link when network access is enabled", async () => {
     window.desktopBridge = createDesktopBridgeStub({
       serverExposureState: {