From 32d93a36532b9149545774ac4d304bc2b9a3518d Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 01:29:41 +0300
Subject: [PATCH 01/53] fix(overlay/hotkeys): wave 1 UX bugfixes

- #7 numpad hotkeys: emit canonical W3C codes (NumpadSubtract etc.)
  the global-hotkey crate accepts; old short tokens (numsub/nummult/
  numdiv/numdec/NumpadEnter->Enter) failed to register and silently
  reverted. Right-Alt: detect held modifiers by event.code so AltGr
  (key AltGraph) no longer reads as a bad main key.
- #6 re-applying an identical hotkey: idempotent register + a re-apply
  window event so a same-value re-record re-claims the binding;
  recorder shows an applied confirmation.
- #17 close ConfirmDialog when the overlay locks.
- #20 dismiss the RMB transparency menu on lock and on window blur.
- #22 Enter key saves the Tarkov paths form.
- #23 clamp the overlay onto a visible monitor at startup when the
  window-state plugin restored off-screen coords (2K -> FHD).

Adds hotkey.spec.ts (18 cases) cross-checking emitted tokens against
the global-hotkey 0.7.0 parser table.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/App.vue                       |  10 ++
 apps/client/src/__tests__/hotkey.spec.ts      | 159 ++++++++++++++++++
 .../hotkeys/components/HotkeyRecorder.vue     |  25 ++-
 .../hotkeys/composables/useGlobalShortcut.ts  |  13 ++
 .../client/src/features/hotkeys/lib/hotkey.ts |  90 +++++++---
 .../overlay/components/MapQuickMenu.vue       |   6 +
 .../settings/sections/PathsSection.vue        |   2 +
 apps/desktop/src-tauri/src/lib.rs             |  54 ++++++
 8 files changed, 331 insertions(+), 28 deletions(-)
 create mode 100644 apps/client/src/__tests__/hotkey.spec.ts

diff --git a/apps/client/src/App.vue b/apps/client/src/App.vue
index 5366711..07e69b5 100644
--- a/apps/client/src/App.vue
+++ b/apps/client/src/App.vue
@@ -11,6 +11,7 @@ import { useTrayIcon } from '@/features/overlay/composables/useTrayIcon';
 import { useOverlayBootstrap } from '@/features/overlay/composables/useOverlayBootstrap';
 import { useAutoMapSwitch } from '@/features/map/composables/useAutoMapSwitch';
 import { eventsUrl } from '@/shared/config';
+import { useConfirm } from 'primevue/useconfirm';
 
 const { clickThrough: overlayClickThrough } = storeToRefs(useOverlayStore());
 const { lockHotkey } = storeToRefs(useHotkeysStore());
@@ -35,8 +36,17 @@ useGlobalShortcut(isTauri, lockHotkey, () => {
 useOverlayBootstrap(overlayClickThrough);
 useTrayIcon(isTauri, overlayClickThrough);
 
+const confirm = useConfirm();
 const quickMenu = ref<InstanceType<typeof MapQuickMenu> | null>(null);
 
+// Close transient UI when the overlay locks so click-through can't strand them.
+watch(overlayClickThrough, (locked) => {
+  if (locked) {
+    confirm.close();
+    quickMenu.value?.close();
+  }
+});
+
 // Right-click anywhere over the Leaflet canvas opens the transparency panel.
 // Lives at the app root so the same gesture works regardless of which route
 // is mounted underneath.
diff --git a/apps/client/src/__tests__/hotkey.spec.ts b/apps/client/src/__tests__/hotkey.spec.ts
new file mode 100644
index 0000000..06a614b
--- /dev/null
+++ b/apps/client/src/__tests__/hotkey.spec.ts
@@ -0,0 +1,159 @@
+import { describe, it, expect } from 'vitest';
+import { captureHotkey, formatHotkeyParts } from '@/features/hotkeys/lib/hotkey';
+
+// Mirror of the keys accepted by global-hotkey 0.7.0's `parse_key` (uppercased
+// before matching). Our captured main-key tokens MUST land in this set or
+// Tauri's register() throws and the binding silently reverts (the Num- bug).
+const CRATE_ACCEPTED = new Set<string>([
+  ...'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''),
+  ...'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('').map((l) => `KEY${l}`),
+  ...'0123456789'.split(''),
+  ...'0123456789'.split('').map((d) => `DIGIT${d}`),
+  'BACKQUOTE', '`', 'BACKSLASH', '\\', 'BRACKETLEFT', '[', 'BRACKETRIGHT', ']',
+  'COMMA', ',', 'EQUAL', '=', 'MINUS', '-', 'PERIOD', '.', 'QUOTE', "'",
+  'SEMICOLON', ';', 'SLASH', '/',
+  'SPACE', 'TAB', 'ENTER', 'BACKSPACE', 'DELETE', 'END', 'HOME', 'INSERT',
+  'PAGEDOWN', 'PAGEUP',
+  'ARROWDOWN', 'DOWN', 'ARROWLEFT', 'LEFT', 'ARROWRIGHT', 'RIGHT', 'ARROWUP', 'UP',
+  'NUMPAD0', 'NUM0', 'NUMPAD1', 'NUM1', 'NUMPAD2', 'NUM2', 'NUMPAD3', 'NUM3',
+  'NUMPAD4', 'NUM4', 'NUMPAD5', 'NUM5', 'NUMPAD6', 'NUM6', 'NUMPAD7', 'NUM7',
+  'NUMPAD8', 'NUM8', 'NUMPAD9', 'NUM9',
+  'NUMPADADD', 'NUMADD', 'NUMPADPLUS', 'NUMPLUS',
+  'NUMPADSUBTRACT', 'NUMSUBTRACT',
+  'NUMPADMULTIPLY', 'NUMMULTIPLY',
+  'NUMPADDIVIDE', 'NUMDIVIDE',
+  'NUMPADDECIMAL', 'NUMDECIMAL',
+  'NUMPADENTER', 'NUMENTER', 'NUMPADEQUAL', 'NUMEQUAL',
+  ...Array.from({ length: 24 }, (_, i) => `F${i + 1}`),
+]);
+
+interface Mods {
+  ctrl?: boolean;
+  alt?: boolean;
+  shift?: boolean;
+  meta?: boolean;
+}
+
+function ev(code: string, mods: Mods = {}, key = ''): KeyboardEvent {
+  return new KeyboardEvent('keydown', {
+    code,
+    key,
+    ctrlKey: !!mods.ctrl,
+    altKey: !!mods.alt,
+    shiftKey: !!mods.shift,
+    metaKey: !!mods.meta,
+  });
+}
+
+/** Last token of an accelerator string (the main key). */
+function mainKey(combo: string): string {
+  const parts = combo.split('+');
+  return parts[parts.length - 1] ?? '';
+}
+
+describe('captureHotkey — main keys', () => {
+  it('letters map KeyX → X', () => {
+    expect(captureHotkey(ev('KeyL', { ctrl: true, alt: true })).combo).toBe('CommandOrControl+Alt+L');
+  });
+
+  it('digits map DigitN → N', () => {
+    expect(captureHotkey(ev('Digit5', { ctrl: true })).combo).toBe('CommandOrControl+5');
+  });
+
+  it('function keys pass through', () => {
+    expect(captureHotkey(ev('F7', { alt: true })).combo).toBe('Alt+F7');
+  });
+
+  it('main-row minus is "-"', () => {
+    expect(captureHotkey(ev('Minus', { ctrl: true })).combo).toBe('CommandOrControl+-');
+  });
+
+  it('meta counts as CommandOrControl', () => {
+    expect(captureHotkey(ev('KeyK', { meta: true })).combo).toBe('CommandOrControl+K');
+  });
+});
+
+describe('captureHotkey — numpad (regression for the Num- bug)', () => {
+  const NUMPAD_CODES = [
+    'Numpad0', 'Numpad1', 'Numpad2', 'Numpad3', 'Numpad4',
+    'Numpad5', 'Numpad6', 'Numpad7', 'Numpad8', 'Numpad9',
+    'NumpadAdd', 'NumpadSubtract', 'NumpadMultiply', 'NumpadDivide', 'NumpadDecimal',
+    'NumpadEnter',
+  ];
+
+  it('NumpadSubtract no longer collapses to "-"', () => {
+    const combo = captureHotkey(ev('NumpadSubtract', { ctrl: true })).combo;
+    expect(combo).toBe('CommandOrControl+NumpadSubtract');
+    expect(mainKey(combo!)).not.toBe('-');
+  });
+
+  it('NumpadAdd keeps working', () => {
+    expect(captureHotkey(ev('NumpadAdd', { ctrl: true })).combo).toBe('CommandOrControl+NumpadAdd');
+  });
+
+  it('every numpad token is accepted by the global-hotkey parser', () => {
+    for (const code of NUMPAD_CODES) {
+      const combo = captureHotkey(ev(code, { ctrl: true })).combo;
+      expect(combo, `no combo for ${code}`).toBeTruthy();
+      const token = mainKey(combo!).toUpperCase();
+      expect(CRATE_ACCEPTED.has(token), `${code} → "${token}" rejected by crate`).toBe(true);
+    }
+  });
+});
+
+describe('captureHotkey — validation', () => {
+  it('requires a modifier', () => {
+    const r = captureHotkey(ev('KeyL'));
+    expect(r.combo).toBeNull();
+    expect(r.error).toBe('no-modifier');
+  });
+
+  it('Escape cancels recording', () => {
+    const r = captureHotkey(ev('Escape', { ctrl: true }, 'Escape'));
+    expect(r.cancelled).toBe(true);
+  });
+
+  it('holding only modifiers waits for a main key', () => {
+    const r = captureHotkey(ev('ControlLeft', { ctrl: true }, 'Control'));
+    expect(r.combo).toBeNull();
+    expect(r.error).toBeNull();
+  });
+
+  it('right Alt as AltGraph waits, not "invalid"', () => {
+    // AltGr layouts report key="AltGraph" (not in MODIFIER_KEYS) — the code match saves it.
+    const r = captureHotkey(ev('AltRight', { ctrl: true, alt: true }, 'AltGraph'));
+    expect(r.combo).toBeNull();
+    expect(r.error).toBeNull();
+  });
+
+  it('right Alt as plain Alt waits', () => {
+    const r = captureHotkey(ev('AltRight', { alt: true }, 'Alt'));
+    expect(r.combo).toBeNull();
+    expect(r.error).toBeNull();
+  });
+
+  it('right-modifier codes are never main keys', () => {
+    for (const code of ['ShiftRight', 'ControlRight', 'MetaRight']) {
+      expect(captureHotkey(ev(code, { shift: true })).error).toBeNull();
+    }
+  });
+
+  it('unmapped keys are rejected', () => {
+    const r = captureHotkey(ev('MediaSelect', { ctrl: true }));
+    expect(r.error).toBe('bad-main-key');
+  });
+});
+
+describe('formatHotkeyParts', () => {
+  it('renders canonical numpad tokens', () => {
+    expect(formatHotkeyParts('CommandOrControl+NumpadSubtract')).toEqual(['Ctrl', 'Num -']);
+  });
+
+  it('still renders legacy persisted tokens', () => {
+    expect(formatHotkeyParts('CommandOrControl+numadd')).toEqual(['Ctrl', 'Num +']);
+  });
+
+  it('uppercases unknown main keys', () => {
+    expect(formatHotkeyParts('Alt+F7')).toEqual(['Alt', 'F7']);
+  });
+});
diff --git a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
index e6af8a1..05ea518 100644
--- a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
+++ b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { captureHotkey, formatHotkeyParts } from '../lib/hotkey';
+import { captureHotkey, formatHotkeyParts, HOTKEY_REAPPLY_EVENT } from '../lib/hotkey';
 
 const props = defineProps<{
   /** Current accelerator string (e.g. "CommandOrControl+Alt+L"). */
@@ -16,9 +16,17 @@ const { t } = useI18n();
 
 const recording = ref(false);
 const error = ref<'invalid' | null>(null);
+const applied = ref(false);
+let appliedTimer: ReturnType<typeof setTimeout> | undefined;
 
 const displayParts = computed(() => formatHotkeyParts(props.modelValue));
 
+function flashApplied(): void {
+  applied.value = true;
+  clearTimeout(appliedTimer);
+  appliedTimer = setTimeout(() => (applied.value = false), 1200);
+}
+
 // Module-level guard so only one recorder is active across all instances —
 // if a recorder is already listening, starting another one stops the first.
 // Without this, every recorder's window-keydown handler would fire on the
@@ -52,13 +60,21 @@ function onKey(event: KeyboardEvent): void {
     return;
   }
   if (result.combo) {
+    const unchanged = result.combo === props.modelValue;
     emit('update:modelValue', result.combo);
     error.value = null;
+    flashApplied();
+    // Same value won't trip the registration watch — broadcast a re-apply so
+    // the binding is re-claimed and the user sees it took.
+    if (unchanged) window.dispatchEvent(new Event(HOTKEY_REAPPLY_EVENT));
     stopRecording();
   }
 }
 
-onBeforeUnmount(() => stopRecording());
+onBeforeUnmount(() => {
+  stopRecording();
+  clearTimeout(appliedTimer);
+});
 </script>
 
 <script lang="ts">
@@ -80,8 +96,8 @@ let currentRecorder: { cancel: () => void } | null = null;
       />
     </div>
     <div
-      class="inline-flex items-center gap-1 rounded-md bg-surface-900/60 px-2 py-1.5 text-[11px] font-semibold tracking-wider"
-      :class="recording ? 'ring-2 ring-primary' : ''"
+      class="inline-flex items-center gap-1 rounded-md bg-surface-900/60 px-2 py-1.5 text-[11px] font-semibold tracking-wider transition-shadow"
+      :class="recording ? 'ring-2 ring-primary' : applied ? 'ring-2 ring-green-500' : ''"
     >
       <template v-if="recording">
         <span class="opacity-70">{{ t('hotkeys.recordingPrompt') }}</span>
@@ -93,6 +109,7 @@ let currentRecorder: { cancel: () => void } | null = null;
           </span>
           <span v-if="idx < displayParts.length - 1" class="px-1 opacity-60">+</span>
         </span>
+        <i v-if="applied" class="pi pi-check ml-1 text-green-500" />
       </template>
     </div>
     <p v-if="error === 'invalid'" class="mt-1.5 text-[10px] leading-relaxed text-amber-400">
diff --git a/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts b/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
index 6a634df..48765fd 100644
--- a/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
+++ b/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
@@ -1,3 +1,5 @@
+import { HOTKEY_REAPPLY_EVENT } from '../lib/hotkey';
+
 /**
  * Register a Tauri global shortcut that mirrors a reactive combo string. On
  * mount we register the current combo; on every change the old combo is
@@ -15,6 +17,10 @@ export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action:
 
   async function tryRegister(next: string): Promise<boolean> {
     if (!isTauri) return false;
+    // Re-applying the already-active combo is a success, not a churn: skip the
+    // unregister→register dance so it can't transiently fail and trigger a
+    // misleading revert.
+    if (next === registered) return true;
     const { register, unregister } = await import('@tauri-apps/plugin-global-shortcut');
     if (registered) {
       try {
@@ -50,6 +56,13 @@ export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action:
     void tryRegister(combo.value);
   });
 
+  // Re-recording an identical combo doesn't change the ref, so the watch below
+  // never fires. The recorder broadcasts this event to force a re-claim — a
+  // no-op if already active, a recovery if a prior register failed.
+  useEventListener(window, HOTKEY_REAPPLY_EVENT, () => {
+    void tryRegister(combo.value);
+  });
+
   watch(combo, async (next, prev) => {
     if (suppressNext) {
       suppressNext = false;
diff --git a/apps/client/src/features/hotkeys/lib/hotkey.ts b/apps/client/src/features/hotkeys/lib/hotkey.ts
index 5171042..463feb1 100644
--- a/apps/client/src/features/hotkeys/lib/hotkey.ts
+++ b/apps/client/src/features/hotkeys/lib/hotkey.ts
@@ -25,6 +25,26 @@ const MODIFIER_DISPLAY: Readonly<Record<string, string>> = {
 /** Display labels for non-modifier main keys. Anything not listed falls back
  *  to an uppercased version of the token. */
 const KEY_DISPLAY: Readonly<Record<string, string>> = {
+  // Canonical numpad tokens — equal to KeyboardEvent.code, accepted verbatim
+  // by the global-hotkey crate (it uppercases before matching).
+  Numpad0: 'Num 0',
+  Numpad1: 'Num 1',
+  Numpad2: 'Num 2',
+  Numpad3: 'Num 3',
+  Numpad4: 'Num 4',
+  Numpad5: 'Num 5',
+  Numpad6: 'Num 6',
+  Numpad7: 'Num 7',
+  Numpad8: 'Num 8',
+  Numpad9: 'Num 9',
+  NumpadAdd: 'Num +',
+  NumpadSubtract: 'Num -',
+  NumpadMultiply: 'Num *',
+  NumpadDivide: 'Num /',
+  NumpadDecimal: 'Num .',
+  NumpadEnter: 'Num ↵',
+  // Legacy short tokens — only num0-9/numadd ever persisted (the others
+  // reverted on a failed register), kept so old binds still render right.
   num0: 'Num 0',
   num1: 'Num 1',
   num2: 'Num 2',
@@ -36,10 +56,6 @@ const KEY_DISPLAY: Readonly<Record<string, string>> = {
   num8: 'Num 8',
   num9: 'Num 9',
   numadd: 'Num +',
-  numsub: 'Num -',
-  nummult: 'Num *',
-  numdiv: 'Num /',
-  numdec: 'Num .',
   Up: '↑',
   Down: '↓',
   Left: '←',
@@ -56,7 +72,28 @@ const KEY_DISPLAY: Readonly<Record<string, string>> = {
   PageDown: 'PgDn',
 };
 
-const MODIFIER_KEYS = new Set(['Control', 'Alt', 'Shift', 'Meta', 'OS']);
+// `AltGraph` is what right-Alt reports on AltGr layouts.
+const MODIFIER_KEYS = new Set(['Control', 'Alt', 'AltGraph', 'Shift', 'Meta', 'OS']);
+
+// Physical modifier codes — matching on `event.code` is layout-independent, so
+// right-Alt (code "AltRight", key "AltGraph") is treated as a held modifier
+// rather than misread as a bad main key.
+const MODIFIER_CODES = new Set([
+  'ControlLeft',
+  'ControlRight',
+  'AltLeft',
+  'AltRight',
+  'ShiftLeft',
+  'ShiftRight',
+  'MetaLeft',
+  'MetaRight',
+  'OSLeft',
+  'OSRight',
+]);
+
+/** Window event the recorder fires so live registrations re-claim their combo
+ *  even when the value is unchanged (a same-value write doesn't trip a watch). */
+export const HOTKEY_REAPPLY_EVENT = 'tc:hotkey-reapply';
 
 /**
  * Split an accelerator string into display-friendly parts (e.g. for rendering
@@ -91,7 +128,7 @@ export function captureHotkey(event: KeyboardEvent): CaptureResult {
     return { combo: null, cancelled: true, error: null };
   }
   // Holding only modifiers — wait for the main key.
-  if (MODIFIER_KEYS.has(event.key)) {
+  if (MODIFIER_KEYS.has(event.key) || MODIFIER_CODES.has(event.code)) {
     return { combo: null, cancelled: false, error: null };
   }
 
@@ -122,24 +159,29 @@ export function captureHotkey(event: KeyboardEvent): CaptureResult {
 
 // `KeyboardEvent.code` → Tauri accelerator token for non-letter/digit/F keys.
 const CODE_TO_ACCEL: Readonly<Record<string, string>> = {
-  // Numpad digits
-  Numpad0: 'num0',
-  Numpad1: 'num1',
-  Numpad2: 'num2',
-  Numpad3: 'num3',
-  Numpad4: 'num4',
-  Numpad5: 'num5',
-  Numpad6: 'num6',
-  Numpad7: 'num7',
-  Numpad8: 'num8',
-  Numpad9: 'num9',
-  // Numpad operators
-  NumpadAdd: 'numadd',
-  NumpadSubtract: 'numsub',
-  NumpadMultiply: 'nummult',
-  NumpadDivide: 'numdiv',
-  NumpadDecimal: 'numdec',
-  NumpadEnter: 'Enter',
+  // Numpad keys: emit the canonical W3C code (== KeyboardEvent.code). The
+  // global-hotkey crate uppercases and matches these verbatim; the old short
+  // tokens (numsub/nummult/numdiv/numdec) were NOT in its alias table, so they
+  // failed to register and silently reverted — only numadd/num0-9 happened to
+  // have aliases. Passing the canonical code makes every numpad key work.
+  Numpad0: 'Numpad0',
+  Numpad1: 'Numpad1',
+  Numpad2: 'Numpad2',
+  Numpad3: 'Numpad3',
+  Numpad4: 'Numpad4',
+  Numpad5: 'Numpad5',
+  Numpad6: 'Numpad6',
+  Numpad7: 'Numpad7',
+  Numpad8: 'Numpad8',
+  Numpad9: 'Numpad9',
+  NumpadAdd: 'NumpadAdd',
+  NumpadSubtract: 'NumpadSubtract',
+  NumpadMultiply: 'NumpadMultiply',
+  NumpadDivide: 'NumpadDivide',
+  NumpadDecimal: 'NumpadDecimal',
+  // Distinct from main Enter — registering 'Enter' here would never fire on the
+  // numpad key the user actually pressed.
+  NumpadEnter: 'NumpadEnter',
   // Punctuation (literal character tokens accepted by Tauri/Electron accel)
   Slash: '/',
   Backslash: '\\',
diff --git a/apps/client/src/features/overlay/components/MapQuickMenu.vue b/apps/client/src/features/overlay/components/MapQuickMenu.vue
index 7279208..1d48471 100644
--- a/apps/client/src/features/overlay/components/MapQuickMenu.vue
+++ b/apps/client/src/features/overlay/components/MapQuickMenu.vue
@@ -34,6 +34,12 @@ useEventListener(window, 'keydown', (e) => {
   if (e.key === 'Escape' && position.value) close();
 });
 
+// Close when the overlay loses focus or is hidden (e.g. Alt+Tab, lock).
+useEventListener(window, 'blur', () => close());
+useEventListener(document, 'visibilitychange', () => {
+  if (document.visibilityState === 'hidden') close();
+});
+
 defineExpose({ open, close });
 </script>
 
diff --git a/apps/client/src/features/settings/sections/PathsSection.vue b/apps/client/src/features/settings/sections/PathsSection.vue
index 594efa8..058f64f 100644
--- a/apps/client/src/features/settings/sections/PathsSection.vue
+++ b/apps/client/src/features/settings/sections/PathsSection.vue
@@ -64,6 +64,7 @@ const {
             :readonly="!canEditPaths"
             size="small"
             fluid
+            @keyup.enter="canSavePaths && savePaths()"
           />
         </IconField>
       </div>
@@ -82,6 +83,7 @@ const {
             :readonly="!canEditPaths"
             size="small"
             fluid
+            @keyup.enter="canSavePaths && savePaths()"
           />
         </IconField>
       </div>
diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
index 9b56125..f2dcc87 100644
--- a/apps/desktop/src-tauri/src/lib.rs
+++ b/apps/desktop/src-tauri/src/lib.rs
@@ -54,8 +54,62 @@ pub fn run() {
                 app_handle: app_handle.clone(),
             });
 
+            // Clamp restored window onto a visible monitor (handles 2K→FHD moves).
+            if let Some(win) = app.get_webview_window("main") {
+                clamp_window_to_monitor(&win);
+            }
+
             Ok(())
         })
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
+
+/// Reposition the window if the window-state plugin restored coordinates that
+/// land off every current monitor (monitor layout changed between sessions).
+fn clamp_window_to_monitor(window: &tauri::WebviewWindow) {
+    const MIN_OVERLAP: i32 = 48;
+
+    let Ok(pos) = window.outer_position() else { return };
+    let Ok(size) = window.outer_size() else { return };
+    let Ok(monitors) = window.available_monitors() else { return };
+
+    if monitors.is_empty() {
+        return;
+    }
+
+    let wx1 = pos.x;
+    let wy1 = pos.y;
+    let wx2 = wx1 + size.width as i32;
+    let wy2 = wy1 + size.height as i32;
+
+    let on_screen = monitors.iter().any(|m| {
+        let mx1 = m.position().x;
+        let my1 = m.position().y;
+        let mx2 = mx1 + m.size().width as i32;
+        let my2 = my1 + m.size().height as i32;
+
+        let ix = (wx2.min(mx2) - wx1.max(mx1)).max(0);
+        let iy = (wy2.min(my2) - wy1.max(my1)).max(0);
+        ix >= MIN_OVERLAP && iy >= MIN_OVERLAP
+    });
+
+    if on_screen {
+        return;
+    }
+
+    // Pick primary → first available → current.
+    let target = window
+        .primary_monitor()
+        .ok()
+        .flatten()
+        .or_else(|| monitors.into_iter().next())
+        .or_else(|| window.current_monitor().ok().flatten());
+
+    if let Some(m) = target {
+        const MARGIN: i32 = 40;
+        let nx = m.position().x + MARGIN;
+        let ny = m.position().y + MARGIN;
+        let _ = window.set_position(tauri::PhysicalPosition::new(nx, ny));
+    }
+}

From ade1862559bb80d5af8c031585e8562057822bfd Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 01:40:02 +0300
Subject: [PATCH 02/53] fix(hotkeys): suspend global shortcuts while recording

The OS keeps every registered shortcut live during capture, so pressing
an already-bound combo fired its action and the OS swallowed the
keystroke before the webview saw it. That made three things impossible:
binding a combo that is already taken (e.g. the lock combo), re-recording
the identical combo (the keypress never reached the recorder, so nothing
saved), and capturing right-Alt combos that collide with a default
Ctrl+Alt binding on AltGr layouts.

The recorder now brackets capture with suspend/resume window events:
suspend unregisters every live shortcut, resume re-claims them all (which
also re-applies an unchanged re-record). Replaces the earlier reapply-
event hack, which never ran because capture itself was being blocked.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../hotkeys/components/HotkeyRecorder.vue     | 18 +++--
 .../hotkeys/composables/useGlobalShortcut.ts  | 69 +++++++++++--------
 .../client/src/features/hotkeys/lib/hotkey.ts |  9 ++-
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
index 05ea518..82ac9fd 100644
--- a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
+++ b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
@@ -1,5 +1,10 @@
 <script setup lang="ts">
-import { captureHotkey, formatHotkeyParts, HOTKEY_REAPPLY_EVENT } from '../lib/hotkey';
+import {
+  captureHotkey,
+  formatHotkeyParts,
+  HOTKEY_SUSPEND_EVENT,
+  HOTKEY_RESUME_EVENT,
+} from '../lib/hotkey';
 
 const props = defineProps<{
   /** Current accelerator string (e.g. "CommandOrControl+Alt+L"). */
@@ -37,12 +42,17 @@ function startRecording(): void {
   currentRecorder = { cancel: stopRecording };
   recording.value = true;
   error.value = null;
+  // Drop all OS bindings so the captured combo reaches us instead of firing.
+  window.dispatchEvent(new Event(HOTKEY_SUSPEND_EVENT));
   window.addEventListener('keydown', onKey, { capture: true });
 }
 
 function stopRecording(): void {
+  if (!recording.value) return;
   recording.value = false;
   window.removeEventListener('keydown', onKey, { capture: true });
+  // Re-claim every binding (also re-applies an unchanged re-record).
+  window.dispatchEvent(new Event(HOTKEY_RESUME_EVENT));
   if (currentRecorder?.cancel === stopRecording) currentRecorder = null;
 }
 
@@ -60,13 +70,11 @@ function onKey(event: KeyboardEvent): void {
     return;
   }
   if (result.combo) {
-    const unchanged = result.combo === props.modelValue;
     emit('update:modelValue', result.combo);
     error.value = null;
     flashApplied();
-    // Same value won't trip the registration watch — broadcast a re-apply so
-    // the binding is re-claimed and the user sees it took.
-    if (unchanged) window.dispatchEvent(new Event(HOTKEY_REAPPLY_EVENT));
+    // stopRecording() resumes registration, re-claiming the combo even when the
+    // value is unchanged (a same-value write never trips the registration watch).
     stopRecording();
   }
 }
diff --git a/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts b/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
index 48765fd..e7e7e97 100644
--- a/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
+++ b/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
@@ -1,4 +1,4 @@
-import { HOTKEY_REAPPLY_EVENT } from '../lib/hotkey';
+import { HOTKEY_SUSPEND_EVENT, HOTKEY_RESUME_EVENT } from '../lib/hotkey';
 
 /**
  * Register a Tauri global shortcut that mirrors a reactive combo string. On
@@ -7,6 +7,11 @@ import { HOTKEY_REAPPLY_EVENT } from '../lib/hotkey';
  * (busy, invalid), the store ref is reverted to the previous value so the UI
  * keeps showing the actually-active hotkey.
  *
+ * While the settings recorder is capturing, every shortcut is suspended
+ * (unregistered) so the OS doesn't fire an action and swallow the keystroke —
+ * that's what lets you (re)bind a combo that's already taken, including itself.
+ * Resume re-claims the current value, which also re-applies an unchanged record.
+ *
  * In browser context all of this is a no-op so the same code lives in both.
  */
 export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action: () => void): void {
@@ -14,29 +19,34 @@ export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action:
   // Prevents the watch from looping when we revert combo.value after a
   // failed registration.
   let suppressNext = false;
+  // True while a recorder is capturing — hold no OS binding.
+  let suspended = false;
+
+  async function unregisterCurrent(): Promise<void> {
+    if (!isTauri || !registered) return;
+    const { unregister } = await import('@tauri-apps/plugin-global-shortcut');
+    try {
+      await unregister(registered);
+    } catch {
+      // Best-effort — the binding may already be gone.
+    }
+    registered = null;
+  }
 
   async function tryRegister(next: string): Promise<boolean> {
-    if (!isTauri) return false;
-    // Re-applying the already-active combo is a success, not a churn: skip the
-    // unregister→register dance so it can't transiently fail and trigger a
-    // misleading revert.
+    if (!isTauri || suspended) return false;
+    // Re-applying the already-active combo is a success, not a churn.
     if (next === registered) return true;
     const { register, unregister } = await import('@tauri-apps/plugin-global-shortcut');
-    if (registered) {
-      try {
-        await unregister(registered);
-      } catch {
-        // Ignore — old binding may already be gone if the plugin reset state.
-      }
-      registered = null;
-    }
-    // Defensive cleanup: an HMR reload may have left an orphan registration
-    // on the Rust side (old JS instance never got to onBeforeUnmount). Try
-    // to clear it before our new register call so the second attempt sticks.
+    // A suspend may have landed while the import was in flight.
+    if (suspended) return false;
+    await unregisterCurrent();
+    // Defensive: an HMR reload may have left an orphan registration on the Rust
+    // side; clear it before our register call so the attempt sticks.
     try {
       await unregister(next);
     } catch {
-      // Expected when the combo isn't registered — that's fine.
+      // Expected when the combo isn't registered.
     }
     try {
       await register(next, (e) => {
@@ -56,10 +66,14 @@ export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action:
     void tryRegister(combo.value);
   });
 
-  // Re-recording an identical combo doesn't change the ref, so the watch below
-  // never fires. The recorder broadcasts this event to force a re-claim — a
-  // no-op if already active, a recovery if a prior register failed.
-  useEventListener(window, HOTKEY_REAPPLY_EVENT, () => {
+  // The recorder brackets capture with suspend/resume so the pressed combo
+  // reaches the webview instead of firing its OS action.
+  useEventListener(window, HOTKEY_SUSPEND_EVENT, () => {
+    suspended = true;
+    void unregisterCurrent();
+  });
+  useEventListener(window, HOTKEY_RESUME_EVENT, () => {
+    suspended = false;
     void tryRegister(combo.value);
   });
 
@@ -68,6 +82,8 @@ export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action:
       suppressNext = false;
       return;
     }
+    // Recording in progress — resume will re-register the final value.
+    if (suspended) return;
     const ok = await tryRegister(next);
     if (!ok && prev) {
       // Revert store value to the working combo so the UI doesn't lie.
@@ -77,14 +93,7 @@ export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action:
     }
   });
 
-  onBeforeUnmount(async () => {
-    if (!isTauri || !registered) return;
-    const { unregister } = await import('@tauri-apps/plugin-global-shortcut');
-    try {
-      await unregister(registered);
-    } catch {
-      // Ignore — best-effort cleanup.
-    }
-    registered = null;
+  onBeforeUnmount(() => {
+    void unregisterCurrent();
   });
 }
diff --git a/apps/client/src/features/hotkeys/lib/hotkey.ts b/apps/client/src/features/hotkeys/lib/hotkey.ts
index 463feb1..f0c3199 100644
--- a/apps/client/src/features/hotkeys/lib/hotkey.ts
+++ b/apps/client/src/features/hotkeys/lib/hotkey.ts
@@ -91,9 +91,12 @@ const MODIFIER_CODES = new Set([
   'OSRight',
 ]);
 
-/** Window event the recorder fires so live registrations re-claim their combo
- *  even when the value is unchanged (a same-value write doesn't trip a watch). */
-export const HOTKEY_REAPPLY_EVENT = 'tc:hotkey-reapply';
+/** Window events the recorder fires to pause/resume all live global shortcuts
+ *  during capture. Without this the OS-registered combo fires its action and
+ *  swallows the keystroke, so an already-bound combo (incl. itself) can never
+ *  be re-captured. Resume re-claims every combo, re-applying unchanged ones. */
+export const HOTKEY_SUSPEND_EVENT = 'tc:hotkey-suspend';
+export const HOTKEY_RESUME_EVENT = 'tc:hotkey-resume';
 
 /**
  * Split an accelerator string into display-friendly parts (e.g. for rendering

From cbc760399a756050b304eae9d81cd3896e59f51e Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 01:47:46 +0300
Subject: [PATCH 03/53] fix(hotkeys): serialize register ops to stop
 resume/watch race
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The suspend/resume change introduced a regression: recording a new combo
updates the ref (firing the change-watch) AND triggers resume, and both
called tryRegister for the same combo concurrently. The second register
failed with an already-registered error, the watch took its failure path,
and reverted the value the user just set — so no hotkey could be saved.

Register/unregister now run through a per-instance promise queue, so the
watch's run sees the resume's registration and short-circuits idempotently
instead of double-registering. The revert is also gated on the combo not
having ended up registered, as a second guard.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../hotkeys/composables/useGlobalShortcut.ts  | 100 +++++++++++-------
 1 file changed, 62 insertions(+), 38 deletions(-)

diff --git a/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts b/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
index e7e7e97..a7f285c 100644
--- a/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
+++ b/apps/client/src/features/hotkeys/composables/useGlobalShortcut.ts
@@ -22,44 +22,67 @@ export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action:
   // True while a recorder is capturing — hold no OS binding.
   let suspended = false;
 
-  async function unregisterCurrent(): Promise<void> {
-    if (!isTauri || !registered) return;
-    const { unregister } = await import('@tauri-apps/plugin-global-shortcut');
-    try {
-      await unregister(registered);
-    } catch {
-      // Best-effort — the binding may already be gone.
-    }
-    registered = null;
+  // Serialize register/unregister ops. The change-watch and the recorder's
+  // resume can both fire a register for the same combo; without this they race,
+  // double-register, one throws "already registered", and the watch's failure
+  // path reverts the value the user just set.
+  let opChain: Promise<unknown> = Promise.resolve();
+  function enqueue<T>(task: () => Promise<T>): Promise<T> {
+    const run = opChain.then(task);
+    opChain = run.then(
+      () => undefined,
+      () => undefined,
+    );
+    return run;
   }
 
-  async function tryRegister(next: string): Promise<boolean> {
-    if (!isTauri || suspended) return false;
-    // Re-applying the already-active combo is a success, not a churn.
-    if (next === registered) return true;
-    const { register, unregister } = await import('@tauri-apps/plugin-global-shortcut');
-    // A suspend may have landed while the import was in flight.
-    if (suspended) return false;
-    await unregisterCurrent();
-    // Defensive: an HMR reload may have left an orphan registration on the Rust
-    // side; clear it before our register call so the attempt sticks.
-    try {
-      await unregister(next);
-    } catch {
-      // Expected when the combo isn't registered.
-    }
-    try {
-      await register(next, (e) => {
-        // Plugin fires both "Pressed" and "Released" — trigger on Pressed only.
-        if (e.state === 'Pressed') action();
-      });
-      registered = next;
-      return true;
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.error('[hotkey] failed to register', next, err);
-      return false;
-    }
+  function unregisterCurrent(): Promise<void> {
+    return enqueue(async () => {
+      if (!isTauri || !registered) return;
+      const { unregister } = await import('@tauri-apps/plugin-global-shortcut');
+      try {
+        await unregister(registered);
+      } catch {
+        // Best-effort — the binding may already be gone.
+      }
+      registered = null;
+    });
+  }
+
+  function tryRegister(next: string): Promise<boolean> {
+    return enqueue(async () => {
+      if (!isTauri || suspended) return false;
+      // Already active (e.g. resume registered it just before this queued run).
+      if (next === registered) return true;
+      const { register, unregister } = await import('@tauri-apps/plugin-global-shortcut');
+      if (registered) {
+        try {
+          await unregister(registered);
+        } catch {
+          // Ignore — old binding may already be gone.
+        }
+        registered = null;
+      }
+      // Defensive: an HMR reload may have left an orphan registration on the
+      // Rust side; clear it before our register call so the attempt sticks.
+      try {
+        await unregister(next);
+      } catch {
+        // Expected when the combo isn't registered.
+      }
+      try {
+        await register(next, (e) => {
+          // Plugin fires both "Pressed" and "Released" — trigger on Pressed only.
+          if (e.state === 'Pressed') action();
+        });
+        registered = next;
+        return true;
+      } catch (err) {
+        // eslint-disable-next-line no-console
+        console.error('[hotkey] failed to register', next, err);
+        return false;
+      }
+    });
   }
 
   onMounted(() => {
@@ -85,8 +108,9 @@ export function useGlobalShortcut(isTauri: boolean, combo: Ref<string>, action:
     // Recording in progress — resume will re-register the final value.
     if (suspended) return;
     const ok = await tryRegister(next);
-    if (!ok && prev) {
-      // Revert store value to the working combo so the UI doesn't lie.
+    // Don't revert if the combo did end up registered (a concurrent resume won
+    // the race) — only when it genuinely couldn't be claimed.
+    if (!ok && prev && registered !== next) {
       suppressNext = true;
       combo.value = prev;
       await tryRegister(prev);

From cd8a3e5d81fe137da79a7ca096d151a59804f71d Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 01:59:46 +0300
Subject: [PATCH 04/53] fix(hotkeys): map right Alt (AltGr) to Ctrl+Alt; drop
 applied flash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Console logs from a Russian layout confirmed right Alt arrives as
key="AltGraph" (code "AltRight") plus a synthetic LeftControl, with the
altKey/ctrlKey flags unreliable on the event. Windows global shortcuts
have no distinct "right Alt" modifier — AltGr is delivered as Ctrl+Alt —
so capture now keys off getModifierState('AltGraph') and emits
CommandOrControl+Alt+<key>, which actually fires when right Alt is pressed.

Also removes the green-ring + check "applied" flash from the recorder
(stylistically excessive); the chip already updates to the new combo, and
the same-value re-record is re-claimed by the resume path regardless.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/__tests__/hotkey.spec.ts      |  7 +++++++
 .../hotkeys/components/HotkeyRecorder.vue     | 19 +++----------------
 .../client/src/features/hotkeys/lib/hotkey.ts |  8 ++++++--
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/apps/client/src/__tests__/hotkey.spec.ts b/apps/client/src/__tests__/hotkey.spec.ts
index 06a614b..554ff11 100644
--- a/apps/client/src/__tests__/hotkey.spec.ts
+++ b/apps/client/src/__tests__/hotkey.spec.ts
@@ -32,6 +32,7 @@ interface Mods {
   alt?: boolean;
   shift?: boolean;
   meta?: boolean;
+  altGraph?: boolean;
 }
 
 function ev(code: string, mods: Mods = {}, key = ''): KeyboardEvent {
@@ -42,6 +43,7 @@ function ev(code: string, mods: Mods = {}, key = ''): KeyboardEvent {
     altKey: !!mods.alt,
     shiftKey: !!mods.shift,
     metaKey: !!mods.meta,
+    modifierAltGraph: !!mods.altGraph,
   });
 }
 
@@ -138,6 +140,11 @@ describe('captureHotkey — validation', () => {
     }
   });
 
+  it('AltGr + key maps to Ctrl+Alt (how Windows delivers it)', () => {
+    // RU layout: AltGr reports key="AltGraph", altKey/ctrlKey flags unreliable.
+    expect(captureHotkey(ev('KeyZ', { altGraph: true })).combo).toBe('CommandOrControl+Alt+Z');
+  });
+
   it('unmapped keys are rejected', () => {
     const r = captureHotkey(ev('MediaSelect', { ctrl: true }));
     expect(r.error).toBe('bad-main-key');
diff --git a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
index 82ac9fd..32c1802 100644
--- a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
+++ b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
@@ -21,17 +21,9 @@ const { t } = useI18n();
 
 const recording = ref(false);
 const error = ref<'invalid' | null>(null);
-const applied = ref(false);
-let appliedTimer: ReturnType<typeof setTimeout> | undefined;
 
 const displayParts = computed(() => formatHotkeyParts(props.modelValue));
 
-function flashApplied(): void {
-  applied.value = true;
-  clearTimeout(appliedTimer);
-  appliedTimer = setTimeout(() => (applied.value = false), 1200);
-}
-
 // Module-level guard so only one recorder is active across all instances —
 // if a recorder is already listening, starting another one stops the first.
 // Without this, every recorder's window-keydown handler would fire on the
@@ -72,17 +64,13 @@ function onKey(event: KeyboardEvent): void {
   if (result.combo) {
     emit('update:modelValue', result.combo);
     error.value = null;
-    flashApplied();
     // stopRecording() resumes registration, re-claiming the combo even when the
     // value is unchanged (a same-value write never trips the registration watch).
     stopRecording();
   }
 }
 
-onBeforeUnmount(() => {
-  stopRecording();
-  clearTimeout(appliedTimer);
-});
+onBeforeUnmount(() => stopRecording());
 </script>
 
 <script lang="ts">
@@ -104,8 +92,8 @@ let currentRecorder: { cancel: () => void } | null = null;
       />
     </div>
     <div
-      class="inline-flex items-center gap-1 rounded-md bg-surface-900/60 px-2 py-1.5 text-[11px] font-semibold tracking-wider transition-shadow"
-      :class="recording ? 'ring-2 ring-primary' : applied ? 'ring-2 ring-green-500' : ''"
+      class="inline-flex items-center gap-1 rounded-md bg-surface-900/60 px-2 py-1.5 text-[11px] font-semibold tracking-wider"
+      :class="recording ? 'ring-2 ring-primary' : ''"
     >
       <template v-if="recording">
         <span class="opacity-70">{{ t('hotkeys.recordingPrompt') }}</span>
@@ -117,7 +105,6 @@ let currentRecorder: { cancel: () => void } | null = null;
           </span>
           <span v-if="idx < displayParts.length - 1" class="px-1 opacity-60">+</span>
         </span>
-        <i v-if="applied" class="pi pi-check ml-1 text-green-500" />
       </template>
     </div>
     <p v-if="error === 'invalid'" class="mt-1.5 text-[10px] leading-relaxed text-amber-400">
diff --git a/apps/client/src/features/hotkeys/lib/hotkey.ts b/apps/client/src/features/hotkeys/lib/hotkey.ts
index f0c3199..c57b8cd 100644
--- a/apps/client/src/features/hotkeys/lib/hotkey.ts
+++ b/apps/client/src/features/hotkeys/lib/hotkey.ts
@@ -135,9 +135,13 @@ export function captureHotkey(event: KeyboardEvent): CaptureResult {
     return { combo: null, cancelled: false, error: null };
   }
 
+  // AltGr (right Alt on many layouts, e.g. Russian) is delivered to Windows
+  // global shortcuts as Ctrl+Alt — there is no distinct "right Alt" modifier —
+  // and its altKey/ctrlKey flags are unreliable, so key off AltGraph directly.
+  const altGraph = event.getModifierState('AltGraph');
   const mods: string[] = [];
-  if (event.ctrlKey || event.metaKey) mods.push('CommandOrControl');
-  if (event.altKey) mods.push('Alt');
+  if (event.ctrlKey || event.metaKey || altGraph) mods.push('CommandOrControl');
+  if (event.altKey || altGraph) mods.push('Alt');
   if (event.shiftKey) mods.push('Shift');
 
   const mainKey = normalizeMainKey(event);

From ee0a5b4573cffdd29c6475e8c6504f4726be0ac7 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 02:02:42 +0300
Subject: [PATCH 05/53] fix(hotkeys): record right Alt (AltGr) as plain Alt,
 not Ctrl+Alt

A Ctrl+Alt bind captured from AltGr on a Russian layout silently stops
firing if the player switches to an English layout mid-game, where the
same physical right-Alt key is a plain Alt with no Ctrl. Strip the
synthetic Ctrl that AltGr injects and record just Alt, so the bind is
layout-stable. Windows global shortcuts can't distinguish left/right Alt
anyway, so plain Alt is the honest, portable representation.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/__tests__/hotkey.spec.ts       |  7 ++++---
 apps/client/src/features/hotkeys/lib/hotkey.ts | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/client/src/__tests__/hotkey.spec.ts b/apps/client/src/__tests__/hotkey.spec.ts
index 554ff11..b833ea5 100644
--- a/apps/client/src/__tests__/hotkey.spec.ts
+++ b/apps/client/src/__tests__/hotkey.spec.ts
@@ -140,9 +140,10 @@ describe('captureHotkey — validation', () => {
     }
   });
 
-  it('AltGr + key maps to Ctrl+Alt (how Windows delivers it)', () => {
-    // RU layout: AltGr reports key="AltGraph", altKey/ctrlKey flags unreliable.
-    expect(captureHotkey(ev('KeyZ', { altGraph: true })).combo).toBe('CommandOrControl+Alt+Z');
+  it('AltGr (right Alt) records as plain Alt, dropping the synthetic Ctrl', () => {
+    // RU layout: AltGr reports key="AltGraph" and injects a synthetic Ctrl. We
+    // strip it so the bind stays layout-stable (right Alt is plain Alt on EN).
+    expect(captureHotkey(ev('KeyZ', { altGraph: true, ctrl: true })).combo).toBe('Alt+Z');
   });
 
   it('unmapped keys are rejected', () => {
diff --git a/apps/client/src/features/hotkeys/lib/hotkey.ts b/apps/client/src/features/hotkeys/lib/hotkey.ts
index c57b8cd..9c3c4fc 100644
--- a/apps/client/src/features/hotkeys/lib/hotkey.ts
+++ b/apps/client/src/features/hotkeys/lib/hotkey.ts
@@ -135,12 +135,14 @@ export function captureHotkey(event: KeyboardEvent): CaptureResult {
     return { combo: null, cancelled: false, error: null };
   }
 
-  // AltGr (right Alt on many layouts, e.g. Russian) is delivered to Windows
-  // global shortcuts as Ctrl+Alt — there is no distinct "right Alt" modifier —
-  // and its altKey/ctrlKey flags are unreliable, so key off AltGraph directly.
+  // Right Alt on layouts like Russian is AltGr, which injects a synthetic Ctrl.
+  // Record it as plain Alt (drop that Ctrl) so the bind stays layout-stable: on
+  // an English layout the same physical key is a plain Alt, and a Ctrl+Alt bind
+  // would silently stop firing there. Global hotkeys can't tell left/right Alt
+  // apart anyway, so "Alt" is the honest, portable representation.
   const altGraph = event.getModifierState('AltGraph');
   const mods: string[] = [];
-  if (event.ctrlKey || event.metaKey || altGraph) mods.push('CommandOrControl');
+  if (!altGraph && (event.ctrlKey || event.metaKey)) mods.push('CommandOrControl');
   if (event.altKey || altGraph) mods.push('Alt');
   if (event.shiftKey) mods.push('Shift');
 

From e5b3ec571f03867c6a40605814d751a6faf760f0 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 02:10:57 +0300
Subject: [PATCH 06/53] fix(hotkeys): reject right Alt (AltGr), don't try to
 bind it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Right Alt on AltGr layouts (Russian etc.) is delivered by the OS as
Ctrl+Alt, so any bind made with it fires inconsistently across layouts —
it simply doesn't work while on the Russian layout. Rather than guess a
mapping, refuse to bind it: when getModifierState('AltGraph') is set the
recorder shows a clear message and waits for a different combo.

AltGraph is set only by a real AltGr, not by a manual left-Ctrl+left-Alt,
so genuine Ctrl+Alt combos (incl. the lock/airdrop defaults) are
unaffected — covered by a test.

Adds the hotkeys.altgr message (en + ru); restart vite dev to pick up the
new locale string (the i18n plugin pre-compiles JSON, no HMR).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/__tests__/hotkey.spec.ts      | 22 +++++++++++--------
 .../hotkeys/components/HotkeyRecorder.vue     | 10 ++++++---
 .../client/src/features/hotkeys/lib/hotkey.ts | 22 +++++++++----------
 apps/client/src/features/i18n/locales/en.json |  1 +
 apps/client/src/features/i18n/locales/ru.json |  1 +
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/apps/client/src/__tests__/hotkey.spec.ts b/apps/client/src/__tests__/hotkey.spec.ts
index b833ea5..ce0720c 100644
--- a/apps/client/src/__tests__/hotkey.spec.ts
+++ b/apps/client/src/__tests__/hotkey.spec.ts
@@ -121,14 +121,13 @@ describe('captureHotkey — validation', () => {
     expect(r.error).toBeNull();
   });
 
-  it('right Alt as AltGraph waits, not "invalid"', () => {
-    // AltGr layouts report key="AltGraph" (not in MODIFIER_KEYS) — the code match saves it.
-    const r = captureHotkey(ev('AltRight', { ctrl: true, alt: true }, 'AltGraph'));
+  it('right Alt as AltGr is rejected (too layout-unstable to bind)', () => {
+    const r = captureHotkey(ev('AltRight', { altGraph: true }, 'AltGraph'));
     expect(r.combo).toBeNull();
-    expect(r.error).toBeNull();
+    expect(r.error).toBe('altgr');
   });
 
-  it('right Alt as plain Alt waits', () => {
+  it('right Alt as plain Alt (e.g. EN layout) waits', () => {
     const r = captureHotkey(ev('AltRight', { alt: true }, 'Alt'));
     expect(r.combo).toBeNull();
     expect(r.error).toBeNull();
@@ -140,10 +139,15 @@ describe('captureHotkey — validation', () => {
     }
   });
 
-  it('AltGr (right Alt) records as plain Alt, dropping the synthetic Ctrl', () => {
-    // RU layout: AltGr reports key="AltGraph" and injects a synthetic Ctrl. We
-    // strip it so the bind stays layout-stable (right Alt is plain Alt on EN).
-    expect(captureHotkey(ev('KeyZ', { altGraph: true, ctrl: true })).combo).toBe('Alt+Z');
+  it('AltGr + key is rejected, but a genuine Ctrl+Alt is not', () => {
+    // AltGr (right Alt on RU) sets the AltGraph modifier → rejected.
+    const altgr = captureHotkey(ev('KeyZ', { altGraph: true, ctrl: true }));
+    expect(altgr.combo).toBeNull();
+    expect(altgr.error).toBe('altgr');
+    // Manual Ctrl+Alt does NOT set AltGraph → still bindable.
+    expect(captureHotkey(ev('KeyZ', { ctrl: true, alt: true })).combo).toBe(
+      'CommandOrControl+Alt+Z',
+    );
   });
 
   it('unmapped keys are rejected', () => {
diff --git a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
index 32c1802..8b2492e 100644
--- a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
+++ b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
@@ -20,7 +20,7 @@ const emit = defineEmits<{
 const { t } = useI18n();
 
 const recording = ref(false);
-const error = ref<'invalid' | null>(null);
+const error = ref<'invalid' | 'altgr' | null>(null);
 
 const displayParts = computed(() => formatHotkeyParts(props.modelValue));
 
@@ -57,6 +57,10 @@ function onKey(event: KeyboardEvent): void {
     stopRecording();
     return;
   }
+  if (result.error === 'altgr') {
+    error.value = 'altgr';
+    return;
+  }
   if (result.error === 'no-modifier' || result.error === 'bad-main-key') {
     error.value = 'invalid';
     return;
@@ -107,8 +111,8 @@ let currentRecorder: { cancel: () => void } | null = null;
         </span>
       </template>
     </div>
-    <p v-if="error === 'invalid'" class="mt-1.5 text-[10px] leading-relaxed text-amber-400">
-      {{ t('hotkeys.invalid') }}
+    <p v-if="error" class="mt-1.5 text-[10px] leading-relaxed text-amber-400">
+      {{ t(error === 'altgr' ? 'hotkeys.altgr' : 'hotkeys.invalid') }}
     </p>
   </div>
 </template>
diff --git a/apps/client/src/features/hotkeys/lib/hotkey.ts b/apps/client/src/features/hotkeys/lib/hotkey.ts
index 9c3c4fc..38e00dc 100644
--- a/apps/client/src/features/hotkeys/lib/hotkey.ts
+++ b/apps/client/src/features/hotkeys/lib/hotkey.ts
@@ -72,8 +72,7 @@ const KEY_DISPLAY: Readonly<Record<string, string>> = {
   PageDown: 'PgDn',
 };
 
-// `AltGraph` is what right-Alt reports on AltGr layouts.
-const MODIFIER_KEYS = new Set(['Control', 'Alt', 'AltGraph', 'Shift', 'Meta', 'OS']);
+const MODIFIER_KEYS = new Set(['Control', 'Alt', 'Shift', 'Meta', 'OS']);
 
 // Physical modifier codes — matching on `event.code` is layout-independent, so
 // right-Alt (code "AltRight", key "AltGraph") is treated as a held modifier
@@ -119,7 +118,7 @@ interface CaptureResult {
   /** True when the user pressed Escape — caller should cancel recording. */
   cancelled: boolean;
   /** Reason the combo is invalid, or null if it's good. */
-  error: 'no-modifier' | 'bad-main-key' | null;
+  error: 'no-modifier' | 'bad-main-key' | 'altgr' | null;
 }
 
 /**
@@ -130,20 +129,21 @@ export function captureHotkey(event: KeyboardEvent): CaptureResult {
   if (event.key === 'Escape') {
     return { combo: null, cancelled: true, error: null };
   }
+  // Right Alt is AltGr on many layouts (Russian etc.): the OS delivers it as
+  // Ctrl+Alt, so a bind made with it fires inconsistently across layouts.
+  // Refuse it. AltGraph is set only by a real AltGr, not by a manual Ctrl+Alt,
+  // so legitimate Ctrl+Alt combos are unaffected.
+  if (event.getModifierState('AltGraph')) {
+    return { combo: null, cancelled: false, error: 'altgr' };
+  }
   // Holding only modifiers — wait for the main key.
   if (MODIFIER_KEYS.has(event.key) || MODIFIER_CODES.has(event.code)) {
     return { combo: null, cancelled: false, error: null };
   }
 
-  // Right Alt on layouts like Russian is AltGr, which injects a synthetic Ctrl.
-  // Record it as plain Alt (drop that Ctrl) so the bind stays layout-stable: on
-  // an English layout the same physical key is a plain Alt, and a Ctrl+Alt bind
-  // would silently stop firing there. Global hotkeys can't tell left/right Alt
-  // apart anyway, so "Alt" is the honest, portable representation.
-  const altGraph = event.getModifierState('AltGraph');
   const mods: string[] = [];
-  if (!altGraph && (event.ctrlKey || event.metaKey)) mods.push('CommandOrControl');
-  if (event.altKey || altGraph) mods.push('Alt');
+  if (event.ctrlKey || event.metaKey) mods.push('CommandOrControl');
+  if (event.altKey) mods.push('Alt');
   if (event.shiftKey) mods.push('Shift');
 
   const mainKey = normalizeMainKey(event);
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 06627bd..0c2a299 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -92,6 +92,7 @@
     "recording": "Recording…",
     "recordingPrompt": "Press the new combination (Esc to cancel)",
     "invalid": "Need at least one modifier (Ctrl/Alt/Shift).",
+    "altgr": "Right Alt (AltGr) can't be used — it's unreliable across layouts. Use Ctrl, Alt or Shift.",
     "conflict": "This combination is taken by another app. Try another."
   },
   "closeConfirm": {
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index bd36a37..90736a5 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -92,6 +92,7 @@
     "recording": "Запись…",
     "recordingPrompt": "Нажми новое сочетание (Esc — отмена)",
     "invalid": "Нужен хотя бы один модификатор (Ctrl/Alt/Shift).",
+    "altgr": "Правый Alt (AltGr) использовать нельзя — он нестабилен между раскладками. Используй Ctrl, Alt или Shift.",
     "conflict": "Это сочетание уже занято другим приложением. Попробуй другое."
   },
   "closeConfirm": {

From 1e94d0d78153f3aa0be2d701dda14ca2ba2c033d Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 02:25:30 +0300
Subject: [PATCH 07/53] feat(overlay/settings): wave 2 UX polish
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- #11 SelectButton fluid: swap class="w-full" for the PrimeVue `fluid`
  prop across Player/Overlay/Language/Extracts settings so the option
  buttons actually stretch to fill the row (w-full only stretched the
  wrapper). Sliders keep w-full.
- #16 first-launch language: default to the system/browser language
  (navigator.language ~ "ru" -> ru, else en) instead of hardcoded en.
  Only used when nothing is persisted; a manual choice still wins.
- #12 drag handle: a dedicated top-left pi-bars grab handle on the
  overlay so dragging isn't a hidden affordance on the status pill.
  Tauri + unlocked only; title/aria from new i18n overlay.move.
- #14 animated border: replace the static solid edge with a dashed
  marching-ants stroke (OverlayBorder.vue → SVG, teleported to body so
  the opacity slider can't dim it; stroke-dashoffset keyframe, seamless
  loop, prefers-reduced-motion guard, relative-color fallback). Removes
  the now-dead overlay-unlocked class toggling from useOverlayBootstrap.

Restart vite dev to pick up the new overlay.move locale string (the
i18n plugin pre-compiles JSON, no HMR).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/i18n/locales/en.json |  3 +-
 apps/client/src/features/i18n/locales/ru.json |  3 +-
 apps/client/src/features/i18n/store.ts        | 12 +++++-
 .../overlay/components/OverlayBorder.vue      | 13 ++++++
 .../overlay/components/OverlayHeader.vue      | 14 +++++++
 .../composables/useOverlayBootstrap.ts        | 10 -----
 .../settings/sections/ExtractsSection.vue     |  4 +-
 .../settings/sections/LanguageSection.vue     |  2 +-
 .../settings/sections/OverlaySection.vue      |  2 +-
 .../settings/sections/PlayerSection.vue       |  2 +-
 apps/client/src/pages/index.vue               |  3 ++
 apps/client/src/styles.css                    | 42 +++++++++++++++----
 12 files changed, 83 insertions(+), 27 deletions(-)
 create mode 100644 apps/client/src/features/overlay/components/OverlayBorder.vue

diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 0c2a299..6f90ecd 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -65,7 +65,8 @@
     "mapOpacity": "Map opacity",
     "mapOpacityHint": "Available when overall opacity is below 100%.",
     "zoom": "Zoom",
-    "quickMenuTitle": "Transparency"
+    "quickMenuTitle": "Transparency",
+    "move": "Drag to move"
   },
   "pairing": {
     "heading": "Phone access",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 90736a5..442de25 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -65,7 +65,8 @@
     "mapOpacity": "Прозрачность карты",
     "mapOpacityHint": "Доступно когда общая прозрачность ниже 100%.",
     "zoom": "Масштаб",
-    "quickMenuTitle": "Прозрачность"
+    "quickMenuTitle": "Прозрачность",
+    "move": "Перетащить"
   },
   "pairing": {
     "heading": "Доступ с телефона",
diff --git a/apps/client/src/features/i18n/store.ts b/apps/client/src/features/i18n/store.ts
index c61a5a5..5be7b2e 100644
--- a/apps/client/src/features/i18n/store.ts
+++ b/apps/client/src/features/i18n/store.ts
@@ -4,8 +4,18 @@ import { persistedRef } from '@/shared/persisted-store';
 const apiLangSchema = z.enum(['en', 'ru']);
 export type ApiLang = z.infer<typeof apiLangSchema>;
 
+// First-launch default: match the system/browser language when we support it,
+// else fall back to English. Only consulted when nothing is persisted yet, so a
+// later manual choice always wins.
+function detectInitialLang(): ApiLang {
+  if (typeof navigator !== 'undefined' && navigator.language?.toLowerCase().startsWith('ru')) {
+    return 'ru';
+  }
+  return 'en';
+}
+
 export const useI18nStore = defineStore('i18n', () => {
-  const apiLang = persistedRef('tc.i18n.apiLang', apiLangSchema, 'en' as ApiLang);
+  const apiLang = persistedRef('tc.i18n.apiLang', apiLangSchema, detectInitialLang());
 
   // Mirror the persisted apiLang into the vue-i18n instance: on first read
   // (initial value), and on every subsequent change. `setLocale` is lazy —
diff --git a/apps/client/src/features/overlay/components/OverlayBorder.vue b/apps/client/src/features/overlay/components/OverlayBorder.vue
new file mode 100644
index 0000000..81bcd58
--- /dev/null
+++ b/apps/client/src/features/overlay/components/OverlayBorder.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+// Animated dashed boundary for the unlocked overlay. An SVG stroke (not a CSS
+// border) so the marching-ants dashes follow the rounded corners cleanly.
+// Teleported to <body> so it sits outside #app, which the opacity slider dims.
+</script>
+
+<template>
+  <Teleport to="body">
+    <svg class="overlay-border" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
+      <rect />
+    </svg>
+  </Teleport>
+</template>
diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 11246f1..b4f7aeb 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -12,6 +12,8 @@ interface Props {
 const props = defineProps<Props>();
 defineEmits<{ close: [] }>();
 
+const { t } = useI18n();
+
 const statusIconClass = computed(() => {
   switch (props.status) {
     case 'open':
@@ -36,6 +38,18 @@ async function startDrag(event: MouseEvent): Promise<void> {
 </script>
 
 <template>
+  <!-- Dedicated drag handle, top-left: an obvious grab target so dragging
+       isn't a hidden affordance on the status pill. Tauri + unlocked only. -->
+  <div
+    v-if="isTauri && !overlayClickThrough"
+    class="absolute top-3 left-3 z-[1000] flex h-7 w-7 cursor-grab items-center justify-center rounded-md bg-surface-800/70 text-surface-0 backdrop-blur select-none active:cursor-grabbing"
+    :title="t('overlay.move')"
+    :aria-label="t('overlay.move')"
+    @mousedown="startDrag"
+  >
+    <i class="pi pi-bars text-sm pointer-events-none" />
+  </div>
+
   <div class="absolute top-3 right-3 z-[1000] flex items-center gap-2">
     <!-- Unlocked: full pill with status dot + map name, also the drag handle. -->
     <span
diff --git a/apps/client/src/features/overlay/composables/useOverlayBootstrap.ts b/apps/client/src/features/overlay/composables/useOverlayBootstrap.ts
index 139dd11..3cd539a 100644
--- a/apps/client/src/features/overlay/composables/useOverlayBootstrap.ts
+++ b/apps/client/src/features/overlay/composables/useOverlayBootstrap.ts
@@ -46,16 +46,6 @@ export function useOverlayBootstrap(overlayClickThrough: Ref<boolean>): void {
   watch(overlayClickThrough, (locked) => void overlay.setClickThrough(locked));
   document.documentElement.classList.add('overlay-window');
 
-  // `overlay-unlocked` class drives the visible window border (see styles.css).
-  // The locked state never shows the border — the lock indicator alone says
-  // "can't interact", and the border would be wasted ink. Sync initially +
-  // on every flip so the visual matches the actual interaction mode.
-  function syncUnlockedClass(locked: boolean): void {
-    document.documentElement.classList.toggle('overlay-unlocked', !locked);
-  }
-  syncUnlockedClass(overlayClickThrough.value);
-  watch(overlayClickThrough, syncUnlockedClass);
-
   // Replay persisted values to the native window before the user interacts
   // with anything. Same calls fire on each subsequent store change.
   void overlay.setAlwaysOnTop(alwaysOnTop.value);
diff --git a/apps/client/src/features/settings/sections/ExtractsSection.vue b/apps/client/src/features/settings/sections/ExtractsSection.vue
index 0f74df2..40a28af 100644
--- a/apps/client/src/features/settings/sections/ExtractsSection.vue
+++ b/apps/client/src/features/settings/sections/ExtractsSection.vue
@@ -49,7 +49,7 @@ const labelSizeOptions = computed(() => [
         option-value="value"
         :allow-empty="false"
         size="small"
-        class="w-full"
+        fluid
       />
       <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('labelHint') }}</p>
     </div>
@@ -63,7 +63,7 @@ const labelSizeOptions = computed(() => [
         option-value="value"
         :allow-empty="false"
         size="small"
-        class="w-full"
+        fluid
       />
     </div>
   </Fieldset>
diff --git a/apps/client/src/features/settings/sections/LanguageSection.vue b/apps/client/src/features/settings/sections/LanguageSection.vue
index 634084d..e67ac92 100644
--- a/apps/client/src/features/settings/sections/LanguageSection.vue
+++ b/apps/client/src/features/settings/sections/LanguageSection.vue
@@ -19,7 +19,7 @@ const langOptions = computed(() => [
       option-value="value"
       :allow-empty="false"
       :aria-label="t('language')"
-      class="w-full"
+      fluid
     />
   </Fieldset>
 </template>
diff --git a/apps/client/src/features/settings/sections/OverlaySection.vue b/apps/client/src/features/settings/sections/OverlaySection.vue
index d3ca210..580d710 100644
--- a/apps/client/src/features/settings/sections/OverlaySection.vue
+++ b/apps/client/src/features/settings/sections/OverlaySection.vue
@@ -67,7 +67,7 @@ const overlayZoomOptions = computed(() => [
           option-value="value"
           :allow-empty="false"
           size="small"
-          class="w-full"
+          fluid
         />
       </div>
     </div>
diff --git a/apps/client/src/features/settings/sections/PlayerSection.vue b/apps/client/src/features/settings/sections/PlayerSection.vue
index 8663221..d726658 100644
--- a/apps/client/src/features/settings/sections/PlayerSection.vue
+++ b/apps/client/src/features/settings/sections/PlayerSection.vue
@@ -22,7 +22,7 @@ const playerFollowOptions = computed(() => [
       option-value="value"
       :allow-empty="false"
       size="small"
-      class="w-full"
+      fluid
     />
     <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('playerFollowHint') }}</p>
   </Fieldset>
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index b9f510e..a9c5d6a 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import MapView from '@/features/map/components/MapView.vue';
 import OverlayHeader from '@/features/overlay/components/OverlayHeader.vue';
+import OverlayBorder from '@/features/overlay/components/OverlayBorder.vue';
 import OverlayLockIndicator from '@/features/overlay/components/OverlayLockIndicator.vue';
 import OverlayErrors from '@/features/overlay/components/OverlayErrors.vue';
 import AirdropStatusBanner from '@/features/airdrop/components/AirdropStatusBanner.vue';
@@ -61,6 +62,8 @@ useGlobalShortcut(isTauri, airdropHotkey, () => airdropStore.press());
 
   <AirdropStatusBanner />
 
+  <OverlayBorder v-if="isTauri && !overlayClickThrough" />
+
   <OverlayLockIndicator
     v-if="isTauri"
     :lock-hotkey="lockHotkey"
diff --git a/apps/client/src/styles.css b/apps/client/src/styles.css
index 80598f9..611a4f5 100644
--- a/apps/client/src/styles.css
+++ b/apps/client/src/styles.css
@@ -103,20 +103,44 @@ html.overlay-window #app {
   opacity: var(--overlay-opacity, 1);
 }
 
-/* Unlocked overlay: trace the rounded window edge so the user can find the
-   resize/drag boundary even after they've dialled the map opacity to 0 and
-   the corners are otherwise invisible. ::after sits inside body's clip, so
-   the border lines up with the rounded-rectangle boundary itself. Locked
-   state hides it — the lock indicator already conveys "no interaction". */
-html.overlay-window.overlay-unlocked body::after {
-  content: '';
+/* Unlocked overlay: an animated dashed boundary traces the rounded window edge
+   so the player can find the drag/resize boundary even at 0 map opacity. It's
+   an SVG stroke (OverlayBorder.vue), not a CSS border, so the marching dashes
+   follow the rounded corners; teleported to <body> so the opacity slider (which
+   dims #app) leaves it at full strength. Mounted only while unlocked. */
+.overlay-border {
   position: fixed;
   inset: 0;
-  border: 2px solid rgb(from var(--p-primary-400) r g b / 0.9);
-  border-radius: 12px;
+  width: 100%;
+  height: 100%;
   pointer-events: none;
   z-index: 9999;
 }
+.overlay-border rect {
+  x: 1.5px;
+  y: 1.5px;
+  width: calc(100% - 3px);
+  height: calc(100% - 3px);
+  rx: 11px;
+  ry: 11px;
+  fill: none;
+  /* Fallback for older engines without relative-color syntax (cf. .leaflet-container). */
+  stroke: var(--p-primary-400);
+  stroke: rgb(from var(--p-primary-400) r g b / 0.9);
+  stroke-width: 2px;
+  stroke-dasharray: 7 7;
+  animation: overlay-ants 0.8s linear infinite;
+}
+@keyframes overlay-ants {
+  to {
+    stroke-dashoffset: -14;
+  }
+}
+@media (prefers-reduced-motion: reduce) {
+  .overlay-border rect {
+    animation: none;
+  }
+}
 
 .leaflet-container {
   /* Fallback for older engines that don't grok relative-color syntax. */

From 659ac291b85f3ed32a112a5286a3ee76c19c2af2 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 02:30:48 +0300
Subject: [PATCH 08/53] fix(overlay): seamless dashed border via pathLength
 normalization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The marching-ants border had a visible seam at the top-left (the path
start): the rounded-rect perimeter isn't an integer multiple of the
14px dash period, and it changes with the resizable window, so the last
dash never met the first. Give the rect pathLength="100" and express the
dash + offset in those normalized units (0.5+0.5 period → exactly 100
dashes, offset -1 = one period). The pattern now divides the perimeter
evenly and closes without a seam at any window size.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/features/overlay/components/OverlayBorder.vue     | 4 +++-
 apps/client/src/styles.css                                | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/features/overlay/components/OverlayBorder.vue b/apps/client/src/features/overlay/components/OverlayBorder.vue
index 81bcd58..91e238d 100644
--- a/apps/client/src/features/overlay/components/OverlayBorder.vue
+++ b/apps/client/src/features/overlay/components/OverlayBorder.vue
@@ -7,7 +7,9 @@
 <template>
   <Teleport to="body">
     <svg class="overlay-border" aria-hidden="true" xmlns="http://www.w3.org/2000/svg">
-      <rect />
+      <!-- pathLength normalizes the perimeter to 100 units so the dash pattern
+           divides evenly and closes without a seam at any window size. -->
+      <rect pathLength="100" />
     </svg>
   </Teleport>
 </template>
diff --git a/apps/client/src/styles.css b/apps/client/src/styles.css
index 611a4f5..9e65c5b 100644
--- a/apps/client/src/styles.css
+++ b/apps/client/src/styles.css
@@ -128,12 +128,16 @@ html.overlay-window #app {
   stroke: var(--p-primary-400);
   stroke: rgb(from var(--p-primary-400) r g b / 0.9);
   stroke-width: 2px;
-  stroke-dasharray: 7 7;
+  /* The rect carries pathLength="100", so dash + offset are in normalized units
+     where the whole perimeter = 100. A 0.5+0.5 period divides 100 exactly (100
+     dashes) → the loop closes seamlessly at the start corner regardless of the
+     (resizable) window size, and one period of offset animates seamlessly. */
+  stroke-dasharray: 0.5 0.5;
   animation: overlay-ants 0.8s linear infinite;
 }
 @keyframes overlay-ants {
   to {
-    stroke-dashoffset: -14;
+    stroke-dashoffset: -1;
   }
 }
 @media (prefers-reduced-motion: reduce) {

From 371de72910ed78dc70ff5662805c8dc7d8929922 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 02:40:01 +0300
Subject: [PATCH 09/53] feat(overlay): hover-reveal drag bar instead of corner
 handle

Replaces the top-left pi-bars handle with a top-center grabber: a tiny
always-visible nub (when unlocked) that expands on hover into a bar
showing the map name, and which is itself the drag region. Keeps the map
view clean by default while making "draggable" discoverable, and gives a
large, obvious grab target. Pure CSS group-hover reveal; same
startDragging() call.

The map name moves out of the top-right pill into the drag bar; the
right cluster is now a compact status dot + gear + close. Browser mode
(no window drag) keeps the status+map-name pill as before.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../overlay/components/OverlayHeader.vue      | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index b4f7aeb..2a960c7 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -38,38 +38,42 @@ async function startDrag(event: MouseEvent): Promise<void> {
 </script>
 
 <template>
-  <!-- Dedicated drag handle, top-left: an obvious grab target so dragging
-       isn't a hidden affordance on the status pill. Tauri + unlocked only. -->
+  <!-- Drag bar, top-center: a subtle grabber that expands on hover into a bar
+       with the map name. The whole strip is the drag region — `group` drives
+       the reveal so the idle hint stays tiny and the map stays unobstructed.
+       Tauri + unlocked only. -->
   <div
     v-if="isTauri && !overlayClickThrough"
-    class="absolute top-3 left-3 z-[1000] flex h-7 w-7 cursor-grab items-center justify-center rounded-md bg-surface-800/70 text-surface-0 backdrop-blur select-none active:cursor-grabbing"
-    :title="t('overlay.move')"
-    :aria-label="t('overlay.move')"
+    class="group absolute top-0 left-1/2 z-[1000] flex -translate-x-1/2 justify-center px-6 pt-1.5 pb-2.5"
     @mousedown="startDrag"
   >
-    <i class="pi pi-bars text-sm pointer-events-none" />
+    <div
+      :title="t('overlay.move')"
+      :aria-label="t('overlay.move')"
+      class="flex h-1.5 max-w-[2.5rem] cursor-grab items-center gap-1.5 overflow-hidden whitespace-nowrap rounded-full bg-surface-700/75 px-2 text-surface-0 backdrop-blur transition-all duration-200 ease-out select-none active:cursor-grabbing group-hover:h-7 group-hover:max-w-[16rem] group-hover:bg-surface-800/85 group-hover:px-3"
+    >
+      <i
+        class="pi pi-bars shrink-0 text-xs opacity-0 transition-opacity duration-150 group-hover:opacity-100 pointer-events-none"
+      />
+      <span
+        class="text-xs font-medium opacity-0 transition-opacity duration-150 group-hover:opacity-100 pointer-events-none"
+        >{{ mapDisplayName }}</span
+      >
+    </div>
   </div>
 
   <div class="absolute top-3 right-3 z-[1000] flex items-center gap-2">
-    <!-- Unlocked: full pill with status dot + map name, also the drag handle. -->
+    <!-- Browser: status dot + map name (no window drag there). Tauri: compact
+         status dot only — the map name lives in the drag bar, and the locked
+         state needs nothing but the connection state. -->
     <span
-      v-if="!overlayClickThrough"
-      class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur select-none"
-      :class="isTauri ? 'cursor-grab active:cursor-grabbing' : 'pointer-events-none'"
-      @mousedown="startDrag"
+      v-if="!isTauri"
+      class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur pointer-events-none select-none"
     >
-      <i
-        :class="['text-[10px] pointer-events-none', statusIconClass]"
-        :title="'ws: ' + status"
-        aria-hidden="true"
-      />
-      <span class="pointer-events-none">{{ mapDisplayName }}</span>
+      <i :class="['text-[10px]', statusIconClass]" :title="'ws: ' + status" aria-hidden="true" />
+      <span>{{ mapDisplayName }}</span>
       <span class="sr-only" aria-live="polite">Connection: {{ status }}</span>
     </span>
-    <!-- Locked overlay: collapse the pill to a single status dot. Map name
-         is redundant once the player has set up the overlay; only the
-         connection state is worth pixel-budget when the window is otherwise
-         frozen. -->
     <span
       v-else
       class="inline-flex h-6 w-6 items-center justify-center rounded-full bg-surface-800/70 backdrop-blur pointer-events-none"

From 59cc55b218c38eff316245341e02949b8d9edc83 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 02:49:45 +0300
Subject: [PATCH 10/53] refactor(overlay): full-width drag bar that persists
 during drag

Two follow-ups to the hover-reveal drag bar:

- Make it full-width instead of a centered pill. The entire top strip is
  the drag region, so the window can still be grabbed back when it has
  been dragged mostly past a screen edge (a centered handle could end up
  off-screen and unreachable). A fixed-height top zone keeps the hover
  target comfortable; the visible bar is a faint idle line that expands
  to a labelled bar.
- Keep the bar expanded while dragging. The OS move loop steals pointer
  events the instant startDragging() runs, dropping :hover and collapsing
  the bar mid-drag. Track a `dragging` flag (set on mousedown, cleared on
  mouseup or the first button-less mousemove) so the bar stays open for
  the whole drag.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../overlay/components/OverlayHeader.vue      | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 2a960c7..4c3d61c 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -27,36 +27,64 @@ const statusIconClass = computed(() => {
   }
 });
 
-// Drag region — explicit @mousedown rather than data-tauri-drag-region,
-// which is flaky on decorations:false + transparent:true windows.
+// The bar expands on hover and must STAY expanded while dragging — the OS move
+// loop steals pointer events, so `:hover` drops the instant the drag starts.
+// Track dragging explicitly; clear it on release (mouseup, or the first
+// button-less mousemove as a fallback if the OS swallowed the mouseup).
+const hovered = ref(false);
+const dragging = ref(false);
+const dragBarActive = computed(() => hovered.value || dragging.value);
+
+function endDrag(): void {
+  dragging.value = false;
+  window.removeEventListener('mouseup', endDrag);
+  window.removeEventListener('mousemove', onDragMove);
+}
+
+function onDragMove(event: MouseEvent): void {
+  if (event.buttons === 0) endDrag();
+}
+
+// Explicit @mousedown rather than data-tauri-drag-region, which is flaky on
+// decorations:false + transparent:true windows.
 async function startDrag(event: MouseEvent): Promise<void> {
   if (!props.isTauri) return;
   if (event.button !== 0) return;
+  dragging.value = true;
+  window.addEventListener('mouseup', endDrag);
+  window.addEventListener('mousemove', onDragMove);
   const { getCurrentWindow } = await import('@tauri-apps/api/window');
   await getCurrentWindow().startDragging();
 }
+
+onBeforeUnmount(endDrag);
 </script>
 
 <template>
-  <!-- Drag bar, top-center: a subtle grabber that expands on hover into a bar
-       with the map name. The whole strip is the drag region — `group` drives
-       the reveal so the idle hint stays tiny and the map stays unobstructed.
-       Tauri + unlocked only. -->
+  <!-- Full-width drag bar at the top. The whole strip is the drag region, so
+       the window can still be grabbed back when it's been dragged mostly past a
+       screen edge. A faint idle line expands into a labelled bar on hover and
+       STAYS expanded while dragging. Tauri + unlocked only. -->
   <div
     v-if="isTauri && !overlayClickThrough"
-    class="group absolute top-0 left-1/2 z-[1000] flex -translate-x-1/2 justify-center px-6 pt-1.5 pb-2.5"
+    class="absolute top-0 right-0 left-0 z-[1000] flex h-6 items-start"
     @mousedown="startDrag"
+    @mouseenter="hovered = true"
+    @mouseleave="hovered = false"
   >
     <div
       :title="t('overlay.move')"
       :aria-label="t('overlay.move')"
-      class="flex h-1.5 max-w-[2.5rem] cursor-grab items-center gap-1.5 overflow-hidden whitespace-nowrap rounded-full bg-surface-700/75 px-2 text-surface-0 backdrop-blur transition-all duration-200 ease-out select-none active:cursor-grabbing group-hover:h-7 group-hover:max-w-[16rem] group-hover:bg-surface-800/85 group-hover:px-3"
+      class="flex w-full cursor-grab items-center justify-center gap-1.5 overflow-hidden rounded-t-xl text-surface-0 backdrop-blur transition-all duration-200 ease-out select-none active:cursor-grabbing"
+      :class="dragBarActive ? 'h-6 bg-surface-800/85' : 'h-1.5 bg-surface-700/55'"
     >
       <i
-        class="pi pi-bars shrink-0 text-xs opacity-0 transition-opacity duration-150 group-hover:opacity-100 pointer-events-none"
+        class="pi pi-bars shrink-0 text-xs transition-opacity duration-150 pointer-events-none"
+        :class="dragBarActive ? 'opacity-100' : 'opacity-0'"
       />
       <span
-        class="text-xs font-medium opacity-0 transition-opacity duration-150 group-hover:opacity-100 pointer-events-none"
+        class="text-xs font-medium whitespace-nowrap transition-opacity duration-150 pointer-events-none"
+        :class="dragBarActive ? 'opacity-100' : 'opacity-0'"
         >{{ mapDisplayName }}</span
       >
     </div>

From d73934f8e00c82e11b0c337c7e724085f3243a9e Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 03:02:52 +0300
Subject: [PATCH 11/53] refactor(overlay): airy floating drag pill + obvious
 drawer close

Drag affordance reworked from the full-width bar (which the right-hand
status/settings/close controls overlapped, and which fused with the
dashed border):
- The visible part is an airy pill floating below the top edge, centred
  so it never collides with the right controls, with a ring + shadow so
  it reads as floating rather than blending into the border. It grows
  from a grabber into a bigger labelled bar (h-8, text-sm).
- The drag region stays full-width (invisible) so the window is still
  grabbable when dragged mostly past a screen edge; hover/expand is
  scoped to the centre so reaching for the controls doesn't trigger it.
- Manual window listeners replaced with VueUse useEventListener (auto
  teardown); the bar still stays open for the whole drag via `dragging`.

Settings drawer: when the overlay is small the drawer opens full-screen,
so there's no outside to click-dismiss and Esc is non-obvious. Added a
prominent close button in a custom header (closable=false). Adds a
`close` locale string (en + ru) and uses it for the overlay close button
too. Restart vite dev to pick up the new strings.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/i18n/locales/en.json |  1 +
 apps/client/src/features/i18n/locales/ru.json |  1 +
 .../overlay/components/OverlayHeader.vue      | 74 ++++++++++---------
 .../src/features/settings/SettingsPanel.vue   | 22 +++++-
 4 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 6f90ecd..da5adb5 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -26,6 +26,7 @@
     "lg": "L"
   },
   "settings": "Settings",
+  "close": "Close",
   "systemSection": "System",
   "floor": "Floor",
   "factions": {
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 442de25..f18a372 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -26,6 +26,7 @@
     "lg": "L"
   },
   "settings": "Настройки",
+  "close": "Закрыть",
   "systemSection": "Системные",
   "floor": "Уровень",
   "factions": {
diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 4c3d61c..34a94ea 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -29,21 +29,19 @@ const statusIconClass = computed(() => {
 
 // The bar expands on hover and must STAY expanded while dragging — the OS move
 // loop steals pointer events, so `:hover` drops the instant the drag starts.
-// Track dragging explicitly; clear it on release (mouseup, or the first
-// button-less mousemove as a fallback if the OS swallowed the mouseup).
+// Track dragging explicitly and clear it on release: mouseup, or the first
+// button-less mousemove as a fallback if the OS swallowed the mouseup. VueUse's
+// useEventListener owns the add/remove + teardown, so no manual cleanup.
 const hovered = ref(false);
 const dragging = ref(false);
 const dragBarActive = computed(() => hovered.value || dragging.value);
 
-function endDrag(): void {
+useEventListener(window, 'mouseup', () => {
   dragging.value = false;
-  window.removeEventListener('mouseup', endDrag);
-  window.removeEventListener('mousemove', onDragMove);
-}
-
-function onDragMove(event: MouseEvent): void {
-  if (event.buttons === 0) endDrag();
-}
+});
+useEventListener(window, 'mousemove', (e: MouseEvent) => {
+  if (dragging.value && e.buttons === 0) dragging.value = false;
+});
 
 // Explicit @mousedown rather than data-tauri-drag-region, which is flaky on
 // decorations:false + transparent:true windows.
@@ -51,42 +49,50 @@ async function startDrag(event: MouseEvent): Promise<void> {
   if (!props.isTauri) return;
   if (event.button !== 0) return;
   dragging.value = true;
-  window.addEventListener('mouseup', endDrag);
-  window.addEventListener('mousemove', onDragMove);
   const { getCurrentWindow } = await import('@tauri-apps/api/window');
   await getCurrentWindow().startDragging();
 }
-
-onBeforeUnmount(endDrag);
 </script>
 
 <template>
-  <!-- Full-width drag bar at the top. The whole strip is the drag region, so
-       the window can still be grabbed back when it's been dragged mostly past a
-       screen edge. A faint idle line expands into a labelled bar on hover and
-       STAYS expanded while dragging. Tauri + unlocked only. -->
+  <!-- Drag affordance. The full-width outer strip is the drag region (so the
+       window stays grabbable even when dragged mostly past a screen edge), and
+       @mousedown works anywhere across it. The visible part is an airy pill
+       floating below the top edge — clear of the dashed border and the
+       right-hand controls — that grows from a grabber into a labelled bar.
+       Hover/expand is scoped to the centre, so reaching for the controls won't
+       trigger it, and `dragging` keeps it open once the OS takes over the move.
+       Tauri + unlocked only. -->
   <div
     v-if="isTauri && !overlayClickThrough"
-    class="absolute top-0 right-0 left-0 z-[1000] flex h-6 items-start"
+    class="absolute top-0 right-0 left-0 z-[1000] flex justify-center"
     @mousedown="startDrag"
-    @mouseenter="hovered = true"
-    @mouseleave="hovered = false"
   >
     <div
-      :title="t('overlay.move')"
-      :aria-label="t('overlay.move')"
-      class="flex w-full cursor-grab items-center justify-center gap-1.5 overflow-hidden rounded-t-xl text-surface-0 backdrop-blur transition-all duration-200 ease-out select-none active:cursor-grabbing"
-      :class="dragBarActive ? 'h-6 bg-surface-800/85' : 'h-1.5 bg-surface-700/55'"
+      class="flex justify-center px-10 pt-2 pb-3"
+      @mouseenter="hovered = true"
+      @mouseleave="hovered = false"
     >
-      <i
-        class="pi pi-bars shrink-0 text-xs transition-opacity duration-150 pointer-events-none"
-        :class="dragBarActive ? 'opacity-100' : 'opacity-0'"
-      />
-      <span
-        class="text-xs font-medium whitespace-nowrap transition-opacity duration-150 pointer-events-none"
-        :class="dragBarActive ? 'opacity-100' : 'opacity-0'"
-        >{{ mapDisplayName }}</span
+      <div
+        :title="t('overlay.move')"
+        :aria-label="t('overlay.move')"
+        class="flex cursor-grab items-center justify-center gap-2 overflow-hidden whitespace-nowrap rounded-full text-surface-0 ring-1 ring-white/10 backdrop-blur transition-all duration-200 ease-out select-none active:cursor-grabbing"
+        :class="
+          dragBarActive
+            ? 'h-8 max-w-[20rem] bg-surface-800/90 px-4 shadow-lg'
+            : 'h-2.5 max-w-[3rem] bg-surface-700/70 px-0 shadow-md'
+        "
       >
+        <i
+          class="pi pi-bars shrink-0 text-xs transition-opacity duration-150 pointer-events-none"
+          :class="dragBarActive ? 'opacity-90' : 'opacity-0'"
+        />
+        <span
+          class="text-sm font-medium transition-opacity duration-150 pointer-events-none"
+          :class="dragBarActive ? 'opacity-100' : 'opacity-0'"
+          >{{ mapDisplayName }}</span
+        >
+      </div>
     </div>
   </div>
 
@@ -116,7 +122,7 @@ onBeforeUnmount(endDrag);
       rounded
       severity="secondary"
       class="!bg-surface-800/80 hover:!bg-red-900 !border-surface-700 backdrop-blur"
-      aria-label="Close"
+      :aria-label="t('close')"
       @click="$emit('close')"
     >
       <template #icon>
diff --git a/apps/client/src/features/settings/SettingsPanel.vue b/apps/client/src/features/settings/SettingsPanel.vue
index 66fa41d..298ecdb 100644
--- a/apps/client/src/features/settings/SettingsPanel.vue
+++ b/apps/client/src/features/settings/SettingsPanel.vue
@@ -40,9 +40,29 @@ const isDesktop = useMediaQuery('(min-width: 640px)');
   <Drawer
     v-model:visible="open"
     :position="isDesktop ? 'right' : 'full'"
-    :header="t('settings')"
+    :closable="false"
     :class="isDesktop ? '!w-[26rem]' : ''"
   >
+    <!-- Explicit, prominent close button: when the overlay is small the drawer
+         opens full-screen, leaving no outside area to click-dismiss and making
+         Esc non-obvious. -->
+    <template #header>
+      <div class="flex w-full items-center justify-between gap-3">
+        <span class="text-lg font-semibold">{{ t('settings') }}</span>
+        <Button
+          rounded
+          text
+          severity="secondary"
+          :aria-label="t('close')"
+          @click="open = false"
+        >
+          <template #icon>
+            <i class="pi pi-times text-lg" />
+          </template>
+        </Button>
+      </div>
+    </template>
+
     <div class="space-y-4">
       <component :is="sec.component" v-for="sec in mainSections" :key="sec.id" />
 

From 315040436abecab0fb752ce6f66823ffccd5578b Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 03:13:03 +0300
Subject: [PATCH 12/53] fix(overlay): drawer double-close; add dev flag to
 preview overlay chrome
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- The settings drawer showed two close buttons: PrimeVue 4's Drawer prop
  is `showCloseIcon`, not `closable`, so `:closable="false"` was ignored
  and the built-in icon rendered alongside the custom header button. Use
  `:show-close-icon="false"` so only the prominent custom close remains.

- Add `showOverlayChrome` (shared/tauri.ts): a DEV-only flag that renders
  the Tauri overlay chrome (drag bar, animated border, lock indicator) in
  a plain browser so the overlay UX can be previewed/iterated without a
  Tauri build. Enable with `?overlay` or localStorage. It only flips
  render gates — native window calls still guard on the real `isTauri`
  (OverlayHeader's startDrag), and the IPC transport is untouched, so
  nothing tries to reach a Tauri runtime that isn't there. OverlayHeader's
  render prop is renamed `isTauri` -> `tauriChrome` to make the split
  explicit; index.vue feeds it `showOverlayChrome`.

Verified in the browser preview: airy centred drag pill expands on hover
with no overlap of the right controls, animated border, lock indicator,
and a single drawer close button all render correctly.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../overlay/components/OverlayHeader.vue      | 13 ++++++-----
 .../src/features/settings/SettingsPanel.vue   |  2 +-
 apps/client/src/pages/index.vue               |  7 +++---
 apps/client/src/shared/tauri.ts               | 22 +++++++++++++++++++
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 34a94ea..0bc2a9b 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import SettingsPanel from '@/features/settings/SettingsPanel.vue';
+import { isTauri } from '@/shared/tauri';
 import type { TransportStatus } from '@/features/server/composables/useServerTransport';
 
 interface Props {
   mapDisplayName: string;
   status: TransportStatus;
-  isTauri: boolean;
+  /** Render the Tauri overlay chrome (true under real Tauri, or the dev
+   *  preview flag). Native window calls still guard on the real `isTauri`. */
+  tauriChrome: boolean;
   overlayClickThrough: boolean;
 }
 
@@ -46,7 +49,7 @@ useEventListener(window, 'mousemove', (e: MouseEvent) => {
 // Explicit @mousedown rather than data-tauri-drag-region, which is flaky on
 // decorations:false + transparent:true windows.
 async function startDrag(event: MouseEvent): Promise<void> {
-  if (!props.isTauri) return;
+  if (!isTauri) return;
   if (event.button !== 0) return;
   dragging.value = true;
   const { getCurrentWindow } = await import('@tauri-apps/api/window');
@@ -64,7 +67,7 @@ async function startDrag(event: MouseEvent): Promise<void> {
        trigger it, and `dragging` keeps it open once the OS takes over the move.
        Tauri + unlocked only. -->
   <div
-    v-if="isTauri && !overlayClickThrough"
+    v-if="tauriChrome && !overlayClickThrough"
     class="absolute top-0 right-0 left-0 z-[1000] flex justify-center"
     @mousedown="startDrag"
   >
@@ -101,7 +104,7 @@ async function startDrag(event: MouseEvent): Promise<void> {
          status dot only — the map name lives in the drag bar, and the locked
          state needs nothing but the connection state. -->
     <span
-      v-if="!isTauri"
+      v-if="!tauriChrome"
       class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur pointer-events-none select-none"
     >
       <i :class="['text-[10px]', statusIconClass]" :title="'ws: ' + status" aria-hidden="true" />
@@ -118,7 +121,7 @@ async function startDrag(event: MouseEvent): Promise<void> {
     </span>
     <SettingsPanel v-if="!overlayClickThrough" />
     <Button
-      v-if="isTauri && !overlayClickThrough"
+      v-if="tauriChrome && !overlayClickThrough"
       rounded
       severity="secondary"
       class="!bg-surface-800/80 hover:!bg-red-900 !border-surface-700 backdrop-blur"
diff --git a/apps/client/src/features/settings/SettingsPanel.vue b/apps/client/src/features/settings/SettingsPanel.vue
index 298ecdb..5666096 100644
--- a/apps/client/src/features/settings/SettingsPanel.vue
+++ b/apps/client/src/features/settings/SettingsPanel.vue
@@ -40,7 +40,7 @@ const isDesktop = useMediaQuery('(min-width: 640px)');
   <Drawer
     v-model:visible="open"
     :position="isDesktop ? 'right' : 'full'"
-    :closable="false"
+    :show-close-icon="false"
     :class="isDesktop ? '!w-[26rem]' : ''"
   >
     <!-- Explicit, prominent close button: when the overlay is small the drawer
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index a9c5d6a..1de1c63 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -9,6 +9,7 @@ import { useMapSettingsStore } from '@/features/map/store';
 import { useOverlayStore } from '@/features/overlay/store';
 import { useHotkeysStore } from '@/features/hotkeys/store';
 import { useTauriOverlay } from '@/features/overlay/composables/useTauriOverlay';
+import { showOverlayChrome } from '@/shared/tauri';
 import { useTransportStatus } from '@/features/server/composables/useTransportStatus';
 import { useGlobalShortcut } from '@/features/hotkeys/composables/useGlobalShortcut';
 import { useCloseConfirm } from '@/features/overlay/composables/useCloseConfirm';
@@ -53,7 +54,7 @@ useGlobalShortcut(isTauri, airdropHotkey, () => airdropStore.press());
   <OverlayHeader
     :map-display-name="mapDisplayName"
     :status="status"
-    :is-tauri="isTauri"
+    :tauri-chrome="showOverlayChrome"
     :overlay-click-through="overlayClickThrough"
     @close="confirmClose"
   />
@@ -62,10 +63,10 @@ useGlobalShortcut(isTauri, airdropHotkey, () => airdropStore.press());
 
   <AirdropStatusBanner />
 
-  <OverlayBorder v-if="isTauri && !overlayClickThrough" />
+  <OverlayBorder v-if="showOverlayChrome && !overlayClickThrough" />
 
   <OverlayLockIndicator
-    v-if="isTauri"
+    v-if="showOverlayChrome"
     :lock-hotkey="lockHotkey"
     :overlay-click-through="overlayClickThrough"
     @lock="overlayClickThrough = true"
diff --git a/apps/client/src/shared/tauri.ts b/apps/client/src/shared/tauri.ts
index b9aea26..9f21b39 100644
--- a/apps/client/src/shared/tauri.ts
+++ b/apps/client/src/shared/tauri.ts
@@ -8,3 +8,25 @@
  * future SSR experiments).
  */
 export const isTauri = typeof window !== 'undefined' && '__TAURI_INTERNALS__' in window;
+
+/**
+ * DEV-only flag to render the Tauri overlay chrome (drag bar, animated border,
+ * lock indicator) in a plain browser, so the overlay UX can be previewed and
+ * iterated without a Tauri build. It ONLY flips render gates — native window
+ * calls and the IPC transport still key off `isTauri`, so they stay no-ops off
+ * real Tauri. Enable via `?overlay` in the URL or
+ * localStorage['tc.dev.overlayChrome'] = '1'.
+ */
+function previewOverlayChrome(): boolean {
+  if (!import.meta.env.DEV || typeof window === 'undefined') return false;
+  try {
+    return (
+      new URLSearchParams(window.location.search).has('overlay') ||
+      window.localStorage.getItem('tc.dev.overlayChrome') === '1'
+    );
+  } catch {
+    return false;
+  }
+}
+
+export const showOverlayChrome = isTauri || previewOverlayChrome();

From aac70d3684372c12bc23599cccc3d61e29b6bc25 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 03:23:32 +0300
Subject: [PATCH 13/53] refactor(overlay): full-width unfurling drag bar;
 default drawer close

- Drawer: drop the custom header + close button and go back to PrimeVue's
  built-in close (the duplicate close came from recreating it). The
  default X + Esc are enough.
- Drag bar: the expanded bar is now full-width (unfurls from a centred
  grabber to a near-full-width title bar), and the hover trigger spans
  the full width of the top, not just the centre. The idle grabber is
  shorter (h-1.5). It stays full-width-grabbable for off-screen recovery
  and open while dragging.
- No control overlap: the bar is tall enough (h-11) to fully contain the
  right-hand status/settings/close controls, which sit on top of it
  (z-1001) like title-bar controls instead of half-overlapping it.

Verified in the browser preview (?overlay): idle short grabber, full-
width unfurl on hover with controls cleanly seated on the bar, and a
single drawer close button.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../overlay/components/OverlayHeader.vue      | 59 +++++++++----------
 .../src/features/settings/SettingsPanel.vue   | 22 +------
 2 files changed, 28 insertions(+), 53 deletions(-)

diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 0bc2a9b..80f2a1b 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -58,48 +58,43 @@ async function startDrag(event: MouseEvent): Promise<void> {
 </script>
 
 <template>
-  <!-- Drag affordance. The full-width outer strip is the drag region (so the
-       window stays grabbable even when dragged mostly past a screen edge), and
-       @mousedown works anywhere across it. The visible part is an airy pill
-       floating below the top edge — clear of the dashed border and the
-       right-hand controls — that grows from a grabber into a labelled bar.
-       Hover/expand is scoped to the centre, so reaching for the controls won't
-       trigger it, and `dragging` keeps it open once the OS takes over the move.
-       Tauri + unlocked only. -->
+  <!-- Drag bar. The full-width outer strip is both the hover trigger and the
+       drag region (grabbable anywhere across the top, even when the window is
+       dragged mostly past a screen edge). Collapsed it's a short, airy grabber
+       nub floating below the edge; on hover/drag it unfurls from the centre
+       into a near-full-width title bar carrying the map name, and stays open
+       while dragging. The right-hand controls sit on top of it (higher z).
+       Tauri/preview + unlocked only. -->
   <div
     v-if="tauriChrome && !overlayClickThrough"
-    class="absolute top-0 right-0 left-0 z-[1000] flex justify-center"
+    class="absolute top-0 right-0 left-0 z-[1000] flex justify-center px-2 pt-2 pb-2"
     @mousedown="startDrag"
+    @mouseenter="hovered = true"
+    @mouseleave="hovered = false"
   >
     <div
-      class="flex justify-center px-10 pt-2 pb-3"
-      @mouseenter="hovered = true"
-      @mouseleave="hovered = false"
+      :title="t('overlay.move')"
+      :aria-label="t('overlay.move')"
+      class="flex cursor-grab items-center justify-center gap-2 overflow-hidden whitespace-nowrap rounded-2xl text-surface-0 ring-1 ring-white/10 backdrop-blur transition-all duration-200 ease-out select-none active:cursor-grabbing"
+      :class="
+        dragBarActive
+          ? 'h-11 w-full bg-surface-900/90 px-4 shadow-lg'
+          : 'h-1.5 w-12 bg-surface-500/70 px-0 shadow-md'
+      "
     >
-      <div
-        :title="t('overlay.move')"
-        :aria-label="t('overlay.move')"
-        class="flex cursor-grab items-center justify-center gap-2 overflow-hidden whitespace-nowrap rounded-full text-surface-0 ring-1 ring-white/10 backdrop-blur transition-all duration-200 ease-out select-none active:cursor-grabbing"
-        :class="
-          dragBarActive
-            ? 'h-8 max-w-[20rem] bg-surface-800/90 px-4 shadow-lg'
-            : 'h-2.5 max-w-[3rem] bg-surface-700/70 px-0 shadow-md'
-        "
+      <i
+        class="pi pi-bars shrink-0 text-xs transition-opacity duration-150 pointer-events-none"
+        :class="dragBarActive ? 'opacity-90' : 'opacity-0'"
+      />
+      <span
+        class="text-sm font-medium transition-opacity duration-150 pointer-events-none"
+        :class="dragBarActive ? 'opacity-100' : 'opacity-0'"
+        >{{ mapDisplayName }}</span
       >
-        <i
-          class="pi pi-bars shrink-0 text-xs transition-opacity duration-150 pointer-events-none"
-          :class="dragBarActive ? 'opacity-90' : 'opacity-0'"
-        />
-        <span
-          class="text-sm font-medium transition-opacity duration-150 pointer-events-none"
-          :class="dragBarActive ? 'opacity-100' : 'opacity-0'"
-          >{{ mapDisplayName }}</span
-        >
-      </div>
     </div>
   </div>
 
-  <div class="absolute top-3 right-3 z-[1000] flex items-center gap-2">
+  <div class="absolute top-3 right-3 z-[1001] flex items-center gap-2">
     <!-- Browser: status dot + map name (no window drag there). Tauri: compact
          status dot only — the map name lives in the drag bar, and the locked
          state needs nothing but the connection state. -->
diff --git a/apps/client/src/features/settings/SettingsPanel.vue b/apps/client/src/features/settings/SettingsPanel.vue
index 5666096..66fa41d 100644
--- a/apps/client/src/features/settings/SettingsPanel.vue
+++ b/apps/client/src/features/settings/SettingsPanel.vue
@@ -40,29 +40,9 @@ const isDesktop = useMediaQuery('(min-width: 640px)');
   <Drawer
     v-model:visible="open"
     :position="isDesktop ? 'right' : 'full'"
-    :show-close-icon="false"
+    :header="t('settings')"
     :class="isDesktop ? '!w-[26rem]' : ''"
   >
-    <!-- Explicit, prominent close button: when the overlay is small the drawer
-         opens full-screen, leaving no outside area to click-dismiss and making
-         Esc non-obvious. -->
-    <template #header>
-      <div class="flex w-full items-center justify-between gap-3">
-        <span class="text-lg font-semibold">{{ t('settings') }}</span>
-        <Button
-          rounded
-          text
-          severity="secondary"
-          :aria-label="t('close')"
-          @click="open = false"
-        >
-          <template #icon>
-            <i class="pi pi-times text-lg" />
-          </template>
-        </Button>
-      </div>
-    </template>
-
     <div class="space-y-4">
       <component :is="sec.component" v-for="sec in mainSections" :key="sec.id" />
 

From 9c5875a0107c1b5711dcc5c83a2fe55b4281731b Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 03:32:53 +0300
Subject: [PATCH 14/53] refactor(overlay): separated drag/controls zones per UX
 review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following a UX design review, stop treating the drag bar as a container
for the window controls (the root of every overlap iteration). The top
band is now a single hover/drag trigger that reveals two SEPARATE,
never-overlapping zones as flex siblings:

- left: a drag pill (flex-1) carrying the map name — visual only, the
  band owns the drag so it stays grabbable full-width for off-screen
  recovery;
- right: the status/settings/close control cluster (shrink-0, own
  pointer events, mousedown.stop so it never starts a drag).

Being flex siblings, they can't collide at any width. Idle shows only a
small centred grabber nub; hover/drag cross-fades to the revealed chrome
(controls auto-hide together with the bar, per the chosen direction);
locked shows just the connection dot; browser keeps its static cluster.

Verified in the browser preview (?overlay): clean idle nub, full-width
reveal with a clear gap between the drag pill and controls, no overlap.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../overlay/components/OverlayHeader.vue      | 111 ++++++++++--------
 1 file changed, 62 insertions(+), 49 deletions(-)

diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 80f2a1b..6617911 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -58,74 +58,87 @@ async function startDrag(event: MouseEvent): Promise<void> {
 </script>
 
 <template>
-  <!-- Drag bar. The full-width outer strip is both the hover trigger and the
-       drag region (grabbable anywhere across the top, even when the window is
-       dragged mostly past a screen edge). Collapsed it's a short, airy grabber
-       nub floating below the edge; on hover/drag it unfurls from the centre
-       into a near-full-width title bar carrying the map name, and stays open
-       while dragging. The right-hand controls sit on top of it (higher z).
-       Tauri/preview + unlocked only. -->
+  <!-- OVERLAY (Tauri/preview), unlocked: a full-width top band that is both the
+       hover trigger and the drag region (grabbable anywhere, even when the
+       window is dragged mostly past a screen edge). Idle, only a small airy
+       grabber nub shows; hovering/dragging reveals two SEPARATE, never-
+       overlapping zones — a drag pill (left, flex-1) and the control cluster
+       (right, auto-width) — as flex siblings, so they can't collide. The pill
+       is visual only; the band owns the drag. -->
   <div
     v-if="tauriChrome && !overlayClickThrough"
-    class="absolute top-0 right-0 left-0 z-[1000] flex justify-center px-2 pt-2 pb-2"
+    class="absolute top-0 right-0 left-0 z-[1000] flex h-12 cursor-grab items-start px-2 pt-2 active:cursor-grabbing"
     @mousedown="startDrag"
     @mouseenter="hovered = true"
     @mouseleave="hovered = false"
   >
+    <!-- Idle grabber nub (centred), cross-fades out when the bar is active. -->
     <div
-      :title="t('overlay.move')"
-      :aria-label="t('overlay.move')"
-      class="flex cursor-grab items-center justify-center gap-2 overflow-hidden whitespace-nowrap rounded-2xl text-surface-0 ring-1 ring-white/10 backdrop-blur transition-all duration-200 ease-out select-none active:cursor-grabbing"
-      :class="
-        dragBarActive
-          ? 'h-11 w-full bg-surface-900/90 px-4 shadow-lg'
-          : 'h-1.5 w-12 bg-surface-500/70 px-0 shadow-md'
-      "
+      class="pointer-events-none absolute top-1.5 left-1/2 h-1.5 w-12 -translate-x-1/2 rounded-full bg-surface-500/70 shadow-md transition-opacity duration-200"
+      :class="dragBarActive ? 'opacity-0' : 'opacity-100'"
+      aria-hidden="true"
+    />
+
+    <!-- Revealed chrome: drag pill + controls, flex siblings (no overlap). -->
+    <div
+      class="flex h-10 w-full items-center gap-2 transition-all duration-200 ease-out"
+      :class="dragBarActive ? 'translate-y-0 opacity-100' : 'pointer-events-none -translate-y-1 opacity-0'"
     >
-      <i
-        class="pi pi-bars shrink-0 text-xs transition-opacity duration-150 pointer-events-none"
-        :class="dragBarActive ? 'opacity-90' : 'opacity-0'"
-      />
-      <span
-        class="text-sm font-medium transition-opacity duration-150 pointer-events-none"
-        :class="dragBarActive ? 'opacity-100' : 'opacity-0'"
-        >{{ mapDisplayName }}</span
+      <!-- Drag pill: visual only; mousedown falls through to the band. -->
+      <div
+        :title="t('overlay.move')"
+        :aria-label="t('overlay.move')"
+        class="pointer-events-none flex h-10 min-w-0 flex-1 items-center gap-2 overflow-hidden rounded-2xl bg-surface-800/85 px-4 text-surface-0 ring-1 ring-white/10 backdrop-blur select-none"
       >
+        <i class="pi pi-bars shrink-0 text-xs opacity-90" aria-hidden="true" />
+        <span class="truncate text-sm font-medium">{{ mapDisplayName }}</span>
+      </div>
+
+      <!-- Controls: own pointer events, never start a drag. -->
+      <div class="flex shrink-0 items-center gap-2" @mousedown.stop>
+        <span
+          class="inline-flex h-8 w-8 items-center justify-center rounded-full bg-surface-800/85 ring-1 ring-white/10 backdrop-blur"
+          :title="'ws: ' + status"
+        >
+          <i :class="['text-[10px]', statusIconClass]" aria-hidden="true" />
+          <span class="sr-only" aria-live="polite">Connection: {{ status }}</span>
+        </span>
+        <SettingsPanel />
+        <Button
+          rounded
+          severity="secondary"
+          class="!bg-surface-800/85 hover:!bg-red-900 !border-surface-700 backdrop-blur"
+          :aria-label="t('close')"
+          @click="$emit('close')"
+        >
+          <template #icon>
+            <i class="pi pi-times text-sm" />
+          </template>
+        </Button>
+      </div>
     </div>
   </div>
 
-  <div class="absolute top-3 right-3 z-[1001] flex items-center gap-2">
-    <!-- Browser: status dot + map name (no window drag there). Tauri: compact
-         status dot only — the map name lives in the drag bar, and the locked
-         state needs nothing but the connection state. -->
-    <span
-      v-if="!tauriChrome"
-      class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur pointer-events-none select-none"
-    >
-      <i :class="['text-[10px]', statusIconClass]" :title="'ws: ' + status" aria-hidden="true" />
-      <span>{{ mapDisplayName }}</span>
-      <span class="sr-only" aria-live="polite">Connection: {{ status }}</span>
-    </span>
+  <!-- OVERLAY locked: just the connection dot — no interactive chrome. -->
+  <div v-else-if="tauriChrome" class="absolute top-3 right-3 z-[1000]">
     <span
-      v-else
       class="inline-flex h-6 w-6 items-center justify-center rounded-full bg-surface-800/70 backdrop-blur pointer-events-none"
       :title="'ws: ' + status"
     >
       <i :class="['text-[10px]', statusIconClass]" aria-hidden="true" />
       <span class="sr-only" aria-live="polite">Connection: {{ status }}</span>
     </span>
-    <SettingsPanel v-if="!overlayClickThrough" />
-    <Button
-      v-if="tauriChrome && !overlayClickThrough"
-      rounded
-      severity="secondary"
-      class="!bg-surface-800/80 hover:!bg-red-900 !border-surface-700 backdrop-blur"
-      :aria-label="t('close')"
-      @click="$emit('close')"
+  </div>
+
+  <!-- BROWSER: no window drag — keep a static status + map name pill + settings. -->
+  <div v-else class="absolute top-3 right-3 z-[1000] flex items-center gap-2">
+    <span
+      class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur pointer-events-none select-none"
     >
-      <template #icon>
-        <i class="pi pi-times text-sm" />
-      </template>
-    </Button>
+      <i :class="['text-[10px]', statusIconClass]" :title="'ws: ' + status" aria-hidden="true" />
+      <span>{{ mapDisplayName }}</span>
+      <span class="sr-only" aria-live="polite">Connection: {{ status }}</span>
+    </span>
+    <SettingsPanel />
   </div>
 </template>

From b2cf6871cfd5f6ab68533507f3b55376b85196ae Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 03:35:54 +0300
Subject: [PATCH 15/53] refactor(overlay): update drag pill icon for
 consistency

Changed the drag pill icon from 'pi-bars' to 'pi-arrows-alt' to better represent the drag functionality. This update enhances the visual clarity of the overlay header while maintaining the existing layout and behavior.
---
 .../src/features/overlay/components/OverlayHeader.vue       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 6617911..b90b40f 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -82,7 +82,9 @@ async function startDrag(event: MouseEvent): Promise<void> {
     <!-- Revealed chrome: drag pill + controls, flex siblings (no overlap). -->
     <div
       class="flex h-10 w-full items-center gap-2 transition-all duration-200 ease-out"
-      :class="dragBarActive ? 'translate-y-0 opacity-100' : 'pointer-events-none -translate-y-1 opacity-0'"
+      :class="
+        dragBarActive ? 'translate-y-0 opacity-100' : 'pointer-events-none -translate-y-1 opacity-0'
+      "
     >
       <!-- Drag pill: visual only; mousedown falls through to the band. -->
       <div
@@ -90,7 +92,7 @@ async function startDrag(event: MouseEvent): Promise<void> {
         :aria-label="t('overlay.move')"
         class="pointer-events-none flex h-10 min-w-0 flex-1 items-center gap-2 overflow-hidden rounded-2xl bg-surface-800/85 px-4 text-surface-0 ring-1 ring-white/10 backdrop-blur select-none"
       >
-        <i class="pi pi-bars shrink-0 text-xs opacity-90" aria-hidden="true" />
+        <i class="pi pi-arrows-alt shrink-0 text-xs opacity-90" aria-hidden="true" />
         <span class="truncate text-sm font-medium">{{ mapDisplayName }}</span>
       </div>
 

From 097b54bf160f28a4f7926ac4de37923e1d2c6db5 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 19:59:12 +0300
Subject: [PATCH 16/53] =?UTF-8?q?feat(map/overlay):=20wave=203=20=E2=80=94?=
 =?UTF-8?q?=20follow-no-zoom,=20looser=20pan,=20lock-on-top,=20touch=20flo?=
 =?UTF-8?q?ors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- #4 Auto-follow without zoom: add an "On" mode that recenters on every
  position via panTo() and keeps the user's current zoom; S/M/L keep the
  recenter+zoom behaviour. Enum gains 'on' (superset — existing saved
  values stay valid), with the new option + clarified hint in en/ru.
- #5 Looser map panning: bump PAN_PAD 0.15 -> 0.5 and soften
  maxBoundsViscosity 1.0 -> 0.5 so dragging the map doesn't hit a rigid
  wall.
- #15 Lock pins on top: the effective always-on-top is now
  alwaysOnTop || clickThrough, so locking keeps the overlay visible out
  of raid and unlocking restores the user's setting.
- #10 Floor switcher on touch: on `pointer: coarse` devices the floor
  buttons drop the small size and get >=44px tap targets with more gap.

Restart vite dev to pick up the new playerFollowOptions.on locale string.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/i18n/locales/en.json |  3 ++-
 apps/client/src/features/i18n/locales/ru.json |  3 ++-
 .../features/map/components/FloorSwitcher.vue | 12 +++++++---
 .../features/map/composables/useLeafletMap.ts |  6 +++--
 .../map/layers/player/usePlayerLayer.ts       | 23 ++++++++++++-------
 apps/client/src/features/map/store.ts         |  2 +-
 .../composables/useOverlayBootstrap.ts        | 11 +++++++--
 .../settings/sections/PlayerSection.vue       |  1 +
 8 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index da5adb5..670aed6 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -18,9 +18,10 @@
   },
   "player": "Player",
   "playerFollow": "Auto-follow",
-  "playerFollowHint": "Recenter and zoom the map on every new position update.",
+  "playerFollowHint": "Recenter the map on every new position. S/M/L also zoom in; On just follows at your current zoom.",
   "playerFollowOptions": {
     "off": "Off",
+    "on": "On",
     "sm": "S",
     "md": "M",
     "lg": "L"
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index f18a372..8d4767c 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -18,9 +18,10 @@
   },
   "player": "Игрок",
   "playerFollow": "Авто-следование",
-  "playerFollowHint": "Центрируем и приближаем карту при каждом новом обновлении позиции.",
+  "playerFollowHint": "Центрируем карту при каждой новой позиции. S/M/L ещё и приближают; «Вкл» — просто следует на текущем зуме.",
   "playerFollowOptions": {
     "off": "Выкл",
+    "on": "Вкл",
     "sm": "S",
     "md": "M",
     "lg": "L"
diff --git a/apps/client/src/features/map/components/FloorSwitcher.vue b/apps/client/src/features/map/components/FloorSwitcher.vue
index 89acabc..7bf9d6b 100644
--- a/apps/client/src/features/map/components/FloorSwitcher.vue
+++ b/apps/client/src/features/map/components/FloorSwitcher.vue
@@ -11,6 +11,9 @@ const props = defineProps<{
 
 const { t } = useI18n();
 
+// Touch devices (phone) need bigger tap targets than the small mouse buttons.
+const coarse = useMediaQuery('(pointer: coarse)');
+
 const emit = defineEmits<{
   (e: 'select', id: string): void;
 }>();
@@ -61,7 +64,8 @@ onBeforeUnmount(() => {
     >
       <div
         v-if="open"
-        class="absolute bottom-12 left-0 flex flex-col gap-1.5"
+        class="absolute bottom-12 left-0 flex flex-col"
+        :class="coarse ? 'gap-2' : 'gap-1.5'"
         role="listbox"
         aria-orientation="vertical"
         :aria-label="t('floor')"
@@ -70,7 +74,8 @@ onBeforeUnmount(() => {
           v-for="floor in floors"
           :key="floor.id"
           rounded
-          size="small"
+          :size="coarse ? undefined : 'small'"
+          :class="coarse ? 'min-h-[44px] min-w-[44px]' : ''"
           :severity="floor.id === current ? 'primary' : 'secondary'"
           :label="floor.label"
           role="option"
@@ -82,9 +87,10 @@ onBeforeUnmount(() => {
     </Transition>
 
     <Button
-      size="small"
+      :size="coarse ? undefined : 'small'"
       severity="secondary"
       class="!bg-surface-800/80 hover:!bg-surface-800 !border-surface-700 backdrop-blur"
+      :class="coarse ? 'min-h-[44px]' : ''"
       :aria-expanded="open"
       aria-haspopup="listbox"
       :aria-label="t('floor')"
diff --git a/apps/client/src/features/map/composables/useLeafletMap.ts b/apps/client/src/features/map/composables/useLeafletMap.ts
index b9494f6..4ce8d81 100644
--- a/apps/client/src/features/map/composables/useLeafletMap.ts
+++ b/apps/client/src/features/map/composables/useLeafletMap.ts
@@ -14,7 +14,9 @@ interface UseLeafletMapResult extends UseFloorSwitcher {
   reload: () => void;
 }
 
-const PAN_PAD = 0.15;
+// Generous panning room beyond the map edges + soft (not rigid) bounds, so
+// dragging the map around doesn't hit a hard wall.
+const PAN_PAD = 0.5;
 
 function applyRotation(latLng: L.LatLng, rotationDeg: number): L.LatLng {
   if (rotationDeg === 0) return latLng;
@@ -118,7 +120,7 @@ export function useLeafletMap(
       minZoom: -5,
       maxZoom: 4,
       zoomSnap: 0.25,
-      maxBoundsViscosity: 1.0,
+      maxBoundsViscosity: 0.5,
     });
     map.value = instance;
     const markersPane = instance.createPane('extracts');
diff --git a/apps/client/src/features/map/layers/player/usePlayerLayer.ts b/apps/client/src/features/map/layers/player/usePlayerLayer.ts
index bc24f15..27e32fa 100644
--- a/apps/client/src/features/map/layers/player/usePlayerLayer.ts
+++ b/apps/client/src/features/map/layers/player/usePlayerLayer.ts
@@ -3,9 +3,10 @@ import { useServerEvent } from '@/features/server/composables/useServerEvents';
 import { useMapSettingsStore } from '@/features/map/store';
 import type { MapLayerContext } from '../registry';
 
-export type PlayerFollow = 'off' | 'sm' | 'md' | 'lg';
+// 'on' follows without changing zoom; sm/md/lg also zoom in by the delta.
+export type PlayerFollow = 'off' | 'on' | 'sm' | 'md' | 'lg';
 
-const FOLLOW_ZOOM_DELTA: Readonly<Record<Exclude<PlayerFollow, 'off'>, number>> = {
+const FOLLOW_ZOOM_DELTA: Readonly<Record<'sm' | 'md' | 'lg', number>> = {
   sm: 1,
   md: 2,
   lg: 3,
@@ -61,12 +62,18 @@ export function usePlayerLayer(ctx: MapLayerContext): void {
     }
 
     const changed = pos.x !== lastX || pos.z !== lastZ || yaw !== lastYaw;
-    if (changed && playerFollow.value !== 'off') {
-      const targetZoom = Math.min(
-        initialZoom.value + FOLLOW_ZOOM_DELTA[playerFollow.value],
-        map.value.getMaxZoom(),
-      );
-      map.value.setView(latLng, targetZoom, { animate: true, duration: 0.4 });
+    const follow = playerFollow.value;
+    if (changed && follow !== 'off') {
+      if (follow === 'on') {
+        // Recenter only — keep whatever zoom the user has set.
+        map.value.panTo(latLng, { animate: true, duration: 0.4 });
+      } else {
+        const targetZoom = Math.min(
+          initialZoom.value + FOLLOW_ZOOM_DELTA[follow],
+          map.value.getMaxZoom(),
+        );
+        map.value.setView(latLng, targetZoom, { animate: true, duration: 0.4 });
+      }
     }
     if (changed) {
       lastX = pos.x;
diff --git a/apps/client/src/features/map/store.ts b/apps/client/src/features/map/store.ts
index f2507a9..ab7479c 100644
--- a/apps/client/src/features/map/store.ts
+++ b/apps/client/src/features/map/store.ts
@@ -6,7 +6,7 @@ import type { PlayerFollow } from './layers/player/usePlayerLayer';
 const extractFactionSchema = z.enum(['pmc', 'scav', 'shared']);
 const labelModeSchema = z.enum(['hover', 'always']);
 const labelSizeSchema = z.enum(['sm', 'md', 'lg']);
-const playerFollowSchema = z.enum(['off', 'sm', 'md', 'lg']);
+const playerFollowSchema = z.enum(['off', 'on', 'sm', 'md', 'lg']);
 const mapCodeSchema = z.string().refine((s): s is TarkovMapCode => s in TARKOV_MAPS);
 const autoMapSwitchSchema = z.boolean();
 
diff --git a/apps/client/src/features/overlay/composables/useOverlayBootstrap.ts b/apps/client/src/features/overlay/composables/useOverlayBootstrap.ts
index 3cd539a..c081508 100644
--- a/apps/client/src/features/overlay/composables/useOverlayBootstrap.ts
+++ b/apps/client/src/features/overlay/composables/useOverlayBootstrap.ts
@@ -46,12 +46,19 @@ export function useOverlayBootstrap(overlayClickThrough: Ref<boolean>): void {
   watch(overlayClickThrough, (locked) => void overlay.setClickThrough(locked));
   document.documentElement.classList.add('overlay-window');
 
+  // Locking pins the window on top regardless of the user's always-on-top
+  // setting, so the overlay stays visible "out of raid"; unlocking restores
+  // their choice. Effective = user choice OR locked.
+  function applyAlwaysOnTop(): void {
+    void overlay.setAlwaysOnTop(alwaysOnTop.value || overlayClickThrough.value);
+  }
+
   // Replay persisted values to the native window before the user interacts
   // with anything. Same calls fire on each subsequent store change.
-  void overlay.setAlwaysOnTop(alwaysOnTop.value);
+  applyAlwaysOnTop();
   void overlay.setOpacity(opacity.value);
   void overlay.setZoom(Number(zoom.value) / 100);
-  watch(alwaysOnTop, (v) => void overlay.setAlwaysOnTop(v));
+  watch([alwaysOnTop, overlayClickThrough], applyAlwaysOnTop);
   watch(opacity, (v) => void overlay.setOpacity(v));
   watch(zoom, (v) => void overlay.setZoom(Number(v) / 100));
 }
diff --git a/apps/client/src/features/settings/sections/PlayerSection.vue b/apps/client/src/features/settings/sections/PlayerSection.vue
index d726658..7731caf 100644
--- a/apps/client/src/features/settings/sections/PlayerSection.vue
+++ b/apps/client/src/features/settings/sections/PlayerSection.vue
@@ -6,6 +6,7 @@ const { t } = useI18n();
 
 const playerFollowOptions = computed(() => [
   { label: t('playerFollowOptions.off'), value: 'off' as const },
+  { label: t('playerFollowOptions.on'), value: 'on' as const },
   { label: t('playerFollowOptions.sm'), value: 'sm' as const },
   { label: t('playerFollowOptions.md'), value: 'md' as const },
   { label: t('playerFollowOptions.lg'), value: 'lg' as const },

From 00103dcfa57f45679c414eed9712af6de1f01ec8 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 20:15:48 +0300
Subject: [PATCH 17/53] feat(overlay): #3 Tarkov in-game clock chip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Show both in-game clocks (left + the +12h right) as a small, non-
interactive chip in the top-left corner — visible even when the overlay
is locked, since the time is glanceable raid info like the map itself.

Math is a pure function in @shared/tarkov-time (Tarkov runs at 7× real
time, anchored to Moscow UTC+3, two clocks 12h apart — the canonical
tarkov.dev formula), unit-tested with 4 cases. The chip ticks once a
second from Date.now().

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/__tests__/tarkov-time.spec.ts | 32 +++++++++++++++
 .../features/tarkov-time/TarkovTimeChip.vue   | 25 ++++++++++++
 apps/client/src/pages/index.vue               |  3 ++
 packages/shared/src/tarkov-time.ts            | 40 +++++++++++++++++++
 4 files changed, 100 insertions(+)
 create mode 100644 apps/client/src/__tests__/tarkov-time.spec.ts
 create mode 100644 apps/client/src/features/tarkov-time/TarkovTimeChip.vue
 create mode 100644 packages/shared/src/tarkov-time.ts

diff --git a/apps/client/src/__tests__/tarkov-time.spec.ts b/apps/client/src/__tests__/tarkov-time.spec.ts
new file mode 100644
index 0000000..33ecbb5
--- /dev/null
+++ b/apps/client/src/__tests__/tarkov-time.spec.ts
@@ -0,0 +1,32 @@
+import { describe, it, expect } from 'vitest';
+import { tarkovTime } from '@shared/tarkov-time';
+
+const HOUR = 60 * 60 * 1000;
+
+describe('tarkovTime', () => {
+  it('at epoch is Moscow midnight + 3h (left) / +15h (right)', () => {
+    expect(tarkovTime(0)).toEqual({ left: '03:00', right: '15:00' });
+  });
+
+  it('advances 7× real time', () => {
+    // 1 real hour → 7 in-game hours.
+    expect(tarkovTime(1 * HOUR)).toEqual({ left: '10:00', right: '22:00' });
+  });
+
+  it('wraps past midnight', () => {
+    // 3 real hours → 21 in-game hours; 03:00 + 21h = 00:00.
+    expect(tarkovTime(3 * HOUR)).toEqual({ left: '00:00', right: '12:00' });
+  });
+
+  it('the two clocks are always exactly 12h apart', () => {
+    for (const ms of [0, HOUR, 1_700_000_000_000, 1_234_567_890]) {
+      const { left, right } = tarkovTime(ms);
+      const toMin = (s: string) => {
+        const [h, m] = s.split(':').map(Number);
+        return (h ?? 0) * 60 + (m ?? 0);
+      };
+      const diff = ((toMin(right) - toMin(left)) % (24 * 60) + 24 * 60) % (24 * 60);
+      expect(diff).toBe(12 * 60);
+    }
+  });
+});
diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
new file mode 100644
index 0000000..8194df4
--- /dev/null
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import { tarkovTime } from '@shared/tarkov-time';
+
+// Non-interactive info chip — stays visible even when the overlay is locked
+// (click-through), like the map itself. Ticks once a second.
+const clock = ref(tarkovTime(Date.now()));
+let timer: ReturnType<typeof setInterval> | undefined;
+
+onMounted(() => {
+  timer = setInterval(() => (clock.value = tarkovTime(Date.now())), 1000);
+});
+onBeforeUnmount(() => clearInterval(timer));
+</script>
+
+<template>
+  <div
+    class="pointer-events-none absolute top-3 left-3 z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur select-none"
+    aria-hidden="true"
+  >
+    <i class="pi pi-clock text-[10px] opacity-70" />
+    <span>{{ clock.left }}</span>
+    <span class="opacity-40">/</span>
+    <span>{{ clock.right }}</span>
+  </div>
+</template>
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index 1de1c63..f4bfa38 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -2,6 +2,7 @@
 import MapView from '@/features/map/components/MapView.vue';
 import OverlayHeader from '@/features/overlay/components/OverlayHeader.vue';
 import OverlayBorder from '@/features/overlay/components/OverlayBorder.vue';
+import TarkovTimeChip from '@/features/tarkov-time/TarkovTimeChip.vue';
 import OverlayLockIndicator from '@/features/overlay/components/OverlayLockIndicator.vue';
 import OverlayErrors from '@/features/overlay/components/OverlayErrors.vue';
 import AirdropStatusBanner from '@/features/airdrop/components/AirdropStatusBanner.vue';
@@ -63,6 +64,8 @@ useGlobalShortcut(isTauri, airdropHotkey, () => airdropStore.press());
 
   <AirdropStatusBanner />
 
+  <TarkovTimeChip />
+
   <OverlayBorder v-if="showOverlayChrome && !overlayClickThrough" />
 
   <OverlayLockIndicator
diff --git a/packages/shared/src/tarkov-time.ts b/packages/shared/src/tarkov-time.ts
new file mode 100644
index 0000000..6179ada
--- /dev/null
+++ b/packages/shared/src/tarkov-time.ts
@@ -0,0 +1,40 @@
+/**
+ * Escape from Tarkov in-game clock.
+ *
+ * Tarkov time runs at 7× real time, anchored to Moscow (UTC+3) — a full
+ * 24h day passes in ~3h26m of real time. Two clocks are shown in-raid,
+ * offset by 12 in-game hours (the canonical tarkov.dev formula). This is
+ * pure arithmetic on a millisecond timestamp so it can be unit-tested
+ * without faking `Date`.
+ */
+const TARKOV_RATIO = 7;
+const MOSCOW_OFFSET_MS = 3 * 60 * 60 * 1000; // UTC+3 (Norvinsk / Russia)
+const ONE_DAY_MS = 24 * 60 * 60 * 1000;
+const HALF_DAY_MS = 12 * 60 * 60 * 1000;
+
+function timeOfDayMs(nowMs: number, rightSide: boolean): number {
+  const offset = MOSCOW_OFFSET_MS + (rightSide ? HALF_DAY_MS : 0);
+  return (((offset + nowMs * TARKOV_RATIO) % ONE_DAY_MS) + ONE_DAY_MS) % ONE_DAY_MS;
+}
+
+function formatHHMM(ms: number): string {
+  const totalMinutes = Math.floor(ms / 60000);
+  const hours = Math.floor(totalMinutes / 60) % 24;
+  const minutes = totalMinutes % 60;
+  return `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}`;
+}
+
+export interface TarkovClock {
+  /** Left clock (e.g. 11:34). */
+  readonly left: string;
+  /** Right clock, +12h from the left (e.g. 23:34). */
+  readonly right: string;
+}
+
+/** Both in-game clocks for the given real-time millisecond timestamp. */
+export function tarkovTime(nowMs: number): TarkovClock {
+  return {
+    left: formatHHMM(timeOfDayMs(nowMs, false)),
+    right: formatHHMM(timeOfDayMs(nowMs, true)),
+  };
+}

From fcbb55bc2ace6e991ed767e17b0198ae45dc904a Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 20:20:23 +0300
Subject: [PATCH 18/53] feat(hotkeys): #8 in-browser keyboard shortcuts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Zoom, floor switching and the airdrop trigger now also respond to the
keyboard in a plain browser / LAN phone, not just the Tauri overlay.
useGlobalShortcut stays Tauri-only (OS global shortcut); the new
useBrowserShortcut is its page-level counterpart, firing the same store
combos via a window keydown listener — no-op under Tauri to avoid
double-firing, ignores keystrokes typed into form fields, and
preventDefaults a match so combos like Ctrl+= don't also zoom the page.

Matching is a pure `matchesAccelerator(event, combo)` in the hotkey lib
(CommandOrControl matches Ctrl or Meta; other modifiers exact), unit-
tested. index.vue binds each map action to both transports via a small
helper. Lock stays overlay-only.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/__tests__/hotkey.spec.ts      | 29 ++++++++++++++++-
 .../hotkeys/composables/useBrowserShortcut.ts | 30 +++++++++++++++++
 .../client/src/features/hotkeys/lib/hotkey.ts | 32 +++++++++++++++++++
 apps/client/src/pages/index.vue               | 20 +++++++++---
 4 files changed, 105 insertions(+), 6 deletions(-)
 create mode 100644 apps/client/src/features/hotkeys/composables/useBrowserShortcut.ts

diff --git a/apps/client/src/__tests__/hotkey.spec.ts b/apps/client/src/__tests__/hotkey.spec.ts
index ce0720c..0f63540 100644
--- a/apps/client/src/__tests__/hotkey.spec.ts
+++ b/apps/client/src/__tests__/hotkey.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { captureHotkey, formatHotkeyParts } from '@/features/hotkeys/lib/hotkey';
+import { captureHotkey, formatHotkeyParts, matchesAccelerator } from '@/features/hotkeys/lib/hotkey';
 
 // Mirror of the keys accepted by global-hotkey 0.7.0's `parse_key` (uppercased
 // before matching). Our captured main-key tokens MUST land in this set or
@@ -156,6 +156,33 @@ describe('captureHotkey — validation', () => {
   });
 });
 
+describe('matchesAccelerator (browser-side matching)', () => {
+  it('matches the exact combo', () => {
+    expect(matchesAccelerator(ev('Equal', { ctrl: true }), 'CommandOrControl+=')).toBe(true);
+    expect(matchesAccelerator(ev('KeyD', { ctrl: true, alt: true }), 'CommandOrControl+Alt+D')).toBe(
+      true,
+    );
+    expect(
+      matchesAccelerator(ev('Equal', { ctrl: true, shift: true }), 'CommandOrControl+Shift+='),
+    ).toBe(true);
+  });
+
+  it('rejects extra or missing modifiers', () => {
+    // extra shift
+    expect(matchesAccelerator(ev('Equal', { ctrl: true, shift: true }), 'CommandOrControl+=')).toBe(
+      false,
+    );
+    // missing alt
+    expect(matchesAccelerator(ev('KeyL', { ctrl: true }), 'CommandOrControl+Alt+L')).toBe(false);
+    // wrong main key
+    expect(matchesAccelerator(ev('Minus', { ctrl: true }), 'CommandOrControl+=')).toBe(false);
+  });
+
+  it('CommandOrControl matches Meta too (Mac)', () => {
+    expect(matchesAccelerator(ev('KeyK', { meta: true }), 'CommandOrControl+K')).toBe(true);
+  });
+});
+
 describe('formatHotkeyParts', () => {
   it('renders canonical numpad tokens', () => {
     expect(formatHotkeyParts('CommandOrControl+NumpadSubtract')).toEqual(['Ctrl', 'Num -']);
diff --git a/apps/client/src/features/hotkeys/composables/useBrowserShortcut.ts b/apps/client/src/features/hotkeys/composables/useBrowserShortcut.ts
new file mode 100644
index 0000000..35e4dfc
--- /dev/null
+++ b/apps/client/src/features/hotkeys/composables/useBrowserShortcut.ts
@@ -0,0 +1,30 @@
+import { matchesAccelerator } from '../lib/hotkey';
+
+function isTypingTarget(el: EventTarget | null): boolean {
+  const node = el as HTMLElement | null;
+  if (!node) return false;
+  return (
+    node.tagName === 'INPUT' ||
+    node.tagName === 'TEXTAREA' ||
+    node.tagName === 'SELECT' ||
+    node.isContentEditable
+  );
+}
+
+/**
+ * Page-level counterpart to useGlobalShortcut: fires `action` when the combo
+ * is pressed while the page is focused, so zoom / floor / airdrop work in a
+ * plain browser or on a LAN phone where Tauri's global-shortcut plugin isn't
+ * available. No-op under Tauri (the OS-level shortcut already handles it, so
+ * this would double-fire). Ignores keystrokes typed into form fields, and
+ * preventDefault on a match so app combos like Ctrl+= don't also zoom the page.
+ */
+export function useBrowserShortcut(isTauri: boolean, combo: Ref<string>, action: () => void): void {
+  useEventListener(window, 'keydown', (e: KeyboardEvent) => {
+    if (isTauri || isTypingTarget(e.target)) return;
+    if (matchesAccelerator(e, combo.value)) {
+      e.preventDefault();
+      action();
+    }
+  });
+}
diff --git a/apps/client/src/features/hotkeys/lib/hotkey.ts b/apps/client/src/features/hotkeys/lib/hotkey.ts
index 38e00dc..8cd0e2a 100644
--- a/apps/client/src/features/hotkeys/lib/hotkey.ts
+++ b/apps/client/src/features/hotkeys/lib/hotkey.ts
@@ -232,3 +232,35 @@ function normalizeMainKey(event: KeyboardEvent): string | null {
   // Numpad / punctuation / navigation
   return CODE_TO_ACCEL[code] ?? null;
 }
+
+const CMD_CTRL_TOKENS = new Set([
+  'CommandOrControl',
+  'CmdOrCtrl',
+  'Command',
+  'Cmd',
+  'Control',
+  'Ctrl',
+  'Meta',
+  'Super',
+]);
+
+/**
+ * Does a `keydown` event exactly match an accelerator string? The browser
+ * counterpart of `captureHotkey` — used to fire the same bindings on the page
+ * (LAN / browser) where Tauri's global-shortcut plugin isn't available.
+ * CommandOrControl matches Ctrl OR Meta; all other modifiers must match
+ * exactly (no extras), so Ctrl+= doesn't also trigger on Ctrl+Shift+=.
+ */
+export function matchesAccelerator(event: KeyboardEvent, combo: string): boolean {
+  const parts = combo.split('+');
+  if (parts.length < 2) return false;
+  const mainToken = parts[parts.length - 1];
+  const mods = parts.slice(0, -1);
+  const wantCmdCtrl = mods.some((m) => CMD_CTRL_TOKENS.has(m));
+  const wantAlt = mods.some((m) => m === 'Alt' || m === 'Option');
+  const wantShift = mods.includes('Shift');
+  if ((event.ctrlKey || event.metaKey) !== wantCmdCtrl) return false;
+  if (event.altKey !== wantAlt) return false;
+  if (event.shiftKey !== wantShift) return false;
+  return normalizeMainKey(event) === mainToken;
+}
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index f4bfa38..4731d43 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -13,6 +13,7 @@ import { useTauriOverlay } from '@/features/overlay/composables/useTauriOverlay'
 import { showOverlayChrome } from '@/shared/tauri';
 import { useTransportStatus } from '@/features/server/composables/useTransportStatus';
 import { useGlobalShortcut } from '@/features/hotkeys/composables/useGlobalShortcut';
+import { useBrowserShortcut } from '@/features/hotkeys/composables/useBrowserShortcut';
 import { useCloseConfirm } from '@/features/overlay/composables/useCloseConfirm';
 import { useAirdropStore } from '@/features/airdrop/store';
 import { useAirdropTracker } from '@/features/airdrop/composables/useAirdropTracker';
@@ -36,11 +37,20 @@ const mapError = ref<string | null>(null);
 // defineExpose. `?.` keeps every shortcut handler safe to call before the
 // component mounts (e.g. immediately after a `:key` swap on map change).
 const mapRef = ref<InstanceType<typeof MapView> | null>(null);
-useGlobalShortcut(isTauri, zoomInHotkey, () => mapRef.value?.zoomIn());
-useGlobalShortcut(isTauri, zoomOutHotkey, () => mapRef.value?.zoomOut());
-useGlobalShortcut(isTauri, floorUpHotkey, () => mapRef.value?.nextFloor());
-useGlobalShortcut(isTauri, floorDownHotkey, () => mapRef.value?.prevFloor());
-useGlobalShortcut(isTauri, airdropHotkey, () => airdropStore.press());
+
+// Bind each map action to BOTH transports: the Tauri global shortcut (overlay)
+// and the page-level listener (browser / LAN phone). Each no-ops in the other's
+// context, so exactly one fires. Lock stays overlay-only (no window to lock in
+// a browser), wired separately in App.vue.
+function bindShortcut(combo: Ref<string>, action: () => void): void {
+  useGlobalShortcut(isTauri, combo, action);
+  useBrowserShortcut(isTauri, combo, action);
+}
+bindShortcut(zoomInHotkey, () => mapRef.value?.zoomIn());
+bindShortcut(zoomOutHotkey, () => mapRef.value?.zoomOut());
+bindShortcut(floorUpHotkey, () => mapRef.value?.nextFloor());
+bindShortcut(floorDownHotkey, () => mapRef.value?.prevFloor());
+bindShortcut(airdropHotkey, () => airdropStore.press());
 </script>
 
 <template>

From 9b2901f6f58359f3a2336fe7ae8d4deccb3ffddf Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 20:50:30 +0300
Subject: [PATCH 19/53] fix(overlay): move Tarkov clock below the header band
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The clock chip overlapped the full-width drag bar when the top header
expanded on hover. Drop it from top-3 to top-14 (just below the h-12
header band) so it never collides — still upper-left and always visible.
Verified in the browser preview.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/tarkov-time/TarkovTimeChip.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
index 8194df4..966e67a 100644
--- a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -13,8 +13,10 @@ onBeforeUnmount(() => clearInterval(timer));
 </script>
 
 <template>
+  <!-- Sits below the top header band (h-12) so the full-width drag bar doesn't
+       cover it on hover; still upper-left, always visible. -->
   <div
-    class="pointer-events-none absolute top-3 left-3 z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur select-none"
+    class="pointer-events-none absolute top-14 left-3 z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur select-none"
     aria-hidden="true"
   >
     <i class="pi pi-clock text-[10px] opacity-70" />

From b781ed2af980d5dade78af1a227eae893fe94ad4 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 20:56:38 +0300
Subject: [PATCH 20/53] feat(overlay): float the Tarkov clock out of the
 header's way
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of pinning the clock low, let it float in the top-left corner
(top-3) and slide down to top-14 only while the drag-bar header is
expanded, then back up when it collapses — so it uses the corner when
free and gets out of the way when the header appears.

Adds a shared app-singleton useOverlayHeaderActive (hovered/dragging/
active) owned by OverlayHeader (reset on lock/unmount so it can't stick),
read by the clock to animate its `top`. Verified in the preview: corner
at rest, smooth slide to below the header on hover, back on leave.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../overlay/components/OverlayHeader.vue      | 31 ++++++++++++++-----
 .../composables/useOverlayHeaderActive.ts     | 18 +++++++++++
 .../features/tarkov-time/TarkovTimeChip.vue   | 10 ++++--
 3 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 apps/client/src/features/overlay/composables/useOverlayHeaderActive.ts

diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index b90b40f..5020432 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import SettingsPanel from '@/features/settings/SettingsPanel.vue';
 import { isTauri } from '@/shared/tauri';
+import { useOverlayHeaderActive } from '../composables/useOverlayHeaderActive';
 import type { TransportStatus } from '@/features/server/composables/useServerTransport';
 
 interface Props {
@@ -30,14 +31,12 @@ const statusIconClass = computed(() => {
   }
 });
 
-// The bar expands on hover and must STAY expanded while dragging — the OS move
-// loop steals pointer events, so `:hover` drops the instant the drag starts.
-// Track dragging explicitly and clear it on release: mouseup, or the first
-// button-less mousemove as a fallback if the OS swallowed the mouseup. VueUse's
-// useEventListener owns the add/remove + teardown, so no manual cleanup.
-const hovered = ref(false);
-const dragging = ref(false);
-const dragBarActive = computed(() => hovered.value || dragging.value);
+// Shared with sibling chrome (the floating clock slides down when this is
+// active). The bar expands on hover and must STAY expanded while dragging —
+// the OS move loop steals pointer events, so `:hover` drops the instant the
+// drag starts. Track dragging explicitly and clear it on release: mouseup, or
+// the first button-less mousemove as a fallback if the OS swallowed the mouseup.
+const { hovered, dragging, active: dragBarActive } = useOverlayHeaderActive();
 
 useEventListener(window, 'mouseup', () => {
   dragging.value = false;
@@ -46,6 +45,22 @@ useEventListener(window, 'mousemove', (e: MouseEvent) => {
   if (dragging.value && e.buttons === 0) dragging.value = false;
 });
 
+// The band unmounts when locked, so its @mouseleave never fires — reset
+// explicitly so the shared state (and the clock) don't get stuck "active".
+watch(
+  () => props.overlayClickThrough,
+  (locked) => {
+    if (locked) {
+      hovered.value = false;
+      dragging.value = false;
+    }
+  },
+);
+onBeforeUnmount(() => {
+  hovered.value = false;
+  dragging.value = false;
+});
+
 // Explicit @mousedown rather than data-tauri-drag-region, which is flaky on
 // decorations:false + transparent:true windows.
 async function startDrag(event: MouseEvent): Promise<void> {
diff --git a/apps/client/src/features/overlay/composables/useOverlayHeaderActive.ts b/apps/client/src/features/overlay/composables/useOverlayHeaderActive.ts
new file mode 100644
index 0000000..eb0d3da
--- /dev/null
+++ b/apps/client/src/features/overlay/composables/useOverlayHeaderActive.ts
@@ -0,0 +1,18 @@
+/**
+ * Shared (app-singleton) state for the overlay's top header band, so sibling
+ * chrome — e.g. the Tarkov clock — can slide out of the way when the band
+ * expands on hover/drag. Module-level refs: there is only ever one overlay
+ * window. OverlayHeader owns the writes (and resets them when locked/unmounted);
+ * everyone else reads `active`.
+ */
+const hovered = ref(false);
+const dragging = ref(false);
+const active = computed(() => hovered.value || dragging.value);
+
+export function useOverlayHeaderActive(): {
+  hovered: Ref<boolean>;
+  dragging: Ref<boolean>;
+  active: ComputedRef<boolean>;
+} {
+  return { hovered, dragging, active };
+}
diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
index 966e67a..d779a56 100644
--- a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { tarkovTime } from '@shared/tarkov-time';
+import { useOverlayHeaderActive } from '@/features/overlay/composables/useOverlayHeaderActive';
 
 // Non-interactive info chip — stays visible even when the overlay is locked
 // (click-through), like the map itself. Ticks once a second.
@@ -10,13 +11,16 @@ onMounted(() => {
   timer = setInterval(() => (clock.value = tarkovTime(Date.now())), 1000);
 });
 onBeforeUnmount(() => clearInterval(timer));
+
+// Float in the top-left corner; slide down out of the way when the drag bar
+// expands over the top, then back up when it collapses.
+const { active: headerActive } = useOverlayHeaderActive();
 </script>
 
 <template>
-  <!-- Sits below the top header band (h-12) so the full-width drag bar doesn't
-       cover it on hover; still upper-left, always visible. -->
   <div
-    class="pointer-events-none absolute top-14 left-3 z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur select-none"
+    class="pointer-events-none absolute left-3 z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur transition-[top] duration-200 ease-out select-none"
+    :class="headerActive ? 'top-14' : 'top-3'"
     aria-hidden="true"
   >
     <i class="pi pi-clock text-[10px] opacity-70" />

From 2770be86965658f3769546ac45643310116e2e64 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 20:59:39 +0300
Subject: [PATCH 21/53] fix(overlay): sync clock slide with header reveal via
 transform

The clock animated `top` (layout) while the header reveals via
transform/opacity (composited), so the two motions drifted. Slide the
clock with translate-y (translate-y-11 = the 44px to top-14) instead, so
both are composited transforms on the same 200ms ease-out and move in
lockstep.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/tarkov-time/TarkovTimeChip.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
index d779a56..2853a23 100644
--- a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -18,9 +18,12 @@ const { active: headerActive } = useOverlayHeaderActive();
 </script>
 
 <template>
+  <!-- Slide via transform (composited), not `top` (layout) — matches the
+       header's transform/opacity reveal so the two move in lockstep.
+       translate-y-11 (44px) lands it at top-14 from the top-3 base. -->
   <div
-    class="pointer-events-none absolute left-3 z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur transition-[top] duration-200 ease-out select-none"
-    :class="headerActive ? 'top-14' : 'top-3'"
+    class="pointer-events-none absolute top-3 left-3 z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur transition-transform duration-200 ease-out select-none"
+    :class="headerActive ? 'translate-y-11' : 'translate-y-0'"
     aria-hidden="true"
   >
     <i class="pi pi-clock text-[10px] opacity-70" />

From 1a0fdcab6119e1ebd5d46d10ad56a46f8cd574c4 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 21:41:33 +0300
Subject: [PATCH 22/53] feat(desktop): headless backend binary (server without
 the Tauri window)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lets the in-process HTTP server + watchers run standalone on :47474 so a
browser / LAN phone can connect (SSE, config) without launching the
overlay — handy for testing the browser-side features, and the server
half of the tray/headless story.

Makes the Tauri AppHandle optional through the watcher chain
(screenshots/logs/watcher/http_server/commands/lib): events always go to
the broadcast channel (SSE), and `app.emit` to the webview only when a
handle is present. The GUI path is unchanged (passes Some). Adds
`run_headless()` + a second binary `tarkov-checker-headless` (no
windows_subsystem, keeps a console) and a `backend:dev` pnpm script.

Verified by running the binary: GET /api/ping and /api/config both 200
with the resolved paths — tauri::async_runtime works fine with no app.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/desktop/package.json                     |  1 +
 apps/desktop/src-tauri/Cargo.toml             |  4 ++
 apps/desktop/src-tauri/src/bin/headless.rs    |  5 +++
 apps/desktop/src-tauri/src/commands.rs        |  2 +-
 apps/desktop/src-tauri/src/http_server.rs     |  6 +--
 apps/desktop/src-tauri/src/lib.rs             | 39 ++++++++++++++++++-
 apps/desktop/src-tauri/src/server/logs.rs     | 34 ++++++++--------
 .../src-tauri/src/server/screenshots.rs       | 34 +++++++---------
 apps/desktop/src-tauri/src/watcher.rs         |  6 +--
 9 files changed, 86 insertions(+), 45 deletions(-)
 create mode 100644 apps/desktop/src-tauri/src/bin/headless.rs

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 45465de..92b9ab4 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -7,6 +7,7 @@
     "tauri": "tauri",
     "tauri:dev": "tauri dev",
     "tauri:build": "tauri build",
+    "backend:dev": "cargo run --manifest-path src-tauri/Cargo.toml --bin tarkov-checker-headless",
     "lint": "echo \"(no JS sources to lint)\"",
     "typecheck": "echo \"(no TS sources to typecheck)\""
   },
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index 47f7083..7368a5c 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -15,6 +15,10 @@ crate-type = ["staticlib", "cdylib", "rlib"]
 name = "tarkov-checker-desktop"
 path = "src/main.rs"
 
+[[bin]]
+name = "tarkov-checker-headless"
+path = "src/bin/headless.rs"
+
 [build-dependencies]
 tauri-build = { version = "2", features = [] }
 
diff --git a/apps/desktop/src-tauri/src/bin/headless.rs b/apps/desktop/src-tauri/src/bin/headless.rs
new file mode 100644
index 0000000..0e2e0a7
--- /dev/null
+++ b/apps/desktop/src-tauri/src/bin/headless.rs
@@ -0,0 +1,5 @@
+// Headless backend: runs the HTTP server + watchers without the Tauri window.
+// No windows_subsystem attribute — keep a console so logs and Ctrl+C work.
+fn main() {
+    tarkov_checker_desktop_lib::run_headless();
+}
diff --git a/apps/desktop/src-tauri/src/commands.rs b/apps/desktop/src-tauri/src/commands.rs
index 65dda2b..ee0cc6c 100644
--- a/apps/desktop/src-tauri/src/commands.rs
+++ b/apps/desktop/src-tauri/src/commands.rs
@@ -30,7 +30,7 @@ pub async fn update_config(
 ) -> Result<ResolvedPaths, String> {
     store.apply(patch).await.map_err(|e| e.to_string())?;
     let resolved = paths::resolve(&store.overrides().await);
-    crate::watcher::apply_resolved(&app, slot.inner(), &resolved).await;
+    crate::watcher::apply_resolved(Some(&app), slot.inner(), &resolved).await;
     Ok(resolved)
 }
 
diff --git a/apps/desktop/src-tauri/src/http_server.rs b/apps/desktop/src-tauri/src/http_server.rs
index 74f043c..a479e25 100644
--- a/apps/desktop/src-tauri/src/http_server.rs
+++ b/apps/desktop/src-tauri/src/http_server.rs
@@ -41,7 +41,7 @@ const ALLOWED_ORIGINS: &[&str] = &[
 pub struct Deps {
     pub config_store: Arc<ConfigStore>,
     pub watcher_slot: Arc<WatcherSlot>,
-    pub app_handle: AppHandle,
+    pub app_handle: Option<AppHandle>,
 }
 
 /// Per-server shared state. Cheap to clone (Arc all the way down).
@@ -138,7 +138,7 @@ async fn events_sse(
 /// supported: \\server\share"}`).
 async fn put_config_http(
     State(state): State<AppState>,
-    Extension(app): Extension<AppHandle>,
+    Extension(app): Extension<Option<AppHandle>>,
     Json(patch): Json<ConfigPatch>,
 ) -> Result<Json<ResolvedPaths>, (StatusCode, Json<ConfigError>)> {
     state.config_store.apply(patch).await.map_err(|e| {
@@ -150,7 +150,7 @@ async fn put_config_http(
         )
     })?;
     let resolved = paths::resolve(&state.config_store.overrides().await);
-    watcher::apply_resolved(&app, &state.watcher_slot, &resolved).await;
+    watcher::apply_resolved(app.as_ref(), &state.watcher_slot, &resolved).await;
     Ok(Json(resolved))
 }
 
diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
index f2dcc87..456ef99 100644
--- a/apps/desktop/src-tauri/src/lib.rs
+++ b/apps/desktop/src-tauri/src/lib.rs
@@ -40,7 +40,7 @@ pub fn run() {
             // Cheap clones, no double state to keep in sync.
             let slot = Arc::new(WatcherSlot::default());
             let resolved = paths::resolve(&tauri::async_runtime::block_on(store.overrides()));
-            tauri::async_runtime::block_on(watcher::apply_resolved(&app_handle, &slot, &resolved));
+            tauri::async_runtime::block_on(watcher::apply_resolved(Some(&app_handle), &slot, &resolved));
 
             app.manage(store.clone());
             app.manage(slot.clone());
@@ -51,7 +51,7 @@ pub fn run() {
             http_server::spawn(http_server::Deps {
                 config_store: store,
                 watcher_slot: slot,
-                app_handle: app_handle.clone(),
+                app_handle: Some(app_handle.clone()),
             });
 
             // Clamp restored window onto a visible monitor (handles 2K→FHD moves).
@@ -65,6 +65,41 @@ pub fn run() {
         .expect("error while running tauri application");
 }
 
+/// Run only the HTTP server + filesystem watchers (no Tauri window). Lets a
+/// browser / LAN client use the helper without launching the overlay.
+pub fn run_headless() {
+    tauri::async_runtime::block_on(async {
+        let data_dir = match config::data_dir() {
+            Ok(d) => d,
+            Err(e) => {
+                eprintln!("[headless] config dir: {e:#}");
+                return;
+            }
+        };
+        if let Err(e) = std::fs::create_dir_all(&data_dir) {
+            eprintln!("[headless] create data dir: {e:#}");
+            return;
+        }
+        let store = match ConfigStore::load(data_dir.join("config.json")).await {
+            Ok(s) => Arc::new(s),
+            Err(e) => {
+                eprintln!("[headless] load config: {e:#}");
+                return;
+            }
+        };
+        let slot = Arc::new(WatcherSlot::default());
+        let resolved = paths::resolve(&store.overrides().await);
+        watcher::apply_resolved(None, &slot, &resolved).await;
+        http_server::spawn(http_server::Deps {
+            config_store: store,
+            watcher_slot: slot,
+            app_handle: None,
+        });
+        eprintln!("[headless] tarkov-checker backend up — http://0.0.0.0:47474 (Ctrl+C to stop)");
+        std::future::pending::<()>().await;
+    });
+}
+
 /// Reposition the window if the window-state plugin restored coordinates that
 /// land off every current monitor (monitor layout changed between sessions).
 fn clamp_window_to_monitor(window: &tauri::WebviewWindow) {
diff --git a/apps/desktop/src-tauri/src/server/logs.rs b/apps/desktop/src-tauri/src/server/logs.rs
index 7378670..b62378d 100644
--- a/apps/desktop/src-tauri/src/server/logs.rs
+++ b/apps/desktop/src-tauri/src/server/logs.rs
@@ -148,7 +148,7 @@ fn find_latest_map_id_in_file(path: &Path) -> Option<String> {
 }
 
 fn emit_map_change(
-    app: &AppHandle,
+    app: Option<&AppHandle>,
     state: &Mutex<State>,
     event_tx: &broadcast::Sender<ServerEvent>,
     raw_map_id: String,
@@ -165,22 +165,22 @@ fn emit_map_change(
     drop(guard);
 
     let t = now_ms();
-    // Tauri webview path — unchanged shape.
-    let payload = MapChangePayload {
-        t,
-        raw_map_id: raw_map_id.clone(),
-    };
-    if let Err(err) = app.emit("map-change", &payload) {
-        eprintln!("[logs-watcher] emit failed: {err}");
+    if let Some(app) = app {
+        let payload = MapChangePayload {
+            t,
+            raw_map_id: raw_map_id.clone(),
+        };
+        if let Err(err) = app.emit("map-change", &payload) {
+            eprintln!("[logs-watcher] emit failed: {err}");
+        }
     }
-    // HTTP /events path — same data, tagged enum. `send` errors only on
-    // zero subscribers (normal when /events is unopened); ignore.
+    // HTTP /events path — unconditional; no Tauri webview needed.
     let _ = event_tx.send(ServerEvent::MapChange { t, raw_map_id });
 }
 
 /// Seek + read appended bytes for the currently-tailed log file, parse line
 /// by line, emit on hit. Idempotent — safe to call on every poll tick.
-fn read_appended(app: &AppHandle, state: &Mutex<State>, event_tx: &broadcast::Sender<ServerEvent>) {
+fn read_appended(app: Option<&AppHandle>, state: &Mutex<State>, event_tx: &broadcast::Sender<ServerEvent>) {
     // Snapshot the path + offset under the lock so the actual I/O happens
     // outside it.
     let snapshot: Option<(PathBuf, u64, String)> = {
@@ -257,7 +257,7 @@ fn read_appended(app: &AppHandle, state: &Mutex<State>, event_tx: &broadcast::Se
 /// only on startup — when we discover a brand-new folder mid-session, the
 /// folder is empty and we just wait for the tail to pick up new lines.
 fn attach_to_session(
-    app: &AppHandle,
+    app: Option<&AppHandle>,
     state: &Mutex<State>,
     event_tx: &broadcast::Sender<ServerEvent>,
     folder: PathBuf,
@@ -336,7 +336,7 @@ fn check_within_session_rotation(state: &Mutex<State>) {
 /// here so we don't have to thread name-comparison logic through the event
 /// channel.
 fn check_new_session_folder(
-    app: &AppHandle,
+    app: Option<&AppHandle>,
     state: &Mutex<State>,
     event_tx: &broadcast::Sender<ServerEvent>,
     logs_dir: &Path,
@@ -389,7 +389,7 @@ impl Drop for LogsWatcher {
 ///     `application_NNN.log` is rotated inside the active session.
 pub fn start(
     logs_dir: PathBuf,
-    app: AppHandle,
+    app: Option<AppHandle>,
     event_tx: broadcast::Sender<ServerEvent>,
 ) -> Result<LogsWatcher> {
     let state = Arc::new(Mutex::new(State {
@@ -400,7 +400,7 @@ pub fn start(
 
     // Initial seed from latest existing session, if any.
     if let Some(latest) = list_session_folders(&logs_dir).last().cloned() {
-        attach_to_session(&app, &state, &event_tx, latest, true);
+        attach_to_session(app.as_ref(), &state, &event_tx, latest, true);
     } else {
         eprintln!(
             "[logs-watcher] no existing tarkov log sessions yet at {}",
@@ -440,7 +440,7 @@ pub fn start(
                     break;
                 }
                 check_new_session_folder(
-                    &app_for_folders,
+                    app_for_folders.as_ref(),
                     &state_for_folders,
                     &event_tx_for_folders,
                     &logs_dir_for_folders,
@@ -462,7 +462,7 @@ pub fn start(
             while !stop_for_tail.load(Ordering::SeqCst) {
                 std::thread::sleep(Duration::from_millis(300));
                 check_within_session_rotation(&state_for_tail);
-                read_appended(&app_for_tail, &state_for_tail, &event_tx_for_tail);
+                read_appended(app_for_tail.as_ref(), &state_for_tail, &event_tx_for_tail);
             }
         })
         .context("spawn logs tail watcher thread")?;
diff --git a/apps/desktop/src-tauri/src/server/screenshots.rs b/apps/desktop/src-tauri/src/server/screenshots.rs
index f0dfe48..6e0836e 100644
--- a/apps/desktop/src-tauri/src/server/screenshots.rs
+++ b/apps/desktop/src-tauri/src/server/screenshots.rs
@@ -115,7 +115,7 @@ pub struct ScreenshotWatcher {
 /// quiet for the whole window are reported.
 pub fn start(
     dir: PathBuf,
-    app: AppHandle,
+    app: Option<AppHandle>,
     event_tx: tokio::sync::broadcast::Sender<crate::server::events::ServerEvent>,
 ) -> Result<ScreenshotWatcher> {
     let (tx, rx) = mpsc::channel::<notify_debouncer_full::DebounceEventResult>();
@@ -144,7 +144,7 @@ pub fn start(
                     Err(_) => continue,
                 };
                 for ev in events {
-                    handle_event(&app_handle, &event_tx, ev);
+                    handle_event(app_handle.as_ref(), &event_tx, ev);
                 }
             }
         })
@@ -156,7 +156,7 @@ pub fn start(
 }
 
 fn handle_event(
-    app: &AppHandle,
+    app: Option<&AppHandle>,
     event_tx: &tokio::sync::broadcast::Sender<crate::server::events::ServerEvent>,
     ev: DebouncedEvent,
 ) {
@@ -177,23 +177,19 @@ fn handle_event(
         };
         let yaw = parsed.orientation.map(quaternion_to_yaw_degrees);
         let t = chrono_now_ms();
-        // Tauri webview path — unchanged. Uses the private PositionPayload
-        // struct so the webview's existing `listen("position", ...)` keeps
-        // working bit-for-bit.
-        let payload = PositionPayload {
-            t,
-            x: parsed.position.x,
-            y: parsed.position.y,
-            z: parsed.position.z,
-            yaw,
-        };
-        if let Err(err) = app.emit("position", &payload) {
-            eprintln!("[screenshot-watcher] emit failed: {err}");
+        if let Some(app) = app {
+            let payload = PositionPayload {
+                t,
+                x: parsed.position.x,
+                y: parsed.position.y,
+                z: parsed.position.z,
+                yaw,
+            };
+            if let Err(err) = app.emit("position", &payload) {
+                eprintln!("[screenshot-watcher] emit failed: {err}");
+            }
         }
-        // HTTP /events path — same data, ServerEvent wire-shape (tagged
-        // enum). `send` errors only when there are zero subscribers; that
-        // is the normal case when nobody has opened /events, so we ignore
-        // it silently.
+        // HTTP /events path — unconditional; no Tauri webview needed.
         let _ = event_tx.send(crate::server::events::ServerEvent::Position {
             t,
             x: parsed.position.x,
diff --git a/apps/desktop/src-tauri/src/watcher.rs b/apps/desktop/src-tauri/src/watcher.rs
index 59dbdd4..7880ed5 100644
--- a/apps/desktop/src-tauri/src/watcher.rs
+++ b/apps/desktop/src-tauri/src/watcher.rs
@@ -76,7 +76,7 @@ impl WatcherSlot {
 /// Acquires `apply_lock` for the full duration so that concurrent calls
 /// (e.g. two rapid `update_config` IPC commands) are serialised rather
 /// than interleaved — preventing duplicate watcher instances.
-pub async fn apply_resolved(app: &AppHandle, slot: &WatcherSlot, resolved: &ResolvedPaths) {
+pub async fn apply_resolved(app: Option<&AppHandle>, slot: &WatcherSlot, resolved: &ResolvedPaths) {
     let _guard = slot.apply_lock.lock().await;
 
     let screenshots_dir = match (
@@ -87,7 +87,7 @@ pub async fn apply_resolved(app: &AppHandle, slot: &WatcherSlot, resolved: &Reso
         _ => None,
     };
     match screenshots_dir {
-        Some(dir) => match screenshots::start(dir, app.clone(), slot.event_tx.clone()) {
+        Some(dir) => match screenshots::start(dir, app.cloned(), slot.event_tx.clone()) {
             Ok(w) => slot.replace_screenshots(Some(w)),
             Err(err) => {
                 eprintln!("[watcher] screenshots start failed: {err:#}");
@@ -102,7 +102,7 @@ pub async fn apply_resolved(app: &AppHandle, slot: &WatcherSlot, resolved: &Reso
         _ => None,
     };
     match logs_dir {
-        Some(dir) => match logs::start(dir, app.clone(), slot.event_tx.clone()) {
+        Some(dir) => match logs::start(dir, app.cloned(), slot.event_tx.clone()) {
             Ok(w) => slot.replace_logs(Some(w)),
             Err(err) => {
                 eprintln!("[watcher] logs start failed: {err:#}");

From f6c63e5b1eb9e7151bfc009f026b2d42f0046fc3 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Tue, 2 Jun 2026 22:04:23 +0300
Subject: [PATCH 23/53] fix(hotkeys): show the hotkeys settings section in the
 desktop browser
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The browser shortcuts (#8) worked, but the settings section to see/
configure them was tauri-only — so a browser user couldn't tell what the
combos were or change them. Make the section visible with
`desktop-or-tauri` (desktop browser + overlay, hidden on phones since
they have no keyboard); the browser uses the same combos via
useBrowserShortcut. The lock recorder stays overlay-only (no window to
lock in a browser).

Verified in the preview: at >=640px the Hotkeys section renders with the
5 keyboard-relevant bindings (zoom x2, floor x2, airdrop) and no lock.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/hotkeys/settings.ts                | 4 +++-
 .../src/features/settings/sections/HotkeysSection.vue       | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/features/hotkeys/settings.ts b/apps/client/src/features/hotkeys/settings.ts
index 7443e15..de04061 100644
--- a/apps/client/src/features/hotkeys/settings.ts
+++ b/apps/client/src/features/hotkeys/settings.ts
@@ -5,6 +5,8 @@ registerSettingsSection({
   id: 'hotkeys',
   group: 'main',
   order: 60,
-  visible: 'tauri',
+  // Shown on the desktop browser + overlay (both have a keyboard), hidden on
+  // phones. The browser uses the same combos via useBrowserShortcut.
+  visible: 'desktop-or-tauri',
   component: HotkeysSection,
 });
diff --git a/apps/client/src/features/settings/sections/HotkeysSection.vue b/apps/client/src/features/settings/sections/HotkeysSection.vue
index eb853a8..bd34777 100644
--- a/apps/client/src/features/settings/sections/HotkeysSection.vue
+++ b/apps/client/src/features/settings/sections/HotkeysSection.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import HotkeyRecorder from '@/features/hotkeys/components/HotkeyRecorder.vue';
 import { useHotkeysStore } from '@/features/hotkeys/store';
+import { isTauri } from '@/shared/tauri';
 
 const { lockHotkey, zoomInHotkey, zoomOutHotkey, floorUpHotkey, floorDownHotkey, airdropHotkey } =
   storeToRefs(useHotkeysStore());
@@ -10,13 +11,14 @@ const { t } = useI18n();
 <template>
   <Fieldset :legend="t('hotkeys.heading')">
     <div class="space-y-3">
-      <HotkeyRecorder v-model="lockHotkey" :label="t('hotkeys.lock')" />
+      <!-- Lock is overlay-only (no window to lock in a browser). -->
+      <HotkeyRecorder v-if="isTauri" v-model="lockHotkey" :label="t('hotkeys.lock')" />
       <HotkeyRecorder v-model="zoomInHotkey" :label="t('hotkeys.zoomIn')" />
       <HotkeyRecorder v-model="zoomOutHotkey" :label="t('hotkeys.zoomOut')" />
       <HotkeyRecorder v-model="floorUpHotkey" :label="t('hotkeys.floorUp')" />
       <HotkeyRecorder v-model="floorDownHotkey" :label="t('hotkeys.floorDown')" />
       <HotkeyRecorder v-model="airdropHotkey" :label="t('hotkeys.airdrop')" />
-      <p class="text-[10px] leading-relaxed opacity-70">{{ t('hotkeys.lockHint') }}</p>
+      <p v-if="isTauri" class="text-[10px] leading-relaxed opacity-70">{{ t('hotkeys.lockHint') }}</p>
     </div>
   </Fieldset>
 </template>

From dd8940fdff469150ce34e167aa78daa7001b0868 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Wed, 3 Jun 2026 00:17:10 +0300
Subject: [PATCH 24/53] feat(hotkeys): backend-owned global hotkeys forwarded
 to every client

The backend registers the five forwarded combos (zoom-in/out,
floor-up/down, airdrop) as OS-global shortcuts and broadcasts a
`command` SSE event, so the overlay, any browser, and LAN phones all
react regardless of focus. Combos persist in hotkeys.json and are
editable from any client via /api/hotkeys. The overlay lock stays
client-registered (recovery path). Drops the focus-only
useBrowserShortcut.

- shared: commandMessage in the SSE union + hotkeys-api schema
- backend: HotkeyController trait (TauriHotkeys via the plugin,
  StandaloneHotkeys via its own Win32 message pump in headless),
  HotkeyStore, /api/hotkeys GET/PUT + suspend/resume, command event
- client: hotkeys store is a thin backend sync layer, command dispatch
  in index.vue, useHotkeysSync (load + recorder suspend/resume bridge)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/App.vue                       |  11 +-
 apps/client/src/__tests__/hotkey.spec.ts      |  29 +-
 .../src/__tests__/hotkeys-store.spec.ts       |  93 +++++
 .../src/__tests__/useServerTransport.spec.ts  |  41 +-
 .../hotkeys/composables/useBrowserShortcut.ts |  30 --
 .../hotkeys/composables/useHotkeysSync.ts     |  27 ++
 .../client/src/features/hotkeys/lib/hotkey.ts |  32 --
 apps/client/src/features/hotkeys/settings.ts  |   3 +-
 apps/client/src/features/hotkeys/store.ts     | 128 +++++-
 .../src/features/server/api/hotkeys-api.ts    |  42 ++
 .../src/features/server/api/ipc-contract.ts   |  17 +
 .../src/features/server/api/transport.ts      |   7 +-
 .../server/composables/useServerTransport.ts  |  12 +
 .../settings/sections/HotkeysSection.vue      |  45 +-
 apps/client/src/pages/index.vue               |  46 +-
 apps/desktop/src-tauri/Cargo.lock             |   2 +
 apps/desktop/src-tauri/Cargo.toml             |  11 +
 apps/desktop/src-tauri/src/commands.rs        |  46 ++
 apps/desktop/src-tauri/src/hotkeys.rs         | 395 ++++++++++++++++++
 apps/desktop/src-tauri/src/http_server.rs     | 178 +++++++-
 apps/desktop/src-tauri/src/lib.rs             | 111 ++++-
 apps/desktop/src-tauri/src/server/events.rs   |  29 ++
 apps/desktop/src-tauri/src/server/hotkeys.rs  | 240 +++++++++++
 apps/desktop/src-tauri/src/server/mod.rs      |   1 +
 apps/desktop/src-tauri/src/watcher.rs         |  12 +-
 packages/shared/src/hotkeys-api.ts            |  44 ++
 packages/shared/src/index.ts                  |   1 +
 packages/shared/src/ws-messages.ts            |  21 +-
 28 files changed, 1481 insertions(+), 173 deletions(-)
 create mode 100644 apps/client/src/__tests__/hotkeys-store.spec.ts
 delete mode 100644 apps/client/src/features/hotkeys/composables/useBrowserShortcut.ts
 create mode 100644 apps/client/src/features/hotkeys/composables/useHotkeysSync.ts
 create mode 100644 apps/client/src/features/server/api/hotkeys-api.ts
 create mode 100644 apps/desktop/src-tauri/src/hotkeys.rs
 create mode 100644 apps/desktop/src-tauri/src/server/hotkeys.rs
 create mode 100644 packages/shared/src/hotkeys-api.ts

diff --git a/apps/client/src/App.vue b/apps/client/src/App.vue
index 07e69b5..5f1fc75 100644
--- a/apps/client/src/App.vue
+++ b/apps/client/src/App.vue
@@ -7,6 +7,7 @@ import { useOverlayStore } from '@/features/overlay/store';
 import { useHotkeysStore } from '@/features/hotkeys/store';
 import { useTauriOverlay } from '@/features/overlay/composables/useTauriOverlay';
 import { useGlobalShortcut } from '@/features/hotkeys/composables/useGlobalShortcut';
+import { useHotkeysSync } from '@/features/hotkeys/composables/useHotkeysSync';
 import { useTrayIcon } from '@/features/overlay/composables/useTrayIcon';
 import { useOverlayBootstrap } from '@/features/overlay/composables/useOverlayBootstrap';
 import { useAutoMapSwitch } from '@/features/map/composables/useAutoMapSwitch';
@@ -27,12 +28,18 @@ provideTransportStatus(status);
 // regardless of which route is currently mounted.
 useAutoMapSwitch();
 
-// Lock toggle is the only truly global hotkey — every other map-specific
-// shortcut lives inside OverlayView, scoped to that route.
+// Lock toggle stays a client-side global shortcut: it's an overlay window op
+// (click-through) with no browser meaning, and keeping it on the proven plugin
+// path preserves the recovery route out of a click-through lockout. Every other
+// hotkey is backend-owned and arrives as a `command` event (see index.vue).
 useGlobalShortcut(isTauri, lockHotkey, () => {
   overlayClickThrough.value = !overlayClickThrough.value;
 });
 
+// Load backend-owned combos into the store + bridge the recorder's
+// suspend/resume to the backend (so a combo can be re-recorded).
+useHotkeysSync();
+
 useOverlayBootstrap(overlayClickThrough);
 useTrayIcon(isTauri, overlayClickThrough);
 
diff --git a/apps/client/src/__tests__/hotkey.spec.ts b/apps/client/src/__tests__/hotkey.spec.ts
index 0f63540..ce0720c 100644
--- a/apps/client/src/__tests__/hotkey.spec.ts
+++ b/apps/client/src/__tests__/hotkey.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { captureHotkey, formatHotkeyParts, matchesAccelerator } from '@/features/hotkeys/lib/hotkey';
+import { captureHotkey, formatHotkeyParts } from '@/features/hotkeys/lib/hotkey';
 
 // Mirror of the keys accepted by global-hotkey 0.7.0's `parse_key` (uppercased
 // before matching). Our captured main-key tokens MUST land in this set or
@@ -156,33 +156,6 @@ describe('captureHotkey — validation', () => {
   });
 });
 
-describe('matchesAccelerator (browser-side matching)', () => {
-  it('matches the exact combo', () => {
-    expect(matchesAccelerator(ev('Equal', { ctrl: true }), 'CommandOrControl+=')).toBe(true);
-    expect(matchesAccelerator(ev('KeyD', { ctrl: true, alt: true }), 'CommandOrControl+Alt+D')).toBe(
-      true,
-    );
-    expect(
-      matchesAccelerator(ev('Equal', { ctrl: true, shift: true }), 'CommandOrControl+Shift+='),
-    ).toBe(true);
-  });
-
-  it('rejects extra or missing modifiers', () => {
-    // extra shift
-    expect(matchesAccelerator(ev('Equal', { ctrl: true, shift: true }), 'CommandOrControl+=')).toBe(
-      false,
-    );
-    // missing alt
-    expect(matchesAccelerator(ev('KeyL', { ctrl: true }), 'CommandOrControl+Alt+L')).toBe(false);
-    // wrong main key
-    expect(matchesAccelerator(ev('Minus', { ctrl: true }), 'CommandOrControl+=')).toBe(false);
-  });
-
-  it('CommandOrControl matches Meta too (Mac)', () => {
-    expect(matchesAccelerator(ev('KeyK', { meta: true }), 'CommandOrControl+K')).toBe(true);
-  });
-});
-
 describe('formatHotkeyParts', () => {
   it('renders canonical numpad tokens', () => {
     expect(formatHotkeyParts('CommandOrControl+NumpadSubtract')).toEqual(['Ctrl', 'Num -']);
diff --git a/apps/client/src/__tests__/hotkeys-store.spec.ts b/apps/client/src/__tests__/hotkeys-store.spec.ts
new file mode 100644
index 0000000..90ed9f7
--- /dev/null
+++ b/apps/client/src/__tests__/hotkeys-store.spec.ts
@@ -0,0 +1,93 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import type { HotkeyConfig } from '@shared/hotkeys-api';
+
+// Mock the transport layer the store syncs through. Hoisted so the vi.mock
+// factory can reference the fns.
+const { fetchHotkeysMock, putHotkeysMock } = vi.hoisted(() => ({
+  fetchHotkeysMock: vi.fn(),
+  putHotkeysMock: vi.fn(),
+}));
+
+vi.mock('@/features/server/api/hotkeys-api', () => ({
+  fetchHotkeys: fetchHotkeysMock,
+  putHotkeys: putHotkeysMock,
+  suspendHotkeys: vi.fn(),
+  resumeHotkeys: vi.fn(),
+}));
+
+import { useHotkeysStore } from '@/features/hotkeys/store';
+
+const DEFAULTS: HotkeyConfig = {
+  zoomIn: 'CommandOrControl+=',
+  zoomOut: 'CommandOrControl+-',
+  floorUp: 'CommandOrControl+Shift+=',
+  floorDown: 'CommandOrControl+Shift+-',
+  airdrop: 'CommandOrControl+Alt+D',
+};
+
+beforeEach(() => {
+  setActivePinia(createPinia());
+  localStorage.clear();
+  fetchHotkeysMock.mockReset();
+  putHotkeysMock.mockReset();
+});
+
+describe('useHotkeysStore — backend sync', () => {
+  it('starts at defaults before load()', () => {
+    const store = useHotkeysStore();
+    expect(store.zoomInHotkey).toBe(DEFAULTS.zoomIn);
+    expect(store.airdropHotkey).toBe(DEFAULTS.airdrop);
+  });
+
+  it('load() applies the backend config', async () => {
+    fetchHotkeysMock.mockResolvedValue({ ...DEFAULTS, zoomIn: 'CommandOrControl+Alt+Z' });
+    const store = useHotkeysStore();
+    await store.load();
+    expect(store.zoomInHotkey).toBe('CommandOrControl+Alt+Z');
+  });
+
+  it('setAction PUTs and applies the effective response', async () => {
+    fetchHotkeysMock.mockResolvedValue(DEFAULTS);
+    putHotkeysMock.mockResolvedValue({ ...DEFAULTS, airdrop: 'CommandOrControl+Alt+X' });
+    const store = useHotkeysStore();
+    await store.load();
+
+    await store.setAction('airdrop', 'CommandOrControl+Alt+X');
+    expect(putHotkeysMock).toHaveBeenCalledWith({ airdrop: 'CommandOrControl+Alt+X' });
+    expect(store.airdropHotkey).toBe('CommandOrControl+Alt+X');
+  });
+
+  it('setAction reverts the optimistic value when the PUT rejects', async () => {
+    fetchHotkeysMock.mockResolvedValue(DEFAULTS);
+    putHotkeysMock.mockRejectedValue(new Error('HTTP 400'));
+    const store = useHotkeysStore();
+    await store.load();
+
+    await store.setAction('zoomIn', 'CommandOrControl+Alt+Q');
+    expect(store.zoomInHotkey).toBe(DEFAULTS.zoomIn); // reverted
+  });
+
+  it('migrates a customised legacy localStorage combo once', async () => {
+    // Old per-field persistedRef stored JSON-encoded strings.
+    localStorage.setItem('tc.hotkeys.zoomIn', JSON.stringify('CommandOrControl+Alt+M'));
+    fetchHotkeysMock.mockResolvedValue(DEFAULTS);
+    putHotkeysMock.mockResolvedValue({ ...DEFAULTS, zoomIn: 'CommandOrControl+Alt+M' });
+
+    const store = useHotkeysStore();
+    await store.load();
+
+    expect(putHotkeysMock).toHaveBeenCalledWith({ zoomIn: 'CommandOrControl+Alt+M' });
+    expect(store.zoomInHotkey).toBe('CommandOrControl+Alt+M');
+  });
+
+  it('does not migrate when legacy values equal the backend defaults', async () => {
+    localStorage.setItem('tc.hotkeys.zoomIn', JSON.stringify(DEFAULTS.zoomIn));
+    fetchHotkeysMock.mockResolvedValue(DEFAULTS);
+
+    const store = useHotkeysStore();
+    await store.load();
+
+    expect(putHotkeysMock).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/client/src/__tests__/useServerTransport.spec.ts b/apps/client/src/__tests__/useServerTransport.spec.ts
index 63c27d9..0eb646e 100644
--- a/apps/client/src/__tests__/useServerTransport.spec.ts
+++ b/apps/client/src/__tests__/useServerTransport.spec.ts
@@ -88,19 +88,21 @@ describe('useServerTransport — Tauri path', () => {
     mockIsTauri = true;
   });
 
-  it('subscribes to "position" and "map-change" and flips status to open', async () => {
-    const off1 = vi.fn();
-    const off2 = vi.fn();
-    listenMock.mockResolvedValueOnce(off1).mockResolvedValueOnce(off2);
+  it('subscribes to "position", "map-change" and "command" and flips status to open', async () => {
+    listenMock
+      .mockResolvedValueOnce(vi.fn())
+      .mockResolvedValueOnce(vi.fn())
+      .mockResolvedValueOnce(vi.fn());
 
     const { result } = mountTransport('/events');
     expect(result.status.value).toBe('connecting');
 
     await flushMounted();
 
-    expect(listenMock).toHaveBeenCalledTimes(2);
+    expect(listenMock).toHaveBeenCalledTimes(3);
     expect(listenMock.mock.calls[0]![0]).toBe('position');
     expect(listenMock.mock.calls[1]![0]).toBe('map-change');
+    expect(listenMock.mock.calls[2]![0]).toBe('command');
     expect(result.status.value).toBe('open');
     expect(useServerStreamMock).not.toHaveBeenCalled();
   });
@@ -158,10 +160,36 @@ describe('useServerTransport — Tauri path', () => {
     expect(dispatchServerEventMock).not.toHaveBeenCalled();
   });
 
+  it('validates command payloads and dispatches them', async () => {
+    listenMock.mockResolvedValueOnce(vi.fn()); // position
+    listenMock.mockResolvedValueOnce(vi.fn()); // map-change
+    let commandHandler: ((event: { payload: unknown }) => void) | null = null;
+    listenMock.mockImplementationOnce(async (_name: string, handler) => {
+      commandHandler = handler;
+      return vi.fn();
+    });
+
+    mountTransport('/events');
+    await flushMounted();
+
+    expect(commandHandler).not.toBeNull();
+
+    commandHandler!({ payload: { action: 'zoom-in' } });
+    expect(dispatchServerEventMock).toHaveBeenCalledWith({ type: 'command', action: 'zoom-in' });
+
+    dispatchServerEventMock.mockClear();
+    commandHandler!({ payload: { action: 'not-an-action' } }); // bad enum value
+    expect(dispatchServerEventMock).not.toHaveBeenCalled();
+  });
+
   it('calls every unlisten and flips status to closed on unmount', async () => {
     const off1 = vi.fn();
     const off2 = vi.fn();
-    listenMock.mockResolvedValueOnce(off1).mockResolvedValueOnce(off2);
+    const off3 = vi.fn();
+    listenMock
+      .mockResolvedValueOnce(off1)
+      .mockResolvedValueOnce(off2)
+      .mockResolvedValueOnce(off3);
 
     const { result, app } = mountTransport('/events');
     await flushMounted();
@@ -171,6 +199,7 @@ describe('useServerTransport — Tauri path', () => {
 
     expect(off1).toHaveBeenCalledTimes(1);
     expect(off2).toHaveBeenCalledTimes(1);
+    expect(off3).toHaveBeenCalledTimes(1);
     expect(result.status.value).toBe('closed');
   });
 });
diff --git a/apps/client/src/features/hotkeys/composables/useBrowserShortcut.ts b/apps/client/src/features/hotkeys/composables/useBrowserShortcut.ts
deleted file mode 100644
index 35e4dfc..0000000
--- a/apps/client/src/features/hotkeys/composables/useBrowserShortcut.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { matchesAccelerator } from '../lib/hotkey';
-
-function isTypingTarget(el: EventTarget | null): boolean {
-  const node = el as HTMLElement | null;
-  if (!node) return false;
-  return (
-    node.tagName === 'INPUT' ||
-    node.tagName === 'TEXTAREA' ||
-    node.tagName === 'SELECT' ||
-    node.isContentEditable
-  );
-}
-
-/**
- * Page-level counterpart to useGlobalShortcut: fires `action` when the combo
- * is pressed while the page is focused, so zoom / floor / airdrop work in a
- * plain browser or on a LAN phone where Tauri's global-shortcut plugin isn't
- * available. No-op under Tauri (the OS-level shortcut already handles it, so
- * this would double-fire). Ignores keystrokes typed into form fields, and
- * preventDefault on a match so app combos like Ctrl+= don't also zoom the page.
- */
-export function useBrowserShortcut(isTauri: boolean, combo: Ref<string>, action: () => void): void {
-  useEventListener(window, 'keydown', (e: KeyboardEvent) => {
-    if (isTauri || isTypingTarget(e.target)) return;
-    if (matchesAccelerator(e, combo.value)) {
-      e.preventDefault();
-      action();
-    }
-  });
-}
diff --git a/apps/client/src/features/hotkeys/composables/useHotkeysSync.ts b/apps/client/src/features/hotkeys/composables/useHotkeysSync.ts
new file mode 100644
index 0000000..deb5451
--- /dev/null
+++ b/apps/client/src/features/hotkeys/composables/useHotkeysSync.ts
@@ -0,0 +1,27 @@
+import { useHotkeysStore } from '@/features/hotkeys/store';
+import { HOTKEY_SUSPEND_EVENT, HOTKEY_RESUME_EVENT } from '../lib/hotkey';
+import { suspendHotkeys, resumeHotkeys } from '@/features/server/api/hotkeys-api';
+
+/**
+ * Mount once at the app root. Loads the backend-owned hotkey combos into the
+ * store and bridges the settings recorder's suspend/resume window events to
+ * the backend: while a recorder captures, the backend must drop its OS-global
+ * binds so the pressed combo reaches the page/webview instead of firing its
+ * action (the backend, not the browser, now holds those binds). The same
+ * window events still drive the client-side lock shortcut via `useGlobalShortcut`.
+ */
+export function useHotkeysSync(): void {
+  const store = useHotkeysStore();
+
+  onMounted(() => {
+    // Best-effort — a closed transport just leaves the defaults in place.
+    void store.load().catch(() => {});
+  });
+
+  useEventListener(window, HOTKEY_SUSPEND_EVENT, () => {
+    void suspendHotkeys().catch(() => {});
+  });
+  useEventListener(window, HOTKEY_RESUME_EVENT, () => {
+    void resumeHotkeys().catch(() => {});
+  });
+}
diff --git a/apps/client/src/features/hotkeys/lib/hotkey.ts b/apps/client/src/features/hotkeys/lib/hotkey.ts
index 8cd0e2a..38e00dc 100644
--- a/apps/client/src/features/hotkeys/lib/hotkey.ts
+++ b/apps/client/src/features/hotkeys/lib/hotkey.ts
@@ -232,35 +232,3 @@ function normalizeMainKey(event: KeyboardEvent): string | null {
   // Numpad / punctuation / navigation
   return CODE_TO_ACCEL[code] ?? null;
 }
-
-const CMD_CTRL_TOKENS = new Set([
-  'CommandOrControl',
-  'CmdOrCtrl',
-  'Command',
-  'Cmd',
-  'Control',
-  'Ctrl',
-  'Meta',
-  'Super',
-]);
-
-/**
- * Does a `keydown` event exactly match an accelerator string? The browser
- * counterpart of `captureHotkey` — used to fire the same bindings on the page
- * (LAN / browser) where Tauri's global-shortcut plugin isn't available.
- * CommandOrControl matches Ctrl OR Meta; all other modifiers must match
- * exactly (no extras), so Ctrl+= doesn't also trigger on Ctrl+Shift+=.
- */
-export function matchesAccelerator(event: KeyboardEvent, combo: string): boolean {
-  const parts = combo.split('+');
-  if (parts.length < 2) return false;
-  const mainToken = parts[parts.length - 1];
-  const mods = parts.slice(0, -1);
-  const wantCmdCtrl = mods.some((m) => CMD_CTRL_TOKENS.has(m));
-  const wantAlt = mods.some((m) => m === 'Alt' || m === 'Option');
-  const wantShift = mods.includes('Shift');
-  if ((event.ctrlKey || event.metaKey) !== wantCmdCtrl) return false;
-  if (event.altKey !== wantAlt) return false;
-  if (event.shiftKey !== wantShift) return false;
-  return normalizeMainKey(event) === mainToken;
-}
diff --git a/apps/client/src/features/hotkeys/settings.ts b/apps/client/src/features/hotkeys/settings.ts
index de04061..266be1a 100644
--- a/apps/client/src/features/hotkeys/settings.ts
+++ b/apps/client/src/features/hotkeys/settings.ts
@@ -6,7 +6,8 @@ registerSettingsSection({
   group: 'main',
   order: 60,
   // Shown on the desktop browser + overlay (both have a keyboard), hidden on
-  // phones. The browser uses the same combos via useBrowserShortcut.
+  // phones. The combos are backend-owned now — configurable from any desktop
+  // browser, fired globally for every client via the `command` event.
   visible: 'desktop-or-tauri',
   component: HotkeysSection,
 });
diff --git a/apps/client/src/features/hotkeys/store.ts b/apps/client/src/features/hotkeys/store.ts
index fb8edf6..9ab60ee 100644
--- a/apps/client/src/features/hotkeys/store.ts
+++ b/apps/client/src/features/hotkeys/store.ts
@@ -1,30 +1,112 @@
 import { z } from 'zod';
 import { persistedRef } from '@/shared/persisted-store';
+import { acceleratorSchema, type HotkeyConfig, type HotkeyPatch } from '@shared/hotkeys-api';
+import { fetchHotkeys, putHotkeys } from '@/features/server/api/hotkeys-api';
 
-// One or more modifiers + a non-empty main key. Bare keys (incl. F-row)
-// are rejected because Tarkov claims them via DirectInput and Tauri's
-// RegisterHotKey loses the race.
-const hotkeySchema = z
-  .string()
-  .regex(/^((CommandOrControl|Control|Ctrl|Alt|Shift|Meta|Super)\+)+[^+\s]+$/);
+// Default combos — must match the Rust `HotkeyConfig::default()` so an
+// un-customised install agrees on both ends and the migration below is a no-op.
+const DEFAULTS: HotkeyConfig = {
+  zoomIn: 'CommandOrControl+=',
+  zoomOut: 'CommandOrControl+-',
+  floorUp: 'CommandOrControl+Shift+=',
+  floorDown: 'CommandOrControl+Shift+-',
+  airdrop: 'CommandOrControl+Alt+D',
+};
 
+// localStorage keys the old client-owned store used (per-field persistedRefs).
+const LEGACY_KEYS: Record<keyof HotkeyConfig, string> = {
+  zoomIn: 'tc.hotkeys.zoomIn',
+  zoomOut: 'tc.hotkeys.zoomOut',
+  floorUp: 'tc.hotkeys.floorUp',
+  floorDown: 'tc.hotkeys.floorDown',
+  airdrop: 'tc.hotkeys.airdrop',
+};
+
+/** Read a legacy persistedRef value (stored as JSON) and validate it. */
+function readLegacy(key: string): string | null {
+  if (typeof localStorage === 'undefined') return null;
+  const raw = localStorage.getItem(key);
+  if (raw === null) return null;
+  try {
+    const parsed = acceleratorSchema.safeParse(JSON.parse(raw));
+    return parsed.success ? parsed.data : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Hotkey settings store. The overlay **lock** combo stays client-owned (it
+ * toggles click-through — a window op, overlay-only — and is registered via
+ * `tauri-plugin-global-shortcut`; see CLAUDE.md). The five forwarded actions
+ * (zoom/floor/airdrop) are owned by the backend: this store is a thin sync
+ * layer that loads them via `fetchHotkeys()` and PUTs on change. Local refs
+ * start at the defaults so reads before `load()` are safe.
+ */
 export const useHotkeysStore = defineStore('hotkeys', () => {
-  const lockHotkey = persistedRef('tc.hotkeys.lock', hotkeySchema, 'CommandOrControl+Alt+L');
-  const zoomInHotkey = persistedRef('tc.hotkeys.zoomIn', hotkeySchema, 'CommandOrControl+=');
-  const zoomOutHotkey = persistedRef('tc.hotkeys.zoomOut', hotkeySchema, 'CommandOrControl+-');
-  const floorUpHotkey = persistedRef(
-    'tc.hotkeys.floorUp',
-    hotkeySchema,
-    'CommandOrControl+Shift+=',
-  );
-  const floorDownHotkey = persistedRef(
-    'tc.hotkeys.floorDown',
-    hotkeySchema,
-    'CommandOrControl+Shift+-',
-  );
-  // Hotkey only arms/clears at boundaries — sample capture is driven by
-  // the screenshot-watcher's `position` events, not this binding.
-  const airdropHotkey = persistedRef('tc.hotkeys.airdrop', hotkeySchema, 'CommandOrControl+Alt+D');
+  const lockHotkey = persistedRef('tc.hotkeys.lock', acceleratorSchema, 'CommandOrControl+Alt+L');
+
+  const zoomInHotkey = ref<string>(DEFAULTS.zoomIn);
+  const zoomOutHotkey = ref<string>(DEFAULTS.zoomOut);
+  const floorUpHotkey = ref<string>(DEFAULTS.floorUp);
+  const floorDownHotkey = ref<string>(DEFAULTS.floorDown);
+  const airdropHotkey = ref<string>(DEFAULTS.airdrop);
+
+  const fields: Record<keyof HotkeyConfig, Ref<string>> = {
+    zoomIn: zoomInHotkey,
+    zoomOut: zoomOutHotkey,
+    floorUp: floorUpHotkey,
+    floorDown: floorDownHotkey,
+    airdrop: airdropHotkey,
+  };
+
+  function applyConfig(cfg: HotkeyConfig): void {
+    for (const key of Object.keys(fields) as (keyof HotkeyConfig)[]) {
+      fields[key].value = cfg[key];
+    }
+  }
+
+  // One-time migration: if the user customised combos in the old localStorage
+  // store, push those up to the backend the first time the new client runs.
+  // Defaults match, so an un-customised install never PUTs anything.
+  const migrated = persistedRef('tc.hotkeys.migrated', z.boolean(), false);
+
+  async function migrateLegacy(backend: HotkeyConfig): Promise<void> {
+    if (migrated.value) return;
+    migrated.value = true;
+    const patch: HotkeyPatch = {};
+    for (const key of Object.keys(LEGACY_KEYS) as (keyof HotkeyConfig)[]) {
+      const legacy = readLegacy(LEGACY_KEYS[key]);
+      if (legacy && legacy !== backend[key]) {
+        patch[key] = legacy;
+      }
+    }
+    if (Object.keys(patch).length > 0) {
+      applyConfig(await putHotkeys(patch));
+    }
+  }
+
+  /** Load combos from the backend and run the one-time legacy migration.
+   * Mounted once at the app root (see `useHotkeysSync`). */
+  async function load(): Promise<void> {
+    const backend = await fetchHotkeys();
+    applyConfig(backend);
+    await migrateLegacy(backend);
+  }
+
+  /** Persist a single action's combo. Optimistically updates the local ref,
+   * then snaps to the backend's EFFECTIVE value (which reverts the field if
+   * the combo couldn't be registered); reverts on a rejected PUT (e.g. 400). */
+  async function setAction(field: keyof HotkeyConfig, combo: string): Promise<void> {
+    const prev = fields[field].value;
+    if (prev === combo) return;
+    fields[field].value = combo;
+    try {
+      applyConfig(await putHotkeys({ [field]: combo }));
+    } catch {
+      fields[field].value = prev;
+    }
+  }
 
   return {
     lockHotkey,
@@ -33,5 +115,7 @@ export const useHotkeysStore = defineStore('hotkeys', () => {
     floorUpHotkey,
     floorDownHotkey,
     airdropHotkey,
+    load,
+    setAction,
   };
 });
diff --git a/apps/client/src/features/server/api/hotkeys-api.ts b/apps/client/src/features/server/api/hotkeys-api.ts
new file mode 100644
index 0000000..b1f6560
--- /dev/null
+++ b/apps/client/src/features/server/api/hotkeys-api.ts
@@ -0,0 +1,42 @@
+import { hotkeyConfigSchema, type HotkeyConfig, type HotkeyPatch } from '@shared/hotkeys-api';
+import { callBackend } from './transport';
+
+const parseConfig = (d: unknown): HotkeyConfig => hotkeyConfigSchema.parse(d);
+
+/** GET the backend-owned hotkey combos (the source of truth). */
+export function fetchHotkeys(): Promise<HotkeyConfig> {
+  return callBackend({
+    tauri: { cmd: 'get_hotkeys' },
+    http: { method: 'GET', path: '/api/hotkeys' },
+    parse: parseConfig,
+  });
+}
+
+/** PUT a partial update; the backend (re)registers and returns the EFFECTIVE
+ * config — a field whose combo couldn't be claimed comes back reverted. */
+export function putHotkeys(patch: HotkeyPatch): Promise<HotkeyConfig> {
+  return callBackend({
+    tauri: { cmd: 'update_hotkeys', args: { patch } },
+    http: { method: 'PUT', path: '/api/hotkeys', body: patch },
+    parse: parseConfig,
+  });
+}
+
+/** Release the OS binds while the settings recorder captures a combo, so the
+ * keystroke reaches the page/webview instead of firing its action. */
+export function suspendHotkeys(): Promise<void> {
+  return callBackend({
+    tauri: { cmd: 'suspend_hotkeys' },
+    http: { method: 'POST', path: '/api/hotkeys/suspend' },
+    parse: () => undefined,
+  });
+}
+
+/** Re-claim the OS binds after the recorder finishes. */
+export function resumeHotkeys(): Promise<void> {
+  return callBackend({
+    tauri: { cmd: 'resume_hotkeys' },
+    http: { method: 'POST', path: '/api/hotkeys/resume' },
+    parse: () => undefined,
+  });
+}
diff --git a/apps/client/src/features/server/api/ipc-contract.ts b/apps/client/src/features/server/api/ipc-contract.ts
index 8c80aae..4412603 100644
--- a/apps/client/src/features/server/api/ipc-contract.ts
+++ b/apps/client/src/features/server/api/ipc-contract.ts
@@ -1,4 +1,5 @@
 import type { ServerConfigResponse, ServerConfigUpdate } from '@shared/config-api';
+import type { HotkeyConfig, HotkeyPatch } from '@shared/hotkeys-api';
 
 /**
  * The full set of Tauri IPC commands the Rust side exposes (see
@@ -19,6 +20,22 @@ export interface IpcContract {
     args: { patch: ServerConfigUpdate };
     result: ServerConfigResponse;
   };
+  get_hotkeys: {
+    args: undefined;
+    result: HotkeyConfig;
+  };
+  update_hotkeys: {
+    args: { patch: HotkeyPatch };
+    result: HotkeyConfig;
+  };
+  suspend_hotkeys: {
+    args: undefined;
+    result: void;
+  };
+  resume_hotkeys: {
+    args: undefined;
+    result: void;
+  };
 }
 
 export type IpcCommand = keyof IpcContract;
diff --git a/apps/client/src/features/server/api/transport.ts b/apps/client/src/features/server/api/transport.ts
index 7e1df29..3b92f0e 100644
--- a/apps/client/src/features/server/api/transport.ts
+++ b/apps/client/src/features/server/api/transport.ts
@@ -3,8 +3,9 @@
  * runs both inside the Tauri overlay and as a plain browser page:
  *
  * - In Tauri: invokes a named IPC command via `@tauri-apps/api/core`.
- * - In a plain browser: makes a same-origin HTTP call (Vite proxies /api to
- *   Fastify in dev; Fastify serves both the SPA and /api in prod).
+ * - In a plain browser: makes a same-origin HTTP call to the in-process Rust
+ *   helper (Vite proxies /api to it on :47474 in dev; in release the helper
+ *   serves both the embedded SPA and /api itself).
  *
  * The raw response is fed through `parse` (typically a zod schema's `.parse`)
  * so callers get a validated, typed result either way.
@@ -64,5 +65,7 @@ async function httpRequest<T>(http: HttpCall, parse: (data: unknown) => T): Prom
     const detail = typeof body === 'object' && body !== null && 'error' in body ? body.error : body;
     throw new Error(`${method} ${http.path} failed: HTTP ${r.status} — ${JSON.stringify(detail)}`);
   }
+  // 204 No Content (e.g. /api/hotkeys/suspend) has no body to parse.
+  if (r.status === 204) return parse(undefined);
   return parse(await r.json());
 }
diff --git a/apps/client/src/features/server/composables/useServerTransport.ts b/apps/client/src/features/server/composables/useServerTransport.ts
index 6410496..84e1455 100644
--- a/apps/client/src/features/server/composables/useServerTransport.ts
+++ b/apps/client/src/features/server/composables/useServerTransport.ts
@@ -1,6 +1,8 @@
 import {
+  commandMessage,
   mapChangeMessage,
   positionMessage,
+  type CommandMessage,
   type MapChangeMessage,
   type PositionMessage,
 } from '@shared/ws-messages';
@@ -19,6 +21,7 @@ export interface UseServerTransport {
 // message minus its literal `type` field.
 type PositionPayload = Omit<PositionMessage, 'type'>;
 type MapChangePayload = Omit<MapChangeMessage, 'type'>;
+type CommandPayload = Omit<CommandMessage, 'type'>;
 
 /**
  * Single entry point for "server-pushed" messages — mount once at the app
@@ -58,6 +61,15 @@ export function useServerTransport(streamUrl: string): UseServerTransport {
         if (parsed.success) dispatchServerEvent(parsed.data);
       }),
     );
+    // Backend-owned global hotkey presses. The browser/SSE path gets these
+    // for free via the discriminated union in `useServerStream`; the Tauri
+    // path needs its own listener because Rust emits via `app.emit`.
+    unlistens.push(
+      await listen<CommandPayload>('command', (event) => {
+        const parsed = commandMessage.safeParse({ type: 'command', ...event.payload });
+        if (parsed.success) dispatchServerEvent(parsed.data);
+      }),
+    );
     status.value = 'open';
   });
 
diff --git a/apps/client/src/features/settings/sections/HotkeysSection.vue b/apps/client/src/features/settings/sections/HotkeysSection.vue
index bd34777..3299723 100644
--- a/apps/client/src/features/settings/sections/HotkeysSection.vue
+++ b/apps/client/src/features/settings/sections/HotkeysSection.vue
@@ -2,10 +2,19 @@
 import HotkeyRecorder from '@/features/hotkeys/components/HotkeyRecorder.vue';
 import { useHotkeysStore } from '@/features/hotkeys/store';
 import { isTauri } from '@/shared/tauri';
+import type { HotkeyConfig } from '@shared/hotkeys-api';
 
+const store = useHotkeysStore();
 const { lockHotkey, zoomInHotkey, zoomOutHotkey, floorUpHotkey, floorDownHotkey, airdropHotkey } =
-  storeToRefs(useHotkeysStore());
+  storeToRefs(store);
 const { t } = useI18n();
+
+// The five action combos are backend-owned: route a recorded combo through
+// `setAction` (PUT + effective-value snap-back) rather than writing the ref
+// directly. Lock stays a plain client-side persistedRef (v-model).
+function onAction(field: keyof HotkeyConfig, combo: string): void {
+  void store.setAction(field, combo);
+}
 </script>
 
 <template>
@@ -13,12 +22,34 @@ const { t } = useI18n();
     <div class="space-y-3">
       <!-- Lock is overlay-only (no window to lock in a browser). -->
       <HotkeyRecorder v-if="isTauri" v-model="lockHotkey" :label="t('hotkeys.lock')" />
-      <HotkeyRecorder v-model="zoomInHotkey" :label="t('hotkeys.zoomIn')" />
-      <HotkeyRecorder v-model="zoomOutHotkey" :label="t('hotkeys.zoomOut')" />
-      <HotkeyRecorder v-model="floorUpHotkey" :label="t('hotkeys.floorUp')" />
-      <HotkeyRecorder v-model="floorDownHotkey" :label="t('hotkeys.floorDown')" />
-      <HotkeyRecorder v-model="airdropHotkey" :label="t('hotkeys.airdrop')" />
-      <p v-if="isTauri" class="text-[10px] leading-relaxed opacity-70">{{ t('hotkeys.lockHint') }}</p>
+      <HotkeyRecorder
+        :model-value="zoomInHotkey"
+        :label="t('hotkeys.zoomIn')"
+        @update:model-value="onAction('zoomIn', $event)"
+      />
+      <HotkeyRecorder
+        :model-value="zoomOutHotkey"
+        :label="t('hotkeys.zoomOut')"
+        @update:model-value="onAction('zoomOut', $event)"
+      />
+      <HotkeyRecorder
+        :model-value="floorUpHotkey"
+        :label="t('hotkeys.floorUp')"
+        @update:model-value="onAction('floorUp', $event)"
+      />
+      <HotkeyRecorder
+        :model-value="floorDownHotkey"
+        :label="t('hotkeys.floorDown')"
+        @update:model-value="onAction('floorDown', $event)"
+      />
+      <HotkeyRecorder
+        :model-value="airdropHotkey"
+        :label="t('hotkeys.airdrop')"
+        @update:model-value="onAction('airdrop', $event)"
+      />
+      <p v-if="isTauri" class="text-[10px] leading-relaxed opacity-70">
+        {{ t('hotkeys.lockHint') }}
+      </p>
     </div>
   </Fieldset>
 </template>
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index 4731d43..424cf1d 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -9,24 +9,22 @@ import AirdropStatusBanner from '@/features/airdrop/components/AirdropStatusBann
 import { useMapSettingsStore } from '@/features/map/store';
 import { useOverlayStore } from '@/features/overlay/store';
 import { useHotkeysStore } from '@/features/hotkeys/store';
-import { useTauriOverlay } from '@/features/overlay/composables/useTauriOverlay';
 import { showOverlayChrome } from '@/shared/tauri';
 import { useTransportStatus } from '@/features/server/composables/useTransportStatus';
-import { useGlobalShortcut } from '@/features/hotkeys/composables/useGlobalShortcut';
-import { useBrowserShortcut } from '@/features/hotkeys/composables/useBrowserShortcut';
+import { useServerEvent } from '@/features/server/composables/useServerEvents';
 import { useCloseConfirm } from '@/features/overlay/composables/useCloseConfirm';
 import { useAirdropStore } from '@/features/airdrop/store';
 import { useAirdropTracker } from '@/features/airdrop/composables/useAirdropTracker';
 
 const { mapCode } = storeToRefs(useMapSettingsStore());
 const { clickThrough: overlayClickThrough } = storeToRefs(useOverlayStore());
-const { lockHotkey, zoomInHotkey, zoomOutHotkey, floorUpHotkey, floorDownHotkey, airdropHotkey } =
-  storeToRefs(useHotkeysStore());
+// Only the lock combo is still client-owned; the rest arrive as backend
+// `command` events (see below) so they fire regardless of focus.
+const { lockHotkey } = storeToRefs(useHotkeysStore());
 
 const airdropStore = useAirdropStore();
 useAirdropTracker();
 
-const { isTauri } = useTauriOverlay();
 const status = useTransportStatus();
 const confirmClose = useCloseConfirm();
 
@@ -38,19 +36,29 @@ const mapError = ref<string | null>(null);
 // component mounts (e.g. immediately after a `:key` swap on map change).
 const mapRef = ref<InstanceType<typeof MapView> | null>(null);
 
-// Bind each map action to BOTH transports: the Tauri global shortcut (overlay)
-// and the page-level listener (browser / LAN phone). Each no-ops in the other's
-// context, so exactly one fires. Lock stays overlay-only (no window to lock in
-// a browser), wired separately in App.vue.
-function bindShortcut(combo: Ref<string>, action: () => void): void {
-  useGlobalShortcut(isTauri, combo, action);
-  useBrowserShortcut(isTauri, combo, action);
-}
-bindShortcut(zoomInHotkey, () => mapRef.value?.zoomIn());
-bindShortcut(zoomOutHotkey, () => mapRef.value?.zoomOut());
-bindShortcut(floorUpHotkey, () => mapRef.value?.nextFloor());
-bindShortcut(floorDownHotkey, () => mapRef.value?.prevFloor());
-bindShortcut(airdropHotkey, () => airdropStore.press());
+// Hotkeys are owned by the backend now: it registers OS-global shortcuts (which
+// fire even while the game is focused) and broadcasts a `command` event. Every
+// client — overlay webview, browser, LAN phone — dispatches it here, so the
+// action runs regardless of which client (if any) has focus.
+useServerEvent('command', (msg) => {
+  switch (msg.action) {
+    case 'zoom-in':
+      mapRef.value?.zoomIn();
+      break;
+    case 'zoom-out':
+      mapRef.value?.zoomOut();
+      break;
+    case 'floor-up':
+      mapRef.value?.nextFloor();
+      break;
+    case 'floor-down':
+      mapRef.value?.prevFloor();
+      break;
+    case 'airdrop':
+      airdropStore.press();
+      break;
+  }
+});
 </script>
 
 <template>
diff --git a/apps/desktop/src-tauri/Cargo.lock b/apps/desktop/src-tauri/Cargo.lock
index ac34106..9db43ee 100644
--- a/apps/desktop/src-tauri/Cargo.lock
+++ b/apps/desktop/src-tauri/Cargo.lock
@@ -3449,6 +3449,7 @@ dependencies = [
  "anyhow",
  "axum",
  "futures-util",
+ "global-hotkey",
  "local-ip-address",
  "mime_guess",
  "notify",
@@ -3468,6 +3469,7 @@ dependencies = [
  "tokio-stream",
  "tower",
  "tower-http",
+ "windows-sys 0.59.0",
  "winreg 0.52.0",
 ]
 
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index 7368a5c..423a633 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -25,6 +25,17 @@ tauri-build = { version = "2", features = [] }
 [dependencies]
 tauri = { version = "2", features = ["tray-icon"] }
 tauri-plugin-global-shortcut = "2"
+# Standalone global-hotkey registration for the headless backend (run_headless),
+# where there is no Tauri/plugin event loop. In the windowed app the plugin
+# above owns registration; the two never coexist in one process (the plugin
+# installs a process-global GlobalHotKeyEvent handler — see the hotkey rework
+# notes). Same accelerator-string parser the client emits.
+global-hotkey = "0.7"
+# Win32 message pump for the headless hotkey thread: the global-hotkey crate
+# needs a GetMessage/PeekMessage loop on the thread that owns its hidden
+# message window, otherwise WM_HOTKEY is never delivered. Version pinned to
+# match the one global-hotkey already pulls (no extra lockfile entry).
+windows-sys = { version = "0.59", features = ["Win32_UI_WindowsAndMessaging", "Win32_Foundation"] }
 tauri-plugin-window-state = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
diff --git a/apps/desktop/src-tauri/src/commands.rs b/apps/desktop/src-tauri/src/commands.rs
index ee0cc6c..834eded 100644
--- a/apps/desktop/src-tauri/src/commands.rs
+++ b/apps/desktop/src-tauri/src/commands.rs
@@ -7,8 +7,10 @@ use tauri::{AppHandle, State};
 
 #[cfg(not(debug_assertions))]
 use crate::http_server::LISTEN_PORT;
+use crate::hotkeys::HotkeyController;
 use crate::lan::detect_lan_ip;
 use crate::server::config::{ConfigPatch, ConfigStore};
+use crate::server::hotkeys::{HotkeyConfig, HotkeyPatch, HotkeyStore};
 use crate::server::paths::{self, ResolvedPaths};
 use crate::watcher::WatcherSlot;
 
@@ -34,6 +36,50 @@ pub async fn update_config(
     Ok(resolved)
 }
 
+/// `GET /api/hotkeys` analogue — the backend-owned combos.
+#[tauri::command]
+pub async fn get_hotkeys(store: State<'_, Arc<HotkeyStore>>) -> Result<HotkeyConfig, String> {
+    Ok(store.get().await)
+}
+
+/// `PUT /api/hotkeys` analogue. Persists the patch then (re)registers the
+/// OS-global hotkeys, reverting any field whose combo can't be claimed.
+/// Returns the effective config.
+#[tauri::command]
+pub async fn update_hotkeys(
+    patch: HotkeyPatch,
+    store: State<'_, Arc<HotkeyStore>>,
+    hotkeys: State<'_, Arc<dyn HotkeyController>>,
+) -> Result<HotkeyConfig, String> {
+    let merged = store.apply(patch).await?;
+    let controller = hotkeys.inner().clone();
+    let to_apply = merged.clone();
+    let effective = tokio::task::spawn_blocking(move || controller.apply(&to_apply))
+        .await
+        .unwrap_or_else(|_| merged.clone());
+    if effective != merged {
+        store.set(effective.clone()).await.map_err(|e| e.to_string())?;
+    }
+    Ok(effective)
+}
+
+/// Drop all OS hotkey binds while the settings recorder captures a combo, so
+/// the keystroke reaches the webview instead of firing its action.
+#[tauri::command]
+pub async fn suspend_hotkeys(hotkeys: State<'_, Arc<dyn HotkeyController>>) -> Result<(), String> {
+    let controller = hotkeys.inner().clone();
+    let _ = tokio::task::spawn_blocking(move || controller.suspend()).await;
+    Ok(())
+}
+
+/// Re-claim the OS hotkey binds after the recorder finishes.
+#[tauri::command]
+pub async fn resume_hotkeys(hotkeys: State<'_, Arc<dyn HotkeyController>>) -> Result<(), String> {
+    let controller = hotkeys.inner().clone();
+    let _ = tokio::task::spawn_blocking(move || controller.resume()).await;
+    Ok(())
+}
+
 /// Wire shape for [`pairing_qr`]. Both fields are intended for direct
 /// rendering by the webview: `url` shown as copyable text, `svg`
 /// inserted via `v-html` (safe — the content originates from this
diff --git a/apps/desktop/src-tauri/src/hotkeys.rs b/apps/desktop/src-tauri/src/hotkeys.rs
new file mode 100644
index 0000000..2723a44
--- /dev/null
+++ b/apps/desktop/src-tauri/src/hotkeys.rs
@@ -0,0 +1,395 @@
+//! OS-global hotkey registration, owned by the backend.
+//!
+//! Two implementations behind one [`HotkeyController`] trait — they are never
+//! used together (the windowed app and the headless backend are mutually
+//! exclusive; both bind :47474):
+//!
+//! * [`TauriHotkeys`] — used by `run()`. Delegates to the already-initialised
+//!   `tauri-plugin-global-shortcut` (its manager lives on Tauri's main thread,
+//!   which pumps Win32 messages). The five action combos are registered via
+//!   the plugin's `GlobalShortcut` API; a process-global handler installed in
+//!   `lib.rs` reads the id→action map this controller maintains and fans the
+//!   press out as a `command` event. The overlay lock combo stays separate
+//!   (client-registered via the plugin's JS API) and is absent from the map.
+//! * [`StandaloneHotkeys`] — used by `run_headless()`. There is no Tauri event
+//!   loop, so it owns a dedicated OS thread that creates a
+//!   `global_hotkey::GlobalHotKeyManager` and runs its own `PeekMessage` pump,
+//!   reading `WM_HOTKEY` directly (no process-global handler involved).
+//!
+//! Combos are accelerator strings parsed by `global_hotkey::hotkey::HotKey`,
+//! whose `id()` is deterministic (`(mods<<16)|key`) — so the registered id can
+//! be mapped back to the action that produced it.
+
+use std::collections::HashMap;
+use std::str::FromStr;
+use std::sync::mpsc;
+use std::sync::Mutex;
+use std::time::Duration;
+
+use global_hotkey::hotkey::HotKey;
+use global_hotkey::GlobalHotKeyManager;
+use tauri::AppHandle;
+use tauri_plugin_global_shortcut::GlobalShortcutExt;
+use tokio::sync::broadcast;
+use windows_sys::Win32::UI::WindowsAndMessaging::{
+    DispatchMessageW, PeekMessageW, TranslateMessage, MSG, PM_REMOVE, WM_HOTKEY,
+};
+
+use crate::server::events::{HotkeyAction, ServerEvent};
+use crate::server::hotkeys::HotkeyConfig;
+
+/// Reconcile registered OS hotkeys with a config, and bracket the recorder's
+/// capture window (suspend = drop all binds so the keystroke reaches the UI,
+/// resume = re-claim from the current config). All methods are synchronous and
+/// may block (the Tauri impl round-trips to the main thread; the standalone
+/// impl round-trips to its pump thread) — call from `spawn_blocking`.
+pub trait HotkeyController: Send + Sync {
+    /// Register `desired`, reverting any field whose combo can't be claimed.
+    /// Returns the effective config (what is actually registered now).
+    fn apply(&self, desired: &HotkeyConfig) -> HotkeyConfig;
+    /// Drop all five OS binds (recorder is capturing).
+    fn suspend(&self);
+    /// Re-claim all five from the current config (recorder finished).
+    fn resume(&self);
+}
+
+/// The five (action, combo) pairs of a config, in stable order.
+fn config_entries(cfg: &HotkeyConfig) -> [(HotkeyAction, &str); 5] {
+    [
+        (HotkeyAction::ZoomIn, cfg.zoom_in.as_str()),
+        (HotkeyAction::ZoomOut, cfg.zoom_out.as_str()),
+        (HotkeyAction::FloorUp, cfg.floor_up.as_str()),
+        (HotkeyAction::FloorDown, cfg.floor_down.as_str()),
+        (HotkeyAction::Airdrop, cfg.airdrop.as_str()),
+    ]
+}
+
+/// (action, old, new) triples for diffing `current` against `desired`.
+fn config_diff(current: &HotkeyConfig, desired: &HotkeyConfig) -> [(HotkeyAction, String, String); 5] {
+    [
+        (HotkeyAction::ZoomIn, current.zoom_in.clone(), desired.zoom_in.clone()),
+        (HotkeyAction::ZoomOut, current.zoom_out.clone(), desired.zoom_out.clone()),
+        (HotkeyAction::FloorUp, current.floor_up.clone(), desired.floor_up.clone()),
+        (HotkeyAction::FloorDown, current.floor_down.clone(), desired.floor_down.clone()),
+        (HotkeyAction::Airdrop, current.airdrop.clone(), desired.airdrop.clone()),
+    ]
+}
+
+fn config_from_pairs(pairs: &[(HotkeyAction, String)]) -> HotkeyConfig {
+    let mut cfg = HotkeyConfig::default();
+    for (action, combo) in pairs {
+        match action {
+            HotkeyAction::ZoomIn => cfg.zoom_in = combo.clone(),
+            HotkeyAction::ZoomOut => cfg.zoom_out = combo.clone(),
+            HotkeyAction::FloorUp => cfg.floor_up = combo.clone(),
+            HotkeyAction::FloorDown => cfg.floor_down = combo.clone(),
+            HotkeyAction::Airdrop => cfg.airdrop = combo.clone(),
+        }
+    }
+    cfg
+}
+
+/// Build the id→action lookup for a config (combos that fail to parse are
+/// skipped — they were validated by the store, so this only drops garbage).
+pub fn action_map(cfg: &HotkeyConfig) -> HashMap<u32, HotkeyAction> {
+    let mut map = HashMap::new();
+    for (action, combo) in config_entries(cfg) {
+        if let Ok(hk) = HotKey::from_str(combo) {
+            map.insert(hk.id(), action);
+        }
+    }
+    map
+}
+
+/// The five combos as accelerator strings, for the plugin Builder.
+pub fn config_combos(cfg: &HotkeyConfig) -> Vec<String> {
+    config_entries(cfg)
+        .iter()
+        .map(|(_, c)| c.to_string())
+        .collect()
+}
+
+// ---------------------------------------------------------------------------
+// Tauri (windowed app) — delegates to tauri-plugin-global-shortcut.
+// ---------------------------------------------------------------------------
+
+pub struct TauriHotkeys {
+    app: AppHandle,
+    /// Shared with the process-global plugin handler installed in `lib.rs`;
+    /// the handler reads it to turn a pressed shortcut id into an action.
+    map: std::sync::Arc<Mutex<HashMap<u32, HotkeyAction>>>,
+    current: Mutex<HotkeyConfig>,
+}
+
+impl TauriHotkeys {
+    /// `map` must already be seeded with `initial`'s ids (the plugin Builder
+    /// registered those combos before the app started — see `lib.rs`).
+    pub fn new(
+        app: AppHandle,
+        map: std::sync::Arc<Mutex<HashMap<u32, HotkeyAction>>>,
+        initial: HotkeyConfig,
+    ) -> Self {
+        Self {
+            app,
+            map,
+            current: Mutex::new(initial),
+        }
+    }
+}
+
+impl HotkeyController for TauriHotkeys {
+    fn apply(&self, desired: &HotkeyConfig) -> HotkeyConfig {
+        let gs = self.app.global_shortcut();
+        let mut map = self.map.lock().expect("hotkey map poisoned");
+        let mut current = self.current.lock().expect("hotkey current poisoned");
+
+        let mut eff: Vec<(HotkeyAction, String)> = Vec::with_capacity(5);
+        for (action, old, new) in config_diff(&current, desired) {
+            if old == new {
+                eff.push((action, new));
+                continue;
+            }
+            let _ = gs.unregister(old.as_str());
+            if let Ok(hk) = HotKey::from_str(&old) {
+                map.remove(&hk.id());
+            }
+            match gs.register(new.as_str()) {
+                Ok(()) => {
+                    if let Ok(hk) = HotKey::from_str(&new) {
+                        map.insert(hk.id(), action);
+                    }
+                    eff.push((action, new));
+                }
+                Err(e) => {
+                    eprintln!("[hotkeys] register '{new}' failed: {e}; keeping '{old}'");
+                    let _ = gs.register(old.as_str());
+                    if let Ok(hk) = HotKey::from_str(&old) {
+                        map.insert(hk.id(), action);
+                    }
+                    eff.push((action, old));
+                }
+            }
+        }
+        let result = config_from_pairs(&eff);
+        *current = result.clone();
+        result
+    }
+
+    fn suspend(&self) {
+        let gs = self.app.global_shortcut();
+        let mut map = self.map.lock().expect("hotkey map poisoned");
+        let current = self.current.lock().expect("hotkey current poisoned");
+        for (_, combo) in config_entries(&current) {
+            let _ = gs.unregister(combo);
+        }
+        map.clear();
+    }
+
+    fn resume(&self) {
+        let gs = self.app.global_shortcut();
+        let mut map = self.map.lock().expect("hotkey map poisoned");
+        let current = self.current.lock().expect("hotkey current poisoned");
+        map.clear();
+        for (action, combo) in config_entries(&current) {
+            match gs.register(combo) {
+                Ok(()) => {
+                    if let Ok(hk) = HotKey::from_str(combo) {
+                        map.insert(hk.id(), action);
+                    }
+                }
+                Err(e) => eprintln!("[hotkeys] resume register '{combo}' failed: {e}"),
+            }
+        }
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Standalone (headless backend) — own thread + Win32 message pump.
+// ---------------------------------------------------------------------------
+
+enum ReqKind {
+    Apply(HotkeyConfig),
+    Suspend,
+    Resume,
+}
+
+struct HotkeyRequest {
+    kind: ReqKind,
+    reply: mpsc::Sender<HotkeyConfig>,
+}
+
+pub struct StandaloneHotkeys {
+    req_tx: mpsc::Sender<HotkeyRequest>,
+}
+
+impl StandaloneHotkeys {
+    pub fn spawn(event_tx: broadcast::Sender<ServerEvent>, initial: HotkeyConfig) -> Self {
+        let (req_tx, req_rx) = mpsc::channel::<HotkeyRequest>();
+        std::thread::Builder::new()
+            .name("global-hotkeys".into())
+            .spawn(move || pump_thread(event_tx, initial, req_rx))
+            .expect("spawn global-hotkeys thread");
+        Self { req_tx }
+    }
+
+    fn request(&self, kind: ReqKind, fallback: HotkeyConfig) -> HotkeyConfig {
+        let (reply_tx, reply_rx) = mpsc::channel();
+        if self
+            .req_tx
+            .send(HotkeyRequest {
+                kind,
+                reply: reply_tx,
+            })
+            .is_err()
+        {
+            return fallback; // pump thread gone
+        }
+        reply_rx.recv_timeout(Duration::from_secs(2)).unwrap_or(fallback)
+    }
+}
+
+impl HotkeyController for StandaloneHotkeys {
+    fn apply(&self, desired: &HotkeyConfig) -> HotkeyConfig {
+        self.request(ReqKind::Apply(desired.clone()), desired.clone())
+    }
+    fn suspend(&self) {
+        let _ = self.request(ReqKind::Suspend, HotkeyConfig::default());
+    }
+    fn resume(&self) {
+        let _ = self.request(ReqKind::Resume, HotkeyConfig::default());
+    }
+}
+
+fn register_all(
+    manager: &GlobalHotKeyManager,
+    cfg: &HotkeyConfig,
+    registered: &mut HashMap<u32, HotkeyAction>,
+) {
+    for (action, combo) in config_entries(cfg) {
+        if let Ok(hk) = HotKey::from_str(combo) {
+            match manager.register(hk) {
+                Ok(()) => {
+                    registered.insert(hk.id(), action);
+                }
+                Err(e) => eprintln!("[hotkeys] register '{combo}' failed: {e}"),
+            }
+        }
+    }
+}
+
+fn unregister_cfg(
+    manager: &GlobalHotKeyManager,
+    cfg: &HotkeyConfig,
+    registered: &mut HashMap<u32, HotkeyAction>,
+) {
+    for (_, combo) in config_entries(cfg) {
+        if let Ok(hk) = HotKey::from_str(combo) {
+            let _ = manager.unregister(hk);
+            registered.remove(&hk.id());
+        }
+    }
+}
+
+fn reconcile(
+    manager: &GlobalHotKeyManager,
+    current: &HotkeyConfig,
+    desired: &HotkeyConfig,
+    registered: &mut HashMap<u32, HotkeyAction>,
+) -> HotkeyConfig {
+    let mut eff: Vec<(HotkeyAction, String)> = Vec::with_capacity(5);
+    for (action, old, new) in config_diff(current, desired) {
+        if old == new {
+            eff.push((action, new));
+            continue;
+        }
+        if let Ok(hk) = HotKey::from_str(&old) {
+            let _ = manager.unregister(hk);
+            registered.remove(&hk.id());
+        }
+        let registered_new = HotKey::from_str(&new)
+            .ok()
+            .and_then(|hk| manager.register(hk).ok().map(|()| hk));
+        match registered_new {
+            Some(hk) => {
+                registered.insert(hk.id(), action);
+                eff.push((action, new));
+            }
+            None => {
+                eprintln!("[hotkeys] register '{new}' failed; keeping '{old}'");
+                if let Ok(hk) = HotKey::from_str(&old) {
+                    if manager.register(hk).is_ok() {
+                        registered.insert(hk.id(), action);
+                    }
+                }
+                eff.push((action, old));
+            }
+        }
+    }
+    config_from_pairs(&eff)
+}
+
+fn pump_thread(
+    event_tx: broadcast::Sender<ServerEvent>,
+    initial: HotkeyConfig,
+    req_rx: mpsc::Receiver<HotkeyRequest>,
+) {
+    let manager = match GlobalHotKeyManager::new() {
+        Ok(m) => m,
+        Err(e) => {
+            eprintln!("[hotkeys] GlobalHotKeyManager::new failed: {e}");
+            return;
+        }
+    };
+
+    let mut current = initial;
+    let mut suspended = false;
+    let mut registered: HashMap<u32, HotkeyAction> = HashMap::new();
+    register_all(&manager, &current, &mut registered);
+    eprintln!("[hotkeys] headless global hotkeys registered ({} combos)", registered.len());
+
+    let mut msg: MSG = unsafe { std::mem::zeroed() };
+    loop {
+        // Drain Win32 messages so WM_HOTKEY is observed. We read the hotkey id
+        // straight off the message (wParam == HotKey::id()) instead of routing
+        // through the crate's process-global handler.
+        unsafe {
+            while PeekMessageW(&mut msg, std::ptr::null_mut(), 0, 0, PM_REMOVE) != 0 {
+                if msg.message == WM_HOTKEY {
+                    let id = msg.wParam as u32;
+                    if let Some(&action) = registered.get(&id) {
+                        let _ = event_tx.send(ServerEvent::Command { action });
+                    }
+                } else {
+                    TranslateMessage(&msg);
+                    DispatchMessageW(&msg);
+                }
+            }
+        }
+
+        match req_rx.recv_timeout(Duration::from_millis(50)) {
+            Ok(req) => {
+                match req.kind {
+                    ReqKind::Apply(desired) => {
+                        if suspended {
+                            current = desired;
+                        } else {
+                            current = reconcile(&manager, &current, &desired, &mut registered);
+                        }
+                    }
+                    ReqKind::Suspend => {
+                        unregister_cfg(&manager, &current, &mut registered);
+                        suspended = true;
+                    }
+                    ReqKind::Resume => {
+                        suspended = false;
+                        registered.clear();
+                        register_all(&manager, &current, &mut registered);
+                    }
+                }
+                let _ = req.reply.send(current.clone());
+            }
+            Err(mpsc::RecvTimeoutError::Timeout) => {}
+            Err(mpsc::RecvTimeoutError::Disconnected) => break,
+        }
+    }
+}
diff --git a/apps/desktop/src-tauri/src/http_server.rs b/apps/desktop/src-tauri/src/http_server.rs
index a479e25..0dbf53d 100644
--- a/apps/desktop/src-tauri/src/http_server.rs
+++ b/apps/desktop/src-tauri/src/http_server.rs
@@ -12,7 +12,7 @@ use axum::{
         sse::{Event, KeepAlive, Sse},
         IntoResponse, Json, Response,
     },
-    routing::get,
+    routing::{get, post},
     Extension, Router,
 };
 #[cfg(not(debug_assertions))]
@@ -24,8 +24,10 @@ use tokio::sync::broadcast;
 use tokio_stream::wrappers::{errors::BroadcastStreamRecvError, BroadcastStream};
 use tower_http::cors::{AllowOrigin, CorsLayer};
 
+use crate::hotkeys::HotkeyController;
 use crate::server::config::{ConfigPatch, ConfigStore};
 use crate::server::events::ServerEvent;
+use crate::server::hotkeys::{HotkeyConfig, HotkeyPatch, HotkeyStore};
 use crate::server::paths::{self, ResolvedPaths};
 use crate::watcher::{self, WatcherSlot};
 
@@ -42,6 +44,8 @@ pub struct Deps {
     pub config_store: Arc<ConfigStore>,
     pub watcher_slot: Arc<WatcherSlot>,
     pub app_handle: Option<AppHandle>,
+    pub hotkey_store: Arc<HotkeyStore>,
+    pub hotkeys: Arc<dyn HotkeyController>,
 }
 
 /// Per-server shared state. Cheap to clone (Arc all the way down).
@@ -60,6 +64,10 @@ struct AppState {
     /// Held here (not inside WatcherSlot directly) so the HTTP handler
     /// can grab a clone without indirecting through the slot.
     event_tx: broadcast::Sender<ServerEvent>,
+    /// Backend-owned global hotkey combos (persisted in hotkeys.json).
+    hotkey_store: Arc<HotkeyStore>,
+    /// Registers/reconciles the OS-global hotkeys from `hotkey_store`.
+    hotkeys: Arc<dyn HotkeyController>,
 }
 
 #[derive(Serialize)]
@@ -154,6 +162,55 @@ async fn put_config_http(
     Ok(Json(resolved))
 }
 
+/// `GET /api/hotkeys` — the backend-owned combos. Same JSON the Tauri
+/// `get_hotkeys` IPC command returns.
+async fn get_hotkeys_http(State(state): State<AppState>) -> Json<HotkeyConfig> {
+    Json(state.hotkey_store.get().await)
+}
+
+/// `PUT /api/hotkeys` — validate + persist the patch, then (re)register the
+/// OS-global hotkeys. If a combo can't be claimed the manager reverts that
+/// field; the *effective* config is persisted and returned so the client
+/// snaps the recorder back. Unparseable combo → 400.
+async fn put_hotkeys_http(
+    State(state): State<AppState>,
+    Json(patch): Json<HotkeyPatch>,
+) -> Result<Json<HotkeyConfig>, (StatusCode, Json<ConfigError>)> {
+    let merged = state.hotkey_store.apply(patch).await.map_err(|error| {
+        (StatusCode::BAD_REQUEST, Json(ConfigError { error }))
+    })?;
+
+    // Registration blocks (round-trips to the main / pump thread); keep it off
+    // the async worker.
+    let hotkeys = state.hotkeys.clone();
+    let to_apply = merged.clone();
+    let effective = tokio::task::spawn_blocking(move || hotkeys.apply(&to_apply))
+        .await
+        .unwrap_or(merged.clone());
+
+    // Persist the revert if a field couldn't be registered.
+    if effective != merged {
+        if let Err(err) = state.hotkey_store.set(effective.clone()).await {
+            eprintln!("[hotkeys] persist effective config failed: {err:#}");
+        }
+    }
+    Ok(Json(effective))
+}
+
+/// `POST /api/hotkeys/suspend` — drop all OS binds while a recorder captures.
+async fn suspend_hotkeys_http(State(state): State<AppState>) -> StatusCode {
+    let hotkeys = state.hotkeys.clone();
+    let _ = tokio::task::spawn_blocking(move || hotkeys.suspend()).await;
+    StatusCode::NO_CONTENT
+}
+
+/// `POST /api/hotkeys/resume` — re-claim the combos after capture finishes.
+async fn resume_hotkeys_http(State(state): State<AppState>) -> StatusCode {
+    let hotkeys = state.hotkeys.clone();
+    let _ = tokio::task::spawn_blocking(move || hotkeys.resume()).await;
+    StatusCode::NO_CONTENT
+}
+
 // Release-only: bake apps/client/dist/ into the .exe. In dev the SPA is
 // served by Vite, so the helper just 404s on non-API paths.
 #[cfg(not(debug_assertions))]
@@ -196,7 +253,7 @@ fn cors_layer() -> CorsLayer {
 
     CorsLayer::new()
         .allow_origin(AllowOrigin::list(origins))
-        .allow_methods([Method::GET, Method::PUT, Method::OPTIONS])
+        .allow_methods([Method::GET, Method::PUT, Method::POST, Method::OPTIONS])
         .allow_headers([header::CONTENT_TYPE])
         // Chrome's Private Network Access policy: a public-origin page
         // (HTTPS on internet) hitting a private IP (127.0.0.1) needs an
@@ -213,6 +270,9 @@ fn router(state: AppState) -> Router {
     Router::new()
         .route("/api/ping", get(ping))
         .route("/api/config", get(get_config_http).put(put_config_http))
+        .route("/api/hotkeys", get(get_hotkeys_http).put(put_hotkeys_http))
+        .route("/api/hotkeys/suspend", post(suspend_hotkeys_http))
+        .route("/api/hotkeys/resume", post(resume_hotkeys_http))
         .route("/events", get(events_sse))
         .with_state(state)
         // SPA fallback MUST come after the API/SSE routes and BEFORE
@@ -233,6 +293,8 @@ pub fn spawn(deps: Deps) {
         config_store: deps.config_store,
         watcher_slot: deps.watcher_slot,
         event_tx,
+        hotkey_store: deps.hotkey_store,
+        hotkeys: deps.hotkeys,
     };
     let app_handle = deps.app_handle;
     tauri::async_runtime::spawn(async move {
@@ -261,27 +323,46 @@ mod tests {
     use axum::http::Request as HttpRequest;
     use tower::ServiceExt;
 
-    async fn test_state() -> AppState {
-        // ConfigStore wants a file path it can write to. Tests use a
-        // per-process tmp file; the file may not exist yet (load returns
-        // empty state in that case).
-        let tmp = std::env::temp_dir().join(format!(
-            "tarkov-checker-test-{}-{}.json",
+    /// No-op hotkey controller — the route tests never register real OS
+    /// hotkeys, they only exercise the HTTP wiring + store.
+    struct NoopHotkeys;
+    impl HotkeyController for NoopHotkeys {
+        fn apply(&self, desired: &HotkeyConfig) -> HotkeyConfig {
+            desired.clone()
+        }
+        fn suspend(&self) {}
+        fn resume(&self) {}
+    }
+
+    fn tmp_json(tag: &str) -> std::path::PathBuf {
+        std::env::temp_dir().join(format!(
+            "tarkov-checker-test-{tag}-{}-{}.json",
             std::process::id(),
             std::time::SystemTime::now()
                 .duration_since(std::time::UNIX_EPOCH)
                 .unwrap_or_default()
                 .as_nanos(),
-        ));
-        let store = ConfigStore::load(tmp)
+        ))
+    }
+
+    async fn test_state() -> AppState {
+        // ConfigStore wants a file path it can write to. Tests use a
+        // per-process tmp file; the file may not exist yet (load returns
+        // empty state in that case).
+        let store = ConfigStore::load(tmp_json("config"))
             .await
             .expect("test config store should load");
+        let hotkey_store = HotkeyStore::load(tmp_json("hotkeys"))
+            .await
+            .expect("test hotkey store should load");
         let watcher_slot = Arc::new(WatcherSlot::default());
         let event_tx = watcher_slot.event_sender();
         AppState {
             config_store: Arc::new(store),
             watcher_slot,
             event_tx,
+            hotkey_store: Arc::new(hotkey_store),
+            hotkeys: Arc::new(NoopHotkeys),
         }
     }
 
@@ -343,6 +424,83 @@ mod tests {
         assert!(body.contains("screenshotsDir"), "body: {body}");
     }
 
+    // -----------------------------------------------------------------
+    // /api/hotkeys — backend-owned combos
+    // -----------------------------------------------------------------
+
+    #[tokio::test]
+    async fn get_hotkeys_returns_defaults() {
+        let response = test_router(test_state().await)
+            .oneshot(
+                HttpRequest::builder()
+                    .uri("/api/hotkeys")
+                    .body(Body::empty())
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+        assert_eq!(response.status(), StatusCode::OK);
+        let body = body_text(response).await;
+        assert!(body.contains("\"zoomIn\""), "body: {body}");
+        assert!(body.contains("\"airdrop\""), "body: {body}");
+    }
+
+    #[tokio::test]
+    async fn put_hotkeys_applies_valid_patch() {
+        // Unlike PUT /api/config, the hotkeys PUT needs no Extension<AppHandle>
+        // (NoopHotkeys in test state), so it runs to completion here.
+        let response = test_router(test_state().await)
+            .oneshot(
+                HttpRequest::builder()
+                    .method(Method::PUT)
+                    .uri("/api/hotkeys")
+                    .header(header::CONTENT_TYPE, "application/json")
+                    .body(Body::from(r#"{"zoomIn":"CommandOrControl+Alt+Z"}"#))
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+        assert_eq!(response.status(), StatusCode::OK);
+        let body = body_text(response).await;
+        assert!(
+            body.contains("CommandOrControl+Alt+Z"),
+            "effective config should echo the new combo: {body}"
+        );
+    }
+
+    #[tokio::test]
+    async fn put_hotkeys_rejects_unparseable_combo() {
+        let response = test_router(test_state().await)
+            .oneshot(
+                HttpRequest::builder()
+                    .method(Method::PUT)
+                    .uri("/api/hotkeys")
+                    .header(header::CONTENT_TYPE, "application/json")
+                    .body(Body::from(r#"{"airdrop":"not+a+real+key"}"#))
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
+    }
+
+    #[tokio::test]
+    async fn suspend_resume_hotkeys_return_no_content() {
+        for path in ["/api/hotkeys/suspend", "/api/hotkeys/resume"] {
+            let response = test_router(test_state().await)
+                .oneshot(
+                    HttpRequest::builder()
+                        .method(Method::POST)
+                        .uri(path)
+                        .body(Body::empty())
+                        .unwrap(),
+                )
+                .await
+                .unwrap();
+            assert_eq!(response.status(), StatusCode::NO_CONTENT, "path: {path}");
+        }
+    }
+
     // -----------------------------------------------------------------
     // /events — SSE smoke test (handler opens, sends correct headers)
     // -----------------------------------------------------------------
diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
index 456ef99..8a653b4 100644
--- a/apps/desktop/src-tauri/src/lib.rs
+++ b/apps/desktop/src-tauri/src/lib.rs
@@ -1,33 +1,91 @@
 mod commands;
+mod hotkeys;
 mod http_server;
 mod lan;
 mod server;
 mod watcher;
 
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
 
-use tauri::Manager;
+use global_hotkey::hotkey::HotKey;
+use std::str::FromStr;
+use tauri::{Emitter, Manager};
+use tauri_plugin_global_shortcut::ShortcutState;
 
+use crate::hotkeys::{HotkeyController, StandaloneHotkeys, TauriHotkeys};
 use crate::server::config::{self, ConfigStore};
+use crate::server::events::{self, CommandPayload, ServerEvent};
+use crate::server::hotkeys::HotkeyStore;
 use crate::server::paths;
 use crate::watcher::WatcherSlot;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    // The five forwarded hotkey combos must be known before the plugin is
+    // built (its Builder registers them directly, dodging the
+    // run_on_main_thread deadlock that registering during our own setup hook
+    // would hit). So load the store + seed the id→action map up front.
+    let data_dir = config::data_dir().expect("resolve data dir");
+    std::fs::create_dir_all(&data_dir).expect("create data dir");
+    let hotkey_store = Arc::new(
+        tauri::async_runtime::block_on(HotkeyStore::load(data_dir.join("hotkeys.json")))
+            .expect("load hotkeys.json"),
+    );
+    let hotkey_cfg = tauri::async_runtime::block_on(hotkey_store.get());
+
+    // Shared with the plugin press-handler below AND TauriHotkeys (which
+    // mutates it on re-register). std::sync::Mutex — only held for a map
+    // lookup/swap, no awaits.
+    let action_map = Arc::new(Mutex::new(hotkeys::action_map(&hotkey_cfg)));
+    // Only register combos that actually parse (a hand-corrupted hotkeys.json
+    // shouldn't crash startup); the rest are dropped + logged.
+    let initial_combos: Vec<String> = hotkeys::config_combos(&hotkey_cfg)
+        .into_iter()
+        .filter(|c| HotKey::from_str(c).is_ok())
+        .collect();
+
+    // Created up front so the press-handler can fan presses into the same
+    // broadcast stream the watchers feed; shared with WatcherSlot in setup.
+    let event_tx = events::channel();
+
+    let handler_tx = event_tx.clone();
+    let handler_map = action_map.clone();
+    let shortcut_plugin = tauri_plugin_global_shortcut::Builder::new()
+        .with_shortcuts(initial_combos.iter().map(|s| s.as_str()))
+        .expect("default hotkey combos must parse")
+        .with_handler(move |app, shortcut, event| {
+            // Plugin fires Pressed + Released — act on Pressed only.
+            if event.state != ShortcutState::Pressed {
+                return;
+            }
+            // The lock combo (JS-registered) also reaches this global handler
+            // but isn't in the action map → ignored here, handled client-side.
+            let action = handler_map
+                .lock()
+                .ok()
+                .and_then(|m| m.get(&shortcut.id()).copied());
+            if let Some(action) = action {
+                let _ = handler_tx.send(ServerEvent::Command { action });
+                let _ = app.emit("command", CommandPayload { action });
+            }
+        })
+        .build();
+
     tauri::Builder::default()
-        .plugin(tauri_plugin_global_shortcut::Builder::new().build())
+        .plugin(shortcut_plugin)
         .plugin(tauri_plugin_window_state::Builder::default().build())
         .invoke_handler(tauri::generate_handler![
             commands::get_config,
             commands::update_config,
+            commands::get_hotkeys,
+            commands::update_hotkeys,
+            commands::suspend_hotkeys,
+            commands::resume_hotkeys,
             commands::pairing_qr,
         ])
-        .setup(|app| {
+        .setup(move |app| {
             let app_handle = app.handle().clone();
 
-            let data_dir = config::data_dir()?;
-            std::fs::create_dir_all(&data_dir)?;
-
             // Block-on the async load — we want the config ready before
             // the webview starts running its onMounted hooks. Tiny JSON;
             // this is in the millisecond range.
@@ -35,15 +93,24 @@ pub fn run() {
                 tauri::async_runtime::block_on(ConfigStore::load(data_dir.join("config.json")))?;
             let store = Arc::new(store);
 
-            // Arc-wrap up front so the same instance can be reached via
-            // Tauri state (for IPC commands) and via http_server::Deps.
-            // Cheap clones, no double state to keep in sync.
-            let slot = Arc::new(WatcherSlot::default());
+            // Reuse the up-front broadcast sender so hotkey `Command` events
+            // and watcher events share one stream.
+            let slot = Arc::new(WatcherSlot::with_sender(event_tx.clone()));
             let resolved = paths::resolve(&tauri::async_runtime::block_on(store.overrides()));
             tauri::async_runtime::block_on(watcher::apply_resolved(Some(&app_handle), &slot, &resolved));
 
+            // Hotkey controller shares the same id→action map the plugin
+            // handler reads, so a PUT re-registration keeps them in lockstep.
+            let hotkeys: Arc<dyn HotkeyController> = Arc::new(TauriHotkeys::new(
+                app_handle.clone(),
+                action_map.clone(),
+                hotkey_cfg.clone(),
+            ));
+
             app.manage(store.clone());
             app.manage(slot.clone());
+            app.manage(hotkey_store.clone());
+            app.manage(hotkeys.clone());
 
             // Companion HTTP server. Spawned independently of the
             // watcher pipeline — a bind failure does not block the
@@ -52,6 +119,8 @@ pub fn run() {
                 config_store: store,
                 watcher_slot: slot,
                 app_handle: Some(app_handle.clone()),
+                hotkey_store: hotkey_store.clone(),
+                hotkeys: hotkeys.clone(),
             });
 
             // Clamp restored window onto a visible monitor (handles 2K→FHD moves).
@@ -87,13 +156,31 @@ pub fn run_headless() {
                 return;
             }
         };
-        let slot = Arc::new(WatcherSlot::default());
+        let hotkey_store = match HotkeyStore::load(data_dir.join("hotkeys.json")).await {
+            Ok(s) => Arc::new(s),
+            Err(e) => {
+                eprintln!("[headless] load hotkeys: {e:#}");
+                return;
+            }
+        };
+        // One broadcast stream shared by the watchers and the hotkey thread.
+        let event_tx = events::channel();
+        let slot = Arc::new(WatcherSlot::with_sender(event_tx.clone()));
         let resolved = paths::resolve(&store.overrides().await);
         watcher::apply_resolved(None, &slot, &resolved).await;
+
+        // No Tauri/plugin event loop here, so use the standalone manager —
+        // it runs its own Win32 message pump on a dedicated thread.
+        let hotkey_cfg = hotkey_store.get().await;
+        let hotkeys: Arc<dyn HotkeyController> =
+            Arc::new(StandaloneHotkeys::spawn(event_tx.clone(), hotkey_cfg));
+
         http_server::spawn(http_server::Deps {
             config_store: store,
             watcher_slot: slot,
             app_handle: None,
+            hotkey_store,
+            hotkeys,
         });
         eprintln!("[headless] tarkov-checker backend up — http://0.0.0.0:47474 (Ctrl+C to stop)");
         std::future::pending::<()>().await;
diff --git a/apps/desktop/src-tauri/src/server/events.rs b/apps/desktop/src-tauri/src/server/events.rs
index 2080aa8..94f9bbf 100644
--- a/apps/desktop/src-tauri/src/server/events.rs
+++ b/apps/desktop/src-tauri/src/server/events.rs
@@ -18,6 +18,20 @@
 use serde::Serialize;
 use tokio::sync::broadcast;
 
+/// Action codes the backend forwards to every client on a global-hotkey
+/// press. Mirrors the TS `hotkeyActions` list in
+/// `packages/shared/src/ws-messages.ts` (kebab-case wire values). Lock is
+/// deliberately absent — it stays a client-side overlay-only shortcut.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum HotkeyAction {
+    ZoomIn,
+    ZoomOut,
+    FloorUp,
+    FloorDown,
+    Airdrop,
+}
+
 /// Wire-shape that goes onto the SSE stream. Tagged enum: the `type`
 /// field tells the client which variant arrived. Field names match the
 /// existing `position` / `map-change` Tauri-event payloads so the
@@ -38,6 +52,21 @@ pub enum ServerEvent {
         #[serde(rename = "rawMapId")]
         raw_map_id: String,
     },
+    /// A backend-registered global hotkey was pressed. Fanned out to the
+    /// SSE stream; the Tauri side also `app.emit("command", …)` so the
+    /// overlay webview reacts. Browser/phone clients dispatch the action;
+    /// no client needs the originating combo, only the action.
+    Command {
+        action: HotkeyAction,
+    },
+}
+
+/// Payload for the Tauri `command` webview event. The channel name already
+/// carries the discriminator, so this is the `Command` variant minus its
+/// `type` tag — mirrors how `position`/`map-change` payloads are emitted.
+#[derive(Debug, Clone, Copy, Serialize)]
+pub struct CommandPayload {
+    pub action: HotkeyAction,
 }
 
 /// Capacity for the broadcast buffer. A position event is ~64 bytes
diff --git a/apps/desktop/src-tauri/src/server/hotkeys.rs b/apps/desktop/src-tauri/src/server/hotkeys.rs
new file mode 100644
index 0000000..b06dd86
--- /dev/null
+++ b/apps/desktop/src-tauri/src/server/hotkeys.rs
@@ -0,0 +1,240 @@
+//! Backend-owned store for the global hotkey combos.
+//!
+//! Persisted in `%APPDATA%/tarkov-checker/hotkeys.json` — a sibling to
+//! `config.json` so the `/api/config` (paths) contract stays clean. Holds
+//! the five forwarded actions only; the overlay lock combo lives client-side
+//! (see CLAUDE.md "Desktop overlay" / the hotkey rework plan).
+//!
+//! Each combo is an accelerator string (`CommandOrControl+Alt+D`, …) parseable
+//! by `global_hotkey::hotkey::HotKey::from_str` — the same format the client
+//! recorder emits. `apply` validates every supplied string before mutating
+//! state so a single bad combo can't half-update the file.
+
+use std::path::PathBuf;
+use std::str::FromStr;
+
+use anyhow::{Context, Result};
+use global_hotkey::hotkey::HotKey;
+use serde::{Deserialize, Serialize};
+use tokio::sync::Mutex;
+
+/// Defaults match the client's historical `tc.hotkeys.*` values so an
+/// un-customised install behaves identically and the one-time client
+/// migration is a no-op.
+const DEFAULT_ZOOM_IN: &str = "CommandOrControl+=";
+const DEFAULT_ZOOM_OUT: &str = "CommandOrControl+-";
+const DEFAULT_FLOOR_UP: &str = "CommandOrControl+Shift+=";
+const DEFAULT_FLOOR_DOWN: &str = "CommandOrControl+Shift+-";
+const DEFAULT_AIRDROP: &str = "CommandOrControl+Alt+D";
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct HotkeyConfig {
+    pub zoom_in: String,
+    pub zoom_out: String,
+    pub floor_up: String,
+    pub floor_down: String,
+    pub airdrop: String,
+}
+
+impl Default for HotkeyConfig {
+    fn default() -> Self {
+        Self {
+            zoom_in: DEFAULT_ZOOM_IN.to_string(),
+            zoom_out: DEFAULT_ZOOM_OUT.to_string(),
+            floor_up: DEFAULT_FLOOR_UP.to_string(),
+            floor_down: DEFAULT_FLOOR_DOWN.to_string(),
+            airdrop: DEFAULT_AIRDROP.to_string(),
+        }
+    }
+}
+
+/// PUT body. Each field optional; only present keys are updated.
+#[derive(Debug, Clone, Default, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct HotkeyPatch {
+    #[serde(default)]
+    pub zoom_in: Option<String>,
+    #[serde(default)]
+    pub zoom_out: Option<String>,
+    #[serde(default)]
+    pub floor_up: Option<String>,
+    #[serde(default)]
+    pub floor_down: Option<String>,
+    #[serde(default)]
+    pub airdrop: Option<String>,
+}
+
+/// Validate an accelerator string by round-tripping it through the same
+/// parser the registration layer uses. Returns the trimmed string on success.
+fn validate(combo: &str) -> Result<String, String> {
+    let t = combo.trim();
+    HotKey::from_str(t)
+        .map(|_| t.to_string())
+        .map_err(|e| format!("invalid hotkey \"{t}\": {e}"))
+}
+
+pub struct HotkeyStore {
+    file: PathBuf,
+    state: Mutex<HotkeyConfig>,
+}
+
+impl HotkeyStore {
+    pub async fn load(file: PathBuf) -> Result<Self> {
+        let state = match tokio::fs::read_to_string(&file).await {
+            Ok(text) => serde_json::from_str(&text).unwrap_or_default(),
+            Err(e) if e.kind() == std::io::ErrorKind::NotFound => HotkeyConfig::default(),
+            Err(e) => return Err(e).context(format!("read {}", file.display())),
+        };
+        Ok(Self {
+            file,
+            state: Mutex::new(state),
+        })
+    }
+
+    pub async fn get(&self) -> HotkeyConfig {
+        self.state.lock().await.clone()
+    }
+
+    /// Apply a patch: validate every supplied combo first, then merge and
+    /// persist. Returns the merged config. Rejects (without mutating) on the
+    /// first unparseable combo.
+    pub async fn apply(&self, patch: HotkeyPatch) -> Result<HotkeyConfig, String> {
+        let zoom_in = patch.zoom_in.map(|s| validate(&s)).transpose()?;
+        let zoom_out = patch.zoom_out.map(|s| validate(&s)).transpose()?;
+        let floor_up = patch.floor_up.map(|s| validate(&s)).transpose()?;
+        let floor_down = patch.floor_down.map(|s| validate(&s)).transpose()?;
+        let airdrop = patch.airdrop.map(|s| validate(&s)).transpose()?;
+
+        let merged = {
+            let mut s = self.state.lock().await;
+            if let Some(v) = zoom_in {
+                s.zoom_in = v;
+            }
+            if let Some(v) = zoom_out {
+                s.zoom_out = v;
+            }
+            if let Some(v) = floor_up {
+                s.floor_up = v;
+            }
+            if let Some(v) = floor_down {
+                s.floor_down = v;
+            }
+            if let Some(v) = airdrop {
+                s.airdrop = v;
+            }
+            s.clone()
+        };
+
+        self.persist(&merged).await.map_err(|e| e.to_string())?;
+        Ok(merged)
+    }
+
+    /// Overwrite stored state with a fully-resolved config (used after the
+    /// manager reverts a field that failed to register). Persists.
+    pub async fn set(&self, config: HotkeyConfig) -> Result<()> {
+        {
+            let mut s = self.state.lock().await;
+            *s = config.clone();
+        }
+        self.persist(&config).await
+    }
+
+    async fn persist(&self, config: &HotkeyConfig) -> Result<()> {
+        if let Some(dir) = self.file.parent() {
+            tokio::fs::create_dir_all(dir)
+                .await
+                .with_context(|| format!("mkdir {}", dir.display()))?;
+        }
+        let body = serde_json::to_string_pretty(config).context("serialize hotkeys")?;
+        tokio::fs::write(&self.file, body)
+            .await
+            .with_context(|| format!("write {}", self.file.display()))?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn tmp_file() -> PathBuf {
+        std::env::temp_dir().join(format!(
+            "tarkov-checker-hotkeys-test-{}-{}.json",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos(),
+        ))
+    }
+
+    #[test]
+    fn defaults_all_parse_as_hotkeys() {
+        let cfg = HotkeyConfig::default();
+        for combo in [
+            &cfg.zoom_in,
+            &cfg.zoom_out,
+            &cfg.floor_up,
+            &cfg.floor_down,
+            &cfg.airdrop,
+        ] {
+            assert!(
+                HotKey::from_str(combo).is_ok(),
+                "default combo should parse: {combo}"
+            );
+        }
+    }
+
+    #[tokio::test]
+    async fn load_missing_file_yields_defaults() {
+        let store = HotkeyStore::load(tmp_file()).await.unwrap();
+        assert_eq!(store.get().await, HotkeyConfig::default());
+    }
+
+    #[tokio::test]
+    async fn apply_patches_only_supplied_fields_and_persists() {
+        let file = tmp_file();
+        let store = HotkeyStore::load(file.clone()).await.unwrap();
+        let merged = store
+            .apply(HotkeyPatch {
+                zoom_in: Some("CommandOrControl+Alt+Z".to_string()),
+                ..Default::default()
+            })
+            .await
+            .unwrap();
+        assert_eq!(merged.zoom_in, "CommandOrControl+Alt+Z");
+        assert_eq!(merged.airdrop, HotkeyConfig::default().airdrop);
+
+        // Reload from disk — the change must have persisted.
+        let reloaded = HotkeyStore::load(file).await.unwrap();
+        assert_eq!(reloaded.get().await.zoom_in, "CommandOrControl+Alt+Z");
+    }
+
+    #[tokio::test]
+    async fn apply_rejects_unparseable_combo_without_mutating() {
+        let store = HotkeyStore::load(tmp_file()).await.unwrap();
+        let result = store
+            .apply(HotkeyPatch {
+                zoom_in: Some("totally+nonsense+key".to_string()),
+                ..Default::default()
+            })
+            .await;
+        assert!(result.is_err(), "bad combo should be rejected");
+        // State untouched.
+        assert_eq!(store.get().await, HotkeyConfig::default());
+    }
+
+    #[tokio::test]
+    async fn apply_trims_whitespace() {
+        let store = HotkeyStore::load(tmp_file()).await.unwrap();
+        let merged = store
+            .apply(HotkeyPatch {
+                airdrop: Some("  CommandOrControl+Alt+D  ".to_string()),
+                ..Default::default()
+            })
+            .await
+            .unwrap();
+        assert_eq!(merged.airdrop, "CommandOrControl+Alt+D");
+    }
+}
diff --git a/apps/desktop/src-tauri/src/server/mod.rs b/apps/desktop/src-tauri/src/server/mod.rs
index dbe6566..ca4f56f 100644
--- a/apps/desktop/src-tauri/src/server/mod.rs
+++ b/apps/desktop/src-tauri/src/server/mod.rs
@@ -12,6 +12,7 @@
 
 pub mod config;
 pub mod events;
+pub mod hotkeys;
 pub mod logs;
 pub mod parse_log_regexes;
 pub mod parse_screenshot_regexes;
diff --git a/apps/desktop/src-tauri/src/watcher.rs b/apps/desktop/src-tauri/src/watcher.rs
index 7880ed5..e30cedc 100644
--- a/apps/desktop/src-tauri/src/watcher.rs
+++ b/apps/desktop/src-tauri/src/watcher.rs
@@ -41,11 +41,21 @@ pub struct WatcherSlot {
 
 impl Default for WatcherSlot {
     fn default() -> Self {
+        Self::with_sender(events::channel())
+    }
+}
+
+impl WatcherSlot {
+    /// Build a slot around an existing broadcast sender. Used by `run()` /
+    /// `run_headless()`, which create the channel up front so the hotkey
+    /// press handler can push `Command` events into the same stream the
+    /// watchers feed.
+    pub fn with_sender(event_tx: broadcast::Sender<ServerEvent>) -> Self {
         Self {
             apply_lock: AsyncMutex::new(()),
             screenshots: Mutex::new(None),
             logs: Mutex::new(None),
-            event_tx: events::channel(),
+            event_tx,
         }
     }
 }
diff --git a/packages/shared/src/hotkeys-api.ts b/packages/shared/src/hotkeys-api.ts
new file mode 100644
index 0000000..0263ace
--- /dev/null
+++ b/packages/shared/src/hotkeys-api.ts
@@ -0,0 +1,44 @@
+import { z } from 'zod';
+import { hotkeyActions, type HotkeyActionCode } from './ws-messages';
+
+/**
+ * Accelerator string in Tauri/Electron format: one or more modifiers + a
+ * non-empty main key, e.g. `CommandOrControl+Alt+L`. Bare keys (incl. the
+ * F-row) are rejected — Tarkov claims them via DirectInput and the OS
+ * RegisterHotKey loses the race. Shared between the client recorder/store
+ * and the backend `/api/hotkeys` validation so both ports agree.
+ */
+export const acceleratorSchema = z
+  .string()
+  .regex(/^((CommandOrControl|Control|Ctrl|Alt|Shift|Meta|Super)\+)+[^+\s]+$/);
+
+/** The five backend-forwarded actions (re-exported from the wire enum so
+ * there's one list to maintain). Lock is deliberately NOT here — it stays a
+ * client-side overlay-only shortcut. */
+export const hotkeyActionSchema = z.enum(hotkeyActions);
+
+/** Full hotkey config the backend owns + persists in `hotkeys.json`. One
+ * accelerator per action, camelCase keys matching the Rust `HotkeyConfig`. */
+export const hotkeyConfigSchema = z.object({
+  zoomIn: acceleratorSchema,
+  zoomOut: acceleratorSchema,
+  floorUp: acceleratorSchema,
+  floorDown: acceleratorSchema,
+  airdrop: acceleratorSchema,
+});
+
+/** PUT body — every field optional, only present keys are updated. */
+export const hotkeyPatchSchema = hotkeyConfigSchema.partial();
+
+export type HotkeyConfig = z.infer<typeof hotkeyConfigSchema>;
+export type HotkeyPatch = z.infer<typeof hotkeyPatchSchema>;
+
+/** Field name in `HotkeyConfig` ↔ wire action code. Used by the client to
+ * map a settings field to the `command` action and back. */
+export const HOTKEY_FIELD_TO_ACTION: Readonly<Record<keyof HotkeyConfig, HotkeyActionCode>> = {
+  zoomIn: 'zoom-in',
+  zoomOut: 'zoom-out',
+  floorUp: 'floor-up',
+  floorDown: 'floor-down',
+  airdrop: 'airdrop',
+};
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index e73b172..df93958 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -4,3 +4,4 @@ export * from './parse-screenshot.js';
 export * from './parse-log.js';
 export * from './triangulate.js';
 export * from './config-api.js';
+export * from './hotkeys-api.js';
diff --git a/packages/shared/src/ws-messages.ts b/packages/shared/src/ws-messages.ts
index 44e0744..b5ec07e 100644
--- a/packages/shared/src/ws-messages.ts
+++ b/packages/shared/src/ws-messages.ts
@@ -20,9 +20,28 @@ export const mapChangeMessage = z.object({
   rawMapId: z.string(),
 });
 
-export const serverMessage = z.discriminatedUnion('type', [positionMessage, mapChangeMessage]);
+/** Action codes the backend forwards to every client on a global-hotkey
+ * press. Single source of truth for the wire enum; mirrored by the Rust
+ * `HotkeyAction` (kebab-case) and consumed by `@shared/hotkeys-api`. */
+export const hotkeyActions = ['zoom-in', 'zoom-out', 'floor-up', 'floor-down', 'airdrop'] as const;
+
+/** Backend-owned global hotkey fired. The OS-level shortcut lives in the
+ * helper process, so this reaches the overlay webview (Tauri `command`
+ * event) AND every browser/phone client (SSE `/events`) identically. */
+export const commandMessage = z.object({
+  type: z.literal('command'),
+  action: z.enum(hotkeyActions),
+});
+
+export const serverMessage = z.discriminatedUnion('type', [
+  positionMessage,
+  mapChangeMessage,
+  commandMessage,
+]);
 
 export type PositionMessage = z.infer<typeof positionMessage>;
 export type MapChangeMessage = z.infer<typeof mapChangeMessage>;
+export type CommandMessage = z.infer<typeof commandMessage>;
+export type HotkeyActionCode = (typeof hotkeyActions)[number];
 export type ServerMessage = z.infer<typeof serverMessage>;
 export type ServerMessageType = ServerMessage['type'];

From 2ad31d8811e472997c23d4de292cb3331e6aabe4 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Wed, 3 Jun 2026 00:17:16 +0300
Subject: [PATCH 25/53] docs: refresh README/CLAUDE for backend hotkeys; drop
 dead Node/Fastify refs

- CLAUDE.md: new "Backend-owned hotkeys" section + route/store updates
- README (root EN+RU), client/desktop READMEs: the LAN/phone interface is
  served by the in-process Rust helper, not the removed Node/Fastify server
- desktop README: replace the obsolete "out of scope" list with current
  capabilities, fix beforeDevCommand, note the client-side tray

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md              | 83 +++++++++++++++++++++++++++++++++++++-----
 README.md              |  8 ++--
 apps/client/README.md  | 14 +++----
 apps/desktop/README.md | 43 +++++++++++++++++-----
 4 files changed, 117 insertions(+), 31 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index eb73c66..19e2d6f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -5,8 +5,9 @@
 - `apps/desktop` — Tauri 2 wrapper. The production artifact: Rust
   watcher/config pipeline (`src-tauri/src/server/`), the Tauri IPC
   commands the webview calls, AND an in-process HTTP server (axum) on
-  `127.0.0.1:47474` exposing `/api/ping`, `/api/config` (GET+PUT) and
-  `/events` (SSE). Single 6 MB `.exe` that ships as both the overlay
+  `127.0.0.1:47474` exposing `/api/ping`, `/api/config` (GET+PUT),
+  `/api/hotkeys` (GET+PUT, +suspend/resume) and `/events` (SSE). Single
+  6 MB `.exe` that ships as both the overlay
   and the local HTTP backend for any browser pointed at the same
   origin. See "In-process HTTP server" below.
 - `apps/client` — Vue + Leaflet map. Two transports, one codebase.
@@ -318,7 +319,11 @@ Persisted state lives in **per-feature** Pinia stores, not one big store:
   into vue-i18n's `locale`; `main.ts` calls `useI18nStore()` eagerly after
   `app.use(createPinia())` so the persisted language is applied before any
   component reads `t()`.
-- `apps/client/src/features/hotkeys/store.ts` — per-action hotkey combos.
+- `apps/client/src/features/hotkeys/store.ts` — thin sync layer over the
+  **backend-owned** combos: `lockHotkey` stays a client `persistedRef`
+  (overlay-only), the five forwarded actions load from the backend
+  (`fetchHotkeys`) and `setAction` PUTs on change. See "Backend-owned
+  hotkeys" below.
 - `apps/client/src/features/overlay/store.ts` — Tauri-only:
   `alwaysOnTop`, `opacity` (0.3–1), `mapOpacity` (0–1), `zoom`
   (`"75" | "100" | "125" | "150"`), plus a deliberately session-only
@@ -347,7 +352,7 @@ that owns settings registers its UI section via `registerSettingsSection()`.
   `useSettingsSections(group)`. Visibility logic: `'always'` (desktop +
   phone, default), `'tauri'` (overlay only), `'desktop-or-tauri'` (phone at
   ≥640px or overlay). Order uses multiples of 10. Currently:
-  - main: 10 map, 20 extracts, 30 player, 40 airdrop (tauri-only), 50 overlay (tauri-only), 60 hotkeys (tauri-only)
+  - main: 10 map, 20 extracts, 30 player, 40 airdrop (tauri-only), 50 overlay (tauri-only), 60 hotkeys (desktop-or-tauri)
   - system: 10 language, 20 paths (desktop-or-tauri)
 - `features/<name>/settings.ts` — each feature with settings calls
   `registerSettingsSection({ id, group, order, visible, component })` at
@@ -408,10 +413,14 @@ allow-set-opacity` doesn't exist in Tauri 2.11.x), the composable
   slider remains visually responsive.
 - **Zoom** — `WebviewWindow.setZoom(factor)`.
 
-**Global shortcut** is `tauri-plugin-global-shortcut` (Rust crate +
-`@tauri-apps/plugin-global-shortcut` npm). Registered in `App.vue`'s
-`onMounted` with combo `"CommandOrControl+Alt+L"`. Handler fires on
-both `Pressed` and `Released` — toggle only on `Pressed`.
+**Lock global shortcut** is the ONLY client-registered hotkey:
+`useGlobalShortcut` (via `@tauri-apps/plugin-global-shortcut`) binds
+`"CommandOrControl+Alt+L"` in `App.vue` to toggle click-through. Kept
+client-side on purpose — it's an overlay window op with no browser
+meaning, and the proven plugin path preserves the recovery route out of
+a click-through lockout. Handler fires on both `Pressed` and `Released`
+— toggle only on `Pressed`. **Every other hotkey is backend-owned** —
+see "Backend-owned hotkeys" below.
 
 **Capabilities** (`apps/desktop/src-tauri/capabilities/default.json`)
 must include the privileged window ops explicitly — `core:default`
@@ -475,9 +484,15 @@ for the architectural reasoning.
   JSON shape as the Tauri `get_config` IPC command.
 - `PUT /api/config` — apply `ConfigPatch`, re-run `apply_resolved`,
   return the new `ResolvedPaths`. UNC → 400 with `{error: "..."}`.
+- `GET /api/hotkeys` — backend-owned combos (`HotkeyConfig`).
+- `PUT /api/hotkeys` — apply `HotkeyPatch`, (re)register OS hotkeys,
+  return the EFFECTIVE config (a combo that can't be claimed reverts).
+  Unparseable combo → 400. See "Backend-owned hotkeys".
+- `POST /api/hotkeys/{suspend,resume}` — drop / re-claim the OS binds
+  while the settings recorder captures a combo (204).
 - `GET /events` — Server-Sent Events stream. `ServerEvent` (tagged
-  enum) frames; one `data: { type: "position"|"map-change", ... }`
-  per watcher emission. Keep-alive `: ping` every 25 s.
+  enum) frames; one `data: { type: "position"|"map-change"|"command", ... }`
+  per watcher / hotkey emission. Keep-alive `: ping` every 25 s.
 
 Events are fan-out twice in parallel by each watcher emit-site:
 
@@ -510,6 +525,54 @@ declarations (TS schema, TS discriminated union, Rust payload struct,
 new `ServerEvent` variant); the file is still called `ws-messages.ts`
 for historical reasons (was the WS schema before the SSE migration).
 
+## Backend-owned hotkeys
+
+The backend is the single owner of the five forwarded hotkeys (`zoom-in`,
+`zoom-out`, `floor-up`, `floor-down`, `airdrop`). It registers them as
+**OS-global** shortcuts (fire even while the game is focused) and on a
+press broadcasts `ServerEvent::Command { action }` so EVERY client —
+overlay webview, browser, LAN phone — performs the action. The old
+focus-required `useBrowserShortcut` and per-client `useGlobalShortcut`
+wiring for these is gone; only the overlay **lock** combo stays
+client-registered (see "Desktop overlay").
+
+- Combos persist in `%APPDATA%/tarkov-checker/hotkeys.json` via
+  `server/hotkeys.rs` (`HotkeyStore`, sibling to `config.json`). Defaults
+  match the client's historical `tc.hotkeys.*` so an un-customised install
+  is unchanged; the client migrates customised localStorage values up once
+  (`tc.hotkeys.migrated`).
+- Registration lives in `src/hotkeys.rs` behind one `HotkeyController`
+  trait, with two impls that are **never** used together (the windowed app
+  and headless backend are mutually exclusive — both bind :47474):
+  - `TauriHotkeys` (`run()`): delegates to `tauri-plugin-global-shortcut`.
+    The five combos are registered via the **plugin Builder**
+    (`.with_shortcuts(...).with_handler(...)`) so registration happens on
+    Tauri's main thread without the `run_on_main_thread` deadlock that
+    registering inside our own `setup` hook would hit; a press-handler
+    reads an `Arc<Mutex<id→action>>` map and emits `command`.
+  - `StandaloneHotkeys` (`run_headless()`): there is no Tauri event loop,
+    so it owns a dedicated OS thread that creates a
+    `global_hotkey::GlobalHotKeyManager` and runs its **own Win32
+    `PeekMessage` pump**, reading `WM_HOTKEY` directly. Required because
+    `global-hotkey` needs a message pump on the manager's thread; the doc
+    even says so. It does NOT use `GlobalHotKeyEvent::set_event_handler`.
+- **Do not** run a standalone `global-hotkey` manager and the Tauri plugin
+  in the SAME process: the plugin installs a process-global
+  `GlobalHotKeyEvent::set_event_handler` (`OnceCell`), so a second
+  manager's events would route to the plugin's handler (which doesn't know
+  the ids) and the `receiver()` channel would get nothing. The two impls
+  above sidestep this by never coexisting.
+- The settings recorder brackets capture with the `HOTKEY_SUSPEND/RESUME`
+  window events; `useHotkeysSync` (App.vue) bridges them to
+  `POST /api/hotkeys/{suspend,resume}` so the backend drops its OS binds
+  and the pressed combo reaches the page/webview to be re-recorded (the
+  same events still drive the client-side lock shortcut).
+- Wire parity follows the same 4-declaration rule as other events:
+  `commandMessage` (zod) + union in `ws-messages.ts`, `ServerEvent::Command`
+  + `HotkeyAction` (kebab-case) in `server/events.rs`. The client dispatches
+  `command` in `pages/index.vue` (`useServerEvent('command', …)`) to
+  `mapRef`/`airdropStore`.
+
 The logs watcher (`server/logs.rs`) tails the **latest** `log_*/`
 session folder under `logsDir` — picked by sort order (timestamps in
 the folder name). On startup it scans the tail of the active
diff --git a/README.md b/README.md
index 316f18c..379d5cf 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ A live in-raid map companion for Escape from Tarkov. The overlay watches your Ta
 
 **Desktop overlay** (primary): a single 6 MB portable `.exe` that opens as a frameless transparent always-on-top window over your game. No installer, no admin rights, no background service. All game monitoring happens in-process — your position is extracted from Tarkov's PrintScreen overlay screenshots, and raid transitions are detected by parsing the active session logs.
 
-**LAN / phone PWA** (optional): a lightweight Node/Fastify server on your PC serves the same map interface to any browser on your local network — perfect for a second monitor or a phone on the same Wi-Fi.
+**LAN / phone PWA** (optional): the overlay's in-process Rust helper (axum, on `0.0.0.0:47474`) serves the same map interface to any browser on your local network — perfect for a second monitor or a phone on the same Wi-Fi. The release build serves the embedded SPA directly; in dev, Vite on :5173 proxies to it.
 
 ## Quick Start
 
@@ -106,7 +106,7 @@ Screenshots and logs are processed locally with no external API calls during gam
 
 ## Architecture Details
 
-See [CLAUDE.md](CLAUDE.md) for in-depth engineering documentation: dev workflow, Tauri overlay configuration, multi-version logs parsing, Windows build quirks, CI/release procedures, and the in-process Rust HTTP server (`/api/config`, `/events`).
+See [CLAUDE.md](CLAUDE.md) for in-depth engineering documentation: dev workflow, Tauri overlay configuration, multi-version logs parsing, Windows build quirks, CI/release procedures, and the in-process Rust HTTP server (`/api/config`, `/api/hotkeys`, `/events`).
 
 ## Credits
 
@@ -142,7 +142,7 @@ See [LICENSE](./LICENSE).
 
 **Десктоп-оверлей** (основной): один портативный `.exe` размером 6 МБ, открывающийся безрамочным прозрачным окном поверх игры. Без установщика, без админских прав, без фоновых сервисов. Все отслеживание игры происходит в одном процессе — ваша позиция извлекается из PrintScreen-скриншотов с оверлеем Tarkov, а переходы между рейдами определяются парсингом логов активной сессии.
 
-**LAN / PWA на телефоне** (опционально): легкий Node/Fastify-сервер на ПК отдаёт ту же карту в браузер любого устройства в локальной сети — идеально для второго монитора или телефона в одной Wi-Fi сети.
+**LAN / PWA на телефоне** (опционально): встроенный в оверлей Rust-хелпер (axum, на `0.0.0.0:47474`) отдаёт ту же карту в браузер любого устройства в локальной сети — идеально для второго монитора или телефона в одной Wi-Fi сети. Release-сборка отдаёт встроенный SPA напрямую; в режиме разработки Vite на :5173 проксирует к нему.
 
 ## Быстрый старт
 
@@ -229,7 +229,7 @@ Customs, Factory (День/Ночь), Woods, Shoreline, Reserve, Interchange, Li
 
 ## Архитектурные детали
 
-Смотри [CLAUDE.md](CLAUDE.md) для подробной инженерной документации: dev workflow, конфигурация Tauri-оверлея, парсинг многоверсионных логов, подводные камни Windows-сборки, процедуры CI/релиза, и in-process Rust HTTP-сервер (`/api/config`, `/events`).
+Смотри [CLAUDE.md](CLAUDE.md) для подробной инженерной документации: dev workflow, конфигурация Tauri-оверлея, парсинг многоверсионных логов, подводные камни Windows-сборки, процедуры CI/релиза, и in-process Rust HTTP-сервер (`/api/config`, `/api/hotkeys`, `/events`).
 
 ## Благодарности
 
diff --git a/apps/client/README.md b/apps/client/README.md
index f833f3e..235a7eb 100644
--- a/apps/client/README.md
+++ b/apps/client/README.md
@@ -1,6 +1,6 @@
 # @tarkov-checker/client
 
-Vue + Leaflet map. Runs both inside the Tauri overlay (`apps/desktop`) and as a plain browser page on phones over LAN (the same prod build Fastify serves at `:3000/`). Same code path, different transport (Tauri events vs SSE / `EventSource`).
+Vue + Leaflet map. Runs both inside the Tauri overlay (`apps/desktop`) and as a plain browser page on phones over LAN (the same prod build the in-process Rust helper in `apps/desktop` serves at `:47474/`; dev uses Vite on `:5173`, which proxies `/api` + `/events` to the helper). Same code path, different transport (Tauri events vs SSE / `EventSource`).
 
 Specifics about Tauri internals, Windows build quirks, and dev workflow live in [the repo CLAUDE.md](../../CLAUDE.md). This README is for contributors working **inside the client**.
 
@@ -24,12 +24,12 @@ features/   One folder per business feature, each fully owns its slice:
   map/         Leaflet map framework (useLeafletMap, useFloorSwitcher), layers registry + built-in layers (extracts/player/airdrop), MapView component, static extracts dataset (data/extracts/<code>.json — one file per canonical map)
   airdrop/     Airdrop triangulation state machine, screenshot tracker, settings section
   overlay/     Tauri overlay window controls, opacity/zoom/mapOpacity sync, tray icon, overlay-specific components
-  hotkeys/     Global shortcuts, HotkeyRecorder, accelerator parser
-  server/      SSE/HTTP transport, typed IPC contract, server event bus, /api/config client
+  hotkeys/     Backend-owned combos synced via thin store (fetch/PUT), HotkeyRecorder, accelerator parser; only the overlay lock stays client-registered
+  server/      SSE/HTTP transport, typed IPC contract, server event bus, /api/config + /api/hotkeys clients
   i18n/        createI18n instance, store (apiLang persisted), locales/<code>.json files
   settings/    Settings registry, SettingsPanel.vue, section sub-components
 shared/     Cross-feature utilities (persisted-store, config) — no business logic
-App.vue     Tiny: <RouterView/> + ConfirmDialog + MapQuickMenu + side effects (transport, tray, lock hotkey)
+App.vue     Tiny: <RouterView/> + ConfirmDialog + MapQuickMenu + side effects (transport, tray, lock hotkey, hotkeys sync — backend load + recorder suspend/resume bridge)
 main.ts     createApp → pinia + router + i18n + PrimeVue
 theme.ts    PrimeVue Aura preset override (primary = purple)
 styles.css  Tailwind imports, font-faces, dark mode token tweaks
@@ -182,7 +182,7 @@ pnpm lint       # eslint --max-warnings=0
 ## Where things connect
 
 - **Tauri detection** — centralized in [`shared/tauri.ts`](./src/shared/tauri.ts) as `isTauri` const. Checked at module load time, safe for non-DOM contexts. Used by transport layer, router, overlay composables, and settings visibility logic.
-- **Server-pushed messages** — schema in [`@shared/ws-messages`](../../packages/shared/src/ws-messages.ts). Position + map-change events; Node server pushes over SSE, Rust port emits as Tauri events. Client uses the same Zod schema either way.
+- **Server-pushed messages** — schema in [`@shared/ws-messages`](../../packages/shared/src/ws-messages.ts). Position, map-change, and command (backend-owned hotkey) events; the in-process Rust helper pushes over SSE to browsers, and emits as Tauri events to the overlay webview. Client uses the same Zod schema either way.
 - **Tarkov map calibration** (CRS, bounds, rotation) — [`@shared/maps`](../../packages/shared/src/maps.ts). Modifying calibration affects both desktop and browser.
 - **Map localization** — `useMapI18n()` composable in [`features/map/composables/useMapI18n.ts`](./src/features/map/composables/useMapI18n.ts) provides `localizedMapName(code)` with `te → t → displayName` fallback chain. Used in MapView + MapSection to stay in sync.
 - **HTTP / IPC** — single dispatch in [`features/server/api/transport.ts`](./src/features/server/api/transport.ts).
@@ -191,6 +191,6 @@ pnpm lint       # eslint --max-warnings=0
 
 ## See also
 
-- [`CLAUDE.md`](../../CLAUDE.md) — repo-wide context: Tauri internals, Windows build quirks (HVCI/Defender), path resolution dual implementation (Node + Rust), why ASCII-only repo path matters.
+- [`CLAUDE.md`](../../CLAUDE.md) — repo-wide context: Tauri internals, Windows build quirks (HVCI/Defender), Rust path resolution, why ASCII-only repo path matters.
 - [`apps/desktop/README.md`](../desktop/README.md) — Tauri overlay specifics.
-- [`packages/shared/`](../../packages/shared/) — Zod schemas + map calibration tables shared between client, Node server, and Rust port.
+- [`packages/shared/`](../../packages/shared/) — Zod schemas + map calibration tables shared between the client and the Rust helper.
diff --git a/apps/desktop/README.md b/apps/desktop/README.md
index 2aa2bdd..e5967b1 100644
--- a/apps/desktop/README.md
+++ b/apps/desktop/README.md
@@ -13,15 +13,14 @@ serves the same files for phone access on `:47474`).
 ## Dev
 
 ```pwsh
-# Terminal 1 — start the Vite dev server (from repo root)
-pnpm dev
-
-# Terminal 2 — launch the Tauri window
+# One command — Tauri spawns Vite, then opens the window
 pnpm --filter @tarkov-checker/desktop tauri:dev
 ```
 
-`beforeDevCommand` is intentionally empty in `tauri.conf.json` so the
-Vite server stays under Turbo's orchestration and isn't double-spawned.
+`beforeDevCommand` in `tauri.conf.json` is
+`pnpm --filter @tarkov-checker/client dev`, so Tauri starts the Vite
+dev server (`:5173`) itself and shuts it down on exit — no separate
+terminal needed.
 
 ## Production build
 
@@ -32,7 +31,31 @@ pnpm --filter @tarkov-checker/desktop tauri:build
 `beforeBuildCommand` builds the client first; Tauri then bundles
 `apps/client/dist` into the installer.
 
-## Out of scope (this bootstrap)
-
-Transparency, always-on-top, click-through, tray icon, custom commands.
-These land in a later session.
+## What this crate does
+
+More than a thin wrapper now. The same `.exe` is both the overlay and a
+local backend:
+
+- **Frameless transparent overlay** — `decorations: false`,
+  `transparent: true`, `shadow: false`. Always-on-top, click-through
+  (lock), opacity and zoom are driven from the webview via Tauri window
+  APIs.
+- **In-process axum HTTP server on `0.0.0.0:47474`** — `GET /api/ping`,
+  `GET`/`PUT /api/config`, `GET`/`PUT /api/hotkeys`,
+  `POST /api/hotkeys/{suspend,resume}`, and `GET /events` (SSE). Backs
+  any same-Wi-Fi browser/phone; release builds also serve the embedded
+  SPA from `/`.
+- **Backend-owned OS-global hotkeys** — zoom/floor/airdrop combos are
+  registered by the backend and broadcast as `command` events to every
+  client (overlay, browser, LAN phone). Only the overlay lock combo is
+  client-registered.
+- **Tauri IPC commands** — `get_config`, `update_config`, `get_hotkeys`,
+  `update_hotkeys`, `suspend_hotkeys`, `resume_hotkeys`, `pairing_qr`
+  (LAN QR pairing).
+- **System-tray icon** — created client-side via the Tauri JS tray API
+  (`apps/client/.../overlay/composables/useTrayIcon.ts`): toggle-lock,
+  show window, quit. A richer Rust-side tray menu (pair phone / copy LAN
+  URL) is still planned — see `PLAN-LAN-AND-TRAY.md`, section E.
+
+For full detail see the repo `CLAUDE.md` — "Desktop overlay",
+"Backend-owned hotkeys", and "In-process HTTP server".

From 5762a47b9e4e58f1ec14b07295a4c8bea6aa32ee Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Wed, 3 Jun 2026 00:27:33 +0300
Subject: [PATCH 26/53] feat(extracts): edge arrows for off-screen extracts
 (#18)

Opt-in, off by default. When zoomed in, a small faction-coloured arrow
sits on the viewport edge for each off-screen extract, pointing at it.
Rendered in an overlay div over the Leaflet container (not a pane) so the
arrows stay pixel-fixed while panning; recomputed on move/zoom. Toggle in
Settings -> Extracts.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/i18n/locales/en.json |  2 +
 apps/client/src/features/i18n/locales/ru.json |  2 +
 .../map/layers/extracts/useEdgeIndicators.ts  | 87 +++++++++++++++++++
 .../map/layers/extracts/useExtractsLayer.ts   | 41 ++++++++-
 apps/client/src/features/map/store.ts         |  3 +
 .../settings/sections/ExtractsSection.vue     | 11 ++-
 apps/client/src/styles.css                    | 21 +++++
 7 files changed, 165 insertions(+), 2 deletions(-)
 create mode 100644 apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts

diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 670aed6..ef593d7 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -16,6 +16,8 @@
     "md": "M",
     "lg": "L"
   },
+  "edgeIndicators": "Edge arrows",
+  "edgeIndicatorsHint": "When zoomed in, show small arrows on the map edge pointing at off-screen extracts.",
   "player": "Player",
   "playerFollow": "Auto-follow",
   "playerFollowHint": "Recenter the map on every new position. S/M/L also zoom in; On just follows at your current zoom.",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 8d4767c..1fb7b17 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -16,6 +16,8 @@
     "md": "M",
     "lg": "L"
   },
+  "edgeIndicators": "Стрелки к выходам",
+  "edgeIndicatorsHint": "На приближении показывает у края карты маленькие стрелки к выходам за пределами экрана.",
   "player": "Игрок",
   "playerFollow": "Авто-следование",
   "playerFollowHint": "Центрируем карту при каждой новой позиции. S/M/L ещё и приближают; «Вкл» — просто следует на текущем зуме.",
diff --git a/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts b/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
new file mode 100644
index 0000000..da37d0c
--- /dev/null
+++ b/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
@@ -0,0 +1,87 @@
+import type { Map as LeafletMap } from 'leaflet';
+
+/** One off-screen target: position in (lat=z, lng=x) + the arrow colour. */
+export interface EdgeArrow {
+  lat: number;
+  lng: number;
+  color: string;
+}
+
+const MARGIN = 16; // px inset from the container edge
+const ARROW_PX = 18;
+
+/**
+ * Renders small arrows on the viewport edge pointing at off-screen extracts.
+ *
+ * The arrows live in a plain overlay `<div>` appended to the Leaflet container
+ * (NOT a map pane) so they stay pixel-fixed to the viewport — a marker in a
+ * pane would be dragged around by the pane transform during a pan. On every
+ * map move/zoom we recompute each target's container point; off-screen ones get
+ * an arrow clamped to the inset rectangle edge, rotated to point outward.
+ */
+export function createEdgeIndicators(map: LeafletMap, getArrows: () => EdgeArrow[]) {
+  const overlay = document.createElement('div');
+  overlay.className = 'edge-indicators';
+  map.getContainer().appendChild(overlay);
+
+  const pool: HTMLElement[] = [];
+
+  function take(i: number): HTMLElement {
+    let el = pool[i];
+    if (!el) {
+      el = document.createElement('div');
+      el.className = 'edge-indicator';
+      el.innerHTML = `<svg viewBox="0 0 24 24" width="${ARROW_PX}" height="${ARROW_PX}" aria-hidden="true"><path d="M12 3 L20 19 L12 15 L4 19 Z" fill="currentColor"/></svg>`;
+      overlay.appendChild(el);
+      pool[i] = el;
+    }
+    return el;
+  }
+
+  function update(): void {
+    const size = map.getSize();
+    const cx = size.x / 2;
+    const cy = size.y / 2;
+    const halfW = cx - MARGIN;
+    const halfH = cy - MARGIN;
+    let used = 0;
+    for (const a of getArrows()) {
+      const cp = map.latLngToContainerPoint([a.lat, a.lng]);
+      if (cp.x >= 0 && cp.x <= size.x && cp.y >= 0 && cp.y <= size.y) continue; // on-screen
+      const dx = cp.x - cx;
+      const dy = cp.y - cy;
+      if (dx === 0 && dy === 0) continue;
+      const t = Math.min(
+        dx !== 0 ? halfW / Math.abs(dx) : Infinity,
+        dy !== 0 ? halfH / Math.abs(dy) : Infinity,
+      );
+      const ex = cx + dx * t;
+      const ey = cy + dy * t;
+      const deg = (Math.atan2(dy, dx) * 180) / Math.PI + 90; // SVG arrow points up
+      const el = take(used);
+      el.style.left = `${ex}px`;
+      el.style.top = `${ey}px`;
+      el.style.transform = `rotate(${deg}deg)`;
+      el.style.color = a.color;
+      el.style.display = '';
+      used++;
+    }
+    for (let i = used; i < pool.length; i++) {
+      const el = pool[i];
+      if (el) el.style.display = 'none';
+    }
+  }
+
+  const onMove = (): void => update();
+  map.on('move zoom zoomend viewreset resize', onMove);
+  update();
+
+  return {
+    update,
+    destroy(): void {
+      map.off('move zoom zoomend viewreset resize', onMove);
+      overlay.remove();
+      pool.length = 0;
+    },
+  };
+}
diff --git a/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts b/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
index 6742ab1..4c64f24 100644
--- a/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
+++ b/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
@@ -1,6 +1,8 @@
 import L, { type Marker, type LayerGroup } from 'leaflet';
+import { FACTION_COLORS } from '@shared/maps';
 import { makeIcon } from './icon';
 import { buildTooltipHtml, sortedEntries, type ExtractEntry } from './tooltip';
+import { createEdgeIndicators, type EdgeArrow } from './useEdgeIndicators';
 import { extractsForMap } from '@/features/map/data/extracts';
 import { useMapSettingsStore } from '@/features/map/store';
 import type { MapLayerContext } from '../registry';
@@ -35,10 +37,11 @@ interface RawExtract {
 export function useExtractsLayer(ctx: MapLayerContext): void {
   const { map, mapCode } = ctx;
   const { t, locale } = useI18n();
-  const { extractFactions, extractLabelMode, extractLabelSize } =
+  const { extractFactions, extractLabelMode, extractLabelSize, edgeIndicators } =
     storeToRefs(useMapSettingsStore());
 
   let extractsLayer: LayerGroup | null = null;
+  let edge: ReturnType<typeof createEdgeIndicators> | null = null;
   const entries: MarkerEntry[] = [];
   const state = {
     visibleFactions: new Set<string>(extractFactions.value),
@@ -80,6 +83,34 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
         extractsLayer.removeLayer(entry.marker);
       }
     }
+    edge?.update();
+  }
+
+  // Off-screen extract arrows (opt-in). One arrow per visible merged extract,
+  // coloured by its first visible faction; the overlay itself decides which
+  // are off-screen on each map move.
+  function arrowData(): EdgeArrow[] {
+    const out: EdgeArrow[] = [];
+    for (const entry of entries) {
+      const first = effectiveEntries(entry)[0];
+      if (!first) continue;
+      out.push({
+        lat: entry.extract.position.z,
+        lng: entry.extract.position.x,
+        color: FACTION_COLORS[first.faction],
+      });
+    }
+    return out;
+  }
+
+  function syncEdge(): void {
+    if (edgeIndicators.value && map.value) {
+      if (edge) edge.update();
+      else edge = createEdgeIndicators(map.value, arrowData);
+    } else if (edge) {
+      edge.destroy();
+      edge = null;
+    }
   }
 
   function reopenAllPermanentTooltips(): void {
@@ -149,6 +180,7 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
       entries.push({ marker, extract: ex });
     }
     refreshMarkers();
+    syncEdge();
   }
 
   // Single source of truth for "the map exists now": loads markers + attaches
@@ -162,11 +194,16 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
       if (m) {
         m.on('click', reopenAllPermanentTooltips);
         loadExtracts();
+      } else if (edge) {
+        edge.destroy();
+        edge = null;
       }
     },
     { immediate: true },
   );
 
+  watch(edgeIndicators, syncEdge);
+
   watch(locale, () => {
     loadExtracts();
   });
@@ -201,6 +238,8 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
   );
 
   onBeforeUnmount(() => {
+    edge?.destroy();
+    edge = null;
     if (extractsLayer && map.value) {
       map.value.removeLayer(extractsLayer);
     }
diff --git a/apps/client/src/features/map/store.ts b/apps/client/src/features/map/store.ts
index ab7479c..406c3a0 100644
--- a/apps/client/src/features/map/store.ts
+++ b/apps/client/src/features/map/store.ts
@@ -31,6 +31,8 @@ export const useMapSettingsStore = defineStore('map-settings', () => {
     labelSizeSchema,
     'md' as ExtractLabelSize,
   );
+  // Off-screen extract arrows on the viewport edge. Opt-in, off by default.
+  const edgeIndicators = persistedRef('tc.map.edgeIndicators', z.boolean(), false);
   const playerFollow = persistedRef(
     'tc.map.playerFollow',
     playerFollowSchema,
@@ -43,6 +45,7 @@ export const useMapSettingsStore = defineStore('map-settings', () => {
     extractFactions,
     extractLabelMode,
     extractLabelSize,
+    edgeIndicators,
     playerFollow,
     autoMapSwitch,
   };
diff --git a/apps/client/src/features/settings/sections/ExtractsSection.vue b/apps/client/src/features/settings/sections/ExtractsSection.vue
index 40a28af..880e1f3 100644
--- a/apps/client/src/features/settings/sections/ExtractsSection.vue
+++ b/apps/client/src/features/settings/sections/ExtractsSection.vue
@@ -2,7 +2,8 @@
 import { FACTION_COLORS } from '@shared/maps';
 import { useMapSettingsStore, type ExtractFactionFilter } from '@/features/map/store';
 
-const { extractFactions, extractLabelMode, extractLabelSize } = storeToRefs(useMapSettingsStore());
+const { extractFactions, extractLabelMode, extractLabelSize, edgeIndicators } =
+  storeToRefs(useMapSettingsStore());
 const { t } = useI18n();
 
 const FACTION_OPTIONS: ReadonlyArray<{
@@ -66,5 +67,13 @@ const labelSizeOptions = computed(() => [
         fluid
       />
     </div>
+
+    <div class="mt-3">
+      <div class="flex items-center justify-between gap-3">
+        <label class="text-sm" for="extract-edge-indicators">{{ t('edgeIndicators') }}</label>
+        <ToggleSwitch v-model="edgeIndicators" input-id="extract-edge-indicators" />
+      </div>
+      <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('edgeIndicatorsHint') }}</p>
+    </div>
   </Fieldset>
 </template>
diff --git a/apps/client/src/styles.css b/apps/client/src/styles.css
index 9e65c5b..9c94ea5 100644
--- a/apps/client/src/styles.css
+++ b/apps/client/src/styles.css
@@ -174,6 +174,27 @@ html.overlay-window #app {
   inset: 0;
 }
 
+/* Off-screen extract arrows (#18). Plain overlay over the Leaflet container
+ * (not a pane), so the arrows stay pixel-fixed to the viewport edge while the
+ * map pane is dragged. Above the map, below Leaflet controls; never clickable. */
+.edge-indicators {
+  position: absolute;
+  inset: 0;
+  z-index: 600;
+  overflow: hidden;
+  pointer-events: none;
+}
+.edge-indicator {
+  position: absolute;
+  width: 18px;
+  height: 18px;
+  margin-left: -9px;
+  margin-top: -9px;
+  transform-origin: center;
+  opacity: 0.9;
+  filter: drop-shadow(0 0 2px rgb(0 0 0 / 0.6));
+}
+
 /* Tooltip container — Leaflet adds .leaflet-tooltip; we hide its built-in
  * pseudo-element callout and let the per-row stripes carry faction colour
  * (rows live inside, one per distinct name). Padding goes on the rows so

From 77dd099fc232c63b36d1a0be534101b4abee3ca8 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Wed, 3 Jun 2026 00:32:55 +0300
Subject: [PATCH 27/53] feat(ui): safe-area insets for floating controls (#24)

Apply env(safe-area-inset-*) via .sa-* helpers to the clock, top clusters,
lock indicator and floor switcher so the iPhone notch / Dynamic Island /
home indicator / rounded corners don't clip them. viewport-fit=cover was
already set in index.html. Insets are 0 on desktop, so positions are
unchanged there.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/features/map/components/MapView.vue   |  2 +-
 .../overlay/components/OverlayHeader.vue      |  6 +++---
 .../components/OverlayLockIndicator.vue       |  2 +-
 .../features/tarkov-time/TarkovTimeChip.vue   |  2 +-
 apps/client/src/styles.css                    | 20 +++++++++++++++++++
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/apps/client/src/features/map/components/MapView.vue b/apps/client/src/features/map/components/MapView.vue
index 22c046f..f30f349 100644
--- a/apps/client/src/features/map/components/MapView.vue
+++ b/apps/client/src/features/map/components/MapView.vue
@@ -53,7 +53,7 @@ watch(mapError, (err) => emit('mapError', err));
 
 <template>
   <div ref="mapContainer" class="absolute inset-0 z-0" />
-  <div v-if="hasFloors" class="absolute bottom-3 left-3 z-[1000]">
+  <div v-if="hasFloors" class="sa-bottom sa-left absolute z-[1000]">
     <FloorSwitcher :floors="info.floors" :current="currentFloor" @select="setActiveFloor" />
   </div>
 </template>
diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 5020432..2f77704 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -82,7 +82,7 @@ async function startDrag(event: MouseEvent): Promise<void> {
        is visual only; the band owns the drag. -->
   <div
     v-if="tauriChrome && !overlayClickThrough"
-    class="absolute top-0 right-0 left-0 z-[1000] flex h-12 cursor-grab items-start px-2 pt-2 active:cursor-grabbing"
+    class="sa-pt absolute top-0 right-0 left-0 z-[1000] flex h-12 cursor-grab items-start px-2 active:cursor-grabbing"
     @mousedown="startDrag"
     @mouseenter="hovered = true"
     @mouseleave="hovered = false"
@@ -137,7 +137,7 @@ async function startDrag(event: MouseEvent): Promise<void> {
   </div>
 
   <!-- OVERLAY locked: just the connection dot — no interactive chrome. -->
-  <div v-else-if="tauriChrome" class="absolute top-3 right-3 z-[1000]">
+  <div v-else-if="tauriChrome" class="sa-top sa-right absolute z-[1000]">
     <span
       class="inline-flex h-6 w-6 items-center justify-center rounded-full bg-surface-800/70 backdrop-blur pointer-events-none"
       :title="'ws: ' + status"
@@ -148,7 +148,7 @@ async function startDrag(event: MouseEvent): Promise<void> {
   </div>
 
   <!-- BROWSER: no window drag — keep a static status + map name pill + settings. -->
-  <div v-else class="absolute top-3 right-3 z-[1000] flex items-center gap-2">
+  <div v-else class="sa-top sa-right absolute z-[1000] flex items-center gap-2">
     <span
       class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur pointer-events-none select-none"
     >
diff --git a/apps/client/src/features/overlay/components/OverlayLockIndicator.vue b/apps/client/src/features/overlay/components/OverlayLockIndicator.vue
index 5ddb73f..00132b0 100644
--- a/apps/client/src/features/overlay/components/OverlayLockIndicator.vue
+++ b/apps/client/src/features/overlay/components/OverlayLockIndicator.vue
@@ -21,7 +21,7 @@ const lockAriaLabel = computed(() =>
 </script>
 
 <template>
-  <div class="absolute bottom-3 right-3 z-[1000] flex items-center gap-2">
+  <div class="sa-bottom sa-right absolute z-[1000] flex items-center gap-2">
     <span
       class="pointer-events-none inline-flex items-center gap-1 rounded-md bg-surface-800/70 px-2 py-1 text-[10px] font-semibold tracking-wider backdrop-blur"
     >
diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
index 2853a23..ee14045 100644
--- a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -22,7 +22,7 @@ const { active: headerActive } = useOverlayHeaderActive();
        header's transform/opacity reveal so the two move in lockstep.
        translate-y-11 (44px) lands it at top-14 from the top-3 base. -->
   <div
-    class="pointer-events-none absolute top-3 left-3 z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur transition-transform duration-200 ease-out select-none"
+    class="sa-top sa-left pointer-events-none absolute z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur transition-transform duration-200 ease-out select-none"
     :class="headerActive ? 'translate-y-11' : 'translate-y-0'"
     aria-hidden="true"
   >
diff --git a/apps/client/src/styles.css b/apps/client/src/styles.css
index 9c94ea5..cd7d2e6 100644
--- a/apps/client/src/styles.css
+++ b/apps/client/src/styles.css
@@ -195,6 +195,26 @@ html.overlay-window #app {
   filter: drop-shadow(0 0 2px rgb(0 0 0 / 0.6));
 }
 
+/* Safe-area offsets for floating controls (#24) — clear the notch / Dynamic
+ * Island / home indicator / rounded corners on phones (index.html sets
+ * viewport-fit=cover so the page draws under them). The insets are 0 on
+ * desktop, so these collapse to the base 0.75rem / 0.5rem there. */
+.sa-top {
+  top: calc(0.75rem + env(safe-area-inset-top));
+}
+.sa-bottom {
+  bottom: calc(0.75rem + env(safe-area-inset-bottom));
+}
+.sa-left {
+  left: calc(0.75rem + env(safe-area-inset-left));
+}
+.sa-right {
+  right: calc(0.75rem + env(safe-area-inset-right));
+}
+.sa-pt {
+  padding-top: calc(0.5rem + env(safe-area-inset-top));
+}
+
 /* Tooltip container — Leaflet adds .leaflet-tooltip; we hide its built-in
  * pseudo-element callout and let the per-row stripes carry faction colour
  * (rows live inside, one per distinct name). Padding goes on the rows so

From ba68aebd6fa2e75114ee8fdf174974fe93243ab7 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Wed, 3 Jun 2026 00:37:39 +0300
Subject: [PATCH 28/53] feat(map): right-click the map name to switch maps
 (#21)

A teleported context menu (same pattern as MapQuickMenu) listing all
visible maps with the current one checked. Wired on the overlay drag band
and the browser status pill; skipped on narrow phone viewports.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../overlay/components/MapSwitchMenu.vue      | 87 +++++++++++++++++++
 .../overlay/components/OverlayHeader.vue      | 19 +++-
 2 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 apps/client/src/features/overlay/components/MapSwitchMenu.vue

diff --git a/apps/client/src/features/overlay/components/MapSwitchMenu.vue b/apps/client/src/features/overlay/components/MapSwitchMenu.vue
new file mode 100644
index 0000000..b9426ac
--- /dev/null
+++ b/apps/client/src/features/overlay/components/MapSwitchMenu.vue
@@ -0,0 +1,87 @@
+<script setup lang="ts">
+import { VISIBLE_MAP_CODES, type TarkovMapCode } from '@shared/maps';
+import { useMapSettingsStore } from '@/features/map/store';
+import { useMapI18n } from '@/features/map/composables/useMapI18n';
+
+// Right-click-the-map-name → quick map switcher. Same teleported-popup pattern
+// as MapQuickMenu (open(x,y) / outside-click / Esc / blur dismissal).
+const { mapCode } = storeToRefs(useMapSettingsStore());
+const { localizedMapName } = useMapI18n();
+
+const position = ref<{ x: number; y: number } | null>(null);
+const panelRef = ref<HTMLElement | null>(null);
+
+const PANEL_W = 208;
+const PANEL_H = 360;
+const EDGE_GAP = 8;
+
+const maps = computed(() =>
+  VISIBLE_MAP_CODES.map((code) => ({ code, name: localizedMapName(code) })),
+);
+
+function open(x: number, y: number): void {
+  position.value = {
+    x: Math.max(EDGE_GAP, Math.min(x, window.innerWidth - PANEL_W - EDGE_GAP)),
+    y: Math.max(EDGE_GAP, Math.min(y, window.innerHeight - PANEL_H - EDGE_GAP)),
+  };
+}
+
+function close(): void {
+  position.value = null;
+}
+
+function select(code: TarkovMapCode): void {
+  mapCode.value = code;
+  close();
+}
+
+onClickOutside(panelRef, () => close());
+useEventListener(window, 'keydown', (e) => {
+  if (e.key === 'Escape' && position.value) close();
+});
+useEventListener(window, 'blur', () => close());
+useEventListener(document, 'visibilitychange', () => {
+  if (document.visibilityState === 'hidden') close();
+});
+
+defineExpose({ open, close });
+</script>
+
+<template>
+  <Teleport to="body">
+    <Transition
+      enter-active-class="transition duration-100 ease-out"
+      enter-from-class="opacity-0 scale-95"
+      enter-to-class="opacity-100 scale-100"
+      leave-active-class="transition duration-75 ease-in"
+      leave-from-class="opacity-100 scale-100"
+      leave-to-class="opacity-0 scale-95"
+    >
+      <div
+        v-if="position"
+        ref="panelRef"
+        class="fixed z-[2000] max-h-[80vh] w-52 origin-top-left overflow-y-auto rounded-md border border-surface-700 bg-surface-900/95 p-1 shadow-xl backdrop-blur"
+        :style="{ left: position.x + 'px', top: position.y + 'px' }"
+        role="menu"
+      >
+        <button
+          v-for="m in maps"
+          :key="m.code"
+          type="button"
+          role="menuitemradio"
+          :aria-checked="m.code === mapCode"
+          class="flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-sm hover:bg-surface-800"
+          :class="m.code === mapCode ? 'font-medium text-primary-400' : ''"
+          @click="select(m.code)"
+        >
+          <i
+            class="pi text-[10px]"
+            :class="m.code === mapCode ? 'pi-check' : 'pi-circle'"
+            aria-hidden="true"
+          />
+          <span class="truncate">{{ m.name }}</span>
+        </button>
+      </div>
+    </Transition>
+  </Teleport>
+</template>
diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 2f77704..a72b69f 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import SettingsPanel from '@/features/settings/SettingsPanel.vue';
+import MapSwitchMenu from './MapSwitchMenu.vue';
 import { isTauri } from '@/shared/tauri';
 import { useOverlayHeaderActive } from '../composables/useOverlayHeaderActive';
 import type { TransportStatus } from '@/features/server/composables/useServerTransport';
@@ -70,6 +71,15 @@ async function startDrag(event: MouseEvent): Promise<void> {
   const { getCurrentWindow } = await import('@tauri-apps/api/window');
   await getCurrentWindow().startDragging();
 }
+
+// Right-click the map name → quick map switcher. Overlay always; browser only
+// on a wide enough viewport (phones have no right-click, skip them).
+const mapMenu = ref<InstanceType<typeof MapSwitchMenu> | null>(null);
+const wideEnough = useMediaQuery('(min-width: 640px)');
+function openMapMenu(event: MouseEvent): void {
+  if (!isTauri && !wideEnough.value) return;
+  mapMenu.value?.open(event.clientX, event.clientY);
+}
 </script>
 
 <template>
@@ -86,6 +96,7 @@ async function startDrag(event: MouseEvent): Promise<void> {
     @mousedown="startDrag"
     @mouseenter="hovered = true"
     @mouseleave="hovered = false"
+    @contextmenu.prevent="openMapMenu"
   >
     <!-- Idle grabber nub (centred), cross-fades out when the bar is active. -->
     <div
@@ -147,10 +158,12 @@ async function startDrag(event: MouseEvent): Promise<void> {
     </span>
   </div>
 
-  <!-- BROWSER: no window drag — keep a static status + map name pill + settings. -->
+  <!-- BROWSER: no window drag — keep a static status + map name pill + settings.
+       Right-click the pill to switch maps (wide viewports only). -->
   <div v-else class="sa-top sa-right absolute z-[1000] flex items-center gap-2">
     <span
-      class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur pointer-events-none select-none"
+      class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur select-none"
+      @contextmenu.prevent="openMapMenu"
     >
       <i :class="['text-[10px]', statusIconClass]" :title="'ws: ' + status" aria-hidden="true" />
       <span>{{ mapDisplayName }}</span>
@@ -158,4 +171,6 @@ async function startDrag(event: MouseEvent): Promise<void> {
     </span>
     <SettingsPanel />
   </div>
+
+  <MapSwitchMenu ref="mapMenu" />
 </template>

From f5445d1506eab1de4ec4efa98dee0b4346738e58 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Wed, 3 Jun 2026 01:25:55 +0300
Subject: [PATCH 29/53] fix(extracts): bolder, larger edge arrows so they read
 on the map (#18)

Add a thick dark outline (paint-order: stroke) and bump the arrow to 22px
with a stronger drop-shadow. The thin filled arrows blended into the busy
map; the outline makes them legible on any background.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../features/map/layers/extracts/useEdgeIndicators.ts |  8 +++++---
 apps/client/src/styles.css                            | 11 +++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts b/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
index da37d0c..0a357d6 100644
--- a/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
+++ b/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
@@ -7,8 +7,8 @@ export interface EdgeArrow {
   color: string;
 }
 
-const MARGIN = 16; // px inset from the container edge
-const ARROW_PX = 18;
+const MARGIN = 18; // px inset from the container edge
+const ARROW_PX = 22;
 
 /**
  * Renders small arrows on the viewport edge pointing at off-screen extracts.
@@ -31,7 +31,9 @@ export function createEdgeIndicators(map: LeafletMap, getArrows: () => EdgeArrow
     if (!el) {
       el = document.createElement('div');
       el.className = 'edge-indicator';
-      el.innerHTML = `<svg viewBox="0 0 24 24" width="${ARROW_PX}" height="${ARROW_PX}" aria-hidden="true"><path d="M12 3 L20 19 L12 15 L4 19 Z" fill="currentColor"/></svg>`;
+      // Thick dark outline (drawn behind the fill via paint-order) so the
+      // small coloured arrow reads on any part of the busy map.
+      el.innerHTML = `<svg viewBox="0 0 24 24" width="${ARROW_PX}" height="${ARROW_PX}" aria-hidden="true"><path d="M12 3 L20 19 L12 15 L4 19 Z" fill="currentColor" stroke="#0a0b0d" stroke-width="3" stroke-linejoin="round" paint-order="stroke"/></svg>`;
       overlay.appendChild(el);
       pool[i] = el;
     }
diff --git a/apps/client/src/styles.css b/apps/client/src/styles.css
index cd7d2e6..3a9f41d 100644
--- a/apps/client/src/styles.css
+++ b/apps/client/src/styles.css
@@ -186,13 +186,12 @@ html.overlay-window #app {
 }
 .edge-indicator {
   position: absolute;
-  width: 18px;
-  height: 18px;
-  margin-left: -9px;
-  margin-top: -9px;
+  width: 22px;
+  height: 22px;
+  margin-left: -11px;
+  margin-top: -11px;
   transform-origin: center;
-  opacity: 0.9;
-  filter: drop-shadow(0 0 2px rgb(0 0 0 / 0.6));
+  filter: drop-shadow(0 0 3px rgb(0 0 0 / 0.85));
 }
 
 /* Safe-area offsets for floating controls (#24) — clear the notch / Dynamic

From 9271d3c327e5183dc7c7e05fc155b32d232e661d Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Wed, 3 Jun 2026 01:25:55 +0300
Subject: [PATCH 30/53] fix(ui): align clock with the status cluster; dvh
 height for iOS Safari

- The clock now sits in a 40px row (= the settings button height) so its
  centre lines up with the status/settings cluster across the top.
- Root height uses dvh instead of vh so iOS Safari's dynamic bottom bar
  no longer clips the floor switcher in portrait (landscape was already fine).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/App.vue                         |  2 +-
 .../src/features/tarkov-time/TarkovTimeChip.vue | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/client/src/App.vue b/apps/client/src/App.vue
index 5f1fc75..74dc4f9 100644
--- a/apps/client/src/App.vue
+++ b/apps/client/src/App.vue
@@ -77,7 +77,7 @@ function onMapContextMenu(event: MouseEvent): void {
   -->
   <PairingModal v-if="isTauri" />
   <div
-    class="relative h-screen w-screen text-surface-0"
+    class="relative h-dvh w-screen text-surface-0"
     :class="isTauri ? '' : 'bg-surface-950'"
     @contextmenu="onMapContextMenu"
   >
diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
index ee14045..7e1f5c5 100644
--- a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -21,14 +21,21 @@ const { active: headerActive } = useOverlayHeaderActive();
   <!-- Slide via transform (composited), not `top` (layout) — matches the
        header's transform/opacity reveal so the two move in lockstep.
        translate-y-11 (44px) lands it at top-14 from the top-3 base. -->
+  <!-- Outer wrapper is a 40px-tall flex row (= the settings button height) so
+       the pill's vertical centre lines up with the status/settings cluster on
+       the opposite corner; both anchor at the same safe-area top. -->
   <div
-    class="sa-top sa-left pointer-events-none absolute z-[1000] inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur transition-transform duration-200 ease-out select-none"
+    class="sa-top sa-left pointer-events-none absolute z-[1000] flex h-10 items-center transition-transform duration-200 ease-out"
     :class="headerActive ? 'translate-y-11' : 'translate-y-0'"
     aria-hidden="true"
   >
-    <i class="pi pi-clock text-[10px] opacity-70" />
-    <span>{{ clock.left }}</span>
-    <span class="opacity-40">/</span>
-    <span>{{ clock.right }}</span>
+    <span
+      class="inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur select-none"
+    >
+      <i class="pi pi-clock text-[10px] opacity-70" />
+      <span>{{ clock.left }}</span>
+      <span class="opacity-40">/</span>
+      <span>{{ clock.right }}</span>
+    </span>
   </div>
 </template>

From 3712e64bd1bc90651c7ca13f337f2401315d0c43 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Thu, 4 Jun 2026 23:06:13 +0300
Subject: [PATCH 31/53] feat(settings): tabbed drawer with collapsible
 accordion sections (#13)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reorganize the settings Drawer into two tabs — Layers (map/extracts/player/
airdrop) and Settings (overlay/hotkeys/language/paths/pairing) — each a
PrimeVue Accordion of collapsible sections instead of a flat Fieldset stack.

- registry: SectionGroup is now layers|settings; sections carry a titleKey
  for the accordion header (the per-section Fieldset legend is dropped).
- SettingsPanel: Tabs + per-tab Accordion (multiple). Expanded panels persist
  per tab; desktop opens all by default, mobile starts collapsed to keep the
  drawer short.
- sections: drop the Fieldset wrapper and render bare content.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/components.d.ts               |   9 ++
 apps/client/src/features/airdrop/settings.ts  |   3 +-
 apps/client/src/features/hotkeys/settings.ts  |   5 +-
 apps/client/src/features/i18n/locales/en.json |   4 +
 apps/client/src/features/i18n/locales/ru.json |   4 +
 apps/client/src/features/i18n/settings.ts     |   8 +-
 apps/client/src/features/map/settings.ts      |  24 ++++-
 apps/client/src/features/overlay/settings.ts  |  16 +--
 apps/client/src/features/server/settings.ts   |   5 +-
 .../src/features/settings/SettingsPanel.vue   |  73 ++++++++++---
 apps/client/src/features/settings/registry.ts |  10 +-
 .../settings/sections/AirdropSection.vue      |  30 +++---
 .../settings/sections/ExtractsSection.vue     |  10 +-
 .../settings/sections/HotkeysSection.vue      |  66 ++++++------
 .../settings/sections/LanguageSection.vue     |  20 ++--
 .../features/settings/sections/MapSection.vue |  30 +++---
 .../settings/sections/OverlaySection.vue      | 100 +++++++++---------
 .../settings/sections/PairingSection.vue      |   4 +-
 .../settings/sections/PathsSection.vue        |   4 +-
 .../settings/sections/PlayerSection.vue       |   4 +-
 20 files changed, 256 insertions(+), 173 deletions(-)

diff --git a/apps/client/src/components.d.ts b/apps/client/src/components.d.ts
index 3496969..8f3d357 100644
--- a/apps/client/src/components.d.ts
+++ b/apps/client/src/components.d.ts
@@ -11,6 +11,10 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
+    Accordion: typeof import('primevue/accordion')['default']
+    AccordionContent: typeof import('primevue/accordioncontent')['default']
+    AccordionHeader: typeof import('primevue/accordionheader')['default']
+    AccordionPanel: typeof import('primevue/accordionpanel')['default']
     Button: typeof import('primevue/button')['default']
     Checkbox: typeof import('primevue/checkbox')['default']
     ConfirmDialog: typeof import('primevue/confirmdialog')['default']
@@ -26,6 +30,11 @@ declare module 'vue' {
     Select: typeof import('primevue/select')['default']
     SelectButton: typeof import('primevue/selectbutton')['default']
     Slider: typeof import('primevue/slider')['default']
+    Tab: typeof import('primevue/tab')['default']
+    TabList: typeof import('primevue/tablist')['default']
+    TabPanel: typeof import('primevue/tabpanel')['default']
+    TabPanels: typeof import('primevue/tabpanels')['default']
+    Tabs: typeof import('primevue/tabs')['default']
     ToggleSwitch: typeof import('primevue/toggleswitch')['default']
   }
 }
diff --git a/apps/client/src/features/airdrop/settings.ts b/apps/client/src/features/airdrop/settings.ts
index 2b7ca05..2eb8032 100644
--- a/apps/client/src/features/airdrop/settings.ts
+++ b/apps/client/src/features/airdrop/settings.ts
@@ -3,8 +3,9 @@ import AirdropSection from '@/features/settings/sections/AirdropSection.vue';
 
 registerSettingsSection({
   id: 'airdrop',
-  group: 'main',
+  group: 'layers',
   order: 40,
   visible: 'tauri',
+  titleKey: 'airdrop.settingsHeading',
   component: AirdropSection,
 });
diff --git a/apps/client/src/features/hotkeys/settings.ts b/apps/client/src/features/hotkeys/settings.ts
index 266be1a..ff18ef5 100644
--- a/apps/client/src/features/hotkeys/settings.ts
+++ b/apps/client/src/features/hotkeys/settings.ts
@@ -3,11 +3,12 @@ import HotkeysSection from '@/features/settings/sections/HotkeysSection.vue';
 
 registerSettingsSection({
   id: 'hotkeys',
-  group: 'main',
-  order: 60,
+  group: 'settings',
+  order: 20,
   // Shown on the desktop browser + overlay (both have a keyboard), hidden on
   // phones. The combos are backend-owned now — configurable from any desktop
   // browser, fired globally for every client via the `command` event.
   visible: 'desktop-or-tauri',
+  titleKey: 'hotkeys.heading',
   component: HotkeysSection,
 });
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index ef593d7..d59bf37 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -29,6 +29,10 @@
     "lg": "L"
   },
   "settings": "Settings",
+  "settingsTabs": {
+    "layers": "Layers",
+    "settings": "Settings"
+  },
   "close": "Close",
   "systemSection": "System",
   "floor": "Floor",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 1fb7b17..165920b 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -29,6 +29,10 @@
     "lg": "L"
   },
   "settings": "Настройки",
+  "settingsTabs": {
+    "layers": "Слои",
+    "settings": "Настройки"
+  },
   "close": "Закрыть",
   "systemSection": "Системные",
   "floor": "Уровень",
diff --git a/apps/client/src/features/i18n/settings.ts b/apps/client/src/features/i18n/settings.ts
index e4ad521..49b1fd3 100644
--- a/apps/client/src/features/i18n/settings.ts
+++ b/apps/client/src/features/i18n/settings.ts
@@ -1,4 +1,10 @@
 import { registerSettingsSection } from '@/features/settings/registry';
 import LanguageSection from '@/features/settings/sections/LanguageSection.vue';
 
-registerSettingsSection({ id: 'language', group: 'system', order: 10, component: LanguageSection });
+registerSettingsSection({
+  id: 'language',
+  group: 'settings',
+  order: 30,
+  titleKey: 'language',
+  component: LanguageSection,
+});
diff --git a/apps/client/src/features/map/settings.ts b/apps/client/src/features/map/settings.ts
index 8907cdb..93febc9 100644
--- a/apps/client/src/features/map/settings.ts
+++ b/apps/client/src/features/map/settings.ts
@@ -3,6 +3,24 @@ import MapSection from '@/features/settings/sections/MapSection.vue';
 import ExtractsSection from '@/features/settings/sections/ExtractsSection.vue';
 import PlayerSection from '@/features/settings/sections/PlayerSection.vue';
 
-registerSettingsSection({ id: 'map', group: 'main', order: 10, component: MapSection });
-registerSettingsSection({ id: 'extracts', group: 'main', order: 20, component: ExtractsSection });
-registerSettingsSection({ id: 'player', group: 'main', order: 30, component: PlayerSection });
+registerSettingsSection({
+  id: 'map',
+  group: 'layers',
+  order: 10,
+  titleKey: 'map',
+  component: MapSection,
+});
+registerSettingsSection({
+  id: 'extracts',
+  group: 'layers',
+  order: 20,
+  titleKey: 'extracts',
+  component: ExtractsSection,
+});
+registerSettingsSection({
+  id: 'player',
+  group: 'layers',
+  order: 30,
+  titleKey: 'player',
+  component: PlayerSection,
+});
diff --git a/apps/client/src/features/overlay/settings.ts b/apps/client/src/features/overlay/settings.ts
index e1af2be..909371d 100644
--- a/apps/client/src/features/overlay/settings.ts
+++ b/apps/client/src/features/overlay/settings.ts
@@ -4,19 +4,21 @@ import PairingSection from '@/features/settings/sections/PairingSection.vue';
 
 registerSettingsSection({
   id: 'overlay',
-  group: 'main',
-  order: 50,
+  group: 'settings',
+  order: 10,
   visible: 'tauri',
+  titleKey: 'overlay.heading',
   component: OverlaySection,
 });
 
-// Pairing lives in system: it's a host-level action ("hand out QR to my
-// phone"), not a per-overlay preference. Tauri-only — pairing_qr is an
-// IPC command, and pairing yourself from a phone makes no sense.
+// Pairing is a host-level action ("hand out QR to my phone"), not a per-overlay
+// preference. Tauri-only — pairing_qr is an IPC command, and pairing yourself
+// from a phone makes no sense.
 registerSettingsSection({
   id: 'pairing',
-  group: 'system',
-  order: 30,
+  group: 'settings',
+  order: 50,
   visible: 'tauri',
+  titleKey: 'pairing.heading',
   component: PairingSection,
 });
diff --git a/apps/client/src/features/server/settings.ts b/apps/client/src/features/server/settings.ts
index effe9af..8365067 100644
--- a/apps/client/src/features/server/settings.ts
+++ b/apps/client/src/features/server/settings.ts
@@ -3,8 +3,9 @@ import PathsSection from '@/features/settings/sections/PathsSection.vue';
 
 registerSettingsSection({
   id: 'paths',
-  group: 'system',
-  order: 20,
+  group: 'settings',
+  order: 40,
   visible: 'desktop-or-tauri',
+  titleKey: 'paths.heading',
   component: PathsSection,
 });
diff --git a/apps/client/src/features/settings/SettingsPanel.vue b/apps/client/src/features/settings/SettingsPanel.vue
index 66fa41d..ad20963 100644
--- a/apps/client/src/features/settings/SettingsPanel.vue
+++ b/apps/client/src/features/settings/SettingsPanel.vue
@@ -1,11 +1,40 @@
 <script setup lang="ts">
+import { z } from 'zod';
 import { useSettingsSections } from './registry';
+import { persistedRef } from '@/shared/persisted-store';
 
 const { t } = useI18n();
-const mainSections = useSettingsSections('main');
-const systemSections = useSettingsSections('system');
+const layersSections = useSettingsSections('layers');
+const settingsSections = useSettingsSections('settings');
 const open = ref(false);
 const isDesktop = useMediaQuery('(min-width: 640px)');
+
+// Only surface a tab that actually has visible sections — e.g. on a phone the
+// Settings tab keeps just Language, while overlay/hotkeys/paths/pairing are
+// desktop/overlay-only and filtered out by the registry.
+const tabs = computed(() =>
+  [
+    { value: 'layers', label: t('settingsTabs.layers'), sections: layersSections.value },
+    { value: 'settings', label: t('settingsTabs.settings'), sections: settingsSections.value },
+  ].filter((tab) => tab.sections.length > 0),
+);
+
+const activeTab = persistedRef('tc.settings.tab', z.enum(['layers', 'settings']), 'layers');
+
+// Expanded accordion panels per tab. Desktop opens every section by default so
+// all controls are visible at a glance; on a phone they start collapsed to keep
+// the drawer short. The default is snapshotted once from the section ids — after
+// that the user's expand/collapse choices persist.
+const openLayers = persistedRef(
+  'tc.settings.open.layers',
+  z.array(z.string()),
+  isDesktop.value ? layersSections.value.map((s) => s.id) : [],
+);
+const openSettings = persistedRef(
+  'tc.settings.open.settings',
+  z.array(z.string()),
+  isDesktop.value ? settingsSections.value.map((s) => s.id) : [],
+);
 </script>
 
 <template>
@@ -43,18 +72,32 @@ const isDesktop = useMediaQuery('(min-width: 640px)');
     :header="t('settings')"
     :class="isDesktop ? '!w-[26rem]' : ''"
   >
-    <div class="space-y-4">
-      <component :is="sec.component" v-for="sec in mainSections" :key="sec.id" />
-
-      <div v-if="systemSections.length" class="pt-2 mt-2 border-t border-surface-700">
-        <p class="mb-3 text-[10px] font-semibold uppercase tracking-wider opacity-70">
-          {{ t('systemSection') }}
-        </p>
-
-        <div class="space-y-4">
-          <component :is="sec.component" v-for="sec in systemSections" :key="sec.id" />
-        </div>
-      </div>
-    </div>
+    <Tabs v-model:value="activeTab">
+      <TabList>
+        <Tab v-for="tab in tabs" :key="tab.value" :value="tab.value">{{ tab.label }}</Tab>
+      </TabList>
+      <TabPanels class="!px-0">
+        <TabPanel value="layers" class="!px-0 !pb-0">
+          <Accordion v-model:value="openLayers" multiple>
+            <AccordionPanel v-for="sec in layersSections" :key="sec.id" :value="sec.id">
+              <AccordionHeader>{{ t(sec.titleKey) }}</AccordionHeader>
+              <AccordionContent>
+                <component :is="sec.component" />
+              </AccordionContent>
+            </AccordionPanel>
+          </Accordion>
+        </TabPanel>
+        <TabPanel value="settings" class="!px-0 !pb-0">
+          <Accordion v-model:value="openSettings" multiple>
+            <AccordionPanel v-for="sec in settingsSections" :key="sec.id" :value="sec.id">
+              <AccordionHeader>{{ t(sec.titleKey) }}</AccordionHeader>
+              <AccordionContent>
+                <component :is="sec.component" />
+              </AccordionContent>
+            </AccordionPanel>
+          </Accordion>
+        </TabPanel>
+      </TabPanels>
+    </Tabs>
   </Drawer>
 </template>
diff --git a/apps/client/src/features/settings/registry.ts b/apps/client/src/features/settings/registry.ts
index 41356dd..7cdae48 100644
--- a/apps/client/src/features/settings/registry.ts
+++ b/apps/client/src/features/settings/registry.ts
@@ -2,16 +2,20 @@ import { computed, shallowReactive, type ComputedRef, type Component } from 'vue
 import { useMediaQuery } from '@vueuse/core';
 import { isTauri } from '@/shared/tauri';
 
-export type SectionGroup = 'main' | 'system';
+export type SectionGroup = 'layers' | 'settings';
 export type SectionVisibility = 'always' | 'tauri' | 'desktop-or-tauri';
 
 export interface SettingsSection {
   id: string;
+  /** Which drawer tab the section lives under: `layers` (what's drawn on the
+   * map) or `settings` (app/system preferences). */
   group: SectionGroup;
   /** Ascending; use multiples of 10 so future insertions fit between existing entries.
-   * main: 10 map, 20 extracts, 30 player, 40 airdrop, 50 overlay, 60 hotkeys
-   * system: 10 language, 20 paths, 30 pairing */
+   * layers: 10 map, 20 extracts, 30 player, 40 airdrop
+   * settings: 10 overlay, 20 hotkeys, 30 language, 40 paths, 50 pairing */
   order: number;
+  /** i18n key for the accordion header label (the section title). */
+  titleKey: string;
   visible?: SectionVisibility;
   /** Sync `Component` or `defineAsyncComponent(() => import('...'))` —
    *  Vue resolves both. */
diff --git a/apps/client/src/features/settings/sections/AirdropSection.vue b/apps/client/src/features/settings/sections/AirdropSection.vue
index 114b03b..b788ea8 100644
--- a/apps/client/src/features/settings/sections/AirdropSection.vue
+++ b/apps/client/src/features/settings/sections/AirdropSection.vue
@@ -6,21 +6,19 @@ const { t } = useI18n();
 </script>
 
 <template>
-  <Fieldset :legend="t('airdrop.settingsHeading')">
-    <div>
-      <div class="mb-1.5 flex items-center justify-between gap-3">
-        <label class="text-xs opacity-70" for="airdrop-radius">{{ t('airdrop.radius') }}</label>
-        <span class="text-xs tabular-nums opacity-70">{{ dropMarkerRadius }}m</span>
-      </div>
-      <Slider
-        v-model="dropMarkerRadius"
-        :min="DROP_MARKER_RADIUS_RANGE.min"
-        :max="DROP_MARKER_RADIUS_RANGE.max"
-        :step="1"
-        input-id="airdrop-radius"
-        class="w-full"
-      />
-      <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('airdrop.radiusHint') }}</p>
+  <div>
+    <div class="mb-1.5 flex items-center justify-between gap-3">
+      <label class="text-xs opacity-70" for="airdrop-radius">{{ t('airdrop.radius') }}</label>
+      <span class="text-xs tabular-nums opacity-70">{{ dropMarkerRadius }}m</span>
     </div>
-  </Fieldset>
+    <Slider
+      v-model="dropMarkerRadius"
+      :min="DROP_MARKER_RADIUS_RANGE.min"
+      :max="DROP_MARKER_RADIUS_RANGE.max"
+      :step="1"
+      input-id="airdrop-radius"
+      class="w-full"
+    />
+    <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('airdrop.radiusHint') }}</p>
+  </div>
 </template>
diff --git a/apps/client/src/features/settings/sections/ExtractsSection.vue b/apps/client/src/features/settings/sections/ExtractsSection.vue
index 880e1f3..188e7c0 100644
--- a/apps/client/src/features/settings/sections/ExtractsSection.vue
+++ b/apps/client/src/features/settings/sections/ExtractsSection.vue
@@ -28,7 +28,7 @@ const labelSizeOptions = computed(() => [
 </script>
 
 <template>
-  <Fieldset :legend="t('extracts')">
+  <div class="space-y-3">
     <div class="flex flex-col gap-1">
       <label
         v-for="opt in FACTION_OPTIONS"
@@ -41,7 +41,7 @@ const labelSizeOptions = computed(() => [
       </label>
     </div>
 
-    <div class="mt-3">
+    <div>
       <p class="mb-1.5 text-xs opacity-60">{{ t('labels') }}</p>
       <SelectButton
         v-model="extractLabelMode"
@@ -55,7 +55,7 @@ const labelSizeOptions = computed(() => [
       <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('labelHint') }}</p>
     </div>
 
-    <div class="mt-3">
+    <div>
       <p class="mb-1.5 text-xs opacity-60">{{ t('labelSize') }}</p>
       <SelectButton
         v-model="extractLabelSize"
@@ -68,12 +68,12 @@ const labelSizeOptions = computed(() => [
       />
     </div>
 
-    <div class="mt-3">
+    <div>
       <div class="flex items-center justify-between gap-3">
         <label class="text-sm" for="extract-edge-indicators">{{ t('edgeIndicators') }}</label>
         <ToggleSwitch v-model="edgeIndicators" input-id="extract-edge-indicators" />
       </div>
       <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('edgeIndicatorsHint') }}</p>
     </div>
-  </Fieldset>
+  </div>
 </template>
diff --git a/apps/client/src/features/settings/sections/HotkeysSection.vue b/apps/client/src/features/settings/sections/HotkeysSection.vue
index 3299723..3dd0caa 100644
--- a/apps/client/src/features/settings/sections/HotkeysSection.vue
+++ b/apps/client/src/features/settings/sections/HotkeysSection.vue
@@ -18,38 +18,36 @@ function onAction(field: keyof HotkeyConfig, combo: string): void {
 </script>
 
 <template>
-  <Fieldset :legend="t('hotkeys.heading')">
-    <div class="space-y-3">
-      <!-- Lock is overlay-only (no window to lock in a browser). -->
-      <HotkeyRecorder v-if="isTauri" v-model="lockHotkey" :label="t('hotkeys.lock')" />
-      <HotkeyRecorder
-        :model-value="zoomInHotkey"
-        :label="t('hotkeys.zoomIn')"
-        @update:model-value="onAction('zoomIn', $event)"
-      />
-      <HotkeyRecorder
-        :model-value="zoomOutHotkey"
-        :label="t('hotkeys.zoomOut')"
-        @update:model-value="onAction('zoomOut', $event)"
-      />
-      <HotkeyRecorder
-        :model-value="floorUpHotkey"
-        :label="t('hotkeys.floorUp')"
-        @update:model-value="onAction('floorUp', $event)"
-      />
-      <HotkeyRecorder
-        :model-value="floorDownHotkey"
-        :label="t('hotkeys.floorDown')"
-        @update:model-value="onAction('floorDown', $event)"
-      />
-      <HotkeyRecorder
-        :model-value="airdropHotkey"
-        :label="t('hotkeys.airdrop')"
-        @update:model-value="onAction('airdrop', $event)"
-      />
-      <p v-if="isTauri" class="text-[10px] leading-relaxed opacity-70">
-        {{ t('hotkeys.lockHint') }}
-      </p>
-    </div>
-  </Fieldset>
+  <div class="space-y-3">
+    <!-- Lock is overlay-only (no window to lock in a browser). -->
+    <HotkeyRecorder v-if="isTauri" v-model="lockHotkey" :label="t('hotkeys.lock')" />
+    <HotkeyRecorder
+      :model-value="zoomInHotkey"
+      :label="t('hotkeys.zoomIn')"
+      @update:model-value="onAction('zoomIn', $event)"
+    />
+    <HotkeyRecorder
+      :model-value="zoomOutHotkey"
+      :label="t('hotkeys.zoomOut')"
+      @update:model-value="onAction('zoomOut', $event)"
+    />
+    <HotkeyRecorder
+      :model-value="floorUpHotkey"
+      :label="t('hotkeys.floorUp')"
+      @update:model-value="onAction('floorUp', $event)"
+    />
+    <HotkeyRecorder
+      :model-value="floorDownHotkey"
+      :label="t('hotkeys.floorDown')"
+      @update:model-value="onAction('floorDown', $event)"
+    />
+    <HotkeyRecorder
+      :model-value="airdropHotkey"
+      :label="t('hotkeys.airdrop')"
+      @update:model-value="onAction('airdrop', $event)"
+    />
+    <p v-if="isTauri" class="text-[10px] leading-relaxed opacity-70">
+      {{ t('hotkeys.lockHint') }}
+    </p>
+  </div>
 </template>
diff --git a/apps/client/src/features/settings/sections/LanguageSection.vue b/apps/client/src/features/settings/sections/LanguageSection.vue
index e67ac92..2a33c0d 100644
--- a/apps/client/src/features/settings/sections/LanguageSection.vue
+++ b/apps/client/src/features/settings/sections/LanguageSection.vue
@@ -11,15 +11,13 @@ const langOptions = computed(() => [
 </script>
 
 <template>
-  <Fieldset :legend="t('language')">
-    <SelectButton
-      v-model="apiLang"
-      :options="langOptions"
-      option-label="label"
-      option-value="value"
-      :allow-empty="false"
-      :aria-label="t('language')"
-      fluid
-    />
-  </Fieldset>
+  <SelectButton
+    v-model="apiLang"
+    :options="langOptions"
+    option-label="label"
+    option-value="value"
+    :allow-empty="false"
+    :aria-label="t('language')"
+    fluid
+  />
 </template>
diff --git a/apps/client/src/features/settings/sections/MapSection.vue b/apps/client/src/features/settings/sections/MapSection.vue
index 957d51f..3f81e15 100644
--- a/apps/client/src/features/settings/sections/MapSection.vue
+++ b/apps/client/src/features/settings/sections/MapSection.vue
@@ -13,21 +13,19 @@ const mapOptions = computed(() =>
 </script>
 
 <template>
-  <Fieldset :legend="t('map')">
-    <div class="space-y-3">
-      <Select
-        v-model="mapCode"
-        :options="mapOptions"
-        option-label="label"
-        option-value="value"
-        :aria-label="t('map')"
-        fluid
-      />
-      <div class="flex items-center justify-between gap-3">
-        <label class="text-sm" for="map-auto-switch">{{ t('autoMapSwitch') }}</label>
-        <ToggleSwitch v-model="autoMapSwitch" input-id="map-auto-switch" />
-      </div>
-      <p class="text-[10px] leading-relaxed opacity-70">{{ t('autoMapSwitchHint') }}</p>
+  <div class="space-y-3">
+    <Select
+      v-model="mapCode"
+      :options="mapOptions"
+      option-label="label"
+      option-value="value"
+      :aria-label="t('map')"
+      fluid
+    />
+    <div class="flex items-center justify-between gap-3">
+      <label class="text-sm" for="map-auto-switch">{{ t('autoMapSwitch') }}</label>
+      <ToggleSwitch v-model="autoMapSwitch" input-id="map-auto-switch" />
     </div>
-  </Fieldset>
+    <p class="text-[10px] leading-relaxed opacity-70">{{ t('autoMapSwitchHint') }}</p>
+  </div>
 </template>
diff --git a/apps/client/src/features/settings/sections/OverlaySection.vue b/apps/client/src/features/settings/sections/OverlaySection.vue
index 580d710..24b40a1 100644
--- a/apps/client/src/features/settings/sections/OverlaySection.vue
+++ b/apps/client/src/features/settings/sections/OverlaySection.vue
@@ -15,61 +15,59 @@ const overlayZoomOptions = computed(() => [
 </script>
 
 <template>
-  <Fieldset :legend="t('overlay.heading')">
-    <div class="space-y-3">
-      <div class="flex items-center justify-between gap-3">
-        <label class="text-sm" for="overlay-always-on-top">{{ t('overlay.alwaysOnTop') }}</label>
-        <ToggleSwitch v-model="overlayAlwaysOnTop" input-id="overlay-always-on-top" />
-      </div>
+  <div class="space-y-3">
+    <div class="flex items-center justify-between gap-3">
+      <label class="text-sm" for="overlay-always-on-top">{{ t('overlay.alwaysOnTop') }}</label>
+      <ToggleSwitch v-model="overlayAlwaysOnTop" input-id="overlay-always-on-top" />
+    </div>
 
-      <div>
-        <div class="mb-1.5 flex items-center justify-between gap-3">
-          <label class="text-xs opacity-70" for="overlay-opacity">{{ t('overlay.opacity') }}</label>
-          <span class="text-xs tabular-nums opacity-70">{{ opacityPercent }}%</span>
-        </div>
-        <Slider
-          v-model="opacityPercent"
-          :min="30"
-          :max="100"
-          :step="5"
-          input-id="overlay-opacity"
-          class="w-full"
-        />
+    <div>
+      <div class="mb-1.5 flex items-center justify-between gap-3">
+        <label class="text-xs opacity-70" for="overlay-opacity">{{ t('overlay.opacity') }}</label>
+        <span class="text-xs tabular-nums opacity-70">{{ opacityPercent }}%</span>
       </div>
+      <Slider
+        v-model="opacityPercent"
+        :min="30"
+        :max="100"
+        :step="5"
+        input-id="overlay-opacity"
+        class="w-full"
+      />
+    </div>
 
-      <div :class="mapOpacityDisabled ? 'opacity-50' : ''">
-        <div class="mb-1.5 flex items-center justify-between gap-3">
-          <label class="text-xs opacity-70" for="overlay-map-opacity">
-            {{ t('overlay.mapOpacity') }}
-          </label>
-          <span class="text-xs tabular-nums opacity-70">{{ mapOpacityPercent }}%</span>
-        </div>
-        <Slider
-          v-model="mapOpacityPercent"
-          :min="0"
-          :max="100"
-          :step="5"
-          :disabled="mapOpacityDisabled"
-          input-id="overlay-map-opacity"
-          class="w-full"
-        />
-        <p v-if="mapOpacityDisabled" class="mt-1.5 text-[10px] leading-relaxed opacity-70">
-          {{ t('overlay.mapOpacityHint') }}
-        </p>
+    <div :class="mapOpacityDisabled ? 'opacity-50' : ''">
+      <div class="mb-1.5 flex items-center justify-between gap-3">
+        <label class="text-xs opacity-70" for="overlay-map-opacity">
+          {{ t('overlay.mapOpacity') }}
+        </label>
+        <span class="text-xs tabular-nums opacity-70">{{ mapOpacityPercent }}%</span>
       </div>
+      <Slider
+        v-model="mapOpacityPercent"
+        :min="0"
+        :max="100"
+        :step="5"
+        :disabled="mapOpacityDisabled"
+        input-id="overlay-map-opacity"
+        class="w-full"
+      />
+      <p v-if="mapOpacityDisabled" class="mt-1.5 text-[10px] leading-relaxed opacity-70">
+        {{ t('overlay.mapOpacityHint') }}
+      </p>
+    </div>
 
-      <div>
-        <p class="mb-1.5 text-xs opacity-60">{{ t('overlay.zoom') }}</p>
-        <SelectButton
-          v-model="overlayZoom"
-          :options="overlayZoomOptions"
-          option-label="label"
-          option-value="value"
-          :allow-empty="false"
-          size="small"
-          fluid
-        />
-      </div>
+    <div>
+      <p class="mb-1.5 text-xs opacity-60">{{ t('overlay.zoom') }}</p>
+      <SelectButton
+        v-model="overlayZoom"
+        :options="overlayZoomOptions"
+        option-label="label"
+        option-value="value"
+        :allow-empty="false"
+        size="small"
+        fluid
+      />
     </div>
-  </Fieldset>
+  </div>
 </template>
diff --git a/apps/client/src/features/settings/sections/PairingSection.vue b/apps/client/src/features/settings/sections/PairingSection.vue
index 753d4ee..b9b1b88 100644
--- a/apps/client/src/features/settings/sections/PairingSection.vue
+++ b/apps/client/src/features/settings/sections/PairingSection.vue
@@ -15,7 +15,7 @@ const { t } = useI18n();
 </script>
 
 <template>
-  <Fieldset :legend="t('pairing.heading')">
+  <div>
     <p class="text-xs opacity-70 mb-3 leading-snug">{{ t('pairing.sectionHint') }}</p>
     <Button
       :label="t('pairing.open')"
@@ -24,5 +24,5 @@ const { t } = useI18n();
       class="w-full"
       @click="pairingModalOpen = true"
     />
-  </Fieldset>
+  </div>
 </template>
diff --git a/apps/client/src/features/settings/sections/PathsSection.vue b/apps/client/src/features/settings/sections/PathsSection.vue
index 058f64f..167db02 100644
--- a/apps/client/src/features/settings/sections/PathsSection.vue
+++ b/apps/client/src/features/settings/sections/PathsSection.vue
@@ -25,7 +25,7 @@ const {
 </script>
 
 <template>
-  <Fieldset :legend="t('paths.heading')">
+  <div class="space-y-3">
     <Message
       v-if="pathsError"
       :severity="pathsError.kind === 'no-helper' ? 'warn' : 'error'"
@@ -105,5 +105,5 @@ const {
         {{ t('paths.mobileHint') }}
       </p>
     </div>
-  </Fieldset>
+  </div>
 </template>
diff --git a/apps/client/src/features/settings/sections/PlayerSection.vue b/apps/client/src/features/settings/sections/PlayerSection.vue
index 7731caf..fb8a1bb 100644
--- a/apps/client/src/features/settings/sections/PlayerSection.vue
+++ b/apps/client/src/features/settings/sections/PlayerSection.vue
@@ -14,7 +14,7 @@ const playerFollowOptions = computed(() => [
 </script>
 
 <template>
-  <Fieldset :legend="t('player')">
+  <div>
     <p class="mb-1.5 text-xs opacity-60">{{ t('playerFollow') }}</p>
     <SelectButton
       v-model="playerFollow"
@@ -26,5 +26,5 @@ const playerFollowOptions = computed(() => [
       fluid
     />
     <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('playerFollowHint') }}</p>
-  </Fieldset>
+  </div>
 </template>

From e51d191063ab869c56c377a9b56e675e42305b74 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Thu, 4 Jun 2026 23:33:04 +0300
Subject: [PATCH 32/53] feat(settings): non-modal live-preview drawer + mobile
 bottom-sheet (#19)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The settings drawer is now non-modal so the map stays bright and interactive
behind it — toggling a layer (extracts/labels/follow/edge arrows) previews on
the map in real time instead of being hidden behind a dimming mask.

On phones the drawer becomes a bottom-sheet: auto height that hugs its content
(capped at 85dvh with internal scroll, rounded top) so the map peeks above and
the live preview stays visible. Desktop keeps the right-side panel.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/settings/SettingsPanel.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/client/src/features/settings/SettingsPanel.vue b/apps/client/src/features/settings/SettingsPanel.vue
index ad20963..6671bf5 100644
--- a/apps/client/src/features/settings/SettingsPanel.vue
+++ b/apps/client/src/features/settings/SettingsPanel.vue
@@ -66,11 +66,17 @@ const openSettings = persistedRef(
     </template>
   </Button>
 
+  <!-- Non-modal so the map stays bright and live behind the drawer: toggling a
+       layer (extracts, labels, follow, edge arrows) is previewed in real time.
+       Mobile uses a bottom-sheet (auto height, capped) that hugs its content so
+       the map peeks above it; desktop keeps the right-side panel. -->
   <Drawer
     v-model:visible="open"
-    :position="isDesktop ? 'right' : 'full'"
+    :modal="false"
+    :dismissable="false"
+    :position="isDesktop ? 'right' : 'bottom'"
     :header="t('settings')"
-    :class="isDesktop ? '!w-[26rem]' : ''"
+    :class="isDesktop ? '!w-[26rem]' : '!h-auto !max-h-[85dvh] !rounded-t-2xl'"
   >
     <Tabs v-model:value="activeTab">
       <TabList>

From 6c82ba023c3b4a9a5a7426bb13e0f2a7403fc8fa Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 5 Jun 2026 00:07:50 +0300
Subject: [PATCH 33/53] feat(overlay): minimize-to-tray option for the close
 button (#9)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add an opt-in "minimize to tray" overlay setting. When enabled, the ✕ button
hides the window to the system tray and keeps the app running (no confirm,
since it's reversible) instead of quitting; the tray's Show restores it and
Quit exits. Default off keeps the ✕ as a confirmed quit.

- overlay store: minimizeToTray persistedRef (tc.overlay.minimizeToTray).
- useCloseConfirm: branch to window.hide() when the flag is on.
- OverlaySection: toggle + hint; i18n keys (en/ru).
- capabilities: grant core:window:allow-hide.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/i18n/locales/en.json |  2 ++
 apps/client/src/features/i18n/locales/ru.json |  2 ++
 .../overlay/composables/useCloseConfirm.ts    | 20 +++++++++++++++----
 apps/client/src/features/overlay/store.ts     |  7 ++++++-
 .../settings/sections/OverlaySection.vue      | 16 ++++++++++++++-
 .../src-tauri/capabilities/default.json       |  1 +
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index d59bf37..71d62de 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -67,6 +67,8 @@
   "overlay": {
     "heading": "Overlay",
     "alwaysOnTop": "Always on top",
+    "minimizeToTray": "Minimize to tray",
+    "minimizeToTrayHint": "Closing the window hides it to the system tray and keeps it running. Restore or quit from the tray icon.",
     "clickThrough": "Click-through",
     "clickThroughWarning": "Once enabled, you can't click the window. Restart the app to re-enable interaction.",
     "opacity": "Opacity",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 165920b..73fe7cc 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -67,6 +67,8 @@
   "overlay": {
     "heading": "Оверлей",
     "alwaysOnTop": "Поверх всех окон",
+    "minimizeToTray": "Сворачивать в трей",
+    "minimizeToTrayHint": "При закрытии окно прячется в системный трей и продолжает работать. Развернуть или выйти — через значок в трее.",
     "clickThrough": "Прозрачное для кликов",
     "clickThroughWarning": "После включения окно перестанет реагировать на мышь. Чтобы вернуть взаимодействие — перезапусти приложение.",
     "opacity": "Прозрачность",
diff --git a/apps/client/src/features/overlay/composables/useCloseConfirm.ts b/apps/client/src/features/overlay/composables/useCloseConfirm.ts
index eab1a7b..a5777ff 100644
--- a/apps/client/src/features/overlay/composables/useCloseConfirm.ts
+++ b/apps/client/src/features/overlay/composables/useCloseConfirm.ts
@@ -1,18 +1,30 @@
 import { useConfirm } from 'primevue/useconfirm';
 import { useTauriOverlay } from './useTauriOverlay';
+import { useOverlayStore } from '@/features/overlay/store';
 
 /**
- * Returns a `confirmClose()` function that pops a PrimeVue confirm dialog
- * and, on accept, closes the Tauri window. No-op in browser context (the
- * close button is hidden there anyway).
+ * Returns the overlay ✕-button handler. With "minimize to tray" enabled it
+ * hides the window to the system tray (reversible — restore from the tray's
+ * Show item), so no confirm is needed. Otherwise it pops a confirm dialog and
+ * quits on accept. No-op in browser context (the ✕ is hidden there anyway).
  */
 export function useCloseConfirm(): () => void {
   const confirm = useConfirm();
   const { t } = useI18n();
   const { isTauri } = useTauriOverlay();
+  const { minimizeToTray } = storeToRefs(useOverlayStore());
 
-  return function confirmClose(): void {
+  return function onCloseRequested(): void {
     if (!isTauri) return;
+
+    if (minimizeToTray.value) {
+      void (async () => {
+        const { getCurrentWindow } = await import('@tauri-apps/api/window');
+        await getCurrentWindow().hide();
+      })();
+      return;
+    }
+
     confirm.require({
       message: t('closeConfirm.message'),
       header: t('closeConfirm.title'),
diff --git a/apps/client/src/features/overlay/store.ts b/apps/client/src/features/overlay/store.ts
index 4b4acd5..48ebbea 100644
--- a/apps/client/src/features/overlay/store.ts
+++ b/apps/client/src/features/overlay/store.ts
@@ -10,6 +10,11 @@ export const useOverlayStore = defineStore('overlay', () => {
   const mapOpacity = persistedRef('tc.overlay.mapOpacity', z.number().min(0).max(1), 1);
   const zoom = persistedRef('tc.overlay.zoom', overlayZoomSchema, '100' as OverlayZoom);
 
+  // When on, the ✕ button hides the window to the system tray (keeps running)
+  // instead of quitting; restore/quit from the tray. Opt-in — default off keeps
+  // the ✕ as a confirmed quit.
+  const minimizeToTray = persistedRef('tc.overlay.minimizeToTray', z.boolean(), false);
+
   // Session-only: booting into a locked overlay with a broken hotkey would be
   // unrecoverable, so the locked state is intentionally NOT persisted.
   const clickThrough = ref(false);
@@ -19,5 +24,5 @@ export const useOverlayStore = defineStore('overlay', () => {
   // persisted — pairing is per-action, never "remembered open".
   const pairingModalOpen = ref(false);
 
-  return { alwaysOnTop, opacity, mapOpacity, zoom, clickThrough, pairingModalOpen };
+  return { alwaysOnTop, opacity, mapOpacity, zoom, minimizeToTray, clickThrough, pairingModalOpen };
 });
diff --git a/apps/client/src/features/settings/sections/OverlaySection.vue b/apps/client/src/features/settings/sections/OverlaySection.vue
index 24b40a1..14c8b11 100644
--- a/apps/client/src/features/settings/sections/OverlaySection.vue
+++ b/apps/client/src/features/settings/sections/OverlaySection.vue
@@ -2,7 +2,11 @@
 import { useOverlayStore } from '@/features/overlay/store';
 import { useOverlaySync } from '@/features/overlay/composables/useOverlaySync';
 
-const { alwaysOnTop: overlayAlwaysOnTop, zoom: overlayZoom } = storeToRefs(useOverlayStore());
+const {
+  alwaysOnTop: overlayAlwaysOnTop,
+  zoom: overlayZoom,
+  minimizeToTray: overlayMinimizeToTray,
+} = storeToRefs(useOverlayStore());
 const { opacityPercent, mapOpacityPercent, mapOpacityDisabled } = useOverlaySync();
 const { t } = useI18n();
 
@@ -21,6 +25,16 @@ const overlayZoomOptions = computed(() => [
       <ToggleSwitch v-model="overlayAlwaysOnTop" input-id="overlay-always-on-top" />
     </div>
 
+    <div>
+      <div class="flex items-center justify-between gap-3">
+        <label class="text-sm" for="overlay-minimize-tray">{{ t('overlay.minimizeToTray') }}</label>
+        <ToggleSwitch v-model="overlayMinimizeToTray" input-id="overlay-minimize-tray" />
+      </div>
+      <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">
+        {{ t('overlay.minimizeToTrayHint') }}
+      </p>
+    </div>
+
     <div>
       <div class="mb-1.5 flex items-center justify-between gap-3">
         <label class="text-xs opacity-70" for="overlay-opacity">{{ t('overlay.opacity') }}</label>
diff --git a/apps/desktop/src-tauri/capabilities/default.json b/apps/desktop/src-tauri/capabilities/default.json
index 53d48d8..2e618e7 100644
--- a/apps/desktop/src-tauri/capabilities/default.json
+++ b/apps/desktop/src-tauri/capabilities/default.json
@@ -9,6 +9,7 @@
     "core:window:allow-set-ignore-cursor-events",
     "core:window:allow-close",
     "core:window:allow-start-dragging",
+    "core:window:allow-hide",
     "core:window:allow-show",
     "core:window:allow-set-focus",
     "core:webview:allow-set-webview-zoom",

From dcb1345cec7eeaff5f14809341f80448a158923d Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sat, 6 Jun 2026 01:28:51 +0300
Subject: [PATCH 34/53] feat(overlay): on-map layer rail + glanceable lock
 read-outs

Replace the settings-drawer Layers tab with an on-map LayerRail; the gear
drawer now holds system settings only. Make the overlay's lock state coherent:
controls hide, glanceable read-outs stay.

- LayerRail (left edge): category icons (Karta/Igrok + dimmed future Loot/
  Quests) open flyouts; per-layer visibility toggle + the layer's section
  inline via a gear. Flyout anchored to the rail (no fixed/Teleport) so it
  doesn't drift in the WebView2 overlay.
- Per-layer visibility primitive: useLayerVisibility (tc.layer.<id>.visible),
  watched by the extracts/player/airdrop composables; MapLayerContext gains
  visible.
- Settings registry: group settings -> system, add subgroup
  (player/loot/quests); SettingsPanel drops the Tabs/Accordion layers tab and
  renders system sections only.
- Floors: stepper moved into the rail bottom; Alt+wheel over the map steps
  floors (captured before Leaflet zoom, throttled); a read-only floor-by-wheel
  hotkey row + a locked-state floor read-out chip.
- Map section: dropdown -> inline Listbox behind an auto-switch disclosure (no
  overlay flip in the 360px flyout). Player follow simplified to on/off.
- Hotkey rows: combo chip + Change button on one line; register the PrimeVue
  Tooltip directive.
- Edge arrows wrap the rail and re-flow on lock; merged clock+location pill
  stays glanceable in every state.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/components.d.ts               |   4 +
 apps/client/src/features/airdrop/settings.ts  |   2 +-
 .../hotkeys/components/HotkeyRecorder.vue     |  39 +--
 apps/client/src/features/hotkeys/settings.ts  |   2 +-
 apps/client/src/features/i18n/locales/en.json |  16 +-
 apps/client/src/features/i18n/locales/ru.json |  16 +-
 apps/client/src/features/i18n/settings.ts     |   2 +-
 .../src/features/map/components/LayerRail.vue | 268 ++++++++++++++++++
 .../src/features/map/components/MapView.vue   |  37 ++-
 .../map/composables/useLayerVisibility.ts     |  17 ++
 .../map/layers/airdrop/useAirdropLayer.ts     |  10 +-
 .../map/layers/extracts/useEdgeIndicators.ts  |  38 ++-
 .../map/layers/extracts/useExtractsLayer.ts   |  32 ++-
 .../map/layers/player/usePlayerLayer.ts       |  38 ++-
 .../src/features/map/layers/registry.ts       |   3 +
 apps/client/src/features/map/settings.ts      |  16 +-
 apps/client/src/features/map/store.ts         |   2 +-
 .../overlay/components/OverlayHeader.vue      |   4 +-
 apps/client/src/features/overlay/settings.ts  |   4 +-
 apps/client/src/features/server/settings.ts   |   2 +-
 .../src/features/settings/SettingsPanel.vue   |  76 ++---
 apps/client/src/features/settings/registry.ts |  19 +-
 .../settings/sections/HotkeysSection.vue      |  26 ++
 .../features/settings/sections/MapSection.vue |  33 ++-
 .../settings/sections/PlayerSection.vue       |  26 +-
 .../features/tarkov-time/TarkovTimeChip.vue   |  13 +-
 apps/client/src/main.ts                       |   2 +
 apps/client/src/pages/index.vue               |   2 +-
 28 files changed, 586 insertions(+), 163 deletions(-)
 create mode 100644 apps/client/src/features/map/components/LayerRail.vue
 create mode 100644 apps/client/src/features/map/composables/useLayerVisibility.ts

diff --git a/apps/client/src/components.d.ts b/apps/client/src/components.d.ts
index 8f3d357..c44671a 100644
--- a/apps/client/src/components.d.ts
+++ b/apps/client/src/components.d.ts
@@ -24,6 +24,7 @@ declare module 'vue' {
     IconField: typeof import('primevue/iconfield')['default']
     InputIcon: typeof import('primevue/inputicon')['default']
     InputText: typeof import('primevue/inputtext')['default']
+    Listbox: typeof import('primevue/listbox')['default']
     Message: typeof import('primevue/message')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
@@ -37,4 +38,7 @@ declare module 'vue' {
     Tabs: typeof import('primevue/tabs')['default']
     ToggleSwitch: typeof import('primevue/toggleswitch')['default']
   }
+  export interface GlobalDirectives {
+    Tooltip: typeof import('primevue/tooltip')['default']
+  }
 }
diff --git a/apps/client/src/features/airdrop/settings.ts b/apps/client/src/features/airdrop/settings.ts
index 2eb8032..dc8192e 100644
--- a/apps/client/src/features/airdrop/settings.ts
+++ b/apps/client/src/features/airdrop/settings.ts
@@ -4,8 +4,8 @@ import AirdropSection from '@/features/settings/sections/AirdropSection.vue';
 registerSettingsSection({
   id: 'airdrop',
   group: 'layers',
+  subgroup: 'player',
   order: 40,
-  visible: 'tauri',
   titleKey: 'airdrop.settingsHeading',
   component: AirdropSection,
 });
diff --git a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
index 8b2492e..f8e4c1f 100644
--- a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
+++ b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
@@ -84,33 +84,36 @@ let currentRecorder: { cancel: () => void } | null = null;
 
 <template>
   <div>
-    <div class="mb-1.5 flex items-center justify-between gap-2">
-      <p class="text-xs opacity-60">{{ label }}</p>
+    <p class="mb-1 text-xs opacity-60">{{ label }}</p>
+    <!-- Combo chip + Change button on ONE line so the button is unambiguously
+         bound to the binding it edits (label sits on its own line above). -->
+    <div class="flex items-center justify-between gap-2">
+      <div
+        class="flex min-w-0 items-center gap-1 overflow-hidden rounded-md bg-surface-900/60 px-2 py-1.5 text-[11px] font-semibold tracking-wider"
+        :class="recording ? 'ring-2 ring-primary' : ''"
+      >
+        <template v-if="recording">
+          <span class="truncate opacity-70">{{ t('hotkeys.recordingPrompt') }}</span>
+        </template>
+        <template v-else>
+          <span v-for="(part, idx) in displayParts" :key="idx" class="inline-flex items-center">
+            <span class="rounded border border-surface-600 bg-surface-900 px-1.5 py-0.5 font-mono">
+              {{ part }}
+            </span>
+            <span v-if="idx < displayParts.length - 1" class="px-1 opacity-60">+</span>
+          </span>
+        </template>
+      </div>
       <Button
         :label="recording ? t('hotkeys.recording') : t('hotkeys.record')"
         size="small"
         severity="secondary"
         :outlined="!recording"
         :disabled="recording"
+        class="shrink-0"
         @click="startRecording"
       />
     </div>
-    <div
-      class="inline-flex items-center gap-1 rounded-md bg-surface-900/60 px-2 py-1.5 text-[11px] font-semibold tracking-wider"
-      :class="recording ? 'ring-2 ring-primary' : ''"
-    >
-      <template v-if="recording">
-        <span class="opacity-70">{{ t('hotkeys.recordingPrompt') }}</span>
-      </template>
-      <template v-else>
-        <span v-for="(part, idx) in displayParts" :key="idx" class="inline-flex items-center">
-          <span class="rounded border border-surface-600 bg-surface-900 px-1.5 py-0.5 font-mono">
-            {{ part }}
-          </span>
-          <span v-if="idx < displayParts.length - 1" class="px-1 opacity-60">+</span>
-        </span>
-      </template>
-    </div>
     <p v-if="error" class="mt-1.5 text-[10px] leading-relaxed text-amber-400">
       {{ t(error === 'altgr' ? 'hotkeys.altgr' : 'hotkeys.invalid') }}
     </p>
diff --git a/apps/client/src/features/hotkeys/settings.ts b/apps/client/src/features/hotkeys/settings.ts
index ff18ef5..fc211fc 100644
--- a/apps/client/src/features/hotkeys/settings.ts
+++ b/apps/client/src/features/hotkeys/settings.ts
@@ -3,7 +3,7 @@ import HotkeysSection from '@/features/settings/sections/HotkeysSection.vue';
 
 registerSettingsSection({
   id: 'hotkeys',
-  group: 'settings',
+  group: 'system',
   order: 20,
   // Shown on the desktop browser + overlay (both have a keyboard), hidden on
   // phones. The combos are backend-owned now — configurable from any desktop
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 71d62de..eb5083b 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -20,7 +20,7 @@
   "edgeIndicatorsHint": "When zoomed in, show small arrows on the map edge pointing at off-screen extracts.",
   "player": "Player",
   "playerFollow": "Auto-follow",
-  "playerFollowHint": "Recenter the map on every new position. S/M/L also zoom in; On just follows at your current zoom.",
+  "playerFollowHint": "Recenter the map on every new position, keeping your current zoom.",
   "playerFollowOptions": {
     "off": "Off",
     "on": "On",
@@ -29,12 +29,15 @@
     "lg": "L"
   },
   "settings": "Settings",
-  "settingsTabs": {
-    "layers": "Layers",
-    "settings": "Settings"
+  "position": "Position",
+  "settingsGroups": {
+    "player": "Player",
+    "loot": "Loot",
+    "quests": "Quests",
+    "system": "System"
   },
   "close": "Close",
-  "systemSection": "System",
+  "floorWheelHint": "Floor — Alt + scroll to change",
   "floor": "Floor",
   "factions": {
     "pmc": "PMC",
@@ -99,6 +102,9 @@
     "floorUp": "Next floor",
     "floorDown": "Previous floor",
     "airdrop": "Mark airdrop",
+    "floorWheel": "Floor by wheel",
+    "scroll": "Scroll",
+    "fixed": "Fixed shortcut — not rebindable",
     "record": "Change",
     "recording": "Recording…",
     "recordingPrompt": "Press the new combination (Esc to cancel)",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 73fe7cc..e2e12b9 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -20,7 +20,7 @@
   "edgeIndicatorsHint": "На приближении показывает у края карты маленькие стрелки к выходам за пределами экрана.",
   "player": "Игрок",
   "playerFollow": "Авто-следование",
-  "playerFollowHint": "Центрируем карту при каждой новой позиции. S/M/L ещё и приближают; «Вкл» — просто следует на текущем зуме.",
+  "playerFollowHint": "Центрирует карту при каждой новой позиции, сохраняя текущий зум.",
   "playerFollowOptions": {
     "off": "Выкл",
     "on": "Вкл",
@@ -29,12 +29,15 @@
     "lg": "L"
   },
   "settings": "Настройки",
-  "settingsTabs": {
-    "layers": "Слои",
-    "settings": "Настройки"
+  "position": "Позиция",
+  "settingsGroups": {
+    "player": "Игрок",
+    "loot": "Лут",
+    "quests": "Квесты",
+    "system": "Система"
   },
   "close": "Закрыть",
-  "systemSection": "Системные",
+  "floorWheelHint": "Уровень — Alt + колесо для смены",
   "floor": "Уровень",
   "factions": {
     "pmc": "ЧВК",
@@ -99,6 +102,9 @@
     "floorUp": "Следующий этаж",
     "floorDown": "Предыдущий этаж",
     "airdrop": "Отметить дроп",
+    "floorWheel": "Этаж колёсиком",
+    "scroll": "Колесо",
+    "fixed": "Фиксированный — не переназначается",
     "record": "Изменить",
     "recording": "Запись…",
     "recordingPrompt": "Нажми новое сочетание (Esc — отмена)",
diff --git a/apps/client/src/features/i18n/settings.ts b/apps/client/src/features/i18n/settings.ts
index 49b1fd3..bc13f69 100644
--- a/apps/client/src/features/i18n/settings.ts
+++ b/apps/client/src/features/i18n/settings.ts
@@ -3,7 +3,7 @@ import LanguageSection from '@/features/settings/sections/LanguageSection.vue';
 
 registerSettingsSection({
   id: 'language',
-  group: 'settings',
+  group: 'system',
   order: 30,
   titleKey: 'language',
   component: LanguageSection,
diff --git a/apps/client/src/features/map/components/LayerRail.vue b/apps/client/src/features/map/components/LayerRail.vue
new file mode 100644
index 0000000..a3d6466
--- /dev/null
+++ b/apps/client/src/features/map/components/LayerRail.vue
@@ -0,0 +1,268 @@
+<script setup lang="ts">
+import { useSettingsSections } from '@/features/settings/registry';
+import { useOverlayStore } from '@/features/overlay/store';
+import { useLayerVisibility } from '../composables/useLayerVisibility';
+
+const props = defineProps<{
+  floors?: ReadonlyArray<{ id: string; label: string }>;
+  currentFloor?: string | null;
+}>();
+const emit = defineEmits<{ (e: 'selectFloor', id: string): void }>();
+
+const { t } = useI18n();
+const sections = useSettingsSections('layers');
+
+// Map is the base map selector (a prerequisite, not a toggleable layer) — it
+// gets its own rail icon at the top. Everything else is a real layer, grouped
+// by its registry `subgroup` into rail categories.
+const baseSection = computed(() => sections.value.find((s) => s.id === 'map') ?? null);
+const layerSections = computed(() => sections.value.filter((s) => s.id !== 'map'));
+
+// Category order + icon. Empty categories (loot/quests until their layers ship)
+// render as dimmed, disabled icons — visible future landing zones.
+const CATEGORY_META = [
+  { key: 'player', icon: 'pi-user' },
+  { key: 'loot', icon: 'pi-box' },
+  { key: 'quests', icon: 'pi-flag' },
+] as const;
+
+const categories = computed(() =>
+  CATEGORY_META.map((c) => ({
+    key: c.key,
+    icon: c.icon,
+    label: t(`settingsGroups.${c.key}`),
+    sections: layerSections.value.filter((s) => s.subgroup === c.key),
+  })),
+);
+
+// Own the visibility refs in setup scope (persistedRef installs a watch — keep
+// that out of render). Cached, so the template lookups below are free.
+const layerVis = useLayerVisibility;
+layerSections.value.forEach((s) => layerVis(s.id));
+
+const openId = ref<string | null>(null);
+const expanded = ref<string | null>(null);
+const railRef = ref<HTMLElement | null>(null);
+const flyoutRef = ref<HTMLElement | null>(null);
+
+// Hide the whole rail (animated) while the overlay is click-through-locked —
+// it can't be interacted with then, and a clean map reads better.
+const { clickThrough } = storeToRefs(useOverlayStore());
+const railVisible = computed(() => !clickThrough.value);
+
+function toggle(id: string): void {
+  openId.value = openId.value === id ? null : id;
+  expanded.value = null;
+}
+
+onClickOutside(flyoutRef, (e) => {
+  // Rail buttons handle their own open/close — don't double-close on them.
+  if (railRef.value?.contains(e.target as Node)) return;
+  openId.value = null;
+});
+
+// On lock, drop any open flyout (the rail itself animates away via <Transition>).
+watch(clickThrough, (locked) => {
+  if (locked) openId.value = null;
+});
+
+// The overlay is a transient surface: when focus leaves it (e.g. clicking back
+// into the game), dismiss the flyout so layer config doesn't linger on screen.
+useEventListener(window, 'blur', () => {
+  openId.value = null;
+});
+
+const openCategory = computed(() => categories.value.find((c) => c.key === openId.value) ?? null);
+const isMapOpen = computed(() => openId.value === 'map');
+
+// Floor stepper at the rail's bottom (multi-floor maps only). Floors are ordered
+// top-to-bottom (highest first, index 0 = top), so "up" steps toward index 0.
+const floorList = computed(() => props.floors ?? []);
+const hasFloors = computed(() => floorList.value.length > 1);
+const floorIndex = computed(() => floorList.value.findIndex((f) => f.id === props.currentFloor));
+const currentFloorLabel = computed(
+  () => floorList.value[Math.max(0, floorIndex.value)]?.label ?? '',
+);
+const canFloorUp = computed(() => floorIndex.value > 0);
+const canFloorDown = computed(
+  () => floorIndex.value >= 0 && floorIndex.value < floorList.value.length - 1,
+);
+function stepFloor(delta: number): void {
+  const i = floorIndex.value < 0 ? 0 : floorIndex.value;
+  const target = floorList.value[i + delta];
+  if (target) emit('selectFloor', target.id);
+}
+</script>
+
+<template>
+  <Transition name="rail">
+    <div
+      v-if="railVisible"
+      ref="railRef"
+      class="layer-rail border-surface-700 bg-surface-900/85 absolute left-0 top-1/2 z-[1100] flex -translate-y-1/2 flex-col gap-1 rounded-r-xl border border-l-0 p-1 backdrop-blur"
+    >
+      <button
+        v-if="baseSection"
+        v-tooltip.right="{ value: t('map'), disabled: openId !== null }"
+        type="button"
+        class="rail-btn"
+        :class="{ 'rail-btn--active': isMapOpen }"
+        :aria-label="t('map')"
+        @click="toggle('map')"
+      >
+        <i class="pi pi-map" />
+      </button>
+      <div class="bg-surface-700 my-0.5 h-px" />
+      <button
+        v-for="c in categories"
+        :key="c.key"
+        v-tooltip.right="{ value: c.label, disabled: openId !== null }"
+        type="button"
+        class="rail-btn"
+        :class="{ 'rail-btn--active': openId === c.key, 'rail-btn--empty': c.sections.length === 0 }"
+        :disabled="c.sections.length === 0"
+        :aria-label="c.label"
+        @click="toggle(c.key)"
+      >
+        <i class="pi" :class="c.icon" />
+      </button>
+
+      <!-- Floor stepper (multi-floor maps): glanceable current floor + ▲/▼.
+           Vertical, in-rail — replaces the bottom-left popup that collided
+           with the rail. Fast path is still the floor-up/down hotkeys. -->
+      <template v-if="hasFloors">
+        <div class="bg-surface-700 my-0.5 h-px" />
+        <button
+          type="button"
+          class="rail-btn"
+          :disabled="!canFloorUp"
+          :aria-label="t('floor') + ' +'"
+          @click="stepFloor(-1)"
+        >
+          <i class="pi pi-chevron-up text-sm" />
+        </button>
+        <div
+          v-tooltip.right="{ value: t('floorWheelHint'), disabled: openId !== null }"
+          class="flex h-5 items-center justify-center text-xs font-semibold tabular-nums opacity-80"
+        >
+          {{ currentFloorLabel }}
+        </div>
+        <button
+          type="button"
+          class="rail-btn"
+          :disabled="!canFloorDown"
+          :aria-label="t('floor') + ' -'"
+          @click="stepFloor(1)"
+        >
+          <i class="pi pi-chevron-down text-sm" />
+        </button>
+      </template>
+
+      <!-- Flyout positioned relative to the rail (vertically centred on it), NOT
+           the viewport — `position: fixed` + getBoundingClientRect drifted in the
+           Tauri WebView2 overlay. No nested overlays remain inside it (map is an
+           inline Listbox; section controls are inline), so no Teleport needed. -->
+      <div
+        v-if="openId"
+        ref="flyoutRef"
+        class="border-surface-700 bg-surface-900/95 absolute left-full top-1/2 ml-1.5 max-h-[80dvh] w-60 -translate-y-1/2 overflow-y-auto rounded-xl border p-3 shadow-xl backdrop-blur"
+      >
+        <template v-if="isMapOpen && baseSection">
+          <p class="mb-2 text-[10px] font-semibold uppercase tracking-wider opacity-50">
+            {{ t('map') }}
+          </p>
+          <component :is="baseSection.component" />
+        </template>
+        <template v-else-if="openCategory">
+          <p class="mb-2 text-[10px] font-semibold uppercase tracking-wider opacity-50">
+            {{ openCategory.label }}
+          </p>
+          <div
+            v-for="s in openCategory.sections"
+            :key="s.id"
+            class="border-surface-800 border-b py-1.5 last:border-0"
+          >
+            <div class="flex items-center gap-2">
+              <ToggleSwitch
+                :model-value="layerVis(s.id).value"
+                @update:model-value="(v: boolean) => (layerVis(s.id).value = v)"
+              />
+              <span class="flex-1 truncate text-sm">{{ t(s.titleKey) }}</span>
+              <button
+                type="button"
+                class="hover:bg-surface-800 flex h-8 w-8 shrink-0 items-center justify-center rounded opacity-70 hover:opacity-100"
+                :class="{ 'text-primary-400 bg-surface-800 !opacity-100': expanded === s.id }"
+                :aria-label="t('settings')"
+                @click="expanded = expanded === s.id ? null : s.id"
+              >
+                <i class="pi pi-cog text-sm" />
+              </button>
+            </div>
+            <div v-if="expanded === s.id" class="mt-2 pl-1">
+              <component :is="s.component" />
+            </div>
+          </div>
+        </template>
+      </div>
+    </div>
+  </Transition>
+
+  <!-- Locked: the rail (and its floor stepper) is hidden, but floors are still
+       changed via the floor-up/down hotkeys — keep a minimal read-only floor
+       readout so the current level stays glanceable while click-through is on. -->
+  <div
+    v-if="clickThrough && hasFloors"
+    class="sa-bottom sa-left border-surface-700 bg-surface-900/85 absolute z-[1100] flex items-center gap-1.5 rounded-md border px-2 py-1 backdrop-blur"
+  >
+    <i class="pi pi-clone text-[10px] opacity-50" />
+    <span class="text-xs font-semibold tabular-nums">{{ currentFloorLabel }}</span>
+  </div>
+</template>
+
+<style scoped>
+.rail-btn {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 2rem;
+  height: 2rem;
+  border-radius: 0.5rem;
+  color: var(--p-surface-300);
+  transition:
+    background-color 0.12s,
+    color 0.12s;
+}
+.rail-btn:hover {
+  background-color: var(--p-surface-800);
+  color: var(--p-surface-0);
+}
+.rail-btn--active {
+  background-color: color-mix(in srgb, var(--p-primary-500) 22%, transparent);
+  color: var(--p-primary-300);
+}
+.rail-btn--empty {
+  opacity: 0.3;
+  cursor: default;
+}
+.rail-btn:disabled {
+  opacity: 0.25;
+  cursor: default;
+}
+.rail-btn:disabled:hover {
+  background-color: transparent;
+  color: var(--p-surface-300);
+}
+
+/* Rail slide/fade when the overlay locks/unlocks. */
+.rail-enter-active,
+.rail-leave-active {
+  transition:
+    opacity 0.18s ease,
+    left 0.18s ease;
+}
+.rail-enter-from,
+.rail-leave-to {
+  opacity: 0;
+  left: -3rem;
+}
+</style>
diff --git a/apps/client/src/features/map/components/MapView.vue b/apps/client/src/features/map/components/MapView.vue
index f30f349..454d4b4 100644
--- a/apps/client/src/features/map/components/MapView.vue
+++ b/apps/client/src/features/map/components/MapView.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { useLeafletMap } from '../composables/useLeafletMap';
 import { useMapLayers } from '../layers/registry';
+import { useLayerVisibility } from '../composables/useLayerVisibility';
 import { useMapI18n } from '../composables/useMapI18n';
 import { mapInfo, type TarkovMapCode } from '@shared/maps';
-import FloorSwitcher from './FloorSwitcher.vue';
+import LayerRail from './LayerRail.vue';
 
 const props = defineProps<{
   mapCode: TarkovMapCode;
@@ -34,10 +35,36 @@ const {
 } = useLeafletMap(mapContainer, props.mapCode);
 
 for (const layer of useMapLayers().value) {
-  layer.mount({ map, mapCode: props.mapCode, mapInfo: info, initialZoom });
+  layer.mount({
+    map,
+    mapCode: props.mapCode,
+    mapInfo: info,
+    initialZoom,
+    visible: useLayerVisibility(layer.id),
+  });
 }
 
-const hasFloors = computed(() => info.floors.length > 1);
+// Alt + mouse wheel over the map steps floors instead of zooming (multi-floor
+// maps only). Captured before Leaflet's own wheel handler so it never zooms;
+// lightly throttled so a trackpad doesn't skip several floors at once.
+let lastFloorWheel = 0;
+useEventListener(
+  mapContainer,
+  'wheel',
+  (e: WheelEvent) => {
+    if (!e.altKey || info.floors.length <= 1) return;
+    e.preventDefault();
+    e.stopImmediatePropagation();
+    const now = performance.now();
+    if (now - lastFloorWheel < 120) return;
+    lastFloorWheel = now;
+    const floors = info.floors;
+    const i = floors.findIndex((f) => f.id === currentFloor.value);
+    const target = floors[(i < 0 ? 0 : i) + (e.deltaY < 0 ? -1 : 1)];
+    if (target) setActiveFloor(target.id);
+  },
+  { capture: true, passive: false },
+);
 
 defineExpose({ zoomIn, zoomOut, nextFloor, prevFloor, reload });
 
@@ -53,7 +80,5 @@ watch(mapError, (err) => emit('mapError', err));
 
 <template>
   <div ref="mapContainer" class="absolute inset-0 z-0" />
-  <div v-if="hasFloors" class="sa-bottom sa-left absolute z-[1000]">
-    <FloorSwitcher :floors="info.floors" :current="currentFloor" @select="setActiveFloor" />
-  </div>
+  <LayerRail :floors="info.floors" :current-floor="currentFloor" @select-floor="setActiveFloor" />
 </template>
diff --git a/apps/client/src/features/map/composables/useLayerVisibility.ts b/apps/client/src/features/map/composables/useLayerVisibility.ts
new file mode 100644
index 0000000..35fcbdd
--- /dev/null
+++ b/apps/client/src/features/map/composables/useLayerVisibility.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod';
+import type { Ref } from 'vue';
+import { persistedRef } from '@/shared/persisted-store';
+
+// One shared visibility ref per layer id (module-level singleton) so the
+// on-map LayerRail toggle and the Leaflet layer composable read/write the SAME
+// ref. Persisted, so a hidden layer stays hidden across sessions.
+const refs = new Map<string, Ref<boolean>>();
+
+export function useLayerVisibility(id: string): Ref<boolean> {
+  let r = refs.get(id);
+  if (!r) {
+    r = persistedRef(`tc.layer.${id}.visible`, z.boolean(), true);
+    refs.set(id, r);
+  }
+  return r;
+}
diff --git a/apps/client/src/features/map/layers/airdrop/useAirdropLayer.ts b/apps/client/src/features/map/layers/airdrop/useAirdropLayer.ts
index 88c481e..fc3068e 100644
--- a/apps/client/src/features/map/layers/airdrop/useAirdropLayer.ts
+++ b/apps/client/src/features/map/layers/airdrop/useAirdropLayer.ts
@@ -18,7 +18,7 @@ import type { MapLayerContext } from '../registry';
  * extract icons but below the player marker.
  */
 export function useAirdropLayer(ctx: MapLayerContext): void {
-  const { map } = ctx;
+  const { map, visible } = ctx;
   const store = useAirdropStore();
   let dropAreaCircle: L.Circle | null = null;
 
@@ -46,7 +46,8 @@ export function useAirdropLayer(ctx: MapLayerContext): void {
 
   // The circle stays through `confirmingClear` — the user is about to wipe
   // it, they should see exactly what they're about to lose.
-  const showDrop = (): boolean => store.phase === 'result' || store.phase === 'confirmingClear';
+  const showDrop = (): boolean =>
+    visible.value && (store.phase === 'result' || store.phase === 'confirmingClear');
 
   watch(
     () => store.phase,
@@ -73,5 +74,10 @@ export function useAirdropLayer(ctx: MapLayerContext): void {
     if (showDrop()) placeDrop();
   });
 
+  watch(visible, () => {
+    clearAll();
+    if (showDrop()) placeDrop();
+  });
+
   onBeforeUnmount(clearAll);
 }
diff --git a/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts b/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
index 0a357d6..11723c6 100644
--- a/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
+++ b/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
@@ -9,6 +9,8 @@ export interface EdgeArrow {
 
 const MARGIN = 18; // px inset from the container edge
 const ARROW_PX = 22;
+const RAIL_GAP = 16; // arrow-centre offset past the rail's right edge
+const RAIL_PAD = 6; // extend the avoid band slightly past the rail's top/bottom
 
 /**
  * Renders small arrows on the viewport edge pointing at off-screen extracts.
@@ -46,6 +48,26 @@ export function createEdgeIndicators(map: LeafletMap, getArrows: () => EdgeArrow
     const cy = size.y / 2;
     const halfW = cx - MARGIN;
     const halfH = cy - MARGIN;
+
+    // The on-map left rail is an obstacle: left-edge arrows whose y falls within
+    // its vertical span get pushed out to the rail's right edge, so they wrap
+    // around the panel instead of hiding behind it. Measured each frame, so it
+    // follows the rail's changing height (floor stepper) and disappears entirely
+    // when the rail is hidden (locked overlay).
+    const containerRect = map.getContainer().getBoundingClientRect();
+    const railEl = document.querySelector('.layer-rail');
+    let avoid: { right: number; top: number; bottom: number } | null = null;
+    if (railEl) {
+      const r = railEl.getBoundingClientRect();
+      if (r.width > 0) {
+        avoid = {
+          right: r.right - containerRect.left,
+          top: r.top - containerRect.top,
+          bottom: r.bottom - containerRect.top,
+        };
+      }
+    }
+
     let used = 0;
     for (const a of getArrows()) {
       const cp = map.latLngToContainerPoint([a.lat, a.lng]);
@@ -57,8 +79,22 @@ export function createEdgeIndicators(map: LeafletMap, getArrows: () => EdgeArrow
         dx !== 0 ? halfW / Math.abs(dx) : Infinity,
         dy !== 0 ? halfH / Math.abs(dy) : Infinity,
       );
-      const ex = cx + dx * t;
+      let ex = cx + dx * t;
       const ey = cy + dy * t;
+      // Wrap a left-edge arrow around the rail panel when it'd land behind it.
+      // Only ever push rightward — as the rail slides out (lock), its right edge
+      // moves left of the arrow and the push naturally stops, so arrows glide
+      // back to the true edge instead of chasing the panel off-screen.
+      if (
+        avoid &&
+        dx < 0 &&
+        ex <= MARGIN + 1 &&
+        ey >= avoid.top - RAIL_PAD &&
+        ey <= avoid.bottom + RAIL_PAD &&
+        avoid.right + RAIL_GAP > ex
+      ) {
+        ex = avoid.right + RAIL_GAP;
+      }
       const deg = (Math.atan2(dy, dx) * 180) / Math.PI + 90; // SVG arrow points up
       const el = take(used);
       el.style.left = `${ex}px`;
diff --git a/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts b/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
index 4c64f24..a8a2a81 100644
--- a/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
+++ b/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
@@ -5,6 +5,7 @@ import { buildTooltipHtml, sortedEntries, type ExtractEntry } from './tooltip';
 import { createEdgeIndicators, type EdgeArrow } from './useEdgeIndicators';
 import { extractsForMap } from '@/features/map/data/extracts';
 import { useMapSettingsStore } from '@/features/map/store';
+import { useOverlayStore } from '@/features/overlay/store';
 import type { MapLayerContext } from '../registry';
 
 export type LabelMode = 'hover' | 'always';
@@ -35,10 +36,11 @@ interface RawExtract {
 }
 
 export function useExtractsLayer(ctx: MapLayerContext): void {
-  const { map, mapCode } = ctx;
+  const { map, mapCode, visible } = ctx;
   const { t, locale } = useI18n();
   const { extractFactions, extractLabelMode, extractLabelSize, edgeIndicators } =
     storeToRefs(useMapSettingsStore());
+  const { clickThrough } = storeToRefs(useOverlayStore());
 
   let extractsLayer: LayerGroup | null = null;
   let edge: ReturnType<typeof createEdgeIndicators> | null = null;
@@ -104,7 +106,7 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
   }
 
   function syncEdge(): void {
-    if (edgeIndicators.value && map.value) {
+    if (edgeIndicators.value && visible.value && map.value) {
       if (edge) edge.update();
       else edge = createEdgeIndicators(map.value, arrowData);
     } else if (edge) {
@@ -128,6 +130,14 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
     return v === i18nKey ? ex.key : v;
   }
 
+  function applyVisible(): void {
+    if (!map.value || !extractsLayer) return;
+    const has = map.value.hasLayer(extractsLayer);
+    if (visible.value && !has) extractsLayer.addTo(map.value);
+    if (!visible.value && has) map.value.removeLayer(extractsLayer);
+    syncEdge();
+  }
+
   function loadExtracts(): void {
     const data = extractsForMap(mapCode);
     if (!data) {
@@ -181,6 +191,7 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
     }
     refreshMarkers();
     syncEdge();
+    applyVisible();
   }
 
   // Single source of truth for "the map exists now": loads markers + attaches
@@ -213,6 +224,22 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
     refreshMarkers();
   });
 
+  watch(visible, applyVisible);
+
+  // Locking the overlay slides the on-map rail out (CSS transition) with no map
+  // event to recompute edge arrows — drive update() across the transition window
+  // so the arrows re-flow around the (dis)appearing rail in sync.
+  let railAnimRaf = 0;
+  watch(clickThrough, () => {
+    cancelAnimationFrame(railAnimRaf);
+    const start = performance.now();
+    const tick = (): void => {
+      edge?.update();
+      if (performance.now() - start < 260) railAnimRaf = requestAnimationFrame(tick);
+    };
+    railAnimRaf = requestAnimationFrame(tick);
+  });
+
   watch(extractLabelMode, (mode) => {
     if (state.labelMode === mode) return;
     state.labelMode = mode;
@@ -238,6 +265,7 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
   );
 
   onBeforeUnmount(() => {
+    cancelAnimationFrame(railAnimRaf);
     edge?.destroy();
     edge = null;
     if (extractsLayer && map.value) {
diff --git a/apps/client/src/features/map/layers/player/usePlayerLayer.ts b/apps/client/src/features/map/layers/player/usePlayerLayer.ts
index 27e32fa..1fef56e 100644
--- a/apps/client/src/features/map/layers/player/usePlayerLayer.ts
+++ b/apps/client/src/features/map/layers/player/usePlayerLayer.ts
@@ -3,14 +3,8 @@ import { useServerEvent } from '@/features/server/composables/useServerEvents';
 import { useMapSettingsStore } from '@/features/map/store';
 import type { MapLayerContext } from '../registry';
 
-// 'on' follows without changing zoom; sm/md/lg also zoom in by the delta.
-export type PlayerFollow = 'off' | 'on' | 'sm' | 'md' | 'lg';
-
-const FOLLOW_ZOOM_DELTA: Readonly<Record<'sm' | 'md' | 'lg', number>> = {
-  sm: 1,
-  md: 2,
-  lg: 3,
-};
+// Follow simply recenters on every new position, keeping the user's zoom.
+export type PlayerFollow = 'off' | 'on';
 
 function buildPlayerIconHtml(displayYaw: number | null): string {
   if (displayYaw === null) {
@@ -20,7 +14,7 @@ function buildPlayerIconHtml(displayYaw: number | null): string {
 }
 
 export function usePlayerLayer(ctx: MapLayerContext): void {
-  const { map, mapInfo, initialZoom } = ctx;
+  const { map, mapInfo, visible } = ctx;
   const mapRotation = mapInfo.rotation;
   const yawOffset = mapInfo.yawOffset ?? 0;
 
@@ -39,7 +33,8 @@ export function usePlayerLayer(ctx: MapLayerContext): void {
     if (!map.value) return;
     const latLng: LatLngExpression = [pos.z, pos.x];
     if (!playerLayer) {
-      playerLayer = L.layerGroup().addTo(map.value);
+      playerLayer = L.layerGroup();
+      if (visible.value) playerLayer.addTo(map.value);
     }
     const displayYaw = yaw === null ? null : yaw + mapRotation + yawOffset;
     const icon = L.divIcon({
@@ -62,18 +57,9 @@ export function usePlayerLayer(ctx: MapLayerContext): void {
     }
 
     const changed = pos.x !== lastX || pos.z !== lastZ || yaw !== lastYaw;
-    const follow = playerFollow.value;
-    if (changed && follow !== 'off') {
-      if (follow === 'on') {
-        // Recenter only — keep whatever zoom the user has set.
-        map.value.panTo(latLng, { animate: true, duration: 0.4 });
-      } else {
-        const targetZoom = Math.min(
-          initialZoom.value + FOLLOW_ZOOM_DELTA[follow],
-          map.value.getMaxZoom(),
-        );
-        map.value.setView(latLng, targetZoom, { animate: true, duration: 0.4 });
-      }
+    if (changed && playerFollow.value === 'on') {
+      // Recenter only — keep whatever zoom the user has set.
+      map.value.panTo(latLng, { animate: true, duration: 0.4 });
     }
     if (changed) {
       lastX = pos.x;
@@ -82,6 +68,14 @@ export function usePlayerLayer(ctx: MapLayerContext): void {
     }
   }
 
+  function applyVisible(): void {
+    if (!playerLayer || !map.value) return;
+    const has = map.value.hasLayer(playerLayer);
+    if (visible.value && !has) playerLayer.addTo(map.value);
+    if (!visible.value && has) map.value.removeLayer(playerLayer);
+  }
+  watch(visible, applyVisible);
+
   useServerEvent('position', (msg) => {
     setPlayerPosition({ x: msg.x, y: msg.y, z: msg.z }, msg.yaw ?? null);
   });
diff --git a/apps/client/src/features/map/layers/registry.ts b/apps/client/src/features/map/layers/registry.ts
index 4b59a78..f55382b 100644
--- a/apps/client/src/features/map/layers/registry.ts
+++ b/apps/client/src/features/map/layers/registry.ts
@@ -7,6 +7,9 @@ export interface MapLayerContext {
   mapCode: TarkovMapCode;
   mapInfo: TarkovMapInfo;
   initialZoom: Ref<number>;
+  /** Per-layer visibility, driven by the on-map LayerRail toggle. The layer's
+   * composable watches this and adds/removes its Leaflet root accordingly. */
+  visible: Ref<boolean>;
 }
 
 export interface MapLayer {
diff --git a/apps/client/src/features/map/settings.ts b/apps/client/src/features/map/settings.ts
index 93febc9..4cf878d 100644
--- a/apps/client/src/features/map/settings.ts
+++ b/apps/client/src/features/map/settings.ts
@@ -3,6 +3,8 @@ import MapSection from '@/features/settings/sections/MapSection.vue';
 import ExtractsSection from '@/features/settings/sections/ExtractsSection.vue';
 import PlayerSection from '@/features/settings/sections/PlayerSection.vue';
 
+// Map sits at the top of the layers list, ungrouped — it's the base map
+// selector, a prerequisite for every layer rather than a layer itself.
 registerSettingsSection({
   id: 'map',
   group: 'layers',
@@ -11,16 +13,18 @@ registerSettingsSection({
   component: MapSection,
 });
 registerSettingsSection({
-  id: 'extracts',
+  id: 'player',
   group: 'layers',
+  subgroup: 'player',
   order: 20,
-  titleKey: 'extracts',
-  component: ExtractsSection,
+  titleKey: 'position',
+  component: PlayerSection,
 });
 registerSettingsSection({
-  id: 'player',
+  id: 'extracts',
   group: 'layers',
+  subgroup: 'player',
   order: 30,
-  titleKey: 'player',
-  component: PlayerSection,
+  titleKey: 'extracts',
+  component: ExtractsSection,
 });
diff --git a/apps/client/src/features/map/store.ts b/apps/client/src/features/map/store.ts
index 406c3a0..30f2f54 100644
--- a/apps/client/src/features/map/store.ts
+++ b/apps/client/src/features/map/store.ts
@@ -6,7 +6,7 @@ import type { PlayerFollow } from './layers/player/usePlayerLayer';
 const extractFactionSchema = z.enum(['pmc', 'scav', 'shared']);
 const labelModeSchema = z.enum(['hover', 'always']);
 const labelSizeSchema = z.enum(['sm', 'md', 'lg']);
-const playerFollowSchema = z.enum(['off', 'on', 'sm', 'md', 'lg']);
+const playerFollowSchema = z.enum(['off', 'on']);
 const mapCodeSchema = z.string().refine((s): s is TarkovMapCode => s in TARKOV_MAPS);
 const autoMapSwitchSchema = z.boolean();
 
diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index a72b69f..58d335a 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -119,7 +119,9 @@ function openMapMenu(event: MouseEvent): void {
         class="pointer-events-none flex h-10 min-w-0 flex-1 items-center gap-2 overflow-hidden rounded-2xl bg-surface-800/85 px-4 text-surface-0 ring-1 ring-white/10 backdrop-blur select-none"
       >
         <i class="pi pi-arrows-alt shrink-0 text-xs opacity-90" aria-hidden="true" />
-        <span class="truncate text-sm font-medium">{{ mapDisplayName }}</span>
+        <!-- Name lives in the always-visible clock+location chip now; the pill is
+             just the drag handle. -->
+        <span class="truncate text-sm font-medium opacity-80">{{ t('overlay.move') }}</span>
       </div>
 
       <!-- Controls: own pointer events, never start a drag. -->
diff --git a/apps/client/src/features/overlay/settings.ts b/apps/client/src/features/overlay/settings.ts
index 909371d..f68733f 100644
--- a/apps/client/src/features/overlay/settings.ts
+++ b/apps/client/src/features/overlay/settings.ts
@@ -4,7 +4,7 @@ import PairingSection from '@/features/settings/sections/PairingSection.vue';
 
 registerSettingsSection({
   id: 'overlay',
-  group: 'settings',
+  group: 'system',
   order: 10,
   visible: 'tauri',
   titleKey: 'overlay.heading',
@@ -16,7 +16,7 @@ registerSettingsSection({
 // from a phone makes no sense.
 registerSettingsSection({
   id: 'pairing',
-  group: 'settings',
+  group: 'system',
   order: 50,
   visible: 'tauri',
   titleKey: 'pairing.heading',
diff --git a/apps/client/src/features/server/settings.ts b/apps/client/src/features/server/settings.ts
index 8365067..805d7b1 100644
--- a/apps/client/src/features/server/settings.ts
+++ b/apps/client/src/features/server/settings.ts
@@ -3,7 +3,7 @@ import PathsSection from '@/features/settings/sections/PathsSection.vue';
 
 registerSettingsSection({
   id: 'paths',
-  group: 'settings',
+  group: 'system',
   order: 40,
   visible: 'desktop-or-tauri',
   titleKey: 'paths.heading',
diff --git a/apps/client/src/features/settings/SettingsPanel.vue b/apps/client/src/features/settings/SettingsPanel.vue
index 6671bf5..1e1124f 100644
--- a/apps/client/src/features/settings/SettingsPanel.vue
+++ b/apps/client/src/features/settings/SettingsPanel.vue
@@ -4,36 +4,18 @@ import { useSettingsSections } from './registry';
 import { persistedRef } from '@/shared/persisted-store';
 
 const { t } = useI18n();
-const layersSections = useSettingsSections('layers');
-const settingsSections = useSettingsSections('settings');
+const systemSections = useSettingsSections('system');
 const open = ref(false);
 const isDesktop = useMediaQuery('(min-width: 640px)');
 
-// Only surface a tab that actually has visible sections — e.g. on a phone the
-// Settings tab keeps just Language, while overlay/hotkeys/paths/pairing are
-// desktop/overlay-only and filtered out by the registry.
-const tabs = computed(() =>
-  [
-    { value: 'layers', label: t('settingsTabs.layers'), sections: layersSections.value },
-    { value: 'settings', label: t('settingsTabs.settings'), sections: settingsSections.value },
-  ].filter((tab) => tab.sections.length > 0),
-);
-
-const activeTab = persistedRef('tc.settings.tab', z.enum(['layers', 'settings']), 'layers');
-
-// Expanded accordion panels per tab. Desktop opens every section by default so
-// all controls are visible at a glance; on a phone they start collapsed to keep
-// the drawer short. The default is snapshotted once from the section ids — after
-// that the user's expand/collapse choices persist.
-const openLayers = persistedRef(
-  'tc.settings.open.layers',
-  z.array(z.string()),
-  isDesktop.value ? layersSections.value.map((s) => s.id) : [],
-);
-const openSettings = persistedRef(
-  'tc.settings.open.settings',
+// System/app settings only. Map layers moved out of the drawer onto the on-map
+// LayerRail; the gear now holds the rare config (overlay/hotkeys/language/
+// paths/pairing). Desktop opens every section; the overlay/phone start
+// collapsed to keep the sheet short. Snapshotted once, then user choices persist.
+const openSections = persistedRef(
+  'tc.settings.open',
   z.array(z.string()),
-  isDesktop.value ? settingsSections.value.map((s) => s.id) : [],
+  isDesktop.value ? systemSections.value.map((s) => s.id) : [],
 );
 </script>
 
@@ -66,10 +48,9 @@ const openSettings = persistedRef(
     </template>
   </Button>
 
-  <!-- Non-modal so the map stays bright and live behind the drawer: toggling a
-       layer (extracts, labels, follow, edge arrows) is previewed in real time.
-       Mobile uses a bottom-sheet (auto height, capped) that hugs its content so
-       the map peeks above it; desktop keeps the right-side panel. -->
+  <!-- System/app config only — map layers live on the on-map LayerRail now.
+       Non-modal so the map stays live behind it; bottom-sheet on the overlay/
+       phone, right-side panel on desktop. -->
   <Drawer
     v-model:visible="open"
     :modal="false"
@@ -78,32 +59,13 @@ const openSettings = persistedRef(
     :header="t('settings')"
     :class="isDesktop ? '!w-[26rem]' : '!h-auto !max-h-[85dvh] !rounded-t-2xl'"
   >
-    <Tabs v-model:value="activeTab">
-      <TabList>
-        <Tab v-for="tab in tabs" :key="tab.value" :value="tab.value">{{ tab.label }}</Tab>
-      </TabList>
-      <TabPanels class="!px-0">
-        <TabPanel value="layers" class="!px-0 !pb-0">
-          <Accordion v-model:value="openLayers" multiple>
-            <AccordionPanel v-for="sec in layersSections" :key="sec.id" :value="sec.id">
-              <AccordionHeader>{{ t(sec.titleKey) }}</AccordionHeader>
-              <AccordionContent>
-                <component :is="sec.component" />
-              </AccordionContent>
-            </AccordionPanel>
-          </Accordion>
-        </TabPanel>
-        <TabPanel value="settings" class="!px-0 !pb-0">
-          <Accordion v-model:value="openSettings" multiple>
-            <AccordionPanel v-for="sec in settingsSections" :key="sec.id" :value="sec.id">
-              <AccordionHeader>{{ t(sec.titleKey) }}</AccordionHeader>
-              <AccordionContent>
-                <component :is="sec.component" />
-              </AccordionContent>
-            </AccordionPanel>
-          </Accordion>
-        </TabPanel>
-      </TabPanels>
-    </Tabs>
+    <Accordion v-model:value="openSections" multiple>
+      <AccordionPanel v-for="sec in systemSections" :key="sec.id" :value="sec.id">
+        <AccordionHeader>{{ t(sec.titleKey) }}</AccordionHeader>
+        <AccordionContent>
+          <component :is="sec.component" />
+        </AccordionContent>
+      </AccordionPanel>
+    </Accordion>
   </Drawer>
 </template>
diff --git a/apps/client/src/features/settings/registry.ts b/apps/client/src/features/settings/registry.ts
index 7cdae48..fe8cb2a 100644
--- a/apps/client/src/features/settings/registry.ts
+++ b/apps/client/src/features/settings/registry.ts
@@ -2,17 +2,26 @@ import { computed, shallowReactive, type ComputedRef, type Component } from 'vue
 import { useMediaQuery } from '@vueuse/core';
 import { isTauri } from '@/shared/tauri';
 
-export type SectionGroup = 'layers' | 'settings';
+export type SectionGroup = 'layers' | 'system';
+export type SectionSubgroup = 'player' | 'loot' | 'quests';
 export type SectionVisibility = 'always' | 'tauri' | 'desktop-or-tauri';
 
 export interface SettingsSection {
   id: string;
-  /** Which drawer tab the section lives under: `layers` (what's drawn on the
-   * map) or `settings` (app/system preferences). */
+  /** Top-level group: `layers` (what's drawn on the map) or `system`
+   * (app/system preferences). */
   group: SectionGroup;
+  /** Optional layer sub-bucket, surfaced as a non-interactive divider in the
+   * drawer. Sections sharing a subgroup render contiguously under one label
+   * (`player`/`loot`/`quests`). Omit for `map` (it sits at the top, ungrouped)
+   * and for all `system` sections. A subgroup divider only appears once that
+   * bucket has a visible section, so empty future buckets (loot/quests) stay
+   * hidden until their layers ship. */
+  subgroup?: SectionSubgroup;
   /** Ascending; use multiples of 10 so future insertions fit between existing entries.
-   * layers: 10 map, 20 extracts, 30 player, 40 airdrop
-   * settings: 10 overlay, 20 hotkeys, 30 language, 40 paths, 50 pairing */
+   * Sort within a group is by `order`; keep same-subgroup sections contiguous.
+   * layers: 10 map · 20 player, 30 extracts, 40 airdrop (subgroup `player`)
+   * system: 10 overlay, 20 hotkeys, 30 language, 40 paths, 50 pairing */
   order: number;
   /** i18n key for the accordion header label (the section title). */
   titleKey: string;
diff --git a/apps/client/src/features/settings/sections/HotkeysSection.vue b/apps/client/src/features/settings/sections/HotkeysSection.vue
index 3dd0caa..fe19174 100644
--- a/apps/client/src/features/settings/sections/HotkeysSection.vue
+++ b/apps/client/src/features/settings/sections/HotkeysSection.vue
@@ -41,6 +41,32 @@ function onAction(field: keyof HotkeyConfig, combo: string): void {
       :label="t('hotkeys.floorDown')"
       @update:model-value="onAction('floorDown', $event)"
     />
+
+    <!-- Read-only gesture: Alt + mouse wheel over the map steps floors. Listed
+         here for discoverability but not rebindable (lock icon in the button
+         slot instead of a recorder), matching the recorder row layout. -->
+    <div>
+      <p class="mb-1 text-xs opacity-60">{{ t('hotkeys.floorWheel') }}</p>
+      <div class="flex items-center justify-between gap-2">
+        <div
+          class="bg-surface-900/60 inline-flex items-center gap-1 rounded-md px-2 py-1.5 text-[11px] font-semibold tracking-wider opacity-70"
+        >
+          <span class="border-surface-600 bg-surface-900 rounded border px-1.5 py-0.5 font-mono">
+            Alt
+          </span>
+          <span class="px-1 opacity-60">+</span>
+          <span class="border-surface-600 bg-surface-900 rounded border px-1.5 py-0.5 font-mono">
+            {{ t('hotkeys.scroll') }}
+          </span>
+        </div>
+        <i
+          v-tooltip.left="t('hotkeys.fixed')"
+          class="pi pi-lock shrink-0 text-xs opacity-40"
+          :aria-label="t('hotkeys.fixed')"
+        />
+      </div>
+    </div>
+
     <HotkeyRecorder
       :model-value="airdropHotkey"
       :label="t('hotkeys.airdrop')"
diff --git a/apps/client/src/features/settings/sections/MapSection.vue b/apps/client/src/features/settings/sections/MapSection.vue
index 3f81e15..7e71fbe 100644
--- a/apps/client/src/features/settings/sections/MapSection.vue
+++ b/apps/client/src/features/settings/sections/MapSection.vue
@@ -10,22 +10,43 @@ const { localizedMapName } = useMapI18n();
 const mapOptions = computed(() =>
   VISIBLE_MAP_CODES.map((code) => ({ value: code, label: localizedMapName(code) })),
 );
+const currentMapName = computed(() => localizedMapName(mapCode.value));
+
+// Auto-switch is the common case (the game's log drives the map), so the 11-map
+// list stays collapsed behind a disclosure when it's on. With auto-switch off
+// the list is always shown — manual selection is the only way to change maps.
+const manualOpen = ref(false);
 </script>
 
 <template>
   <div class="space-y-3">
-    <Select
+    <div class="flex items-center justify-between gap-3">
+      <label class="text-sm" for="map-auto-switch">{{ t('autoMapSwitch') }}</label>
+      <ToggleSwitch v-model="autoMapSwitch" input-id="map-auto-switch" />
+    </div>
+
+    <button
+      v-if="autoMapSwitch"
+      type="button"
+      class="border-surface-700 hover:bg-surface-800 flex w-full items-center justify-between gap-2 rounded-md border px-3 py-2 text-left text-sm transition-colors"
+      @click="manualOpen = !manualOpen"
+    >
+      <span class="truncate">{{ currentMapName }}</span>
+      <i
+        class="pi text-xs opacity-60"
+        :class="manualOpen ? 'pi-chevron-up' : 'pi-chevron-down'"
+      />
+    </button>
+
+    <Listbox
+      v-if="!autoMapSwitch || manualOpen"
       v-model="mapCode"
       :options="mapOptions"
       option-label="label"
       option-value="value"
       :aria-label="t('map')"
+      list-style="max-height:8rem"
       fluid
     />
-    <div class="flex items-center justify-between gap-3">
-      <label class="text-sm" for="map-auto-switch">{{ t('autoMapSwitch') }}</label>
-      <ToggleSwitch v-model="autoMapSwitch" input-id="map-auto-switch" />
-    </div>
-    <p class="text-[10px] leading-relaxed opacity-70">{{ t('autoMapSwitchHint') }}</p>
   </div>
 </template>
diff --git a/apps/client/src/features/settings/sections/PlayerSection.vue b/apps/client/src/features/settings/sections/PlayerSection.vue
index fb8a1bb..80fc02c 100644
--- a/apps/client/src/features/settings/sections/PlayerSection.vue
+++ b/apps/client/src/features/settings/sections/PlayerSection.vue
@@ -3,28 +3,18 @@ import { useMapSettingsStore } from '@/features/map/store';
 
 const { playerFollow } = storeToRefs(useMapSettingsStore());
 const { t } = useI18n();
-
-const playerFollowOptions = computed(() => [
-  { label: t('playerFollowOptions.off'), value: 'off' as const },
-  { label: t('playerFollowOptions.on'), value: 'on' as const },
-  { label: t('playerFollowOptions.sm'), value: 'sm' as const },
-  { label: t('playerFollowOptions.md'), value: 'md' as const },
-  { label: t('playerFollowOptions.lg'), value: 'lg' as const },
-]);
 </script>
 
 <template>
   <div>
-    <p class="mb-1.5 text-xs opacity-60">{{ t('playerFollow') }}</p>
-    <SelectButton
-      v-model="playerFollow"
-      :options="playerFollowOptions"
-      option-label="label"
-      option-value="value"
-      :allow-empty="false"
-      size="small"
-      fluid
-    />
+    <div class="flex items-center justify-between gap-3">
+      <label class="text-sm" for="player-follow">{{ t('playerFollow') }}</label>
+      <ToggleSwitch
+        :model-value="playerFollow === 'on'"
+        input-id="player-follow"
+        @update:model-value="(v: boolean) => (playerFollow = v ? 'on' : 'off')"
+      />
+    </div>
     <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t('playerFollowHint') }}</p>
   </div>
 </template>
diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
index 7e1f5c5..03eca90 100644
--- a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -2,6 +2,11 @@
 import { tarkovTime } from '@shared/tarkov-time';
 import { useOverlayHeaderActive } from '@/features/overlay/composables/useOverlayHeaderActive';
 
+// Optional current-map name, merged into this always-visible chip so "where am
+// I" stays glanceable in every state (idle + locked) — the drag band only shows
+// the name on hover. Empty string = clock only (browser / non-overlay context).
+defineProps<{ mapDisplayName?: string }>();
+
 // Non-interactive info chip — stays visible even when the overlay is locked
 // (click-through), like the map itself. Ticks once a second.
 const clock = ref(tarkovTime(Date.now()));
@@ -30,12 +35,18 @@ const { active: headerActive } = useOverlayHeaderActive();
     aria-hidden="true"
   >
     <span
-      class="inline-flex items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur select-none"
+      class="inline-flex max-w-[16rem] items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur select-none"
     >
       <i class="pi pi-clock text-[10px] opacity-70" />
       <span>{{ clock.left }}</span>
       <span class="opacity-40">/</span>
       <span>{{ clock.right }}</span>
+      <template v-if="mapDisplayName">
+        <span class="mx-0.5 opacity-25">|</span>
+        <span class="max-w-[8.75rem] truncate font-sans text-[11px] font-medium opacity-90">
+          {{ mapDisplayName }}
+        </span>
+      </template>
     </span>
   </div>
 </template>
diff --git a/apps/client/src/main.ts b/apps/client/src/main.ts
index 8c429c3..9df77da 100644
--- a/apps/client/src/main.ts
+++ b/apps/client/src/main.ts
@@ -1,5 +1,6 @@
 import PrimeVue from 'primevue/config';
 import ConfirmationService from 'primevue/confirmationservice';
+import Tooltip from 'primevue/tooltip';
 import App from './App.vue';
 import { router } from '@/app/router';
 import { i18n } from '@/features/i18n';
@@ -57,4 +58,5 @@ app.use(PrimeVue, {
     },
   },
 });
+app.directive('tooltip', Tooltip);
 app.mount('#app');
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index 424cf1d..092057f 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -82,7 +82,7 @@ useServerEvent('command', (msg) => {
 
   <AirdropStatusBanner />
 
-  <TarkovTimeChip />
+  <TarkovTimeChip :map-display-name="showOverlayChrome ? mapDisplayName : ''" />
 
   <OverlayBorder v-if="showOverlayChrome && !overlayClickThrough" />
 

From d0fcff4e787be73457d9d9c6b857b4aaa8e9e152 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sat, 6 Jun 2026 01:35:22 +0300
Subject: [PATCH 35/53] docs: sync CLAUDE.md + READMEs with the on-map rail
 architecture

Bring the docs current with the overlay redesign committed in dcb1345:
settings split into the on-map LayerRail (layers) + a system-only gear drawer;
per-layer visibility (tc.layer.<id>.visible); floors moved into the rail +
Alt+wheel; coherent lock state (controls hide, read-outs stay) with the merged
clock+location pill; player follow simplified to on/off; edge arrows wrap the
rail. Also folds in earlier audit fixes (0.0.0.0 bind, minimize-to-tray, close
behaviour).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md             | 217 +++++++++++++++++++++++++++---------------
 README.md             |  32 ++++---
 apps/client/README.md |  11 ++-
 3 files changed, 167 insertions(+), 93 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 19e2d6f..0a8e94b 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -5,10 +5,10 @@
 - `apps/desktop` — Tauri 2 wrapper. The production artifact: Rust
   watcher/config pipeline (`src-tauri/src/server/`), the Tauri IPC
   commands the webview calls, AND an in-process HTTP server (axum) on
-  `127.0.0.1:47474` exposing `/api/ping`, `/api/config` (GET+PUT),
-  `/api/hotkeys` (GET+PUT, +suspend/resume) and `/events` (SSE). Single
-  6 MB `.exe` that ships as both the overlay
-  and the local HTTP backend for any browser pointed at the same
+  `0.0.0.0:47474` (binds all interfaces, trust model: same Wi-Fi = trusted)
+  exposing `/api/ping`, `/api/config` (GET+PUT), `/api/hotkeys` (GET+PUT,
+  +suspend/resume) and `/events` (SSE). Single 6 MB `.exe` that ships as both
+  the overlay and the local HTTP backend for any browser pointed at the same
   origin. See "In-process HTTP server" below.
 - `apps/client` — Vue + Leaflet map. Two transports, one codebase.
   Inside the Tauri webview: `invoke(...)` + `listen('position', ...)`.
@@ -176,25 +176,39 @@ key back in the running app.
 
 ## Map rendering layers
 
-`apps/client/src/features/map/` is split into two sibling folders by
-ownership:
+`apps/client/src/features/map/` is split into three sibling folders:
 
 - `composables/` — **framework hooks** for Leaflet/Vue plumbing:
-  `useLeafletMap`, `useFloorSwitcher`. Nothing here knows about extracts,
-  player markers, or future quest markers — pure map/Leaflet glue.
-- `layers/<name>/` — **domain layers** rendered on top of the map. Each
-  layer fully owns its concerns: data adapter, icon HTML, tooltip HTML,
-  the composable that wires it into Leaflet. All layers use a registry
-  pattern: `layers/registry.ts` exports `registerMapLayer()` and
-  `useMapLayers()`. Currently:
+  `useLeafletMap`. Nothing here knows about extracts, player markers, or future
+  quest markers — pure map/Leaflet glue.
+- `components/` — **UI surfaces** mounted by the page:
+  - `LayerRail.vue` — on-map left rail (vertically centered). Top icon = base map
+    selector flyout (MapSection component). Below that, one icon per layer **category**
+    (derived from registry `subgroup`: today only `player`, with `loot`/`quests`
+    dimmed future icons). Clicking a category icon opens a flyout listing its
+    layers: each row has a visibility `ToggleSwitch`, layer name, and a gear button
+    that expands that layer's settings component inline. Floor stepper at the rail's
+    bottom (multi-floor maps only) is a vertical ▲/level/▼. Rail hides when the
+    overlay is click-through-locked. When locked on a multi-floor map, a compact
+    read-only floor chip appears bottom-left. Flyouts position relative to the rail
+    via CSS `position: absolute; left: full; top: 1/2` (NOT `position: fixed`
+    which drifted in the Tauri WebView2 overlay).
+  - `MapView.vue` — mounts the Leaflet container, the LayerRail, and layer
+    composables. Wires Alt+mouse wheel (captured, throttled ~120ms) to step
+    floors instead of zooming on multi-floor maps.
+- `layers/<name>/` — **domain layers** rendered on top of the map. Each layer fully
+  owns its concerns: data adapter, icon HTML, tooltip HTML, the composable that
+  wires it into Leaflet. All layers use a registry pattern: `layers/registry.ts`
+  exports `registerMapLayer()` and `useMapLayers()`. Currently:
 
       layers/extracts/
         useExtractsLayer.ts     # Leaflet/Vue glue, data load, marker sync
         icon.ts                 # slice geometry + makeIcon (composite via CSS clip-path)
         tooltip.ts              # buildTooltipHtml + escapeHtml + sortedEntries
+        useEdgeIndicators.ts    # off-screen extract arrows; wraps left edge around the rail
         index.ts                # registerMapLayer call
       layers/player/
-        usePlayerLayer.ts       # player position marker + follow logic
+        usePlayerLayer.ts       # player position marker + recentering on follow
         index.ts                # registerMapLayer call
       layers/airdrop/
         useAirdropLayer.ts      # purple uncertainty circle around the predicted drop
@@ -203,11 +217,20 @@ ownership:
   Each `index.ts` calls `registerMapLayer({ id, mount })` at module load;
   `main.ts` loads all index files via `import.meta.glob('@/features/map/layers/*/index.ts', { eager: true })`.
   `MapView.vue` reads the registry with `useMapLayers()` and calls
-  `mount(ctx)` for each layer in setup(). When quest markers (or anything
-  else) get added later, create `layers/quests/{useQuestMarkers,icon,tooltip,index}.ts`
-  following the same pattern — no manual list to update. Airdrop's state
-  machine, tracker, and banner live in `features/airdrop/` — only the
-  Leaflet circle moved here. See "Airdrop feature" below.
+  `mount(ctx)` for each layer in setup(). `MapLayerContext` (in `layers/registry.ts`)
+  includes `visible: Ref<boolean>` driven by the LayerRail toggle; the layer composable
+  watches it and adds/removes its Leaflet root accordingly. When quest markers (or
+  anything else) get added later, create `layers/quests/{useQuestMarkers,icon,tooltip,index}.ts`
+  following the same pattern — no manual list to update. Airdrop's state machine,
+  tracker, and banner live in `features/airdrop/` — only the Leaflet circle moved here.
+  See "Airdrop feature" below.
+
+**Off-screen extract arrows** (`useEdgeIndicators.ts`): arrows render on the viewport
+edge pointing at extracts outside the visible bounds. On the overlay, the left edge
+wraps around the LayerRail — a left-edge arrow whose y falls within the rail's
+vertical span is pushed out to the rail's right edge (RAIL_GAP px beyond). Measured
+each frame via `.layer-rail` rect so arrows flow dynamically as the rail animates
+in/out on lock transitions.
 
 Extract markers are `L.divIcon` instances (not `L.icon`) — the composite
 PNG split via CSS `clip-path: polygon(...)` is built inline as HTML.
@@ -235,9 +258,8 @@ icon's top edge gives a few pixels of overlap for visual cohesion.
 marker — an SVG arrow (rotated by `yaw + mapRotation + yawOffset`) or
 a circle fallback when `yaw === null`. The marker isn't created until
 the first position arrives. On every position update with changed
-`(x, z, yaw)` and `playerFollow !== 'off'`, the map recenters and zooms
-to `initialZoom + FOLLOW_ZOOM_DELTA[mode]` — that's why `initialZoom`
-sits in `MapLayerContext`.
+`(x, z)` and `playerFollow === 'on'`, the map recenters (zoom stays
+fixed) — that's why `initialZoom` sits in `MapLayerContext`.
 
 ## Airdrop feature
 
@@ -286,9 +308,11 @@ Two surfaces read/write this state:
   axum server (see "In-process HTTP server" below). Same behaviour as
   the IPC commands, same `ResolvedPaths` shape.
 
-The HTTP server binds on `127.0.0.1:47474` — fixed port, no TCP
-exposure beyond loopback. LAN exposure is a future opt-in toggle
-(see "Future architecture").
+The HTTP server binds on `0.0.0.0:47474` — all interfaces, fixed port. Same-Wi-Fi
+machine browsers reach it via localhost/127.0.0.1 loopback; LAN phones reach it
+via the LAN IP. Trust model: same Wi-Fi = trusted (gated by `CorsLayer` for
+browser drive-by callers; LAN curl-equivalents unfiltered by design). See
+"In-process HTTP server" section for architectural reasoning.
 
 ## User settings
 
@@ -302,10 +326,11 @@ Persisted state lives in **per-feature** Pinia stores, not one big store:
     the `--extract-label-size` CSS variable on `<html>` from
     `useExtractsLayer` in `layers/extracts/useExtractsLayer.ts` — which also
     re-binds tooltips so Leaflet recomputes positions for the new height).
-  - `playerFollow` — `"off" | "sm" | "md" | "lg"` — auto-recenter + zoom on
-    every fresh position update. Wired in `layers/player/usePlayerLayer.ts`;
-    only re-centers when `(x, z)` actually changes (skips spam updates when
-    the player stands still). Zoom step: `initialZoom + FOLLOW_ZOOM_DELTA[mode]`.
+  - `edgeIndicators` — boolean, default false. Off-screen extract arrows; opt-in.
+  - `playerFollow` — `"off" | "on"` — auto-recenter map on every fresh position
+    update. Wired in `layers/player/usePlayerLayer.ts`; only recenters when
+    `(x, z)` actually changes (skips spam updates when the player stands still).
+    Zoom stays fixed at `initialZoom`.
   - `autoMapSwitch` — boolean, default `true`. When on, incoming
     `map-change` events from the logs watcher flip `mapCode` to whatever
     the game just loaded (resolved through `canonicalMapCode()` so
@@ -314,6 +339,11 @@ Persisted state lives in **per-feature** Pinia stores, not one big store:
     are silently dropped with one `console.warn`. Wiring lives in
     `features/map/composables/useAutoMapSwitch.ts`, mounted once at
     `App.vue` root.
+- **Per-layer visibility**: `composables/useLayerVisibility.ts` exports a
+  function that returns a shared `persistedRef('tc.layer.<id>.visible', z.boolean(), true)`
+  per layer id (module-level singleton). The LayerRail toggle and the layer
+  composable read/write the same ref. Consumed by `MapLayerContext.visible`
+  in `layers/registry.ts`.
 - `apps/client/src/features/i18n/store.ts` — `apiLang` (`"en" | "ru"`).
   The store's `watch(apiLang, ..., {immediate: true})` mirrors the value
   into vue-i18n's `locale`; `main.ts` calls `useI18nStore()` eagerly after
@@ -326,7 +356,8 @@ Persisted state lives in **per-feature** Pinia stores, not one big store:
   hotkeys" below.
 - `apps/client/src/features/overlay/store.ts` — Tauri-only:
   `alwaysOnTop`, `opacity` (0.3–1), `mapOpacity` (0–1), `zoom`
-  (`"75" | "100" | "125" | "150"`), plus a deliberately session-only
+  (`"75" | "100" | "125" | "150"`), `minimizeToTray` (default false; when on,
+  ✕ hides to tray instead of closing), plus a deliberately session-only
   `clickThrough` (plain `ref()`, not `persistedRef` — see note below).
 - `apps/client/src/features/airdrop/store.ts` — `dropMarkerRadius` (game
   meters, slider-bound in Settings). Wraps the airdrop state machine —
@@ -336,36 +367,44 @@ Each store uses `persistedRef` from `@/shared/persisted-store` with its
 own key (`tc.<feature>.<field>`) — corrupt persisted data falls back to
 defaults silently.
 
-**Session-only state.** `overlayClickThrough` intentionally does NOT
-use `persistedRef`. Booting into a locked overlay with a broken hotkey
-would be unrecoverable, so `App.vue` resets the value to `false` on
-every Tauri startup. Reach for plain `ref()` (not `persistedRef`) any
-time boot-time recoverability matters more than user-visible
-continuity; default to `persistedRef` everywhere else.
+**Session-only state.** `clickThrough` intentionally does NOT use `persistedRef`.
+Booting into a locked overlay with a broken hotkey would be unrecoverable, so
+`App.vue` resets the value to `false` on every Tauri startup. Reach for plain
+`ref()` (not `persistedRef`) any time boot-time recoverability matters more than
+user-visible continuity; default to `persistedRef` everywhere else.
 
 ## Settings UI registry
 
-Settings sections use a registry pattern similar to map layers: each feature
-that owns settings registers its UI section via `registerSettingsSection()`.
+Settings sections use a registry pattern similar to map layers, split into two
+surfaces: the on-map LayerRail (for layer toggles) and the gear drawer (for system config).
 
 - `features/settings/registry.ts` — `registerSettingsSection()` and
-  `useSettingsSections(group)`. Visibility logic: `'always'` (desktop +
-  phone, default), `'tauri'` (overlay only), `'desktop-or-tauri'` (phone at
-  ≥640px or overlay). Order uses multiples of 10. Currently:
-  - main: 10 map, 20 extracts, 30 player, 40 airdrop (tauri-only), 50 overlay (tauri-only), 60 hotkeys (desktop-or-tauri)
-  - system: 10 language, 20 paths (desktop-or-tauri)
+  `useSettingsSections(group)` with `SectionGroup = 'layers' | 'system'` (renamed from
+  `'settings'`). Added `SectionSubgroup = 'player' | 'loot' | 'quests'` and optional
+  `subgroup` field on `SettingsSection`. Visibility logic: `'always'` (desktop + phone,
+  default), `'tauri'` (overlay only), `'desktop-or-tauri'` (phone at ≥640px or overlay).
+  Order uses multiples of 10. Registry also requires a `titleKey` (i18n string for the
+  section label). Currently:
+  - layers: 10 map (no subgroup) · 20 player, 30 extracts, 40 airdrop (subgroup `player`)
+  - system: 10 overlay (tauri-only), 20 hotkeys (desktop-or-tauri), 30 language, 40 paths (desktop-or-tauri), 50 pairing (tauri-only)
 - `features/<name>/settings.ts` — each feature with settings calls
-  `registerSettingsSection({ id, group, order, visible, component })` at
-  module load. Currently: `map`, `airdrop`, `overlay`, `hotkeys`, `i18n`,
-  `server` (each maps to a section component under
-  `features/settings/sections/`).
+  `registerSettingsSection({ id, group, order, titleKey, visible, component })` at
+  module load. The `subgroup` field (if present) gates the category under which it
+  appears in the LayerRail; sections with the same subgroup render together.
 - `main.ts` loads all registration files via
   `import.meta.glob('@/features/*/settings.ts', { eager: true })`.
-- `SettingsPanel.vue` — gear icon in the top-right cluster next to the
-  transport-status pill (`App.vue`), opens a PrimeVue `Drawer` (right-side on
-  desktop, `position="full"` on `<640px`). Iterates `useSettingsSections('main')`
-  and `useSettingsSections('system')` to build the drawer — no hard-coded list
-  of sections.
+- **LayerRail** (`components/LayerRail.vue`) — on-map left rail. Renders `layers`
+  group sections: the map selector at the top (order 10, no subgroup), then one
+  icon per subgroup (player, loot, quests) derived from sections below. Clicking a
+  subgroup icon opens a flyout listing its layers, each with a visibility toggle +
+  settings gear. Empty subgroups (loot, quests) render as dimmed future icons.
+- **Gear drawer** (`features/settings/SettingsPanel.vue`) — opens from the top-right
+  cluster (SettingsPanel button). A **non-modal** PrimeVue `Drawer` (right-side on
+  desktop, bottom-sheet on `<640px` with `position="bottom"`). Renders `system` group
+  sections only in a single flat **Accordion**. Open-panel state persists (`tc.settings.open`,
+  keyed by section id). Desktop starts with all sections open; overlay/phone start
+  collapsed to keep the sheet short. Iterates `useSettingsSections('system')` — no
+  hard-coded list.
 
 Faction colours come from `FACTION_COLORS` in `packages/shared/src/maps.ts`
 so icons and tooltip stripes never drift across components.
@@ -389,29 +428,42 @@ is a no-op so the same code path serves both.
 
 **Overlay controls** (only rendered when `isTauri`):
 
-- **Drag region** — the transport-status pill in `App.vue`'s top-right cluster.
-  Uses an explicit `@mousedown` handler that calls `getCurrentWindow().
-startDragging()` rather than `data-tauri-drag-region` attribute, which
-  is flaky on `decorations: false + transparent: true` windows. Child
-  `<i>` and `<span>` inside the pill have `pointer-events: none` so the
-  drag start always lands on the pill itself.
-- **Close** — red ✕ button next to the gear; runs through a PrimeVue
-  `ConfirmDialog` so an accidental click can't kill the session (close
-  sits right next to settings).
-- **Lock / click-through** — bottom-right corner: a `[Ctrl][Alt][L]` Kbd
-  hint plus a lock button (`pi-lock-open` ↔ `pi-lock`). State lives on
-  `overlayClickThrough` in the store. Click on the open lock locks the
-  window; **only the global hotkey can unlock it**, because once
-  click-through is on the lock button itself isn't clickable. App.vue
-  _always_ resets `overlayClickThrough` to `false` on Tauri startup —
-  the locked state intentionally doesn't persist across sessions, so
-  the app can't boot into an unrecoverable lockout.
-- **Opacity slider** — calls `Window.setOpacity()` (Windows Layered
-  Window API). If the call rejects (the permission `core:window:
-allow-set-opacity` doesn't exist in Tauri 2.11.x), the composable
-  silently falls back to `document.documentElement.style.opacity` so the
-  slider remains visually responsive.
-- **Zoom** — `WebviewWindow.setZoom(factor)`.
+**Unlocked state:**
+- **Drag region** — the entire top bar (OverlayHeader.vue) is clickable and grabbable.
+  Uses an explicit `@mousedown` handler that calls `getCurrentWindow().startDragging()`
+  rather than `data-tauri-drag-region` attribute, which is flaky on `decorations: false +
+  transparent: true` windows. Idle, only a small nub shows; hovering/dragging reveals
+  two separate zones as flex siblings: a drag pill (left, flex-1, visual only with "move"
+  label) and the control cluster (right, auto-width with pointer events). The transport
+  status dot, settings gear, and close button all live in the cluster; only the drag
+  pill is pointer-disabled.
+- **Close** — red ✕ button. With `minimizeToTray` off (default), runs through a
+  PrimeVue `ConfirmDialog` so an accidental click can't kill the session. With it on,
+  hides the window to the system tray (reversible via the tray's Show item) with no
+  confirm.
+- **Settings gear** — opens the system settings drawer (right-side desktop, bottom-sheet
+  phone/overlay).
+- **Opacity slider** — in the gear drawer (`OverlaySection.vue`), calls
+  `Window.setOpacity()` (Windows Layered Window API). If the call rejects (the permission
+  `core:window:allow-set-opacity` doesn't exist in Tauri 2.11.x), the composable
+  silently falls back to `document.documentElement.style.opacity` so the slider remains
+  visually responsive.
+- **Zoom** — in the gear drawer, calls `WebviewWindow.setZoom(factor)`.
+
+**Locked state (click-through):**
+- **Rails & controls hide** — the top band vanishes, the LayerRail hides, and animated
+  borders disappear for a clean map-only view.
+- **Read-outs stay visible** — the clock+location pill (TarkovTimeChip, top-left),
+  the connection status dot (OverlayHeader), the floor stepper chip (LayerRail,
+  bottom-left on multi-floor maps), and the lock hotkey hint (OverlayLockIndicator,
+  bottom-right) remain always-visible.
+- **Unlock** — bottom-right corner: a `[Ctrl][Alt][L]` Kbd hint plus a lock button
+  (`pi-lock-open` ↔ `pi-lock` in OverlayLockIndicator). State lives on `clickThrough`
+  in the store. Click on the open lock or press the hotkey to toggle. **Only the
+  global hotkey can unlock it** because once click-through is on the lock button itself
+  isn't clickable (intentional escape hatch). App.vue _always_ resets `clickThrough` to
+  `false` on Tauri startup — the locked state intentionally doesn't persist across
+  sessions, so the app can't boot into an unrecoverable lockout.
 
 **Lock global shortcut** is the ONLY client-registered hotkey:
 `useGlobalShortcut` (via `@tauri-apps/plugin-global-shortcut`) binds
@@ -422,6 +474,15 @@ a click-through lockout. Handler fires on both `Pressed` and `Released`
 — toggle only on `Pressed`. **Every other hotkey is backend-owned** —
 see "Backend-owned hotkeys" below.
 
+**Floor switching** (multi-floor maps only) — three paths:
+- **GUI**: the floor stepper (▲/▼) at the bottom of the LayerRail.
+- **Hotkey**: backend-owned `floor-up`/`floor-down` actions (always global, even while
+  the game is focused).
+- **Quick**: Alt + mouse wheel over the map (MapView.vue, captured in the capture phase
+  before Leaflet's wheel-zoom, throttled ~120ms so trackpad doesn't skip floors).
+  The floor stepper reads the current floor; locking the overlay hides the rail's
+  stepper but keeps the read-only bottom-left floor chip, and hotkeys still work.
+
 **Capabilities** (`apps/desktop/src-tauri/capabilities/default.json`)
 must include the privileged window ops explicitly — `core:default`
 covers basics only:
@@ -431,7 +492,13 @@ core:window:allow-set-always-on-top
 core:window:allow-set-ignore-cursor-events
 core:window:allow-close
 core:window:allow-start-dragging
+core:window:allow-hide
+core:window:allow-show
+core:window:allow-set-focus
 core:webview:allow-set-webview-zoom
+core:tray:default
+core:menu:default
+core:app:allow-default-window-icon
 global-shortcut:allow-register
 global-shortcut:allow-unregister
 global-shortcut:allow-is-registered
diff --git a/README.md b/README.md
index 379d5cf..e9dd54f 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ A live in-raid map companion for Escape from Tarkov. The overlay watches your Ta
 3. Double-click to launch. On first run, the overlay auto-detects your Tarkov installation via the Windows registry. If that fails, manually set the paths in **Settings → Tarkov paths**.
 4. In Tarkov, press **PrintScreen** during a raid. The screenshot drops into your Tarkov screenshots folder, and the overlay reads its filename to update your position on the map.
 
-**Data storage**: settings and cache live in `%APPDATA%/tarkov-checker/`. Closing the window fully exits the app — nothing lingers in Task Manager.
+**Data storage**: settings and cache live in `%APPDATA%/tarkov-checker/`. By default, closing the window exits the app. Optionally, enable "Minimize to tray" in Settings to hide the window to the system tray instead of closing (the tray icon's "Show" restores it, "Quit" exits).
 
 ### Developers
 
@@ -70,7 +70,7 @@ If auto-detect fails, fill in **Game folder** in Settings and click **Save**. Wa
 
 ## Feature Details
 
-**Live player position**: The overlay monitors your Tarkov screenshots folder. Each PrintScreen you take in-raid embeds your world position (x, z coordinates) and viewing direction (quaternion) in the filename. The overlay parses this, places a directional arrow on the correct map at the correct rotation, and optionally auto-recenters and zooms to follow you (configurable: Off / Small / Medium / Large).
+**Live player position**: The overlay monitors your Tarkov screenshots folder. Each PrintScreen you take in-raid embeds your world position (x, z coordinates) and viewing direction (quaternion) in the filename. The overlay parses this, places a directional arrow on the correct map at the correct rotation, and optionally auto-recenters to follow you (toggle on/off in the Player section of Settings).
 
 **Auto-map switching**: The overlay tails your active Tarkov session log and detects scene-preset and Transit-location lines. When you load into a raid, it automatically flips the displayed map to match. This includes aliases for maps renamed in patch 1.0.5.0 (Factory, Reserve, Interchange). Toggle in Settings; enabled by default.
 
@@ -78,17 +78,19 @@ If auto-detect fails, fill in **Game folder** in Settings and click **Save**. Wa
 
 **Extracts overlay**: displays every known extract on every map with faction filtering (PMC / Scav / Shared) and label customization (always visible or on hover). Uses the same faction-color scheme across all UI elements.
 
-**Multi-floor maps**: Most maps have floor switchers (Customs, Factory, Shoreline, Reserve, Interchange, Streets, The Lab, Ground Zero). Woods and Lighthouse are single-level. Navigate with UI buttons or hotkeys to toggle between levels.
+**Multi-floor maps**: Most maps have floor switchers (Customs, Factory, Shoreline, Reserve, Interchange, Streets, The Lab, Ground Zero). Woods and Lighthouse are single-level. Switch floors via the stepper in the left-side layer rail, or hold **Alt** and scroll your mouse wheel over the map. Dedicated hotkeys (Floor-up/Floor-down) also work.
 
 **Window controls** (desktop overlay only):
 
 - **Drag** the transport-status pill in the top-right to move the overlay
-- **Click-through lock** (Ctrl+Alt+L) — toggle whether mouse clicks pass through to the game underneath
+- **Layer rail** (left edge of map) — quick toggles to show/hide player position, extracts, airdrop markers. Each layer has a gear icon to open its settings.
+- **Settings button** (gear in top-right cluster) — app/system preferences: overlay opacity, hotkeys, language, Tarkov paths, pairing. Layer settings are accessed via the rail.
+- **Click-through lock** (Ctrl+Alt+L) — toggle whether mouse clicks pass through to the game underneath. When locked, the interactive controls hide but glanceable readouts remain: Tarkov time, map name, connection status, floor indicator (top-left), and the unlock hotkey hint (bottom-right).
 - **Always-on-top** — keep the overlay above Tarkov even when the game window is focused
 - **Opacity slider** — adjust overall window transparency (30–100%). Map area and other UI elements fade uniformly.
-- **Map opacity slider** — independently adjust map transparency while keeping UI controls solid (0–100%, Tauri only)
+- **Map opacity slider** — independently adjust map transparency while keeping UI controls solid (0–100%)
 - **Zoom** — scale the entire UI
-- **Close** button with confirmation to prevent accidental exits
+- **Close** button with confirmation (unless "Minimize to tray" is enabled, then it hides to the tray)
 
 ## Supported Maps
 
@@ -98,7 +100,7 @@ Customs, Factory (Day/Night), Woods, Shoreline, Reserve, Interchange, Lighthouse
 
 The project consists of:
 
-- **Tauri 2 desktop wrapper** (`apps/desktop`) — native window management, file watchers, screenshot parser, log tailer, in-process HTTP server (Rust + axum) on `127.0.0.1:47474`, IPC bridge to the web UI
+- **Tauri 2 desktop wrapper** (`apps/desktop`) — native window management, file watchers, screenshot parser, log tailer, in-process HTTP server (Rust + axum) on `0.0.0.0:47474`, IPC bridge to the web UI
 - **Vue 3 + Leaflet map** (`apps/client`) — interactive map rendering, extract markers, player position arrow, UI controls; talks to the helper via Tauri IPC inside the overlay and via HTTP + SSE when opened in a regular browser
 - **Shared modules** (`packages/shared`) — map calibration data, position/event schemas, log parser, type definitions
 
@@ -153,7 +155,7 @@ See [LICENSE](./LICENSE).
 3. Запусти двойным кликом. При первом запуске оверлей автоматически обнаружит твою установку Tarkov через реестр Windows. Если не получится, вручную укажи пути в **Settings → Tarkov paths**.
 4. В Tarkov нажми **PrintScreen** во время рейда. Скриншот упадёт в папку скриншотов Tarkov, а оверлей прочитает имя файла и обновит твою позицию на карте.
 
-**Хранение данных**: настройки и кэш живут в `%APPDATA%/tarkov-checker/`. Закрытие окна полностью завершает приложение — ничего не остаётся в Диспетчере задач.
+**Хранение данных**: настройки и кэш живут в `%APPDATA%/tarkov-checker/`. По умолчанию закрытие окна завершает приложение. Опционально включи "Minimize to tray" в Settings, чтобы скрыть окно в системный трей вместо закрытия (пункт "Show" в меню трея его восстанавливает, "Quit" завершает приложение).
 
 ### Для разработчиков
 
@@ -193,7 +195,7 @@ pnpm --filter @tarkov-checker/desktop tauri:dev
 
 ## Подробное описание функций
 
-**Отслеживание позиции игрока**: оверлей мониторит папку скриншотов Tarkov. Каждый PrintScreen во время рейда содержит в имени файла твои мировые координаты (x, z) и направление взгляда (кватернион). Оверлей парсит это, ставит стрелку на правильную карту под правильным углом и опционально автоцентрирует и приближает вид, чтобы следить за тобой (настраивается: Выключено / Малый / Средний / Большой).
+**Отслеживание позиции игрока**: оверлей мониторит папку скриншотов Tarkov. Каждый PrintScreen во время рейда содержит в имени файла твои мировые координаты (x, z) и направление взгляда (кватернион). Оверлей парсит это, ставит стрелку на правильную карту под правильным углом и опционально автоцентрирует вид, чтобы следить за тобой (включается/выключается в разделе Player в Settings).
 
 **Автосмена карт**: оверлей отслеживает активный лог сессии Tarkov и ловит строки scene-preset и Transit-location. Когда ты загружаешься в рейд, отображаемая карта автоматически переключается. Это включает поддержку переименованных в патче 1.0.5.0 карт (Factory, Reserve, Interchange). Включается в Settings; по умолчанию включено.
 
@@ -201,17 +203,19 @@ pnpm --filter @tarkov-checker/desktop tauri:dev
 
 **Оверлей выходов**: отображает все известные выходы на каждой карте с фильтром по фракциям (PMC / Scav / Shared) и настройкой видимости подписей (всегда или при наведении). Использует одну цветовую схему фракций по всему интерфейсу.
 
-**Многоэтажные карты**: на большинстве карт есть переключатели этажей (Customs, Factory, Shoreline, Reserve, Interchange, Streets, The Lab, Ground Zero). Woods и Lighthouse одноуровневые. Навигируй кнопками UI или хоткеями между уровнями.
+**Многоэтажные карты**: на большинстве карт есть переключатели этажей (Customs, Factory, Shoreline, Reserve, Interchange, Streets, The Lab, Ground Zero). Woods и Lighthouse одноуровневые. Переключай этажи через степпер на левом rail-е карты, или зажми **Alt** и крутни колёсико мыши над картой. Работают и отдельные хоткеи (Floor-up/Floor-down).
 
 **Управление окном** (только десктоп-оверлей):
 
 - **Перетаскивание**: транспортный статус в правом верхнем углу — перетащи, чтобы переместить оверлей
-- **Блокировка клика** (Ctrl+Alt+L) — переключай, проходят ли клики мышки сквозь окно в игру
+- **Layer rail** (левый край карты) — быстрые переключатели для показа/скрытия позиции игрока, выходов, маркеров дропа. У каждого слоя есть иконка шестерёнки для его настроек.
+- **Кнопка Settings** (шестерёнка в правом верхнем кластере) — параметры приложения и системы: прозрачность оверлея, хоткеи, язык, пути Tarkov, pairing. Настройки слоёв открываются через rail.
+- **Блокировка клика** (Ctrl+Alt+L) — переключай, проходят ли клики мышки сквозь окно в игру. Когда заблокирован, интерактивные элементы скрываются, но видная информация остаётся: время Tarkov, имя карты, статус соединения, индикатор этажа (левый верхний угол) и подсказка по хоткею разблокировки (правый нижний угол).
 - **Поверх всех окон** — держи оверлей над Tarkov, даже когда окно игры в фокусе
 - **Ползунок прозрачности** — изменяй общую видимость окна (30–100%). Карта и весь интерфейс исчезают равномерно.
-- **Ползунок прозрачности карты** — независимо изменяй видимость карты, сохраняя UI элементы непрозрачными (0–100%, только Tauri)
+- **Ползунок прозрачности карты** — независимо изменяй видимость карты, сохраняя UI элементы непрозрачными (0–100%)
 - **Масштаб** — меняй размер всего интерфейса
-- **Кнопка закрытия** с подтверждением, чтобы не закрыть случайно
+- **Кнопка закрытия** с подтверждением (если не включена опция "Minimize to tray", тогда скрывает в трей)
 
 ## Поддерживаемые карты
 
@@ -221,7 +225,7 @@ Customs, Factory (День/Ночь), Woods, Shoreline, Reserve, Interchange, Li
 
 Проект состоит из:
 
-- **Tauri 2 десктоп-обёртка** (`apps/desktop`) — управление окнами, слежение за файлами, парсинг скриншотов, отслеживание логов, in-process HTTP-сервер (Rust + axum) на `127.0.0.1:47474`, IPC-мост к веб-интерфейсу
+- **Tauri 2 десктоп-обёртка** (`apps/desktop`) — управление окнами, слежение за файлами, парсинг скриншотов, отслеживание логов, in-process HTTP-сервер (Rust + axum) на `0.0.0.0:47474`, IPC-мост к веб-интерфейсу
 - **Vue 3 + Leaflet карта** (`apps/client`) — интерактивный рендеринг карты, маркеры выходов, стрелка позиции игрока, управление UI; внутри оверлея общается с хелпером через Tauri IPC, в обычном браузере — через HTTP + SSE
 - **Общие модули** (`packages/shared`) — калибровка карт, схемы позиций/событий, парсер логов, определения типов
 
diff --git a/apps/client/README.md b/apps/client/README.md
index 235a7eb..1a9d257 100644
--- a/apps/client/README.md
+++ b/apps/client/README.md
@@ -21,7 +21,7 @@ Specifics about Tauri internals, Windows build quirks, and dev workflow live in
 app/        Composition root — router config.
 pages/      File-based routes. Add a *.vue here → it becomes a route. typed-router.d.ts is regenerated on dev/build.
 features/   One folder per business feature, each fully owns its slice:
-  map/         Leaflet map framework (useLeafletMap, useFloorSwitcher), layers registry + built-in layers (extracts/player/airdrop), MapView component, static extracts dataset (data/extracts/<code>.json — one file per canonical map)
+  map/         Leaflet map framework (useLeafletMap, useLayerVisibility), layers registry + built-in layers (extracts/player/airdrop), MapView + LayerRail components, static extracts dataset (data/extracts/<code>.json — one file per canonical map)
   airdrop/     Airdrop triangulation state machine, screenshot tracker, settings section
   overlay/     Tauri overlay window controls, opacity/zoom/mapOpacity sync, tray icon, overlay-specific components
   hotkeys/     Backend-owned combos synced via thin store (fetch/PUT), HotkeyRecorder, accelerator parser; only the overlay lock stays client-registered
@@ -93,8 +93,10 @@ For nested or dynamic routes (`/raids/[id]`), see [Vue Router file-based docs](h
      import { registerSettingsSection } from '@/features/settings/registry';
      registerSettingsSection({
        id: '<name>',
-       group: 'main', // or 'system'
-       order: 30, // multiples of 10
+       group: 'layers', // 'layers' (map/layer toggles on LayerRail) or 'system' (app config in gear drawer)
+       subgroup: 'player', // optional: 'player' | 'loot' | 'quests' (layers group only); omit for 'system' and for map
+       order: 30, // multiples of 10; layers: 10 map · 20 player, 30 extracts, 40 airdrop; system: 10 overlay, 20 hotkeys, 30 language, 40 paths, 50 pairing
+       titleKey: 'xxx.heading', // i18n key for the section title
        visible: 'always', // or 'tauri', 'desktop-or-tauri'
        component: XxxSection,
      });
@@ -103,6 +105,7 @@ For nested or dynamic routes (`/raids/[id]`), see [Vue Router file-based docs](h
 6. If the feature adds a map layer (new extract/player marker/etc):
    - Create `src/features/map/layers/<name>/` with `useXxxLayer.ts` and `index.ts`.
    - Call `registerMapLayer({ id, mount: useXxxLayer })` in `index.ts`.
+   - Inside your composable, get the visibility ref via `useLayerVisibility(id)` from `composables/useLayerVisibility.ts` and `watch(visible, ...)` to add/remove your Leaflet root when toggled. The `MapLayerContext.visible` ref is wired to the on-map LayerRail toggle.
    - `main.ts` auto-discovers via `import.meta.glob('@/features/map/layers/*/index.ts', { eager: true })`.
 
 ### Add a new locale
@@ -186,7 +189,7 @@ pnpm lint       # eslint --max-warnings=0
 - **Tarkov map calibration** (CRS, bounds, rotation) — [`@shared/maps`](../../packages/shared/src/maps.ts). Modifying calibration affects both desktop and browser.
 - **Map localization** — `useMapI18n()` composable in [`features/map/composables/useMapI18n.ts`](./src/features/map/composables/useMapI18n.ts) provides `localizedMapName(code)` with `te → t → displayName` fallback chain. Used in MapView + MapSection to stay in sync.
 - **HTTP / IPC** — single dispatch in [`features/server/api/transport.ts`](./src/features/server/api/transport.ts).
-- **Settings registry** — `registerSettingsSection()` in [`features/settings/registry.ts`](./src/features/settings/registry.ts). Each feature calls this at module load via `features/<name>/settings.ts`. Auto-discovered by `main.ts`.
+- **Settings registry** — `registerSettingsSection()` in [`features/settings/registry.ts`](./src/features/settings/registry.ts) with `group: 'layers'` (on-map LayerRail) or `group: 'system'` (gear drawer). Each feature calls this at module load via `features/<name>/settings.ts`. Auto-discovered by `main.ts`. `'layers'` sections render in the LayerRail flyout with inline visibility toggles; `'system'` sections render in the SettingsPanel drawer as accordion items.
 - **Map layers registry** — `registerMapLayer()` in [`features/map/layers/registry.ts`](./src/features/map/layers/registry.ts). Each layer calls this via `features/map/layers/<name>/index.ts`. Auto-discovered by `main.ts`; mounted by `MapView.vue` in setup().
 
 ## See also

From 3a3e96e3f0a1e30a5978a1fcbc5cbb75ee2119e7 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sat, 6 Jun 2026 01:55:46 +0300
Subject: [PATCH 36/53] fix(overlay): review fixes - visibility persistence,
 floor direction, cleanup

From the architecture + code review of dcb1345:

- useLayerVisibility: create the per-layer persistedRefs in a DETACHED
  effectScope so each one's localStorage watch survives MapView's `:key`
  remount on map switch. Previously the watch was captured by MapView's setup
  scope and died after the first map switch, silently stopping visibility
  persistence (real regression in a user-facing setting).
- Floors: rename nextFloor/prevFloor -> floorUp/floorDown and CLAMP (no
  wrap-around). Up now means a higher floor everywhere - the floor-up hotkey
  and the rail's up button were moving in opposite directions, and the hotkey
  wrapped while the rail clamped.
- Remove dead FloorSwitcher.vue (replaced by the in-rail floor stepper).
- Drop the orphaned settingsGroups.system i18n key (en/ru).
- CLAUDE.md: restore useFloorSwitcher (+ useLayerVisibility) in the
  composables list.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md                                     |   4 +-
 apps/client/src/features/i18n/locales/en.json |   3 +-
 apps/client/src/features/i18n/locales/ru.json |   3 +-
 .../features/map/components/FloorSwitcher.vue | 102 ------------------
 .../src/features/map/components/MapView.vue   |   6 +-
 .../map/composables/useFloorSwitcher.ts       |  24 +++--
 .../map/composables/useLayerVisibility.ts     |  26 +++--
 apps/client/src/pages/index.vue               |   4 +-
 8 files changed, 40 insertions(+), 132 deletions(-)
 delete mode 100644 apps/client/src/features/map/components/FloorSwitcher.vue

diff --git a/CLAUDE.md b/CLAUDE.md
index 0a8e94b..3694f8c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -179,8 +179,8 @@ key back in the running app.
 `apps/client/src/features/map/` is split into three sibling folders:
 
 - `composables/` — **framework hooks** for Leaflet/Vue plumbing:
-  `useLeafletMap`. Nothing here knows about extracts, player markers, or future
-  quest markers — pure map/Leaflet glue.
+  `useLeafletMap`, `useFloorSwitcher`, `useLayerVisibility`. Nothing here knows
+  about extracts, player markers, or future quest markers — pure map/Leaflet glue.
 - `components/` — **UI surfaces** mounted by the page:
   - `LayerRail.vue` — on-map left rail (vertically centered). Top icon = base map
     selector flyout (MapSection component). Below that, one icon per layer **category**
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index eb5083b..86efda0 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -33,8 +33,7 @@
   "settingsGroups": {
     "player": "Player",
     "loot": "Loot",
-    "quests": "Quests",
-    "system": "System"
+    "quests": "Quests"
   },
   "close": "Close",
   "floorWheelHint": "Floor — Alt + scroll to change",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index e2e12b9..6d1058e 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -33,8 +33,7 @@
   "settingsGroups": {
     "player": "Игрок",
     "loot": "Лут",
-    "quests": "Квесты",
-    "system": "Система"
+    "quests": "Квесты"
   },
   "close": "Закрыть",
   "floorWheelHint": "Уровень — Alt + колесо для смены",
diff --git a/apps/client/src/features/map/components/FloorSwitcher.vue b/apps/client/src/features/map/components/FloorSwitcher.vue
deleted file mode 100644
index 7bf9d6b..0000000
--- a/apps/client/src/features/map/components/FloorSwitcher.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<script setup lang="ts">
-interface Floor {
-  readonly id: string;
-  readonly label: string;
-}
-
-const props = defineProps<{
-  floors: ReadonlyArray<Floor>;
-  current: string | null;
-}>();
-
-const { t } = useI18n();
-
-// Touch devices (phone) need bigger tap targets than the small mouse buttons.
-const coarse = useMediaQuery('(pointer: coarse)');
-
-const emit = defineEmits<{
-  (e: 'select', id: string): void;
-}>();
-
-const open = ref(false);
-const root = ref<HTMLElement | null>(null);
-
-const currentLabel = computed(() => {
-  const match = props.floors.find((f) => f.id === props.current);
-  return match?.label ?? props.floors[0]?.label ?? '';
-});
-
-function toggle(): void {
-  open.value = !open.value;
-}
-function select(id: string): void {
-  emit('select', id);
-  open.value = false;
-}
-function onDocumentClick(event: MouseEvent): void {
-  if (!open.value) return;
-  if (root.value && !root.value.contains(event.target as Node)) {
-    open.value = false;
-  }
-}
-function onKey(event: KeyboardEvent): void {
-  if (event.key === 'Escape' && open.value) open.value = false;
-}
-onMounted(() => {
-  document.addEventListener('mousedown', onDocumentClick);
-  document.addEventListener('keydown', onKey);
-});
-onBeforeUnmount(() => {
-  document.removeEventListener('mousedown', onDocumentClick);
-  document.removeEventListener('keydown', onKey);
-});
-</script>
-
-<template>
-  <div ref="root" class="relative">
-    <Transition
-      enter-active-class="transition duration-150 ease-out"
-      enter-from-class="opacity-0 translate-y-1"
-      enter-to-class="opacity-100 translate-y-0"
-      leave-active-class="transition duration-100 ease-in"
-      leave-from-class="opacity-100 translate-y-0"
-      leave-to-class="opacity-0 translate-y-1"
-    >
-      <div
-        v-if="open"
-        class="absolute bottom-12 left-0 flex flex-col"
-        :class="coarse ? 'gap-2' : 'gap-1.5'"
-        role="listbox"
-        aria-orientation="vertical"
-        :aria-label="t('floor')"
-      >
-        <Button
-          v-for="floor in floors"
-          :key="floor.id"
-          rounded
-          :size="coarse ? undefined : 'small'"
-          :class="coarse ? 'min-h-[44px] min-w-[44px]' : ''"
-          :severity="floor.id === current ? 'primary' : 'secondary'"
-          :label="floor.label"
-          role="option"
-          :aria-selected="floor.id === current"
-          :aria-label="'Floor ' + floor.label"
-          @click="select(floor.id)"
-        />
-      </div>
-    </Transition>
-
-    <Button
-      :size="coarse ? undefined : 'small'"
-      severity="secondary"
-      class="!bg-surface-800/80 hover:!bg-surface-800 !border-surface-700 backdrop-blur"
-      :class="coarse ? 'min-h-[44px]' : ''"
-      :aria-expanded="open"
-      aria-haspopup="listbox"
-      :aria-label="t('floor')"
-      @click="toggle"
-    >
-      {{ t('floor') }}: {{ currentLabel }}
-    </Button>
-  </div>
-</template>
diff --git a/apps/client/src/features/map/components/MapView.vue b/apps/client/src/features/map/components/MapView.vue
index 454d4b4..35343b8 100644
--- a/apps/client/src/features/map/components/MapView.vue
+++ b/apps/client/src/features/map/components/MapView.vue
@@ -29,8 +29,8 @@ const {
   setActiveFloor,
   zoomIn,
   zoomOut,
-  nextFloor,
-  prevFloor,
+  floorUp,
+  floorDown,
   reload,
 } = useLeafletMap(mapContainer, props.mapCode);
 
@@ -66,7 +66,7 @@ useEventListener(
   { capture: true, passive: false },
 );
 
-defineExpose({ zoomIn, zoomOut, nextFloor, prevFloor, reload });
+defineExpose({ zoomIn, zoomOut, floorUp, floorDown, reload });
 
 watch(
   locale,
diff --git a/apps/client/src/features/map/composables/useFloorSwitcher.ts b/apps/client/src/features/map/composables/useFloorSwitcher.ts
index f046f7a..853004f 100644
--- a/apps/client/src/features/map/composables/useFloorSwitcher.ts
+++ b/apps/client/src/features/map/composables/useFloorSwitcher.ts
@@ -11,8 +11,10 @@ interface FloorInfo {
 export interface UseFloorSwitcher {
   currentFloor: Ref<string | null>;
   setActiveFloor: (id: string) => void;
-  nextFloor: () => void;
-  prevFloor: () => void;
+  /** Step to a higher floor (toward the top of the list); clamps at the topmost. */
+  floorUp: () => void;
+  /** Step to a lower floor (toward the bottom); clamps at the lowest. */
+  floorDown: () => void;
 }
 
 /**
@@ -70,25 +72,27 @@ export function useFloorSwitcher(
     currentFloor.value = id;
   }
 
+  // Floors are ordered top-to-bottom (index 0 = highest), so "up" steps toward
+  // index 0. Clamp at both ends — no wrap-around, so repeated presses at the top
+  // or bottom do nothing (matches the rail stepper's disabled-at-edge buttons).
   function shiftFloor(delta: 1 | -1): void {
     const floorIds = floors.map((f) => f.id);
     if (floorIds.length <= 1) return;
     const active = currentFloor.value ?? defaultFloor;
     if (active === null) return;
-    const idx = floorIds.indexOf(active);
-    // Wrap around so repeated presses cycle the list.
-    const nextIdx = (idx + delta + floorIds.length) % floorIds.length;
+    const nextIdx = floorIds.indexOf(active) + delta;
+    if (nextIdx < 0 || nextIdx >= floorIds.length) return;
     const next = floorIds[nextIdx];
     if (next) setActiveFloor(next);
   }
 
-  function nextFloor(): void {
-    shiftFloor(1);
+  function floorUp(): void {
+    shiftFloor(-1);
   }
 
-  function prevFloor(): void {
-    shiftFloor(-1);
+  function floorDown(): void {
+    shiftFloor(1);
   }
 
-  return { currentFloor, setActiveFloor, nextFloor, prevFloor };
+  return { currentFloor, setActiveFloor, floorUp, floorDown };
 }
diff --git a/apps/client/src/features/map/composables/useLayerVisibility.ts b/apps/client/src/features/map/composables/useLayerVisibility.ts
index 35fcbdd..4d5604b 100644
--- a/apps/client/src/features/map/composables/useLayerVisibility.ts
+++ b/apps/client/src/features/map/composables/useLayerVisibility.ts
@@ -1,17 +1,25 @@
 import { z } from 'zod';
-import type { Ref } from 'vue';
+import { effectScope, type Ref } from 'vue';
 import { persistedRef } from '@/shared/persisted-store';
 
-// One shared visibility ref per layer id (module-level singleton) so the
-// on-map LayerRail toggle and the Leaflet layer composable read/write the SAME
-// ref. Persisted, so a hidden layer stays hidden across sessions.
+// One shared visibility ref per layer id (module-level singleton) so the on-map
+// LayerRail toggle and the Leaflet layer composable read/write the SAME ref.
+//
+// Created inside a DETACHED effect scope so the localStorage watch that
+// `persistedRef` installs lives for the whole process. Created naively, that
+// watch is owned by whichever component first calls this (MapView's setup) and
+// gets disposed on the next map switch (`:key="mapCode"` remount) — silently
+// stopping persistence. This scope is never stopped.
+const scope = effectScope(true);
 const refs = new Map<string, Ref<boolean>>();
 
 export function useLayerVisibility(id: string): Ref<boolean> {
-  let r = refs.get(id);
-  if (!r) {
-    r = persistedRef(`tc.layer.${id}.visible`, z.boolean(), true);
-    refs.set(id, r);
-  }
+  const cached = refs.get(id);
+  if (cached) return cached;
+  // scope.run only returns undefined if the scope is stopped; ours never is.
+  const r = scope.run(() =>
+    persistedRef(`tc.layer.${id}.visible`, z.boolean(), true),
+  ) as Ref<boolean>;
+  refs.set(id, r);
   return r;
 }
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index 092057f..0064939 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -49,10 +49,10 @@ useServerEvent('command', (msg) => {
       mapRef.value?.zoomOut();
       break;
     case 'floor-up':
-      mapRef.value?.nextFloor();
+      mapRef.value?.floorUp();
       break;
     case 'floor-down':
-      mapRef.value?.prevFloor();
+      mapRef.value?.floorDown();
       break;
     case 'airdrop':
       airdropStore.press();

From 4a6167b06fb2d32489aab44c72577589026d6655 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sat, 6 Jun 2026 02:06:55 +0300
Subject: [PATCH 37/53] refactor(overlay): consolidate layers into one registry
 (arch review #1)

Eliminate the dual-registration smell: a layer lived in BOTH the map-layer
registry and the settings-section registry (group 'layers'), linked only by a
matching string id. The map-layer registry is now the single source of truth -
each layer self-describes its rail category, order, title and inline settings:

  registerMapLayer({ id, mount, category, order, titleKey, settingsComponent })

- LayerRail reads useMapLayers() and derives categories from each layer's
  `category` (CATEGORY_META is now just icon/teaser metadata, not the catalog);
  the base map selector is a deliberate direct MapSection import.
- Settings registry is system-only now: dropped group/subgroup, and
  useSettingsSections() takes no argument.
- Removed features/map/settings.ts and features/airdrop/settings.ts - their
  registrations moved into the layer index.ts files.
- useLayerVisibility keys off the one registry's ids.

Verified in preview: rail categories/order/toggles, live show-hide (persisted),
base-map flyout, system drawer. typecheck + lint clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/features/airdrop/settings.ts  | 11 ---
 apps/client/src/features/hotkeys/settings.ts  |  1 -
 apps/client/src/features/i18n/settings.ts     |  1 -
 .../src/features/map/components/LayerRail.vue | 89 ++++++++++---------
 .../src/features/map/layers/airdrop/index.ts  | 10 ++-
 .../src/features/map/layers/extracts/index.ts | 10 ++-
 .../src/features/map/layers/player/index.ts   | 10 ++-
 .../src/features/map/layers/registry.ts       | 39 ++++++--
 apps/client/src/features/map/settings.ts      | 30 -------
 apps/client/src/features/overlay/settings.ts  |  2 -
 apps/client/src/features/server/settings.ts   |  1 -
 .../src/features/settings/SettingsPanel.vue   |  2 +-
 apps/client/src/features/settings/registry.ts | 32 ++-----
 13 files changed, 111 insertions(+), 127 deletions(-)
 delete mode 100644 apps/client/src/features/airdrop/settings.ts
 delete mode 100644 apps/client/src/features/map/settings.ts

diff --git a/apps/client/src/features/airdrop/settings.ts b/apps/client/src/features/airdrop/settings.ts
deleted file mode 100644
index dc8192e..0000000
--- a/apps/client/src/features/airdrop/settings.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { registerSettingsSection } from '@/features/settings/registry';
-import AirdropSection from '@/features/settings/sections/AirdropSection.vue';
-
-registerSettingsSection({
-  id: 'airdrop',
-  group: 'layers',
-  subgroup: 'player',
-  order: 40,
-  titleKey: 'airdrop.settingsHeading',
-  component: AirdropSection,
-});
diff --git a/apps/client/src/features/hotkeys/settings.ts b/apps/client/src/features/hotkeys/settings.ts
index fc211fc..b21fc4e 100644
--- a/apps/client/src/features/hotkeys/settings.ts
+++ b/apps/client/src/features/hotkeys/settings.ts
@@ -3,7 +3,6 @@ import HotkeysSection from '@/features/settings/sections/HotkeysSection.vue';
 
 registerSettingsSection({
   id: 'hotkeys',
-  group: 'system',
   order: 20,
   // Shown on the desktop browser + overlay (both have a keyboard), hidden on
   // phones. The combos are backend-owned now — configurable from any desktop
diff --git a/apps/client/src/features/i18n/settings.ts b/apps/client/src/features/i18n/settings.ts
index bc13f69..ded6e08 100644
--- a/apps/client/src/features/i18n/settings.ts
+++ b/apps/client/src/features/i18n/settings.ts
@@ -3,7 +3,6 @@ import LanguageSection from '@/features/settings/sections/LanguageSection.vue';
 
 registerSettingsSection({
   id: 'language',
-  group: 'system',
   order: 30,
   titleKey: 'language',
   component: LanguageSection,
diff --git a/apps/client/src/features/map/components/LayerRail.vue b/apps/client/src/features/map/components/LayerRail.vue
index a3d6466..9b9cfbe 100644
--- a/apps/client/src/features/map/components/LayerRail.vue
+++ b/apps/client/src/features/map/components/LayerRail.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import { useSettingsSections } from '@/features/settings/registry';
+import { useMapLayers, type MapLayer } from '../layers/registry';
 import { useOverlayStore } from '@/features/overlay/store';
 import { useLayerVisibility } from '../composables/useLayerVisibility';
+import { isTauri } from '@/shared/tauri';
+import MapSection from '@/features/settings/sections/MapSection.vue';
 
 const props = defineProps<{
   floors?: ReadonlyArray<{ id: string; label: string }>;
@@ -10,16 +12,22 @@ const props = defineProps<{
 const emit = defineEmits<{ (e: 'selectFloor', id: string): void }>();
 
 const { t } = useI18n();
-const sections = useSettingsSections('layers');
+const mapLayers = useMapLayers();
+const isDesktop = useMediaQuery('(min-width: 640px)');
 
-// Map is the base map selector (a prerequisite, not a toggleable layer) — it
-// gets its own rail icon at the top. Everything else is a real layer, grouped
-// by its registry `subgroup` into rail categories.
-const baseSection = computed(() => sections.value.find((s) => s.id === 'map') ?? null);
-const layerSections = computed(() => sections.value.filter((s) => s.id !== 'map'));
+// A layer's rail row can be context-gated (defaults to 'always'); the layer
+// still mounts on the map regardless — this only hides the toggle row.
+function available(l: MapLayer): boolean {
+  const a = l.availability ?? 'always';
+  if (a === 'always') return true;
+  if (a === 'tauri') return isTauri;
+  return isTauri || isDesktop.value;
+}
+const visibleLayers = computed(() => mapLayers.value.filter(available));
 
-// Category order + icon. Empty categories (loot/quests until their layers ship)
-// render as dimmed, disabled icons — visible future landing zones.
+// Presentation metadata only — icon + order, plus the "future" categories we
+// tease as dimmed placeholders. Which LAYERS fall under each comes from the
+// registry's `category` field, not from here.
 const CATEGORY_META = [
   { key: 'player', icon: 'pi-user' },
   { key: 'loot', icon: 'pi-box' },
@@ -31,22 +39,23 @@ const categories = computed(() =>
     key: c.key,
     icon: c.icon,
     label: t(`settingsGroups.${c.key}`),
-    sections: layerSections.value.filter((s) => s.subgroup === c.key),
+    layers: visibleLayers.value
+      .filter((l) => l.category === c.key)
+      .sort((a, b) => a.order - b.order),
   })),
 );
 
-// Own the visibility refs in setup scope (persistedRef installs a watch — keep
-// that out of render). Cached, so the template lookups below are free.
+// Own the visibility refs in setup scope (cached singletons; cheap thereafter).
 const layerVis = useLayerVisibility;
-layerSections.value.forEach((s) => layerVis(s.id));
+visibleLayers.value.forEach((l) => layerVis(l.id));
 
+// 'map' = base map selector flyout; otherwise a category key.
 const openId = ref<string | null>(null);
 const expanded = ref<string | null>(null);
 const railRef = ref<HTMLElement | null>(null);
 const flyoutRef = ref<HTMLElement | null>(null);
 
-// Hide the whole rail (animated) while the overlay is click-through-locked —
-// it can't be interacted with then, and a clean map reads better.
+// Hide the rail (animated) while the overlay is click-through-locked.
 const { clickThrough } = storeToRefs(useOverlayStore());
 const railVisible = computed(() => !clickThrough.value);
 
@@ -56,18 +65,14 @@ function toggle(id: string): void {
 }
 
 onClickOutside(flyoutRef, (e) => {
-  // Rail buttons handle their own open/close — don't double-close on them.
   if (railRef.value?.contains(e.target as Node)) return;
   openId.value = null;
 });
 
-// On lock, drop any open flyout (the rail itself animates away via <Transition>).
 watch(clickThrough, (locked) => {
   if (locked) openId.value = null;
 });
 
-// The overlay is a transient surface: when focus leaves it (e.g. clicking back
-// into the game), dismiss the flyout so layer config doesn't linger on screen.
 useEventListener(window, 'blur', () => {
   openId.value = null;
 });
@@ -76,7 +81,7 @@ const openCategory = computed(() => categories.value.find((c) => c.key === openI
 const isMapOpen = computed(() => openId.value === 'map');
 
 // Floor stepper at the rail's bottom (multi-floor maps only). Floors are ordered
-// top-to-bottom (highest first, index 0 = top), so "up" steps toward index 0.
+// top-to-bottom (index 0 = top), so "up" steps toward index 0.
 const floorList = computed(() => props.floors ?? []);
 const hasFloors = computed(() => floorList.value.length > 1);
 const floorIndex = computed(() => floorList.value.findIndex((f) => f.id === props.currentFloor));
@@ -102,7 +107,6 @@ function stepFloor(delta: number): void {
       class="layer-rail border-surface-700 bg-surface-900/85 absolute left-0 top-1/2 z-[1100] flex -translate-y-1/2 flex-col gap-1 rounded-r-xl border border-l-0 p-1 backdrop-blur"
     >
       <button
-        v-if="baseSection"
         v-tooltip.right="{ value: t('map'), disabled: openId !== null }"
         type="button"
         class="rail-btn"
@@ -119,17 +123,15 @@ function stepFloor(delta: number): void {
         v-tooltip.right="{ value: c.label, disabled: openId !== null }"
         type="button"
         class="rail-btn"
-        :class="{ 'rail-btn--active': openId === c.key, 'rail-btn--empty': c.sections.length === 0 }"
-        :disabled="c.sections.length === 0"
+        :class="{ 'rail-btn--active': openId === c.key, 'rail-btn--empty': c.layers.length === 0 }"
+        :disabled="c.layers.length === 0"
         :aria-label="c.label"
         @click="toggle(c.key)"
       >
         <i class="pi" :class="c.icon" />
       </button>
 
-      <!-- Floor stepper (multi-floor maps): glanceable current floor + ▲/▼.
-           Vertical, in-rail — replaces the bottom-left popup that collided
-           with the rail. Fast path is still the floor-up/down hotkeys. -->
+      <!-- Floor stepper (multi-floor maps): glanceable current floor + ▲/▼. -->
       <template v-if="hasFloors">
         <div class="bg-surface-700 my-0.5 h-px" />
         <button
@@ -158,48 +160,48 @@ function stepFloor(delta: number): void {
         </button>
       </template>
 
-      <!-- Flyout positioned relative to the rail (vertically centred on it), NOT
-           the viewport — `position: fixed` + getBoundingClientRect drifted in the
-           Tauri WebView2 overlay. No nested overlays remain inside it (map is an
-           inline Listbox; section controls are inline), so no Teleport needed. -->
+      <!-- Flyout positioned relative to the rail (vertically centred), NOT
+           `position: fixed` which drifted in the Tauri WebView2 overlay. No
+           nested overlays inside (map = inline Listbox, sections inline). -->
       <div
         v-if="openId"
         ref="flyoutRef"
         class="border-surface-700 bg-surface-900/95 absolute left-full top-1/2 ml-1.5 max-h-[80dvh] w-60 -translate-y-1/2 overflow-y-auto rounded-xl border p-3 shadow-xl backdrop-blur"
       >
-        <template v-if="isMapOpen && baseSection">
+        <template v-if="isMapOpen">
           <p class="mb-2 text-[10px] font-semibold uppercase tracking-wider opacity-50">
             {{ t('map') }}
           </p>
-          <component :is="baseSection.component" />
+          <MapSection />
         </template>
         <template v-else-if="openCategory">
           <p class="mb-2 text-[10px] font-semibold uppercase tracking-wider opacity-50">
             {{ openCategory.label }}
           </p>
           <div
-            v-for="s in openCategory.sections"
-            :key="s.id"
+            v-for="l in openCategory.layers"
+            :key="l.id"
             class="border-surface-800 border-b py-1.5 last:border-0"
           >
             <div class="flex items-center gap-2">
               <ToggleSwitch
-                :model-value="layerVis(s.id).value"
-                @update:model-value="(v: boolean) => (layerVis(s.id).value = v)"
+                :model-value="layerVis(l.id).value"
+                @update:model-value="(v: boolean) => (layerVis(l.id).value = v)"
               />
-              <span class="flex-1 truncate text-sm">{{ t(s.titleKey) }}</span>
+              <span class="flex-1 truncate text-sm">{{ t(l.titleKey) }}</span>
               <button
+                v-if="l.settingsComponent"
                 type="button"
                 class="hover:bg-surface-800 flex h-8 w-8 shrink-0 items-center justify-center rounded opacity-70 hover:opacity-100"
-                :class="{ 'text-primary-400 bg-surface-800 !opacity-100': expanded === s.id }"
+                :class="{ 'text-primary-400 bg-surface-800 !opacity-100': expanded === l.id }"
                 :aria-label="t('settings')"
-                @click="expanded = expanded === s.id ? null : s.id"
+                @click="expanded = expanded === l.id ? null : l.id"
               >
                 <i class="pi pi-cog text-sm" />
               </button>
             </div>
-            <div v-if="expanded === s.id" class="mt-2 pl-1">
-              <component :is="s.component" />
+            <div v-if="l.settingsComponent && expanded === l.id" class="mt-2 pl-1">
+              <component :is="l.settingsComponent" />
             </div>
           </div>
         </template>
@@ -207,9 +209,8 @@ function stepFloor(delta: number): void {
     </div>
   </Transition>
 
-  <!-- Locked: the rail (and its floor stepper) is hidden, but floors are still
-       changed via the floor-up/down hotkeys — keep a minimal read-only floor
-       readout so the current level stays glanceable while click-through is on. -->
+  <!-- Locked: rail hidden, but keep a read-only floor read-out so the current
+       level stays glanceable while click-through is on. -->
   <div
     v-if="clickThrough && hasFloors"
     class="sa-bottom sa-left border-surface-700 bg-surface-900/85 absolute z-[1100] flex items-center gap-1.5 rounded-md border px-2 py-1 backdrop-blur"
diff --git a/apps/client/src/features/map/layers/airdrop/index.ts b/apps/client/src/features/map/layers/airdrop/index.ts
index 0b4825b..de39ef8 100644
--- a/apps/client/src/features/map/layers/airdrop/index.ts
+++ b/apps/client/src/features/map/layers/airdrop/index.ts
@@ -1,4 +1,12 @@
 import { registerMapLayer } from '../registry';
 import { useAirdropLayer } from './useAirdropLayer';
+import AirdropSection from '@/features/settings/sections/AirdropSection.vue';
 
-registerMapLayer({ id: 'airdrop', mount: useAirdropLayer });
+registerMapLayer({
+  id: 'airdrop',
+  mount: useAirdropLayer,
+  category: 'player',
+  order: 30,
+  titleKey: 'airdrop.settingsHeading',
+  settingsComponent: AirdropSection,
+});
diff --git a/apps/client/src/features/map/layers/extracts/index.ts b/apps/client/src/features/map/layers/extracts/index.ts
index 1d5e48c..8797c5d 100644
--- a/apps/client/src/features/map/layers/extracts/index.ts
+++ b/apps/client/src/features/map/layers/extracts/index.ts
@@ -1,4 +1,12 @@
 import { registerMapLayer } from '../registry';
 import { useExtractsLayer } from './useExtractsLayer';
+import ExtractsSection from '@/features/settings/sections/ExtractsSection.vue';
 
-registerMapLayer({ id: 'extracts', mount: useExtractsLayer });
+registerMapLayer({
+  id: 'extracts',
+  mount: useExtractsLayer,
+  category: 'player',
+  order: 20,
+  titleKey: 'extracts',
+  settingsComponent: ExtractsSection,
+});
diff --git a/apps/client/src/features/map/layers/player/index.ts b/apps/client/src/features/map/layers/player/index.ts
index eb0115f..4f9d938 100644
--- a/apps/client/src/features/map/layers/player/index.ts
+++ b/apps/client/src/features/map/layers/player/index.ts
@@ -1,4 +1,12 @@
 import { registerMapLayer } from '../registry';
 import { usePlayerLayer } from './usePlayerLayer';
+import PlayerSection from '@/features/settings/sections/PlayerSection.vue';
 
-registerMapLayer({ id: 'player', mount: usePlayerLayer });
+registerMapLayer({
+  id: 'player',
+  mount: usePlayerLayer,
+  category: 'player',
+  order: 10,
+  titleKey: 'position',
+  settingsComponent: PlayerSection,
+});
diff --git a/apps/client/src/features/map/layers/registry.ts b/apps/client/src/features/map/layers/registry.ts
index f55382b..26b9804 100644
--- a/apps/client/src/features/map/layers/registry.ts
+++ b/apps/client/src/features/map/layers/registry.ts
@@ -1,4 +1,11 @@
-import { computed, shallowReactive, type ComputedRef, type Ref, type ShallowRef } from 'vue';
+import {
+  computed,
+  shallowReactive,
+  type Component,
+  type ComputedRef,
+  type Ref,
+  type ShallowRef,
+} from 'vue';
 import type { Map as LeafletMap } from 'leaflet';
 import type { TarkovMapCode, TarkovMapInfo } from '@shared/maps';
 
@@ -12,25 +19,41 @@ export interface MapLayerContext {
   visible: Ref<boolean>;
 }
 
+/** Rail category a layer is grouped under (a section of the on-map LayerRail). */
+export type LayerCategory = 'player' | 'loot' | 'quests';
+
+/** Context gate for a layer's rail row. Defaults to 'always'. The layer still
+ * mounts on the map regardless — this only hides the toggle row. */
+export type LayerAvailability = 'always' | 'tauri' | 'desktop-or-tauri';
+
 export interface MapLayer {
   id: string;
   mount: (ctx: MapLayerContext) => void;
+  /** Rail category this layer is grouped under. */
+  category: LayerCategory;
+  /** Ascending order within the category; use multiples of 10. */
+  order: number;
+  /** i18n key for the layer's display name (rail row + flyout header). */
+  titleKey: string;
+  /** Optional per-layer settings, rendered inline in the rail flyout via a gear. */
+  settingsComponent?: Component;
+  availability?: LayerAvailability;
 }
 
+// Single source of truth for a layer: what mounts on the map AND how the rail
+// presents/toggles/configures it. No second registry, no cross-registry id
+// matching — `useLayerVisibility(layer.id)` keys off these same ids.
 const registry = shallowReactive(new Map<string, MapLayer>());
 
+// HMR-safe: replace by id instead of duplicating on hot-reload.
 export function registerMapLayer(layer: MapLayer): void {
   registry.set(layer.id, layer);
 }
 
 /**
- * Read-once snapshot of registered layers. `MapView.vue` iterates this in
- * setup() and mounts each layer; layers added later (e.g. through dynamic
- * feature flags) won't appear without a `MapView` remount — which is what
- * `:key="mapCode"` already does on map switch. The ComputedRef wrapper is
- * kept for HMR: when a layer's index.ts is hot-reloaded, the reactive
- * registry mutation invalidates this computed so the next remount picks
- * up the new entry.
+ * Reactive snapshot of registered layers. `MapView.vue` mounts each in setup();
+ * `LayerRail.vue` reads it to build the category icons + flyouts. shallowReactive
+ * so late registrations (dev HMR) re-track the computed.
  */
 export function useMapLayers(): ComputedRef<MapLayer[]> {
   return computed(() => [...registry.values()]);
diff --git a/apps/client/src/features/map/settings.ts b/apps/client/src/features/map/settings.ts
deleted file mode 100644
index 4cf878d..0000000
--- a/apps/client/src/features/map/settings.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { registerSettingsSection } from '@/features/settings/registry';
-import MapSection from '@/features/settings/sections/MapSection.vue';
-import ExtractsSection from '@/features/settings/sections/ExtractsSection.vue';
-import PlayerSection from '@/features/settings/sections/PlayerSection.vue';
-
-// Map sits at the top of the layers list, ungrouped — it's the base map
-// selector, a prerequisite for every layer rather than a layer itself.
-registerSettingsSection({
-  id: 'map',
-  group: 'layers',
-  order: 10,
-  titleKey: 'map',
-  component: MapSection,
-});
-registerSettingsSection({
-  id: 'player',
-  group: 'layers',
-  subgroup: 'player',
-  order: 20,
-  titleKey: 'position',
-  component: PlayerSection,
-});
-registerSettingsSection({
-  id: 'extracts',
-  group: 'layers',
-  subgroup: 'player',
-  order: 30,
-  titleKey: 'extracts',
-  component: ExtractsSection,
-});
diff --git a/apps/client/src/features/overlay/settings.ts b/apps/client/src/features/overlay/settings.ts
index f68733f..647e7fd 100644
--- a/apps/client/src/features/overlay/settings.ts
+++ b/apps/client/src/features/overlay/settings.ts
@@ -4,7 +4,6 @@ import PairingSection from '@/features/settings/sections/PairingSection.vue';
 
 registerSettingsSection({
   id: 'overlay',
-  group: 'system',
   order: 10,
   visible: 'tauri',
   titleKey: 'overlay.heading',
@@ -16,7 +15,6 @@ registerSettingsSection({
 // from a phone makes no sense.
 registerSettingsSection({
   id: 'pairing',
-  group: 'system',
   order: 50,
   visible: 'tauri',
   titleKey: 'pairing.heading',
diff --git a/apps/client/src/features/server/settings.ts b/apps/client/src/features/server/settings.ts
index 805d7b1..7d1eaf6 100644
--- a/apps/client/src/features/server/settings.ts
+++ b/apps/client/src/features/server/settings.ts
@@ -3,7 +3,6 @@ import PathsSection from '@/features/settings/sections/PathsSection.vue';
 
 registerSettingsSection({
   id: 'paths',
-  group: 'system',
   order: 40,
   visible: 'desktop-or-tauri',
   titleKey: 'paths.heading',
diff --git a/apps/client/src/features/settings/SettingsPanel.vue b/apps/client/src/features/settings/SettingsPanel.vue
index 1e1124f..9851caf 100644
--- a/apps/client/src/features/settings/SettingsPanel.vue
+++ b/apps/client/src/features/settings/SettingsPanel.vue
@@ -4,7 +4,7 @@ import { useSettingsSections } from './registry';
 import { persistedRef } from '@/shared/persisted-store';
 
 const { t } = useI18n();
-const systemSections = useSettingsSections('system');
+const systemSections = useSettingsSections();
 const open = ref(false);
 const isDesktop = useMediaQuery('(min-width: 640px)');
 
diff --git a/apps/client/src/features/settings/registry.ts b/apps/client/src/features/settings/registry.ts
index fe8cb2a..5921bb1 100644
--- a/apps/client/src/features/settings/registry.ts
+++ b/apps/client/src/features/settings/registry.ts
@@ -2,38 +2,22 @@ import { computed, shallowReactive, type ComputedRef, type Component } from 'vue
 import { useMediaQuery } from '@vueuse/core';
 import { isTauri } from '@/shared/tauri';
 
-export type SectionGroup = 'layers' | 'system';
-export type SectionSubgroup = 'player' | 'loot' | 'quests';
 export type SectionVisibility = 'always' | 'tauri' | 'desktop-or-tauri';
 
 export interface SettingsSection {
   id: string;
-  /** Top-level group: `layers` (what's drawn on the map) or `system`
-   * (app/system preferences). */
-  group: SectionGroup;
-  /** Optional layer sub-bucket, surfaced as a non-interactive divider in the
-   * drawer. Sections sharing a subgroup render contiguously under one label
-   * (`player`/`loot`/`quests`). Omit for `map` (it sits at the top, ungrouped)
-   * and for all `system` sections. A subgroup divider only appears once that
-   * bucket has a visible section, so empty future buckets (loot/quests) stay
-   * hidden until their layers ship. */
-  subgroup?: SectionSubgroup;
-  /** Ascending; use multiples of 10 so future insertions fit between existing entries.
-   * Sort within a group is by `order`; keep same-subgroup sections contiguous.
-   * layers: 10 map · 20 player, 30 extracts, 40 airdrop (subgroup `player`)
-   * system: 10 overlay, 20 hotkeys, 30 language, 40 paths, 50 pairing */
+  /** Ascending; use multiples of 10 so future insertions fit between entries. */
   order: number;
   /** i18n key for the accordion header label (the section title). */
   titleKey: string;
   visible?: SectionVisibility;
-  /** Sync `Component` or `defineAsyncComponent(() => import('...'))` —
-   *  Vue resolves both. */
+  /** Sync `Component` or `defineAsyncComponent(() => import('...'))`. */
   component: Component;
 }
 
-// shallowReactive so `useSettingsSections`'s computed re-tracks on
-// registerSettingsSection during dev HMR (or any future late registration).
-// Plain Map mutations would otherwise go unnoticed by Vue's tracker.
+// System/app settings only (the gear drawer). Map layers self-describe their
+// own settings via the map-layer registry now — this registry no longer carries
+// any layer concept (no groups/subgroups).
 const registry = shallowReactive(new Map<string, SettingsSection>());
 
 // HMR-safe: replace existing entry instead of duplicating on hot-reload.
@@ -41,7 +25,7 @@ export function registerSettingsSection(s: SettingsSection): void {
   registry.set(s.id, s);
 }
 
-export function useSettingsSections(group: SectionGroup): ComputedRef<SettingsSection[]> {
+export function useSettingsSections(): ComputedRef<SettingsSection[]> {
   const isDesktop = useMediaQuery('(min-width: 640px)');
 
   return computed(() => {
@@ -51,8 +35,6 @@ export function useSettingsSections(group: SectionGroup): ComputedRef<SettingsSe
       return isTauri || isDesktop.value;
     };
 
-    return [...registry.values()]
-      .filter((s) => s.group === group && visible(s.visible))
-      .sort((a, b) => a.order - b.order);
+    return [...registry.values()].filter((s) => visible(s.visible)).sort((a, b) => a.order - b.order);
   });
 }

From 636a182d9326d9c2c811026ac5a6a7c6653f8564 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sat, 6 Jun 2026 02:15:51 +0300
Subject: [PATCH 38/53] refactor(overlay): decouple edge indicators from rail
 DOM + overlay store (arch review #2)

- New useRailObstacle: LayerRail publishes its rect (viewport coords; null when
  hidden) to a shared reactive singleton; edge-indicator layers consume it.
- useEdgeIndicators takes a getObstacle() callback instead of
  document.querySelector('.layer-rail').
- useExtractsLayer no longer imports the overlay store: it reads the rail rect
  and repaints on change, replacing the clickThrough-driven rAF loop + the magic
  260ms transition timer. The rail owns its lock/transition - it clears the
  obstacle immediately on lock and republishes after the enter transition.

Future edge-indicator layers (loot/quests) reuse useRailObstacle - no copy of
the DOM scrape or the overlay coupling.

Verified: left-edge arrows still wrap the rail (x=57 = railRight 41 + 16).
typecheck + lint clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/features/map/components/LayerRail.vue | 23 ++++++++++-
 .../map/composables/useRailObstacle.ts        | 32 +++++++++++++++
 .../map/layers/extracts/useEdgeIndicators.ts  | 40 ++++++++++++-------
 .../map/layers/extracts/useExtractsLayer.ts   | 23 +++--------
 4 files changed, 84 insertions(+), 34 deletions(-)
 create mode 100644 apps/client/src/features/map/composables/useRailObstacle.ts

diff --git a/apps/client/src/features/map/components/LayerRail.vue b/apps/client/src/features/map/components/LayerRail.vue
index 9b9cfbe..2ed5358 100644
--- a/apps/client/src/features/map/components/LayerRail.vue
+++ b/apps/client/src/features/map/components/LayerRail.vue
@@ -2,6 +2,7 @@
 import { useMapLayers, type MapLayer } from '../layers/registry';
 import { useOverlayStore } from '@/features/overlay/store';
 import { useLayerVisibility } from '../composables/useLayerVisibility';
+import { setRailObstacle } from '../composables/useRailObstacle';
 import { isTauri } from '@/shared/tauri';
 import MapSection from '@/features/settings/sections/MapSection.vue';
 
@@ -70,13 +71,31 @@ onClickOutside(flyoutRef, (e) => {
 });
 
 watch(clickThrough, (locked) => {
-  if (locked) openId.value = null;
+  if (locked) {
+    openId.value = null;
+    setRailObstacle(null); // arrows reflow to the true edge as the rail fades out
+  }
 });
 
 useEventListener(window, 'blur', () => {
   openId.value = null;
 });
 
+// Publish the rail's rect (viewport coords) so edge-indicator layers can wrap
+// around it without scraping the DOM. Republish whenever it appears or moves.
+function publishRail(): void {
+  const el = railRef.value;
+  if (!el) {
+    setRailObstacle(null);
+    return;
+  }
+  const r = el.getBoundingClientRect();
+  setRailObstacle({ left: r.left, right: r.right, top: r.top, bottom: r.bottom, width: r.width });
+}
+onMounted(publishRail);
+useEventListener(window, 'resize', publishRail);
+onBeforeUnmount(() => setRailObstacle(null));
+
 const openCategory = computed(() => categories.value.find((c) => c.key === openId.value) ?? null);
 const isMapOpen = computed(() => openId.value === 'map');
 
@@ -100,7 +119,7 @@ function stepFloor(delta: number): void {
 </script>
 
 <template>
-  <Transition name="rail">
+  <Transition name="rail" @after-enter="publishRail">
     <div
       v-if="railVisible"
       ref="railRef"
diff --git a/apps/client/src/features/map/composables/useRailObstacle.ts b/apps/client/src/features/map/composables/useRailObstacle.ts
new file mode 100644
index 0000000..6c32076
--- /dev/null
+++ b/apps/client/src/features/map/composables/useRailObstacle.ts
@@ -0,0 +1,32 @@
+import { ref, type Ref } from 'vue';
+
+/**
+ * The on-map LayerRail's bounding rect in VIEWPORT coordinates (px), or null
+ * when the rail is hidden. Published by `LayerRail.vue`; consumed by
+ * edge-indicator layers so off-screen-marker arrows can wrap around the rail
+ * WITHOUT scraping the DOM (`document.querySelector('.layer-rail')`) or knowing
+ * anything about overlay-lock state. Reactive, so consumers can `watch` it and
+ * repaint as the rail appears / moves / disappears.
+ *
+ * A module-level singleton: there is exactly one rail. Future chrome that
+ * off-screen indicators should avoid can extend this into a list.
+ */
+export interface RailRect {
+  readonly left: number;
+  readonly right: number;
+  readonly top: number;
+  readonly bottom: number;
+  readonly width: number;
+}
+
+const railRect = ref<RailRect | null>(null);
+
+/** Read side — edge-indicator layers. */
+export function useRailObstacle(): Ref<RailRect | null> {
+  return railRect;
+}
+
+/** Write side — the LayerRail publishes its rect (or null when hidden). */
+export function setRailObstacle(rect: RailRect | null): void {
+  railRect.value = rect;
+}
diff --git a/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts b/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
index 11723c6..d10ed31 100644
--- a/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
+++ b/apps/client/src/features/map/layers/extracts/useEdgeIndicators.ts
@@ -7,6 +7,15 @@ export interface EdgeArrow {
   color: string;
 }
 
+/** An obstacle (the on-map rail) in viewport coords that left-edge arrows wrap
+ * around. Supplied by the caller — this util never touches the DOM for it. */
+export interface EdgeObstacle {
+  readonly right: number;
+  readonly top: number;
+  readonly bottom: number;
+  readonly width: number;
+}
+
 const MARGIN = 18; // px inset from the container edge
 const ARROW_PX = 22;
 const RAIL_GAP = 16; // arrow-centre offset past the rail's right edge
@@ -21,7 +30,11 @@ const RAIL_PAD = 6; // extend the avoid band slightly past the rail's top/bottom
  * map move/zoom we recompute each target's container point; off-screen ones get
  * an arrow clamped to the inset rectangle edge, rotated to point outward.
  */
-export function createEdgeIndicators(map: LeafletMap, getArrows: () => EdgeArrow[]) {
+export function createEdgeIndicators(
+  map: LeafletMap,
+  getArrows: () => EdgeArrow[],
+  getObstacle: () => EdgeObstacle | null = () => null,
+) {
   const overlay = document.createElement('div');
   overlay.className = 'edge-indicators';
   map.getContainer().appendChild(overlay);
@@ -51,21 +64,18 @@ export function createEdgeIndicators(map: LeafletMap, getArrows: () => EdgeArrow
 
     // The on-map left rail is an obstacle: left-edge arrows whose y falls within
     // its vertical span get pushed out to the rail's right edge, so they wrap
-    // around the panel instead of hiding behind it. Measured each frame, so it
-    // follows the rail's changing height (floor stepper) and disappears entirely
-    // when the rail is hidden (locked overlay).
-    const containerRect = map.getContainer().getBoundingClientRect();
-    const railEl = document.querySelector('.layer-rail');
+    // around the panel instead of hiding behind it. The obstacle rect (viewport
+    // coords) is supplied by the caller and converted into container coords here;
+    // null when the rail is hidden (locked overlay), so arrows revert to the edge.
+    const obstacle = getObstacle();
     let avoid: { right: number; top: number; bottom: number } | null = null;
-    if (railEl) {
-      const r = railEl.getBoundingClientRect();
-      if (r.width > 0) {
-        avoid = {
-          right: r.right - containerRect.left,
-          top: r.top - containerRect.top,
-          bottom: r.bottom - containerRect.top,
-        };
-      }
+    if (obstacle && obstacle.width > 0) {
+      const containerRect = map.getContainer().getBoundingClientRect();
+      avoid = {
+        right: obstacle.right - containerRect.left,
+        top: obstacle.top - containerRect.top,
+        bottom: obstacle.bottom - containerRect.top,
+      };
     }
 
     let used = 0;
diff --git a/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts b/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
index a8a2a81..1f243e2 100644
--- a/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
+++ b/apps/client/src/features/map/layers/extracts/useExtractsLayer.ts
@@ -5,7 +5,7 @@ import { buildTooltipHtml, sortedEntries, type ExtractEntry } from './tooltip';
 import { createEdgeIndicators, type EdgeArrow } from './useEdgeIndicators';
 import { extractsForMap } from '@/features/map/data/extracts';
 import { useMapSettingsStore } from '@/features/map/store';
-import { useOverlayStore } from '@/features/overlay/store';
+import { useRailObstacle } from '@/features/map/composables/useRailObstacle';
 import type { MapLayerContext } from '../registry';
 
 export type LabelMode = 'hover' | 'always';
@@ -40,7 +40,7 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
   const { t, locale } = useI18n();
   const { extractFactions, extractLabelMode, extractLabelSize, edgeIndicators } =
     storeToRefs(useMapSettingsStore());
-  const { clickThrough } = storeToRefs(useOverlayStore());
+  const railRect = useRailObstacle();
 
   let extractsLayer: LayerGroup | null = null;
   let edge: ReturnType<typeof createEdgeIndicators> | null = null;
@@ -108,7 +108,7 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
   function syncEdge(): void {
     if (edgeIndicators.value && visible.value && map.value) {
       if (edge) edge.update();
-      else edge = createEdgeIndicators(map.value, arrowData);
+      else edge = createEdgeIndicators(map.value, arrowData, () => railRect.value);
     } else if (edge) {
       edge.destroy();
       edge = null;
@@ -226,19 +226,9 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
 
   watch(visible, applyVisible);
 
-  // Locking the overlay slides the on-map rail out (CSS transition) with no map
-  // event to recompute edge arrows — drive update() across the transition window
-  // so the arrows re-flow around the (dis)appearing rail in sync.
-  let railAnimRaf = 0;
-  watch(clickThrough, () => {
-    cancelAnimationFrame(railAnimRaf);
-    const start = performance.now();
-    const tick = (): void => {
-      edge?.update();
-      if (performance.now() - start < 260) railAnimRaf = requestAnimationFrame(tick);
-    };
-    railAnimRaf = requestAnimationFrame(tick);
-  });
+  // The LayerRail publishes its rect (and null when it hides on lock); repaint
+  // the edge arrows whenever it changes so they re-flow around the rail.
+  watch(railRect, () => edge?.update());
 
   watch(extractLabelMode, (mode) => {
     if (state.labelMode === mode) return;
@@ -265,7 +255,6 @@ export function useExtractsLayer(ctx: MapLayerContext): void {
   );
 
   onBeforeUnmount(() => {
-    cancelAnimationFrame(railAnimRaf);
     edge?.destroy();
     edge = null;
     if (extractsLayer && map.value) {

From 1e602da94304341812bfca5e920fb611a9077aea Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sat, 6 Jun 2026 02:22:26 +0300
Subject: [PATCH 39/53] refactor(overlay): single useOverlayLock source for the
 lock policy (arch review #3)

The controls-hide / read-outs-stay lock policy was re-derived (!clickThrough) in
every chrome component and threaded as a prop through OverlayHeader /
OverlayLockIndicator. Centralize it:

- New useOverlayLock(): locked / showControls (derived) + lock() action.
- LayerRail, OverlayHeader, OverlayLockIndicator and pages/index.vue read the
  derived state from it instead of the store directly; dropped the
  overlay-click-through prop and the lock emit (the button calls lock() itself).
  App.vue keeps the raw ref - it owns the hotkey toggle + boot reset.

One definition of the policy, no prop-drilling - cheaper to extend as chrome grows.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/features/map/components/LayerRail.vue | 12 +++----
 .../overlay/components/OverlayHeader.vue      | 20 ++++++------
 .../components/OverlayLockIndicator.vue       | 12 +++----
 .../overlay/composables/useOverlayLock.ts     | 31 +++++++++++++++++++
 apps/client/src/pages/index.vue               | 14 +++------
 5 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 apps/client/src/features/overlay/composables/useOverlayLock.ts

diff --git a/apps/client/src/features/map/components/LayerRail.vue b/apps/client/src/features/map/components/LayerRail.vue
index 2ed5358..6895dbe 100644
--- a/apps/client/src/features/map/components/LayerRail.vue
+++ b/apps/client/src/features/map/components/LayerRail.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useMapLayers, type MapLayer } from '../layers/registry';
-import { useOverlayStore } from '@/features/overlay/store';
+import { useOverlayLock } from '@/features/overlay/composables/useOverlayLock';
 import { useLayerVisibility } from '../composables/useLayerVisibility';
 import { setRailObstacle } from '../composables/useRailObstacle';
 import { isTauri } from '@/shared/tauri';
@@ -57,8 +57,8 @@ const railRef = ref<HTMLElement | null>(null);
 const flyoutRef = ref<HTMLElement | null>(null);
 
 // Hide the rail (animated) while the overlay is click-through-locked.
-const { clickThrough } = storeToRefs(useOverlayStore());
-const railVisible = computed(() => !clickThrough.value);
+const { locked, showControls } = useOverlayLock();
+const railVisible = showControls;
 
 function toggle(id: string): void {
   openId.value = openId.value === id ? null : id;
@@ -70,8 +70,8 @@ onClickOutside(flyoutRef, (e) => {
   openId.value = null;
 });
 
-watch(clickThrough, (locked) => {
-  if (locked) {
+watch(locked, (isLocked) => {
+  if (isLocked) {
     openId.value = null;
     setRailObstacle(null); // arrows reflow to the true edge as the rail fades out
   }
@@ -231,7 +231,7 @@ function stepFloor(delta: number): void {
   <!-- Locked: rail hidden, but keep a read-only floor read-out so the current
        level stays glanceable while click-through is on. -->
   <div
-    v-if="clickThrough && hasFloors"
+    v-if="locked && hasFloors"
     class="sa-bottom sa-left border-surface-700 bg-surface-900/85 absolute z-[1100] flex items-center gap-1.5 rounded-md border px-2 py-1 backdrop-blur"
   >
     <i class="pi pi-clone text-[10px] opacity-50" />
diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 58d335a..ce43b50 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -3,6 +3,7 @@ import SettingsPanel from '@/features/settings/SettingsPanel.vue';
 import MapSwitchMenu from './MapSwitchMenu.vue';
 import { isTauri } from '@/shared/tauri';
 import { useOverlayHeaderActive } from '../composables/useOverlayHeaderActive';
+import { useOverlayLock } from '../composables/useOverlayLock';
 import type { TransportStatus } from '@/features/server/composables/useServerTransport';
 
 interface Props {
@@ -11,13 +12,13 @@ interface Props {
   /** Render the Tauri overlay chrome (true under real Tauri, or the dev
    *  preview flag). Native window calls still guard on the real `isTauri`. */
   tauriChrome: boolean;
-  overlayClickThrough: boolean;
 }
 
 const props = defineProps<Props>();
 defineEmits<{ close: [] }>();
 
 const { t } = useI18n();
+const { locked, showControls } = useOverlayLock();
 
 const statusIconClass = computed(() => {
   switch (props.status) {
@@ -48,15 +49,12 @@ useEventListener(window, 'mousemove', (e: MouseEvent) => {
 
 // The band unmounts when locked, so its @mouseleave never fires — reset
 // explicitly so the shared state (and the clock) don't get stuck "active".
-watch(
-  () => props.overlayClickThrough,
-  (locked) => {
-    if (locked) {
-      hovered.value = false;
-      dragging.value = false;
-    }
-  },
-);
+watch(locked, (isLocked) => {
+  if (isLocked) {
+    hovered.value = false;
+    dragging.value = false;
+  }
+});
 onBeforeUnmount(() => {
   hovered.value = false;
   dragging.value = false;
@@ -91,7 +89,7 @@ function openMapMenu(event: MouseEvent): void {
        (right, auto-width) — as flex siblings, so they can't collide. The pill
        is visual only; the band owns the drag. -->
   <div
-    v-if="tauriChrome && !overlayClickThrough"
+    v-if="tauriChrome && showControls"
     class="sa-pt absolute top-0 right-0 left-0 z-[1000] flex h-12 cursor-grab items-start px-2 active:cursor-grabbing"
     @mousedown="startDrag"
     @mouseenter="hovered = true"
diff --git a/apps/client/src/features/overlay/components/OverlayLockIndicator.vue b/apps/client/src/features/overlay/components/OverlayLockIndicator.vue
index 00132b0..495196b 100644
--- a/apps/client/src/features/overlay/components/OverlayLockIndicator.vue
+++ b/apps/client/src/features/overlay/components/OverlayLockIndicator.vue
@@ -1,20 +1,20 @@
 <script setup lang="ts">
 import { formatHotkeyParts } from '@/features/hotkeys/lib/hotkey';
+import { useOverlayLock } from '../composables/useOverlayLock';
 
 interface Props {
   lockHotkey: string;
-  overlayClickThrough: boolean;
 }
 
 const props = defineProps<Props>();
-defineEmits<{ lock: [] }>();
+const { locked, lock } = useOverlayLock();
 
 const lockHotkeyParts = computed(() => formatHotkeyParts(props.lockHotkey));
 
 // When click-through is on the lock button itself isn't clickable, so screen
 // readers need the keyboard escape route spelled out in the label.
 const lockAriaLabel = computed(() =>
-  props.overlayClickThrough
+  locked.value
     ? `Locked — press ${lockHotkeyParts.value.join(' + ')} to unlock`
     : 'Lock interaction',
 );
@@ -34,13 +34,13 @@ const lockAriaLabel = computed(() =>
     </span>
     <Button
       rounded
-      :severity="overlayClickThrough ? 'primary' : 'secondary'"
+      :severity="locked ? 'primary' : 'secondary'"
       class="!bg-surface-800/80 hover:!bg-surface-800 !border-surface-700 backdrop-blur"
       :aria-label="lockAriaLabel"
-      @click="$emit('lock')"
+      @click="lock"
     >
       <template #icon>
-        <i :class="overlayClickThrough ? 'pi pi-lock' : 'pi pi-lock-open'" />
+        <i :class="locked ? 'pi pi-lock' : 'pi pi-lock-open'" />
       </template>
     </Button>
   </div>
diff --git a/apps/client/src/features/overlay/composables/useOverlayLock.ts b/apps/client/src/features/overlay/composables/useOverlayLock.ts
new file mode 100644
index 0000000..d3abf3f
--- /dev/null
+++ b/apps/client/src/features/overlay/composables/useOverlayLock.ts
@@ -0,0 +1,31 @@
+import { computed, type ComputedRef } from 'vue';
+import { useOverlayStore } from '../store';
+
+/**
+ * Single source of truth for the overlay's click-through lock policy:
+ * **controls hide, glanceable read-outs stay.** Every piece of chrome reads its
+ * lock-derived state from here instead of re-deriving `!clickThrough` itself, so
+ * the policy has ONE definition as more chrome is added.
+ *
+ * Read-only derived state + the `lock()` action (the lock button). Unlock is
+ * hotkey-only by design — see `App.vue`'s global shortcut.
+ */
+export interface OverlayLock {
+  /** Click-through is on; the overlay can't be clicked. */
+  locked: ComputedRef<boolean>;
+  /** Show interactive chrome (rail, top-band controls, border). Hidden on lock. */
+  showControls: ComputedRef<boolean>;
+  /** Engage the lock. */
+  lock: () => void;
+}
+
+export function useOverlayLock(): OverlayLock {
+  const { clickThrough } = storeToRefs(useOverlayStore());
+  return {
+    locked: computed(() => clickThrough.value),
+    showControls: computed(() => !clickThrough.value),
+    lock: () => {
+      clickThrough.value = true;
+    },
+  };
+}
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index 0064939..16737ce 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -7,7 +7,7 @@ import OverlayLockIndicator from '@/features/overlay/components/OverlayLockIndic
 import OverlayErrors from '@/features/overlay/components/OverlayErrors.vue';
 import AirdropStatusBanner from '@/features/airdrop/components/AirdropStatusBanner.vue';
 import { useMapSettingsStore } from '@/features/map/store';
-import { useOverlayStore } from '@/features/overlay/store';
+import { useOverlayLock } from '@/features/overlay/composables/useOverlayLock';
 import { useHotkeysStore } from '@/features/hotkeys/store';
 import { showOverlayChrome } from '@/shared/tauri';
 import { useTransportStatus } from '@/features/server/composables/useTransportStatus';
@@ -17,7 +17,7 @@ import { useAirdropStore } from '@/features/airdrop/store';
 import { useAirdropTracker } from '@/features/airdrop/composables/useAirdropTracker';
 
 const { mapCode } = storeToRefs(useMapSettingsStore());
-const { clickThrough: overlayClickThrough } = storeToRefs(useOverlayStore());
+const { showControls } = useOverlayLock();
 // Only the lock combo is still client-owned; the rest arrive as backend
 // `command` events (see below) so they fire regardless of focus.
 const { lockHotkey } = storeToRefs(useHotkeysStore());
@@ -74,7 +74,6 @@ useServerEvent('command', (msg) => {
     :map-display-name="mapDisplayName"
     :status="status"
     :tauri-chrome="showOverlayChrome"
-    :overlay-click-through="overlayClickThrough"
     @close="confirmClose"
   />
 
@@ -84,12 +83,7 @@ useServerEvent('command', (msg) => {
 
   <TarkovTimeChip :map-display-name="showOverlayChrome ? mapDisplayName : ''" />
 
-  <OverlayBorder v-if="showOverlayChrome && !overlayClickThrough" />
+  <OverlayBorder v-if="showOverlayChrome && showControls" />
 
-  <OverlayLockIndicator
-    v-if="showOverlayChrome"
-    :lock-hotkey="lockHotkey"
-    :overlay-click-through="overlayClickThrough"
-    @lock="overlayClickThrough = true"
-  />
+  <OverlayLockIndicator v-if="showOverlayChrome" :lock-hotkey="lockHotkey" />
 </template>

From b18cd31d4884c5c7ae4393f34e6bd29f35d50081 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sat, 6 Jun 2026 02:25:51 +0300
Subject: [PATCH 40/53] test(overlay): cover layer visibility, floor stepping,
 and the layer registry (arch review #4)

Pin the contracts the scaling refactor introduced:
- useLayerVisibility: default-visible, singleton-per-id, persists to
  tc.layer.<id>.visible, reads an existing value on first use.
- useFloorSwitcher: floorUp/floorDown direction + clamp (no wrap), default-floor
  start, single-floor no-op.
- map-layer registry: register/expose + HMR-safe replace-by-id.

110 tests pass; typecheck + lint clean.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../src/__tests__/map-layer-registry.spec.ts  | 21 ++++++++
 .../src/__tests__/useFloorSwitcher.spec.ts    | 53 +++++++++++++++++++
 .../src/__tests__/useLayerVisibility.spec.ts  | 30 +++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 apps/client/src/__tests__/map-layer-registry.spec.ts
 create mode 100644 apps/client/src/__tests__/useFloorSwitcher.spec.ts
 create mode 100644 apps/client/src/__tests__/useLayerVisibility.spec.ts

diff --git a/apps/client/src/__tests__/map-layer-registry.spec.ts b/apps/client/src/__tests__/map-layer-registry.spec.ts
new file mode 100644
index 0000000..70db373
--- /dev/null
+++ b/apps/client/src/__tests__/map-layer-registry.spec.ts
@@ -0,0 +1,21 @@
+import { describe, it, expect } from 'vitest';
+import { registerMapLayer, useMapLayers } from '@/features/map/layers/registry';
+
+const noop = (): void => {};
+
+describe('map layer registry', () => {
+  it('registers a layer and exposes it via useMapLayers', () => {
+    registerMapLayer({ id: 'test-reg', mount: noop, category: 'loot', order: 99, titleKey: 'x' });
+    const found = useMapLayers().value.find((l) => l.id === 'test-reg');
+    expect(found?.category).toBe('loot');
+    expect(found?.order).toBe(99);
+  });
+
+  it('replaces by id on re-register (HMR-safe), never duplicating', () => {
+    registerMapLayer({ id: 'test-dup', mount: noop, category: 'player', order: 1, titleKey: 'a' });
+    registerMapLayer({ id: 'test-dup', mount: noop, category: 'quests', order: 2, titleKey: 'b' });
+    const matches = useMapLayers().value.filter((l) => l.id === 'test-dup');
+    expect(matches).toHaveLength(1);
+    expect(matches[0]?.category).toBe('quests');
+  });
+});
diff --git a/apps/client/src/__tests__/useFloorSwitcher.spec.ts b/apps/client/src/__tests__/useFloorSwitcher.spec.ts
new file mode 100644
index 0000000..31a2393
--- /dev/null
+++ b/apps/client/src/__tests__/useFloorSwitcher.spec.ts
@@ -0,0 +1,53 @@
+import { describe, it, expect } from 'vitest';
+import { shallowRef } from 'vue';
+import { useFloorSwitcher, type LoadedMap } from '@/features/map/composables/useFloorSwitcher';
+
+// Floors are ordered top-to-bottom (index 0 = highest floor).
+const FLOORS = [{ id: '2' }, { id: '1' }, { id: '0' }, { id: '-1' }];
+
+// loaded = null: no SVG, so setActiveFloor just records the choice in
+// currentFloor (the DOM toggle path is skipped) — perfect for testing the
+// stepping logic in isolation.
+function make(floors = FLOORS, defaultFloor = '0') {
+  return useFloorSwitcher(shallowRef<LoadedMap | null>(null), floors, defaultFloor);
+}
+
+describe('useFloorSwitcher', () => {
+  it('floorUp goes to a higher floor, floorDown to a lower one', () => {
+    const f = make();
+    f.setActiveFloor('0');
+    f.floorUp();
+    expect(f.currentFloor.value).toBe('1');
+    f.floorUp();
+    expect(f.currentFloor.value).toBe('2');
+    f.floorDown();
+    expect(f.currentFloor.value).toBe('1');
+  });
+
+  it('clamps at the top floor (no wrap-around)', () => {
+    const f = make();
+    f.setActiveFloor('2');
+    f.floorUp();
+    expect(f.currentFloor.value).toBe('2');
+  });
+
+  it('clamps at the bottom floor (no wrap-around)', () => {
+    const f = make();
+    f.setActiveFloor('-1');
+    f.floorDown();
+    expect(f.currentFloor.value).toBe('-1');
+  });
+
+  it('starts from the default floor when none is active yet', () => {
+    const f = make();
+    f.floorUp();
+    expect(f.currentFloor.value).toBe('1');
+  });
+
+  it('is a no-op on single-floor maps', () => {
+    const f = make([{ id: 'only' }], 'only');
+    f.floorUp();
+    f.floorDown();
+    expect(f.currentFloor.value).toBeNull();
+  });
+});
diff --git a/apps/client/src/__tests__/useLayerVisibility.spec.ts b/apps/client/src/__tests__/useLayerVisibility.spec.ts
new file mode 100644
index 0000000..9829cd7
--- /dev/null
+++ b/apps/client/src/__tests__/useLayerVisibility.spec.ts
@@ -0,0 +1,30 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { nextTick } from 'vue';
+import { useLayerVisibility } from '@/features/map/composables/useLayerVisibility';
+
+// Each test uses a distinct id — the composable caches refs in a module-level
+// singleton that outlives a single test (by design: the persist watch must
+// survive component remounts).
+describe('useLayerVisibility', () => {
+  beforeEach(() => localStorage.clear());
+
+  it('defaults a fresh layer to visible', () => {
+    expect(useLayerVisibility('test-default').value).toBe(true);
+  });
+
+  it('returns the same ref for the same id (singleton)', () => {
+    expect(useLayerVisibility('test-singleton')).toBe(useLayerVisibility('test-singleton'));
+  });
+
+  it('persists a toggle to tc.layer.<id>.visible', async () => {
+    const v = useLayerVisibility('test-persist');
+    v.value = false;
+    await nextTick();
+    expect(localStorage.getItem('tc.layer.test-persist.visible')).toBe('false');
+  });
+
+  it('reads an existing persisted value on first use', () => {
+    localStorage.setItem('tc.layer.test-seeded.visible', 'false');
+    expect(useLayerVisibility('test-seeded').value).toBe(false);
+  });
+});

From a9f76c2b83e5c05c16286ea52fc04ec6de3e741f Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sat, 6 Jun 2026 02:29:06 +0300
Subject: [PATCH 41/53] docs: sync registries section after the layer-registry
 consolidation

Layers now live in ONE registry (registerMapLayer carries category/order/
titleKey/settingsComponent) and the settings registry is system-only. Update
CLAUDE.md (Settings & layer registries + Map rendering layers) and
apps/client/README (recipes + where-things-connect): drop the layers
group/subgroup from the settings registry, note useRailObstacle + useOverlayLock.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md             | 70 +++++++++++++++++++++----------------------
 apps/client/README.md | 15 +++++-----
 2 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 3694f8c..07ba0d7 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -179,8 +179,9 @@ key back in the running app.
 `apps/client/src/features/map/` is split into three sibling folders:
 
 - `composables/` — **framework hooks** for Leaflet/Vue plumbing:
-  `useLeafletMap`, `useFloorSwitcher`, `useLayerVisibility`. Nothing here knows
-  about extracts, player markers, or future quest markers — pure map/Leaflet glue.
+  `useLeafletMap`, `useFloorSwitcher`, `useLayerVisibility`, `useRailObstacle`
+  (the rail rect edge-indicator layers wrap around). Nothing here knows about
+  extracts, player markers, or future quest markers — pure map/Leaflet glue.
 - `components/` — **UI surfaces** mounted by the page:
   - `LayerRail.vue` — on-map left rail (vertically centered). Top icon = base map
     selector flyout (MapSection component). Below that, one icon per layer **category**
@@ -214,7 +215,9 @@ key back in the running app.
         useAirdropLayer.ts      # purple uncertainty circle around the predicted drop
         index.ts                # registerMapLayer call
 
-  Each `index.ts` calls `registerMapLayer({ id, mount })` at module load;
+  Each `index.ts` calls `registerMapLayer({ id, mount, category, order, titleKey,
+  settingsComponent? })` at module load (the rail metadata lives here — there is
+  no second registry for layers);
   `main.ts` loads all index files via `import.meta.glob('@/features/map/layers/*/index.ts', { eager: true })`.
   `MapView.vue` reads the registry with `useMapLayers()` and calls
   `mount(ctx)` for each layer in setup(). `MapLayerContext` (in `layers/registry.ts`)
@@ -373,38 +376,35 @@ Booting into a locked overlay with a broken hotkey would be unrecoverable, so
 `ref()` (not `persistedRef`) any time boot-time recoverability matters more than
 user-visible continuity; default to `persistedRef` everywhere else.
 
-## Settings UI registry
-
-Settings sections use a registry pattern similar to map layers, split into two
-surfaces: the on-map LayerRail (for layer toggles) and the gear drawer (for system config).
-
-- `features/settings/registry.ts` — `registerSettingsSection()` and
-  `useSettingsSections(group)` with `SectionGroup = 'layers' | 'system'` (renamed from
-  `'settings'`). Added `SectionSubgroup = 'player' | 'loot' | 'quests'` and optional
-  `subgroup` field on `SettingsSection`. Visibility logic: `'always'` (desktop + phone,
-  default), `'tauri'` (overlay only), `'desktop-or-tauri'` (phone at ≥640px or overlay).
-  Order uses multiples of 10. Registry also requires a `titleKey` (i18n string for the
-  section label). Currently:
-  - layers: 10 map (no subgroup) · 20 player, 30 extracts, 40 airdrop (subgroup `player`)
-  - system: 10 overlay (tauri-only), 20 hotkeys (desktop-or-tauri), 30 language, 40 paths (desktop-or-tauri), 50 pairing (tauri-only)
-- `features/<name>/settings.ts` — each feature with settings calls
-  `registerSettingsSection({ id, group, order, titleKey, visible, component })` at
-  module load. The `subgroup` field (if present) gates the category under which it
-  appears in the LayerRail; sections with the same subgroup render together.
-- `main.ts` loads all registration files via
-  `import.meta.glob('@/features/*/settings.ts', { eager: true })`.
-- **LayerRail** (`components/LayerRail.vue`) — on-map left rail. Renders `layers`
-  group sections: the map selector at the top (order 10, no subgroup), then one
-  icon per subgroup (player, loot, quests) derived from sections below. Clicking a
-  subgroup icon opens a flyout listing its layers, each with a visibility toggle +
-  settings gear. Empty subgroups (loot, quests) render as dimmed future icons.
-- **Gear drawer** (`features/settings/SettingsPanel.vue`) — opens from the top-right
-  cluster (SettingsPanel button). A **non-modal** PrimeVue `Drawer` (right-side on
-  desktop, bottom-sheet on `<640px` with `position="bottom"`). Renders `system` group
-  sections only in a single flat **Accordion**. Open-panel state persists (`tc.settings.open`,
-  keyed by section id). Desktop starts with all sections open; overlay/phone start
-  collapsed to keep the sheet short. Iterates `useSettingsSections('system')` — no
-  hard-coded list.
+## Settings & layer registries
+
+**Two SEPARATE registries, one per surface — no shared-id matching across them.**
+
+- **Map-layer registry** (`features/map/layers/registry.ts`) — the single source
+  of truth for layers. `registerMapLayer({ id, mount, category, order, titleKey,
+  settingsComponent?, availability? })`; `useMapLayers()` reads them. Each layer
+  self-describes its rail `category` (`'player' | 'loot' | 'quests'`), `order`,
+  display `titleKey`, and optional inline `settingsComponent`. Layers register in
+  their own `layers/<name>/index.ts` (auto-loaded via the layers glob). Consumed by
+  the on-map **LayerRail** (`features/map/components/LayerRail.vue`): a left rail
+  with the base map selector at the top (a direct `MapSection` import — it's a
+  prerequisite, not a layer), then one icon per category (membership derived from
+  each layer's `category`; empty categories like loot/quests render as dimmed
+  future placeholders). A category flyout lists its layers, each with a visibility
+  toggle (`useLayerVisibility`) + the layer's `settingsComponent` inline via a gear.
+  `CATEGORY_META` in the rail is presentation-only (icon + which futures to tease),
+  NOT the catalogue.
+- **Settings-section registry** (`features/settings/registry.ts`) — **system/app
+  settings only** (no layer concept; no groups/subgroups). `registerSettingsSection({
+  id, order, titleKey, visible?, component })`; `useSettingsSections()` returns them
+  filtered by `visible` (`'always'` | `'tauri'` | `'desktop-or-tauri'`) and sorted by
+  `order`. Registered in `features/<name>/settings.ts` (auto-loaded via
+  `import.meta.glob('@/features/*/settings.ts', { eager: true })`). Currently: 10
+  overlay (tauri), 20 hotkeys (desktop-or-tauri), 30 language, 40 paths
+  (desktop-or-tauri), 50 pairing (tauri). Consumed by the gear **drawer**
+  (`SettingsPanel.vue`): a **non-modal** PrimeVue `Drawer` (right on desktop,
+  bottom-sheet on `<640px`) rendering a single flat **Accordion**; open-panel state
+  persists in `tc.settings.open`.
 
 Faction colours come from `FACTION_COLORS` in `packages/shared/src/maps.ts`
 so icons and tooltip stripes never drift across components.
diff --git a/apps/client/README.md b/apps/client/README.md
index 1a9d257..44ee972 100644
--- a/apps/client/README.md
+++ b/apps/client/README.md
@@ -86,16 +86,15 @@ For nested or dynamic routes (`/raids/[id]`), see [Vue Router file-based docs](h
 2. Inside the feature: `./X` and `../X` imports.
 3. Other features depend on yours via `@/features/<name>/<thing>`.
 4. If the feature has persisted user settings — create `store.ts` using [`persistedRef`](./src/shared/persisted-store.ts) from `@/shared/persisted-store`. Each setting gets its own key like `tc.<name>.<field>`.
-5. If the feature has its own settings UI:
+5. If the feature has its own SYSTEM/app settings UI (the gear drawer). Map-layer
+   settings live on the layer registration instead — see step 6.
    - Create a section component `XxxSection.vue` under [`features/settings/sections/`](./src/features/settings/sections/).
    - Create `src/features/<name>/settings.ts` that calls `registerSettingsSection()`:
      ```ts
      import { registerSettingsSection } from '@/features/settings/registry';
      registerSettingsSection({
        id: '<name>',
-       group: 'layers', // 'layers' (map/layer toggles on LayerRail) or 'system' (app config in gear drawer)
-       subgroup: 'player', // optional: 'player' | 'loot' | 'quests' (layers group only); omit for 'system' and for map
-       order: 30, // multiples of 10; layers: 10 map · 20 player, 30 extracts, 40 airdrop; system: 10 overlay, 20 hotkeys, 30 language, 40 paths, 50 pairing
+       order: 30, // multiples of 10
        titleKey: 'xxx.heading', // i18n key for the section title
        visible: 'always', // or 'tauri', 'desktop-or-tauri'
        component: XxxSection,
@@ -104,8 +103,8 @@ For nested or dynamic routes (`/raids/[id]`), see [Vue Router file-based docs](h
    - That's it — `main.ts` auto-discovers the file via `import.meta.glob('@/features/*/settings.ts', { eager: true })`.
 6. If the feature adds a map layer (new extract/player marker/etc):
    - Create `src/features/map/layers/<name>/` with `useXxxLayer.ts` and `index.ts`.
-   - Call `registerMapLayer({ id, mount: useXxxLayer })` in `index.ts`.
-   - Inside your composable, get the visibility ref via `useLayerVisibility(id)` from `composables/useLayerVisibility.ts` and `watch(visible, ...)` to add/remove your Leaflet root when toggled. The `MapLayerContext.visible` ref is wired to the on-map LayerRail toggle.
+   - Call `registerMapLayer({ id, mount: useXxxLayer, category, order, titleKey, settingsComponent })` in `index.ts` — the rail category, order, display name, and optional inline settings component all live on the layer registration (no separate `settings.ts` for layers).
+   - Inside your composable, read `ctx.visible` (wired to the on-map LayerRail toggle via `useLayerVisibility(id)`) and `watch` it to add/remove your Leaflet root when toggled.
    - `main.ts` auto-discovers via `import.meta.glob('@/features/map/layers/*/index.ts', { eager: true })`.
 
 ### Add a new locale
@@ -189,8 +188,8 @@ pnpm lint       # eslint --max-warnings=0
 - **Tarkov map calibration** (CRS, bounds, rotation) — [`@shared/maps`](../../packages/shared/src/maps.ts). Modifying calibration affects both desktop and browser.
 - **Map localization** — `useMapI18n()` composable in [`features/map/composables/useMapI18n.ts`](./src/features/map/composables/useMapI18n.ts) provides `localizedMapName(code)` with `te → t → displayName` fallback chain. Used in MapView + MapSection to stay in sync.
 - **HTTP / IPC** — single dispatch in [`features/server/api/transport.ts`](./src/features/server/api/transport.ts).
-- **Settings registry** — `registerSettingsSection()` in [`features/settings/registry.ts`](./src/features/settings/registry.ts) with `group: 'layers'` (on-map LayerRail) or `group: 'system'` (gear drawer). Each feature calls this at module load via `features/<name>/settings.ts`. Auto-discovered by `main.ts`. `'layers'` sections render in the LayerRail flyout with inline visibility toggles; `'system'` sections render in the SettingsPanel drawer as accordion items.
-- **Map layers registry** — `registerMapLayer()` in [`features/map/layers/registry.ts`](./src/features/map/layers/registry.ts). Each layer calls this via `features/map/layers/<name>/index.ts`. Auto-discovered by `main.ts`; mounted by `MapView.vue` in setup().
+- **Settings registry** — `registerSettingsSection()` in [`features/settings/registry.ts`](./src/features/settings/registry.ts) — **system/app settings only** (gear-drawer accordion). Each feature calls it at module load via `features/<name>/settings.ts`. Map-LAYER settings live on the map-layer registration instead (below).
+- **Map layers registry** — `registerMapLayer()` in [`features/map/layers/registry.ts`](./src/features/map/layers/registry.ts) — the single source of truth for layers, carrying each layer's rail `category`/`order`/`titleKey`/`settingsComponent`. Each layer calls it via `features/map/layers/<name>/index.ts`; auto-discovered by `main.ts`, mounted by `MapView.vue`, rendered by the on-map `LayerRail`. Per-layer show/hide is `useLayerVisibility`; edge-indicator layers read the rail rect from `useRailObstacle`.
 
 ## See also
 

From bdad8c510f1305f19b0915d4feb3e9af491ba574 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sun, 7 Jun 2026 01:23:54 +0300
Subject: [PATCH 42/53] feat(client): mobile fullscreen + keep-awake, PWA
 manifest

Browser/phone-only Display settings section plus an on-map fullscreen
control for the second-screen phone use case.

- Fullscreen button in the top-right cluster (mobile/touch browser only);
  iOS Safari has no Fullscreen API, so it shows an Add to Home Screen
  popover instead. Hidden once installed as a standalone PWA.
- Keep screen awake (default on): Screen Wake Lock API in secure contexts,
  with a self-contained muted-video fallback for insecure LAN HTTP (the
  phone case). No nosleep.js dependency -- the proven MIT clips are
  embedded in-repo and driven by useNoSleepVideo.
- PWA manifest + iOS meta tags for Add to Home Screen.
- New browser settings-section visibility (!isTauri); Display at order 25.

Reviewed by architect and code-review agents; wake-lock state-machine and
denied-status fixes folded in. Verified: typecheck, lint, 110 tests, live
mobile preview (fullscreen, keep-awake status, video playback).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md                                     |  66 ++++++++++-
 apps/client/index.html                        |   8 ++
 apps/client/public/manifest.webmanifest       |  19 +++
 apps/client/src/components.d.ts               |   1 +
 .../features/display/assets/noSleepVideo.ts   |  14 +++
 .../display/components/DisplaySection.vue     |  63 ++++++++++
 .../display/components/FullscreenButton.vue   |  51 ++++++++
 .../display/composables/useDisplayEnv.ts      |  34 ++++++
 .../composables/useFullscreenToggle.ts        |   9 ++
 .../display/composables/useKeepAwake.ts       | 112 ++++++++++++++++++
 .../display/composables/useNoSleepVideo.ts    |  46 +++++++
 apps/client/src/features/display/settings.ts  |  12 ++
 apps/client/src/features/display/store.ts     |  17 +++
 apps/client/src/features/i18n/locales/en.json |  12 ++
 apps/client/src/features/i18n/locales/ru.json |  12 ++
 .../overlay/components/OverlayHeader.vue      |   2 +
 apps/client/src/features/settings/registry.ts |   3 +-
 apps/client/src/pages/index.vue               |   5 +
 18 files changed, 482 insertions(+), 4 deletions(-)
 create mode 100644 apps/client/public/manifest.webmanifest
 create mode 100644 apps/client/src/features/display/assets/noSleepVideo.ts
 create mode 100644 apps/client/src/features/display/components/DisplaySection.vue
 create mode 100644 apps/client/src/features/display/components/FullscreenButton.vue
 create mode 100644 apps/client/src/features/display/composables/useDisplayEnv.ts
 create mode 100644 apps/client/src/features/display/composables/useFullscreenToggle.ts
 create mode 100644 apps/client/src/features/display/composables/useKeepAwake.ts
 create mode 100644 apps/client/src/features/display/composables/useNoSleepVideo.ts
 create mode 100644 apps/client/src/features/display/settings.ts
 create mode 100644 apps/client/src/features/display/store.ts

diff --git a/CLAUDE.md b/CLAUDE.md
index 07ba0d7..f455ee7 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -365,6 +365,11 @@ Persisted state lives in **per-feature** Pinia stores, not one big store:
 - `apps/client/src/features/airdrop/store.ts` — `dropMarkerRadius` (game
   meters, slider-bound in Settings). Wraps the airdrop state machine —
   `phase` and `outcome` are derived runtime state, not persisted.
+- `apps/client/src/features/display/store.ts` — browser/phone-only:
+  `keepAwake` (default `true`) plus non-persisted runtime status
+  (`keepAwakeMode` = `'wakelock' | 'video' | 'none'`, `keepAwakeActive`)
+  written by the keep-awake driver and read by the settings UI. See
+  "Mobile display (browser / phone)" below.
 
 Each store uses `persistedRef` from `@/shared/persisted-store` with its
 own key (`tc.<feature>.<field>`) — corrupt persisted data falls back to
@@ -397,11 +402,12 @@ user-visible continuity; default to `persistedRef` everywhere else.
 - **Settings-section registry** (`features/settings/registry.ts`) — **system/app
   settings only** (no layer concept; no groups/subgroups). `registerSettingsSection({
   id, order, titleKey, visible?, component })`; `useSettingsSections()` returns them
-  filtered by `visible` (`'always'` | `'tauri'` | `'desktop-or-tauri'`) and sorted by
+  filtered by `visible` (`'always'` | `'tauri'` | `'desktop-or-tauri'` | `'browser'`,
+  where `'browser'` = `!isTauri`) and sorted by
   `order`. Registered in `features/<name>/settings.ts` (auto-loaded via
   `import.meta.glob('@/features/*/settings.ts', { eager: true })`). Currently: 10
-  overlay (tauri), 20 hotkeys (desktop-or-tauri), 30 language, 40 paths
-  (desktop-or-tauri), 50 pairing (tauri). Consumed by the gear **drawer**
+  overlay (tauri), 20 hotkeys (desktop-or-tauri), 25 display (browser), 30 language,
+  40 paths (desktop-or-tauri), 50 pairing (tauri). Consumed by the gear **drawer**
   (`SettingsPanel.vue`): a **non-modal** PrimeVue `Drawer` (right on desktop,
   bottom-sheet on `<640px`) rendering a single flat **Accordion**; open-panel state
   persists in `tc.settings.open`.
@@ -409,6 +415,60 @@ user-visible continuity; default to `persistedRef` everywhere else.
 Faction colours come from `FACTION_COLORS` in `packages/shared/src/maps.ts`
 so icons and tooltip stripes never drift across components.
 
+## Mobile display (browser / phone)
+
+`apps/client/src/features/display/` holds the two phone/second-screen features.
+Both are browser-only (gated on `!isTauri`) — the frameless Tauri overlay has no
+browser chrome and isn't a sleeping phone, so they no-op there. VueUse
+`useFullscreen` / `useWakeLock` do the heavy lifting; the feature code is the
+gating + fallback policy.
+
+- **Fullscreen** (`composables/useFullscreenToggle.ts`, `components/FullscreenButton.vue`).
+  The button lives in the **browser branch** of `OverlayHeader.vue` (top-right
+  cluster, before the gear). Self-gates to mobile/touch (`!isStandalone &&
+  (mobileViewport || touch) && (fullscreenSupported || iOS)`). `pi-window-maximize`
+  ↔ `pi-window-minimize`. iOS Safari has **no Fullscreen API**, so on iOS the
+  button opens a PrimeVue `Popover` with an "Add to Home Screen" hint instead
+  (the PWA `display: standalone` route is the only chrome-free path on iPhone).
+  A duplicate toggle also lives in the Display settings section. `useFullscreen`
+  targets `document.documentElement` so the address bar collapses; each consumer
+  gets its own instance (no shared singleton to strand on unmount). Toggle calls
+  are `.catch(() => undefined)` — `requestFullscreen` rejects when embedded in an
+  iframe and there's nothing actionable.
+- **Keep screen awake** (`composables/useKeepAwake.ts`, default ON). Mounted once
+  in `pages/index.vue` (NOT `MapView`, which remounts on every `:key="mapCode"`
+  change). Two paths:
+  - **Secure context** (HTTPS / `localhost`): Screen Wake Lock API via VueUse.
+    Auto-acquires on mount, no user gesture; VueUse re-acquires on visibility
+    return itself, so we don't double-handle `visibilitychange` for it.
+  - **Insecure LAN HTTP** (the actual phone case — `http://<lan-ip>:5173`/`:47474`
+    is NOT a secure context, so `navigator.wakeLock` is `undefined`): fall back to
+    a muted looping off-screen `<video>` (`composables/useNoSleepVideo.ts` +
+    `assets/noSleepVideo.ts`). The clips (WebM + MP4) are taken verbatim from
+    NoSleep.js (MIT) but embedded and driven in-repo — **no `nosleep.js` runtime
+    dependency** (it's unmaintained; we only need the video trick). iOS Safari
+    plays the MP4, Android/desktop the WebM. Video playback needs a user gesture,
+    so we arm a one-shot `touchstart`/`click` listener and start on the first tap;
+    we re-play on visibility return (the video stays paused after a hide, unlike
+    the wakeLock path). The settings status line reflects which path is active
+    (`display.keepAwakeStatus*` i18n keys).
+
+`useDisplayEnv.ts` centralises the env detection: `isIos` (UA incl. iPadOS-as-Mac),
+`isStandalone` (`matchMedia('(display-mode: standalone)')` + `navigator.standalone`),
+`isMobileViewport` (`max-width: 639px`), `isTouch` (`(hover: none) and (pointer:
+coarse)`).
+
+**PWA manifest** (`apps/client/public/manifest.webmanifest` + `<link rel="manifest">`
+and the `apple-mobile-web-app-*` / `mobile-web-app-capable` meta in `index.html`):
+`display: standalone`, icon = the existing `favicon.svg` (`sizes: "any"`).
+`start_url`/`scope` are `/`, correct for the phone (`:5173`/`:47474`) and the Tauri
+release (base `/`). The hosted **GitHub Pages** build serves under base
+`/tarkov-checker/`, so its `start_url`/`scope` would mismatch — the static manifest
+isn't templated by Vite. Pages PWA install is a secondary path; template the
+manifest if it ever matters. iOS `apple-touch-icon` ideally wants a PNG — pointing
+it at the SVG works on Android, but iPhone may fall back to a page screenshot for
+the home-screen icon; rasterising `favicon.svg` to PNG is an open follow-up.
+
 ## Desktop overlay (Tauri)
 
 The Tauri 2 window is configured as a **frameless, transparent overlay**
diff --git a/apps/client/index.html b/apps/client/index.html
index bc4ef1e..5a97677 100644
--- a/apps/client/index.html
+++ b/apps/client/index.html
@@ -5,6 +5,14 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
     <meta name="theme-color" content="#0b0b0b" />
+    <!-- PWA: "Add to Home Screen" gives iPhone an app-like chrome-free view
+         (iOS has no Fullscreen API); Android Chrome installs as standalone. -->
+    <link rel="manifest" href="/manifest.webmanifest" />
+    <link rel="apple-touch-icon" href="/favicon.svg" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+    <meta name="apple-mobile-web-app-title" content="tarkov-checker" />
     <title>tarkov-checker</title>
   </head>
   <body class="text-neutral-100">
diff --git a/apps/client/public/manifest.webmanifest b/apps/client/public/manifest.webmanifest
new file mode 100644
index 0000000..0421aaa
--- /dev/null
+++ b/apps/client/public/manifest.webmanifest
@@ -0,0 +1,19 @@
+{
+  "name": "tarkov-checker",
+  "short_name": "tarkov-checker",
+  "description": "Live Escape from Tarkov map overlay — second-screen map for your phone.",
+  "start_url": "/",
+  "scope": "/",
+  "display": "standalone",
+  "orientation": "any",
+  "background_color": "#0b0b0b",
+  "theme_color": "#0b0b0b",
+  "icons": [
+    {
+      "src": "/favicon.svg",
+      "sizes": "any",
+      "type": "image/svg+xml",
+      "purpose": "any"
+    }
+  ]
+}
diff --git a/apps/client/src/components.d.ts b/apps/client/src/components.d.ts
index c44671a..69cb61a 100644
--- a/apps/client/src/components.d.ts
+++ b/apps/client/src/components.d.ts
@@ -26,6 +26,7 @@ declare module 'vue' {
     InputText: typeof import('primevue/inputtext')['default']
     Listbox: typeof import('primevue/listbox')['default']
     Message: typeof import('primevue/message')['default']
+    Popover: typeof import('primevue/popover')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Select: typeof import('primevue/select')['default']
diff --git a/apps/client/src/features/display/assets/noSleepVideo.ts b/apps/client/src/features/display/assets/noSleepVideo.ts
new file mode 100644
index 0000000..171a9ea
--- /dev/null
+++ b/apps/client/src/features/display/assets/noSleepVideo.ts
@@ -0,0 +1,14 @@
+// Tiny silent video clips for the keep-awake video fallback — the classic "play
+// a muted looping <video>" trick, the only thing that works on insecure (HTTP)
+// origins where the Screen Wake Lock API is unavailable.
+//
+// Data taken VERBATIM from NoSleep.js (richtr/NoSleep.js, MIT) and generated by
+// gen-nosleep.cjs so the long base64 is byte-accurate. We embed the clips and
+// drive them ourselves (see useNoSleepVideo) so we don't depend on that
+// (unmaintained, last release 2020) package at runtime. iOS Safari can only play
+// the MP4; WebM serves Android/desktop and lets the dev preview verify playback
+// (its open VP8 codec decodes in headless Chromium, unlike proprietary H.264).
+export const NO_SLEEP_WEBM =
+  'data:video/webm;base64,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';
+export const NO_SLEEP_MP4 =
+  'data:video/mp4;base64,AAAAHGZ0eXBNNFYgAAACAGlzb21pc28yYXZjMQAAAAhmcmVlAAAGF21kYXTeBAAAbGliZmFhYyAxLjI4AABCAJMgBDIARwAAArEGBf//rdxF6b3m2Ui3lizYINkj7u94MjY0IC0gY29yZSAxNDIgcjIgOTU2YzhkOCAtIEguMjY0L01QRUctNCBBVkMgY29kZWMgLSBDb3B5bGVmdCAyMDAzLTIwMTQgLSBodHRwOi8vd3d3LnZpZGVvbGFuLm9yZy94MjY0Lmh0bWwgLSBvcHRpb25zOiBjYWJhYz0wIHJlZj0zIGRlYmxvY2s9MTowOjAgYW5hbHlzZT0weDE6MHgxMTEgbWU9aGV4IHN1Ym1lPTcgcHN5PTEgcHN5X3JkPTEuMDA6MC4wMCBtaXhlZF9yZWY9MSBtZV9yYW5nZT0xNiBjaHJvbWFfbWU9MSB0cmVsbGlzPTEgOHg4ZGN0PTAgY3FtPTAgZGVhZHpvbmU9MjEsMTEgZmFzdF9wc2tpcD0xIGNocm9tYV9xcF9vZmZzZXQ9LTIgdGhyZWFkcz02IGxvb2thaGVhZF90aHJlYWRzPTEgc2xpY2VkX3RocmVhZHM9MCBucj0wIGRlY2ltYXRlPTEgaW50ZXJsYWNlZD0wIGJsdXJheV9jb21wYXQ9MCBjb25zdHJhaW5lZF9pbnRyYT0wIGJmcmFtZXM9MCB3ZWlnaHRwPTAga2V5aW50PTI1MCBrZXlpbnRfbWluPTI1IHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NDAgcmM9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02OSBxcHN0ZXA9NCB2YnZfbWF4cmF0ZT03NjggdmJ2X2J1ZnNpemU9MzAwMCBjcmZfbWF4PTAuMCBuYWxfaHJkPW5vbmUgZmlsbGVyPTAgaXBfcmF0aW89MS40MCBhcT0xOjEuMDAAgAAAAFZliIQL8mKAAKvMnJycnJycnJycnXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXiEASZACGQAjgCEASZACGQAjgAAAAAdBmjgX4GSAIQBJkAIZACOAAAAAB0GaVAX4GSAhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpgL8DJIQBJkAIZACOAIQBJkAIZACOAAAAABkGagC/AySEASZACGQAjgAAAAAZBmqAvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZrAL8DJIQBJkAIZACOAAAAABkGa4C/AySEASZACGQAjgCEASZACGQAjgAAAAAZBmwAvwMkhAEmQAhkAI4AAAAAGQZsgL8DJIQBJkAIZACOAIQBJkAIZACOAAAAABkGbQC/AySEASZACGQAjgCEASZACGQAjgAAAAAZBm2AvwMkhAEmQAhkAI4AAAAAGQZuAL8DJIQBJkAIZACOAIQBJkAIZACOAAAAABkGboC/AySEASZACGQAjgAAAAAZBm8AvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZvgL8DJIQBJkAIZACOAAAAABkGaAC/AySEASZACGQAjgCEASZACGQAjgAAAAAZBmiAvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpAL8DJIQBJkAIZACOAAAAABkGaYC/AySEASZACGQAjgCEASZACGQAjgAAAAAZBmoAvwMkhAEmQAhkAI4AAAAAGQZqgL8DJIQBJkAIZACOAIQBJkAIZACOAAAAABkGawC/AySEASZACGQAjgAAAAAZBmuAvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZsAL8DJIQBJkAIZACOAAAAABkGbIC/AySEASZACGQAjgCEASZACGQAjgAAAAAZBm0AvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZtgL8DJIQBJkAIZACOAAAAABkGbgCvAySEASZACGQAjgCEASZACGQAjgAAAAAZBm6AnwMkhAEmQAhkAI4AhAEmQAhkAI4AhAEmQAhkAI4AhAEmQAhkAI4AAAAhubW9vdgAAAGxtdmhkAAAAAAAAAAAAAAAAAAAD6AAABDcAAQAAAQAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAzB0cmFrAAAAXHRraGQAAAADAAAAAAAAAAAAAAABAAAAAAAAA+kAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAALAAAACQAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAPpAAAAAAABAAAAAAKobWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAB1MAAAdU5VxAAAAAAALWhkbHIAAAAAAAAAAHZpZGUAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAACU21pbmYAAAAUdm1oZAAAAAEAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAhNzdGJsAAAAr3N0c2QAAAAAAAAAAQAAAJ9hdmMxAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAALAAkABIAAAASAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAALWF2Y0MBQsAN/+EAFWdCwA3ZAsTsBEAAAPpAADqYA8UKkgEABWjLg8sgAAAAHHV1aWRraEDyXyRPxbo5pRvPAyPzAAAAAAAAABhzdHRzAAAAAAAAAAEAAAAeAAAD6QAAABRzdHNzAAAAAAAAAAEAAAABAAAAHHN0c2MAAAAAAAAAAQAAAAEAAAABAAAAAQAAAIxzdHN6AAAAAAAAAAAAAAAeAAADDwAAAAsAAAALAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAAiHN0Y28AAAAAAAAAHgAAAEYAAANnAAADewAAA5gAAAO0AAADxwAAA+MAAAP2AAAEEgAABCUAAARBAAAEXQAABHAAAASMAAAEnwAABLsAAATOAAAE6gAABQYAAAUZAAAFNQAABUgAAAVkAAAFdwAABZMAAAWmAAAFwgAABd4AAAXxAAAGDQAABGh0cmFrAAAAXHRraGQAAAADAAAAAAAAAAAAAAACAAAAAAAABDcAAAAAAAAAAAAAAAEBAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAQkAAADcAABAAAAAAPgbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAC7gAAAykBVxAAAAAAALWhkbHIAAAAAAAAAAHNvdW4AAAAAAAAAAAAAAABTb3VuZEhhbmRsZXIAAAADi21pbmYAAAAQc21oZAAAAAAAAAAAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAADT3N0YmwAAABnc3RzZAAAAAAAAAABAAAAV21wNGEAAAAAAAAAAQAAAAAAAAAAAAIAEAAAAAC7gAAAAAAAM2VzZHMAAAAAA4CAgCIAAgAEgICAFEAVBbjYAAu4AAAADcoFgICAAhGQBoCAgAECAAAAIHN0dHMAAAAAAAAAAgAAADIAAAQAAAAAAQAAAkAAAAFUc3RzYwAAAAAAAAAbAAAAAQAAAAEAAAABAAAAAgAAAAIAAAABAAAAAwAAAAEAAAABAAAABAAAAAIAAAABAAAABgAAAAEAAAABAAAABwAAAAIAAAABAAAACAAAAAEAAAABAAAACQAAAAIAAAABAAAACgAAAAEAAAABAAAACwAAAAIAAAABAAAADQAAAAEAAAABAAAADgAAAAIAAAABAAAADwAAAAEAAAABAAAAEAAAAAIAAAABAAAAEQAAAAEAAAABAAAAEgAAAAIAAAABAAAAFAAAAAEAAAABAAAAFQAAAAIAAAABAAAAFgAAAAEAAAABAAAAFwAAAAIAAAABAAAAGAAAAAEAAAABAAAAGQAAAAIAAAABAAAAGgAAAAEAAAABAAAAGwAAAAIAAAABAAAAHQAAAAEAAAABAAAAHgAAAAIAAAABAAAAHwAAAAQAAAABAAAA4HN0c3oAAAAAAAAAAAAAADMAAAAaAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAACMc3RjbwAAAAAAAAAfAAAALAAAA1UAAANyAAADhgAAA6IAAAO+AAAD0QAAA+0AAAQAAAAEHAAABC8AAARLAAAEZwAABHoAAASWAAAEqQAABMUAAATYAAAE9AAABRAAAAUjAAAFPwAABVIAAAVuAAAFgQAABZ0AAAWwAAAFzAAABegAAAX7AAAGFwAAAGJ1ZHRhAAAAWm1ldGEAAAAAAAAAIWhkbHIAAAAAAAAAAG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYXZmNTUuMzMuMTAw';
diff --git a/apps/client/src/features/display/components/DisplaySection.vue b/apps/client/src/features/display/components/DisplaySection.vue
new file mode 100644
index 0000000..082beaa
--- /dev/null
+++ b/apps/client/src/features/display/components/DisplaySection.vue
@@ -0,0 +1,63 @@
+<script setup lang="ts">
+import { useDisplayStore } from '../store';
+import { useDisplayEnv } from '../composables/useDisplayEnv';
+import { useFullscreenToggle } from '../composables/useFullscreenToggle';
+
+const { t } = useI18n();
+const { keepAwake, keepAwakeMode, keepAwakeActive } = storeToRefs(useDisplayStore());
+const { isIos, isStandalone } = useDisplayEnv();
+const { isFullscreen, isSupported: fsSupported, toggle: toggleFullscreen } = useFullscreenToggle();
+
+// Hide the fullscreen row once installed as a PWA (already chrome-free).
+const showFullscreenRow = computed(() => !isStandalone.value);
+const fullscreenToggleable = computed(() => fsSupported.value && !isIos);
+
+// ToggleSwitch bound to live fullscreen state — set just toggles, the getter
+// reflects the real state once `fullscreenchange` fires (no desync flash).
+const fullscreenModel = computed({
+  get: () => isFullscreen.value,
+  set: () => {
+    void toggleFullscreen().catch(() => undefined);
+  },
+});
+
+// Driven entirely off the keep-awake driver's store state (mode + active) — no
+// separate navigator probe, so the status can't drift from the actual driver.
+const keepAwakeStatusKey = computed(() => {
+  if (!keepAwake.value) return 'display.keepAwakeHintOff';
+  if (keepAwakeActive.value)
+    return keepAwakeMode.value === 'video'
+      ? 'display.keepAwakeStatusVideo'
+      : 'display.keepAwakeStatusActive';
+  if (keepAwakeMode.value === 'video') return 'display.keepAwakeStatusTap';
+  if (keepAwakeMode.value === 'wakelock') return 'display.keepAwakeStatusBlocked';
+  return 'display.keepAwakeHintOff';
+});
+</script>
+
+<template>
+  <div class="space-y-3">
+    <div v-if="showFullscreenRow">
+      <div class="flex items-center justify-between gap-3">
+        <label class="text-sm" for="display-fullscreen">{{ t('display.fullscreen') }}</label>
+        <ToggleSwitch
+          v-if="fullscreenToggleable"
+          v-model="fullscreenModel"
+          input-id="display-fullscreen"
+        />
+        <span v-else class="text-xs opacity-50">{{ t('display.fullscreenNA') }}</span>
+      </div>
+      <p v-if="!fullscreenToggleable && isIos" class="mt-1.5 text-[10px] leading-relaxed opacity-70">
+        {{ t('display.iosHint') }}
+      </p>
+    </div>
+
+    <div>
+      <div class="flex items-center justify-between gap-3">
+        <label class="text-sm" for="display-keep-awake">{{ t('display.keepAwake') }}</label>
+        <ToggleSwitch v-model="keepAwake" input-id="display-keep-awake" />
+      </div>
+      <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t(keepAwakeStatusKey) }}</p>
+    </div>
+  </div>
+</template>
diff --git a/apps/client/src/features/display/components/FullscreenButton.vue b/apps/client/src/features/display/components/FullscreenButton.vue
new file mode 100644
index 0000000..7117438
--- /dev/null
+++ b/apps/client/src/features/display/components/FullscreenButton.vue
@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { useDisplayEnv } from '../composables/useDisplayEnv';
+import { useFullscreenToggle } from '../composables/useFullscreenToggle';
+
+const { t } = useI18n();
+const { isIos, isStandalone, isMobileViewport, isTouch } = useDisplayEnv();
+const { isFullscreen, isSupported, toggle } = useFullscreenToggle();
+
+// Mobile/touch browser only: desktop has F11, and an installed PWA is already
+// chrome-free. On iOS the Fullscreen API is absent, so the button becomes a
+// "Add to Home Screen" hint instead.
+const show = computed(
+  () =>
+    !isStandalone.value &&
+    (isMobileViewport.value || isTouch.value) &&
+    (isSupported.value || isIos),
+);
+
+const iosHint = ref<{ toggle: (e: Event) => void } | null>(null);
+
+function onClick(event: MouseEvent): void {
+  // requestFullscreen rejects when disallowed (e.g. embedded in an iframe);
+  // swallow it — there's nothing actionable and no user-facing failure.
+  if (isSupported.value && !isIos) void toggle().catch(() => undefined);
+  else if (isIos) iosHint.value?.toggle(event);
+}
+
+const icon = computed(() => {
+  if (isIos && !isSupported.value) return 'pi pi-mobile';
+  return isFullscreen.value ? 'pi pi-window-minimize' : 'pi pi-window-maximize';
+});
+</script>
+
+<template>
+  <template v-if="show">
+    <Button
+      rounded
+      severity="secondary"
+      class="!bg-surface-800/80 hover:!bg-surface-800 !border-surface-700 backdrop-blur"
+      :aria-label="t('display.fullscreen')"
+      @click="onClick"
+    >
+      <template #icon>
+        <i :class="['text-sm', icon]" aria-hidden="true" />
+      </template>
+    </Button>
+    <Popover ref="iosHint">
+      <p class="max-w-[15rem] text-xs leading-relaxed">{{ t('display.iosHint') }}</p>
+    </Popover>
+  </template>
+</template>
diff --git a/apps/client/src/features/display/composables/useDisplayEnv.ts b/apps/client/src/features/display/composables/useDisplayEnv.ts
new file mode 100644
index 0000000..9e232d3
--- /dev/null
+++ b/apps/client/src/features/display/composables/useDisplayEnv.ts
@@ -0,0 +1,34 @@
+import type { ComputedRef, Ref } from 'vue';
+
+// iOS (incl. iPadOS, which reports as Mac) — used ONLY to pick the "Add to Home
+// Screen" hint when the Fullscreen API is absent. Real capability is gated on
+// useFullscreen().isSupported, never on this UA sniff.
+function detectIos(): boolean {
+  if (typeof navigator === 'undefined') return false;
+  const ua = navigator.userAgent;
+  return /iPhone|iPod|iPad/.test(ua) || (/Macintosh/.test(ua) && navigator.maxTouchPoints > 1);
+}
+
+function detectNavigatorStandalone(): boolean {
+  if (typeof navigator === 'undefined') return false;
+  return (navigator as Navigator & { standalone?: boolean }).standalone === true;
+}
+
+export interface DisplayEnv {
+  isIos: boolean;
+  /** Launched as an installed PWA (no browser chrome → fullscreen affordance moot). */
+  isStandalone: ComputedRef<boolean>;
+  isMobileViewport: Ref<boolean>;
+  isTouch: Ref<boolean>;
+}
+
+export function useDisplayEnv(): DisplayEnv {
+  const displayModeStandalone = useMediaQuery('(display-mode: standalone)');
+  const navStandalone = detectNavigatorStandalone();
+  return {
+    isIos: detectIos(),
+    isStandalone: computed(() => displayModeStandalone.value || navStandalone),
+    isMobileViewport: useMediaQuery('(max-width: 639px)'),
+    isTouch: useMediaQuery('(hover: none) and (pointer: coarse)'),
+  };
+}
diff --git a/apps/client/src/features/display/composables/useFullscreenToggle.ts b/apps/client/src/features/display/composables/useFullscreenToggle.ts
new file mode 100644
index 0000000..a859066
--- /dev/null
+++ b/apps/client/src/features/display/composables/useFullscreenToggle.ts
@@ -0,0 +1,9 @@
+// Thin wrapper over VueUse useFullscreen. Targets documentElement so the
+// browser address bar collapses (not just an element). Callers get independent
+// instances that stay in sync via their own `fullscreenchange` listeners — no
+// shared singleton, so an unmounting consumer can't strand the others.
+export function useFullscreenToggle() {
+  const target = typeof document !== 'undefined' ? document.documentElement : undefined;
+  const { isFullscreen, isSupported, toggle } = useFullscreen(target);
+  return { isFullscreen, isSupported, toggle };
+}
diff --git a/apps/client/src/features/display/composables/useKeepAwake.ts b/apps/client/src/features/display/composables/useKeepAwake.ts
new file mode 100644
index 0000000..c139d55
--- /dev/null
+++ b/apps/client/src/features/display/composables/useKeepAwake.ts
@@ -0,0 +1,112 @@
+import { isTauri } from '@/shared/tauri';
+import { createNoSleepVideo, type NoSleepVideo } from './useNoSleepVideo';
+import { useDisplayStore } from '../store';
+
+// Keeps the screen awake while the map page is mounted. Two paths:
+//   • Secure context (HTTPS / localhost): Screen Wake Lock API via VueUse,
+//     auto-re-acquired on visibility return — no user gesture needed.
+//   • Insecure LAN HTTP (the phone case): navigator.wakeLock is undefined, so
+//     fall back to a muted looping <video> (nosleep.js). Video playback needs a
+//     user gesture, so we arm a one-shot listener and start on the first tap.
+// No-op under Tauri — the desktop overlay isn't a sleeping phone.
+export function useKeepAwake(): void {
+  if (isTauri) return;
+
+  const store = useDisplayStore();
+  const { keepAwake } = storeToRefs(store);
+  const { isSupported, isActive, request, release } = useWakeLock();
+
+  let noSleep: NoSleepVideo | null = null;
+  let disarmGesture: (() => void) | null = null;
+  // True once the video has actually played — gates re-play on visibility return
+  // so we don't fire play() (which needs a gesture) before the first tap.
+  let videoStarted = false;
+
+  function startVideo(): void {
+    noSleep ??= createNoSleepVideo();
+    void noSleep
+      .enable()
+      .then(() => {
+        videoStarted = true;
+        store.keepAwakeActive = true;
+      })
+      .catch(() => {
+        store.keepAwakeActive = false;
+      });
+  }
+
+  function armGesture(): void {
+    if (disarmGesture) return;
+    store.keepAwakeMode = 'video';
+    // removeEventListener takes no `passive` flag — match on type + listener.
+    const remove = (): void => {
+      document.removeEventListener('touchstart', start);
+      document.removeEventListener('click', start);
+      disarmGesture = null;
+    };
+    const start = (): void => {
+      remove();
+      startVideo();
+    };
+    document.addEventListener('touchstart', start, { passive: true });
+    document.addEventListener('click', start, { passive: true });
+    disarmGesture = remove;
+  }
+
+  async function acquire(): Promise<void> {
+    if (isSupported.value) {
+      // VueUse's request() defers when the page is hidden and self-re-acquires
+      // on visibility return, so call it regardless of current visibility.
+      store.keepAwakeMode = 'wakelock';
+      try {
+        await request('screen');
+      } catch {
+        // Supported but denied (rare: low-power mode / permissions policy) — the
+        // settings status reflects the not-holding state via keepAwakeActive.
+      }
+      store.keepAwakeActive = isActive.value;
+      return;
+    }
+    // Video fallback needs a visible page and a user gesture to start.
+    if (document.visibilityState === 'visible') armGesture();
+  }
+
+  async function releaseAll(): Promise<void> {
+    disarmGesture?.();
+    videoStarted = false;
+    if (isActive.value) await release();
+    noSleep?.disable();
+    store.keepAwakeActive = false;
+    store.keepAwakeMode = 'none';
+  }
+
+  // wakeLock path: VueUse re-acquires on visibility itself. Video path: the
+  // <video> stays paused after the tab was hidden, so re-play on return — but
+  // only once it has actually started (a hidden→visible transition has no user
+  // gesture, so an un-started video can't begin here).
+  useEventListener(document, 'visibilitychange', () => {
+    if (document.visibilityState === 'visible') {
+      if (keepAwake.value && store.keepAwakeMode === 'video' && videoStarted) startVideo();
+    } else if (store.keepAwakeMode === 'video') {
+      store.keepAwakeActive = false;
+    }
+  });
+
+  watch(keepAwake, (on) => {
+    if (on) void acquire();
+    else void releaseAll();
+  });
+
+  // Mirror VueUse's reactive isActive for the wakeLock path so the settings
+  // status reflects OS-side drops / re-acquires.
+  watch(isActive, (active) => {
+    if (store.keepAwakeMode === 'wakelock') store.keepAwakeActive = active;
+  });
+
+  onMounted(() => {
+    if (keepAwake.value) void acquire();
+  });
+  onScopeDispose(() => {
+    void releaseAll();
+  });
+}
diff --git a/apps/client/src/features/display/composables/useNoSleepVideo.ts b/apps/client/src/features/display/composables/useNoSleepVideo.ts
new file mode 100644
index 0000000..7771238
--- /dev/null
+++ b/apps/client/src/features/display/composables/useNoSleepVideo.ts
@@ -0,0 +1,46 @@
+import { NO_SLEEP_WEBM, NO_SLEEP_MP4 } from '../assets/noSleepVideo';
+
+export interface NoSleepVideo {
+  /** Must be called from a user gesture for the first play; muted playback may
+   *  resume programmatically afterwards (e.g. after the tab was hidden). */
+  enable: () => Promise<void>;
+  disable: () => void;
+}
+
+// Keep-awake fallback for insecure (HTTP) origins where the Screen Wake Lock API
+// is unavailable: a muted, looping, off-screen <video>. Browsers won't sleep the
+// display while a video plays. Self-contained — no third-party runtime dep.
+export function createNoSleepVideo(): NoSleepVideo {
+  let video: HTMLVideoElement | null = null;
+
+  function ensure(): HTMLVideoElement {
+    if (video) return video;
+    const el = document.createElement('video');
+    el.setAttribute('title', 'No Sleep');
+    el.setAttribute('playsinline', '');
+    el.muted = true;
+    el.loop = true;
+    // WebM first (Android/desktop), MP4 second (iOS Safari plays only MP4). The
+    // browser picks the first source it can decode.
+    for (const [type, src] of [
+      ['video/webm', NO_SLEEP_WEBM],
+      ['video/mp4', NO_SLEEP_MP4],
+    ] as const) {
+      const source = document.createElement('source');
+      source.type = type;
+      source.src = src;
+      el.appendChild(source);
+    }
+    // Off-screen, non-interactive. Attaching to the DOM is more reliable than a
+    // detached element across browsers.
+    el.style.cssText = 'position:fixed;width:1px;height:1px;opacity:0;pointer-events:none;';
+    document.body.appendChild(el);
+    video = el;
+    return el;
+  }
+
+  return {
+    enable: () => ensure().play(),
+    disable: () => video?.pause(),
+  };
+}
diff --git a/apps/client/src/features/display/settings.ts b/apps/client/src/features/display/settings.ts
new file mode 100644
index 0000000..db0ec88
--- /dev/null
+++ b/apps/client/src/features/display/settings.ts
@@ -0,0 +1,12 @@
+import { registerSettingsSection } from '@/features/settings/registry';
+import DisplaySection from './components/DisplaySection.vue';
+
+// Browser/phone-only display prefs (fullscreen, keep-awake). Meaningless in the
+// frameless Tauri overlay, so gated to non-Tauri via the 'browser' visibility.
+registerSettingsSection({
+  id: 'display',
+  order: 25,
+  visible: 'browser',
+  titleKey: 'display.heading',
+  component: DisplaySection,
+});
diff --git a/apps/client/src/features/display/store.ts b/apps/client/src/features/display/store.ts
new file mode 100644
index 0000000..864c881
--- /dev/null
+++ b/apps/client/src/features/display/store.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod';
+import { persistedRef } from '@/shared/persisted-store';
+
+export type KeepAwakeMode = 'wakelock' | 'video' | 'none';
+
+export const useDisplayStore = defineStore('display', () => {
+  // Keep the phone screen awake while the map is open. Default on — the map is
+  // a passive second screen, so sleeping mid-raid is the common annoyance.
+  const keepAwake = persistedRef('tc.display.keepAwake', z.boolean(), true);
+
+  // Runtime status of the keep-awake driver (not persisted) — read by the
+  // settings UI to show which path holds the lock and whether it's active.
+  const keepAwakeMode = ref<KeepAwakeMode>('none');
+  const keepAwakeActive = ref(false);
+
+  return { keepAwake, keepAwakeMode, keepAwakeActive };
+});
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 86efda0..1cd43e5 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -80,6 +80,18 @@
     "quickMenuTitle": "Transparency",
     "move": "Drag to move"
   },
+  "display": {
+    "heading": "Display",
+    "fullscreen": "Fullscreen",
+    "fullscreenNA": "N/A",
+    "iosHint": "On iPhone, open this page in Safari, tap Share then “Add to Home Screen” for a full-screen, app-like view.",
+    "keepAwake": "Keep screen awake",
+    "keepAwakeHintOff": "Stop your screen from sleeping while the map is open.",
+    "keepAwakeStatusActive": "On — your screen won’t sleep while the map is open.",
+    "keepAwakeStatusVideo": "On (compatibility mode) — your screen won’t sleep while the map is open.",
+    "keepAwakeStatusTap": "Tap the map once to activate — this connection can’t use the Wake Lock API (needs HTTPS).",
+    "keepAwakeStatusBlocked": "Couldn’t keep the screen awake — the browser denied it; your screen may sleep."
+  },
   "pairing": {
     "heading": "Phone access",
     "sectionHint": "Show a QR for a phone in the same Wi-Fi to open the same map UI.",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 6d1058e..3ebdc28 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -80,6 +80,18 @@
     "quickMenuTitle": "Прозрачность",
     "move": "Перетащить"
   },
+  "display": {
+    "heading": "Дисплей",
+    "fullscreen": "Полный экран",
+    "fullscreenNA": "Недоступно",
+    "iosHint": "На iPhone открой эту страницу в Safari, нажми «Поделиться» → «На экран «Домой»» — получишь полноэкранный режим как у приложения.",
+    "keepAwake": "Не гасить экран",
+    "keepAwakeHintOff": "Не давать экрану гаснуть, пока открыта карта.",
+    "keepAwakeStatusActive": "Включено — экран не гаснет, пока открыта карта.",
+    "keepAwakeStatusVideo": "Включено (режим совместимости) — экран не гаснет, пока открыта карта.",
+    "keepAwakeStatusTap": "Коснись карты, чтобы активировать — это соединение не может использовать Wake Lock API (нужен HTTPS).",
+    "keepAwakeStatusBlocked": "Не удалось удержать экран — браузер отклонил запрос; экран может гаснуть."
+  },
   "pairing": {
     "heading": "Доступ с телефона",
     "sectionHint": "Покажи QR для телефона в той же Wi-Fi, чтобы открыть карту на нём.",
diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index ce43b50..50dd8e6 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import SettingsPanel from '@/features/settings/SettingsPanel.vue';
+import FullscreenButton from '@/features/display/components/FullscreenButton.vue';
 import MapSwitchMenu from './MapSwitchMenu.vue';
 import { isTauri } from '@/shared/tauri';
 import { useOverlayHeaderActive } from '../composables/useOverlayHeaderActive';
@@ -169,6 +170,7 @@ function openMapMenu(event: MouseEvent): void {
       <span>{{ mapDisplayName }}</span>
       <span class="sr-only" aria-live="polite">Connection: {{ status }}</span>
     </span>
+    <FullscreenButton />
     <SettingsPanel />
   </div>
 
diff --git a/apps/client/src/features/settings/registry.ts b/apps/client/src/features/settings/registry.ts
index 5921bb1..5a727e4 100644
--- a/apps/client/src/features/settings/registry.ts
+++ b/apps/client/src/features/settings/registry.ts
@@ -2,7 +2,7 @@ import { computed, shallowReactive, type ComputedRef, type Component } from 'vue
 import { useMediaQuery } from '@vueuse/core';
 import { isTauri } from '@/shared/tauri';
 
-export type SectionVisibility = 'always' | 'tauri' | 'desktop-or-tauri';
+export type SectionVisibility = 'always' | 'tauri' | 'desktop-or-tauri' | 'browser';
 
 export interface SettingsSection {
   id: string;
@@ -32,6 +32,7 @@ export function useSettingsSections(): ComputedRef<SettingsSection[]> {
     const visible = (v: SectionVisibility = 'always'): boolean => {
       if (v === 'always') return true;
       if (v === 'tauri') return isTauri;
+      if (v === 'browser') return !isTauri;
       return isTauri || isDesktop.value;
     };
 
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index 16737ce..06e092b 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -15,6 +15,7 @@ import { useServerEvent } from '@/features/server/composables/useServerEvents';
 import { useCloseConfirm } from '@/features/overlay/composables/useCloseConfirm';
 import { useAirdropStore } from '@/features/airdrop/store';
 import { useAirdropTracker } from '@/features/airdrop/composables/useAirdropTracker';
+import { useKeepAwake } from '@/features/display/composables/useKeepAwake';
 
 const { mapCode } = storeToRefs(useMapSettingsStore());
 const { showControls } = useOverlayLock();
@@ -25,6 +26,10 @@ const { lockHotkey } = storeToRefs(useHotkeysStore());
 const airdropStore = useAirdropStore();
 useAirdropTracker();
 
+// Keep the phone screen awake while the map is open (browser only; no-op in
+// Tauri). Mounted here, not in MapView, which remounts on every map change.
+useKeepAwake();
+
 const status = useTransportStatus();
 const confirmClose = useCloseConfirm();
 

From 55143b2328bedad2f52bec917056a32f67fc25f3 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sun, 7 Jun 2026 01:51:44 +0300
Subject: [PATCH 43/53] fix(client): stable viewport height + iOS-safe
 rail/flyout centering

On iOS 15 (Safari < 16.4) the map overlay layout broke on a real phone: the
page could scroll, which let Safari's bottom toolbar retract and swell dvh,
and the vertically-centred LayerRail + its flyout landed off-centre.

Two root causes, both iOS-specific:
- A scrollable body let the toolbar toggle, making 100dvh unstable. Lock the
  app shell (html/body/#app overflow:hidden + overscroll-behavior:none) and
  size the root with the stable 100%/svh chain (h-dvh -> h-full).
- Tailwind v4 translate utilities rely on @property-registered vars, which
  Safari < 16.4 ignores, so -translate-y-1/2 produced an invalid translate
  declaration and centring silently failed. Replace it with a literal
  transform: translateY(-50%) on the rail and flyout.

Also switch the rail flyout / settings drawer max-heights from dvh to svh so
they stay stable under the locked toolbar.

Diagnosed and verified on an iPod touch 7 (iOS 15.8) via a temporary
viewport-metrics overlay (since removed): the rail now centres at the
viewport midpoint with no page overflow or scroll.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 apps/client/src/App.vue                            |  2 +-
 .../src/features/map/components/LayerRail.vue      | 14 ++++++++++++--
 .../client/src/features/settings/SettingsPanel.vue |  2 +-
 apps/client/src/styles.css                         |  6 ++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/apps/client/src/App.vue b/apps/client/src/App.vue
index 74dc4f9..61eb4c6 100644
--- a/apps/client/src/App.vue
+++ b/apps/client/src/App.vue
@@ -77,7 +77,7 @@ function onMapContextMenu(event: MouseEvent): void {
   -->
   <PairingModal v-if="isTauri" />
   <div
-    class="relative h-dvh w-screen text-surface-0"
+    class="relative h-full w-screen text-surface-0"
     :class="isTauri ? '' : 'bg-surface-950'"
     @contextmenu="onMapContextMenu"
   >
diff --git a/apps/client/src/features/map/components/LayerRail.vue b/apps/client/src/features/map/components/LayerRail.vue
index 6895dbe..418a804 100644
--- a/apps/client/src/features/map/components/LayerRail.vue
+++ b/apps/client/src/features/map/components/LayerRail.vue
@@ -123,7 +123,7 @@ function stepFloor(delta: number): void {
     <div
       v-if="railVisible"
       ref="railRef"
-      class="layer-rail border-surface-700 bg-surface-900/85 absolute left-0 top-1/2 z-[1100] flex -translate-y-1/2 flex-col gap-1 rounded-r-xl border border-l-0 p-1 backdrop-blur"
+      class="layer-rail border-surface-700 bg-surface-900/85 absolute left-0 top-1/2 z-[1100] flex flex-col gap-1 rounded-r-xl border border-l-0 p-1 backdrop-blur"
     >
       <button
         v-tooltip.right="{ value: t('map'), disabled: openId !== null }"
@@ -185,7 +185,7 @@ function stepFloor(delta: number): void {
       <div
         v-if="openId"
         ref="flyoutRef"
-        class="border-surface-700 bg-surface-900/95 absolute left-full top-1/2 ml-1.5 max-h-[80dvh] w-60 -translate-y-1/2 overflow-y-auto rounded-xl border p-3 shadow-xl backdrop-blur"
+        class="layer-rail__flyout border-surface-700 bg-surface-900/95 absolute left-full top-1/2 ml-1.5 max-h-[80svh] w-60 overflow-y-auto rounded-xl border p-3 shadow-xl backdrop-blur"
       >
         <template v-if="isMapOpen">
           <p class="mb-2 text-[10px] font-semibold uppercase tracking-wider opacity-50">
@@ -240,6 +240,16 @@ function stepFloor(delta: number): void {
 </template>
 
 <style scoped>
+/* Vertical centring via a literal transform, NOT Tailwind's `-translate-y-1/2`.
+   Tailwind v4's translate utilities rely on @property-registered `--tw-*` vars,
+   which Safari < 16.4 (iOS 15) ignores — the composed `translate` declaration
+   then turns invalid and centring silently breaks. A plain transform works on
+   every Safari. (Paired with `top-1/2` in the template.) */
+.layer-rail,
+.layer-rail__flyout {
+  transform: translateY(-50%);
+}
+
 .rail-btn {
   display: flex;
   align-items: center;
diff --git a/apps/client/src/features/settings/SettingsPanel.vue b/apps/client/src/features/settings/SettingsPanel.vue
index 9851caf..4f3f065 100644
--- a/apps/client/src/features/settings/SettingsPanel.vue
+++ b/apps/client/src/features/settings/SettingsPanel.vue
@@ -57,7 +57,7 @@ const openSections = persistedRef(
     :dismissable="false"
     :position="isDesktop ? 'right' : 'bottom'"
     :header="t('settings')"
-    :class="isDesktop ? '!w-[26rem]' : '!h-auto !max-h-[85dvh] !rounded-t-2xl'"
+    :class="isDesktop ? '!w-[26rem]' : '!h-auto !max-h-[85svh] !rounded-t-2xl'"
   >
     <Accordion v-model:value="openSections" multiple>
       <AccordionPanel v-for="sec in systemSections" :key="sec.id" :value="sec.id">
diff --git a/apps/client/src/styles.css b/apps/client/src/styles.css
index 3a9f41d..51ce8eb 100644
--- a/apps/client/src/styles.css
+++ b/apps/client/src/styles.css
@@ -80,6 +80,12 @@ body,
   height: 100%;
   margin: 0;
   background: transparent;
+  /* Fixed full-screen app shell — never page-scroll. On iOS Safari a scrollable
+     body lets the bottom toolbar retract, which swells `dvh` and breaks the
+     vertically-centred rail/flyout. Locking scroll keeps the toolbar (and the
+     `100%`/`svh` height) stable; `100%` resolves to the small viewport. */
+  overflow: hidden;
+  overscroll-behavior: none;
 }
 
 /* Tauri overlay mode: round the painted area for a softer overlay shape.

From eab1b24d319d8c262306ee6cb6f8129c65892e37 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sun, 7 Jun 2026 03:02:00 +0300
Subject: [PATCH 44/53] refactor(client): consolidate mobile top bar; drop
 keep-awake; clock seconds

Mobile/phone UX pass.

- Top bar: fold the connection-status dot, the map name (>=380px) and the two
  in-game clocks into the always-visible left chip (TarkovTimeChip). The
  top-right browser cluster is now just the settings gear, so the bar no longer
  overflows on a 320px phone (iPod touch). Drop the clock icon.
- Clock: show seconds, sampled via requestAnimationFrame so they tick smoothly
  (in-game time runs 7x, so a fixed interval visibly stutters them); add the
  seconds field to @shared/tarkov-time.
- Remove the keep-awake feature entirely. There is no reliable web way to keep a
  mobile screen awake over plain HTTP: the Screen Wake Lock API needs a secure
  context (absent on iOS < 16.4, unreachable for a LAN phone) and the
  muted/unmuted looping-video trick no longer keeps the screen on under current
  iOS or Android (verified on iPod touch iOS 15 + Android). Deletes useKeepAwake,
  useNoSleepVideo, the embedded video asset and the display store. The Display
  settings section now holds only the fullscreen toggle (iOS shows an
  Add-to-Home-Screen hint).
- Remove the on-map fullscreen button; fullscreen lives only in Display settings.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md                                     |  88 +++++++-------
 apps/client/src/__tests__/tarkov-time.spec.ts |   6 +-
 .../features/display/assets/noSleepVideo.ts   |  14 ---
 .../display/components/DisplaySection.vue     |  49 ++------
 .../display/components/FullscreenButton.vue   |  51 --------
 .../display/composables/useDisplayEnv.ts      |  16 +--
 .../display/composables/useKeepAwake.ts       | 112 ------------------
 .../display/composables/useNoSleepVideo.ts    |  46 -------
 apps/client/src/features/display/store.ts     |  17 ---
 apps/client/src/features/i18n/locales/en.json |   8 +-
 apps/client/src/features/i18n/locales/ru.json |   8 +-
 .../overlay/components/OverlayHeader.vue      |  17 +--
 .../features/tarkov-time/TarkovTimeChip.vue   |  92 +++++++++-----
 apps/client/src/pages/index.vue               |  18 +--
 packages/shared/src/tarkov-time.ts            |   6 +-
 15 files changed, 145 insertions(+), 403 deletions(-)
 delete mode 100644 apps/client/src/features/display/assets/noSleepVideo.ts
 delete mode 100644 apps/client/src/features/display/components/FullscreenButton.vue
 delete mode 100644 apps/client/src/features/display/composables/useKeepAwake.ts
 delete mode 100644 apps/client/src/features/display/composables/useNoSleepVideo.ts
 delete mode 100644 apps/client/src/features/display/store.ts

diff --git a/CLAUDE.md b/CLAUDE.md
index f455ee7..9366738 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -365,11 +365,6 @@ Persisted state lives in **per-feature** Pinia stores, not one big store:
 - `apps/client/src/features/airdrop/store.ts` — `dropMarkerRadius` (game
   meters, slider-bound in Settings). Wraps the airdrop state machine —
   `phase` and `outcome` are derived runtime state, not persisted.
-- `apps/client/src/features/display/store.ts` — browser/phone-only:
-  `keepAwake` (default `true`) plus non-persisted runtime status
-  (`keepAwakeMode` = `'wakelock' | 'video' | 'none'`, `keepAwakeActive`)
-  written by the keep-awake driver and read by the settings UI. See
-  "Mobile display (browser / phone)" below.
 
 Each store uses `persistedRef` from `@/shared/persisted-store` with its
 own key (`tc.<feature>.<field>`) — corrupt persisted data falls back to
@@ -417,46 +412,49 @@ so icons and tooltip stripes never drift across components.
 
 ## Mobile display (browser / phone)
 
-`apps/client/src/features/display/` holds the two phone/second-screen features.
-Both are browser-only (gated on `!isTauri`) — the frameless Tauri overlay has no
-browser chrome and isn't a sleeping phone, so they no-op there. VueUse
-`useFullscreen` / `useWakeLock` do the heavy lifting; the feature code is the
-gating + fallback policy.
-
-- **Fullscreen** (`composables/useFullscreenToggle.ts`, `components/FullscreenButton.vue`).
-  The button lives in the **browser branch** of `OverlayHeader.vue` (top-right
-  cluster, before the gear). Self-gates to mobile/touch (`!isStandalone &&
-  (mobileViewport || touch) && (fullscreenSupported || iOS)`). `pi-window-maximize`
-  ↔ `pi-window-minimize`. iOS Safari has **no Fullscreen API**, so on iOS the
-  button opens a PrimeVue `Popover` with an "Add to Home Screen" hint instead
-  (the PWA `display: standalone` route is the only chrome-free path on iPhone).
-  A duplicate toggle also lives in the Display settings section. `useFullscreen`
-  targets `document.documentElement` so the address bar collapses; each consumer
-  gets its own instance (no shared singleton to strand on unmount). Toggle calls
-  are `.catch(() => undefined)` — `requestFullscreen` rejects when embedded in an
-  iframe and there's nothing actionable.
-- **Keep screen awake** (`composables/useKeepAwake.ts`, default ON). Mounted once
-  in `pages/index.vue` (NOT `MapView`, which remounts on every `:key="mapCode"`
-  change). Two paths:
-  - **Secure context** (HTTPS / `localhost`): Screen Wake Lock API via VueUse.
-    Auto-acquires on mount, no user gesture; VueUse re-acquires on visibility
-    return itself, so we don't double-handle `visibilitychange` for it.
-  - **Insecure LAN HTTP** (the actual phone case — `http://<lan-ip>:5173`/`:47474`
-    is NOT a secure context, so `navigator.wakeLock` is `undefined`): fall back to
-    a muted looping off-screen `<video>` (`composables/useNoSleepVideo.ts` +
-    `assets/noSleepVideo.ts`). The clips (WebM + MP4) are taken verbatim from
-    NoSleep.js (MIT) but embedded and driven in-repo — **no `nosleep.js` runtime
-    dependency** (it's unmaintained; we only need the video trick). iOS Safari
-    plays the MP4, Android/desktop the WebM. Video playback needs a user gesture,
-    so we arm a one-shot `touchstart`/`click` listener and start on the first tap;
-    we re-play on visibility return (the video stays paused after a hide, unlike
-    the wakeLock path). The settings status line reflects which path is active
-    (`display.keepAwakeStatus*` i18n keys).
-
-`useDisplayEnv.ts` centralises the env detection: `isIos` (UA incl. iPadOS-as-Mac),
-`isStandalone` (`matchMedia('(display-mode: standalone)')` + `navigator.standalone`),
-`isMobileViewport` (`max-width: 639px`), `isTouch` (`(hover: none) and (pointer:
-coarse)`).
+`apps/client/src/features/display/` holds the browser/phone fullscreen affordance.
+Browser-only — the Display settings section registers with `visible: 'browser'`
+(`!isTauri`); the frameless Tauri overlay has no browser chrome, so it's moot there.
+
+- **Fullscreen** lives ONLY in the Display settings section
+  (`components/DisplaySection.vue`) — a `ToggleSwitch` bound to live fullscreen
+  state via `composables/useFullscreenToggle.ts` (VueUse `useFullscreen` on
+  `document.documentElement`, so the address bar collapses). Android/desktop get a
+  real toggle; iOS Safari has **no Fullscreen API**, so on iOS the row shows an
+  "Add to Home Screen" hint instead (the PWA `display: standalone` route is the
+  only chrome-free path on iPhone). The whole row hides once installed as a PWA
+  (`isStandalone`). The toggle is `.catch(() => undefined)` — `requestFullscreen`
+  rejects in an iframe and there's nothing actionable. (There is no on-map
+  fullscreen button — it was tried in the top-right cluster but removed to keep
+  the bar uncluttered on narrow phones; see "Top bar" below.)
+- `composables/useDisplayEnv.ts` exposes `isIos` (UA incl. iPadOS-as-Mac) and
+  `isStandalone` (`matchMedia('(display-mode: standalone)')` + `navigator.standalone`).
+
+**Top bar (browser).** The connection-status dot, the map name (only ≥380px), and
+the two in-game clocks all live in the always-visible left chip
+(`TarkovTimeChip.vue`), so the top-right browser cluster is just the settings gear
+— this keeps the bar from overflowing on a 320px-wide phone (iPod touch). The clock
+samples via `requestAnimationFrame` and swaps its ref only when the shown value
+changes (in-game time runs 7×, so a fixed interval visibly stutters the seconds).
+
+**Keep-awake was considered and deliberately dropped.** There is no reliable web
+way to keep a mobile screen awake over plain HTTP: the Screen Wake Lock API needs a
+secure context (HTTPS / `localhost` — neither reaches a LAN phone, and it's absent
+entirely on iOS < 16.4), and the muted/unmuted looping-`<video>` trick no longer
+keeps the screen on under current iOS **or** Android (verified on iPod touch iOS 15
++ Android). The honest fallback is the OS auto-lock setting. Don't re-add a JS
+keep-awake hack unless serving over HTTPS becomes viable.
+
+**PWA manifest** (`apps/client/public/manifest.webmanifest` + `<link rel="manifest">`
+and the `apple-mobile-web-app-*` / `mobile-web-app-capable` meta in `index.html`):
+`display: standalone`, icon = the existing `favicon.svg` (`sizes: "any"`).
+`start_url`/`scope` are `/`, correct for the phone (`:5173`/`:47474`) and the Tauri
+release (base `/`). The hosted **GitHub Pages** build serves under base
+`/tarkov-checker/`, so its `start_url`/`scope` would mismatch — the static manifest
+isn't templated by Vite. Pages PWA install is a secondary path; template the
+manifest if it ever matters. iOS `apple-touch-icon` ideally wants a PNG — pointing
+it at the SVG works on Android, but iPhone may fall back to a page screenshot for
+the home-screen icon; rasterising `favicon.svg` to PNG is an open follow-up.
 
 **PWA manifest** (`apps/client/public/manifest.webmanifest` + `<link rel="manifest">`
 and the `apple-mobile-web-app-*` / `mobile-web-app-capable` meta in `index.html`):
diff --git a/apps/client/src/__tests__/tarkov-time.spec.ts b/apps/client/src/__tests__/tarkov-time.spec.ts
index 33ecbb5..9e3e9c3 100644
--- a/apps/client/src/__tests__/tarkov-time.spec.ts
+++ b/apps/client/src/__tests__/tarkov-time.spec.ts
@@ -5,17 +5,17 @@ const HOUR = 60 * 60 * 1000;
 
 describe('tarkovTime', () => {
   it('at epoch is Moscow midnight + 3h (left) / +15h (right)', () => {
-    expect(tarkovTime(0)).toEqual({ left: '03:00', right: '15:00' });
+    expect(tarkovTime(0)).toEqual({ left: '03:00', right: '15:00', seconds: '00' });
   });
 
   it('advances 7× real time', () => {
     // 1 real hour → 7 in-game hours.
-    expect(tarkovTime(1 * HOUR)).toEqual({ left: '10:00', right: '22:00' });
+    expect(tarkovTime(1 * HOUR)).toEqual({ left: '10:00', right: '22:00', seconds: '00' });
   });
 
   it('wraps past midnight', () => {
     // 3 real hours → 21 in-game hours; 03:00 + 21h = 00:00.
-    expect(tarkovTime(3 * HOUR)).toEqual({ left: '00:00', right: '12:00' });
+    expect(tarkovTime(3 * HOUR)).toEqual({ left: '00:00', right: '12:00', seconds: '00' });
   });
 
   it('the two clocks are always exactly 12h apart', () => {
diff --git a/apps/client/src/features/display/assets/noSleepVideo.ts b/apps/client/src/features/display/assets/noSleepVideo.ts
deleted file mode 100644
index 171a9ea..0000000
--- a/apps/client/src/features/display/assets/noSleepVideo.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Tiny silent video clips for the keep-awake video fallback — the classic "play
-// a muted looping <video>" trick, the only thing that works on insecure (HTTP)
-// origins where the Screen Wake Lock API is unavailable.
-//
-// Data taken VERBATIM from NoSleep.js (richtr/NoSleep.js, MIT) and generated by
-// gen-nosleep.cjs so the long base64 is byte-accurate. We embed the clips and
-// drive them ourselves (see useNoSleepVideo) so we don't depend on that
-// (unmaintained, last release 2020) package at runtime. iOS Safari can only play
-// the MP4; WebM serves Android/desktop and lets the dev preview verify playback
-// (its open VP8 codec decodes in headless Chromium, unlike proprietary H.264).
-export const NO_SLEEP_WEBM =
-  'data:video/webm;base64,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';
-export const NO_SLEEP_MP4 =
-  'data:video/mp4;base64,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';
diff --git a/apps/client/src/features/display/components/DisplaySection.vue b/apps/client/src/features/display/components/DisplaySection.vue
index 082beaa..660153b 100644
--- a/apps/client/src/features/display/components/DisplaySection.vue
+++ b/apps/client/src/features/display/components/DisplaySection.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
-import { useDisplayStore } from '../store';
 import { useDisplayEnv } from '../composables/useDisplayEnv';
 import { useFullscreenToggle } from '../composables/useFullscreenToggle';
 
 const { t } = useI18n();
-const { keepAwake, keepAwakeMode, keepAwakeActive } = storeToRefs(useDisplayStore());
 const { isIos, isStandalone } = useDisplayEnv();
 const { isFullscreen, isSupported: fsSupported, toggle: toggleFullscreen } = useFullscreenToggle();
 
@@ -20,44 +18,21 @@ const fullscreenModel = computed({
     void toggleFullscreen().catch(() => undefined);
   },
 });
-
-// Driven entirely off the keep-awake driver's store state (mode + active) — no
-// separate navigator probe, so the status can't drift from the actual driver.
-const keepAwakeStatusKey = computed(() => {
-  if (!keepAwake.value) return 'display.keepAwakeHintOff';
-  if (keepAwakeActive.value)
-    return keepAwakeMode.value === 'video'
-      ? 'display.keepAwakeStatusVideo'
-      : 'display.keepAwakeStatusActive';
-  if (keepAwakeMode.value === 'video') return 'display.keepAwakeStatusTap';
-  if (keepAwakeMode.value === 'wakelock') return 'display.keepAwakeStatusBlocked';
-  return 'display.keepAwakeHintOff';
-});
 </script>
 
 <template>
-  <div class="space-y-3">
-    <div v-if="showFullscreenRow">
-      <div class="flex items-center justify-between gap-3">
-        <label class="text-sm" for="display-fullscreen">{{ t('display.fullscreen') }}</label>
-        <ToggleSwitch
-          v-if="fullscreenToggleable"
-          v-model="fullscreenModel"
-          input-id="display-fullscreen"
-        />
-        <span v-else class="text-xs opacity-50">{{ t('display.fullscreenNA') }}</span>
-      </div>
-      <p v-if="!fullscreenToggleable && isIos" class="mt-1.5 text-[10px] leading-relaxed opacity-70">
-        {{ t('display.iosHint') }}
-      </p>
-    </div>
-
-    <div>
-      <div class="flex items-center justify-between gap-3">
-        <label class="text-sm" for="display-keep-awake">{{ t('display.keepAwake') }}</label>
-        <ToggleSwitch v-model="keepAwake" input-id="display-keep-awake" />
-      </div>
-      <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">{{ t(keepAwakeStatusKey) }}</p>
+  <div v-if="showFullscreenRow" class="space-y-3">
+    <div class="flex items-center justify-between gap-3">
+      <label class="text-sm" for="display-fullscreen">{{ t('display.fullscreen') }}</label>
+      <ToggleSwitch
+        v-if="fullscreenToggleable"
+        v-model="fullscreenModel"
+        input-id="display-fullscreen"
+      />
+      <span v-else class="text-xs opacity-50">{{ t('display.fullscreenNA') }}</span>
     </div>
+    <p v-if="!fullscreenToggleable && isIos" class="text-[10px] leading-relaxed opacity-70">
+      {{ t('display.iosHint') }}
+    </p>
   </div>
 </template>
diff --git a/apps/client/src/features/display/components/FullscreenButton.vue b/apps/client/src/features/display/components/FullscreenButton.vue
deleted file mode 100644
index 7117438..0000000
--- a/apps/client/src/features/display/components/FullscreenButton.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<script setup lang="ts">
-import { useDisplayEnv } from '../composables/useDisplayEnv';
-import { useFullscreenToggle } from '../composables/useFullscreenToggle';
-
-const { t } = useI18n();
-const { isIos, isStandalone, isMobileViewport, isTouch } = useDisplayEnv();
-const { isFullscreen, isSupported, toggle } = useFullscreenToggle();
-
-// Mobile/touch browser only: desktop has F11, and an installed PWA is already
-// chrome-free. On iOS the Fullscreen API is absent, so the button becomes a
-// "Add to Home Screen" hint instead.
-const show = computed(
-  () =>
-    !isStandalone.value &&
-    (isMobileViewport.value || isTouch.value) &&
-    (isSupported.value || isIos),
-);
-
-const iosHint = ref<{ toggle: (e: Event) => void } | null>(null);
-
-function onClick(event: MouseEvent): void {
-  // requestFullscreen rejects when disallowed (e.g. embedded in an iframe);
-  // swallow it — there's nothing actionable and no user-facing failure.
-  if (isSupported.value && !isIos) void toggle().catch(() => undefined);
-  else if (isIos) iosHint.value?.toggle(event);
-}
-
-const icon = computed(() => {
-  if (isIos && !isSupported.value) return 'pi pi-mobile';
-  return isFullscreen.value ? 'pi pi-window-minimize' : 'pi pi-window-maximize';
-});
-</script>
-
-<template>
-  <template v-if="show">
-    <Button
-      rounded
-      severity="secondary"
-      class="!bg-surface-800/80 hover:!bg-surface-800 !border-surface-700 backdrop-blur"
-      :aria-label="t('display.fullscreen')"
-      @click="onClick"
-    >
-      <template #icon>
-        <i :class="['text-sm', icon]" aria-hidden="true" />
-      </template>
-    </Button>
-    <Popover ref="iosHint">
-      <p class="max-w-[15rem] text-xs leading-relaxed">{{ t('display.iosHint') }}</p>
-    </Popover>
-  </template>
-</template>
diff --git a/apps/client/src/features/display/composables/useDisplayEnv.ts b/apps/client/src/features/display/composables/useDisplayEnv.ts
index 9e232d3..8e24f82 100644
--- a/apps/client/src/features/display/composables/useDisplayEnv.ts
+++ b/apps/client/src/features/display/composables/useDisplayEnv.ts
@@ -1,9 +1,9 @@
-import type { ComputedRef, Ref } from 'vue';
+import type { ComputedRef } from 'vue';
 
-// iOS (incl. iPadOS, which reports as Mac) — used ONLY to pick the "Add to Home
-// Screen" hint when the Fullscreen API is absent. Real capability is gated on
-// useFullscreen().isSupported, never on this UA sniff.
-function detectIos(): boolean {
+// iOS (incl. iPadOS, which reports as Mac). Used only to pick the "Add to Home
+// Screen" hint when the Fullscreen API is absent — capability is otherwise gated
+// on real feature detection, never on this UA sniff.
+function isIosDevice(): boolean {
   if (typeof navigator === 'undefined') return false;
   const ua = navigator.userAgent;
   return /iPhone|iPod|iPad/.test(ua) || (/Macintosh/.test(ua) && navigator.maxTouchPoints > 1);
@@ -18,17 +18,13 @@ export interface DisplayEnv {
   isIos: boolean;
   /** Launched as an installed PWA (no browser chrome → fullscreen affordance moot). */
   isStandalone: ComputedRef<boolean>;
-  isMobileViewport: Ref<boolean>;
-  isTouch: Ref<boolean>;
 }
 
 export function useDisplayEnv(): DisplayEnv {
   const displayModeStandalone = useMediaQuery('(display-mode: standalone)');
   const navStandalone = detectNavigatorStandalone();
   return {
-    isIos: detectIos(),
+    isIos: isIosDevice(),
     isStandalone: computed(() => displayModeStandalone.value || navStandalone),
-    isMobileViewport: useMediaQuery('(max-width: 639px)'),
-    isTouch: useMediaQuery('(hover: none) and (pointer: coarse)'),
   };
 }
diff --git a/apps/client/src/features/display/composables/useKeepAwake.ts b/apps/client/src/features/display/composables/useKeepAwake.ts
deleted file mode 100644
index c139d55..0000000
--- a/apps/client/src/features/display/composables/useKeepAwake.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { isTauri } from '@/shared/tauri';
-import { createNoSleepVideo, type NoSleepVideo } from './useNoSleepVideo';
-import { useDisplayStore } from '../store';
-
-// Keeps the screen awake while the map page is mounted. Two paths:
-//   • Secure context (HTTPS / localhost): Screen Wake Lock API via VueUse,
-//     auto-re-acquired on visibility return — no user gesture needed.
-//   • Insecure LAN HTTP (the phone case): navigator.wakeLock is undefined, so
-//     fall back to a muted looping <video> (nosleep.js). Video playback needs a
-//     user gesture, so we arm a one-shot listener and start on the first tap.
-// No-op under Tauri — the desktop overlay isn't a sleeping phone.
-export function useKeepAwake(): void {
-  if (isTauri) return;
-
-  const store = useDisplayStore();
-  const { keepAwake } = storeToRefs(store);
-  const { isSupported, isActive, request, release } = useWakeLock();
-
-  let noSleep: NoSleepVideo | null = null;
-  let disarmGesture: (() => void) | null = null;
-  // True once the video has actually played — gates re-play on visibility return
-  // so we don't fire play() (which needs a gesture) before the first tap.
-  let videoStarted = false;
-
-  function startVideo(): void {
-    noSleep ??= createNoSleepVideo();
-    void noSleep
-      .enable()
-      .then(() => {
-        videoStarted = true;
-        store.keepAwakeActive = true;
-      })
-      .catch(() => {
-        store.keepAwakeActive = false;
-      });
-  }
-
-  function armGesture(): void {
-    if (disarmGesture) return;
-    store.keepAwakeMode = 'video';
-    // removeEventListener takes no `passive` flag — match on type + listener.
-    const remove = (): void => {
-      document.removeEventListener('touchstart', start);
-      document.removeEventListener('click', start);
-      disarmGesture = null;
-    };
-    const start = (): void => {
-      remove();
-      startVideo();
-    };
-    document.addEventListener('touchstart', start, { passive: true });
-    document.addEventListener('click', start, { passive: true });
-    disarmGesture = remove;
-  }
-
-  async function acquire(): Promise<void> {
-    if (isSupported.value) {
-      // VueUse's request() defers when the page is hidden and self-re-acquires
-      // on visibility return, so call it regardless of current visibility.
-      store.keepAwakeMode = 'wakelock';
-      try {
-        await request('screen');
-      } catch {
-        // Supported but denied (rare: low-power mode / permissions policy) — the
-        // settings status reflects the not-holding state via keepAwakeActive.
-      }
-      store.keepAwakeActive = isActive.value;
-      return;
-    }
-    // Video fallback needs a visible page and a user gesture to start.
-    if (document.visibilityState === 'visible') armGesture();
-  }
-
-  async function releaseAll(): Promise<void> {
-    disarmGesture?.();
-    videoStarted = false;
-    if (isActive.value) await release();
-    noSleep?.disable();
-    store.keepAwakeActive = false;
-    store.keepAwakeMode = 'none';
-  }
-
-  // wakeLock path: VueUse re-acquires on visibility itself. Video path: the
-  // <video> stays paused after the tab was hidden, so re-play on return — but
-  // only once it has actually started (a hidden→visible transition has no user
-  // gesture, so an un-started video can't begin here).
-  useEventListener(document, 'visibilitychange', () => {
-    if (document.visibilityState === 'visible') {
-      if (keepAwake.value && store.keepAwakeMode === 'video' && videoStarted) startVideo();
-    } else if (store.keepAwakeMode === 'video') {
-      store.keepAwakeActive = false;
-    }
-  });
-
-  watch(keepAwake, (on) => {
-    if (on) void acquire();
-    else void releaseAll();
-  });
-
-  // Mirror VueUse's reactive isActive for the wakeLock path so the settings
-  // status reflects OS-side drops / re-acquires.
-  watch(isActive, (active) => {
-    if (store.keepAwakeMode === 'wakelock') store.keepAwakeActive = active;
-  });
-
-  onMounted(() => {
-    if (keepAwake.value) void acquire();
-  });
-  onScopeDispose(() => {
-    void releaseAll();
-  });
-}
diff --git a/apps/client/src/features/display/composables/useNoSleepVideo.ts b/apps/client/src/features/display/composables/useNoSleepVideo.ts
deleted file mode 100644
index 7771238..0000000
--- a/apps/client/src/features/display/composables/useNoSleepVideo.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { NO_SLEEP_WEBM, NO_SLEEP_MP4 } from '../assets/noSleepVideo';
-
-export interface NoSleepVideo {
-  /** Must be called from a user gesture for the first play; muted playback may
-   *  resume programmatically afterwards (e.g. after the tab was hidden). */
-  enable: () => Promise<void>;
-  disable: () => void;
-}
-
-// Keep-awake fallback for insecure (HTTP) origins where the Screen Wake Lock API
-// is unavailable: a muted, looping, off-screen <video>. Browsers won't sleep the
-// display while a video plays. Self-contained — no third-party runtime dep.
-export function createNoSleepVideo(): NoSleepVideo {
-  let video: HTMLVideoElement | null = null;
-
-  function ensure(): HTMLVideoElement {
-    if (video) return video;
-    const el = document.createElement('video');
-    el.setAttribute('title', 'No Sleep');
-    el.setAttribute('playsinline', '');
-    el.muted = true;
-    el.loop = true;
-    // WebM first (Android/desktop), MP4 second (iOS Safari plays only MP4). The
-    // browser picks the first source it can decode.
-    for (const [type, src] of [
-      ['video/webm', NO_SLEEP_WEBM],
-      ['video/mp4', NO_SLEEP_MP4],
-    ] as const) {
-      const source = document.createElement('source');
-      source.type = type;
-      source.src = src;
-      el.appendChild(source);
-    }
-    // Off-screen, non-interactive. Attaching to the DOM is more reliable than a
-    // detached element across browsers.
-    el.style.cssText = 'position:fixed;width:1px;height:1px;opacity:0;pointer-events:none;';
-    document.body.appendChild(el);
-    video = el;
-    return el;
-  }
-
-  return {
-    enable: () => ensure().play(),
-    disable: () => video?.pause(),
-  };
-}
diff --git a/apps/client/src/features/display/store.ts b/apps/client/src/features/display/store.ts
deleted file mode 100644
index 864c881..0000000
--- a/apps/client/src/features/display/store.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { z } from 'zod';
-import { persistedRef } from '@/shared/persisted-store';
-
-export type KeepAwakeMode = 'wakelock' | 'video' | 'none';
-
-export const useDisplayStore = defineStore('display', () => {
-  // Keep the phone screen awake while the map is open. Default on — the map is
-  // a passive second screen, so sleeping mid-raid is the common annoyance.
-  const keepAwake = persistedRef('tc.display.keepAwake', z.boolean(), true);
-
-  // Runtime status of the keep-awake driver (not persisted) — read by the
-  // settings UI to show which path holds the lock and whether it's active.
-  const keepAwakeMode = ref<KeepAwakeMode>('none');
-  const keepAwakeActive = ref(false);
-
-  return { keepAwake, keepAwakeMode, keepAwakeActive };
-});
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 1cd43e5..ff1390f 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -84,13 +84,7 @@
     "heading": "Display",
     "fullscreen": "Fullscreen",
     "fullscreenNA": "N/A",
-    "iosHint": "On iPhone, open this page in Safari, tap Share then “Add to Home Screen” for a full-screen, app-like view.",
-    "keepAwake": "Keep screen awake",
-    "keepAwakeHintOff": "Stop your screen from sleeping while the map is open.",
-    "keepAwakeStatusActive": "On — your screen won’t sleep while the map is open.",
-    "keepAwakeStatusVideo": "On (compatibility mode) — your screen won’t sleep while the map is open.",
-    "keepAwakeStatusTap": "Tap the map once to activate — this connection can’t use the Wake Lock API (needs HTTPS).",
-    "keepAwakeStatusBlocked": "Couldn’t keep the screen awake — the browser denied it; your screen may sleep."
+    "iosHint": "On iPhone, open this page in Safari, tap Share then “Add to Home Screen” for a full-screen, app-like view."
   },
   "pairing": {
     "heading": "Phone access",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 3ebdc28..26d3c2e 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -84,13 +84,7 @@
     "heading": "Дисплей",
     "fullscreen": "Полный экран",
     "fullscreenNA": "Недоступно",
-    "iosHint": "На iPhone открой эту страницу в Safari, нажми «Поделиться» → «На экран «Домой»» — получишь полноэкранный режим как у приложения.",
-    "keepAwake": "Не гасить экран",
-    "keepAwakeHintOff": "Не давать экрану гаснуть, пока открыта карта.",
-    "keepAwakeStatusActive": "Включено — экран не гаснет, пока открыта карта.",
-    "keepAwakeStatusVideo": "Включено (режим совместимости) — экран не гаснет, пока открыта карта.",
-    "keepAwakeStatusTap": "Коснись карты, чтобы активировать — это соединение не может использовать Wake Lock API (нужен HTTPS).",
-    "keepAwakeStatusBlocked": "Не удалось удержать экран — браузер отклонил запрос; экран может гаснуть."
+    "iosHint": "На iPhone открой эту страницу в Safari, нажми «Поделиться» → «На экран «Домой»» — получишь полноэкранный режим как у приложения."
   },
   "pairing": {
     "heading": "Доступ с телефона",
diff --git a/apps/client/src/features/overlay/components/OverlayHeader.vue b/apps/client/src/features/overlay/components/OverlayHeader.vue
index 50dd8e6..1c74356 100644
--- a/apps/client/src/features/overlay/components/OverlayHeader.vue
+++ b/apps/client/src/features/overlay/components/OverlayHeader.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import SettingsPanel from '@/features/settings/SettingsPanel.vue';
-import FullscreenButton from '@/features/display/components/FullscreenButton.vue';
 import MapSwitchMenu from './MapSwitchMenu.vue';
 import { isTauri } from '@/shared/tauri';
 import { useOverlayHeaderActive } from '../composables/useOverlayHeaderActive';
@@ -8,7 +7,6 @@ import { useOverlayLock } from '../composables/useOverlayLock';
 import type { TransportStatus } from '@/features/server/composables/useServerTransport';
 
 interface Props {
-  mapDisplayName: string;
   status: TransportStatus;
   /** Render the Tauri overlay chrome (true under real Tauri, or the dev
    *  preview flag). Native window calls still guard on the real `isTauri`. */
@@ -159,18 +157,11 @@ function openMapMenu(event: MouseEvent): void {
     </span>
   </div>
 
-  <!-- BROWSER: no window drag — keep a static status + map name pill + settings.
-       Right-click the pill to switch maps (wide viewports only). -->
+  <!-- BROWSER: connection status + map name now live in the always-visible
+       clock chip (top-left), and the fullscreen/PWA helper moved to the Display
+       settings section — so the top-right cluster is just the gear, which keeps
+       the bar from overflowing on a 320px phone. -->
   <div v-else class="sa-top sa-right absolute z-[1000] flex items-center gap-2">
-    <span
-      class="inline-flex items-center gap-2 rounded-md bg-surface-800/70 px-3 py-1 text-sm font-medium text-surface-0 backdrop-blur select-none"
-      @contextmenu.prevent="openMapMenu"
-    >
-      <i :class="['text-[10px]', statusIconClass]" :title="'ws: ' + status" aria-hidden="true" />
-      <span>{{ mapDisplayName }}</span>
-      <span class="sr-only" aria-live="polite">Connection: {{ status }}</span>
-    </span>
-    <FullscreenButton />
     <SettingsPanel />
   </div>
 
diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
index 03eca90..bc20194 100644
--- a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -1,52 +1,88 @@
 <script setup lang="ts">
 import { tarkovTime } from '@shared/tarkov-time';
 import { useOverlayHeaderActive } from '@/features/overlay/composables/useOverlayHeaderActive';
+import type { TransportStatus } from '@/features/server/composables/useServerTransport';
 
-// Optional current-map name, merged into this always-visible chip so "where am
-// I" stays glanceable in every state (idle + locked) — the drag band only shows
-// the name on hover. Empty string = clock only (browser / non-overlay context).
-defineProps<{ mapDisplayName?: string }>();
+// Always-visible info chip (top-left), shown in every state (idle + locked).
+// In the browser it also folds in the connection-status dot and (on wider
+// screens) the map name, so the right-hand cluster can shrink to just the
+// settings gear on a narrow 320px phone. In the Tauri overlay `status` is
+// omitted (the overlay header renders its own dot) and the map name shows
+// unconditionally.
+const props = defineProps<{
+  mapDisplayName?: string;
+  status?: TransportStatus;
+  /** Browser: hide the map name below ~380px so the chip fits a 320px phone. */
+  compactMapName?: boolean;
+}>();
 
-// Non-interactive info chip — stays visible even when the overlay is locked
-// (click-through), like the map itself. Ticks once a second.
+// Non-interactive. In-game time runs 7× real time, so a fixed interval makes the
+// seconds stutter (a sample lands inside the same second twice). Sample each
+// animation frame and swap the ref only when the shown value changes — each
+// second renders once for its true ~143ms, ticking smoothly without re-rendering
+// 60×/s. (rAF pauses while the tab is hidden, then self-corrects on return.)
 const clock = ref(tarkovTime(Date.now()));
-let timer: ReturnType<typeof setInterval> | undefined;
-
+let raf: number | undefined;
+function tick(): void {
+  const next = tarkovTime(Date.now());
+  if (
+    next.left !== clock.value.left ||
+    next.right !== clock.value.right ||
+    next.seconds !== clock.value.seconds
+  ) {
+    clock.value = next;
+  }
+  raf = requestAnimationFrame(tick);
+}
 onMounted(() => {
-  timer = setInterval(() => (clock.value = tarkovTime(Date.now())), 1000);
+  raf = requestAnimationFrame(tick);
+});
+onBeforeUnmount(() => {
+  if (raf !== undefined) cancelAnimationFrame(raf);
 });
-onBeforeUnmount(() => clearInterval(timer));
 
-// Float in the top-left corner; slide down out of the way when the drag bar
-// expands over the top, then back up when it collapses.
+// Slide down out of the way when the overlay drag bar expands; back up after.
 const { active: headerActive } = useOverlayHeaderActive();
+
+const statusDotClass = computed(() => {
+  switch (props.status) {
+    case 'open':
+      return 'pi-circle-fill text-green-500';
+    case 'connecting':
+      return 'pi-circle-fill text-amber-400 animate-pulse';
+    case 'closed':
+      return 'pi-times-circle text-red-500';
+    default:
+      return 'pi-circle text-surface-500';
+  }
+});
 </script>
 
 <template>
-  <!-- Slide via transform (composited), not `top` (layout) — matches the
-       header's transform/opacity reveal so the two move in lockstep.
-       translate-y-11 (44px) lands it at top-14 from the top-3 base. -->
-  <!-- Outer wrapper is a 40px-tall flex row (= the settings button height) so
-       the pill's vertical centre lines up with the status/settings cluster on
-       the opposite corner; both anchor at the same safe-area top. -->
+  <!-- Slide via transform (composited), matching the header's reveal. -->
   <div
     class="sa-top sa-left pointer-events-none absolute z-[1000] flex h-10 items-center transition-transform duration-200 ease-out"
     :class="headerActive ? 'translate-y-11' : 'translate-y-0'"
-    aria-hidden="true"
   >
     <span
       class="inline-flex max-w-[16rem] items-center gap-1.5 rounded-md bg-surface-800/70 px-2 py-1 font-mono text-xs tabular-nums text-surface-0 backdrop-blur select-none"
+      aria-hidden="true"
     >
-      <i class="pi pi-clock text-[10px] opacity-70" />
-      <span>{{ clock.left }}</span>
+      <i v-if="status" :class="['pi text-[9px]', statusDotClass]" />
+      <span>{{ clock.left }}<span class="opacity-50">:{{ clock.seconds }}</span></span>
       <span class="opacity-40">/</span>
-      <span>{{ clock.right }}</span>
-      <template v-if="mapDisplayName">
-        <span class="mx-0.5 opacity-25">|</span>
-        <span class="max-w-[8.75rem] truncate font-sans text-[11px] font-medium opacity-90">
-          {{ mapDisplayName }}
-        </span>
-      </template>
+      <span>{{ clock.right }}<span class="opacity-50">:{{ clock.seconds }}</span></span>
+      <span
+        v-if="mapDisplayName"
+        class="items-center gap-1.5"
+        :class="compactMapName ? 'hidden min-[380px]:inline-flex' : 'inline-flex'"
+      >
+        <span class="opacity-25">|</span>
+        <span class="max-w-[8.75rem] truncate font-sans text-[11px] font-medium opacity-90">{{
+          mapDisplayName
+        }}</span>
+      </span>
     </span>
+    <span v-if="status" class="sr-only" aria-live="polite">Connection: {{ status }}</span>
   </div>
 </template>
diff --git a/apps/client/src/pages/index.vue b/apps/client/src/pages/index.vue
index 06e092b..a23abac 100644
--- a/apps/client/src/pages/index.vue
+++ b/apps/client/src/pages/index.vue
@@ -15,7 +15,6 @@ import { useServerEvent } from '@/features/server/composables/useServerEvents';
 import { useCloseConfirm } from '@/features/overlay/composables/useCloseConfirm';
 import { useAirdropStore } from '@/features/airdrop/store';
 import { useAirdropTracker } from '@/features/airdrop/composables/useAirdropTracker';
-import { useKeepAwake } from '@/features/display/composables/useKeepAwake';
 
 const { mapCode } = storeToRefs(useMapSettingsStore());
 const { showControls } = useOverlayLock();
@@ -26,10 +25,6 @@ const { lockHotkey } = storeToRefs(useHotkeysStore());
 const airdropStore = useAirdropStore();
 useAirdropTracker();
 
-// Keep the phone screen awake while the map is open (browser only; no-op in
-// Tauri). Mounted here, not in MapView, which remounts on every map change.
-useKeepAwake();
-
 const status = useTransportStatus();
 const confirmClose = useCloseConfirm();
 
@@ -75,18 +70,17 @@ useServerEvent('command', (msg) => {
     @map-error="mapError = $event"
   />
 
-  <OverlayHeader
-    :map-display-name="mapDisplayName"
-    :status="status"
-    :tauri-chrome="showOverlayChrome"
-    @close="confirmClose"
-  />
+  <OverlayHeader :status="status" :tauri-chrome="showOverlayChrome" @close="confirmClose" />
 
   <OverlayErrors :map-error="mapError" @dismiss-map="mapError = null" @retry="mapRef?.reload()" />
 
   <AirdropStatusBanner />
 
-  <TarkovTimeChip :map-display-name="showOverlayChrome ? mapDisplayName : ''" />
+  <TarkovTimeChip
+    :map-display-name="mapDisplayName"
+    :status="showOverlayChrome ? undefined : status"
+    :compact-map-name="!showOverlayChrome"
+  />
 
   <OverlayBorder v-if="showOverlayChrome && showControls" />
 
diff --git a/packages/shared/src/tarkov-time.ts b/packages/shared/src/tarkov-time.ts
index 6179ada..3a1eaf5 100644
--- a/packages/shared/src/tarkov-time.ts
+++ b/packages/shared/src/tarkov-time.ts
@@ -29,12 +29,16 @@ export interface TarkovClock {
   readonly left: string;
   /** Right clock, +12h from the left (e.g. 23:34). */
   readonly right: string;
+  /** Seconds (e.g. 07) — identical for both clocks, which differ by exactly 12h. */
+  readonly seconds: string;
 }
 
 /** Both in-game clocks for the given real-time millisecond timestamp. */
 export function tarkovTime(nowMs: number): TarkovClock {
+  const leftMs = timeOfDayMs(nowMs, false);
   return {
-    left: formatHHMM(timeOfDayMs(nowMs, false)),
+    left: formatHHMM(leftMs),
     right: formatHHMM(timeOfDayMs(nowMs, true)),
+    seconds: String(Math.floor((leftMs % 60000) / 1000)).padStart(2, '0'),
   };
 }

From 81afb76a155528919d488c9b7936d8c057677a25 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Sun, 7 Jun 2026 03:40:18 +0300
Subject: [PATCH 45/53] feat(hotkeys): read-only on mobile + live cross-client
 config re-sync

Show the hotkeys settings section on phones (read-only) and keep every
client's view in sync when a combo is rebound.

- Section is now visible: 'always'. Recording needs a physical keyboard (the
  recorder captures window keydown), so the rows go read-only on a phone --
  HotkeyRecorder hides its Change button, the Alt+wheel mouse row is hidden,
  and a hint points at the overlay for rebinding. Editable on the overlay +
  desktop browser as before.
- Live re-sync: a rebind now broadcasts ServerEvent::Hotkeys { config } from
  BOTH PUT paths -- put_hotkeys_http (state.event_tx) and the update_hotkeys
  IPC command (slot.event_sender(), the same broadcast channel) -- so other
  clients refresh over SSE. New hotkeysMessage in the wire union; useHotkeysSync
  applies it via store.applyConfig. The originating client already has the
  effective config from its response.
- Rename packages/shared/src/ws-messages.ts -> sse-messages.ts (the transport
  has been SSE since the WS migration) + all importers, the package.json
  export, and docs. Fix a pre-existing extensionless relative import in
  hotkeys-api (node16 needs the .js).

Verified: shared + client typecheck, lint, 110 tests; Rust built via tauri:dev;
live re-sync confirmed on an iPod touch (rebind on the overlay reflects on the
phone instantly).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 CLAUDE.md                                     | 20 ++++++++++++-----
 apps/client/README.md                         |  2 +-
 .../hotkeys/components/HotkeyRecorder.vue     |  3 +++
 .../hotkeys/composables/useHotkeysSync.ts     |  7 ++++++
 apps/client/src/features/hotkeys/settings.ts  |  9 ++++----
 apps/client/src/features/hotkeys/store.ts     |  1 +
 apps/client/src/features/i18n/locales/en.json |  1 +
 apps/client/src/features/i18n/locales/ru.json |  1 +
 .../server/composables/useServerEvents.ts     |  2 +-
 .../server/composables/useServerStream.ts     |  2 +-
 .../server/composables/useServerTransport.ts  |  2 +-
 .../settings/sections/HotkeysSection.vue      | 22 +++++++++++++++++--
 apps/desktop/src-tauri/src/commands.rs        |  7 ++++++
 apps/desktop/src-tauri/src/http_server.rs     |  2 ++
 apps/desktop/src-tauri/src/server/events.rs   | 12 +++++++++-
 packages/shared/package.json                  |  6 ++---
 packages/shared/src/hotkeys-api.ts            |  2 +-
 packages/shared/src/index.ts                  |  2 +-
 .../src/{ws-messages.ts => sse-messages.ts}   | 19 ++++++++++++++++
 19 files changed, 101 insertions(+), 21 deletions(-)
 rename packages/shared/src/{ws-messages.ts => sse-messages.ts} (70%)

diff --git a/CLAUDE.md b/CLAUDE.md
index 9366738..1acd015 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -401,7 +401,8 @@ user-visible continuity; default to `persistedRef` everywhere else.
   where `'browser'` = `!isTauri`) and sorted by
   `order`. Registered in `features/<name>/settings.ts` (auto-loaded via
   `import.meta.glob('@/features/*/settings.ts', { eager: true })`). Currently: 10
-  overlay (tauri), 20 hotkeys (desktop-or-tauri), 25 display (browser), 30 language,
+  overlay (tauri), 20 hotkeys (always; rows read-only on a phone — no keyboard
+  to record), 25 display (browser), 30 language,
   40 paths (desktop-or-tauri), 50 pairing (tauri). Consumed by the gear **drawer**
   (`SettingsPanel.vue`): a **non-modal** PrimeVue `Drawer` (right on desktop,
   bottom-sheet on `<640px`) rendering a single flat **Accordion**; open-panel state
@@ -643,12 +644,13 @@ Frontend chooses the transport in two places only:
 
 `PositionPayload` (struct in `screenshots.rs`) and `MapChangePayload`
 (struct in `logs.rs`) on the Rust side mirror `PositionMessage` and
-`MapChangeMessage` from `packages/shared/src/ws-messages.ts`. The
+`MapChangeMessage` from `packages/shared/src/sse-messages.ts`. The
 HTTP-side `ServerEvent` enum (in `server/events.rs`) is the tagged-
 union wire format for SSE. Adding a new event type touches four
 declarations (TS schema, TS discriminated union, Rust payload struct,
-new `ServerEvent` variant); the file is still called `ws-messages.ts`
-for historical reasons (was the WS schema before the SSE migration).
+new `ServerEvent` variant) — e.g. the `hotkeys` config-resync event below.
+(The file was `ws-messages.ts` before the SSE migration; renamed to
+`sse-messages.ts`.)
 
 ## Backend-owned hotkeys
 
@@ -693,10 +695,18 @@ client-registered (see "Desktop overlay").
   and the pressed combo reaches the page/webview to be re-recorded (the
   same events still drive the client-side lock shortcut).
 - Wire parity follows the same 4-declaration rule as other events:
-  `commandMessage` (zod) + union in `ws-messages.ts`, `ServerEvent::Command`
+  `commandMessage` (zod) + union in `sse-messages.ts`, `ServerEvent::Command`
   + `HotkeyAction` (kebab-case) in `server/events.rs`. The client dispatches
   `command` in `pages/index.vue` (`useServerEvent('command', …)`) to
   `mapRef`/`airdropStore`.
+- **Config re-sync:** a rebind broadcasts `ServerEvent::Hotkeys { config }`
+  (`hotkeysMessage` in `sse-messages.ts`) from BOTH PUT paths —
+  `put_hotkeys_http` (`state.event_tx`) and the `update_hotkeys` IPC command
+  (`slot.event_sender()`, same broadcast channel) — so OTHER clients re-sync
+  over SSE; the originator already has the effective config from its response.
+  `useHotkeysSync` applies it via `store.applyConfig`. This is why the
+  hotkeys section is `visible: 'always'` (read-only on a phone — no keyboard
+  to record): the phone's list stays live with what the overlay set.
 
 The logs watcher (`server/logs.rs`) tails the **latest** `log_*/`
 session folder under `logsDir` — picked by sort order (timestamps in
diff --git a/apps/client/README.md b/apps/client/README.md
index 44ee972..646bd43 100644
--- a/apps/client/README.md
+++ b/apps/client/README.md
@@ -184,7 +184,7 @@ pnpm lint       # eslint --max-warnings=0
 ## Where things connect
 
 - **Tauri detection** — centralized in [`shared/tauri.ts`](./src/shared/tauri.ts) as `isTauri` const. Checked at module load time, safe for non-DOM contexts. Used by transport layer, router, overlay composables, and settings visibility logic.
-- **Server-pushed messages** — schema in [`@shared/ws-messages`](../../packages/shared/src/ws-messages.ts). Position, map-change, and command (backend-owned hotkey) events; the in-process Rust helper pushes over SSE to browsers, and emits as Tauri events to the overlay webview. Client uses the same Zod schema either way.
+- **Server-pushed messages** — schema in [`@shared/sse-messages`](../../packages/shared/src/sse-messages.ts). Position, map-change, command (backend-owned hotkey press), and hotkeys (config re-sync after a rebind) events; the in-process Rust helper pushes over SSE to browsers, and emits as Tauri events to the overlay webview. Client uses the same Zod schema either way.
 - **Tarkov map calibration** (CRS, bounds, rotation) — [`@shared/maps`](../../packages/shared/src/maps.ts). Modifying calibration affects both desktop and browser.
 - **Map localization** — `useMapI18n()` composable in [`features/map/composables/useMapI18n.ts`](./src/features/map/composables/useMapI18n.ts) provides `localizedMapName(code)` with `te → t → displayName` fallback chain. Used in MapView + MapSection to stay in sync.
 - **HTTP / IPC** — single dispatch in [`features/server/api/transport.ts`](./src/features/server/api/transport.ts).
diff --git a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
index f8e4c1f..a05bb8b 100644
--- a/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
+++ b/apps/client/src/features/hotkeys/components/HotkeyRecorder.vue
@@ -11,6 +11,8 @@ const props = defineProps<{
   modelValue: string;
   /** Human label for the action this hotkey performs. */
   label: string;
+  /** Display-only (no keyboard to record, e.g. a phone) — hides the Change button. */
+  readonly?: boolean;
 }>();
 
 const emit = defineEmits<{
@@ -105,6 +107,7 @@ let currentRecorder: { cancel: () => void } | null = null;
         </template>
       </div>
       <Button
+        v-if="!readonly"
         :label="recording ? t('hotkeys.recording') : t('hotkeys.record')"
         size="small"
         severity="secondary"
diff --git a/apps/client/src/features/hotkeys/composables/useHotkeysSync.ts b/apps/client/src/features/hotkeys/composables/useHotkeysSync.ts
index deb5451..93a337f 100644
--- a/apps/client/src/features/hotkeys/composables/useHotkeysSync.ts
+++ b/apps/client/src/features/hotkeys/composables/useHotkeysSync.ts
@@ -1,6 +1,7 @@
 import { useHotkeysStore } from '@/features/hotkeys/store';
 import { HOTKEY_SUSPEND_EVENT, HOTKEY_RESUME_EVENT } from '../lib/hotkey';
 import { suspendHotkeys, resumeHotkeys } from '@/features/server/api/hotkeys-api';
+import { useServerEvent } from '@/features/server/composables/useServerEvents';
 
 /**
  * Mount once at the app root. Loads the backend-owned hotkey combos into the
@@ -18,6 +19,12 @@ export function useHotkeysSync(): void {
     void store.load().catch(() => {});
   });
 
+  // Another client rebound a combo → the backend broadcasts the effective
+  // config over SSE; apply it so this client's view stays in sync (e.g. the
+  // phone's read-only list). Browser/SSE only — the overlay is the rebind
+  // surface and already updates from its own PUT response.
+  useServerEvent('hotkeys', (msg) => store.applyConfig(msg.config));
+
   useEventListener(window, HOTKEY_SUSPEND_EVENT, () => {
     void suspendHotkeys().catch(() => {});
   });
diff --git a/apps/client/src/features/hotkeys/settings.ts b/apps/client/src/features/hotkeys/settings.ts
index b21fc4e..9c49655 100644
--- a/apps/client/src/features/hotkeys/settings.ts
+++ b/apps/client/src/features/hotkeys/settings.ts
@@ -4,10 +4,11 @@ import HotkeysSection from '@/features/settings/sections/HotkeysSection.vue';
 registerSettingsSection({
   id: 'hotkeys',
   order: 20,
-  // Shown on the desktop browser + overlay (both have a keyboard), hidden on
-  // phones. The combos are backend-owned now — configurable from any desktop
-  // browser, fired globally for every client via the `command` event.
-  visible: 'desktop-or-tauri',
+  // Shown everywhere — the combos are backend-owned and fire globally, so the
+  // bindings are worth seeing on any client. Rebinding needs a keyboard, so
+  // the rows go read-only on a phone (see HotkeysSection); the overlay + desktop
+  // browser stay editable.
+  visible: 'always',
   titleKey: 'hotkeys.heading',
   component: HotkeysSection,
 });
diff --git a/apps/client/src/features/hotkeys/store.ts b/apps/client/src/features/hotkeys/store.ts
index 9ab60ee..f4a2740 100644
--- a/apps/client/src/features/hotkeys/store.ts
+++ b/apps/client/src/features/hotkeys/store.ts
@@ -117,5 +117,6 @@ export const useHotkeysStore = defineStore('hotkeys', () => {
     airdropHotkey,
     load,
     setAction,
+    applyConfig,
   };
 });
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index ff1390f..d4fc434 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -100,6 +100,7 @@
   },
   "hotkeys": {
     "heading": "Hotkeys",
+    "rebindHint": "These fire globally from the PC. Rebind them in the overlay app on the PC — a phone has no keyboard to record a combo.",
     "lock": "Toggle lock",
     "lockHint": "Global shortcuts fire even when the game window is focused. Every binding needs at least one Ctrl / Alt / Shift.",
     "zoomIn": "Zoom in",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 26d3c2e..f4827c2 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -100,6 +100,7 @@
   },
   "hotkeys": {
     "heading": "Хоткеи",
+    "rebindHint": "Срабатывают глобально с ПК. Переопределить можно в оверлее на ПК — на телефоне нет клавиатуры для записи комбинации.",
     "lock": "Переключить блокировку",
     "lockHint": "Глобальные хоткеи — срабатывают даже когда фокус в окне игры. Каждый биндинг требует хотя бы один Ctrl / Alt / Shift.",
     "zoomIn": "Приблизить",
diff --git a/apps/client/src/features/server/composables/useServerEvents.ts b/apps/client/src/features/server/composables/useServerEvents.ts
index f49464f..a6b9300 100644
--- a/apps/client/src/features/server/composables/useServerEvents.ts
+++ b/apps/client/src/features/server/composables/useServerEvents.ts
@@ -1,4 +1,4 @@
-import type { ServerMessage, ServerMessageType } from '@shared/ws-messages';
+import type { ServerMessage, ServerMessageType } from '@shared/sse-messages';
 
 type EventMap = {
   [K in ServerMessageType]: Extract<ServerMessage, { type: K }>;
diff --git a/apps/client/src/features/server/composables/useServerStream.ts b/apps/client/src/features/server/composables/useServerStream.ts
index 756c242..b5771ed 100644
--- a/apps/client/src/features/server/composables/useServerStream.ts
+++ b/apps/client/src/features/server/composables/useServerStream.ts
@@ -1,4 +1,4 @@
-import { serverMessage } from '@shared/ws-messages';
+import { serverMessage } from '@shared/sse-messages';
 import { dispatchServerEvent } from './useServerEvents';
 
 export type StreamStatus = 'connecting' | 'open' | 'closed';
diff --git a/apps/client/src/features/server/composables/useServerTransport.ts b/apps/client/src/features/server/composables/useServerTransport.ts
index 84e1455..122bcb9 100644
--- a/apps/client/src/features/server/composables/useServerTransport.ts
+++ b/apps/client/src/features/server/composables/useServerTransport.ts
@@ -5,7 +5,7 @@ import {
   type CommandMessage,
   type MapChangeMessage,
   type PositionMessage,
-} from '@shared/ws-messages';
+} from '@shared/sse-messages';
 import { isTauri } from '@/shared/tauri';
 import { useServerStream } from './useServerStream';
 import { dispatchServerEvent } from './useServerEvents';
diff --git a/apps/client/src/features/settings/sections/HotkeysSection.vue b/apps/client/src/features/settings/sections/HotkeysSection.vue
index fe19174..2084616 100644
--- a/apps/client/src/features/settings/sections/HotkeysSection.vue
+++ b/apps/client/src/features/settings/sections/HotkeysSection.vue
@@ -9,6 +9,13 @@ const { lockHotkey, zoomInHotkey, zoomOutHotkey, floorUpHotkey, floorDownHotkey,
   storeToRefs(store);
 const { t } = useI18n();
 
+// Combos are backend-owned and fire globally, but recording a new one needs a
+// physical keyboard (the recorder captures window keydown). So rows are editable
+// on the overlay + desktop browser, read-only on a phone — which just displays
+// the current binds and points at the overlay for rebinding.
+const isDesktop = useMediaQuery('(min-width: 640px)');
+const rebindable = computed(() => isTauri || isDesktop.value);
+
 // The five action combos are backend-owned: route a recorded combo through
 // `setAction` (PUT + effective-value snap-back) rather than writing the ref
 // directly. Lock stays a plain client-side persistedRef (v-model).
@@ -19,33 +26,43 @@ function onAction(field: keyof HotkeyConfig, combo: string): void {
 
 <template>
   <div class="space-y-3">
+    <!-- Phone: no keyboard to record, so the rows are read-only — explain where
+         to rebind. -->
+    <p v-if="!rebindable" class="text-[10px] leading-relaxed opacity-70">
+      {{ t('hotkeys.rebindHint') }}
+    </p>
+
     <!-- Lock is overlay-only (no window to lock in a browser). -->
     <HotkeyRecorder v-if="isTauri" v-model="lockHotkey" :label="t('hotkeys.lock')" />
     <HotkeyRecorder
       :model-value="zoomInHotkey"
       :label="t('hotkeys.zoomIn')"
+      :readonly="!rebindable"
       @update:model-value="onAction('zoomIn', $event)"
     />
     <HotkeyRecorder
       :model-value="zoomOutHotkey"
       :label="t('hotkeys.zoomOut')"
+      :readonly="!rebindable"
       @update:model-value="onAction('zoomOut', $event)"
     />
     <HotkeyRecorder
       :model-value="floorUpHotkey"
       :label="t('hotkeys.floorUp')"
+      :readonly="!rebindable"
       @update:model-value="onAction('floorUp', $event)"
     />
     <HotkeyRecorder
       :model-value="floorDownHotkey"
       :label="t('hotkeys.floorDown')"
+      :readonly="!rebindable"
       @update:model-value="onAction('floorDown', $event)"
     />
 
     <!-- Read-only gesture: Alt + mouse wheel over the map steps floors. Listed
          here for discoverability but not rebindable (lock icon in the button
-         slot instead of a recorder), matching the recorder row layout. -->
-    <div>
+         slot instead of a recorder). Mouse-only, so hidden on phones. -->
+    <div v-if="rebindable">
       <p class="mb-1 text-xs opacity-60">{{ t('hotkeys.floorWheel') }}</p>
       <div class="flex items-center justify-between gap-2">
         <div
@@ -70,6 +87,7 @@ function onAction(field: keyof HotkeyConfig, combo: string): void {
     <HotkeyRecorder
       :model-value="airdropHotkey"
       :label="t('hotkeys.airdrop')"
+      :readonly="!rebindable"
       @update:model-value="onAction('airdrop', $event)"
     />
     <p v-if="isTauri" class="text-[10px] leading-relaxed opacity-70">
diff --git a/apps/desktop/src-tauri/src/commands.rs b/apps/desktop/src-tauri/src/commands.rs
index 834eded..414ac28 100644
--- a/apps/desktop/src-tauri/src/commands.rs
+++ b/apps/desktop/src-tauri/src/commands.rs
@@ -10,6 +10,7 @@ use crate::http_server::LISTEN_PORT;
 use crate::hotkeys::HotkeyController;
 use crate::lan::detect_lan_ip;
 use crate::server::config::{ConfigPatch, ConfigStore};
+use crate::server::events::ServerEvent;
 use crate::server::hotkeys::{HotkeyConfig, HotkeyPatch, HotkeyStore};
 use crate::server::paths::{self, ResolvedPaths};
 use crate::watcher::WatcherSlot;
@@ -50,6 +51,7 @@ pub async fn update_hotkeys(
     patch: HotkeyPatch,
     store: State<'_, Arc<HotkeyStore>>,
     hotkeys: State<'_, Arc<dyn HotkeyController>>,
+    slot: State<'_, Arc<WatcherSlot>>,
 ) -> Result<HotkeyConfig, String> {
     let merged = store.apply(patch).await?;
     let controller = hotkeys.inner().clone();
@@ -60,6 +62,11 @@ pub async fn update_hotkeys(
     if effective != merged {
         store.set(effective.clone()).await.map_err(|e| e.to_string())?;
     }
+    // Tell the other clients (browser/phone over SSE) the config changed —
+    // `event_sender()` is the same broadcast channel the /events stream serves.
+    let _ = slot
+        .event_sender()
+        .send(ServerEvent::Hotkeys { config: effective.clone() });
     Ok(effective)
 }
 
diff --git a/apps/desktop/src-tauri/src/http_server.rs b/apps/desktop/src-tauri/src/http_server.rs
index 0dbf53d..dcf6a8a 100644
--- a/apps/desktop/src-tauri/src/http_server.rs
+++ b/apps/desktop/src-tauri/src/http_server.rs
@@ -194,6 +194,8 @@ async fn put_hotkeys_http(
             eprintln!("[hotkeys] persist effective config failed: {err:#}");
         }
     }
+    // Notify the other clients (browser/phone over SSE) so their view re-syncs.
+    let _ = state.event_tx.send(ServerEvent::Hotkeys { config: effective.clone() });
     Ok(Json(effective))
 }
 
diff --git a/apps/desktop/src-tauri/src/server/events.rs b/apps/desktop/src-tauri/src/server/events.rs
index 94f9bbf..25799f1 100644
--- a/apps/desktop/src-tauri/src/server/events.rs
+++ b/apps/desktop/src-tauri/src/server/events.rs
@@ -18,9 +18,11 @@
 use serde::Serialize;
 use tokio::sync::broadcast;
 
+use crate::server::hotkeys::HotkeyConfig;
+
 /// Action codes the backend forwards to every client on a global-hotkey
 /// press. Mirrors the TS `hotkeyActions` list in
-/// `packages/shared/src/ws-messages.ts` (kebab-case wire values). Lock is
+/// `packages/shared/src/sse-messages.ts` (kebab-case wire values). Lock is
 /// deliberately absent — it stays a client-side overlay-only shortcut.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
 #[serde(rename_all = "kebab-case")]
@@ -59,6 +61,14 @@ pub enum ServerEvent {
     Command {
         action: HotkeyAction,
     },
+    /// The backend-owned hotkey config changed (a rebind on any client).
+    /// Broadcast over SSE so every other client's view stays in sync; the
+    /// originating client already has the effective config from its PUT/IPC
+    /// response. Carries the full effective config (camelCase keys via
+    /// `HotkeyConfig`'s own serde rename).
+    Hotkeys {
+        config: HotkeyConfig,
+    },
 }
 
 /// Payload for the Tauri `command` webview event. The channel name already
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 04f39f5..02a4fbd 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -10,9 +10,9 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
-    "./ws-messages": {
-      "types": "./dist/ws-messages.d.ts",
-      "import": "./dist/ws-messages.js"
+    "./sse-messages": {
+      "types": "./dist/sse-messages.d.ts",
+      "import": "./dist/sse-messages.js"
     },
     "./maps": {
       "types": "./dist/maps.d.ts",
diff --git a/packages/shared/src/hotkeys-api.ts b/packages/shared/src/hotkeys-api.ts
index 0263ace..052e620 100644
--- a/packages/shared/src/hotkeys-api.ts
+++ b/packages/shared/src/hotkeys-api.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { hotkeyActions, type HotkeyActionCode } from './ws-messages';
+import { hotkeyActions, type HotkeyActionCode } from './sse-messages.js';
 
 /**
  * Accelerator string in Tauri/Electron format: one or more modifiers + a
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index df93958..8c76fde 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -1,4 +1,4 @@
-export * from './ws-messages.js';
+export * from './sse-messages.js';
 export * from './maps.js';
 export * from './parse-screenshot.js';
 export * from './parse-log.js';
diff --git a/packages/shared/src/ws-messages.ts b/packages/shared/src/sse-messages.ts
similarity index 70%
rename from packages/shared/src/ws-messages.ts
rename to packages/shared/src/sse-messages.ts
index b5ec07e..604ca53 100644
--- a/packages/shared/src/ws-messages.ts
+++ b/packages/shared/src/sse-messages.ts
@@ -33,15 +33,34 @@ export const commandMessage = z.object({
   action: z.enum(hotkeyActions),
 });
 
+/** The backend-owned hotkey config changed (a rebind on any client). Broadcast
+ * so every other client's view stays in sync — e.g. the phone's read-only list.
+ * The originating client already has the effective config from its PUT response.
+ * The `config` shape mirrors `HotkeyConfig` in `@shared/hotkeys-api`; it's
+ * inlined here (not imported) to avoid a circular import — `hotkeys-api` imports
+ * `hotkeyActions` from this module. */
+export const hotkeysMessage = z.object({
+  type: z.literal('hotkeys'),
+  config: z.object({
+    zoomIn: z.string(),
+    zoomOut: z.string(),
+    floorUp: z.string(),
+    floorDown: z.string(),
+    airdrop: z.string(),
+  }),
+});
+
 export const serverMessage = z.discriminatedUnion('type', [
   positionMessage,
   mapChangeMessage,
   commandMessage,
+  hotkeysMessage,
 ]);
 
 export type PositionMessage = z.infer<typeof positionMessage>;
 export type MapChangeMessage = z.infer<typeof mapChangeMessage>;
 export type CommandMessage = z.infer<typeof commandMessage>;
+export type HotkeysMessage = z.infer<typeof hotkeysMessage>;
 export type HotkeyActionCode = (typeof hotkeyActions)[number];
 export type ServerMessage = z.infer<typeof serverMessage>;
 export type ServerMessageType = ServerMessage['type'];

From 0ffa21f9ff24adfb2f8851d87ad01f1a259b8a8b Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 12 Jun 2026 15:20:39 +0300
Subject: [PATCH 46/53] fix(desktop): comctl32 v6 manifest for test exes +
 rustfmt of committed code

Every `cargo test` run died at load with STATUS_ENTRYPOINT_NOT_FOUND
(CI Build-overlay run 16): the lib statically imports ComCtl32
v6-only symbols (SetWindowSubclass etc., via tray-icon/muda), and the
test harness exes never get tauri-build's embedded manifest, so the
loader bound comctl32 v5.82. build.rs now disables tauri-build's app
manifest (its entire content is the same dependency block) and emits
the equivalent /MANIFEST:EMBED + /MANIFESTDEPENDENCY link args for all
linked targets, tests included. Verified the shipped exe manifest is
equivalent via mt.exe.

Also rustfmt over already-committed unformatted files (hotkeys.rs,
lan.rs, events.rs) -- `cargo fmt --check` is the first step of
build-overlay.yml and was what failed runs 17/18.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 apps/desktop/src-tauri/build.rs             | 19 ++++++++-
 apps/desktop/src-tauri/src/hotkeys.rs       | 44 +++++++++++++++++----
 apps/desktop/src-tauri/src/lan.rs           |  6 +--
 apps/desktop/src-tauri/src/server/events.rs |  8 +---
 4 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/apps/desktop/src-tauri/build.rs b/apps/desktop/src-tauri/build.rs
index d860e1e..f2b36ea 100644
--- a/apps/desktop/src-tauri/build.rs
+++ b/apps/desktop/src-tauri/build.rs
@@ -1,3 +1,20 @@
 fn main() {
-    tauri_build::build()
+    // ComCtl32 v6 manifest for every linked exe — including the lib unit-test
+    // harness, which tauri-build's embedded manifest never reaches. The lib
+    // statically imports v6-only symbols (SetWindowSubclass etc., via
+    // tray-icon/muda); without a manifest the loader binds comctl32 v5.82 and
+    // the test exe dies at startup with STATUS_ENTRYPOINT_NOT_FOUND.
+    // tauri-build's own manifest (whose entire content is this same dependency
+    // block) is disabled below so the bins don't get a duplicate RT_MANIFEST.
+    println!("cargo:rustc-link-arg=/MANIFEST:EMBED");
+    println!(
+        "cargo:rustc-link-arg=/MANIFESTDEPENDENCY:type='win32' \
+         name='Microsoft.Windows.Common-Controls' version='6.0.0.0' \
+         publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'"
+    );
+    tauri_build::try_build(
+        tauri_build::Attributes::new()
+            .windows_attributes(tauri_build::WindowsAttributes::new_without_app_manifest()),
+    )
+    .expect("failed to run tauri-build");
 }
diff --git a/apps/desktop/src-tauri/src/hotkeys.rs b/apps/desktop/src-tauri/src/hotkeys.rs
index 2723a44..c8a68e4 100644
--- a/apps/desktop/src-tauri/src/hotkeys.rs
+++ b/apps/desktop/src-tauri/src/hotkeys.rs
@@ -65,13 +65,36 @@ fn config_entries(cfg: &HotkeyConfig) -> [(HotkeyAction, &str); 5] {
 }
 
 /// (action, old, new) triples for diffing `current` against `desired`.
-fn config_diff(current: &HotkeyConfig, desired: &HotkeyConfig) -> [(HotkeyAction, String, String); 5] {
+fn config_diff(
+    current: &HotkeyConfig,
+    desired: &HotkeyConfig,
+) -> [(HotkeyAction, String, String); 5] {
     [
-        (HotkeyAction::ZoomIn, current.zoom_in.clone(), desired.zoom_in.clone()),
-        (HotkeyAction::ZoomOut, current.zoom_out.clone(), desired.zoom_out.clone()),
-        (HotkeyAction::FloorUp, current.floor_up.clone(), desired.floor_up.clone()),
-        (HotkeyAction::FloorDown, current.floor_down.clone(), desired.floor_down.clone()),
-        (HotkeyAction::Airdrop, current.airdrop.clone(), desired.airdrop.clone()),
+        (
+            HotkeyAction::ZoomIn,
+            current.zoom_in.clone(),
+            desired.zoom_in.clone(),
+        ),
+        (
+            HotkeyAction::ZoomOut,
+            current.zoom_out.clone(),
+            desired.zoom_out.clone(),
+        ),
+        (
+            HotkeyAction::FloorUp,
+            current.floor_up.clone(),
+            desired.floor_up.clone(),
+        ),
+        (
+            HotkeyAction::FloorDown,
+            current.floor_down.clone(),
+            desired.floor_down.clone(),
+        ),
+        (
+            HotkeyAction::Airdrop,
+            current.airdrop.clone(),
+            desired.airdrop.clone(),
+        ),
     ]
 }
 
@@ -244,7 +267,9 @@ impl StandaloneHotkeys {
         {
             return fallback; // pump thread gone
         }
-        reply_rx.recv_timeout(Duration::from_secs(2)).unwrap_or(fallback)
+        reply_rx
+            .recv_timeout(Duration::from_secs(2))
+            .unwrap_or(fallback)
     }
 }
 
@@ -345,7 +370,10 @@ fn pump_thread(
     let mut suspended = false;
     let mut registered: HashMap<u32, HotkeyAction> = HashMap::new();
     register_all(&manager, &current, &mut registered);
-    eprintln!("[hotkeys] headless global hotkeys registered ({} combos)", registered.len());
+    eprintln!(
+        "[hotkeys] headless global hotkeys registered ({} combos)",
+        registered.len()
+    );
 
     let mut msg: MSG = unsafe { std::mem::zeroed() };
     loop {
diff --git a/apps/desktop/src-tauri/src/lan.rs b/apps/desktop/src-tauri/src/lan.rs
index 5256906..bbeca01 100644
--- a/apps/desktop/src-tauri/src/lan.rs
+++ b/apps/desktop/src-tauri/src/lan.rs
@@ -21,11 +21,11 @@ const VIRTUAL_INTERFACE_HINTS: &[&str] = &[
     "wsl",
     "docker",
     "vmware",
-    "vbox",      // VirtualBox
+    "vbox", // VirtualBox
     "virtualbox",
     "loopback",
-    "tap-",      // OpenVPN TAP adapters
-    "tun",       // OpenVPN TUN
+    "tap-", // OpenVPN TAP adapters
+    "tun",  // OpenVPN TUN
 ];
 
 /// Best-guess primary LAN IP of the host. Returns `None` if there is
diff --git a/apps/desktop/src-tauri/src/server/events.rs b/apps/desktop/src-tauri/src/server/events.rs
index 25799f1..dab8ec8 100644
--- a/apps/desktop/src-tauri/src/server/events.rs
+++ b/apps/desktop/src-tauri/src/server/events.rs
@@ -58,17 +58,13 @@ pub enum ServerEvent {
     /// SSE stream; the Tauri side also `app.emit("command", …)` so the
     /// overlay webview reacts. Browser/phone clients dispatch the action;
     /// no client needs the originating combo, only the action.
-    Command {
-        action: HotkeyAction,
-    },
+    Command { action: HotkeyAction },
     /// The backend-owned hotkey config changed (a rebind on any client).
     /// Broadcast over SSE so every other client's view stays in sync; the
     /// originating client already has the effective config from its PUT/IPC
     /// response. Carries the full effective config (camelCase keys via
     /// `HotkeyConfig`'s own serde rename).
-    Hotkeys {
-        config: HotkeyConfig,
-    },
+    Hotkeys { config: HotkeyConfig },
 }
 
 /// Payload for the Tauri `command` webview event. The channel name already

From e129bd772787d76e6a31095a35fc4a75ef6a6a7d Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 12 Jun 2026 15:22:31 +0300
Subject: [PATCH 47/53] feat(desktop): tray/LAN groundwork -- toast hint, icon
 set, delete-screenshots opt-in

Work-in-progress slice of PLAN-LAN-AND-TRAY.md: minimize-to-tray close
behaviour with a one-time native toast hint (src/notify.rs registers
our own AppUserModelID so the toast is not attributed to PowerShell),
the regenerated icon set from favicon.svg, the opt-in recycle-bin
delete of parsed screenshots, and the client-side wiring (overlay
store, tray composable, paths settings section, locales).

Also carries the CI fixes that live inside feature-touched files:
rustfmt across the Rust tree, clippy useless_vec in the logs.rs tests,
and the CORS preflight test now sends
Access-Control-Request-Private-Network -- tower-http only emits the
allow header in response to it (mirrors real Chrome behaviour).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .claude/launch.json                           |   3 +-
 CLAUDE.md                                     |  52 ++-
 PLAN-LAN-AND-TRAY.md                          | 395 ++++++++++++++++
 apps/client/src/components.d.ts               |   8 -
 apps/client/src/features/i18n/locales/en.json |  14 +-
 apps/client/src/features/i18n/locales/ru.json |  14 +-
 .../overlay/composables/useCloseConfirm.ts    |  18 +-
 .../overlay/composables/useTrayIcon.ts        | 161 +++++--
 apps/client/src/features/overlay/store.ts     |  24 +-
 .../server/composables/useServerPaths.ts      |  26 ++
 .../settings/sections/PathsSection.vue        |  21 +
 apps/desktop/src-tauri/Cargo.lock             | 442 +++++++++++++++++-
 apps/desktop/src-tauri/Cargo.toml             |  16 +
 apps/desktop/src-tauri/icons/128x128.png      | Bin 442 -> 2897 bytes
 apps/desktop/src-tauri/icons/128x128@2x.png   | Bin 906 -> 5636 bytes
 apps/desktop/src-tauri/icons/32x32.png        | Bin 158 -> 688 bytes
 apps/desktop/src-tauri/icons/64x64.png        | Bin 0 -> 1498 bytes
 .../src-tauri/icons/Square107x107Logo.png     | Bin 0 -> 2335 bytes
 .../src-tauri/icons/Square142x142Logo.png     | Bin 0 -> 3142 bytes
 .../src-tauri/icons/Square150x150Logo.png     | Bin 0 -> 3496 bytes
 .../src-tauri/icons/Square284x284Logo.png     | Bin 0 -> 6069 bytes
 .../src-tauri/icons/Square30x30Logo.png       | Bin 0 -> 693 bytes
 .../src-tauri/icons/Square310x310Logo.png     | Bin 0 -> 6832 bytes
 .../src-tauri/icons/Square44x44Logo.png       | Bin 0 -> 1003 bytes
 .../src-tauri/icons/Square71x71Logo.png       | Bin 0 -> 1546 bytes
 .../src-tauri/icons/Square89x89Logo.png       | Bin 0 -> 1960 bytes
 apps/desktop/src-tauri/icons/StoreLogo.png    | Bin 0 -> 1135 bytes
 apps/desktop/src-tauri/icons/icon.icns        | Bin 0 -> 67920 bytes
 apps/desktop/src-tauri/icons/icon.ico         | Bin 41086 -> 11426 bytes
 apps/desktop/src-tauri/icons/icon.png         | Bin 0 -> 11575 bytes
 apps/desktop/src-tauri/src/commands.rs        |  81 +++-
 apps/desktop/src-tauri/src/http_server.rs     |  40 +-
 apps/desktop/src-tauri/src/lib.rs             |  28 +-
 apps/desktop/src-tauri/src/notify.rs          |  71 +++
 apps/desktop/src-tauri/src/server/config.rs   |  14 +
 apps/desktop/src-tauri/src/server/logs.rs     |  73 ++-
 apps/desktop/src-tauri/src/server/paths.rs    |  13 +
 .../src-tauri/src/server/screenshots.rs       |  50 +-
 apps/desktop/src-tauri/src/watcher.rs         |  21 +-
 packages/shared/src/config-api.ts             |   7 +
 40 files changed, 1479 insertions(+), 113 deletions(-)
 create mode 100644 PLAN-LAN-AND-TRAY.md
 create mode 100644 apps/desktop/src-tauri/icons/64x64.png
 create mode 100644 apps/desktop/src-tauri/icons/Square107x107Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/Square142x142Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/Square150x150Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/Square284x284Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/Square30x30Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/Square310x310Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/Square44x44Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/Square71x71Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/Square89x89Logo.png
 create mode 100644 apps/desktop/src-tauri/icons/StoreLogo.png
 create mode 100644 apps/desktop/src-tauri/icons/icon.icns
 create mode 100644 apps/desktop/src-tauri/icons/icon.png
 create mode 100644 apps/desktop/src-tauri/src/notify.rs

diff --git a/.claude/launch.json b/.claude/launch.json
index 45c21fc..55f03cf 100644
--- a/.claude/launch.json
+++ b/.claude/launch.json
@@ -5,7 +5,8 @@
       "name": "tarkov-checker-dev",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["dev"],
-      "port": 5173
+      "port": 5173,
+      "autoPort": false
     }
   ]
 }
diff --git a/CLAUDE.md b/CLAUDE.md
index 1acd015..cc3652f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -309,7 +309,25 @@ Two surfaces read/write this state:
   path without a restart.
 - **HTTP**: `GET /api/config` / `PUT /api/config` on the in-process
   axum server (see "In-process HTTP server" below). Same behaviour as
-  the IPC commands, same `ResolvedPaths` shape.
+  the IPC commands, same `ConfigResponse` shape.
+
+The config get/update no longer returns bare `ResolvedPaths` — it returns
+`ConfigResponse` (`paths.rs`), which `#[serde(flatten)]`s `ResolvedPaths` and
+appends `deleteScreenshots: bool`. Wire shape is
+`{ gameDir, logsDir, screenshotsDir, deleteScreenshots }`, mirrored by
+`serverConfigResponseSchema` in `@shared/config-api`. `deleteScreenshots` is an
+opt-in (default false) flag persisted in `config.json` alongside the path
+overrides: when on, the screenshot watcher sends each parsed Tarkov screenshot
+to the **OS recycle bin** (`trash` crate) right after broadcasting its
+position — the image is never used beyond its filename, so nothing is lost, and
+the folder stops filling up over long sessions. Only files whose name parses as
+a Tarkov position screenshot are touched (`should_trash` in `screenshots.rs`);
+unrelated files the user dropped in the folder are never deleted. The flag
+reaches the watcher via a shared `Arc<AtomicBool>` on `WatcherSlot`
+(`set_delete_screenshots`), so toggling it takes effect live; both PUT paths
+(`update_config` IPC + `put_config_http`) set it before `apply_resolved`. UI is
+a `ToggleSwitch` in the Paths settings section (saves immediately, no Save
+button), so it's configured on the machine that owns the screenshots folder.
 
 The HTTP server binds on `0.0.0.0:47474` — all interfaces, fixed port. Same-Wi-Fi
 machine browsers reach it via localhost/127.0.0.1 loopback; LAN phones reach it
@@ -587,7 +605,7 @@ machine (via HTTP). One source of state, two transports.
 | Module                  | Role                                                                                               |
 | ----------------------- | -------------------------------------------------------------------------------------------------- |
 | `http_server.rs`        | axum routes, CorsLayer, SSE handler, listens on `0.0.0.0:47474`                                    |
-| `server/screenshots.rs` | `notify-debouncer-full` watcher (250 ms `awaitWriteFinish` equivalent); parses filename → position |
+| `server/screenshots.rs` | `notify-debouncer-full` watcher (250 ms `awaitWriteFinish` equivalent); parses filename → position; opt-in recycle-bin delete after parse (see below) |
 | `server/logs.rs`        | poll-tails latest `log_*/application_NNN.log`; emits `map-change` on `rcid:` / `Location:` hits    |
 | `server/paths.rs`       | env → manual override → `winreg` auto-detect; returns `ResolvedPaths`                              |
 | `server/config.rs`      | reads/writes `%APPDATA%/tarkov-checker/config.json`; rejects UNC paths                             |
@@ -608,8 +626,9 @@ for the architectural reasoning.
 - `GET /api/config` — current `ResolvedPaths`. Origin-allowlisted via
   `CorsLayer` (Vite dev `:5173`, hosted GitHub Pages); same
   JSON shape as the Tauri `get_config` IPC command.
-- `PUT /api/config` — apply `ConfigPatch`, re-run `apply_resolved`,
-  return the new `ResolvedPaths`. UNC → 400 with `{error: "..."}`.
+- `PUT /api/config` — apply `ConfigPatch` (path overrides +
+  `deleteScreenshots`), re-run `apply_resolved`, return the new
+  `ConfigResponse`. UNC → 400 with `{error: "..."}`.
 - `GET /api/hotkeys` — backend-owned combos (`HotkeyConfig`).
 - `PUT /api/hotkeys` — apply `HotkeyPatch`, (re)register OS hotkeys,
   return the EFFECTIVE config (a combo that can't be claimed reverts).
@@ -813,9 +832,28 @@ DeviceGuard').SecurityServicesRunning` → should be empty/`0`. VBS
 
 7. **Icons must exist for `tauri-build` on Windows.** At minimum
    `apps/desktop/src-tauri/icons/icon.ico` must be present (the Windows
-   Resource step depends on it). Placeholder PNGs at 32×32, 128×128,
-   128×128@2x are also referenced in `tauri.conf.json` and ship today
-   as solid purple squares — replace before any release.
+   Resource step depends on it). The icon set (`32x32.png`, `128x128.png`,
+   `128x128@2x.png`, `icon.ico`, `icon.icns`, the `Square*Logo`/`StoreLogo`
+   set) is generated from `apps/client/public/favicon.svg` via
+   `pnpm --filter @tarkov-checker/desktop exec tauri icon <path>/favicon.svg`
+   — the same mark the browser build uses. Re-run that after editing the SVG;
+   the generator also emits `ios/` + `android/` dirs which we delete (this is a
+   Windows-only desktop app). `icons/128x128.png` is also `include_bytes!`'d
+   into the binary by `src/notify.rs` for the toast icon — see item 8.
+
+8. **Toast notifications must register their own AppUserModelID.**
+   `tauri-plugin-notification` only stamps the toast's AUMID when the exe runs
+   from outside `target/{debug,release}` — but the portable .exe ships straight
+   out of `target/release` and dev runs from `target/debug`, so the plugin
+   always skips it and `notify-rust` falls back to PowerShell's identity (the
+   toast shows "PowerShell" + its icon). Fix: we don't use the plugin.
+   `src/notify.rs` registers `HKCU\Software\Classes\AppUserModelId\<identifier>`
+   with a `DisplayName` + `IconUri` (the favicon PNG, written to
+   `%APPDATA%/tarkov-checker/notification-icon.png`) at startup, then emits the
+   toast via `tauri-winrt-notification::Toast::new(<identifier>)`. No installer
+   / Start-Menu shortcut needed. Only used today for the one-time "still
+   running in the tray" hint (`commands::notify_tray_hint`, fired by the
+   client's `useCloseConfirm` gated on `tc.overlay.trayHintShown`).
 
 ## CI & releases
 
diff --git a/PLAN-LAN-AND-TRAY.md b/PLAN-LAN-AND-TRAY.md
new file mode 100644
index 0000000..5549921
--- /dev/null
+++ b/PLAN-LAN-AND-TRAY.md
@@ -0,0 +1,395 @@
+# Plan: LAN-phone (D) + Tray UI (E)
+
+Implementation plan for the LAN-phone + tray-UI iterations. Designed to
+be picked up cold by a fresh session.
+
+For broader context see [CLAUDE.md](./CLAUDE.md) — especially the
+"In-process HTTP server" and "Tarkov path resolution" sections.
+
+---
+
+## Architecture (simplified)
+
+Earlier iterations of this plan had an opt-in `lanMode` toggle plus a
+bearer-token auth scheme, with a tray "Enable LAN mode" item, a
+"Reset pairing" item, and token-in-fragment QR codes. That was scoped
+back to the trust model the user actually wants:
+
+> Same Wi-Fi = trusted. No token. Just show the LAN URL.
+
+Concrete consequences:
+
+- Helper **always** binds `0.0.0.0:47474`. No `lanMode` field in
+  `config.json`. No restart-on-toggle.
+- No `auth_guard`, no `AuthToken` state, no Credential Manager
+  storage. `auth.rs` deleted.
+- QR encodes the bare LAN URL (`http://<lan-ip>:47474/`). No token
+  fragment, no localStorage shuffling on the phone, no hash-bootstrap
+  in `main.ts`.
+- `CorsLayer` Origin allowlist still gates browser drive-by callers
+  (hosted-page XHR from anything not on the allowlist gets no ACAO).
+  Curl-equivalents from the LAN are unfiltered by design.
+- Tray loses E5 ("Enable LAN") and E6 ("Reset pairing") entirely —
+  there's nothing left to toggle or reset.
+
+What the user gets, end to end:
+
+```
+                 Wi-Fi LAN
+   ┌─────────────────────────────────────┐
+   │                                     │
+   │   PC running tarkov-checker.exe     │
+   │   ─────────────────────────────     │
+   │     Tauri overlay window  ──────┐   │
+   │       (existing scenario)       │   │
+   │                                 ▼   │
+   │     Helper:                         │
+   │     - 0.0.0.0:47474                 │
+   │     - /api/* /events                │
+   │     - GET / → embedded SPA          │
+   │                          ▲          │
+   │                          │ http     │
+   │   ┌──────────────────────┘          │
+   │   │                                 │
+   │   │  Phone in LAN                   │
+   │   │  ────────────                   │
+   │   │  Scans QR → opens               │
+   │   │  http://<pc-ip>:47474/          │
+   │   │  → SPA loads same-origin        │
+   │   │  → works                        │
+   │   │                                 │
+   └─────────────────────────────────────┘
+```
+
+Cross-network (phone on cellular, ПК at home) is **out of scope** —
+needs tunneling (cloudflared / Tailscale Funnel / ngrok). Documented
+as future work.
+
+---
+
+## D — LAN-phone unlock (done)
+
+All of D landed and is verified end-to-end on a real phone (same
+Wi-Fi). Summary of what's in the tree:
+
+### D1 — Embed SPA into the .exe ✅
+
+`rust-embed = "8"` + `mime_guess = "2"` in
+`apps/desktop/src-tauri/Cargo.toml`. `EmbeddedSpa` struct pointing at
+`../../client/dist/`, `spa_fallback` handler that serves the literal
+asset (with the right MIME) or falls back to `index.html` (SPA
+history mode), wired as `.fallback(spa_fallback)` after the API/SSE
+routes.
+
+Debug builds read from disk at request time. Release builds bake the
+bytes in. `compression` feature is NOT enabled — it pulls in
+`zstd-sys` which crashes rustc on this Windows host (CLAUDE.md
+"Windows build quirks"). Re-evaluate in CI later.
+
+### D2 — DROPPED ✂
+
+No `lanMode` toggle. Helper always `0.0.0.0:47474`. The earlier
+restart-on-toggle plumbing is removed.
+
+### D3 — DROPPED ✂
+
+No bearer-token auth. `auth.rs`, `auth_guard`, `AuthToken`,
+`extract_bearer_token`, `token_matches`, `paired` field on `/api/ping`
+all removed. CORS allowlist remains the browser-side gate.
+
+### D4 — QR pairing ✅
+
+`qrcode = "0.14"` (only `svg` feature) + `local-ip-address = "0.6"`.
+`src/lan.rs::detect_lan_ip()` with multi-NIC heuristic (filters
+`vEthernet` / `wsl` / `docker` / `vmware` etc. by name, ranks survivors
+192.168 > 10 > 172.16-31 > other).
+
+`pairing_qr` Tauri command returns `{url, svg}` where `url =
+http://<lan-ip>:47474/` (no token). `PairingModal.vue` on every
+`onMounted` calls `invoke('pairing_qr')` so a Wi-Fi change between
+openings picks up the new IP.
+
+Frontend `shared/config.ts` distinguishes three contexts via
+`isHelperServed()` (page on port 47474) — dev mode uses Vite proxy,
+helper-served goes same-origin (critical for the phone case), hosted
+SPA on GitHub Pages goes cross-origin to `http://localhost:47474`
+through the localhost-exception.
+
+`PairingSection.vue` in Settings drawer → System group (order 30,
+`visible: 'tauri'`), one button with `pi-qrcode` icon, opens the modal
+via `useOverlayStore().pairingModalOpen`.
+
+i18n keys under `pairing.*` in both `en.json` and `ru.json`.
+
+---
+
+## E — Tray UI (DONE)
+
+Goal: replace the "open the overlay window to do anything" UX with a
+Windows system-tray icon. Overlay becomes optional; tray is the
+always-available control surface.
+
+**Implemented — but client-side, not the Rust plan sketched below.** The tray
+lives in `apps/client/src/features/overlay/composables/useTrayIcon.ts` via the
+`@tauri-apps/api/tray` + `/menu` JS API (mounted from `App.vue`), not a Rust
+`TrayIconBuilder` / `tray.rs`. No `tray.rs` exists. The E1–E7 Rust sketches
+below are kept as historical context only; the actual menu and behaviour:
+
+- **Menu** (opens on right-click; left-click restores the window — Windows
+  convention, `showMenuOnLeftClick: false`):
+  `☑ Lock (click-through)` · ─ · `Show window` · ─ · `☑ Always on top` ·
+  `☑ Player follow` · ─ · `Pair phone` · `Copy LAN URL` · ─ · `Quit`.
+  The three `CheckMenuItem`s mirror their stores and re-sync via watchers when
+  toggled elsewhere (lock hotkey, settings drawer, quick menu). Menu layout
+  follows the UX rule "promote only actions worth doing mid-game, when the
+  fullscreen game hides the overlay" — sliders (opacity/zoom) and one-shot
+  config stay in the drawer.
+- **Pair phone** sets `useOverlayStore().pairingModalOpen = true` and shows the
+  window — no Rust `show-pairing-modal` event/listener needed (the JS tray
+  shares the Pinia store directly, so the App.vue listener from the E4 sketch
+  was unnecessary).
+- **Copy LAN URL** calls a native `copy_lan_url` Tauri command (`commands.rs`)
+  that writes `http://<lan-ip>:47474/` to the clipboard via
+  `tauri-plugin-clipboard-manager`'s Rust `ClipboardExt`. Native (not
+  `navigator.clipboard`) because a tray-menu click grants no DOM user-gesture,
+  so the webview clipboard API would be rejected. URL building shares the
+  `lan_url()` helper with `pairing_qr`. No capability entry needed — the write
+  is Rust-side, not a webview IPC call.
+- **Close → tray:** `minimizeToTray` now defaults **true**, so the in-app ✕
+  parks the overlay in the tray (`useCloseConfirm.ts` calls `window.hide()`);
+  `Quit` in the tray is the canonical exit. Users can flip the setting off for
+  ✕ = confirmed quit.
+- **First-close hint:** the first time the overlay parks in the tray,
+  `useCloseConfirm` fires a native Windows toast ("still running in the tray")
+  via the `notify_tray_hint` Tauri command (the window is already hidden, so an
+  in-app toast couldn't be seen). Shown once, gated by the persisted
+  `tc.overlay.trayHintShown` flag. The toast is attributed to this app's
+  name + favicon (not PowerShell) by registering our own AppUserModelID in
+  HKCU and emitting via `tauri-winrt-notification` — `tauri-plugin-notification`
+  was tried first but skips the AUMID for exes run from `target/release` (our
+  portable build), leaving PowerShell's identity. See `src/notify.rs` and
+  CLAUDE.md "Windows build quirks" item 8. The app icons themselves were also
+  regenerated from `favicon.svg` (`tauri icon`), replacing the purple
+  placeholders for the tray / window / taskbar too.
+
+Surface area after the simplification:
+
+| Item              | Action                                                    |
+| ----------------- | --------------------------------------------------------- |
+| Open dashboard    | `show()` + `unminimize()` + `set_focus()` on overlay      |
+| Pair phone        | Emit `show-pairing-modal` event; App.vue flips store flag |
+| Copy pairing URL  | Build LAN URL via `detect_lan_ip`, copy to clipboard      |
+| Quit              | `app.exit(0)`                                             |
+
+Four items, separator between "Open dashboard" and the pair pair, and
+between the pair pair and Quit.
+
+### E1 — Tray icon skeleton
+
+**Plan:**
+
+1. Tauri 2 ships `tauri::tray::TrayIconBuilder`. Wire up in `lib.rs`
+   `setup` hook after `app.manage(...)` calls.
+
+   ```rust
+   use tauri::tray::TrayIconBuilder;
+   use tauri::menu::{Menu, MenuItem, PredefinedMenuItem};
+
+   let open_item = MenuItem::with_id(app, "open_dashboard",
+       "Open dashboard", true, None::<&str>)?;
+   let pair_phone = MenuItem::with_id(app, "pair_phone",
+       "Pair phone", true, None::<&str>)?;
+   let copy_url = MenuItem::with_id(app, "copy_url",
+       "Copy LAN URL", true, None::<&str>)?;
+   let separator1 = PredefinedMenuItem::separator(app)?;
+   let separator2 = PredefinedMenuItem::separator(app)?;
+   let quit = MenuItem::with_id(app, "quit", "Quit", true,
+       None::<&str>)?;
+
+   let menu = Menu::with_items(app, &[
+       &open_item, &separator1,
+       &pair_phone, &copy_url,
+       &separator2, &quit,
+   ])?;
+
+   TrayIconBuilder::with_id("main")
+       .icon(app.default_window_icon().unwrap().clone())
+       .menu(&menu)
+       .show_menu_on_left_click(true)
+       .on_menu_event(|app, event| tray::handle_event(app, event))
+       .build(app)?;
+   ```
+
+2. New `apps/desktop/src-tauri/src/tray.rs` with `handle_event` plus
+   per-action functions, dispatched by `event.id().as_ref()`.
+
+3. **Icon**: reuse `apps/desktop/src-tauri/icons/icon.ico` via
+   `app.default_window_icon()` — `tauri.conf.json` already has the
+   icons section, no change needed.
+
+**Files:**
+
+- `apps/desktop/src-tauri/src/lib.rs` — TrayIconBuilder block
+- `apps/desktop/src-tauri/src/tray.rs` — NEW
+
+### E2 — "Open dashboard"
+
+```rust
+fn handle_open_dashboard(app: &AppHandle) {
+    if let Some(window) = app.get_webview_window("main") {
+        let _ = window.show();
+        let _ = window.unminimize();
+        let _ = window.set_focus();
+    }
+}
+```
+
+No browser open, no hosted URL — the overlay IS the dashboard.
+
+### E3 — "Copy LAN URL"
+
+```rust
+fn handle_copy_url(app: &AppHandle) {
+    use tauri_plugin_clipboard_manager::ClipboardExt;
+    let ip = match crate::lan::detect_lan_ip() {
+        Some(ip) => ip,
+        None => { eprintln!("[tray] no LAN IP detected"); return; }
+    };
+    let url = format!("http://{ip}:{}/", crate::http_server::LISTEN_PORT);
+    if let Err(err) = app.clipboard().write_text(url) {
+        eprintln!("[tray] clipboard write failed: {err}");
+    }
+}
+```
+
+Requires `tauri-plugin-clipboard-manager` dep + a capability entry.
+
+### E4 — "Pair phone"
+
+Brings the overlay window forward and emits `show-pairing-modal`.
+App.vue listens and flips `useOverlayStore().pairingModalOpen`.
+
+```rust
+fn handle_pair_phone(app: &AppHandle) {
+    if let Some(window) = app.get_webview_window("main") {
+        let _ = window.show();
+        let _ = window.unminimize();
+        let _ = window.set_focus();
+        let _ = window.emit("show-pairing-modal", ());
+    }
+}
+```
+
+App.vue (one new listener, no new component):
+
+```ts
+import { listen } from '@tauri-apps/api/event';
+import { useOverlayStore } from '@/features/overlay/store';
+
+onMounted(async () => {
+  if (!isTauri) return;
+  const unlisten = await listen('show-pairing-modal', () => {
+    useOverlayStore().pairingModalOpen = true;
+  });
+  onBeforeUnmount(unlisten);
+});
+```
+
+### E7 — "Quit"
+
+```rust
+fn handle_quit(app: &AppHandle) {
+    app.exit(0);
+}
+```
+
+`app.exit()` runs proper Tauri teardown.
+
+---
+
+## Dependency order
+
+```
+D1 ✅ ─┬─→ D4 ✅ ─→ E4 (uses PairingModal which uses pairing_qr)
+       │
+       └─→ E1 (skeleton) ─→ E2/E3/E4/E7 handlers
+```
+
+E1 is the only blocker for E2-E7. ~1-2 hours total for the tray work.
+
+---
+
+## Verification matrix
+
+| Scenario                              | Status      |
+| ------------------------------------- | ----------- |
+| Tauri overlay (existing IPC path)     | works ✅    |
+| Hosted SPA on same PC                 | works ✅    |
+| Helper-served SPA in same-PC browser  | works ✅    |
+| Vite dev at `<lan-ip>:5173` on phone  | works ✅    |
+| Helper at `<lan-ip>:47474` on phone   | works ✅    |
+| Cross-network phone (cellular etc.)  | out of scope (needs tunnel) |
+| Helper down                           | "Helper not running" UI |
+
+---
+
+## Out-of-scope (future work)
+
+- **Cross-network access.** Phone on cellular hitting helper at home.
+  Needs the user to run a tunnel (`cloudflared`, Tailscale Funnel,
+  ngrok) and the SPA to know the tunnel URL. Could land later as a
+  "Connect over internet" advanced setting.
+- **LAN-side auth.** If the trust-model ever needs to harden (coffee
+  shop Wi-Fi, malicious LAN device), token-via-QR can come back. The
+  earlier implementation lives in git history if a rewind is needed.
+- **Compression for `rust-embed`.** Pulls `zstd-sys` which crashes
+  rustc locally. Enable in CI.
+
+---
+
+## File checklist (cumulative, E remaining)
+
+```
+# As built (client-side tray), not the original Rust plan:
+apps/desktop/src-tauri/Cargo.toml                      [+tauri-plugin-clipboard-manager, +tauri-winrt-notification]
+apps/desktop/src-tauri/src/lib.rs                      [.plugin(clipboard init), notify::register_aumid in setup, copy_lan_url/notify_tray_hint in handler]
+apps/desktop/src-tauri/src/commands.rs                 [lan_url() helper + copy_lan_url + notify_tray_hint commands]
+apps/desktop/src-tauri/src/notify.rs                   [NEW: AUMID registration + winrt toast]
+apps/desktop/src-tauri/icons/*                         [regenerated from favicon.svg via `tauri icon`]
+
+apps/client/src/features/overlay/composables/useTrayIcon.ts  [full menu: checkmarks, pair, copy, left-click restore]
+apps/client/src/features/overlay/composables/useCloseConfirm.ts [first-close tray notification]
+apps/client/src/features/overlay/store.ts              [minimizeToTray default → true, trayHintShown flag]
+apps/client/src/features/i18n/locales/en.json + ru.json [tray menu + trayHint strings]
+
+# Not needed in the end: capabilities/default.json (Rust-side clipboard write),
+# tray.rs (tray is JS), tauri.conf.json (tray-icon feature already present),
+# App.vue listener (JS tray flips the store directly).
+```
+
+---
+
+## Quick-reference commands
+
+```powershell
+# Dev (Vite + Tauri).
+pnpm --filter @tarkov-checker/desktop tauri:dev
+
+# Build production overlay (.exe with embedded SPA).
+pnpm overlay:build
+
+# Build hosted SPA for GitHub Pages.
+$env:GITHUB_PAGES = 'true'; pnpm --filter @tarkov-checker/client build
+
+# Local checks.
+pnpm typecheck && pnpm lint && pnpm test
+cd apps/desktop/src-tauri
+cargo fmt --all -- --check
+cargo clippy --all-targets -- -D warnings
+cargo test --lib  # Windows host is flaky — push a tag if it crashes locally.
+
+# Test helper directly (no UI).
+curl http://localhost:47474/api/ping
+curl http://localhost:47474/api/config
+curl -N http://localhost:47474/events
+```
diff --git a/apps/client/src/components.d.ts b/apps/client/src/components.d.ts
index 69cb61a..362cd28 100644
--- a/apps/client/src/components.d.ts
+++ b/apps/client/src/components.d.ts
@@ -20,23 +20,15 @@ declare module 'vue' {
     ConfirmDialog: typeof import('primevue/confirmdialog')['default']
     Dialog: typeof import('primevue/dialog')['default']
     Drawer: typeof import('primevue/drawer')['default']
-    Fieldset: typeof import('primevue/fieldset')['default']
     IconField: typeof import('primevue/iconfield')['default']
     InputIcon: typeof import('primevue/inputicon')['default']
     InputText: typeof import('primevue/inputtext')['default']
     Listbox: typeof import('primevue/listbox')['default']
     Message: typeof import('primevue/message')['default']
-    Popover: typeof import('primevue/popover')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    Select: typeof import('primevue/select')['default']
     SelectButton: typeof import('primevue/selectbutton')['default']
     Slider: typeof import('primevue/slider')['default']
-    Tab: typeof import('primevue/tab')['default']
-    TabList: typeof import('primevue/tablist')['default']
-    TabPanel: typeof import('primevue/tabpanel')['default']
-    TabPanels: typeof import('primevue/tabpanels')['default']
-    Tabs: typeof import('primevue/tabs')['default']
     ToggleSwitch: typeof import('primevue/toggleswitch')['default']
   }
   export interface GlobalDirectives {
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index d4fc434..7123f18 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -51,6 +51,8 @@
     "saved": "Saved",
     "loading": "Connecting to the helper…",
     "mobileHint": "Open this page on the machine running Tarkov to configure paths.",
+    "deleteScreenshots": "Delete screenshots after reading",
+    "deleteScreenshotsHint": "Sends each Tarkov screenshot to the Recycle Bin once its position has been read. Keeps the folder from filling up. Off by default.",
     "source": {
       "env": "from .env",
       "manual": "manual",
@@ -124,6 +126,10 @@
     "accept": "Close",
     "reject": "Cancel"
   },
+  "trayHint": {
+    "title": "Still running",
+    "body": "tarkov-checker is now in the system tray. Open it from there, or right-click the tray icon to quit."
+  },
   "airdrop": {
     "armedFirst": "Drop tracker armed while facing the airdrop and press PrintScreen",
     "armedSecond": "Step sideways 5m, then press PrintScreen again",
@@ -137,10 +143,14 @@
     "radiusHint": "How big the predicted-landing circle is on the map. Two-shot triangulation isn't perfectly precise — the circle just makes the uncertainty honest. Adjust to taste."
   },
   "tray": {
-    "toggleLock": "Toggle lock",
+    "lock": "Lock (click-through)",
     "showWindow": "Show window",
+    "alwaysOnTop": "Always on top",
+    "playerFollow": "Player follow",
+    "pairPhone": "Pair phone",
+    "copyUrl": "Copy LAN URL",
     "quit": "Quit",
-    "tooltip": "tarkov-checker"
+    "tooltip": "tarkov-checker — running"
   },
   "extractNames": {
     "bigmap": {
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index f4827c2..4609b9a 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -51,6 +51,8 @@
     "saved": "Сохранено",
     "loading": "Подключаемся к хелперу…",
     "mobileHint": "Открой эту страницу на машине с Tarkov, чтобы настроить пути.",
+    "deleteScreenshots": "Удалять скриншоты после считывания",
+    "deleteScreenshotsHint": "Отправляет каждый скриншот Tarkov в корзину после считывания позиции. Не даёт папке разрастаться. По умолчанию выключено.",
     "source": {
       "env": "из .env",
       "manual": "вручную",
@@ -124,6 +126,10 @@
     "accept": "Закрыть",
     "reject": "Отмена"
   },
+  "trayHint": {
+    "title": "Работает в фоне",
+    "body": "tarkov-checker свёрнут в системный трей. Открой его оттуда или нажми правый клик по иконке, чтобы выйти."
+  },
   "airdrop": {
     "armedFirst": "Drop-трекер запущен, смотри на дроп и нажми PrintScreen",
     "armedSecond": "Отойди на 5м в сторону и нажми PrintScreen ещё раз",
@@ -137,10 +143,14 @@
     "radiusHint": "Размер круга предполагаемого места падения на карте. Триангуляция по двум снимкам не идеально точная — круг просто честно показывает погрешность. Подбери на свой вкус."
   },
   "tray": {
-    "toggleLock": "Переключить блокировку",
+    "lock": "Блокировка (клики сквозь)",
     "showWindow": "Показать окно",
+    "alwaysOnTop": "Поверх всех окон",
+    "playerFollow": "Авто-следование",
+    "pairPhone": "Подключить телефон",
+    "copyUrl": "Копировать LAN-ссылку",
     "quit": "Выход",
-    "tooltip": "tarkov-checker"
+    "tooltip": "tarkov-checker — работает"
   },
   "extractNames": {
     "bigmap": {
diff --git a/apps/client/src/features/overlay/composables/useCloseConfirm.ts b/apps/client/src/features/overlay/composables/useCloseConfirm.ts
index a5777ff..f3d46ae 100644
--- a/apps/client/src/features/overlay/composables/useCloseConfirm.ts
+++ b/apps/client/src/features/overlay/composables/useCloseConfirm.ts
@@ -12,7 +12,7 @@ export function useCloseConfirm(): () => void {
   const confirm = useConfirm();
   const { t } = useI18n();
   const { isTauri } = useTauriOverlay();
-  const { minimizeToTray } = storeToRefs(useOverlayStore());
+  const { minimizeToTray, trayHintShown } = storeToRefs(useOverlayStore());
 
   return function onCloseRequested(): void {
     if (!isTauri) return;
@@ -21,6 +21,22 @@ export function useCloseConfirm(): () => void {
       void (async () => {
         const { getCurrentWindow } = await import('@tauri-apps/api/window');
         await getCurrentWindow().hide();
+        // First time only: the window is now hidden, so an in-app toast can't
+        // be seen — fire a native OS notification telling the user it's still
+        // running in the tray, then remember we've said it.
+        if (!trayHintShown.value) {
+          trayHintShown.value = true;
+          try {
+            const { invoke } = await import('@tauri-apps/api/core');
+            await invoke('notify_tray_hint', {
+              title: t('trayHint.title'),
+              body: t('trayHint.body'),
+            });
+          } catch (err) {
+            // eslint-disable-next-line no-console
+            console.error('[tray] hint notification failed:', err);
+          }
+        }
       })();
       return;
     }
diff --git a/apps/client/src/features/overlay/composables/useTrayIcon.ts b/apps/client/src/features/overlay/composables/useTrayIcon.ts
index 0586bb6..ec017f4 100644
--- a/apps/client/src/features/overlay/composables/useTrayIcon.ts
+++ b/apps/client/src/features/overlay/composables/useTrayIcon.ts
@@ -1,59 +1,144 @@
-import type { TrayIcon } from '@tauri-apps/api/tray';
-import type { Menu } from '@tauri-apps/api/menu';
+import type { TrayIcon, TrayIconEvent } from '@tauri-apps/api/tray';
+import type { Menu, CheckMenuItem } from '@tauri-apps/api/menu';
 import { useI18nStore } from '@/features/i18n/store';
+import { useOverlayStore } from '@/features/overlay/store';
+import { useMapSettingsStore } from '@/features/map/store';
 
 type TrayHandle = Awaited<ReturnType<typeof TrayIcon.new>>;
-type TrayMenu = Awaited<ReturnType<typeof Menu.new>>;
 
 const TRAY_ID = 'tarkov-checker-tray';
 
+async function showWindow(): Promise<void> {
+  const { getCurrentWindow } = await import('@tauri-apps/api/window');
+  const win = getCurrentWindow();
+  await win.show();
+  await win.unminimize();
+  await win.setFocus();
+}
+
 /**
  * Owns the Tauri system-tray icon lifecycle: creates the icon on mount,
- * rebuilds the menu when the UI language changes, and removes the icon on
- * unmount. No-op in browser context.
+ * rebuilds the menu when the UI language changes, keeps the checkmark items in
+ * sync with their stores, and removes the icon on unmount. No-op in browser
+ * context.
+ *
+ * The tray is the only control surface reachable while the game is fullscreen
+ * (the overlay can be hidden or click-through-locked behind it), so the menu
+ * leans on actions that matter mid-game: unlock, restore, the always-on-top /
+ * player-follow toggles, and the LAN-share shortcuts. Left-click restores the
+ * window (Windows convention); right-click opens the menu. Since ✕ now parks
+ * the overlay in the tray (see overlay store `minimizeToTray`), "Quit" here is
+ * the canonical way to actually exit.
  */
 export function useTrayIcon(isTauri: boolean, overlayClickThrough: Ref<boolean>): void {
   if (!isTauri) return;
 
   const { t } = useI18n();
   const { apiLang } = storeToRefs(useI18nStore());
+  const { alwaysOnTop, pairingModalOpen } = storeToRefs(useOverlayStore());
+  const { playerFollow } = storeToRefs(useMapSettingsStore());
+
   let trayRef: TrayHandle | null = null;
+  // Live references to the check items so external state changes (hotkey,
+  // settings drawer, quick menu) can re-sync their checkmarks without
+  // rebuilding the whole menu.
+  let lockItem: CheckMenuItem | null = null;
+  let aotItem: CheckMenuItem | null = null;
+  let followItem: CheckMenuItem | null = null;
+
+  async function copyLanUrl(): Promise<void> {
+    try {
+      const { invoke } = await import('@tauri-apps/api/core');
+      await invoke('copy_lan_url');
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error('[tray] copy LAN URL failed:', err);
+    }
+  }
+
+  async function buildTrayMenu(): Promise<Menu> {
+    const { Menu, MenuItem, CheckMenuItem, PredefinedMenuItem } = await import(
+      '@tauri-apps/api/menu'
+    );
+    const separator = () => PredefinedMenuItem.new({ item: 'Separator' });
+
+    lockItem = await CheckMenuItem.new({
+      id: 'toggle-lock',
+      text: t('tray.lock'),
+      checked: overlayClickThrough.value,
+      action: () => {
+        overlayClickThrough.value = !overlayClickThrough.value;
+      },
+    });
+    const showItem = await MenuItem.new({
+      id: 'show',
+      text: t('tray.showWindow'),
+      action: () => void showWindow(),
+    });
+    aotItem = await CheckMenuItem.new({
+      id: 'always-on-top',
+      text: t('tray.alwaysOnTop'),
+      checked: alwaysOnTop.value,
+      action: () => {
+        alwaysOnTop.value = !alwaysOnTop.value;
+      },
+    });
+    followItem = await CheckMenuItem.new({
+      id: 'player-follow',
+      text: t('tray.playerFollow'),
+      checked: playerFollow.value === 'on',
+      action: () => {
+        playerFollow.value = playerFollow.value === 'on' ? 'off' : 'on';
+      },
+    });
+    const pairItem = await MenuItem.new({
+      id: 'pair-phone',
+      text: t('tray.pairPhone'),
+      action: () => {
+        void showWindow();
+        pairingModalOpen.value = true;
+      },
+    });
+    const copyItem = await MenuItem.new({
+      id: 'copy-url',
+      text: t('tray.copyUrl'),
+      action: () => void copyLanUrl(),
+    });
+    const quitItem = await MenuItem.new({
+      id: 'quit',
+      text: t('tray.quit'),
+      action: () =>
+        void (async () => {
+          const { getCurrentWindow } = await import('@tauri-apps/api/window');
+          await getCurrentWindow().close();
+        })(),
+    });
 
-  async function buildTrayMenu(): Promise<TrayMenu> {
-    const [{ Menu }, { getCurrentWindow }] = await Promise.all([
-      import('@tauri-apps/api/menu'),
-      import('@tauri-apps/api/window'),
-    ]);
     return Menu.new({
       items: [
-        {
-          id: 'toggle-lock',
-          text: t('tray.toggleLock'),
-          action: () => {
-            overlayClickThrough.value = !overlayClickThrough.value;
-          },
-        },
-        {
-          id: 'show',
-          text: t('tray.showWindow'),
-          action: async () => {
-            const win = getCurrentWindow();
-            await win.show();
-            await win.setFocus();
-          },
-        },
-        { item: 'Separator' },
-        {
-          id: 'quit',
-          text: t('tray.quit'),
-          action: async () => {
-            await getCurrentWindow().close();
-          },
-        },
+        lockItem,
+        await separator(),
+        showItem,
+        await separator(),
+        aotItem,
+        followItem,
+        await separator(),
+        pairItem,
+        copyItem,
+        await separator(),
+        quitItem,
       ],
     });
   }
 
+  // Left-click restores the overlay (Windows convention); the menu opens on
+  // right-click. `showMenuOnLeftClick: false` routes left clicks here instead.
+  function onTrayEvent(event: TrayIconEvent): void {
+    if (event.type === 'Click' && event.button === 'Left' && event.buttonState === 'Up') {
+      void showWindow();
+    }
+  }
+
   onMounted(async () => {
     try {
       const [{ TrayIcon }, { defaultWindowIcon }] = await Promise.all([
@@ -66,7 +151,8 @@ export function useTrayIcon(isTauri: boolean, overlayClickThrough: Ref<boolean>)
         icon: icon ?? undefined,
         menu: await buildTrayMenu(),
         tooltip: t('tray.tooltip'),
-        showMenuOnLeftClick: true,
+        showMenuOnLeftClick: false,
+        action: onTrayEvent,
       });
     } catch (err) {
       // eslint-disable-next-line no-console
@@ -74,6 +160,11 @@ export function useTrayIcon(isTauri: boolean, overlayClickThrough: Ref<boolean>)
     }
   });
 
+  // Keep checkmarks in sync when state is changed from anywhere else.
+  watch(overlayClickThrough, (v) => void lockItem?.setChecked(v));
+  watch(alwaysOnTop, (v) => void aotItem?.setChecked(v));
+  watch(playerFollow, (v) => void followItem?.setChecked(v === 'on'));
+
   watch(apiLang, async () => {
     if (!trayRef) return;
     try {
diff --git a/apps/client/src/features/overlay/store.ts b/apps/client/src/features/overlay/store.ts
index 48ebbea..89ab505 100644
--- a/apps/client/src/features/overlay/store.ts
+++ b/apps/client/src/features/overlay/store.ts
@@ -11,9 +11,16 @@ export const useOverlayStore = defineStore('overlay', () => {
   const zoom = persistedRef('tc.overlay.zoom', overlayZoomSchema, '100' as OverlayZoom);
 
   // When on, the ✕ button hides the window to the system tray (keeps running)
-  // instead of quitting; restore/quit from the tray. Opt-in — default off keeps
-  // the ✕ as a confirmed quit.
-  const minimizeToTray = persistedRef('tc.overlay.minimizeToTray', z.boolean(), false);
+  // instead of quitting; restore via the tray's "Show window", quit via the
+  // tray's "Quit". Default ON — closing parks the overlay in the tray rather
+  // than killing the session. Users who prefer ✕ = confirmed quit can flip it
+  // off in Settings.
+  const minimizeToTray = persistedRef('tc.overlay.minimizeToTray', z.boolean(), true);
+
+  // One-shot: tracks whether the "still running in the tray" notification has
+  // been shown. Set true after the first close-to-tray so the hint fires once,
+  // not on every ✕.
+  const trayHintShown = persistedRef('tc.overlay.trayHintShown', z.boolean(), false);
 
   // Session-only: booting into a locked overlay with a broken hotkey would be
   // unrecoverable, so the locked state is intentionally NOT persisted.
@@ -24,5 +31,14 @@ export const useOverlayStore = defineStore('overlay', () => {
   // persisted — pairing is per-action, never "remembered open".
   const pairingModalOpen = ref(false);
 
-  return { alwaysOnTop, opacity, mapOpacity, zoom, minimizeToTray, clickThrough, pairingModalOpen };
+  return {
+    alwaysOnTop,
+    opacity,
+    mapOpacity,
+    zoom,
+    minimizeToTray,
+    trayHintShown,
+    clickThrough,
+    pairingModalOpen,
+  };
 });
diff --git a/apps/client/src/features/server/composables/useServerPaths.ts b/apps/client/src/features/server/composables/useServerPaths.ts
index bf1bf5f..901903c 100644
--- a/apps/client/src/features/server/composables/useServerPaths.ts
+++ b/apps/client/src/features/server/composables/useServerPaths.ts
@@ -24,6 +24,8 @@ export interface UseServerPaths {
   canSavePaths: ComputedRef<boolean>;
   savePaths: () => Promise<void>;
   statusIconClass: (slot: PathSlot) => string;
+  deleteScreenshots: Ref<boolean>;
+  setDeleteScreenshots: (v: boolean) => Promise<void>;
 }
 
 /**
@@ -73,6 +75,7 @@ export function useServerPaths(canEditPaths: Ref<boolean>): UseServerPaths {
   const pathsSaving = ref(false);
   const pathsError = ref<PathsError | null>(null);
   const pathsJustSaved = ref(false);
+  const deleteScreenshots = ref(false);
 
   const gameDirLocked = computed(() => serverConfig.value?.gameDir.source === 'env');
   const screenshotsDirLocked = computed(() => serverConfig.value?.screenshotsDir.source === 'env');
@@ -91,6 +94,7 @@ export function useServerPaths(canEditPaths: Ref<boolean>): UseServerPaths {
     serverConfig.value = cfg;
     gameDirInput.value = cfg.gameDir.value ?? '';
     screenshotsDirInput.value = cfg.screenshotsDir.value ?? '';
+    deleteScreenshots.value = cfg.deleteScreenshots;
   }
 
   async function loadPaths(): Promise<void> {
@@ -136,6 +140,26 @@ export function useServerPaths(canEditPaths: Ref<boolean>): UseServerPaths {
     }
   }
 
+  /**
+   * Immediate-save toggle (no "Save" button — it's a switch). Optimistically
+   * flips the ref, PUTs just the flag, and reverts on failure. The backend
+   * enforces the actual deletion in the screenshot watcher.
+   */
+  async function setDeleteScreenshots(v: boolean): Promise<void> {
+    const prev = deleteScreenshots.value;
+    if (prev === v) return;
+    deleteScreenshots.value = v;
+    pathsError.value = null;
+    try {
+      const cfg = await putServerConfig({ deleteScreenshots: v });
+      cachedConfig = cfg;
+      applyConfig(cfg);
+    } catch (err) {
+      deleteScreenshots.value = prev;
+      pathsError.value = toPathsError(err);
+    }
+  }
+
   function statusIconClass(slot: PathSlot): string {
     const item = serverConfig.value?.[slot];
     if (!item) return 'pi pi-circle text-surface-500';
@@ -161,5 +185,7 @@ export function useServerPaths(canEditPaths: Ref<boolean>): UseServerPaths {
     canSavePaths,
     savePaths,
     statusIconClass,
+    deleteScreenshots,
+    setDeleteScreenshots,
   };
 }
diff --git a/apps/client/src/features/settings/sections/PathsSection.vue b/apps/client/src/features/settings/sections/PathsSection.vue
index 167db02..87892aa 100644
--- a/apps/client/src/features/settings/sections/PathsSection.vue
+++ b/apps/client/src/features/settings/sections/PathsSection.vue
@@ -21,6 +21,8 @@ const {
   canSavePaths,
   savePaths,
   statusIconClass,
+  deleteScreenshots,
+  setDeleteScreenshots,
 } = useServerPaths(canEditPaths);
 </script>
 
@@ -104,6 +106,25 @@ const {
       <p v-else class="text-[10px] leading-relaxed opacity-70">
         {{ t('paths.mobileHint') }}
       </p>
+
+      <div class="border-t border-surface-700 pt-3">
+        <div class="flex items-start justify-between gap-3">
+          <div class="min-w-0">
+            <label for="delete-screenshots-toggle" class="block text-xs">
+              {{ t('paths.deleteScreenshots') }}
+            </label>
+            <p class="mt-1 text-[10px] leading-relaxed opacity-70">
+              {{ t('paths.deleteScreenshotsHint') }}
+            </p>
+          </div>
+          <ToggleSwitch
+            input-id="delete-screenshots-toggle"
+            :model-value="deleteScreenshots"
+            :disabled="!canEditPaths"
+            @update:model-value="setDeleteScreenshots"
+          />
+        </div>
+      </div>
     </div>
   </div>
 </template>
diff --git a/apps/desktop/src-tauri/Cargo.lock b/apps/desktop/src-tauri/Cargo.lock
index 9db43ee..21a5aee 100644
--- a/apps/desktop/src-tauri/Cargo.lock
+++ b/apps/desktop/src-tauri/Cargo.lock
@@ -47,6 +47,27 @@ version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
+[[package]]
+name = "arboard"
+version = "3.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
+dependencies = [
+ "clipboard-win",
+ "image",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation",
+ "parking_lot",
+ "percent-encoding",
+ "windows-sys 0.60.2",
+ "wl-clipboard-rs",
+ "x11rb",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.89"
@@ -256,6 +277,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
 version = "1.11.1"
@@ -387,6 +414,15 @@ dependencies = [
  "windows-link 0.2.1",
 ]
 
+[[package]]
+name = "clipboard-win"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
+dependencies = [
+ "error-code",
+]
+
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -480,6 +516,12 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.7"
@@ -763,6 +805,12 @@ dependencies = [
  "tendril",
 ]
 
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
 [[package]]
 name = "dpi"
 version = "0.1.2"
@@ -867,12 +915,24 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "error-code"
+version = "3.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
+
 [[package]]
 name = "fastrand"
 version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
+[[package]]
+name = "fax"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -917,6 +977,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
 version = "1.1.9"
@@ -1394,6 +1460,17 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1681,6 +1758,20 @@ dependencies = [
  "icu_properties",
 ]
 
+[[package]]
+name = "image"
+version = "0.25.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+ "png 0.18.1",
+ "tiff",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -2060,6 +2151,16 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
 [[package]]
 name = "muda"
 version = "0.19.2"
@@ -2140,6 +2241,15 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
+[[package]]
+name = "nom"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "notify"
 version = "6.1.1"
@@ -2230,6 +2340,7 @@ dependencies = [
  "block2",
  "objc2",
  "objc2-core-foundation",
+ "objc2-core-graphics",
  "objc2-foundation",
 ]
 
@@ -2417,6 +2528,16 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
+[[package]]
+name = "os_pipe"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "pango"
 version = "0.18.3"
@@ -2471,6 +2592,17 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
+[[package]]
+name = "petgraph"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
+dependencies = [
+ "fixedbitset",
+ "hashbrown 0.15.5",
+ "indexmap 2.14.0",
+]
+
 [[package]]
 name = "phf"
 version = "0.13.1"
@@ -2544,7 +2676,7 @@ checksum = "092791278e026273c1b65bbdcfbba3a300f2994c896bd01ab01da613c29c46f1"
 dependencies = [
  "base64 0.22.1",
  "indexmap 2.14.0",
- "quick-xml",
+ "quick-xml 0.39.4",
  "serde",
  "time",
 ]
@@ -2690,12 +2822,33 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "pxfm"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
+
 [[package]]
 name = "qrcode"
 version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec"
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quick-xml"
+version = "0.37.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quick-xml"
 version = "0.39.4"
@@ -3419,7 +3572,7 @@ dependencies = [
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -3462,13 +3615,16 @@ dependencies = [
  "serde_json",
  "tauri",
  "tauri-build",
+ "tauri-plugin-clipboard-manager",
  "tauri-plugin-global-shortcut",
  "tauri-plugin-window-state",
+ "tauri-winrt-notification",
  "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tower",
  "tower-http",
+ "trash",
  "windows-sys 0.59.0",
  "winreg 0.52.0",
 ]
@@ -3521,7 +3677,7 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -3602,6 +3758,21 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "tauri-plugin-clipboard-manager"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206dc20af4ed210748ba945c2774e60fd0acd52b9a73a028402caf809e9b6ecf"
+dependencies = [
+ "arboard",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "tauri-plugin-global-shortcut"
 version = "2.3.1"
@@ -3654,7 +3825,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
 ]
 
 [[package]]
@@ -3679,7 +3850,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "wry",
 ]
 
@@ -3732,6 +3903,18 @@ dependencies = [
  "toml 1.1.2+spec-1.1.0",
 ]
 
+[[package]]
+name = "tauri-winrt-notification"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b1e66e07de489fe43a46678dd0b8df65e0c973909df1b60ba33874e297ba9b9"
+dependencies = [
+ "quick-xml 0.37.5",
+ "thiserror 2.0.18",
+ "windows 0.61.3",
+ "windows-version",
+]
+
 [[package]]
 name = "tendril"
 version = "0.5.0"
@@ -3782,6 +3965,20 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "tiff"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52"
+dependencies = [
+ "fax",
+ "flate2",
+ "half",
+ "quick-error",
+ "weezl",
+ "zune-jpeg",
+]
+
 [[package]]
 name = "time"
 version = "0.3.47"
@@ -4075,6 +4272,24 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "trash"
+version = "5.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7602e0c7d66ec2d92a8c917219fbc7894039efa2063b9064260110828a356f46"
+dependencies = [
+ "chrono",
+ "libc",
+ "log",
+ "objc2",
+ "objc2-foundation",
+ "once_cell",
+ "percent-encoding",
+ "scopeguard",
+ "urlencoding",
+ "windows 0.56.0",
+]
+
 [[package]]
 name = "tray-icon"
 version = "0.23.1"
@@ -4097,6 +4312,17 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "tree_magic_mini"
+version = "3.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
+dependencies = [
+ "memchr",
+ "nom",
+ "petgraph",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -4193,6 +4419,12 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "urlpattern"
 version = "0.3.0"
@@ -4406,6 +4638,76 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "wayland-backend"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
+dependencies = [
+ "bitflags 2.11.1",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "563a85523cade2429938e790815fd7319062103b9f4a2dc806e9b53b95982d8f"
+dependencies = [
+ "bitflags 2.11.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
+dependencies = [
+ "bitflags 2.11.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
+dependencies = [
+ "proc-macro2",
+ "quick-xml 0.39.4",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+dependencies = [
+ "pkg-config",
+]
+
 [[package]]
 name = "web-sys"
 version = "0.3.99"
@@ -4480,10 +4782,10 @@ checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
 ]
 
 [[package]]
@@ -4504,10 +4806,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
  "thiserror 2.0.18",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
 ]
 
+[[package]]
+name = "weezl"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -4554,6 +4862,16 @@ dependencies = [
  "windows-version",
 ]
 
+[[package]]
+name = "windows"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
+dependencies = [
+ "windows-core 0.56.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows"
 version = "0.61.3"
@@ -4576,14 +4894,26 @@ dependencies = [
  "windows-core 0.61.2",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
+dependencies = [
+ "windows-implement 0.56.0",
+ "windows-interface 0.56.0",
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
  "windows-link 0.1.3",
  "windows-result 0.3.4",
  "windows-strings 0.4.2",
@@ -4595,8 +4925,8 @@ version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.60.2",
+ "windows-interface 0.59.3",
  "windows-link 0.2.1",
  "windows-result 0.4.1",
  "windows-strings 0.5.1",
@@ -4613,6 +4943,17 @@ dependencies = [
  "windows-threading",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.60.2"
@@ -4624,6 +4965,17 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.59.3"
@@ -4657,6 +5009,15 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.3.4"
@@ -5137,6 +5498,24 @@ dependencies = [
  "wasmparser",
 ]
 
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"
+dependencies = [
+ "libc",
+ "log",
+ "os_pipe",
+ "rustix",
+ "thiserror 2.0.18",
+ "tree_magic_mini",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+]
+
 [[package]]
 name = "writeable"
 version = "0.6.3"
@@ -5181,7 +5560,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows",
+ "windows 0.61.3",
  "windows-core 0.61.2",
  "windows-version",
  "x11-dl",
@@ -5254,6 +5633,26 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.8.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "zerofrom"
 version = "0.1.8"
@@ -5313,3 +5712,18 @@ name = "zmij"
 version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+
+[[package]]
+name = "zune-core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
+dependencies = [
+ "zune-core",
+]
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index 423a633..0c8bf03 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -37,6 +37,18 @@ global-hotkey = "0.7"
 # match the one global-hotkey already pulls (no extra lockfile entry).
 windows-sys = { version = "0.59", features = ["Win32_UI_WindowsAndMessaging", "Win32_Foundation"] }
 tauri-plugin-window-state = "2"
+# System-clipboard access for the tray "Copy LAN URL" item. Used from Rust
+# (ClipboardExt in commands::copy_lan_url), so the write happens natively and
+# needs no DOM user-gesture — unlike navigator.clipboard, which a tray-menu
+# click can't satisfy.
+tauri-plugin-clipboard-manager = "2"
+# Native Windows toast for the one-time "still running in the tray" hint on the
+# first close-to-tray. We use this directly (not tauri-plugin-notification)
+# because the plugin only stamps the toast's AppUserModelID for installed apps
+# — our portable .exe runs from target/release, so the plugin leaves it as
+# PowerShell's identity. We register our own AUMID + icon (src/notify.rs) and
+# emit with it. Already in the tree transitively; pinning it as a direct dep.
+tauri-winrt-notification = "0.7"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 # Server runtime: filesystem watchers, config storage, registry probes.
@@ -84,6 +96,10 @@ mime_guess = "2"
 # inline. SVG scales without rasterisation and the encoded payload is
 # small (~256 bytes).
 qrcode = { version = "0.14", default-features = false, features = ["svg"] }
+# Sends parsed screenshots to the OS recycle bin (recoverable) when the
+# opt-in "delete after parse" setting is on — see server/screenshots.rs.
+# Recycle bin (not permanent unlink) so an accidental enable is undoable.
+trash = "5"
 # Detects the host's primary LAN IP (first non-loopback IPv4). Used by
 # pairing_qr to build the URL the QR encodes. Multi-NIC hosts can pick
 # the wrong interface (Hyper-V switch, WSL2 vNIC) — the pairing modal
diff --git a/apps/desktop/src-tauri/icons/128x128.png b/apps/desktop/src-tauri/icons/128x128.png
index af8f27caac7df6e249c5a95c858e6aa715b075c0..ded239b44a31da5ac08a482492d8f9eaa4cc02c5 100644
GIT binary patch
delta 2891
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

literal 442
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc4gQ`kjv*CsZ!Z}NGAIZf*dX3-&{D{5Ep|!K
z`}w)J=f_OzJC-sQ@HS*K#4taQVz|z*gYAGR!@5x+>><Ja<m?$GjSCklf#J>I>FVdQ
I&MBb@06I*E{Qv*}

diff --git a/apps/desktop/src-tauri/icons/128x128@2x.png b/apps/desktop/src-tauri/icons/128x128@2x.png
index 9daf2ad11f543c32efa3e3144b45a57a656ba655..6fb8871d14f4c0112a2dc982053c3548d0daa5ce 100644
GIT binary patch
literal 5636
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%0AkcL9CmfK!
za1hd*09kytpHZ$|9T2!G_m8dr5-ho-+D`U3@d;`;-DI2lS16=BDk366+#@77Z3d8e
zx*l?c{^nI}4*-NV8kXhwM+~BBUEF`n^sJeuw$i{XVjlwJd?=)W#7Beopf!p{AuYcE
zAq*JTIQ0`xzL^v^gb|r`LX;q%EW@T{IDpx-zb=*Z42(DfI{-Lu<vy1>OAoz`=xU8J
zsk8w2sI#xAD&H$k^%z8|cBn&8Gb<#6&k3G%lq?|bd(le;|CgrhNmo)Le&)@Hy&~eY
z017U3wXa~mT3HjSbt=dzHY&iLH3sY6cHg4}J^KA|pr@;=YkrV=D;Lz%RygTTNT<xi
z?YfCkNgI3ncL`mhdzEp(Vs(~Y?obwg-sEVwoN01oICS#`Ohy8{5hucynCLZ<WO?(+
zv8k!4mCXe{+iT#=sUvz2^>8PUcV9y2F~$r6>}Tp|Z?6((hCaFVJs;uuAPZ(bQ!K5n
zM^0r3g(Y+O{54Gug9GWRJ}(0&-$qix4tBW0sr@w`(N#VQUdMsmn6Z!nCt;2>rbD!z
z-IQjc5U|d(n0R6vG2tQ3JXxd5;H;~oQyMKP*Z2!2=RZaATN(L?DG}`s`7lciQq|8w
zfhQjiW*V=ybUGp-Uvlr(>$mb=VqpSus3^zMg>koWES?Syv?Sfmvg0Pa9h}aUtus=9
z)!*69)UAiBqX*XV43PQ9k?G<G9R(dHHos-j$tC|)cSWmtvnBxIP0QfU6+Rco%-F!b
zEV?NbRt0VCy(vu0^0s#>a-CX>VVJa%Vxztggo1{<k3D8z{%psZLT#LRg<X|XqfW-^
zK!%W|t{kMEq2L815Ca+ZVOSK@W>uO;tVgC{ZrBHm-g`gP$09^}4WCS`5_VS<6jV~h
zlu4;Fl7}}INvF$hsTXWHTo25WAfCIOVXQ^JugV_!tSj@Om800U3*+hSTyapX!=uT2
zHx<=zyY}LSGWC0qMjRUQx-&SbQhktS9}#HvJ?%}U`h?;6V22~DCEM`Q_Y-H1Aq{}O
MwlTi+3L)(O0Q-Y~v;Y7A

literal 906
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;Kn_c~qpu?a
z!^VE@KZ&eBK4*bPWHAE+-(e7DJf6QIg@J)t-qXb~q$2L^6+=M=1%U$_#QP0e3fZm2
xW+{5JmVC1k&zNP;Aj`&(IEqF?U<8H$f4jQDrjCTgUcmgr;OXk;vd$@?2>^QvijM#Q

diff --git a/apps/desktop/src-tauri/icons/32x32.png b/apps/desktop/src-tauri/icons/32x32.png
index 3da39f76aa025ac865b0d6de3fdbaca6f71f7f5f..3db151689ddc80f9e3a0123c69e8dd7c31c3c7a2 100644
GIT binary patch
delta 665
zcmV;K0%rZ50k8#-BYy&SNkl<Zc-qBRF>ljA6n=MhBugRCrGceYBbA9(L;{t8g|fBk
z&e*VZXczb$MM&)rNJsXHZZI)`KuQEm45cu&T@WEsr6j(-@71=fHnw}gi9gA`)VlZH
z_wL?(&*xGMl}csZ7}MaNbsncEf3&pLuRER2Uid=c&lIEA>wmpRV44hCrBZ464?`Ca
z9H<8|$zg2p*r3Vdj^}wts$4D~@;`G_3|b&ys6e>32CD3lnwuuIFw0|A-kF~#WWN34
z@sv#W%+jC53OLUmljbJ^2NncG0RPPg8t{`V0ad$A&gKe_Rr2@0kook3e9kxyjTKqC
zOM2}AnZpwr?0+8cc>Mna5Zv8fCp!I0gPpfm0$&D*I9sbk(>JOAaxaraCINT5LF$G_
z{TIz^?=R}aebpfI?~F+_(+OwoIhGxn+Y}e(!UncZyk=|&APW>6_B?CZhXFRQg%9|$
zCr}HH7#G~A2yH`Ob_DLtM42QSFE7ZGwhD1yRzig8kAKeju;5P@<!D|^R^-3?I(#Dg
z5MQGxp~*p{vwS2H!1>in^U2E_%Q!LnVE_G;I!Y$+{dXiRNp+AGIJAxXvMNHzsbs+N
zIx0fj(3c$n785iUXnUB64PXOX_(&76R3((I##JnhC`C+$iI|)aw$18{I?Gvq=YXhs
zOB&L3R(}F>q<OK8*yh!a-K`br`~LoCG9S4eUn(rkVxu0R9Y2)J5j>Z6oc2Ky6>4qF
zA0$^k$v7b7HB>lcilYWXWBnu>2T+9V0^_$qpjlY<d{30SA#X#Ahx?PxzT55AMF;qz
z_+-Lc(GFr>2oY|n!ba=oV<yr@48%fAyg3J?))E!4dd4|100000NkvXXu0mjf6HPp<

delta 130
zcmdnMI*)OJay0{Eage(c!@6@aFBupZSkfJR9T^xl_H+M9WCij$3p^r=85sBugD~Uq
z{1qucL1RxB$B+p3x91k}GB|J?aA-?6VEg^#BM-wf7vHO{Pk&E8Ds!6=s16C3bj<y;
T^$qW9F_4(2tDnm{r-UW|2N@^}

diff --git a/apps/desktop/src-tauri/icons/64x64.png b/apps/desktop/src-tauri/icons/64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..e79f74b6a740521555272865ab79b168166108cd
GIT binary patch
literal 1498
zcmV<01tt24P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000G{Nkl<Zc-rM#
zJ!~9B6n?Y2_MPr*VhWtf!IqLLMmVx%q@+j)RS*cfAPEu@2Q^eFNE1Q2P(&0^hq#Jq
zz$geRk~EP*6ck4oDN>MZpu#j4TSnNv+vR<e-Sw>R&z}9e+kMhXzO%hE@0;(vdGp>p
zi`vN0(9r1i_V!ysh*OT^Oz>Bu)ElzMb6(*&-|6e?`>tB8uC)3?(MIu4_{R!mL#{Ir
zmzx360KnkjV1<$UoSz}ekT4^v{Jg)uzP_M-Z|+v!w(YO@$0B7<ioB@ji^bv}TU%R;
z4Gd6}&%79hG3zlwxHdn*Hvf=vA}|NbvW~$gNE6@>H+sm!M`8}l_UC!g7sSB80JgZ>
zltba2Va#IXE0j}V2F#d+LLsYOe=ojZ)5_X@zaL@UUliqX*`XYZmG~ZfbmZ9&!v{$4
zBUfVeDG?qP`?tTc1%N0QNlYImWBLe*@k2!ALfgMLH#W&x`jhPYPsq9dJ2@Nw#XP^5
zOaO`-Z%pzt)lun|!eH3nKj7z=*no%y0Q205){6hL=2PBrX)jH|Gl>_TYY9aC>$}|z
z09M`n@C=Dpjs$<PvP$;tC9;2h;w#<q9SnlO|8KlH&avrm&};Mm*T4KRQZ_^e048pJ
zJWFD1II!ASHT%}DdJgmSOOj10E1cz3s(<!vM<5dg0LoieD*?*GZtK^6ipHcqcuo2f
z)g)>cu15lb+27y)X=vJCdfVU9AfT!J&AsRXmWRudP1s4K^jjp39wO)NV~%HQ;kM<_
z2*TzS+Se}3X;Z$P;GKB44?K^Fu|vltVZFWT@T7xU{yV<VmEVmqd=PkS^UbMr0C={~
zPX%l~j+Jl51dQb?aQ1|pOX2`Xr{p<3c>9PP-d;qG#bZk0IRqSJ5&-O8{Wt=Yjvy#w
zVlKKY&;tN=@2x(9oCK)f%oH%T$AX67D^39X?FbX$2rn&B$M#Q|i7-GJ4B>5R04(hs
zoyBxQ3^3Fqt#`0VE2D!gS9OM%Tax(zUFD?{J$KwUB~V${kzx*_*$FZ>0F;oIGyyQ=
zad|TEnHUtUt(4CNzG&nf_H6<x+PVyoN8JX;dRX5Kyt(Z<K6hnKuw_wRh*YMsZw5G?
z)A2GnI^O%{gXa6X4whpFcjo5B1+g+frM)Hq(&51oy1@&S*N!GtyI1`|5+)GF`@-Qx
zaefFh2Q3q@Ib}`%ZZ_ohQ*kArzc)V5NzN^aNYGItFhes2kHmqEj|38?iG{)_TKKDQ
zYCJs#C}ZnZl=K(?v|TemY6{ug#8;ok^iy#>mqZzWyu7-VnP-nD4uCo)=Av6G(9Q_S
zw3Oluk-APyd5onxKP5$$7yyz5fvn7ABBp>b)N=&p5T;TTDl1$E^|*o?Opzaqb=y-@
z;SNrbO`^&~>jL#Je%MJ(A+oyqUMx(&JMnH(>W%elx6-c+p)!NYja0hN@>6DlLsVJO
ziNxklllkt+oiEt#YnSH9scv*van!mv8?5N^xj`03HS>lzHp}9u8g25**RFI~aWqgT
z{OEOgBP4icUzPTXV5L*#2zHJHr(op+m1fW8nf6^-9uH8K%T+SVQz|q)P0H27RT$TI
z$V3KG+wMh)2EkUxObYAp(zzmo+FeQWiVPIL*@IVP8ZJrU#)rHlHPRUjH>{QBf*U2h
zdP%BnTHUMWxDHdAf}70HInwqN0No}CgdXKs|3?P8tMaNnbT`miM)|!geMh)0a?6y{
zh6%&%rJKv4{&UdXYnmFZ)oP1Oi32&Y{ioa~H30zRaabZDL?uVgui|x)`i+y^O!yd0
zh0KDPjQ0$pdvv~O=O{WV83e=yXR_8u1lqIm@2JW*0N^p9R4UD*uZ}-XWX0jJ$3MTe
zwsvn%-QyJOBA;>F=STUgmwP3`Q`+Yj+O^OB4|uMP&p!r6ng9R*07*qoM6N<$f`by^
ARR910

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square107x107Logo.png b/apps/desktop/src-tauri/icons/Square107x107Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9de791179a26280978bbd6f1c509d7cd1d38a1ed
GIT binary patch
literal 2335
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
FV1o80SLpx%

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square142x142Logo.png b/apps/desktop/src-tauri/icons/Square142x142Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a7821805e0942119bf22c973619887f80a30f76
GIT binary patch
literal 3142
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

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square150x150Logo.png b/apps/desktop/src-tauri/icons/Square150x150Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f359d41a0028792bea608ddfe513dcad719f6c4
GIT binary patch
literal 3496
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
W!Rc+IrGV`K0000<MNUMnLSTZ{wYHQ1

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square284x284Logo.png b/apps/desktop/src-tauri/icons/Square284x284Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf5f70f538d7ff9d1518fcf5c9b7ff2b84619549
GIT binary patch
literal 6069
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

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square30x30Logo.png b/apps/desktop/src-tauri/icons/Square30x30Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..63a368380a8f78d3d81400773ca29b5933d373b3
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0007fNkl<Zc-qC6
zF=!M)6o%jIEJwUMa%nDyg5j<ZktkS%Af&lm7g5kIt=5W#g;t_g+6gvRnsjyvB*gC0
zOF%)dO5x=!jGMx{z{v@_H~w#SgQ%Hd_p;eMSlFH2H{ZN@Z~mEeDY6Ne@B8;~TUSce
zDP3y|Ay!@2ebR+-gNUG)0o?>}f{xJu?*cv#_D2C|70?gI4gCjRldu<fzCzjA7=k<{
zipAoOtfKuZ=Y>K+(FvHF<YRelhQ#z)617R9$x_(p^+<j3NVUFFu)Y;P*Kr~iwF=2Q
z3mV7(^|?c8Z$Erj9w%{eN)Lz!5IkQYg~1#d>@+TsywxDu>yiKR9XkJR9GrW1fv8-f
z;7yZ;%}=9)b!Sf(Nxk0&bR$L-V<c}kNX(ui|NfFSa>treOm7(JMy$N4{(yqlP3<Ee
z+_Zjc1k39)I;T9nNsQs_!@k@{Vz8K=3Jb}QQ!5-k?8|*52Up9wdX0{#WWLOB4}~^9
zLXNRc50=bfP>G`B%LG?#FI?|w2uL={g=mFgs)n3`M{ob!ADSvei>MP%HRniJa>&4;
zr3SRhdHW-PTb)RkE6Mj<_-F}jb&`XFwJkkWT11jSS-sc?zPgW5l*@m%LZVWF249U2
zWyypO`&v~om&-jizU}`a>i#4L3gpaPAhrDs&wcX_2ALG+&uH1SX+ZpK5o_9g2<=6s
z>MfBKE!qJ1ovsBgL`*M7n##8LpMFCIwJ;nkH7vXEAkeYq^hn?|jf-pN1h_j6pYXG$
zGE+pqE^QofOBq3XIM7!e{+Gc`of|TO)|n}}VK5l%=JWYie8R`$Y5tu`JEwpy19}6@
bHn;o+a!nNx=wq^D00000NkvXXu0mjfw8%f8

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square310x310Logo.png b/apps/desktop/src-tauri/icons/Square310x310Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba05c640ecfac33fe6a3a5e65421d6fdaffcd442
GIT binary patch
literal 6832
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

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square44x44Logo.png b/apps/desktop/src-tauri/icons/Square44x44Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..faed520396c77a2a5f64fa27dcfa9b489b4a53c1
GIT binary patch
literal 1003
zcmV<H0~Gv;P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}000BBNkl<Zc-qxj
zO=}ZT6uoaIO-fT}R}};$1uKXZDvE9dwXQ4`{0FwK6~vXU>@N_dUH9W36qLGZjo?BH
zqF_a^LW-i&3X&R9+O(PHJufrUm^96s<RzJ0D9N<xos%=?-FxnP5h{t^-rmIC-rg-K
z<xRdEq85Y@BFQhwNF*|sPN&!Y`&;ovcX#(A20B3@2?m}9o@_Szv<z@O9-rZtF$!nQ
zGU#!<v0Y}t>OBf?3`L{S&E4JIHv*dFHz^8vKpw2=ew*V-s}@(l=wv<b*s)j)+U;xu
zz+hPjUTl)uC?ZA~=s!ZDD@xSYQ~1TkCdsWF$<%sy09%8{$+|j7;=%ye#@N9h%I=U{
zUM1({3OOs^>LaCANeE`qzH^-f1NLK!fu%M|Snnh1+W#Vw0q3V)kYx6o2H3hdz+gvw
zMxE#H6nm8(J)~lfo+H6e!ecx?wLs3>)y4z1hR-Nw6<f<+DL=ia&6av9x395$PN-`z
z?JRu^1lZ;dG7*T``!{@6^OFmTE$!gXI<G%7OPwT69wiI9U)v!0<BvXJ!8ALv50;s&
zHSoX4p%~+w!mBDK0V^4>W<43y8%j!?3pwraVY7fyy1Z&&0&Fp8_4HV3R&lkd8?d{&
zB`QIU<>;V5F61n}hY`T4DS#1IcP7KjDNY|V0~j?_)mzmR){O&JIXO4lxw==qty#Fu
zp|pb?TBqGbl%HABs<X%qhH)=hw<H3T992yK7GE;p>MzV`vF5t9vawc}x0lr!4p<fP
z(@O<S@{f8SBs98aRfeUTL?rsO?g`BX^#@*VsR7v1Ud600omE_mpH|xa{a33BY1Lur
z+CW%D<AA-Uq-pH606T6sf}a%ut41|L<#}Z99%caZx0j#3@0Tq@;pKt}a!fL;RzJKi
zYZ*obCcJL2F!G$MP)!yaVBoQW*=SprPAT)Py3+epjbMk#8a-bi;_)+*Uw$@b;!u+T
zuVzdNYGUAWBv*fFPaV)~gbh2|w?88B1k#)#^zMj14Z|YBb!iWwkile=hR{j_rN94B
z0@`<b-ct%VxEcdowvmDb)K$T}peb+_Xz4~u#jPsWsrig&&HCuJ+YGdL1M^k8fCW}G
zj%2$4<_+z6;U05+;ESG+v%ASh1_^t6dppg|13U0nLQe3*OeT|5r%1V6F3F(#DZFPL
zbA0Uez(4jv@JZ4<pLgIC;VgyZ%mXq2vmV$3$3$1tV~_~z`f{tP0Tx(CN5?E5-KLBG
Z_z#7fpm==lVX*)J002ovPDHLkV1j88)2{#k

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square71x71Logo.png b/apps/desktop/src-tauri/icons/Square71x71Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4c3db2c456c7ef68be7823e5e8c87bec9a5b508
GIT binary patch
literal 1546
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

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/Square89x89Logo.png b/apps/desktop/src-tauri/icons/Square89x89Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..fec0e264ace877eed9f62a666940762de5c44ae6
GIT binary patch
literal 1960
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

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/StoreLogo.png b/apps/desktop/src-tauri/icons/StoreLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a52b383dcfdda107dd75a41c7f83afb981910507
GIT binary patch
literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&000CwNkl<Zc-q}s
zJxmlq6n?X}9E2l!7N8aoC`e4esL`m==D@_n#KuM`4Gk0~YGvh5w9(GOLK*{=KLuEj
zSP5r=QKA7NBqo?}(Mo6z6Nq?wyS_I&v$yA+mziY`Zto?Rojs2C=9~BC{mqzAhLXu-
zr)62!ad^~moD|dmF~-vPNSmfPmd$1}C4c`1KoSAm#mV1*+NRNlhK8F6C|d%Aw2;f?
zCP)hq4Vp(VeG&|lnm`b9IP8RIkq0J5Z)kVV@o^fWM+a=%K8Q+q&01PoQn)9kA;N@O
z>59eU@y9qm6lEZ&h;^1oBpir1p=*9;LVeJYssdq&CSaYduKF`;;B5S^mT4tJ1;V=a
zgVEOmtfvFVZRLfotb()j9qj2P9RCb)(L&fGMsEigm(Kvhr`Ad?BA{3A!N%vV0wL3h
z4fX@;>n(h__RF2%>@vW{7MjzR_-!KqevFgdz)p1oG&dFiO)o<J+0?d7FE9`e;{HIv
zgb+af<qX(UU(~eNe;8s{&H}XV@k}m%=S5&Jfq)PQ^XU*@VIq6-Gp^{{Kof`!o&)3J
zarXtaXAO@80z(1uULZ}h?d9+JCvU(W{}9~c%&l;3lF32b1a_<ooSClxIjg!r%;ED~
zm<K}9lq!Njvyx!gz6Ag9J*MMubiI?@*kn#&fRIGIh$q)N$}luNpdJu(vEIfGxF;$R
z=ZU<FWQ7fcf}M;L<ejQTk~hgBnV|zQWUScS3e}{_nHb3^k{PN-dfMHM`EePlO;U!G
z8M0})flu3;;A9Mq3HfFGFJCL`O;uxuM<V4=Vt(tAn~o45TxILggxWv)WRPr?0BPuG
zgR5N;2zS*21m}TcRhR0Qp{kX7DXi2q!XvMz>P9s?#|+q+{Z`<CW7TxsFT*c;+Zrjd
zQAHp`*28hnoV02VKM=(PQa!R~+?C<UosI{h+C;N(@?>OI!*{>-;tyBtnm_{87D9%U
z87>g4;-uQCD5~0~CEl{mkut*sLX84v$z7qCW<sY`R|wuDOQ$)ZmHpZ>S;V4>D!b4@
z5KmFC*_w%|p}TP%p>8Tq!!$ACB}-nCq3s~_YlbP$o5ZeN2n7spL?AEeskn?CYd(w&
zc`Y4#@>3w;t~vFiCQf)If;AMZ`LL~akojN$kA_4pw7TxLgA_dt)f&7VB=!Vp!n(b~
z?VyScI%>*c8g5fffs=AJ|G2+xj-y*`0t1sr9w!nt(x5A8nd0g)&ANkJEP1D0Z<&^F
zVp9jCy<l=>QXPueWP&x<#IAU(AnFO;g|E`FLe+u5&Yf7T8+2?{2X)mv1;lh607)}(
z<6#9Nemrf63o2s~#=$Sy7y=PpqFIO_hy^isH)*819QZ{lVqgeFN?xk*vR@yVD45xp
zA4JK0EhxTtb`^&yartcTZpR67vEt&{Xt|4Le*q?2-mmlvUYGy?002ovPDHLkV1hPK
B5J~_5

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/icon.icns b/apps/desktop/src-tauri/icons/icon.icns
new file mode 100644
index 0000000000000000000000000000000000000000..6412fbbcb7b699df719805a3e541f833d74d895a
GIT binary patch
literal 67920
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

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/icons/icon.ico b/apps/desktop/src-tauri/icons/icon.ico
index 99081b364c87ce4038ea937aa12574069a3630a6..dec9d49bdbc312afd338766d3cd50032393ea6d4 100644
GIT binary patch
literal 11426
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
F|1U=$*r)&i

literal 41086
zcmeIuF%iQs3<c2NUI26|hC&MrkAV>=X68!iS^~LymL*y8_L4_M@~TYsGkI74^w8^P
zx2>n-yy~AalDZk=*Q(aDa%9d~AM3hVt6!BBy{d9J1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfWQ%l009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
I5V*a-7dQACF#rGn

diff --git a/apps/desktop/src-tauri/icons/icon.png b/apps/desktop/src-tauri/icons/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3404821e21e1317a62f9625e69283f81a668d57a
GIT binary patch
literal 11575
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
Y?K@r!?4JLt#=wcAr;p?uBHsJ|0B)k6c>n+a

literal 0
HcmV?d00001

diff --git a/apps/desktop/src-tauri/src/commands.rs b/apps/desktop/src-tauri/src/commands.rs
index 414ac28..8bec51f 100644
--- a/apps/desktop/src-tauri/src/commands.rs
+++ b/apps/desktop/src-tauri/src/commands.rs
@@ -5,36 +5,46 @@ use std::sync::Arc;
 use serde::Serialize;
 use tauri::{AppHandle, State};
 
+use crate::hotkeys::HotkeyController;
 #[cfg(not(debug_assertions))]
 use crate::http_server::LISTEN_PORT;
-use crate::hotkeys::HotkeyController;
 use crate::lan::detect_lan_ip;
 use crate::server::config::{ConfigPatch, ConfigStore};
 use crate::server::events::ServerEvent;
 use crate::server::hotkeys::{HotkeyConfig, HotkeyPatch, HotkeyStore};
-use crate::server::paths::{self, ResolvedPaths};
+use crate::server::paths::{self, ConfigResponse};
 use crate::watcher::WatcherSlot;
 
 /// Returns the same shape as the old `GET /api/config`.
 #[tauri::command]
-pub async fn get_config(store: State<'_, Arc<ConfigStore>>) -> Result<ResolvedPaths, String> {
+pub async fn get_config(store: State<'_, Arc<ConfigStore>>) -> Result<ConfigResponse, String> {
     let overrides = store.overrides().await;
-    Ok(paths::resolve(&overrides))
+    Ok(ConfigResponse {
+        paths: paths::resolve(&overrides),
+        delete_screenshots: store.delete_screenshots().await,
+    })
 }
 
 /// `PUT /api/config` analogue. Persists the patch then re-resolves +
-/// re-applies the watcher to honour the new path.
+/// re-applies the watcher to honour the new path / delete-screenshots flag.
 #[tauri::command]
 pub async fn update_config(
     app: AppHandle,
     patch: ConfigPatch,
     store: State<'_, Arc<ConfigStore>>,
     slot: State<'_, Arc<WatcherSlot>>,
-) -> Result<ResolvedPaths, String> {
+) -> Result<ConfigResponse, String> {
     store.apply(patch).await.map_err(|e| e.to_string())?;
+    let delete_screenshots = store.delete_screenshots().await;
+    // Push the new flag to the slot BEFORE re-applying, so the restarted
+    // screenshot watcher clones the up-to-date value.
+    slot.set_delete_screenshots(delete_screenshots);
     let resolved = paths::resolve(&store.overrides().await);
     crate::watcher::apply_resolved(Some(&app), slot.inner(), &resolved).await;
-    Ok(resolved)
+    Ok(ConfigResponse {
+        paths: resolved,
+        delete_screenshots,
+    })
 }
 
 /// `GET /api/hotkeys` analogue — the backend-owned combos.
@@ -60,13 +70,16 @@ pub async fn update_hotkeys(
         .await
         .unwrap_or_else(|_| merged.clone());
     if effective != merged {
-        store.set(effective.clone()).await.map_err(|e| e.to_string())?;
+        store
+            .set(effective.clone())
+            .await
+            .map_err(|e| e.to_string())?;
     }
     // Tell the other clients (browser/phone over SSE) the config changed —
     // `event_sender()` is the same broadcast channel the /events stream serves.
-    let _ = slot
-        .event_sender()
-        .send(ServerEvent::Hotkeys { config: effective.clone() });
+    let _ = slot.event_sender().send(ServerEvent::Hotkeys {
+        config: effective.clone(),
+    });
     Ok(effective)
 }
 
@@ -104,6 +117,19 @@ pub struct PairingQr {
     pub svg: String,
 }
 
+/// Builds the helper's LAN URL (`http://<lan-ip>:<port>/`). Dev serves the
+/// SPA from Vite on :5173; release serves it from the embedded helper on
+/// :47474. Errors with "no LAN IP found" when the host has no non-loopback
+/// IPv4. Shared by `pairing_qr` and `copy_lan_url`.
+fn lan_url() -> Result<String, String> {
+    let ip = detect_lan_ip().ok_or_else(|| "no LAN IP found".to_string())?;
+    #[cfg(debug_assertions)]
+    let port: u16 = 5173;
+    #[cfg(not(debug_assertions))]
+    let port = LISTEN_PORT;
+    Ok(format!("http://{ip}:{port}/"))
+}
+
 /// Builds the LAN URL of the helper plus an inline SVG QR for it.
 /// Called by `PairingModal.vue` on every open so the URL is fresh each
 /// time (LAN IP can change if the user switched Wi-Fi).
@@ -114,13 +140,7 @@ pub struct PairingQr {
 ///   URLs, but surfaced rather than panicked just in case)
 #[tauri::command]
 pub async fn pairing_qr() -> Result<PairingQr, String> {
-    let ip = detect_lan_ip().ok_or_else(|| "no LAN IP found".to_string())?;
-    // Dev: Vite serves the SPA on :5173. Release: helper serves it on :47474.
-    #[cfg(debug_assertions)]
-    let port: u16 = 5173;
-    #[cfg(not(debug_assertions))]
-    let port = LISTEN_PORT;
-    let url = format!("http://{ip}:{port}/");
+    let url = lan_url()?;
     let code = qrcode::QrCode::new(url.as_bytes()).map_err(|e| e.to_string())?;
     let svg = code
         .render::<qrcode::render::svg::Color>()
@@ -128,3 +148,28 @@ pub async fn pairing_qr() -> Result<PairingQr, String> {
         .build();
     Ok(PairingQr { url, svg })
 }
+
+/// Copies the helper's LAN URL to the system clipboard and returns it.
+/// Driven by the tray "Copy LAN URL" item: a native clipboard write that
+/// works without a DOM user-gesture (tray-menu clicks don't grant one, so
+/// `navigator.clipboard` from the webview would be rejected).
+#[tauri::command]
+pub async fn copy_lan_url(app: AppHandle) -> Result<String, String> {
+    use tauri_plugin_clipboard_manager::ClipboardExt;
+    let url = lan_url()?;
+    app.clipboard()
+        .write_text(url.clone())
+        .map_err(|e| e.to_string())?;
+    Ok(url)
+}
+
+/// Shows a native OS notification. Driven once by `useCloseConfirm` on the
+/// first close-to-tray to tell the user the app keeps running in the tray
+/// rather than quitting. Sent from Rust because the window is already hidden
+/// by then, so an in-app toast would no longer be visible. Strings are passed
+/// in pre-localised by the webview. The toast is attributed to this app's
+/// registered AUMID (name + favicon) — see `notify::register_aumid`.
+#[tauri::command]
+pub async fn notify_tray_hint(app: AppHandle, title: String, body: String) -> Result<(), String> {
+    crate::notify::show_toast(&app, &title, &body)
+}
diff --git a/apps/desktop/src-tauri/src/http_server.rs b/apps/desktop/src-tauri/src/http_server.rs
index dcf6a8a..afd894f 100644
--- a/apps/desktop/src-tauri/src/http_server.rs
+++ b/apps/desktop/src-tauri/src/http_server.rs
@@ -5,6 +5,8 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::Duration;
 
+#[cfg(not(debug_assertions))]
+use axum::http::Uri;
 use axum::{
     extract::State,
     http::{header, HeaderValue, Method, StatusCode},
@@ -15,8 +17,6 @@ use axum::{
     routing::{get, post},
     Extension, Router,
 };
-#[cfg(not(debug_assertions))]
-use axum::http::Uri;
 use futures_util::stream::{Stream, StreamExt};
 use serde::Serialize;
 use tauri::AppHandle;
@@ -28,7 +28,7 @@ use crate::hotkeys::HotkeyController;
 use crate::server::config::{ConfigPatch, ConfigStore};
 use crate::server::events::ServerEvent;
 use crate::server::hotkeys::{HotkeyConfig, HotkeyPatch, HotkeyStore};
-use crate::server::paths::{self, ResolvedPaths};
+use crate::server::paths::{self, ConfigResponse};
 use crate::watcher::{self, WatcherSlot};
 
 pub const LISTEN_PORT: u16 = 47474;
@@ -97,9 +97,12 @@ struct ConfigError {
 /// plus the `source` and `exists` flags per slot. Same JSON the Tauri
 /// `get_config` IPC command returns, so a browser frontend reads the
 /// same shape as the webview.
-async fn get_config_http(State(state): State<AppState>) -> Json<ResolvedPaths> {
+async fn get_config_http(State(state): State<AppState>) -> Json<ConfigResponse> {
     let overrides = state.config_store.overrides().await;
-    Json(paths::resolve(&overrides))
+    Json(ConfigResponse {
+        paths: paths::resolve(&overrides),
+        delete_screenshots: state.config_store.delete_screenshots().await,
+    })
 }
 
 /// `GET /events` — Server-Sent Events stream of `ServerEvent`s. One JSON
@@ -148,7 +151,7 @@ async fn put_config_http(
     State(state): State<AppState>,
     Extension(app): Extension<Option<AppHandle>>,
     Json(patch): Json<ConfigPatch>,
-) -> Result<Json<ResolvedPaths>, (StatusCode, Json<ConfigError>)> {
+) -> Result<Json<ConfigResponse>, (StatusCode, Json<ConfigError>)> {
     state.config_store.apply(patch).await.map_err(|e| {
         (
             StatusCode::BAD_REQUEST,
@@ -157,9 +160,17 @@ async fn put_config_http(
             }),
         )
     })?;
+    let delete_screenshots = state.config_store.delete_screenshots().await;
+    // Update the slot before re-applying so the restarted watcher sees it.
+    state
+        .watcher_slot
+        .set_delete_screenshots(delete_screenshots);
     let resolved = paths::resolve(&state.config_store.overrides().await);
     watcher::apply_resolved(app.as_ref(), &state.watcher_slot, &resolved).await;
-    Ok(Json(resolved))
+    Ok(Json(ConfigResponse {
+        paths: resolved,
+        delete_screenshots,
+    }))
 }
 
 /// `GET /api/hotkeys` — the backend-owned combos. Same JSON the Tauri
@@ -176,9 +187,11 @@ async fn put_hotkeys_http(
     State(state): State<AppState>,
     Json(patch): Json<HotkeyPatch>,
 ) -> Result<Json<HotkeyConfig>, (StatusCode, Json<ConfigError>)> {
-    let merged = state.hotkey_store.apply(patch).await.map_err(|error| {
-        (StatusCode::BAD_REQUEST, Json(ConfigError { error }))
-    })?;
+    let merged = state
+        .hotkey_store
+        .apply(patch)
+        .await
+        .map_err(|error| (StatusCode::BAD_REQUEST, Json(ConfigError { error })))?;
 
     // Registration blocks (round-trips to the main / pump thread); keep it off
     // the async worker.
@@ -195,7 +208,9 @@ async fn put_hotkeys_http(
         }
     }
     // Notify the other clients (browser/phone over SSE) so their view re-syncs.
-    let _ = state.event_tx.send(ServerEvent::Hotkeys { config: effective.clone() });
+    let _ = state.event_tx.send(ServerEvent::Hotkeys {
+        config: effective.clone(),
+    });
     Ok(Json(effective))
 }
 
@@ -542,6 +557,9 @@ mod tests {
                     .header(header::ORIGIN, "http://localhost:5173")
                     .header("access-control-request-method", "PUT")
                     .header("access-control-request-headers", "content-type")
+                    // Chrome sends this on public→private preflights; the
+                    // allow header below is only emitted in response to it.
+                    .header("access-control-request-private-network", "true")
                     .body(Body::empty())
                     .unwrap(),
             )
diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
index 8a653b4..0e48ea6 100644
--- a/apps/desktop/src-tauri/src/lib.rs
+++ b/apps/desktop/src-tauri/src/lib.rs
@@ -2,6 +2,7 @@ mod commands;
 mod hotkeys;
 mod http_server;
 mod lan;
+mod notify;
 mod server;
 mod watcher;
 
@@ -74,6 +75,7 @@ pub fn run() {
     tauri::Builder::default()
         .plugin(shortcut_plugin)
         .plugin(tauri_plugin_window_state::Builder::default().build())
+        .plugin(tauri_plugin_clipboard_manager::init())
         .invoke_handler(tauri::generate_handler![
             commands::get_config,
             commands::update_config,
@@ -82,10 +84,16 @@ pub fn run() {
             commands::suspend_hotkeys,
             commands::resume_hotkeys,
             commands::pairing_qr,
+            commands::copy_lan_url,
+            commands::notify_tray_hint,
         ])
         .setup(move |app| {
             let app_handle = app.handle().clone();
 
+            // Register our AppUserModelID (name + favicon) so the tray-hint
+            // toast is attributed to this app instead of PowerShell.
+            notify::register_aumid(&app_handle, &data_dir);
+
             // Block-on the async load — we want the config ready before
             // the webview starts running its onMounted hooks. Tiny JSON;
             // this is in the millisecond range.
@@ -96,8 +104,13 @@ pub fn run() {
             // Reuse the up-front broadcast sender so hotkey `Command` events
             // and watcher events share one stream.
             let slot = Arc::new(WatcherSlot::with_sender(event_tx.clone()));
+            slot.set_delete_screenshots(tauri::async_runtime::block_on(store.delete_screenshots()));
             let resolved = paths::resolve(&tauri::async_runtime::block_on(store.overrides()));
-            tauri::async_runtime::block_on(watcher::apply_resolved(Some(&app_handle), &slot, &resolved));
+            tauri::async_runtime::block_on(watcher::apply_resolved(
+                Some(&app_handle),
+                &slot,
+                &resolved,
+            ));
 
             // Hotkey controller shares the same id→action map the plugin
             // handler reads, so a PUT re-registration keeps them in lockstep.
@@ -166,6 +179,7 @@ pub fn run_headless() {
         // One broadcast stream shared by the watchers and the hotkey thread.
         let event_tx = events::channel();
         let slot = Arc::new(WatcherSlot::with_sender(event_tx.clone()));
+        slot.set_delete_screenshots(store.delete_screenshots().await);
         let resolved = paths::resolve(&store.overrides().await);
         watcher::apply_resolved(None, &slot, &resolved).await;
 
@@ -192,9 +206,15 @@ pub fn run_headless() {
 fn clamp_window_to_monitor(window: &tauri::WebviewWindow) {
     const MIN_OVERLAP: i32 = 48;
 
-    let Ok(pos) = window.outer_position() else { return };
-    let Ok(size) = window.outer_size() else { return };
-    let Ok(monitors) = window.available_monitors() else { return };
+    let Ok(pos) = window.outer_position() else {
+        return;
+    };
+    let Ok(size) = window.outer_size() else {
+        return;
+    };
+    let Ok(monitors) = window.available_monitors() else {
+        return;
+    };
 
     if monitors.is_empty() {
         return;
diff --git a/apps/desktop/src-tauri/src/notify.rs b/apps/desktop/src-tauri/src/notify.rs
new file mode 100644
index 0000000..329cc86
--- /dev/null
+++ b/apps/desktop/src-tauri/src/notify.rs
@@ -0,0 +1,71 @@
+//! Windows toast notifications attributed to this app (its name + icon)
+//! rather than PowerShell.
+//!
+//! `tauri-plugin-notification` only stamps the toast's AppUserModelID when the
+//! exe runs from somewhere other than `target/{debug,release}`. Our portable
+//! .exe ships straight out of `target/release` (and dev runs from
+//! `target/debug`), so the plugin always skips it and notify-rust falls back
+//! to its PowerShell identity — which is what shows up as the toast's author.
+//!
+//! We sidestep that by registering our OWN AppUserModelID in HKCU (with a
+//! DisplayName + IconUri) and emitting the toast through
+//! `tauri-winrt-notification` with that id. No installer / Start-Menu shortcut
+//! required, so it works for the portable build.
+
+use std::path::{Path, PathBuf};
+
+use tauri::AppHandle;
+use tauri_winrt_notification::Toast;
+
+// The app mark — the same one the browser build shows — baked in at compile
+// time from icons/128x128.png (regenerated from favicon.svg via `tauri icon`).
+// Written to disk on launch so the AUMID's IconUri can point at a real file.
+const ICON_BYTES: &[u8] = include_bytes!("../icons/128x128.png");
+
+/// Registers `HKCU\Software\Classes\AppUserModelId\<identifier>` with a
+/// DisplayName + IconUri so Windows shows this app's name and icon on toasts
+/// instead of PowerShell's. Idempotent and best-effort: any failure just
+/// leaves toasts with a generic identity, so errors are logged, not
+/// propagated. `data_dir` is the already-created `%APPDATA%/tarkov-checker`
+/// folder (sibling to config.json).
+pub fn register_aumid(app: &AppHandle, data_dir: &Path) {
+    let aumid = app.config().identifier.clone();
+    let icon_path = match write_icon(data_dir) {
+        Ok(path) => path,
+        Err(err) => {
+            eprintln!("[notify] icon write failed: {err}");
+            return;
+        }
+    };
+    if let Err(err) = write_registry(&aumid, &icon_path) {
+        eprintln!("[notify] AUMID registration failed: {err}");
+    }
+}
+
+fn write_icon(data_dir: &Path) -> std::io::Result<PathBuf> {
+    let path = data_dir.join("notification-icon.png");
+    std::fs::write(&path, ICON_BYTES)?;
+    Ok(path)
+}
+
+fn write_registry(aumid: &str, icon_path: &Path) -> std::io::Result<()> {
+    use winreg::enums::HKEY_CURRENT_USER;
+    use winreg::RegKey;
+
+    let hkcu = RegKey::predef(HKEY_CURRENT_USER);
+    let (key, _) = hkcu.create_subkey(format!("Software\\Classes\\AppUserModelId\\{aumid}"))?;
+    key.set_value("DisplayName", &"tarkov-checker")?;
+    key.set_value("IconUri", &icon_path.display().to_string())?;
+    Ok(())
+}
+
+/// Emits a toast attributed to our registered AUMID. Title + body arrive
+/// pre-localised from the webview.
+pub fn show_toast(app: &AppHandle, title: &str, body: &str) -> Result<(), String> {
+    let aumid = app.config().identifier.clone();
+    Toast::new(&aumid)
+        .title(title)
+        .text1(body)
+        .show()
+        .map_err(|err| err.to_string())
+}
diff --git a/apps/desktop/src-tauri/src/server/config.rs b/apps/desktop/src-tauri/src/server/config.rs
index 061c0cb..cf0e1e1 100644
--- a/apps/desktop/src-tauri/src/server/config.rs
+++ b/apps/desktop/src-tauri/src/server/config.rs
@@ -19,6 +19,10 @@ pub struct StoredConfig {
     pub game_dir: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub screenshots_dir: Option<String>,
+    /// Delete each Tarkov screenshot after the watcher parses its position
+    /// from the filename. Opt-in (default false) — see `screenshots.rs`.
+    #[serde(default)]
+    pub delete_screenshots: bool,
 }
 
 /// PUT body. Each field is optional; only the keys present are updated.
@@ -30,6 +34,8 @@ pub struct ConfigPatch {
     pub game_dir: Option<Option<String>>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub screenshots_dir: Option<Option<String>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub delete_screenshots: Option<bool>,
 }
 
 pub struct ConfigStore {
@@ -60,6 +66,11 @@ impl ConfigStore {
         }
     }
 
+    /// Current value of the "delete screenshots after parse" toggle.
+    pub async fn delete_screenshots(&self) -> bool {
+        self.state.lock().await.delete_screenshots
+    }
+
     pub async fn apply(&self, patch: ConfigPatch) -> Result<()> {
         // Validate all fields before acquiring the lock so a rejected UNC path
         // never partially mutates state (e.g. game_dir updated but
@@ -81,6 +92,9 @@ impl ConfigStore {
             if let Some(v) = screenshots_dir {
                 s.screenshots_dir = v;
             }
+            if let Some(v) = patch.delete_screenshots {
+                s.delete_screenshots = v;
+            }
         }
         self.persist().await
     }
diff --git a/apps/desktop/src-tauri/src/server/logs.rs b/apps/desktop/src-tauri/src/server/logs.rs
index b62378d..e684b6e 100644
--- a/apps/desktop/src-tauri/src/server/logs.rs
+++ b/apps/desktop/src-tauri/src/server/logs.rs
@@ -78,6 +78,31 @@ struct ActiveLog {
     partial: String,
 }
 
+/// Chronological sort key parsed from a `log_*` folder name. Tarkov names
+/// sessions `log_<Y>.<M>.<D>_<H>-<M>-<S>_<version>` with the HOUR written
+/// WITHOUT a leading zero (`log_2026.06.07_3-16-27_...`), so a plain
+/// lexicographic sort puts a 3 AM session AFTER a 2 PM one (`'3' > '1'`) and
+/// the watcher latches onto the wrong (often stale) folder. Parsing the numeric
+/// components makes ordering follow actual time. Unparseable names get the
+/// all-zero key so a real, parseable session always wins `.last()`.
+fn session_sort_key(path: &Path) -> (u32, u32, u32, u32, u32, u32) {
+    fn parse(path: &Path) -> Option<(u32, u32, u32, u32, u32, u32)> {
+        let name = path.file_name()?.to_str()?;
+        let rest = name.strip_prefix(SESSION_FOLDER_PREFIX)?; // "2026.06.07_3-16-27_<ver>"
+        let mut parts = rest.split('_');
+        let mut date = parts.next()?.split('.');
+        let mut time = parts.next()?.split('-');
+        let year = date.next()?.parse().ok()?;
+        let month = date.next()?.parse().ok()?;
+        let day = date.next()?.parse().ok()?;
+        let hour = time.next()?.parse().ok()?;
+        let min = time.next()?.parse().ok()?;
+        let sec = time.next()?.parse().ok()?;
+        Some((year, month, day, hour, min, sec))
+    }
+    parse(path).unwrap_or((0, 0, 0, 0, 0, 0))
+}
+
 fn list_session_folders(logs_dir: &Path) -> Vec<PathBuf> {
     let mut out: Vec<PathBuf> = match fs::read_dir(logs_dir) {
         Ok(it) => it
@@ -93,7 +118,9 @@ fn list_session_folders(logs_dir: &Path) -> Vec<PathBuf> {
             .collect(),
         Err(_) => Vec::new(),
     };
-    out.sort();
+    // Chronological (NOT lexicographic — the hour has no leading zero); callers
+    // take `.last()` for the most recent session.
+    out.sort_by_key(|p| session_sort_key(p));
     out
 }
 
@@ -180,7 +207,11 @@ fn emit_map_change(
 
 /// Seek + read appended bytes for the currently-tailed log file, parse line
 /// by line, emit on hit. Idempotent — safe to call on every poll tick.
-fn read_appended(app: Option<&AppHandle>, state: &Mutex<State>, event_tx: &broadcast::Sender<ServerEvent>) {
+fn read_appended(
+    app: Option<&AppHandle>,
+    state: &Mutex<State>,
+    event_tx: &broadcast::Sender<ServerEvent>,
+) {
     // Snapshot the path + offset under the lock so the actual I/O happens
     // outside it.
     let snapshot: Option<(PathBuf, u64, String)> = {
@@ -349,8 +380,10 @@ fn check_new_session_folder(
         let guard = state.lock().expect("logs state poisoned");
         guard.active_folder.clone()
     };
+    // Compare by parsed timestamp, not path order — same leading-zero-hour
+    // pitfall as the folder sort above.
     let is_newer = match &current {
-        Some(c) => latest > *c,
+        Some(c) => session_sort_key(&latest) > session_sort_key(c),
         None => true,
     };
     if !is_newer {
@@ -479,6 +512,40 @@ pub fn start(
 #[cfg(test)]
 mod tests {
     use super::*;
+    use std::path::PathBuf;
+
+    // --- session folder ordering --------------------------------------------
+
+    #[test]
+    fn session_sort_key_orders_by_time_not_lexicographically() {
+        // EFT writes the hour without a leading zero, so a 3 AM session would
+        // sort AFTER a 2:56 PM one under a plain string sort. The parsed key
+        // must put the afternoon session later (greater).
+        let morning = PathBuf::from("log_2026.06.07_3-16-27_1.0.5.0.45464");
+        let afternoon = PathBuf::from("log_2026.06.07_14-56-33_1.0.5.0.45464");
+        assert!(
+            session_sort_key(&afternoon) > session_sort_key(&morning),
+            "14:56 must sort after 03:16"
+        );
+        // And a `.last()` over the unsorted set must pick the afternoon one.
+        let mut folders = [afternoon.clone(), morning];
+        folders.sort_by_key(|p| session_sort_key(p));
+        assert_eq!(folders.last(), Some(&afternoon));
+    }
+
+    #[test]
+    fn session_sort_key_orders_across_days() {
+        let older = PathBuf::from("log_2026.06.06_23-00-00_1.0.5.0");
+        let newer = PathBuf::from("log_2026.06.07_1-00-00_1.0.5.0");
+        assert!(session_sort_key(&newer) > session_sort_key(&older));
+    }
+
+    #[test]
+    fn session_sort_key_unparseable_sorts_first() {
+        let junk = PathBuf::from("log_not_a_timestamp");
+        let real = PathBuf::from("log_2026.06.07_3-16-27_1.0.5.0");
+        assert!(session_sort_key(&real) > session_sort_key(&junk));
+    }
 
     // --- SCENE_PRESET_RE cases -----------------------------------------------
 
diff --git a/apps/desktop/src-tauri/src/server/paths.rs b/apps/desktop/src-tauri/src/server/paths.rs
index a60c417..d790a98 100644
--- a/apps/desktop/src-tauri/src/server/paths.rs
+++ b/apps/desktop/src-tauri/src/server/paths.rs
@@ -51,6 +51,19 @@ pub struct ResolvedPaths {
     pub screenshots_dir: ResolvedPath,
 }
 
+/// What `GET`/`PUT /api/config` (and the Tauri equivalents) return: the
+/// resolved path table plus the behaviour flags that live alongside paths in
+/// `config.json`. Flattened so the wire shape is
+/// `{ gameDir, logsDir, screenshotsDir, deleteScreenshots }` — matching
+/// `serverConfigResponseSchema` in `@shared/config-api`.
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ConfigResponse {
+    #[serde(flatten)]
+    pub paths: ResolvedPaths,
+    pub delete_screenshots: bool,
+}
+
 #[derive(Debug, Clone, Default)]
 pub struct ManualOverrides {
     pub game_dir: Option<String>,
diff --git a/apps/desktop/src-tauri/src/server/screenshots.rs b/apps/desktop/src-tauri/src/server/screenshots.rs
index 6e0836e..b0e3a64 100644
--- a/apps/desktop/src-tauri/src/server/screenshots.rs
+++ b/apps/desktop/src-tauri/src/server/screenshots.rs
@@ -11,7 +11,9 @@ use once_cell::sync::Lazy;
 use regex::Regex;
 use serde::Serialize;
 use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc;
+use std::sync::Arc;
 use std::time::Duration;
 use tauri::{AppHandle, Emitter};
 
@@ -117,6 +119,7 @@ pub fn start(
     dir: PathBuf,
     app: Option<AppHandle>,
     event_tx: tokio::sync::broadcast::Sender<crate::server::events::ServerEvent>,
+    delete_screenshots: Arc<AtomicBool>,
 ) -> Result<ScreenshotWatcher> {
     let (tx, rx) = mpsc::channel::<notify_debouncer_full::DebounceEventResult>();
     let mut debouncer =
@@ -144,7 +147,7 @@ pub fn start(
                     Err(_) => continue,
                 };
                 for ev in events {
-                    handle_event(app_handle.as_ref(), &event_tx, ev);
+                    handle_event(app_handle.as_ref(), &event_tx, ev, &delete_screenshots);
                 }
             }
         })
@@ -155,10 +158,18 @@ pub fn start(
     })
 }
 
+/// Whether a freshly-seen file should be sent to the recycle bin: only when
+/// the feature is enabled AND the filename parsed as a Tarkov screenshot.
+/// Files the user dropped in the folder that don't match are never touched.
+fn should_trash(path: &Path, enabled: bool) -> bool {
+    enabled && parse_screenshot_filename(path).is_some()
+}
+
 fn handle_event(
     app: Option<&AppHandle>,
     event_tx: &tokio::sync::broadcast::Sender<crate::server::events::ServerEvent>,
     ev: DebouncedEvent,
+    delete_screenshots: &AtomicBool,
 ) {
     // Only fresh-on-disk files matter — chokidar in TS used the `add`
     // event which fires on initial discovery + new creates. notify's
@@ -197,6 +208,19 @@ fn handle_event(
             z: parsed.position.z,
             yaw,
         });
+
+        // Opt-in cleanup: the position is already extracted from the filename
+        // and broadcast, so the image is no longer needed. Send it to the OS
+        // recycle bin (recoverable). Best-effort — a failure (file locked by
+        // the screenshot tool, permissions) is logged and ignored.
+        if should_trash(path, delete_screenshots.load(Ordering::Relaxed)) {
+            if let Err(err) = trash::delete(path) {
+                eprintln!(
+                    "[screenshot-watcher] recycle failed for {}: {err}",
+                    path.display()
+                );
+            }
+        }
     }
 }
 
@@ -213,6 +237,30 @@ mod tests {
     use super::*;
     use std::path::Path;
 
+    // -----------------------------------------------------------------------
+    // should_trash — only parsed Tarkov screenshots are ever deleted
+    // -----------------------------------------------------------------------
+
+    #[test]
+    fn should_trash_parsed_screenshot_when_enabled() {
+        let path = Path::new("2026-05-30 12-34-56_-100.5, 50.0, 200.3_0,0,0.7,0.7_.png");
+        assert!(should_trash(path, true));
+    }
+
+    #[test]
+    fn should_not_trash_when_disabled() {
+        let path = Path::new("2026-05-30 12-34-56_-100.5, 50.0, 200.3_0,0,0.7,0.7_.png");
+        assert!(!should_trash(path, false));
+    }
+
+    #[test]
+    fn should_not_trash_unparseable_file_even_when_enabled() {
+        // A user's own file that isn't a Tarkov position screenshot must
+        // survive even with the feature on.
+        assert!(!should_trash(Path::new("my vacation.png"), true));
+        assert!(!should_trash(Path::new("notes.txt"), true));
+    }
+
     // -----------------------------------------------------------------------
     // parse_screenshot_filename
     // -----------------------------------------------------------------------
diff --git a/apps/desktop/src-tauri/src/watcher.rs b/apps/desktop/src-tauri/src/watcher.rs
index e30cedc..ecf38d0 100644
--- a/apps/desktop/src-tauri/src/watcher.rs
+++ b/apps/desktop/src-tauri/src/watcher.rs
@@ -2,7 +2,8 @@
 //! we can swap them atomically when resolved paths change.
 
 use std::path::PathBuf;
-use std::sync::Mutex;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex};
 
 use tauri::AppHandle;
 use tokio::sync::broadcast;
@@ -37,6 +38,10 @@ pub struct WatcherSlot {
     screenshots: Mutex<Option<ScreenshotWatcher>>,
     logs: Mutex<Option<LogsWatcher>>,
     event_tx: broadcast::Sender<ServerEvent>,
+    /// "Delete screenshot after parse" toggle. Shared (Arc) so a running
+    /// screenshot watcher thread reads the live value — flipping it via
+    /// `set_delete_screenshots` takes effect without restarting the watcher.
+    delete_screenshots: Arc<AtomicBool>,
 }
 
 impl Default for WatcherSlot {
@@ -56,6 +61,7 @@ impl WatcherSlot {
             screenshots: Mutex::new(None),
             logs: Mutex::new(None),
             event_tx,
+            delete_screenshots: Arc::new(AtomicBool::new(false)),
         }
     }
 }
@@ -77,6 +83,12 @@ impl WatcherSlot {
     pub fn event_sender(&self) -> broadcast::Sender<ServerEvent> {
         self.event_tx.clone()
     }
+
+    /// Update the shared delete-screenshots flag. A running watcher reads it
+    /// live, so no restart is needed when only this toggle changes.
+    pub fn set_delete_screenshots(&self, enabled: bool) {
+        self.delete_screenshots.store(enabled, Ordering::Relaxed);
+    }
 }
 
 /// Apply the resolved paths: start each watcher if its path is usable,
@@ -97,7 +109,12 @@ pub async fn apply_resolved(app: Option<&AppHandle>, slot: &WatcherSlot, resolve
         _ => None,
     };
     match screenshots_dir {
-        Some(dir) => match screenshots::start(dir, app.cloned(), slot.event_tx.clone()) {
+        Some(dir) => match screenshots::start(
+            dir,
+            app.cloned(),
+            slot.event_tx.clone(),
+            slot.delete_screenshots.clone(),
+        ) {
             Ok(w) => slot.replace_screenshots(Some(w)),
             Err(err) => {
                 eprintln!("[watcher] screenshots start failed: {err:#}");
diff --git a/packages/shared/src/config-api.ts b/packages/shared/src/config-api.ts
index e6bce0b..b0bc4cd 100644
--- a/packages/shared/src/config-api.ts
+++ b/packages/shared/src/config-api.ts
@@ -12,6 +12,12 @@ export const serverConfigResponseSchema = z.object({
   gameDir: resolvedPathSchema,
   logsDir: resolvedPathSchema,
   screenshotsDir: resolvedPathSchema,
+  /** When true, the helper deletes each Tarkov screenshot after parsing its
+   * position out of the filename (the image itself is never used). Opt-in;
+   * keeps the screenshots folder from filling up over long sessions.
+   * `.default(false)` so a response from an older helper (which omits the
+   * field) still parses instead of hard-failing on version skew. */
+  deleteScreenshots: z.boolean().default(false),
 });
 
 /**
@@ -22,6 +28,7 @@ export const serverConfigResponseSchema = z.object({
 export const serverConfigUpdateSchema = z.object({
   gameDir: z.string().nullable().optional(),
   screenshotsDir: z.string().nullable().optional(),
+  deleteScreenshots: z.boolean().optional(),
 });
 
 export type PathSource = z.infer<typeof pathSourceSchema>;

From a863dc323bdbf83132aa2ea2d67c1c4b11f3af9d Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 12 Jun 2026 16:16:53 +0300
Subject: [PATCH 48/53] refactor(client): clean up formatting and improve
 readability in various files

- Adjusted formatting in `hotkey.spec.ts`, `tarkov-time.spec.ts`, and `useServerTransport.spec.ts` for better readability.
- Enhanced code structure in `settings/registry.ts` and `settings/sections/MapSection.vue` by consolidating lines.
- Improved layout in `TarkovTimeChip.vue` for consistent HTML structure.
- Updated `useTrayIcon.ts` to streamline import statements.

These changes focus on code clarity and maintainability without altering functionality.
---
 CLAUDE.md                                     |  42 +-
 PLAN-LAN-AND-TRAY.md                          | 395 ------------------
 apps/client/src/__tests__/hotkey.spec.ts      | 113 ++++-
 apps/client/src/__tests__/tarkov-time.spec.ts |   2 +-
 .../src/__tests__/useServerTransport.spec.ts  |   5 +-
 .../overlay/composables/useTrayIcon.ts        |   5 +-
 apps/client/src/features/settings/registry.ts |   4 +-
 .../features/settings/sections/MapSection.vue |   5 +-
 .../features/tarkov-time/TarkovTimeChip.vue   |   8 +-
 9 files changed, 131 insertions(+), 448 deletions(-)
 delete mode 100644 PLAN-LAN-AND-TRAY.md

diff --git a/CLAUDE.md b/CLAUDE.md
index cc3652f..1b92e1d 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -216,7 +216,7 @@ key back in the running app.
         index.ts                # registerMapLayer call
 
   Each `index.ts` calls `registerMapLayer({ id, mount, category, order, titleKey,
-  settingsComponent? })` at module load (the rail metadata lives here — there is
+settingsComponent? })` at module load (the rail metadata lives here — there is
   no second registry for layers);
   `main.ts` loads all index files via `import.meta.glob('@/features/map/layers/*/index.ts', { eager: true })`.
   `MapView.vue` reads the registry with `useMapLayers()` and calls
@@ -400,7 +400,7 @@ user-visible continuity; default to `persistedRef` everywhere else.
 
 - **Map-layer registry** (`features/map/layers/registry.ts`) — the single source
   of truth for layers. `registerMapLayer({ id, mount, category, order, titleKey,
-  settingsComponent?, availability? })`; `useMapLayers()` reads them. Each layer
+settingsComponent?, availability? })`; `useMapLayers()` reads them. Each layer
   self-describes its rail `category` (`'player' | 'loot' | 'quests'`), `order`,
   display `titleKey`, and optional inline `settingsComponent`. Layers register in
   their own `layers/<name>/index.ts` (auto-loaded via the layers glob). Consumed by
@@ -414,7 +414,7 @@ user-visible continuity; default to `persistedRef` everywhere else.
   NOT the catalogue.
 - **Settings-section registry** (`features/settings/registry.ts`) — **system/app
   settings only** (no layer concept; no groups/subgroups). `registerSettingsSection({
-  id, order, titleKey, visible?, component })`; `useSettingsSections()` returns them
+id, order, titleKey, visible?, component })`; `useSettingsSections()` returns them
   filtered by `visible` (`'always'` | `'tauri'` | `'desktop-or-tauri'` | `'browser'`,
   where `'browser'` = `!isTauri`) and sorted by
   `order`. Registered in `features/<name>/settings.ts` (auto-loaded via
@@ -461,8 +461,9 @@ way to keep a mobile screen awake over plain HTTP: the Screen Wake Lock API need
 secure context (HTTPS / `localhost` — neither reaches a LAN phone, and it's absent
 entirely on iOS < 16.4), and the muted/unmuted looping-`<video>` trick no longer
 keeps the screen on under current iOS **or** Android (verified on iPod touch iOS 15
-+ Android). The honest fallback is the OS auto-lock setting. Don't re-add a JS
-keep-awake hack unless serving over HTTPS becomes viable.
+
+- Android). The honest fallback is the OS auto-lock setting. Don't re-add a JS
+  keep-awake hack unless serving over HTTPS becomes viable.
 
 **PWA manifest** (`apps/client/public/manifest.webmanifest` + `<link rel="manifest">`
 and the `apple-mobile-web-app-*` / `mobile-web-app-capable` meta in `index.html`):
@@ -506,10 +507,11 @@ is a no-op so the same code path serves both.
 **Overlay controls** (only rendered when `isTauri`):
 
 **Unlocked state:**
+
 - **Drag region** — the entire top bar (OverlayHeader.vue) is clickable and grabbable.
   Uses an explicit `@mousedown` handler that calls `getCurrentWindow().startDragging()`
   rather than `data-tauri-drag-region` attribute, which is flaky on `decorations: false +
-  transparent: true` windows. Idle, only a small nub shows; hovering/dragging reveals
+transparent: true` windows. Idle, only a small nub shows; hovering/dragging reveals
   two separate zones as flex siblings: a drag pill (left, flex-1, visual only with "move"
   label) and the control cluster (right, auto-width with pointer events). The transport
   status dot, settings gear, and close button all live in the cluster; only the drag
@@ -528,6 +530,7 @@ is a no-op so the same code path serves both.
 - **Zoom** — in the gear drawer, calls `WebviewWindow.setZoom(factor)`.
 
 **Locked state (click-through):**
+
 - **Rails & controls hide** — the top band vanishes, the LayerRail hides, and animated
   borders disappear for a clean map-only view.
 - **Read-outs stay visible** — the clock+location pill (TarkovTimeChip, top-left),
@@ -552,6 +555,7 @@ a click-through lockout. Handler fires on both `Pressed` and `Released`
 see "Backend-owned hotkeys" below.
 
 **Floor switching** (multi-floor maps only) — three paths:
+
 - **GUI**: the floor stepper (▲/▼) at the bottom of the LayerRail.
 - **Hotkey**: backend-owned `floor-up`/`floor-down` actions (always global, even while
   the game is focused).
@@ -602,17 +606,17 @@ axum-based HTTP server alongside the Tauri IPC layer, so the same
 process backs both the webview (via IPC) and any browser tab on the
 machine (via HTTP). One source of state, two transports.
 
-| Module                  | Role                                                                                               |
-| ----------------------- | -------------------------------------------------------------------------------------------------- |
-| `http_server.rs`        | axum routes, CorsLayer, SSE handler, listens on `0.0.0.0:47474`                                    |
+| Module                  | Role                                                                                                                                                  |
+| ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `http_server.rs`        | axum routes, CorsLayer, SSE handler, listens on `0.0.0.0:47474`                                                                                       |
 | `server/screenshots.rs` | `notify-debouncer-full` watcher (250 ms `awaitWriteFinish` equivalent); parses filename → position; opt-in recycle-bin delete after parse (see below) |
-| `server/logs.rs`        | poll-tails latest `log_*/application_NNN.log`; emits `map-change` on `rcid:` / `Location:` hits    |
-| `server/paths.rs`       | env → manual override → `winreg` auto-detect; returns `ResolvedPaths`                              |
-| `server/config.rs`      | reads/writes `%APPDATA%/tarkov-checker/config.json`; rejects UNC paths                             |
-| `server/events.rs`      | `ServerEvent` enum + `tokio::sync::broadcast` channel for HTTP-side fan-out                        |
-| `watcher.rs`            | `WatcherSlot` state holder + `apply_resolved` that atomically swaps watcher handles                |
-| `lan.rs`                | LAN IP detection for the QR pairing flow (multi-NIC heuristic — see `detect_lan_ip`)               |
-| `commands.rs`           | Tauri `#[tauri::command]` adapters mirroring the HTTP routes + `pairing_qr`                        |
+| `server/logs.rs`        | poll-tails latest `log_*/application_NNN.log`; emits `map-change` on `rcid:` / `Location:` hits                                                       |
+| `server/paths.rs`       | env → manual override → `winreg` auto-detect; returns `ResolvedPaths`                                                                                 |
+| `server/config.rs`      | reads/writes `%APPDATA%/tarkov-checker/config.json`; rejects UNC paths                                                                                |
+| `server/events.rs`      | `ServerEvent` enum + `tokio::sync::broadcast` channel for HTTP-side fan-out                                                                           |
+| `watcher.rs`            | `WatcherSlot` state holder + `apply_resolved` that atomically swaps watcher handles                                                                   |
+| `lan.rs`                | LAN IP detection for the QR pairing flow (multi-NIC heuristic — see `detect_lan_ip`)                                                                  |
+| `commands.rs`           | Tauri `#[tauri::command]` adapters mirroring the HTTP routes + `pairing_qr`                                                                           |
 
 **Trust model: same Wi-Fi = trusted.** The helper always binds
 `0.0.0.0:47474`. No bearer-token auth — browser drive-by callers are
@@ -715,9 +719,9 @@ client-registered (see "Desktop overlay").
   same events still drive the client-side lock shortcut).
 - Wire parity follows the same 4-declaration rule as other events:
   `commandMessage` (zod) + union in `sse-messages.ts`, `ServerEvent::Command`
-  + `HotkeyAction` (kebab-case) in `server/events.rs`. The client dispatches
-  `command` in `pages/index.vue` (`useServerEvent('command', …)`) to
-  `mapRef`/`airdropStore`.
+  - `HotkeyAction` (kebab-case) in `server/events.rs`. The client dispatches
+    `command` in `pages/index.vue` (`useServerEvent('command', …)`) to
+    `mapRef`/`airdropStore`.
 - **Config re-sync:** a rebind broadcasts `ServerEvent::Hotkeys { config }`
   (`hotkeysMessage` in `sse-messages.ts`) from BOTH PUT paths —
   `put_hotkeys_http` (`state.event_tx`) and the `update_hotkeys` IPC command
diff --git a/PLAN-LAN-AND-TRAY.md b/PLAN-LAN-AND-TRAY.md
deleted file mode 100644
index 5549921..0000000
--- a/PLAN-LAN-AND-TRAY.md
+++ /dev/null
@@ -1,395 +0,0 @@
-# Plan: LAN-phone (D) + Tray UI (E)
-
-Implementation plan for the LAN-phone + tray-UI iterations. Designed to
-be picked up cold by a fresh session.
-
-For broader context see [CLAUDE.md](./CLAUDE.md) — especially the
-"In-process HTTP server" and "Tarkov path resolution" sections.
-
----
-
-## Architecture (simplified)
-
-Earlier iterations of this plan had an opt-in `lanMode` toggle plus a
-bearer-token auth scheme, with a tray "Enable LAN mode" item, a
-"Reset pairing" item, and token-in-fragment QR codes. That was scoped
-back to the trust model the user actually wants:
-
-> Same Wi-Fi = trusted. No token. Just show the LAN URL.
-
-Concrete consequences:
-
-- Helper **always** binds `0.0.0.0:47474`. No `lanMode` field in
-  `config.json`. No restart-on-toggle.
-- No `auth_guard`, no `AuthToken` state, no Credential Manager
-  storage. `auth.rs` deleted.
-- QR encodes the bare LAN URL (`http://<lan-ip>:47474/`). No token
-  fragment, no localStorage shuffling on the phone, no hash-bootstrap
-  in `main.ts`.
-- `CorsLayer` Origin allowlist still gates browser drive-by callers
-  (hosted-page XHR from anything not on the allowlist gets no ACAO).
-  Curl-equivalents from the LAN are unfiltered by design.
-- Tray loses E5 ("Enable LAN") and E6 ("Reset pairing") entirely —
-  there's nothing left to toggle or reset.
-
-What the user gets, end to end:
-
-```
-                 Wi-Fi LAN
-   ┌─────────────────────────────────────┐
-   │                                     │
-   │   PC running tarkov-checker.exe     │
-   │   ─────────────────────────────     │
-   │     Tauri overlay window  ──────┐   │
-   │       (existing scenario)       │   │
-   │                                 ▼   │
-   │     Helper:                         │
-   │     - 0.0.0.0:47474                 │
-   │     - /api/* /events                │
-   │     - GET / → embedded SPA          │
-   │                          ▲          │
-   │                          │ http     │
-   │   ┌──────────────────────┘          │
-   │   │                                 │
-   │   │  Phone in LAN                   │
-   │   │  ────────────                   │
-   │   │  Scans QR → opens               │
-   │   │  http://<pc-ip>:47474/          │
-   │   │  → SPA loads same-origin        │
-   │   │  → works                        │
-   │   │                                 │
-   └─────────────────────────────────────┘
-```
-
-Cross-network (phone on cellular, ПК at home) is **out of scope** —
-needs tunneling (cloudflared / Tailscale Funnel / ngrok). Documented
-as future work.
-
----
-
-## D — LAN-phone unlock (done)
-
-All of D landed and is verified end-to-end on a real phone (same
-Wi-Fi). Summary of what's in the tree:
-
-### D1 — Embed SPA into the .exe ✅
-
-`rust-embed = "8"` + `mime_guess = "2"` in
-`apps/desktop/src-tauri/Cargo.toml`. `EmbeddedSpa` struct pointing at
-`../../client/dist/`, `spa_fallback` handler that serves the literal
-asset (with the right MIME) or falls back to `index.html` (SPA
-history mode), wired as `.fallback(spa_fallback)` after the API/SSE
-routes.
-
-Debug builds read from disk at request time. Release builds bake the
-bytes in. `compression` feature is NOT enabled — it pulls in
-`zstd-sys` which crashes rustc on this Windows host (CLAUDE.md
-"Windows build quirks"). Re-evaluate in CI later.
-
-### D2 — DROPPED ✂
-
-No `lanMode` toggle. Helper always `0.0.0.0:47474`. The earlier
-restart-on-toggle plumbing is removed.
-
-### D3 — DROPPED ✂
-
-No bearer-token auth. `auth.rs`, `auth_guard`, `AuthToken`,
-`extract_bearer_token`, `token_matches`, `paired` field on `/api/ping`
-all removed. CORS allowlist remains the browser-side gate.
-
-### D4 — QR pairing ✅
-
-`qrcode = "0.14"` (only `svg` feature) + `local-ip-address = "0.6"`.
-`src/lan.rs::detect_lan_ip()` with multi-NIC heuristic (filters
-`vEthernet` / `wsl` / `docker` / `vmware` etc. by name, ranks survivors
-192.168 > 10 > 172.16-31 > other).
-
-`pairing_qr` Tauri command returns `{url, svg}` where `url =
-http://<lan-ip>:47474/` (no token). `PairingModal.vue` on every
-`onMounted` calls `invoke('pairing_qr')` so a Wi-Fi change between
-openings picks up the new IP.
-
-Frontend `shared/config.ts` distinguishes three contexts via
-`isHelperServed()` (page on port 47474) — dev mode uses Vite proxy,
-helper-served goes same-origin (critical for the phone case), hosted
-SPA on GitHub Pages goes cross-origin to `http://localhost:47474`
-through the localhost-exception.
-
-`PairingSection.vue` in Settings drawer → System group (order 30,
-`visible: 'tauri'`), one button with `pi-qrcode` icon, opens the modal
-via `useOverlayStore().pairingModalOpen`.
-
-i18n keys under `pairing.*` in both `en.json` and `ru.json`.
-
----
-
-## E — Tray UI (DONE)
-
-Goal: replace the "open the overlay window to do anything" UX with a
-Windows system-tray icon. Overlay becomes optional; tray is the
-always-available control surface.
-
-**Implemented — but client-side, not the Rust plan sketched below.** The tray
-lives in `apps/client/src/features/overlay/composables/useTrayIcon.ts` via the
-`@tauri-apps/api/tray` + `/menu` JS API (mounted from `App.vue`), not a Rust
-`TrayIconBuilder` / `tray.rs`. No `tray.rs` exists. The E1–E7 Rust sketches
-below are kept as historical context only; the actual menu and behaviour:
-
-- **Menu** (opens on right-click; left-click restores the window — Windows
-  convention, `showMenuOnLeftClick: false`):
-  `☑ Lock (click-through)` · ─ · `Show window` · ─ · `☑ Always on top` ·
-  `☑ Player follow` · ─ · `Pair phone` · `Copy LAN URL` · ─ · `Quit`.
-  The three `CheckMenuItem`s mirror their stores and re-sync via watchers when
-  toggled elsewhere (lock hotkey, settings drawer, quick menu). Menu layout
-  follows the UX rule "promote only actions worth doing mid-game, when the
-  fullscreen game hides the overlay" — sliders (opacity/zoom) and one-shot
-  config stay in the drawer.
-- **Pair phone** sets `useOverlayStore().pairingModalOpen = true` and shows the
-  window — no Rust `show-pairing-modal` event/listener needed (the JS tray
-  shares the Pinia store directly, so the App.vue listener from the E4 sketch
-  was unnecessary).
-- **Copy LAN URL** calls a native `copy_lan_url` Tauri command (`commands.rs`)
-  that writes `http://<lan-ip>:47474/` to the clipboard via
-  `tauri-plugin-clipboard-manager`'s Rust `ClipboardExt`. Native (not
-  `navigator.clipboard`) because a tray-menu click grants no DOM user-gesture,
-  so the webview clipboard API would be rejected. URL building shares the
-  `lan_url()` helper with `pairing_qr`. No capability entry needed — the write
-  is Rust-side, not a webview IPC call.
-- **Close → tray:** `minimizeToTray` now defaults **true**, so the in-app ✕
-  parks the overlay in the tray (`useCloseConfirm.ts` calls `window.hide()`);
-  `Quit` in the tray is the canonical exit. Users can flip the setting off for
-  ✕ = confirmed quit.
-- **First-close hint:** the first time the overlay parks in the tray,
-  `useCloseConfirm` fires a native Windows toast ("still running in the tray")
-  via the `notify_tray_hint` Tauri command (the window is already hidden, so an
-  in-app toast couldn't be seen). Shown once, gated by the persisted
-  `tc.overlay.trayHintShown` flag. The toast is attributed to this app's
-  name + favicon (not PowerShell) by registering our own AppUserModelID in
-  HKCU and emitting via `tauri-winrt-notification` — `tauri-plugin-notification`
-  was tried first but skips the AUMID for exes run from `target/release` (our
-  portable build), leaving PowerShell's identity. See `src/notify.rs` and
-  CLAUDE.md "Windows build quirks" item 8. The app icons themselves were also
-  regenerated from `favicon.svg` (`tauri icon`), replacing the purple
-  placeholders for the tray / window / taskbar too.
-
-Surface area after the simplification:
-
-| Item              | Action                                                    |
-| ----------------- | --------------------------------------------------------- |
-| Open dashboard    | `show()` + `unminimize()` + `set_focus()` on overlay      |
-| Pair phone        | Emit `show-pairing-modal` event; App.vue flips store flag |
-| Copy pairing URL  | Build LAN URL via `detect_lan_ip`, copy to clipboard      |
-| Quit              | `app.exit(0)`                                             |
-
-Four items, separator between "Open dashboard" and the pair pair, and
-between the pair pair and Quit.
-
-### E1 — Tray icon skeleton
-
-**Plan:**
-
-1. Tauri 2 ships `tauri::tray::TrayIconBuilder`. Wire up in `lib.rs`
-   `setup` hook after `app.manage(...)` calls.
-
-   ```rust
-   use tauri::tray::TrayIconBuilder;
-   use tauri::menu::{Menu, MenuItem, PredefinedMenuItem};
-
-   let open_item = MenuItem::with_id(app, "open_dashboard",
-       "Open dashboard", true, None::<&str>)?;
-   let pair_phone = MenuItem::with_id(app, "pair_phone",
-       "Pair phone", true, None::<&str>)?;
-   let copy_url = MenuItem::with_id(app, "copy_url",
-       "Copy LAN URL", true, None::<&str>)?;
-   let separator1 = PredefinedMenuItem::separator(app)?;
-   let separator2 = PredefinedMenuItem::separator(app)?;
-   let quit = MenuItem::with_id(app, "quit", "Quit", true,
-       None::<&str>)?;
-
-   let menu = Menu::with_items(app, &[
-       &open_item, &separator1,
-       &pair_phone, &copy_url,
-       &separator2, &quit,
-   ])?;
-
-   TrayIconBuilder::with_id("main")
-       .icon(app.default_window_icon().unwrap().clone())
-       .menu(&menu)
-       .show_menu_on_left_click(true)
-       .on_menu_event(|app, event| tray::handle_event(app, event))
-       .build(app)?;
-   ```
-
-2. New `apps/desktop/src-tauri/src/tray.rs` with `handle_event` plus
-   per-action functions, dispatched by `event.id().as_ref()`.
-
-3. **Icon**: reuse `apps/desktop/src-tauri/icons/icon.ico` via
-   `app.default_window_icon()` — `tauri.conf.json` already has the
-   icons section, no change needed.
-
-**Files:**
-
-- `apps/desktop/src-tauri/src/lib.rs` — TrayIconBuilder block
-- `apps/desktop/src-tauri/src/tray.rs` — NEW
-
-### E2 — "Open dashboard"
-
-```rust
-fn handle_open_dashboard(app: &AppHandle) {
-    if let Some(window) = app.get_webview_window("main") {
-        let _ = window.show();
-        let _ = window.unminimize();
-        let _ = window.set_focus();
-    }
-}
-```
-
-No browser open, no hosted URL — the overlay IS the dashboard.
-
-### E3 — "Copy LAN URL"
-
-```rust
-fn handle_copy_url(app: &AppHandle) {
-    use tauri_plugin_clipboard_manager::ClipboardExt;
-    let ip = match crate::lan::detect_lan_ip() {
-        Some(ip) => ip,
-        None => { eprintln!("[tray] no LAN IP detected"); return; }
-    };
-    let url = format!("http://{ip}:{}/", crate::http_server::LISTEN_PORT);
-    if let Err(err) = app.clipboard().write_text(url) {
-        eprintln!("[tray] clipboard write failed: {err}");
-    }
-}
-```
-
-Requires `tauri-plugin-clipboard-manager` dep + a capability entry.
-
-### E4 — "Pair phone"
-
-Brings the overlay window forward and emits `show-pairing-modal`.
-App.vue listens and flips `useOverlayStore().pairingModalOpen`.
-
-```rust
-fn handle_pair_phone(app: &AppHandle) {
-    if let Some(window) = app.get_webview_window("main") {
-        let _ = window.show();
-        let _ = window.unminimize();
-        let _ = window.set_focus();
-        let _ = window.emit("show-pairing-modal", ());
-    }
-}
-```
-
-App.vue (one new listener, no new component):
-
-```ts
-import { listen } from '@tauri-apps/api/event';
-import { useOverlayStore } from '@/features/overlay/store';
-
-onMounted(async () => {
-  if (!isTauri) return;
-  const unlisten = await listen('show-pairing-modal', () => {
-    useOverlayStore().pairingModalOpen = true;
-  });
-  onBeforeUnmount(unlisten);
-});
-```
-
-### E7 — "Quit"
-
-```rust
-fn handle_quit(app: &AppHandle) {
-    app.exit(0);
-}
-```
-
-`app.exit()` runs proper Tauri teardown.
-
----
-
-## Dependency order
-
-```
-D1 ✅ ─┬─→ D4 ✅ ─→ E4 (uses PairingModal which uses pairing_qr)
-       │
-       └─→ E1 (skeleton) ─→ E2/E3/E4/E7 handlers
-```
-
-E1 is the only blocker for E2-E7. ~1-2 hours total for the tray work.
-
----
-
-## Verification matrix
-
-| Scenario                              | Status      |
-| ------------------------------------- | ----------- |
-| Tauri overlay (existing IPC path)     | works ✅    |
-| Hosted SPA on same PC                 | works ✅    |
-| Helper-served SPA in same-PC browser  | works ✅    |
-| Vite dev at `<lan-ip>:5173` on phone  | works ✅    |
-| Helper at `<lan-ip>:47474` on phone   | works ✅    |
-| Cross-network phone (cellular etc.)  | out of scope (needs tunnel) |
-| Helper down                           | "Helper not running" UI |
-
----
-
-## Out-of-scope (future work)
-
-- **Cross-network access.** Phone on cellular hitting helper at home.
-  Needs the user to run a tunnel (`cloudflared`, Tailscale Funnel,
-  ngrok) and the SPA to know the tunnel URL. Could land later as a
-  "Connect over internet" advanced setting.
-- **LAN-side auth.** If the trust-model ever needs to harden (coffee
-  shop Wi-Fi, malicious LAN device), token-via-QR can come back. The
-  earlier implementation lives in git history if a rewind is needed.
-- **Compression for `rust-embed`.** Pulls `zstd-sys` which crashes
-  rustc locally. Enable in CI.
-
----
-
-## File checklist (cumulative, E remaining)
-
-```
-# As built (client-side tray), not the original Rust plan:
-apps/desktop/src-tauri/Cargo.toml                      [+tauri-plugin-clipboard-manager, +tauri-winrt-notification]
-apps/desktop/src-tauri/src/lib.rs                      [.plugin(clipboard init), notify::register_aumid in setup, copy_lan_url/notify_tray_hint in handler]
-apps/desktop/src-tauri/src/commands.rs                 [lan_url() helper + copy_lan_url + notify_tray_hint commands]
-apps/desktop/src-tauri/src/notify.rs                   [NEW: AUMID registration + winrt toast]
-apps/desktop/src-tauri/icons/*                         [regenerated from favicon.svg via `tauri icon`]
-
-apps/client/src/features/overlay/composables/useTrayIcon.ts  [full menu: checkmarks, pair, copy, left-click restore]
-apps/client/src/features/overlay/composables/useCloseConfirm.ts [first-close tray notification]
-apps/client/src/features/overlay/store.ts              [minimizeToTray default → true, trayHintShown flag]
-apps/client/src/features/i18n/locales/en.json + ru.json [tray menu + trayHint strings]
-
-# Not needed in the end: capabilities/default.json (Rust-side clipboard write),
-# tray.rs (tray is JS), tauri.conf.json (tray-icon feature already present),
-# App.vue listener (JS tray flips the store directly).
-```
-
----
-
-## Quick-reference commands
-
-```powershell
-# Dev (Vite + Tauri).
-pnpm --filter @tarkov-checker/desktop tauri:dev
-
-# Build production overlay (.exe with embedded SPA).
-pnpm overlay:build
-
-# Build hosted SPA for GitHub Pages.
-$env:GITHUB_PAGES = 'true'; pnpm --filter @tarkov-checker/client build
-
-# Local checks.
-pnpm typecheck && pnpm lint && pnpm test
-cd apps/desktop/src-tauri
-cargo fmt --all -- --check
-cargo clippy --all-targets -- -D warnings
-cargo test --lib  # Windows host is flaky — push a tag if it crashes locally.
-
-# Test helper directly (no UI).
-curl http://localhost:47474/api/ping
-curl http://localhost:47474/api/config
-curl -N http://localhost:47474/events
-```
diff --git a/apps/client/src/__tests__/hotkey.spec.ts b/apps/client/src/__tests__/hotkey.spec.ts
index ce0720c..5dd040b 100644
--- a/apps/client/src/__tests__/hotkey.spec.ts
+++ b/apps/client/src/__tests__/hotkey.spec.ts
@@ -9,21 +9,82 @@ const CRATE_ACCEPTED = new Set<string>([
   ...'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('').map((l) => `KEY${l}`),
   ...'0123456789'.split(''),
   ...'0123456789'.split('').map((d) => `DIGIT${d}`),
-  'BACKQUOTE', '`', 'BACKSLASH', '\\', 'BRACKETLEFT', '[', 'BRACKETRIGHT', ']',
-  'COMMA', ',', 'EQUAL', '=', 'MINUS', '-', 'PERIOD', '.', 'QUOTE', "'",
-  'SEMICOLON', ';', 'SLASH', '/',
-  'SPACE', 'TAB', 'ENTER', 'BACKSPACE', 'DELETE', 'END', 'HOME', 'INSERT',
-  'PAGEDOWN', 'PAGEUP',
-  'ARROWDOWN', 'DOWN', 'ARROWLEFT', 'LEFT', 'ARROWRIGHT', 'RIGHT', 'ARROWUP', 'UP',
-  'NUMPAD0', 'NUM0', 'NUMPAD1', 'NUM1', 'NUMPAD2', 'NUM2', 'NUMPAD3', 'NUM3',
-  'NUMPAD4', 'NUM4', 'NUMPAD5', 'NUM5', 'NUMPAD6', 'NUM6', 'NUMPAD7', 'NUM7',
-  'NUMPAD8', 'NUM8', 'NUMPAD9', 'NUM9',
-  'NUMPADADD', 'NUMADD', 'NUMPADPLUS', 'NUMPLUS',
-  'NUMPADSUBTRACT', 'NUMSUBTRACT',
-  'NUMPADMULTIPLY', 'NUMMULTIPLY',
-  'NUMPADDIVIDE', 'NUMDIVIDE',
-  'NUMPADDECIMAL', 'NUMDECIMAL',
-  'NUMPADENTER', 'NUMENTER', 'NUMPADEQUAL', 'NUMEQUAL',
+  'BACKQUOTE',
+  '`',
+  'BACKSLASH',
+  '\\',
+  'BRACKETLEFT',
+  '[',
+  'BRACKETRIGHT',
+  ']',
+  'COMMA',
+  ',',
+  'EQUAL',
+  '=',
+  'MINUS',
+  '-',
+  'PERIOD',
+  '.',
+  'QUOTE',
+  "'",
+  'SEMICOLON',
+  ';',
+  'SLASH',
+  '/',
+  'SPACE',
+  'TAB',
+  'ENTER',
+  'BACKSPACE',
+  'DELETE',
+  'END',
+  'HOME',
+  'INSERT',
+  'PAGEDOWN',
+  'PAGEUP',
+  'ARROWDOWN',
+  'DOWN',
+  'ARROWLEFT',
+  'LEFT',
+  'ARROWRIGHT',
+  'RIGHT',
+  'ARROWUP',
+  'UP',
+  'NUMPAD0',
+  'NUM0',
+  'NUMPAD1',
+  'NUM1',
+  'NUMPAD2',
+  'NUM2',
+  'NUMPAD3',
+  'NUM3',
+  'NUMPAD4',
+  'NUM4',
+  'NUMPAD5',
+  'NUM5',
+  'NUMPAD6',
+  'NUM6',
+  'NUMPAD7',
+  'NUM7',
+  'NUMPAD8',
+  'NUM8',
+  'NUMPAD9',
+  'NUM9',
+  'NUMPADADD',
+  'NUMADD',
+  'NUMPADPLUS',
+  'NUMPLUS',
+  'NUMPADSUBTRACT',
+  'NUMSUBTRACT',
+  'NUMPADMULTIPLY',
+  'NUMMULTIPLY',
+  'NUMPADDIVIDE',
+  'NUMDIVIDE',
+  'NUMPADDECIMAL',
+  'NUMDECIMAL',
+  'NUMPADENTER',
+  'NUMENTER',
+  'NUMPADEQUAL',
+  'NUMEQUAL',
   ...Array.from({ length: 24 }, (_, i) => `F${i + 1}`),
 ]);
 
@@ -55,7 +116,9 @@ function mainKey(combo: string): string {
 
 describe('captureHotkey — main keys', () => {
   it('letters map KeyX → X', () => {
-    expect(captureHotkey(ev('KeyL', { ctrl: true, alt: true })).combo).toBe('CommandOrControl+Alt+L');
+    expect(captureHotkey(ev('KeyL', { ctrl: true, alt: true })).combo).toBe(
+      'CommandOrControl+Alt+L',
+    );
   });
 
   it('digits map DigitN → N', () => {
@@ -77,9 +140,21 @@ describe('captureHotkey — main keys', () => {
 
 describe('captureHotkey — numpad (regression for the Num- bug)', () => {
   const NUMPAD_CODES = [
-    'Numpad0', 'Numpad1', 'Numpad2', 'Numpad3', 'Numpad4',
-    'Numpad5', 'Numpad6', 'Numpad7', 'Numpad8', 'Numpad9',
-    'NumpadAdd', 'NumpadSubtract', 'NumpadMultiply', 'NumpadDivide', 'NumpadDecimal',
+    'Numpad0',
+    'Numpad1',
+    'Numpad2',
+    'Numpad3',
+    'Numpad4',
+    'Numpad5',
+    'Numpad6',
+    'Numpad7',
+    'Numpad8',
+    'Numpad9',
+    'NumpadAdd',
+    'NumpadSubtract',
+    'NumpadMultiply',
+    'NumpadDivide',
+    'NumpadDecimal',
     'NumpadEnter',
   ];
 
diff --git a/apps/client/src/__tests__/tarkov-time.spec.ts b/apps/client/src/__tests__/tarkov-time.spec.ts
index 9e3e9c3..cbab8dd 100644
--- a/apps/client/src/__tests__/tarkov-time.spec.ts
+++ b/apps/client/src/__tests__/tarkov-time.spec.ts
@@ -25,7 +25,7 @@ describe('tarkovTime', () => {
         const [h, m] = s.split(':').map(Number);
         return (h ?? 0) * 60 + (m ?? 0);
       };
-      const diff = ((toMin(right) - toMin(left)) % (24 * 60) + 24 * 60) % (24 * 60);
+      const diff = (((toMin(right) - toMin(left)) % (24 * 60)) + 24 * 60) % (24 * 60);
       expect(diff).toBe(12 * 60);
     }
   });
diff --git a/apps/client/src/__tests__/useServerTransport.spec.ts b/apps/client/src/__tests__/useServerTransport.spec.ts
index 0eb646e..0d017ec 100644
--- a/apps/client/src/__tests__/useServerTransport.spec.ts
+++ b/apps/client/src/__tests__/useServerTransport.spec.ts
@@ -186,10 +186,7 @@ describe('useServerTransport — Tauri path', () => {
     const off1 = vi.fn();
     const off2 = vi.fn();
     const off3 = vi.fn();
-    listenMock
-      .mockResolvedValueOnce(off1)
-      .mockResolvedValueOnce(off2)
-      .mockResolvedValueOnce(off3);
+    listenMock.mockResolvedValueOnce(off1).mockResolvedValueOnce(off2).mockResolvedValueOnce(off3);
 
     const { result, app } = mountTransport('/events');
     await flushMounted();
diff --git a/apps/client/src/features/overlay/composables/useTrayIcon.ts b/apps/client/src/features/overlay/composables/useTrayIcon.ts
index ec017f4..58aead6 100644
--- a/apps/client/src/features/overlay/composables/useTrayIcon.ts
+++ b/apps/client/src/features/overlay/composables/useTrayIcon.ts
@@ -57,9 +57,8 @@ export function useTrayIcon(isTauri: boolean, overlayClickThrough: Ref<boolean>)
   }
 
   async function buildTrayMenu(): Promise<Menu> {
-    const { Menu, MenuItem, CheckMenuItem, PredefinedMenuItem } = await import(
-      '@tauri-apps/api/menu'
-    );
+    const { Menu, MenuItem, CheckMenuItem, PredefinedMenuItem } =
+      await import('@tauri-apps/api/menu');
     const separator = () => PredefinedMenuItem.new({ item: 'Separator' });
 
     lockItem = await CheckMenuItem.new({
diff --git a/apps/client/src/features/settings/registry.ts b/apps/client/src/features/settings/registry.ts
index 5a727e4..4d77613 100644
--- a/apps/client/src/features/settings/registry.ts
+++ b/apps/client/src/features/settings/registry.ts
@@ -36,6 +36,8 @@ export function useSettingsSections(): ComputedRef<SettingsSection[]> {
       return isTauri || isDesktop.value;
     };
 
-    return [...registry.values()].filter((s) => visible(s.visible)).sort((a, b) => a.order - b.order);
+    return [...registry.values()]
+      .filter((s) => visible(s.visible))
+      .sort((a, b) => a.order - b.order);
   });
 }
diff --git a/apps/client/src/features/settings/sections/MapSection.vue b/apps/client/src/features/settings/sections/MapSection.vue
index 7e71fbe..77d71d8 100644
--- a/apps/client/src/features/settings/sections/MapSection.vue
+++ b/apps/client/src/features/settings/sections/MapSection.vue
@@ -32,10 +32,7 @@ const manualOpen = ref(false);
       @click="manualOpen = !manualOpen"
     >
       <span class="truncate">{{ currentMapName }}</span>
-      <i
-        class="pi text-xs opacity-60"
-        :class="manualOpen ? 'pi-chevron-up' : 'pi-chevron-down'"
-      />
+      <i class="pi text-xs opacity-60" :class="manualOpen ? 'pi-chevron-up' : 'pi-chevron-down'" />
     </button>
 
     <Listbox
diff --git a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
index bc20194..8ad7002 100644
--- a/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
+++ b/apps/client/src/features/tarkov-time/TarkovTimeChip.vue
@@ -69,9 +69,13 @@ const statusDotClass = computed(() => {
       aria-hidden="true"
     >
       <i v-if="status" :class="['pi text-[9px]', statusDotClass]" />
-      <span>{{ clock.left }}<span class="opacity-50">:{{ clock.seconds }}</span></span>
+      <span
+        >{{ clock.left }}<span class="opacity-50">:{{ clock.seconds }}</span></span
+      >
       <span class="opacity-40">/</span>
-      <span>{{ clock.right }}<span class="opacity-50">:{{ clock.seconds }}</span></span>
+      <span
+        >{{ clock.right }}<span class="opacity-50">:{{ clock.seconds }}</span></span
+      >
       <span
         v-if="mapDisplayName"
         class="items-center gap-1.5"

From 3cd8fe63d63c59011c5b87be8f23bdec1d96963c Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 12 Jun 2026 16:21:29 +0300
Subject: [PATCH 49/53] docs: update CLAUDE.md for improved layer structure
 clarity

Reformatted the layers section in CLAUDE.md to enhance readability and maintain consistency in the documentation. The changes include indentation adjustments for better visual hierarchy, ensuring that the structure of layers and their respective files is clear and easy to follow.
---
 CLAUDE.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 1b92e1d..0197da7 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -202,18 +202,18 @@ key back in the running app.
   wires it into Leaflet. All layers use a registry pattern: `layers/registry.ts`
   exports `registerMapLayer()` and `useMapLayers()`. Currently:
 
-      layers/extracts/
-        useExtractsLayer.ts     # Leaflet/Vue glue, data load, marker sync
-        icon.ts                 # slice geometry + makeIcon (composite via CSS clip-path)
-        tooltip.ts              # buildTooltipHtml + escapeHtml + sortedEntries
-        useEdgeIndicators.ts    # off-screen extract arrows; wraps left edge around the rail
-        index.ts                # registerMapLayer call
-      layers/player/
-        usePlayerLayer.ts       # player position marker + recentering on follow
-        index.ts                # registerMapLayer call
-      layers/airdrop/
-        useAirdropLayer.ts      # purple uncertainty circle around the predicted drop
-        index.ts                # registerMapLayer call
+        layers/extracts/
+          useExtractsLayer.ts     # Leaflet/Vue glue, data load, marker sync
+          icon.ts                 # slice geometry + makeIcon (composite via CSS clip-path)
+          tooltip.ts              # buildTooltipHtml + escapeHtml + sortedEntries
+          useEdgeIndicators.ts    # off-screen extract arrows; wraps left edge around the rail
+          index.ts                # registerMapLayer call
+        layers/player/
+          usePlayerLayer.ts       # player position marker + recentering on follow
+          index.ts                # registerMapLayer call
+        layers/airdrop/
+          useAirdropLayer.ts      # purple uncertainty circle around the predicted drop
+          index.ts                # registerMapLayer call
 
   Each `index.ts` calls `registerMapLayer({ id, mount, category, order, titleKey,
 settingsComponent? })` at module load (the rail metadata lives here — there is

From 4feb4a55809ca4cddc31a491b04613fb0816c1d5 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 12 Jun 2026 16:52:35 +0300
Subject: [PATCH 50/53] Add .prettierignore file to exclude build outputs,
 lockfiles, and generated files from formatting

---
 .prettierignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.prettierignore b/.prettierignore
index 3339bba..f542578 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -23,3 +23,7 @@ apps/client/.eslintrc-auto-import.json
 
 # Claude Code local tooling (launch config, vendored skills)
 .claude/**
+
+# Agent instructions — hand-formatted (tables, aligned lists), owned by
+# whoever edits them, not by prettier
+CLAUDE.md

From ee59334491959abf3f0de0e60980e4ce726a8097 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 12 Jun 2026 17:12:06 +0300
Subject: [PATCH 51/53] refactor(i18n): update paths section headings for
 clarity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changed the heading in the English and Russian locale files from "Tarkov paths" to "Game integration" and "Пути Tarkov" to "Интеграция с игрой" respectively. Updated visibility settings in the settings section to 'always' for improved diagnostics. Adjusted layout in PathsSection.vue for better user experience, including a more accessible toggle switch for deleting screenshots.
---
 apps/client/src/features/i18n/locales/en.json |  2 +-
 apps/client/src/features/i18n/locales/ru.json |  2 +-
 apps/client/src/features/server/settings.ts   |  4 +++-
 .../settings/sections/PathsSection.vue        | 20 +++++++++----------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 7123f18..78c8e6c 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -44,7 +44,7 @@
     "shared": "Shared"
   },
   "paths": {
-    "heading": "Tarkov paths",
+    "heading": "Game integration",
     "gameDir": "Game folder",
     "screenshotsDir": "Screenshots folder",
     "save": "Save",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 4609b9a..627e293 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -44,7 +44,7 @@
     "shared": "Общие"
   },
   "paths": {
-    "heading": "Пути Tarkov",
+    "heading": "Интеграция с игрой",
     "gameDir": "Папка с игрой",
     "screenshotsDir": "Папка скриншотов",
     "save": "Сохранить",
diff --git a/apps/client/src/features/server/settings.ts b/apps/client/src/features/server/settings.ts
index 7d1eaf6..5e66c19 100644
--- a/apps/client/src/features/server/settings.ts
+++ b/apps/client/src/features/server/settings.ts
@@ -4,7 +4,9 @@ import PathsSection from '@/features/settings/sections/PathsSection.vue';
 registerSettingsSection({
   id: 'paths',
   order: 40,
-  visible: 'desktop-or-tauri',
+  // 'always': phones get the read-only view (PathsSection's canEditPaths) —
+  // path status is useful for diagnostics, editing stays desktop/Tauri-only.
+  visible: 'always',
   titleKey: 'paths.heading',
   component: PathsSection,
 });
diff --git a/apps/client/src/features/settings/sections/PathsSection.vue b/apps/client/src/features/settings/sections/PathsSection.vue
index 87892aa..b0c4dbc 100644
--- a/apps/client/src/features/settings/sections/PathsSection.vue
+++ b/apps/client/src/features/settings/sections/PathsSection.vue
@@ -108,22 +108,22 @@ const {
       </p>
 
       <div class="border-t border-surface-700 pt-3">
-        <div class="flex items-start justify-between gap-3">
-          <div class="min-w-0">
-            <label for="delete-screenshots-toggle" class="block text-xs">
-              {{ t('paths.deleteScreenshots') }}
-            </label>
-            <p class="mt-1 text-[10px] leading-relaxed opacity-70">
-              {{ t('paths.deleteScreenshotsHint') }}
-            </p>
-          </div>
+        <div class="flex items-center justify-between gap-3">
+          <label for="delete-screenshots-toggle" class="text-xs">
+            {{ t('paths.deleteScreenshots') }}
+          </label>
+          <!-- Editable everywhere incl. phones (unlike the paths): a switch
+               needs no keyboard and a stray flip is a recoverable, single PUT. -->
           <ToggleSwitch
+            class="shrink-0"
             input-id="delete-screenshots-toggle"
             :model-value="deleteScreenshots"
-            :disabled="!canEditPaths"
             @update:model-value="setDeleteScreenshots"
           />
         </div>
+        <p class="mt-1.5 text-[10px] leading-relaxed opacity-70">
+          {{ t('paths.deleteScreenshotsHint') }}
+        </p>
       </div>
     </div>
   </div>

From 1435f24d048b87638d71f5e94c6f53c46a4f4d94 Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 12 Jun 2026 17:21:12 +0300
Subject: [PATCH 52/53] chore: enhance package.json scripts and CI
 configurations

- Added new scripts for frontend, backend, and Tauri development in package.json.
- Introduced lint:fix script for automated linting fixes.
- Updated CI workflow to run the format check using the updated format script.
- Added lint:fix command to shared and client package.json files for improved linting capabilities.
---
 .github/workflows/checks.yml | 2 +-
 apps/client/package.json     | 3 ++-
 package.json                 | 8 ++++++--
 packages/shared/package.json | 1 +
 turbo.json                   | 3 +++
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index e68aee6..6fc1b45 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -57,7 +57,7 @@ jobs:
       # eslint-config-prettier disables format rules in ESLint, so
       # Prettier itself isn't verified by `pnpm lint`. Run it first —
       # a formatting drift fails fast before the heavier eslint pass.
-      - run: pnpm format:check
+      - run: pnpm format
 
       - run: pnpm lint
 
diff --git a/apps/client/package.json b/apps/client/package.json
index 2da162d..30e68e9 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -11,7 +11,8 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "typecheck": "vue-tsc -b --noEmit",
-    "lint": "eslint src"
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix"
   },
   "dependencies": {
     "@primeuix/themes": "^2.0.3",
diff --git a/package.json b/package.json
index 2be7345..535166c 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,16 @@
   },
   "scripts": {
     "dev": "turbo run dev",
+    "dev:frontend": "pnpm --filter @tarkov-checker/client dev",
+    "dev:backend": "pnpm --filter @tarkov-checker/desktop backend:dev",
+    "dev:tauri": "pnpm --filter @tarkov-checker/desktop tauri:dev",
     "build": "turbo run build",
     "lint": "turbo run lint",
+    "lint:fix": "turbo run lint:fix",
     "typecheck": "turbo run typecheck",
     "test": "turbo run test",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
+    "format": "prettier --check .",
+    "format:fix": "prettier --write .",
     "overlay:build": "pnpm --filter @tarkov-checker/shared build && pnpm --filter @tarkov-checker/client build && pnpm --filter @tarkov-checker/desktop tauri build",
     "shared:gen-rust-regex": "node packages/shared/scripts/gen-rust-regex.mjs",
     "shared:gen-rust-regex:check": "node packages/shared/scripts/gen-rust-regex.mjs && git diff --exit-code apps/desktop/src-tauri/src/server/parse_log_regexes.rs apps/desktop/src-tauri/src/server/parse_screenshot_regexes.rs"
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 02a4fbd..568db79 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -27,6 +27,7 @@
     "build": "tsc -p tsconfig.json",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "lint": "eslint src --max-warnings=0",
+    "lint:fix": "eslint src --max-warnings=0 --fix",
     "gen-rust-regex": "node scripts/gen-rust-regex.mjs"
   },
   "dependencies": {
diff --git a/turbo.json b/turbo.json
index d570098..26c11c3 100644
--- a/turbo.json
+++ b/turbo.json
@@ -10,6 +10,9 @@
       "dependsOn": ["^build"]
     },
     "lint": {},
+    "lint:fix": {
+      "cache": false
+    },
     "test": {
       "dependsOn": ["^build"]
     },

From 1fb4bc31b77c432de4c16ef92de6b958f09c0aaa Mon Sep 17 00:00:00 2001
From: Mosmain <mosmain@yandex.ru>
Date: Fri, 12 Jun 2026 17:49:53 +0300
Subject: [PATCH 53/53] feat(updater): implement self-update functionality and
 UI components

- Added `UpdateBanner` component to notify users of available updates in the client.
- Introduced updater logic in the Rust backend to check for and install updates from GitHub Releases.
- Updated English and Russian locale files to include new updater messages.
- Refactored package.json scripts for clarity and consistency.
- Enhanced the Tauri application to handle self-updating, including cleanup of old executables.

This commit lays the groundwork for a seamless update experience for users, ensuring they are notified of new versions and can easily install them.
---
 apps/client/src/App.vue                       |   4 +
 apps/client/src/features/i18n/locales/en.json |   6 +
 apps/client/src/features/i18n/locales/ru.json |   6 +
 .../updater/components/UpdateBanner.vue       |  71 +++++
 apps/desktop/src-tauri/Cargo.lock             | 212 +++++++++++++-
 apps/desktop/src-tauri/Cargo.toml             |   6 +-
 apps/desktop/src-tauri/src/commands.rs        |  30 ++
 apps/desktop/src-tauri/src/lib.rs             |   6 +
 apps/desktop/src-tauri/src/main.rs            |   5 +
 apps/desktop/src-tauri/src/updater.rs         | 263 ++++++++++++++++++
 apps/desktop/src-tauri/tauri.conf.json        |   1 -
 package.json                                  |   2 +-
 12 files changed, 605 insertions(+), 7 deletions(-)
 create mode 100644 apps/client/src/features/updater/components/UpdateBanner.vue
 create mode 100644 apps/desktop/src-tauri/src/updater.rs

diff --git a/apps/client/src/App.vue b/apps/client/src/App.vue
index 61eb4c6..e4abf15 100644
--- a/apps/client/src/App.vue
+++ b/apps/client/src/App.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import MapQuickMenu from '@/features/overlay/components/MapQuickMenu.vue';
 import PairingModal from '@/features/overlay/components/PairingModal.vue';
+import UpdateBanner from '@/features/updater/components/UpdateBanner.vue';
 import { useServerTransport } from '@/features/server/composables/useServerTransport';
 import { provideTransportStatus } from '@/features/server/composables/useTransportStatus';
 import { useOverlayStore } from '@/features/overlay/store';
@@ -76,6 +77,9 @@ function onMapContextMenu(event: MouseEvent): void {
     mount it at all there.
   -->
   <PairingModal v-if="isTauri" />
+  <!-- Self-update is a Tauri-only concern: browsers/phones always load the
+       SPA the helper serves, they have nothing to update themselves. -->
+  <UpdateBanner v-if="isTauri" />
   <div
     class="relative h-full w-screen text-surface-0"
     :class="isTauri ? '' : 'bg-surface-950'"
diff --git a/apps/client/src/features/i18n/locales/en.json b/apps/client/src/features/i18n/locales/en.json
index 78c8e6c..9c4be7e 100644
--- a/apps/client/src/features/i18n/locales/en.json
+++ b/apps/client/src/features/i18n/locales/en.json
@@ -68,6 +68,12 @@
       "otherTitle": "Couldn't load Tarkov paths"
     }
   },
+  "updater": {
+    "available": "Update v{version} available",
+    "install": "Update",
+    "installing": "Updating…",
+    "error": "Update failed. Grab the new exe manually: GitHub → Releases."
+  },
   "overlay": {
     "heading": "Overlay",
     "alwaysOnTop": "Always on top",
diff --git a/apps/client/src/features/i18n/locales/ru.json b/apps/client/src/features/i18n/locales/ru.json
index 627e293..1a1df13 100644
--- a/apps/client/src/features/i18n/locales/ru.json
+++ b/apps/client/src/features/i18n/locales/ru.json
@@ -68,6 +68,12 @@
       "otherTitle": "Не удалось загрузить пути Tarkov"
     }
   },
+  "updater": {
+    "available": "Доступно обновление v{version}",
+    "install": "Обновить",
+    "installing": "Обновляем…",
+    "error": "Не получилось обновиться. Скачай новый exe вручную: GitHub → Releases."
+  },
   "overlay": {
     "heading": "Оверлей",
     "alwaysOnTop": "Поверх всех окон",
diff --git a/apps/client/src/features/updater/components/UpdateBanner.vue b/apps/client/src/features/updater/components/UpdateBanner.vue
new file mode 100644
index 0000000..f35b2b4
--- /dev/null
+++ b/apps/client/src/features/updater/components/UpdateBanner.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import { isTauri } from '@/shared/tauri';
+import { useOverlayStore } from '@/features/overlay/store';
+
+/** Mirrors `UpdateInfo` in src-tauri/src/updater.rs (downloadUrl stays Rust-side). */
+interface UpdateInfo {
+  current: string;
+  latest: string;
+  releaseUrl: string;
+}
+
+const { t } = useI18n();
+const { clickThrough } = storeToRefs(useOverlayStore());
+
+const info = ref<UpdateInfo | null>(null);
+const installing = ref(false);
+const failed = ref(false);
+const dismissed = ref(false);
+
+onMounted(async () => {
+  if (!isTauri) return;
+  try {
+    const { invoke } = await import('@tauri-apps/api/core');
+    info.value = await invoke<UpdateInfo | null>('check_update');
+  } catch (e) {
+    // Convenience check only — offline / rate-limited GitHub is not an error
+    // worth surfacing, the app works fine on the current version.
+    console.warn('[updater] check failed:', e);
+  }
+});
+
+async function install(): Promise<void> {
+  if (installing.value) return;
+  installing.value = true;
+  failed.value = false;
+  try {
+    const { invoke } = await import('@tauri-apps/api/core');
+    // On success the backend swaps the exe, respawns it and exits this
+    // process — there is no resolved state to handle.
+    await invoke('install_update');
+  } catch (e) {
+    console.warn('[updater] install failed:', e);
+    failed.value = true;
+    installing.value = false;
+  }
+}
+</script>
+
+<template>
+  <!-- Hidden while click-through-locked: the banner is interactive chrome. -->
+  <div
+    v-if="info && !dismissed && !clickThrough"
+    class="border-surface-700 bg-surface-900/95 fixed bottom-2 left-1/2 z-[1100] flex -translate-x-1/2 items-center gap-2 rounded-lg border px-3 py-1.5 text-xs shadow-lg"
+  >
+    <template v-if="!failed">
+      <span>{{ t('updater.available', { version: info.latest }) }}</span>
+      <Button
+        size="small"
+        :label="installing ? t('updater.installing') : t('updater.install')"
+        :loading="installing"
+        @click="install"
+      />
+    </template>
+    <span v-else class="text-amber-400">{{ t('updater.error') }}</span>
+    <button
+      class="pi pi-times text-surface-400 hover:text-surface-0 cursor-pointer text-[10px]"
+      :aria-label="t('close')"
+      @click="dismissed = true"
+    />
+  </div>
+</template>
diff --git a/apps/desktop/src-tauri/Cargo.lock b/apps/desktop/src-tauri/Cargo.lock
index 21a5aee..c910f29 100644
--- a/apps/desktop/src-tauri/Cargo.lock
+++ b/apps/desktop/src-tauri/Cargo.lock
@@ -468,7 +468,7 @@ dependencies = [
  "bitflags 2.11.1",
  "core-foundation",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -1011,6 +1011,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1018,7 +1027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]
 
 [[package]]
@@ -1032,6 +1041,12 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -1586,6 +1601,22 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.20"
@@ -2182,6 +2213,23 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "ndk"
 version = "0.9.0"
@@ -2522,6 +2570,49 @@ version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
+[[package]]
+name = "openssl"
+version = "0.10.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
+dependencies = [
+ "bitflags 2.11.1",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.116"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -2954,6 +3045,42 @@ version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
+[[package]]
+name = "reqwest"
+version = "0.12.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-tls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "native-tls",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-native-tls",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.13.4"
@@ -3050,6 +3177,15 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "rustls-pki-types"
+version = "1.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -3071,6 +3207,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "schemars"
 version = "0.8.22"
@@ -3128,6 +3273,29 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "security-framework"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+dependencies = [
+ "bitflags 2.11.1",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "selectors"
 version = "0.36.1"
@@ -3597,7 +3765,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tarkov-checker-desktop"
-version = "0.0.0"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -3610,6 +3778,7 @@ dependencies = [
  "once_cell",
  "qrcode",
  "regex",
+ "reqwest 0.12.28",
  "rust-embed",
  "serde",
  "serde_json",
@@ -3659,7 +3828,7 @@ dependencies = [
  "percent-encoding",
  "plist",
  "raw-window-handle",
- "reqwest",
+ "reqwest 0.13.4",
  "serde",
  "serde_json",
  "serde_repr",
@@ -3915,6 +4084,19 @@ dependencies = [
  "windows-version",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom 0.4.2",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "tendril"
 version = "0.5.0"
@@ -4061,6 +4243,16 @@ dependencies = [
  "syn 2.0.117",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.18"
@@ -4461,6 +4653,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version-compare"
 version = "0.2.1"
@@ -5674,6 +5872,12 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+
 [[package]]
 name = "zerotrie"
 version = "0.2.4"
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index 0c8bf03..9a270f9 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tarkov-checker-desktop"
-version = "0.0.0"
+version = "0.1.0"
 description = "Desktop wrapper for tarkov-checker"
 authors = ["tarkov-checker"]
 edition = "2021"
@@ -105,6 +105,10 @@ trash = "5"
 # the wrong interface (Hyper-V switch, WSL2 vNIC) — the pairing modal
 # surfaces the picked value so the user notices.
 local-ip-address = "0.6"
+# HTTP client for the portable self-updater (GitHub releases/latest +
+# asset download). native-tls = schannel on Windows — avoids rustls/ring,
+# whose build scripts are flaky on this host (see "Windows build quirks").
+reqwest = { version = "0.12", default-features = false, features = ["native-tls", "json"] }
 
 [dev-dependencies]
 # `oneshot` extension on Router for unit-testing handlers in-process —
diff --git a/apps/desktop/src-tauri/src/commands.rs b/apps/desktop/src-tauri/src/commands.rs
index 8bec51f..c99844f 100644
--- a/apps/desktop/src-tauri/src/commands.rs
+++ b/apps/desktop/src-tauri/src/commands.rs
@@ -173,3 +173,33 @@ pub async fn copy_lan_url(app: AppHandle) -> Result<String, String> {
 pub async fn notify_tray_hint(app: AppHandle, title: String, body: String) -> Result<(), String> {
     crate::notify::show_toast(&app, &title, &body)
 }
+
+/// Asks GitHub whether a newer release exists. `None` = up to date (or the
+/// repo has no published releases yet). Network failures surface as `Err` —
+/// the webview logs and stays silent, no nagging.
+#[tauri::command]
+pub async fn check_update() -> Result<Option<crate::updater::UpdateInfo>, String> {
+    crate::updater::check().await.map_err(|e| format!("{e:#}"))
+}
+
+/// Portable self-update: re-checks GitHub (the webview never supplies a URL,
+/// so it can't point the updater anywhere else), downloads the new exe, swaps
+/// it in via the rename dance, relaunches and exits. See `updater.rs`.
+#[tauri::command]
+pub async fn install_update(app: AppHandle) -> Result<(), String> {
+    let info = crate::updater::check()
+        .await
+        .map_err(|e| format!("{e:#}"))?
+        .ok_or_else(|| "already up to date".to_string())?;
+    let exe = crate::updater::download_and_swap(&info.download_url)
+        .await
+        .map_err(|e| format!("{e:#}"))?;
+    // --updated: the fresh instance sleeps ~1.5s (main.rs) so this one can
+    // release :47474 and the OS hotkeys before it claims them.
+    std::process::Command::new(exe)
+        .arg("--updated")
+        .spawn()
+        .map_err(|e| e.to_string())?;
+    app.exit(0);
+    Ok(())
+}
diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
index 0e48ea6..b189016 100644
--- a/apps/desktop/src-tauri/src/lib.rs
+++ b/apps/desktop/src-tauri/src/lib.rs
@@ -4,6 +4,7 @@ mod http_server;
 mod lan;
 mod notify;
 mod server;
+mod updater;
 mod watcher;
 
 use std::sync::{Arc, Mutex};
@@ -86,10 +87,15 @@ pub fn run() {
             commands::pairing_qr,
             commands::copy_lan_url,
             commands::notify_tray_hint,
+            commands::check_update,
+            commands::install_update,
         ])
         .setup(move |app| {
             let app_handle = app.handle().clone();
 
+            // Sweep the `.old.exe` a previous self-update left behind.
+            updater::cleanup_old();
+
             // Register our AppUserModelID (name + favicon) so the tray-hint
             // toast is attributed to this app instead of PowerShell.
             notify::register_aumid(&app_handle, &data_dir);
diff --git a/apps/desktop/src-tauri/src/main.rs b/apps/desktop/src-tauri/src/main.rs
index 3a329b8..558d446 100644
--- a/apps/desktop/src-tauri/src/main.rs
+++ b/apps/desktop/src-tauri/src/main.rs
@@ -2,5 +2,10 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
+    // Relaunch-after-self-update: give the old instance time to exit and
+    // release :47474 + the OS hotkeys before this one claims them.
+    if std::env::args().any(|a| a == "--updated") {
+        std::thread::sleep(std::time::Duration::from_millis(1500));
+    }
     tarkov_checker_desktop_lib::run()
 }
diff --git a/apps/desktop/src-tauri/src/updater.rs b/apps/desktop/src-tauri/src/updater.rs
new file mode 100644
index 0000000..2676693
--- /dev/null
+++ b/apps/desktop/src-tauri/src/updater.rs
@@ -0,0 +1,263 @@
+//! Portable self-update via GitHub Releases.
+//!
+//! There is no installer: a running exe on Windows can't be deleted or
+//! overwritten, but it CAN be renamed. Install therefore = download the new
+//! exe next to the current one, rename current -> `.old.exe`, rename the
+//! download into the current name, spawn it, exit. The fresh instance removes
+//! the leftover `.old.exe` on startup (`cleanup_old`).
+
+use std::path::{Path, PathBuf};
+use std::time::Duration;
+
+use anyhow::{anyhow, Context};
+use serde::{Deserialize, Serialize};
+
+/// Repo the overlay updates from.
+const REPO: &str = "Mosmain/tarkov-checker";
+/// Release asset to download — CI uploads exactly this name.
+const ASSET_NAME: &str = "tarkov-checker-desktop.exe";
+
+pub fn current_version() -> &'static str {
+    env!("CARGO_PKG_VERSION")
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateInfo {
+    pub current: String,
+    pub latest: String,
+    pub release_url: String,
+    /// Kept internal on purpose: `install_update` re-resolves the URL itself
+    /// so the webview can never point the updater at an arbitrary host.
+    #[serde(skip)]
+    pub download_url: String,
+}
+
+#[derive(Debug, Deserialize)]
+struct Release {
+    tag_name: String,
+    html_url: String,
+    #[serde(default)]
+    assets: Vec<Asset>,
+}
+
+#[derive(Debug, Deserialize)]
+struct Asset {
+    name: String,
+    browser_download_url: String,
+}
+
+/// `"v1.2.3"` / `"1.2.3-rc1"` -> `[1, 2, 3]`. `None` for anything else.
+fn parse_version(s: &str) -> Option<[u64; 3]> {
+    let s = s.trim().trim_start_matches(['v', 'V']);
+    let mut parts = s.split('.');
+    let major = parts.next()?.parse().ok()?;
+    let minor = parts.next()?.parse().ok()?;
+    // tolerate a suffix on the patch ("3-rc1" -> 3)
+    let patch = parts
+        .next()?
+        .split(|c: char| !c.is_ascii_digit())
+        .next()?
+        .parse()
+        .ok()?;
+    if parts.next().is_some() {
+        return None;
+    }
+    Some([major, minor, patch])
+}
+
+/// Strict ">" — equal, older, or unparseable versions are not "newer", so a
+/// malformed tag can never trigger an install loop.
+pub fn is_newer(remote: &str, current: &str) -> bool {
+    match (parse_version(remote), parse_version(current)) {
+        (Some(r), Some(c)) => r > c,
+        _ => false,
+    }
+}
+
+fn client() -> reqwest::Result<reqwest::Client> {
+    reqwest::Client::builder()
+        // api.github.com rejects requests without a User-Agent.
+        .user_agent(concat!("tarkov-checker/", env!("CARGO_PKG_VERSION")))
+        .timeout(Duration::from_secs(60))
+        .build()
+}
+
+/// Latest published release, or `None` when up to date / no releases yet.
+pub async fn check() -> anyhow::Result<Option<UpdateInfo>> {
+    let resp = client()?
+        .get(format!(
+            "https://api.github.com/repos/{REPO}/releases/latest"
+        ))
+        .header("Accept", "application/vnd.github+json")
+        .send()
+        .await
+        .context("releases/latest request")?;
+    // 404 = the repo has no published releases yet.
+    if resp.status() == reqwest::StatusCode::NOT_FOUND {
+        return Ok(None);
+    }
+    let release: Release = resp
+        .error_for_status()
+        .context("releases/latest status")?
+        .json()
+        .await
+        .context("releases/latest body")?;
+
+    if !is_newer(&release.tag_name, current_version()) {
+        return Ok(None);
+    }
+    let asset = release
+        .assets
+        .iter()
+        .find(|a| a.name == ASSET_NAME)
+        .ok_or_else(|| anyhow!("release {} has no {ASSET_NAME} asset", release.tag_name))?;
+    Ok(Some(UpdateInfo {
+        current: current_version().to_string(),
+        latest: release.tag_name.trim_start_matches(['v', 'V']).to_string(),
+        release_url: release.html_url,
+        download_url: asset.browser_download_url.clone(),
+    }))
+}
+
+/// Downloads the new exe and swaps it into place. Returns the path of the
+/// (now replaced) current exe so the caller can respawn it.
+pub async fn download_and_swap(download_url: &str) -> anyhow::Result<PathBuf> {
+    let exe = std::env::current_exe().context("current_exe")?;
+    let bytes = client()?
+        .get(download_url)
+        .send()
+        .await
+        .context("asset download")?
+        .error_for_status()
+        .context("asset download status")?
+        .bytes()
+        .await
+        .context("asset download body")?;
+    // Sanity gate: a PE binary of plausible size, not an HTML error page.
+    if bytes.len() < 1024 * 1024 || !bytes.starts_with(b"MZ") {
+        return Err(anyhow!(
+            "downloaded file does not look like the overlay exe ({} bytes)",
+            bytes.len()
+        ));
+    }
+    let staged = staged_path(&exe);
+    tokio::fs::write(&staged, &bytes)
+        .await
+        .with_context(|| format!("write {}", staged.display()))?;
+    swap(&exe, &staged).with_context(|| format!("swap into {}", exe.display()))?;
+    Ok(exe)
+}
+
+/// The rename dance. On the second rename failing, rolls the first one back
+/// so the app is left runnable.
+fn swap(current: &Path, staged: &Path) -> std::io::Result<()> {
+    let old = old_path(current);
+    let _ = std::fs::remove_file(&old);
+    std::fs::rename(current, &old)?;
+    if let Err(e) = std::fs::rename(staged, current) {
+        let _ = std::fs::rename(&old, current);
+        return Err(e);
+    }
+    Ok(())
+}
+
+fn staged_path(current: &Path) -> PathBuf {
+    current.with_extension("new.exe")
+}
+
+fn old_path(current: &Path) -> PathBuf {
+    current.with_extension("old.exe")
+}
+
+/// Remove the `.old.exe` left by a previous update. Runs on a background
+/// thread with retries — the previous instance may still be exiting (it can't
+/// be deleted until its process is gone).
+pub fn cleanup_old() {
+    std::thread::spawn(|| {
+        let Ok(exe) = std::env::current_exe() else {
+            return;
+        };
+        let old = old_path(&exe);
+        for _ in 0..20 {
+            if !old.exists() || std::fs::remove_file(&old).is_ok() {
+                return;
+            }
+            std::thread::sleep(Duration::from_millis(250));
+        }
+    });
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // --- version comparison ------------------------------------------------
+
+    #[test]
+    fn is_newer_basic() {
+        assert!(is_newer("0.2.0", "0.1.0"));
+        assert!(is_newer("1.0.0", "0.9.9"));
+        assert!(!is_newer("0.1.0", "0.1.0"));
+        assert!(!is_newer("0.1.0", "0.2.0"));
+    }
+
+    #[test]
+    fn is_newer_strips_tag_prefix() {
+        assert!(is_newer("v0.2.0", "0.1.0"));
+        assert!(is_newer("V0.2.0", "v0.1.0"));
+    }
+
+    #[test]
+    fn is_newer_tolerates_patch_suffix() {
+        assert!(is_newer("0.2.0-rc1", "0.1.0"));
+    }
+
+    #[test]
+    fn is_newer_rejects_garbage() {
+        assert!(!is_newer("latest", "0.1.0"));
+        assert!(!is_newer("0.2", "0.1.0"));
+        assert!(!is_newer("0.2.0.1", "0.1.0"));
+        assert!(!is_newer("0.2.0", "not-a-version"));
+    }
+
+    // --- rename dance ------------------------------------------------------
+
+    fn temp_file(name: &str, contents: &[u8]) -> PathBuf {
+        let p = std::env::temp_dir().join(format!("tc-updater-test-{}-{name}", std::process::id()));
+        std::fs::write(&p, contents).unwrap();
+        p
+    }
+
+    #[test]
+    fn swap_replaces_current_and_keeps_old() {
+        let current = temp_file("current.exe", b"OLD");
+        let staged = temp_file("current.new.exe", b"NEW");
+        // temp_file names don't follow with_extension semantics — rename
+        // staged to the path swap() derives.
+        let staged_real = staged_path(&current);
+        std::fs::rename(&staged, &staged_real).unwrap();
+
+        swap(&current, &staged_real).unwrap();
+
+        assert_eq!(std::fs::read(&current).unwrap(), b"NEW");
+        assert_eq!(std::fs::read(old_path(&current)).unwrap(), b"OLD");
+        assert!(!staged_real.exists());
+
+        let _ = std::fs::remove_file(&current);
+        let _ = std::fs::remove_file(old_path(&current));
+    }
+
+    #[test]
+    fn swap_rolls_back_when_staged_missing() {
+        let current = temp_file("rollback.exe", b"OLD");
+        let staged = staged_path(&current); // never created
+
+        assert!(swap(&current, &staged).is_err());
+        // first rename rolled back — the app is still launchable
+        assert_eq!(std::fs::read(&current).unwrap(), b"OLD");
+        assert!(!old_path(&current).exists());
+
+        let _ = std::fs::remove_file(&current);
+    }
+}
diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json
index 70ee789..fd9588c 100644
--- a/apps/desktop/src-tauri/tauri.conf.json
+++ b/apps/desktop/src-tauri/tauri.conf.json
@@ -1,7 +1,6 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0",
   "productName": "tarkov-checker",
-  "version": "0.0.0",
   "identifier": "dev.tarkov-checker.desktop",
   "build": {
     "frontendDist": "../../client/dist",
diff --git a/package.json b/package.json
index 535166c..eae9341 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "test": "turbo run test",
     "format": "prettier --check .",
     "format:fix": "prettier --write .",
-    "overlay:build": "pnpm --filter @tarkov-checker/shared build && pnpm --filter @tarkov-checker/client build && pnpm --filter @tarkov-checker/desktop tauri build",
+    "build:overlay": "pnpm --filter @tarkov-checker/shared build && pnpm --filter @tarkov-checker/client build && pnpm --filter @tarkov-checker/desktop tauri build",
     "shared:gen-rust-regex": "node packages/shared/scripts/gen-rust-regex.mjs",
     "shared:gen-rust-regex:check": "node packages/shared/scripts/gen-rust-regex.mjs && git diff --exit-code apps/desktop/src-tauri/src/server/parse_log_regexes.rs apps/desktop/src-tauri/src/server/parse_screenshot_regexes.rs"
   },