chore: resolve merge conflict in bootstrap.ts

Keep settings window parent logic for Windows during merge with remote.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

apps/desktop-client/src/main/bootstrap.ts

@@ -478,8 +478,19 @@ function queueWindowModeSwitch(
 }
 
 async function openSettingsWindow(): Promise<void> {
-  const window = await ensureSettingsWindow()
+  const window = await ensureSettingsWindow();
-  await revealWindow(window)
+  const parent = settingsWindowParent();
+  if (parent && window.getParentWindow() !== parent) {
+    window.setParentWindow(parent);
+  }
+  await revealWindow(window);
+}
+
+function settingsWindowParent(): ElectronBrowserWindow | undefined {
+  if (process.platform !== "win32") {
+    return undefined;
+  }
+  return currentMainWindow() ?? undefined;
 }
 
 function rendererURL(): string | null {
@@ -618,6 +629,7 @@ async function createSettingsWindow(): Promise<ElectronBrowserWindow> {
   const initial = SETTINGS_WINDOW_SIZE
   const backgroundColor = nativeTheme.shouldUseDarkColors ? '#15191a' : '#f2f4f7'
   const window = new BrowserWindow({
+    parent: settingsWindowParent(),
     width: initial.width,
     height: initial.height,
     minWidth: initial.minWidth,