From 8f179dec533c92c20994d8ead251d2202fb496f5 Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 07:37:11 -0600
Subject: [PATCH 1/9] fix(meshcore): send empty room guest passwords instead of
 hello

Stop substituting blank guest login with the older "hello" default so Login matches MeshCore guidance (try empty first).
---
 README.md                                     |  2 +-
 docs/agents/meshcore-rooms.md                 |  2 +-
 docs/meshcore-meshtastic-parity.md            |  2 +-
 docs/troubleshooting.md                       | 10 +++---
 src/renderer/components/RoomsPanel.test.tsx   | 35 ++++++++++++++++---
 src/renderer/components/RoomsPanel.tsx        | 24 +++++++------
 .../hooks/useMeshcoreRoomAuth.test.tsx        | 14 ++++++++
 .../lib/meshcoreInfraAdminSecrets.test.ts     |  9 +++++
 src/renderer/lib/meshcoreInfraAdminSecrets.ts |  9 ++---
 .../lib/meshcoreRoomCredentialStorage.test.ts | 20 +++++++++--
 .../lib/meshcoreRoomCredentialStorage.ts      | 34 ++++++++++++------
 src/renderer/lib/meshcoreRoomSession.test.ts  | 23 ++++++++++++
 src/renderer/lib/meshcoreRoomSession.ts       | 10 ++++--
 src/renderer/locales/en/translation.json      | 12 +++----
 14 files changed, 157 insertions(+), 49 deletions(-)

diff --git a/README.md b/README.md
index 63ea6b2cc..83706659d 100644
--- a/README.md
+++ b/README.md
@@ -258,7 +258,7 @@ MeshCore runs simultaneously alongside Meshtastic and Reticulum. Use the protoco
 
 **Room servers (BBS)** — **Rooms** tab (RF only; not MQTT)
 
-- Login to room-server contacts (guest read-only or admin post); **Continue read-only** when the server guest password is empty (zero-byte password, matching the official Android client)
+- Login to room-server contacts (guest read-only or admin post); try an **empty guest password** first (zero-byte SendLogin, matching official clients); **"hello"** is the older default if empty fails; **Continue read-only** also sends no password
 - Post plain UTF-8 after login; inbound **SignedPlain** pushes show author prefix stripped in the UI
 - **Remember password**, **Auto-sync** (periodic re-login while connected, minimum 60 minutes per room), per-room unread badges (sidebar **Rooms** tab; separate from **Chat** badges)
 - Room admin CLI / ACL setperm on the **Repeaters** tab (room rows); Rooms Members still call `get acl` via the same CLI path. Session/login queue and path sync in `meshcoreRoom*.ts` — see [docs/meshcore-meshtastic-parity.md](docs/meshcore-meshtastic-parity.md#meshcore-room-servers) and [Troubleshooting](docs/troubleshooting.md#meshcore-room-server-login-posts-and-windows-10)
diff --git a/docs/agents/meshcore-rooms.md b/docs/agents/meshcore-rooms.md
index 3520139e7..a486552e2 100644
--- a/docs/agents/meshcore-rooms.md
+++ b/docs/agents/meshcore-rooms.md
@@ -2,7 +2,7 @@
 
 Deep subsystem reference for AI assistants. Open this when a task touches MeshCore Rooms login/post, session RPCs, saved passwords, auto-sync scheduling, or room wire text. Hard rules live in [`AGENTS.md`](../../AGENTS.md).
 
-- **UI:** `RoomsPanel.tsx` — login overlay, post composer (`ChatComposer`), auto-sync toggles, Members ACL refresh (`get acl`); **Manage on Repeaters** jumps to Repeaters & Rooms ops (CLI / setperm / infra). Sidebar badge via `meshcoreRoomsUnread.ts` (`mesh-client:meshcoreRoomsUnread`).
+- **UI:** `RoomsPanel.tsx` — login overlay, post composer (`ChatComposer`), auto-sync toggles, Members ACL refresh (`get acl`); **Manage on Repeaters** jumps to Repeaters & Rooms ops (CLI / setperm / infra). Sidebar badge via `meshcoreRoomsUnread.ts` (`mesh-client:meshcoreRoomsUnread`). Empty guest **Login** sends zero password bytes (try empty first; `"hello"` is the older default); **Continue read-only** sends the same empty password.
 - **Ops (not on Rooms tab):** Ping / Status / Neighbors / Sensor / CLI / ACL setperm live on `RepeatersPanel` (mixed Repeater + Room table). **Open room** on a room row jumps back to Rooms. Guest passwords stay in `meshcoreRoomCredentialStorage`; ops admin uses `meshcoreInfraAdminSecrets` (admin-only records allowed).
 - **Room remote CLI:** needs room **admin** password via SendLogin ACL (`meshcoreCancelRoomLogin` then admin login inside `sendRepeaterCliCommand`); guest BBS login is not enough (`repeatersPanel.roomCliNeedsAdminPassword`).
 - **Post length (single-packet):** room posts use the shared `ChatComposer` (`variant="room"`) and are **single-packet** like MeshCore chat — over the room payload limit (`getMeshcoreRoomPayloadLimit` in `chatComposerLimits.ts`) the send is blocked with the same `meshcoreSingleNotice` callout rather than split into `[i/N]` parts, and the ~5s fast-send advisory applies. See [`chat.md`](chat.md) (Composer limits / send cadence).
diff --git a/docs/meshcore-meshtastic-parity.md b/docs/meshcore-meshtastic-parity.md
index 2443bdbf7..fbb3528bf 100644
--- a/docs/meshcore-meshtastic-parity.md
+++ b/docs/meshcore-meshtastic-parity.md
@@ -52,7 +52,7 @@ Shared UI gates use `ProtocolCapabilities` in [`src/renderer/lib/radio/BaseRadio
 
 Room servers (`hw_model === 'Room'`, contact type 3) are BBS nodes on the mesh. The companion radio must be connected over **RF** (BLE, serial, or TCP); **MQTT does not carry room login/post**.
 
-**Login:** Guest read-only uses **zero password bytes** when the server guest password is empty (**Continue read-only** on the login overlay). Admin login uses the configured password. Login RPC, queue, and path sync live under `src/renderer/lib/meshcoreRoom*.ts` (e.g. [`meshcoreRoomLoginRpc.ts`](../src/renderer/lib/meshcoreRoomLoginRpc.ts), [`meshcoreRoomLoginQueue.ts`](../src/renderer/lib/meshcoreRoomLoginQueue.ts)); timeouts are shorter on TCP and 0-hop paths ([`timeConstants.ts`](../src/renderer/lib/timeConstants.ts)).
+**Login:** Guest Login with an empty password sends **zero password bytes** (same wire as **Continue read-only**). Prefer empty first; **`hello`** is the older factory default. Admin login uses the configured password. Login RPC, queue, and path sync live under `src/renderer/lib/meshcoreRoom*.ts` (e.g. [`meshcoreRoomLoginRpc.ts`](../src/renderer/lib/meshcoreRoomLoginRpc.ts), [`meshcoreRoomLoginQueue.ts`](../src/renderer/lib/meshcoreRoomLoginQueue.ts)); timeouts are shorter on TCP and 0-hop paths ([`timeConstants.ts`](../src/renderer/lib/timeConstants.ts)).
 
 **Posts:** Outbound room posts use plain UTF-8 (`TXT_TYPE_PLAIN`) after login and are **single-packet** — mesh-client does not emit multi-part `[i/N]` room posts; over-limit text is blocked in the composer (same rationale as chat/DM). Inbound **SignedPlain** pushes include a four-byte author prefix; the **Rooms** UI strips it, and inbound multi-part from other clients is still merged for display. Posts appear in the **Rooms** tab (channel `-2`), not Chat channel pills.
 
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 3e3cd1af1..1a83a434f 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -892,9 +892,9 @@ The client deduplicates overlapping RF and MQTT hears within **5 minutes** (cros
 
 **Guest / read-only login fails with timeout or "rejected"**:
 
-- When the room server **guest password is empty**, use **Continue read-only** on the Rooms login overlay. That sends **zero password bytes** (same as the official Android app). **Login** with an empty guest field is disabled; it would send the default **`hello`** password instead.
-- When the server **does** configure a guest password, enter that value in the guest field and click **Login** (some communities use **`hello`**).
-- **Room admin CLI** (**Repeaters** tab → room row CLI; needs the room **admin** password via SendLogin ACL, not guest BBS login): many stock room servers use **`hello`** as the default admin password when none was configured. Save the admin password under Repeaters → password for that room. Do not confuse that with **Continue read-only** on the Rooms login overlay, which sends zero bytes for blank guest servers.
+- Try **Login** with an **empty** guest field first. That sends **zero password bytes** (same as the official Android app and **Continue read-only**). Most rooms leave the guest password blank for guests.
+- If empty login fails, try the older default guest password **`hello`**.
+- **Room admin CLI** (**Repeaters** tab → room row CLI; needs the room **admin** password via SendLogin ACL, not guest BBS login): many stock room servers use **`hello`** as the default admin password when none was configured. Save the admin password under Repeaters → password for that room. Do not confuse that with blank guest Login / **Continue read-only**, which send zero bytes.
 - Logs showing push **`0x86`** (frame 134) mean **LoginFail** (wrong password or ACL denied). **Room login** rejects immediately on a prefix-matched LoginFail. **Repeater admin login** keeps waiting for a possible LoginSuccess (meshcore.js behavior on congested links); timeout after LoginFail alone is reported as timeout, not wrong password.
 - **Admin password** working while guest/read-only fails usually means the guest password on the server does not match what the client sent, or ACL denies read-only login.
 - If the room **changed its password** and mesh-client keeps trying to log in, open the **Rooms** tab: expand **Saved passwords** in the sidebar (or use the login overlay for the selected room). Use **Stop auto-login** to stop connect-time retries while keeping the old password stored, or **Forget saved password** to clear the stored guest/admin password and turn off auto-login and auto-sync. After a wrong-password failure, auto-login is turned off automatically until you log in again with **Remember password** or re-enable it.
@@ -935,7 +935,7 @@ The client deduplicates overlapping RF and MQTT hears within **5 minutes** (cros
 
 **Read-only → write upgrade does nothing**:
 
-- After **Continue read-only**, use **Upgrade access** (or **Login** with the guest password) so the client sends a fresh **SendLogin** with `forceRelogin`. Enter the real guest password (often **`hello`**); empty field Login is disabled on the main overlay to avoid sending `hello` when the server expects blank read-only login.
+- After **Continue read-only**, use **Upgrade access** (or **Login** with the guest password) so the client sends a fresh **SendLogin** with `forceRelogin`. If the room still uses a guest password, enter it (often **`hello`** on older servers); an empty field cannot upgrade write access.
 
 **Long room posts show as `[1/2]`, `[2/2]`…**:
 
@@ -954,7 +954,7 @@ The client deduplicates overlapping RF and MQTT hears within **5 minutes** (cros
 **Retest checklist (after upgrading from a known-good build)**:
 
 1. Connect MeshCore over TCP or BLE; confirm nodes load.
-2. Open **Rooms** → with **empty guest password** on the server, click **Continue read-only** (not **Login** with an empty field). With a configured guest password, enter it and click **Login**.
+2. Open **Rooms** → try **Login** with an **empty** guest field first (or **Continue read-only**). If that fails, try **`hello`**. With a configured guest password, enter it and click **Login**.
 3. Post as admin; confirm the post appears in the **official Android app** on the same room (SignedPlain BBS path).
 4. Confirm room posts appear in **Rooms** with unread badges (not Chat channel pills).
 5. On **Connection** tab, receive a **channel** message on a channel you are not viewing → sidebar **Chat** badge and red pill on that channel when you open Chat.
diff --git a/src/renderer/components/RoomsPanel.test.tsx b/src/renderer/components/RoomsPanel.test.tsx
index f329c48fb..73482ed9b 100644
--- a/src/renderer/components/RoomsPanel.test.tsx
+++ b/src/renderer/components/RoomsPanel.test.tsx
@@ -167,6 +167,9 @@ describe('RoomsPanel', () => {
     const onLoginRoom = vi.fn().mockResolvedValue(undefined);
     renderRoomsPanel(nodes, { initialRoomTarget: room.node_id, onLoginRoom });
 
+    fireEvent.change(screen.getByLabelText('roomsPanel.guestPasswordLabel'), {
+      target: { value: 'hello' },
+    });
     fireEvent.click(screen.getByRole('button', { name: 'roomsPanel.upgradeAccess' }));
 
     await waitFor(() => {
@@ -275,14 +278,36 @@ describe('RoomsPanel', () => {
     });
   });
 
-  it('disables Login when guest password field is empty', () => {
+  it('allows Login with empty guest password and sends blank', async () => {
+    meshcoreClearAllRoomSessions();
     const room = makeRoom(0x1004, 'Empty Guest Room');
     const nodes = new Map<number, MeshNode>([[room.node_id, room]]);
-    renderRoomsPanel(nodes, { initialRoomTarget: room.node_id });
-    fireEvent.change(screen.getByLabelText('roomsPanel.guestPasswordLabel'), {
-      target: { value: '' },
+    const onLoginRoom = vi.fn().mockResolvedValue(undefined);
+    renderRoomsPanel(nodes, { initialRoomTarget: room.node_id, onLoginRoom });
+    expect(screen.getByLabelText('roomsPanel.guestPasswordLabel')).toHaveValue('');
+    expect(screen.getByText('roomsPanel.emptyGuestLoginHint')).toBeInTheDocument();
+    expect(screen.getByText('roomsPanel.loginButton')).not.toBeDisabled();
+    fireEvent.click(screen.getByText('roomsPanel.loginButton'));
+    await waitFor(() => {
+      expect(onLoginRoom).toHaveBeenCalledWith(
+        room.node_id,
+        '',
+        expect.objectContaining({ guestPassword: '' }),
+      );
     });
-    expect(screen.getByText('roomsPanel.loginButton')).toBeDisabled();
+  });
+
+  it('disables Upgrade access when guest password field is empty', () => {
+    meshcoreClearAllRoomSessions();
+    const room = makeRoom(0x100d, 'Upgrade Empty Room');
+    const nodes = new Map<number, MeshNode>([[room.node_id, room]]);
+    meshcoreApplyRoomSession(room.node_id, {
+      guestPassword: '',
+      adminPassword: '',
+      role: 'readonly',
+    });
+    renderRoomsPanel(nodes, { initialRoomTarget: room.node_id });
+    expect(screen.getByRole('button', { name: 'roomsPanel.upgradeAccess' })).toBeDisabled();
     expect(screen.getByText('roomsPanel.emptyGuestLoginHint')).toBeInTheDocument();
   });
 
diff --git a/src/renderer/components/RoomsPanel.tsx b/src/renderer/components/RoomsPanel.tsx
index aa76daaf8..ec8b2c85e 100644
--- a/src/renderer/components/RoomsPanel.tsx
+++ b/src/renderer/components/RoomsPanel.tsx
@@ -71,7 +71,6 @@ import {
   getMeshcoreRoomSavedSecretsSummary,
 } from '@/renderer/lib/meshcoreRoomSavedSecrets';
 import {
-  MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD,
   meshcoreCancelAllRoomLogins,
   meshcoreGetRoomSession,
   meshcoreIsRoomLoggedIn,
@@ -264,7 +263,7 @@ export default function RoomsPanel({
   const [selectedRoomId, setSelectedRoomId] = useState<number | null>(
     () => initialRoomTarget ?? null,
   );
-  const [loginPassword, setLoginPassword] = useState(MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD);
+  const [loginPassword, setLoginPassword] = useState('');
   /** Tracks in-flight login promises before the shared queue snapshot updates (tests / fast paths). */
   const [localLoginRoomIds, setLocalLoginRoomIds] = useState<Set<number>>(() => new Set());
   const [leaveLoadingRoomIds, setLeaveLoadingRoomIds] = useState<Set<number>>(() => new Set());
@@ -812,7 +811,7 @@ export default function RoomsPanel({
         next.delete(nodeId);
         return next;
       });
-      setLoginPassword(MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD);
+      setLoginPassword('');
       setRememberPassword(false);
       loadSyncConfig(nodeId);
     },
@@ -946,7 +945,7 @@ export default function RoomsPanel({
         forceRelogin,
       });
       if (rememberPassword) refreshStoredRooms();
-      setLoginPassword(MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD);
+      setLoginPassword('');
     });
   }, [
     loginPassword,
@@ -1276,8 +1275,13 @@ export default function RoomsPanel({
       : savedRoomsNotLoggedInCount === 0
         ? t('roomsPanel.loginAllSavedDisabledAllLoggedIn')
         : '';
-  const loginButtonEnabled = isConnected && !guestFieldEmpty && !selectedRoomLoginLoading;
-  const loginButtonClass = loginButtonEnabled
+  /** Overlay Login may send a zero-byte password; upgrade needs a non-empty guest password. */
+  const overlayLoginEnabled = isConnected && !selectedRoomLoginLoading;
+  const upgradeLoginEnabled = overlayLoginEnabled && !guestFieldEmpty;
+  const overlayLoginButtonClass = overlayLoginEnabled
+    ? 'border-readable-green bg-readable-green w-full cursor-pointer rounded border px-3 py-2 text-sm font-semibold text-white hover:bg-readable-green/90'
+    : 'w-full cursor-not-allowed rounded border border-gray-600 bg-gray-700 px-3 py-2 text-sm font-medium text-gray-500';
+  const upgradeLoginButtonClass = upgradeLoginEnabled
     ? 'border-readable-green bg-readable-green w-full cursor-pointer rounded border px-3 py-2 text-sm font-semibold text-white hover:bg-readable-green/90'
     : 'w-full cursor-not-allowed rounded border border-gray-600 bg-gray-700 px-3 py-2 text-sm font-medium text-gray-500';
   const selectedRoomLeaveLoading =
@@ -1738,8 +1742,8 @@ export default function RoomsPanel({
                 <button
                   type="button"
                   onClick={handleLogin}
-                  disabled={!loginButtonEnabled}
-                  className={loginButtonClass}
+                  disabled={!overlayLoginEnabled}
+                  className={overlayLoginButtonClass}
                 >
                   {t('roomsPanel.loginButton')}
                 </button>
@@ -2657,8 +2661,8 @@ export default function RoomsPanel({
                     <button
                       type="button"
                       onClick={handleLogin}
-                      disabled={!loginButtonEnabled}
-                      className={loginButtonClass}
+                      disabled={!upgradeLoginEnabled}
+                      className={upgradeLoginButtonClass}
                       aria-label={t('roomsPanel.upgradeAccess')}
                     >
                       {selectedRoomLoginLoading
diff --git a/src/renderer/hooks/useMeshcoreRoomAuth.test.tsx b/src/renderer/hooks/useMeshcoreRoomAuth.test.tsx
index c5687abac..e2e0cc804 100644
--- a/src/renderer/hooks/useMeshcoreRoomAuth.test.tsx
+++ b/src/renderer/hooks/useMeshcoreRoomAuth.test.tsx
@@ -100,4 +100,18 @@ describe('useMeshcoreRoomAuth', () => {
     expect(await screen.findByText('roomsPanel.loginTitle')).toBeInTheDocument();
     expect(screen.getByText('roomsPanel.continueReadOnly')).toBeInTheDocument();
   });
+
+  it('saves empty guest password without substituting hello', async () => {
+    render(<RoomAuthProbe nodeId={0xabc} mode="guest" roomName="Blank Guest Room" />);
+    fireEvent.click(screen.getByText('request-auth'));
+    expect(await screen.findByText('roomsPanel.loginTitle')).toBeInTheDocument();
+
+    fireEvent.click(screen.getByText('roomsPanel.loginButton'));
+
+    await waitFor(() => {
+      expect(screen.getByTestId('auth-result')).toHaveTextContent(
+        JSON.stringify({ ok: true, guestPassword: '' }),
+      );
+    });
+  });
 });
diff --git a/src/renderer/lib/meshcoreInfraAdminSecrets.test.ts b/src/renderer/lib/meshcoreInfraAdminSecrets.test.ts
index 7a29ab4a9..79be9abd2 100644
--- a/src/renderer/lib/meshcoreInfraAdminSecrets.test.ts
+++ b/src/renderer/lib/meshcoreInfraAdminSecrets.test.ts
@@ -88,6 +88,15 @@ describe('meshcoreInfraAdminSecrets', () => {
     });
   });
 
+  it('room forgetAdmin keeps remembered blank guest password', async () => {
+    await setMeshcoreRoomCredential(0x32, {
+      guestPassword: '',
+      adminPassword: 'admin',
+    });
+    await forgetAdminPassword(0x32, 'Room');
+    expect(getMeshcoreRoomCredential(0x32)).toEqual({ guestPassword: '' });
+  });
+
   it('hasResolvableAdminPassword is true for persisted room admin without BBS session', async () => {
     expect(hasResolvableAdminPassword(0x40, 'Room')).toBe(false);
     await setAdminPassword(0x40, 'Room', 'admin', { persist: true });
diff --git a/src/renderer/lib/meshcoreInfraAdminSecrets.ts b/src/renderer/lib/meshcoreInfraAdminSecrets.ts
index c0fee4b72..96e9fbc43 100644
--- a/src/renderer/lib/meshcoreInfraAdminSecrets.ts
+++ b/src/renderer/lib/meshcoreInfraAdminSecrets.ts
@@ -104,12 +104,13 @@ export async function forgetAdminPassword(
     clearRoomEphemeralAdminPassword(nodeId);
     const prev = getMeshcoreRoomCredential(nodeId);
     if (!prev) return;
-    const guest = prev.guestPassword?.trim() ?? '';
-    if (!guest) {
-      await setMeshcoreRoomCredential(nodeId, null);
+    // Keep an explicit guestPassword (including remembered blank); only drop the whole
+    // record when there is no guest field left after clearing admin.
+    if (Object.prototype.hasOwnProperty.call(prev, 'guestPassword')) {
+      await setMeshcoreRoomCredential(nodeId, { guestPassword: prev.guestPassword ?? '' });
       return;
     }
-    await setMeshcoreRoomCredential(nodeId, { guestPassword: guest });
+    await setMeshcoreRoomCredential(nodeId, null);
     return;
   }
   await forgetMeshcoreRepeaterSavedSecret(nodeId);
diff --git a/src/renderer/lib/meshcoreRoomCredentialStorage.test.ts b/src/renderer/lib/meshcoreRoomCredentialStorage.test.ts
index 7d46aae4a..37d873250 100644
--- a/src/renderer/lib/meshcoreRoomCredentialStorage.test.ts
+++ b/src/renderer/lib/meshcoreRoomCredentialStorage.test.ts
@@ -50,17 +50,31 @@ describe('meshcoreRoomCredentialStorage', () => {
     });
   });
 
-  it('rejects empty guest and admin objects', () => {
+  it('persists remembered blank guest password', async () => {
+    await setMeshcoreRoomCredential(0x1005, { guestPassword: '', adminPassword: '' });
+    expect(getMeshcoreRoomCredential(0x1005)).toEqual({ guestPassword: '' });
+  });
+
+  it('reads explicit empty guestPassword from storage', () => {
     localStorage.setItem(
       APP_SETTINGS_STORAGE_KEY,
       JSON.stringify({
         [meshcoreRoomCredentialSettingForNode(0x2003)]: JSON.stringify({
           guestPassword: '',
-          adminPassword: '',
         }),
       }),
     );
-    expect(getMeshcoreRoomCredential(0x2003)).toBeUndefined();
+    expect(getMeshcoreRoomCredential(0x2003)).toEqual({ guestPassword: '' });
+  });
+
+  it('rejects empty objects without guestPassword or adminPassword', () => {
+    localStorage.setItem(
+      APP_SETTINGS_STORAGE_KEY,
+      JSON.stringify({
+        [meshcoreRoomCredentialSettingForNode(0x2004)]: JSON.stringify({}),
+      }),
+    );
+    expect(getMeshcoreRoomCredential(0x2004)).toBeUndefined();
   });
 
   it('clears credential when set to null', async () => {
diff --git a/src/renderer/lib/meshcoreRoomCredentialStorage.ts b/src/renderer/lib/meshcoreRoomCredentialStorage.ts
index fbb0a5200..d972cf8a4 100644
--- a/src/renderer/lib/meshcoreRoomCredentialStorage.ts
+++ b/src/renderer/lib/meshcoreRoomCredentialStorage.ts
@@ -15,17 +15,29 @@ export interface MeshcoreRoomStoredCredential {
 }
 
 function parseCredentialValue(raw: unknown): MeshcoreRoomStoredCredential | undefined {
-  return parseLegacyCredentialRaw(raw, {
+  return parseLegacyCredentialRaw<MeshcoreRoomStoredCredential>(raw, {
     fromPlainString: (value) => ({ guestPassword: value }),
     fromObject: (o) => {
-      const storedGuestPassword = typeof o.guestPassword === 'string' ? o.guestPassword : '';
+      const hasExplicitGuestPassword = Object.prototype.hasOwnProperty.call(o, 'guestPassword');
+      const storedGuestPassword =
+        hasExplicitGuestPassword && typeof o.guestPassword === 'string' ? o.guestPassword : '';
       const legacyGuestPassword = typeof o.password === 'string' ? o.password : '';
-      const guestPassword = storedGuestPassword || legacyGuestPassword;
+      // Prefer explicit guestPassword (including "") over legacy password. Legacy empty
+      // password alone is not a remembered blank credential.
+      const guestPassword = hasExplicitGuestPassword ? storedGuestPassword : legacyGuestPassword;
       const adminRaw = typeof o.adminPassword === 'string' ? o.adminPassword.trim() : '';
       const adminPassword = adminRaw.length > 0 ? adminRaw : undefined;
-      // Persist when either guest or admin is non-empty (ops can save admin-only).
-      if (!guestPassword && !adminPassword) return undefined;
-      return { guestPassword, adminPassword };
+      // Persist when guestPassword key was saved (including empty) or admin is non-empty.
+      if (!hasExplicitGuestPassword && !guestPassword && !adminPassword) return undefined;
+      if (!(hasExplicitGuestPassword || guestPassword || adminPassword)) return undefined;
+      const out: MeshcoreRoomStoredCredential = {};
+      if (hasExplicitGuestPassword || guestPassword.length > 0) {
+        out.guestPassword = guestPassword;
+      }
+      if (adminPassword != null) {
+        out.adminPassword = adminPassword;
+      }
+      return out;
     },
   });
 }
@@ -35,13 +47,15 @@ const roomCredentialStorage: MeshcorePerNodeCredentialStorage<MeshcoreRoomStored
     prefix: MESHCORE_ROOM_CREDENTIAL_SETTING_PREFIX,
     logTag: 'meshcoreRoomCredentialStorage',
     parseValue: parseCredentialValue,
-    serialize: (cred) =>
-      JSON.stringify({
-        ...((cred.guestPassword ?? '').length > 0 ? { guestPassword: cred.guestPassword } : {}),
+    serialize: (cred) => {
+      const hasGuest = Object.prototype.hasOwnProperty.call(cred, 'guestPassword');
+      return JSON.stringify({
+        ...(hasGuest ? { guestPassword: cred.guestPassword ?? '' } : {}),
         ...(cred.adminPassword != null && cred.adminPassword.length > 0
           ? { adminPassword: cred.adminPassword }
           : {}),
-      }),
+      });
+    },
   });
 export function meshcoreRoomCredentialSettingForNode(nodeId: number): string {
   return roomCredentialStorage.settingKeyForNode(nodeId);
diff --git a/src/renderer/lib/meshcoreRoomSession.test.ts b/src/renderer/lib/meshcoreRoomSession.test.ts
index d7e6146c9..898a38d8f 100644
--- a/src/renderer/lib/meshcoreRoomSession.test.ts
+++ b/src/renderer/lib/meshcoreRoomSession.test.ts
@@ -1,6 +1,7 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import {
+  MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD,
   MESHCORE_ROOM_LOGIN_ABORT_MESSAGE,
   MESHCORE_ROOM_LOGIN_NO_ROUTE_MESSAGE,
   meshcoreApplyRoomSession,
@@ -11,9 +12,11 @@ import {
   meshcoreIsRoomLoginAbortError,
   meshcoreRoomCanPost,
   meshcoreRoomCliRequiresAdmin,
+  meshcoreRoomEffectiveGuestPassword,
   meshcoreRoomLogin,
   meshcoreRoomLoginErrorIsAuthFailure,
   meshcoreRoomLoginErrorIsNoRoute,
+  meshcoreRoomLoginFailureMessage,
   meshcoreRoomLogout,
   meshcoreRoomTryAdminLogin,
   meshcoreRoomTryRelogin,
@@ -54,6 +57,26 @@ describe('meshcoreRoomSession', () => {
     expect(meshcoreRoomCanPost(0xabc)).toBe(false);
   });
 
+  it('meshcoreRoomEffectiveGuestPassword trims without substituting hello', () => {
+    expect(meshcoreRoomEffectiveGuestPassword('')).toBe('');
+    expect(meshcoreRoomEffectiveGuestPassword('  ')).toBe('');
+    expect(meshcoreRoomEffectiveGuestPassword('  secret  ')).toBe('secret');
+    expect(meshcoreRoomEffectiveGuestPassword(MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD)).toBe('hello');
+  });
+
+  it('meshcoreRoomLoginFailureMessage distinguishes blank vs hello guest', () => {
+    const rejected = new Error('room login rejected (wrong password or ACL denied)');
+    expect(meshcoreRoomLoginFailureMessage(rejected, '')).toEqual({
+      key: 'meshcore.errors.roomLogin.rejectedBlankGuest',
+    });
+    expect(meshcoreRoomLoginFailureMessage(rejected, 'hello')).toEqual({
+      key: 'meshcore.errors.roomLogin.rejectedDefaultGuest',
+    });
+    expect(meshcoreRoomLoginFailureMessage(rejected, 'other')).toEqual({
+      key: 'meshcore.errors.roomLogin.rejectedCheckPassword',
+    });
+  });
+
   it('allows posting for readwrite session', () => {
     meshcoreClearAllRoomSessions();
     meshcoreApplyRoomSession(0xabc, {
diff --git a/src/renderer/lib/meshcoreRoomSession.ts b/src/renderer/lib/meshcoreRoomSession.ts
index 0ca91ba7c..21c10c667 100644
--- a/src/renderer/lib/meshcoreRoomSession.ts
+++ b/src/renderer/lib/meshcoreRoomSession.ts
@@ -198,7 +198,10 @@ export function meshcoreApplyRoomSession(
   notifyRoomSessionChanged();
 }
 
-/** Default room guest password when firmware uses factory defaults (see MeshCore ROOM_PASSWORD). */
+/**
+ * Older factory default guest password (MeshCore ROOM_PASSWORD). Prefer empty first;
+ * users may still type this on servers that never cleared the legacy default.
+ */
 export const MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD = 'hello';
 
 /** Thrown when multi-hop login has no route bytes after resolve/trace. */
@@ -208,11 +211,12 @@ export const MESHCORE_ROOM_LOGIN_NO_ROUTE_MESSAGE = 'meshcore.errors.roomLogin.n
 export const MESHCORE_ROOM_LOGIN_PATH_SYNC_FAILED_MESSAGE =
   'meshcore.errors.roomLogin.pathSyncFailed';
 
+/** Trim guest password for SendLogin; empty stays empty (zero-byte password field). */
 export function meshcoreRoomEffectiveGuestPassword(password: string): string {
-  return password.trim() || MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD;
+  return password.trim();
 }
 
-/** True when Login sent the factory default guest password (empty field → hello). */
+/** True when Login sent the older factory default guest password `"hello"`. */
 export function meshcoreRoomUsedDefaultGuestPassword(password: string): boolean {
   return password === MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD;
 }
diff --git a/src/renderer/locales/en/translation.json b/src/renderer/locales/en/translation.json
index c35b61dfc..0567db11a 100644
--- a/src/renderer/locales/en/translation.json
+++ b/src/renderer/locales/en/translation.json
@@ -2308,11 +2308,11 @@
         "noRoute": "No route to this room server. Trace the node from the map or wait for path adverts, then try again.",
         "pathSyncFailed": "Could not program the route on your radio before login. Reconnect the device and try again.",
         "pathSyncFailedDetail": "Could not program the route on your radio before login. Reconnect the device and try again.{{detail}}",
-        "rejectedBlankGuest": "Room login rejected. Use Continue read-only for blank guest password, or try guest password \"hello\".",
-        "rejectedDefaultGuest": "Room login rejected. If this server has no guest password, use Continue read-only instead of Login. Otherwise check the guest or admin password.",
+        "rejectedBlankGuest": "Room login rejected. Try guest password \"hello\" (older default), or check whether this server allows blank guest login.",
+        "rejectedDefaultGuest": "Room login rejected. Leave the guest field empty and try Login again, or check the guest or admin password.",
         "rejectedCheckPassword": "Room login rejected. Check the guest or admin password for this room server.",
-        "timedOutBlankGuest": "Room login timed out. Use Continue read-only for blank guest password, or try guest password \"hello\".",
-        "timedOutDefaultGuest": "Room login timed out. If this server has no guest password, use Continue read-only instead of Login.",
+        "timedOutBlankGuest": "Room login timed out. Try guest password \"hello\" (older default), or check the route and try again.",
+        "timedOutDefaultGuest": "Room login timed out. Leave the guest field empty and try Login again, or check the route.",
         "timedOut": "Room login timed out. The room may be out of range or not responding.",
         "failed": "Room login failed"
       },
@@ -4785,8 +4785,8 @@
     "lastPost": "Last post",
     "loginTitle": "Login to room server",
     "adminLoginTitle": "Room admin login",
-    "loginHelp": "Enter the guest password to join and post. Default is often \"hello\". For servers with no guest password, use Continue read-only (Login sends \"hello\" when the field is empty).",
-    "emptyGuestLoginHint": "Empty guest field: use Continue read-only for blank-password servers. Login requires a password and sends \"hello\" when the field is empty.",
+    "loginHelp": "Try an empty guest password first (most rooms leave it blank for guests). If that fails, try \"hello\" (older default). Continue read-only also sends no password.",
+    "emptyGuestLoginHint": "Empty guest field: Login sends no password (try this first). If the server still uses the older default, enter \"hello\".",
     "unreadPosts": "{{count}} new",
     "collapsedRoomWithUnread": "{{label}}, {{count}} unread",
     "adminLoginHelp": "Enter the room admin password to manage settings and ACLs. Default is often \"hello\".",

From 73e1e581372f27637be31312db217e28b224a174 Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 07:42:18 -0600
Subject: [PATCH 2/9] fix(meshcore): enable Radio Device User/Identity Apply

Wire MeshCore setOwner (setAdvertName) into RadioPanel and prefill
from activeRuntime.deviceOwner so companion/repeater name can be set.

Fixes #860
---
 src/renderer/App.tsx                          | 13 ++--
 src/renderer/components/RadioPanel.test.tsx   | 77 +++++++++++++++++++
 .../lib/appPanelHandlerSelection.test.ts      | 17 ++++
 src/renderer/lib/appPanelHandlerSelection.ts  | 16 +++-
 4 files changed, 116 insertions(+), 7 deletions(-)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 342e3ec8d..72cb0a7c2 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -157,6 +157,7 @@ import {
 import {
   resolvePanelPositionSendHandler,
   resolvePanelRebootHandler,
+  resolvePanelSetOwnerHandler,
 } from './lib/appPanelHandlerSelection';
 import { protocolRecord, selectByProtocol } from './lib/appProtocolSelect';
 import { getAppSettingsRaw, isRrcUnreadAllRoomMessagesEnabled } from './lib/appSettingsStorage';
@@ -1762,7 +1763,7 @@ function AppContent() {
     : meshtasticRuntime.securityConfig;
   const effectiveDeviceOwner = isRemoteConfigureTarget
     ? (meshtasticRuntime.remoteConfigSnapshot?.deviceOwner ?? null)
-    : meshtasticRuntime.deviceOwner;
+    : activeRuntime.deviceOwner;
   const effectiveDeviceFixedPosition = isRemoteConfigureTarget
     ? (meshtasticRuntime.remoteConfigSnapshot?.deviceFixedPosition ?? null)
     : meshtasticRuntime.deviceFixedPosition;
@@ -3639,11 +3640,11 @@ function AppContent() {
                                     meshcorePanelActions.sendPositionToDevice,
                                   )}
                                   deviceOwner={effectiveDeviceOwner}
-                                  onSetOwner={
-                                    capabilities.hasChannelConfig
-                                      ? meshtasticPanelActions.setOwner
-                                      : undefined
-                                  }
+                                  onSetOwner={resolvePanelSetOwnerHandler(
+                                    capabilities,
+                                    meshtasticPanelActions.setOwner,
+                                    meshcorePanelActions.setOwner,
+                                  )}
                                   capabilities={capabilities}
                                   meshcoreChannels={
                                     capabilities.hasCompanionContactManagementConfig
diff --git a/src/renderer/components/RadioPanel.test.tsx b/src/renderer/components/RadioPanel.test.tsx
index 86355b86c..31e8fcb40 100644
--- a/src/renderer/components/RadioPanel.test.tsx
+++ b/src/renderer/components/RadioPanel.test.tsx
@@ -101,6 +101,83 @@ describe('RadioPanel HelpTooltip coverage — LoRa params', () => {
   });
 });
 
+describe('RadioPanel MeshCore Device User / Identity', () => {
+  async function openDeviceUserSection(user: ReturnType<typeof userEvent.setup>) {
+    const userDetails = [...document.querySelectorAll('details')].find((d) => {
+      const span = d.querySelector(':scope > summary > span');
+      return span?.textContent?.trim() === 'Device User / Identity';
+    });
+    expect(userDetails).toBeDefined();
+    await user.click(userDetails!.querySelector('summary')!);
+    return userDetails!;
+  }
+
+  it('enables Apply and calls onSetOwner when MeshCore capabilities provide the handler', async () => {
+    const user = userEvent.setup();
+    const onSetOwner = vi.fn().mockResolvedValue(undefined);
+    render(
+      <ToastProvider>
+        <RadioPanel
+          {...defaultProps}
+          isConnected
+          capabilities={MESHCORE_CAPABILITIES}
+          onSetOwner={onSetOwner}
+        />
+      </ToastProvider>,
+    );
+
+    await openDeviceUserSection(user);
+
+    const nameInput = screen.getByLabelText('Name');
+    await user.clear(nameInput);
+    await user.type(nameInput, 'WisMesh Tag');
+
+    const applyButton = screen.getByRole('button', { name: 'Apply Device User / Identity' });
+    expect(applyButton).toBeEnabled();
+    await user.click(applyButton);
+
+    await waitFor(() => {
+      expect(onSetOwner).toHaveBeenCalledWith({
+        longName: 'WisMesh Tag',
+        shortName: '',
+        isLicensed: false,
+      });
+    });
+  });
+
+  it('keeps Apply disabled when MeshCore capabilities are set but onSetOwner is missing', async () => {
+    const user = userEvent.setup();
+    render(
+      <ToastProvider>
+        <RadioPanel {...defaultProps} isConnected capabilities={MESHCORE_CAPABILITIES} />
+      </ToastProvider>,
+    );
+
+    await openDeviceUserSection(user);
+
+    expect(screen.getByRole('button', { name: 'Apply Device User / Identity' })).toBeDisabled();
+  });
+
+  it('prefills the MeshCore name field from deviceOwner', async () => {
+    const user = userEvent.setup();
+    render(
+      <ToastProvider>
+        <RadioPanel
+          {...defaultProps}
+          isConnected
+          capabilities={MESHCORE_CAPABILITIES}
+          deviceOwner={{ longName: 'TagName', shortName: '', isLicensed: false }}
+          onSetOwner={vi.fn().mockResolvedValue(undefined)}
+        />
+      </ToastProvider>,
+    );
+
+    await openDeviceUserSection(user);
+
+    expect(screen.getByLabelText('Name')).toHaveValue('TagName');
+  });
+});
+
 describe('RadioPanel remote target safeguards', () => {
   it('disables Device apply until device config slice is hydrated', async () => {
     const user = userEvent.setup();
diff --git a/src/renderer/lib/appPanelHandlerSelection.test.ts b/src/renderer/lib/appPanelHandlerSelection.test.ts
index fd1a7d163..69ec7e949 100644
--- a/src/renderer/lib/appPanelHandlerSelection.test.ts
+++ b/src/renderer/lib/appPanelHandlerSelection.test.ts
@@ -3,22 +3,26 @@ import { describe, expect, it, vi } from 'vitest';
 import {
   resolvePanelPositionSendHandler,
   resolvePanelRebootHandler,
+  resolvePanelSetOwnerHandler,
 } from './appPanelHandlerSelection';
 
 const meshtasticCapabilities = {
   hasFullPositionConfig: true,
   hasCompanionContactManagementConfig: false,
   hasShutdown: true,
+  hasChannelConfig: true,
 };
 const meshcoreCapabilities = {
   hasFullPositionConfig: false,
   hasCompanionContactManagementConfig: true,
   hasShutdown: false,
+  hasChannelConfig: false,
 };
 const unsupportedCapabilities = {
   hasFullPositionConfig: false,
   hasCompanionContactManagementConfig: false,
   hasShutdown: false,
+  hasChannelConfig: false,
 };
 
 describe('App panel handler selection', () => {
@@ -52,4 +56,17 @@ describe('App panel handler selection', () => {
       resolvePanelRebootHandler(unsupportedCapabilities, meshtastic, meshcore, unsupported),
     ).toBe(unsupported);
   });
+
+  it('selects setOwner handlers by capabilities', () => {
+    const meshtastic = vi.fn();
+    const meshcore = vi.fn();
+
+    expect(resolvePanelSetOwnerHandler(meshtasticCapabilities, meshtastic, meshcore)).toBe(
+      meshtastic,
+    );
+    expect(resolvePanelSetOwnerHandler(meshcoreCapabilities, meshtastic, meshcore)).toBe(meshcore);
+    expect(
+      resolvePanelSetOwnerHandler(unsupportedCapabilities, meshtastic, meshcore),
+    ).toBeUndefined();
+  });
 });
diff --git a/src/renderer/lib/appPanelHandlerSelection.ts b/src/renderer/lib/appPanelHandlerSelection.ts
index 1fcec0d70..32f396fc4 100644
--- a/src/renderer/lib/appPanelHandlerSelection.ts
+++ b/src/renderer/lib/appPanelHandlerSelection.ts
@@ -2,7 +2,10 @@ import type { ProtocolCapabilities } from './radio/BaseRadioProvider';
 
 type HandlerSelectionCapabilities = Pick<
   ProtocolCapabilities,
-  'hasFullPositionConfig' | 'hasCompanionContactManagementConfig' | 'hasShutdown'
+  | 'hasFullPositionConfig'
+  | 'hasCompanionContactManagementConfig'
+  | 'hasShutdown'
+  | 'hasChannelConfig'
 >;
 
 export function resolvePanelPositionSendHandler<T>(
@@ -25,3 +28,14 @@ export function resolvePanelRebootHandler<T>(
   if (capabilities.hasCompanionContactManagementConfig) return meshcoreHandler;
   return unsupportedHandler;
 }
+
+/** Radio Device User/Identity Apply — MeshCore uses setAdvertName; Meshtastic uses setOwner. */
+export function resolvePanelSetOwnerHandler<T>(
+  capabilities: HandlerSelectionCapabilities,
+  meshtasticHandler: T,
+  meshcoreHandler: T,
+): T | undefined {
+  if (capabilities.hasCompanionContactManagementConfig) return meshcoreHandler;
+  if (capabilities.hasChannelConfig) return meshtasticHandler;
+  return undefined;
+}

From f21a3bda3b9f92a252b0ca9df29cdc1dd83e375f Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 07:58:27 -0600
Subject: [PATCH 3/9] fix(meshcore): honor LoginSuccess ACL and clarify blank
 vs hello room login

Parse meshcore.js reserved as the room ACL byte and document blank as read-only vs hello as default read/write guest password.
---
 README.md                                    |  2 +-
 docs/agents/meshcore-rooms.md                |  2 +-
 docs/meshcore-meshtastic-parity.md           |  2 +-
 docs/troubleshooting.md                      | 10 ++--
 src/renderer/lib/meshcoreRoomLoginRpc.ts     |  2 +-
 src/renderer/lib/meshcoreRoomSession.test.ts | 54 ++++++++++++++++++++
 src/renderer/lib/meshcoreRoomSession.ts      |  4 ++
 src/renderer/locales/en/translation.json     | 14 ++---
 8 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 83706659d..23f50fb9c 100644
--- a/README.md
+++ b/README.md
@@ -258,7 +258,7 @@ MeshCore runs simultaneously alongside Meshtastic and Reticulum. Use the protoco
 
 **Room servers (BBS)** — **Rooms** tab (RF only; not MQTT)
 
-- Login to room-server contacts (guest read-only or admin post); try an **empty guest password** first (zero-byte SendLogin, matching official clients); **"hello"** is the older default if empty fails; **Continue read-only** also sends no password
+- Login to room-server contacts; **blank** guest password for read-only when allowed; **`"hello"`** as the default read/write guest password; **Continue read-only** also sends blank
 - Post plain UTF-8 after login; inbound **SignedPlain** pushes show author prefix stripped in the UI
 - **Remember password**, **Auto-sync** (periodic re-login while connected, minimum 60 minutes per room), per-room unread badges (sidebar **Rooms** tab; separate from **Chat** badges)
 - Room admin CLI / ACL setperm on the **Repeaters** tab (room rows); Rooms Members still call `get acl` via the same CLI path. Session/login queue and path sync in `meshcoreRoom*.ts` — see [docs/meshcore-meshtastic-parity.md](docs/meshcore-meshtastic-parity.md#meshcore-room-servers) and [Troubleshooting](docs/troubleshooting.md#meshcore-room-server-login-posts-and-windows-10)
diff --git a/docs/agents/meshcore-rooms.md b/docs/agents/meshcore-rooms.md
index a486552e2..8d56a9039 100644
--- a/docs/agents/meshcore-rooms.md
+++ b/docs/agents/meshcore-rooms.md
@@ -2,7 +2,7 @@
 
 Deep subsystem reference for AI assistants. Open this when a task touches MeshCore Rooms login/post, session RPCs, saved passwords, auto-sync scheduling, or room wire text. Hard rules live in [`AGENTS.md`](../../AGENTS.md).
 
-- **UI:** `RoomsPanel.tsx` — login overlay, post composer (`ChatComposer`), auto-sync toggles, Members ACL refresh (`get acl`); **Manage on Repeaters** jumps to Repeaters & Rooms ops (CLI / setperm / infra). Sidebar badge via `meshcoreRoomsUnread.ts` (`mesh-client:meshcoreRoomsUnread`). Empty guest **Login** sends zero password bytes (try empty first; `"hello"` is the older default); **Continue read-only** sends the same empty password.
+- **UI:** `RoomsPanel.tsx` — login overlay, post composer (`ChatComposer`), auto-sync toggles, Members ACL refresh (`get acl`); **Manage on Repeaters** jumps to Repeaters & Rooms ops (CLI / setperm / infra). Sidebar badge via `meshcoreRoomsUnread.ts` (`mesh-client:meshcoreRoomsUnread`). Blank guest **Login** = read-only when allowed; **`"hello"`** is the default read/write guest password; **Continue read-only** also sends blank.
 - **Ops (not on Rooms tab):** Ping / Status / Neighbors / Sensor / CLI / ACL setperm live on `RepeatersPanel` (mixed Repeater + Room table). **Open room** on a room row jumps back to Rooms. Guest passwords stay in `meshcoreRoomCredentialStorage`; ops admin uses `meshcoreInfraAdminSecrets` (admin-only records allowed).
 - **Room remote CLI:** needs room **admin** password via SendLogin ACL (`meshcoreCancelRoomLogin` then admin login inside `sendRepeaterCliCommand`); guest BBS login is not enough (`repeatersPanel.roomCliNeedsAdminPassword`).
 - **Post length (single-packet):** room posts use the shared `ChatComposer` (`variant="room"`) and are **single-packet** like MeshCore chat — over the room payload limit (`getMeshcoreRoomPayloadLimit` in `chatComposerLimits.ts`) the send is blocked with the same `meshcoreSingleNotice` callout rather than split into `[i/N]` parts, and the ~5s fast-send advisory applies. See [`chat.md`](chat.md) (Composer limits / send cadence).
diff --git a/docs/meshcore-meshtastic-parity.md b/docs/meshcore-meshtastic-parity.md
index fbb3528bf..bbb95a806 100644
--- a/docs/meshcore-meshtastic-parity.md
+++ b/docs/meshcore-meshtastic-parity.md
@@ -52,7 +52,7 @@ Shared UI gates use `ProtocolCapabilities` in [`src/renderer/lib/radio/BaseRadio
 
 Room servers (`hw_model === 'Room'`, contact type 3) are BBS nodes on the mesh. The companion radio must be connected over **RF** (BLE, serial, or TCP); **MQTT does not carry room login/post**.
 
-**Login:** Guest Login with an empty password sends **zero password bytes** (same wire as **Continue read-only**). Prefer empty first; **`hello`** is the older factory default. Admin login uses the configured password. Login RPC, queue, and path sync live under `src/renderer/lib/meshcoreRoom*.ts` (e.g. [`meshcoreRoomLoginRpc.ts`](../src/renderer/lib/meshcoreRoomLoginRpc.ts), [`meshcoreRoomLoginQueue.ts`](../src/renderer/lib/meshcoreRoomLoginQueue.ts)); timeouts are shorter on TCP and 0-hop paths ([`timeConstants.ts`](../src/renderer/lib/timeConstants.ts)).
+**Login:** Blank guest Login sends **zero password bytes** (read-only when `allow.read.only` is on; same wire as **Continue read-only**). **`hello`** is the default read/write guest password. Admin login uses the configured password. LoginSuccess ACL byte is read from meshcore.js `reserved` (or `permissions`). Login RPC, queue, and path sync live under `src/renderer/lib/meshcoreRoom*.ts` (e.g. [`meshcoreRoomLoginRpc.ts`](../src/renderer/lib/meshcoreRoomLoginRpc.ts), [`meshcoreRoomLoginQueue.ts`](../src/renderer/lib/meshcoreRoomLoginQueue.ts)); timeouts are shorter on TCP and 0-hop paths ([`timeConstants.ts`](../src/renderer/lib/timeConstants.ts)).
 
 **Posts:** Outbound room posts use plain UTF-8 (`TXT_TYPE_PLAIN`) after login and are **single-packet** — mesh-client does not emit multi-part `[i/N]` room posts; over-limit text is blocked in the composer (same rationale as chat/DM). Inbound **SignedPlain** pushes include a four-byte author prefix; the **Rooms** UI strips it, and inbound multi-part from other clients is still merged for display. Posts appear in the **Rooms** tab (channel `-2`), not Chat channel pills.
 
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 1a83a434f..0c0b1bec7 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -892,9 +892,9 @@ The client deduplicates overlapping RF and MQTT hears within **5 minutes** (cros
 
 **Guest / read-only login fails with timeout or "rejected"**:
 
-- Try **Login** with an **empty** guest field first. That sends **zero password bytes** (same as the official Android app and **Continue read-only**). Most rooms leave the guest password blank for guests.
-- If empty login fails, try the older default guest password **`hello`**.
-- **Room admin CLI** (**Repeaters** tab → room row CLI; needs the room **admin** password via SendLogin ACL, not guest BBS login): many stock room servers use **`hello`** as the default admin password when none was configured. Save the admin password under Repeaters → password for that room. Do not confuse that with blank guest Login / **Continue read-only**, which send zero bytes.
+- Try **blank** Login (or **Continue read-only**) for **read-only** when the room has `allow.read.only` on. That sends **zero password bytes**.
+- For **read/write** (post), try the default guest password **`hello`**, or the room’s configured guest password. MeshCore has no passwordless write mode.
+- **Room admin CLI** (**Repeaters** tab → room row CLI; needs the room **admin** password via SendLogin ACL, not guest BBS login): many stock room servers use **`hello`** as the default admin password when none was configured. Save the admin password under Repeaters → password for that room.
 - Logs showing push **`0x86`** (frame 134) mean **LoginFail** (wrong password or ACL denied). **Room login** rejects immediately on a prefix-matched LoginFail. **Repeater admin login** keeps waiting for a possible LoginSuccess (meshcore.js behavior on congested links); timeout after LoginFail alone is reported as timeout, not wrong password.
 - **Admin password** working while guest/read-only fails usually means the guest password on the server does not match what the client sent, or ACL denies read-only login.
 - If the room **changed its password** and mesh-client keeps trying to log in, open the **Rooms** tab: expand **Saved passwords** in the sidebar (or use the login overlay for the selected room). Use **Stop auto-login** to stop connect-time retries while keeping the old password stored, or **Forget saved password** to clear the stored guest/admin password and turn off auto-login and auto-sync. After a wrong-password failure, auto-login is turned off automatically until you log in again with **Remember password** or re-enable it.
@@ -935,7 +935,7 @@ The client deduplicates overlapping RF and MQTT hears within **5 minutes** (cros
 
 **Read-only → write upgrade does nothing**:
 
-- After **Continue read-only**, use **Upgrade access** (or **Login** with the guest password) so the client sends a fresh **SendLogin** with `forceRelogin`. If the room still uses a guest password, enter it (often **`hello`** on older servers); an empty field cannot upgrade write access.
+- After **Continue read-only**, use **Upgrade access** and enter the guest password (often **`hello`**) so the client sends a fresh **SendLogin** with `forceRelogin`. An empty field cannot upgrade write access.
 
 **Long room posts show as `[1/2]`, `[2/2]`…**:
 
@@ -954,7 +954,7 @@ The client deduplicates overlapping RF and MQTT hears within **5 minutes** (cros
 **Retest checklist (after upgrading from a known-good build)**:
 
 1. Connect MeshCore over TCP or BLE; confirm nodes load.
-2. Open **Rooms** → try **Login** with an **empty** guest field first (or **Continue read-only**). If that fails, try **`hello`**. With a configured guest password, enter it and click **Login**.
+2. Open **Rooms** → try **blank** Login for read-only (or **Continue read-only**). For posting, try **`hello`** (default read/write guest password) or the room’s guest password.
 3. Post as admin; confirm the post appears in the **official Android app** on the same room (SignedPlain BBS path).
 4. Confirm room posts appear in **Rooms** with unread badges (not Chat channel pills).
 5. On **Connection** tab, receive a **channel** message on a channel you are not viewing → sidebar **Chat** badge and red pill on that channel when you open Chat.
diff --git a/src/renderer/lib/meshcoreRoomLoginRpc.ts b/src/renderer/lib/meshcoreRoomLoginRpc.ts
index 72398c5bc..fff6cb109 100644
--- a/src/renderer/lib/meshcoreRoomLoginRpc.ts
+++ b/src/renderer/lib/meshcoreRoomLoginRpc.ts
@@ -126,7 +126,7 @@ export function runMeshcoreRoomLogin(
         return;
       }
       console.debug(
-        `[meshcoreRoomLoginRpc] LoginSuccess prefix=${prefixToHex(prefix)} permissions=${String(r.permissions ?? 'n/a')}`,
+        `[meshcoreRoomLoginRpc] LoginSuccess prefix=${prefixToHex(prefix)} permissions=${String(r.permissions ?? r.reserved ?? 'n/a')}`,
       );
       succeed(r);
     };
diff --git a/src/renderer/lib/meshcoreRoomSession.test.ts b/src/renderer/lib/meshcoreRoomSession.test.ts
index 898a38d8f..34f49256b 100644
--- a/src/renderer/lib/meshcoreRoomSession.test.ts
+++ b/src/renderer/lib/meshcoreRoomSession.test.ts
@@ -105,6 +105,60 @@ describe('meshcoreRoomSession', () => {
     expect(meshcoreRoomCanPost(42)).toBe(true);
   });
 
+  it('login uses meshcore.js reserved ACL byte over empty-password hint', async () => {
+    meshcoreClearAllRoomSessions();
+    // Empty password hint would be readonly; reserved=2 (read-write) must win.
+    mockRunMeshcoreRoomLogin.mockResolvedValue({ reserved: 2 });
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    await meshcoreRoomLogin(conn, 42, pubKey, '', {
+      guestPassword: '',
+      adminPassword: '',
+    });
+    expect(meshcoreGetRoomSession(42)?.role).toBe('readwrite');
+    expect(meshcoreRoomCanPost(42)).toBe(true);
+  });
+
+  it('login treats reserved guest ACL as read-only', async () => {
+    meshcoreClearAllRoomSessions();
+    mockRunMeshcoreRoomLogin.mockResolvedValue({ reserved: 0 });
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    await meshcoreRoomLogin(conn, 42, pubKey, 'hello', {
+      guestPassword: 'hello',
+      adminPassword: '',
+    });
+    expect(meshcoreGetRoomSession(42)?.role).toBe('readonly');
+    expect(meshcoreRoomCanPost(42)).toBe(false);
+  });
+
+  it('login prefers permissions over reserved when both present', async () => {
+    meshcoreClearAllRoomSessions();
+    mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: 3, reserved: 0 });
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    await meshcoreRoomLogin(conn, 42, pubKey, 'hello', {
+      guestPassword: 'hello',
+      adminPassword: 'admin',
+    });
+    expect(meshcoreGetRoomSession(42)?.role).toBe('admin');
+  });
+
   it('skips relogin when already logged in without forceRelogin', async () => {
     meshcoreClearAllRoomSessions();
     mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: 2 });
diff --git a/src/renderer/lib/meshcoreRoomSession.ts b/src/renderer/lib/meshcoreRoomSession.ts
index 21c10c667..47333c1c7 100644
--- a/src/renderer/lib/meshcoreRoomSession.ts
+++ b/src/renderer/lib/meshcoreRoomSession.ts
@@ -170,12 +170,16 @@ function roleFromPasswordHint(
   return 'readwrite';
 }
 
+/** Prefer `permissions`; meshcore.js LoginSuccess puts the ACL byte in `reserved`. */
 function parseLoginResponsePermissions(response: unknown): number | null {
   if (!response || typeof response !== 'object') return null;
   const r = response as Record<string, unknown>;
   if (typeof r.permissions === 'number' && Number.isFinite(r.permissions)) {
     return r.permissions & 0xff;
   }
+  if (typeof r.reserved === 'number' && Number.isFinite(r.reserved)) {
+    return r.reserved & 0xff;
+  }
   return null;
 }
 
diff --git a/src/renderer/locales/en/translation.json b/src/renderer/locales/en/translation.json
index 0567db11a..02e886516 100644
--- a/src/renderer/locales/en/translation.json
+++ b/src/renderer/locales/en/translation.json
@@ -2308,11 +2308,11 @@
         "noRoute": "No route to this room server. Trace the node from the map or wait for path adverts, then try again.",
         "pathSyncFailed": "Could not program the route on your radio before login. Reconnect the device and try again.",
         "pathSyncFailedDetail": "Could not program the route on your radio before login. Reconnect the device and try again.{{detail}}",
-        "rejectedBlankGuest": "Room login rejected. Try guest password \"hello\" (older default), or check whether this server allows blank guest login.",
-        "rejectedDefaultGuest": "Room login rejected. Leave the guest field empty and try Login again, or check the guest or admin password.",
+        "rejectedBlankGuest": "Room login rejected. Blank is for read-only when allowed; try guest password \"hello\" for read/write, or check the room settings.",
+        "rejectedDefaultGuest": "Room login rejected. Try blank for read-only (if allowed), or check the guest or admin password.",
         "rejectedCheckPassword": "Room login rejected. Check the guest or admin password for this room server.",
-        "timedOutBlankGuest": "Room login timed out. Try guest password \"hello\" (older default), or check the route and try again.",
-        "timedOutDefaultGuest": "Room login timed out. Leave the guest field empty and try Login again, or check the route.",
+        "timedOutBlankGuest": "Room login timed out. Try guest password \"hello\" for read/write, or check the route and try again.",
+        "timedOutDefaultGuest": "Room login timed out. Try blank for read-only (if allowed), or check the route.",
         "timedOut": "Room login timed out. The room may be out of range or not responding.",
         "failed": "Room login failed"
       },
@@ -4785,8 +4785,8 @@
     "lastPost": "Last post",
     "loginTitle": "Login to room server",
     "adminLoginTitle": "Room admin login",
-    "loginHelp": "Try an empty guest password first (most rooms leave it blank for guests). If that fails, try \"hello\" (older default). Continue read-only also sends no password.",
-    "emptyGuestLoginHint": "Empty guest field: Login sends no password (try this first). If the server still uses the older default, enter \"hello\".",
+    "loginHelp": "Try blank for read-only. Try \"hello\" as the default read/write guest password. Continue read-only also sends a blank password.",
+    "emptyGuestLoginHint": "Blank Login is read-only when the room allows it. Enter \"hello\" (or the room's guest password) to post.",
     "unreadPosts": "{{count}} new",
     "collapsedRoomWithUnread": "{{label}}, {{count}} unread",
     "adminLoginHelp": "Enter the room admin password to manage settings and ACLs. Default is often \"hello\".",
@@ -4814,7 +4814,7 @@
     "cancelLoginDialog": "Cancel room login dialog",
     "continueReadOnly": "Continue read-only",
     "readOnlyBadge": "Read-only",
-    "readOnlyHint": "You have read-only access. Log in with a guest or admin password to post.",
+    "readOnlyHint": "You have read-only access. Enter the guest password (often \"hello\") or admin password to post.",
     "upgradeAccess": "Upgrade access",
     "noPostsYet": "No posts in this room yet.",
     "postPlaceholder": "Post to room…",

From c856c109c9eef75c49e5074d77e1850a8c6c1548 Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 08:13:14 -0600
Subject: [PATCH 4/9] fix(meshcore): abort room login during path resolve on
 Cancel

Register an outer abort for the full loginRoom op so Cancel works before SendLogin starts, not only while waiting on LoginSuccess.
---
 docs/agents/meshcore-rooms.md                |  2 +-
 src/renderer/lib/meshcoreRoomSession.test.ts | 24 ++++++
 src/renderer/lib/meshcoreRoomSession.ts      | 63 ++++++++++++++-
 src/renderer/runtime/useMeshcoreRuntime.ts   | 81 +++++++++++++-------
 4 files changed, 138 insertions(+), 32 deletions(-)

diff --git a/docs/agents/meshcore-rooms.md b/docs/agents/meshcore-rooms.md
index 8d56a9039..39f54130f 100644
--- a/docs/agents/meshcore-rooms.md
+++ b/docs/agents/meshcore-rooms.md
@@ -2,7 +2,7 @@
 
 Deep subsystem reference for AI assistants. Open this when a task touches MeshCore Rooms login/post, session RPCs, saved passwords, auto-sync scheduling, or room wire text. Hard rules live in [`AGENTS.md`](../../AGENTS.md).
 
-- **UI:** `RoomsPanel.tsx` — login overlay, post composer (`ChatComposer`), auto-sync toggles, Members ACL refresh (`get acl`); **Manage on Repeaters** jumps to Repeaters & Rooms ops (CLI / setperm / infra). Sidebar badge via `meshcoreRoomsUnread.ts` (`mesh-client:meshcoreRoomsUnread`). Blank guest **Login** = read-only when allowed; **`"hello"`** is the default read/write guest password; **Continue read-only** also sends blank.
+- **UI:** `RoomsPanel.tsx` — login overlay, post composer (`ChatComposer`), auto-sync toggles, Members ACL refresh (`get acl`); **Manage on Repeaters** jumps to Repeaters & Rooms ops (CLI / setperm / infra). Sidebar badge via `meshcoreRoomsUnread.ts` (`mesh-client:meshcoreRoomsUnread`). Blank guest **Login** = read-only when allowed; **`"hello"`** is the default read/write guest password; **Continue read-only** also sends blank. **Cancel login** aborts the outer login op (path resolve + SendLogin) via `meshcoreBeginRoomLoginOperation` / `meshcoreCancelRoomLogin`.
 - **Ops (not on Rooms tab):** Ping / Status / Neighbors / Sensor / CLI / ACL setperm live on `RepeatersPanel` (mixed Repeater + Room table). **Open room** on a room row jumps back to Rooms. Guest passwords stay in `meshcoreRoomCredentialStorage`; ops admin uses `meshcoreInfraAdminSecrets` (admin-only records allowed).
 - **Room remote CLI:** needs room **admin** password via SendLogin ACL (`meshcoreCancelRoomLogin` then admin login inside `sendRepeaterCliCommand`); guest BBS login is not enough (`repeatersPanel.roomCliNeedsAdminPassword`).
 - **Post length (single-packet):** room posts use the shared `ChatComposer` (`variant="room"`) and are **single-packet** like MeshCore chat — over the room payload limit (`getMeshcoreRoomPayloadLimit` in `chatComposerLimits.ts`) the send is blocked with the same `meshcoreSingleNotice` callout rather than split into `[i/N]` parts, and the ~5s fast-send advisory applies. See [`chat.md`](chat.md) (Composer limits / send cadence).
diff --git a/src/renderer/lib/meshcoreRoomSession.test.ts b/src/renderer/lib/meshcoreRoomSession.test.ts
index 34f49256b..9ce28811b 100644
--- a/src/renderer/lib/meshcoreRoomSession.test.ts
+++ b/src/renderer/lib/meshcoreRoomSession.test.ts
@@ -4,9 +4,12 @@ import {
   MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD,
   MESHCORE_ROOM_LOGIN_ABORT_MESSAGE,
   MESHCORE_ROOM_LOGIN_NO_ROUTE_MESSAGE,
+  meshcoreAbortablePromise,
   meshcoreApplyRoomSession,
+  meshcoreBeginRoomLoginOperation,
   meshcoreCancelRoomLogin,
   meshcoreClearAllRoomSessions,
+  meshcoreEndRoomLoginOperation,
   meshcoreGetRoomSession,
   meshcoreIsRoomLoggedIn,
   meshcoreIsRoomLoginAbortError,
@@ -380,6 +383,27 @@ describe('meshcoreRoomSession', () => {
     expect(meshcoreIsRoomLoggedIn(42)).toBe(false);
   });
 
+  it('outer login cancel aborts path-resolve wait before SendLogin', async () => {
+    const signal = meshcoreBeginRoomLoginOperation(99);
+    let resolveSlow!: (v: string) => void;
+    const slow = new Promise<string>((resolve) => {
+      resolveSlow = resolve;
+    });
+    const raced = meshcoreAbortablePromise(slow, signal);
+    const settled = raced.then(
+      () => ({ ok: true as const }),
+      (err: unknown) => ({ ok: false as const, err }),
+    );
+    meshcoreCancelRoomLogin(99);
+    const result = await settled;
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(meshcoreIsRoomLoginAbortError(result.err)).toBe(true);
+    }
+    resolveSlow('late');
+    meshcoreEndRoomLoginOperation(99, signal);
+  });
+
   it('does not apply session when login resolves after cancel', async () => {
     let resolveLogin!: (value: { permissions: number }) => void;
     const loginDeferred = new Promise<{ permissions: number }>((resolve) => {
diff --git a/src/renderer/lib/meshcoreRoomSession.ts b/src/renderer/lib/meshcoreRoomSession.ts
index 47333c1c7..234c238e6 100644
--- a/src/renderer/lib/meshcoreRoomSession.ts
+++ b/src/renderer/lib/meshcoreRoomSession.ts
@@ -67,17 +67,72 @@ export function subscribeMeshcoreRoomSessionChanges(cb: RoomSessionChangeListene
 /** Per-room login abort controllers (replaced on each new login for the same node). */
 const roomLoginAbortControllers = new Map<number, AbortController>();
 
+/**
+ * Outer abort for the full loginRoom op (path resolve + SendLogin). Registered before
+ * queue/RPC so Cancel works during route prime — not only after SendLogin starts.
+ */
+const roomLoginOuterAbortControllers = new Map<number, AbortController>();
+
 export function meshcoreIsRoomLoginAbortError(err: unknown): boolean {
   return err instanceof DOMException && err.message === MESHCORE_ROOM_LOGIN_ABORT_MESSAGE;
 }
 
+export function meshcoreThrowIfRoomLoginAborted(signal: AbortSignal | undefined): void {
+  if (signal?.aborted) {
+    throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
+  }
+}
+
+/** Reject as soon as `signal` aborts, even if `promise` is still pending. */
+export function meshcoreAbortablePromise<T>(promise: Promise<T>, signal: AbortSignal): Promise<T> {
+  meshcoreThrowIfRoomLoginAborted(signal);
+  return new Promise<T>((resolve, reject) => {
+    const onAbort = (): void => {
+      reject(new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError'));
+    };
+    signal.addEventListener('abort', onAbort, { once: true });
+    promise.then(
+      (value) => {
+        signal.removeEventListener('abort', onAbort);
+        resolve(value);
+      },
+      (err: unknown) => {
+        signal.removeEventListener('abort', onAbort);
+        reject(err instanceof Error ? err : new Error(String(err)));
+      },
+    );
+  });
+}
+
+/**
+ * Start (or replace) the outer abort controller for a room login operation.
+ * Call from loginRoom before path resolve; pair with {@link meshcoreEndRoomLoginOperation}.
+ */
+export function meshcoreBeginRoomLoginOperation(nodeId: number): AbortSignal {
+  roomLoginOuterAbortControllers.get(nodeId)?.abort();
+  const controller = new AbortController();
+  roomLoginOuterAbortControllers.set(nodeId, controller);
+  return controller.signal;
+}
+
+export function meshcoreEndRoomLoginOperation(nodeId: number, signal: AbortSignal): void {
+  if (roomLoginOuterAbortControllers.get(nodeId)?.signal === signal) {
+    roomLoginOuterAbortControllers.delete(nodeId);
+  }
+}
+
 export function meshcoreCancelRoomLogin(nodeId: number): void {
+  roomLoginOuterAbortControllers.get(nodeId)?.abort();
   roomLoginAbortControllers.get(nodeId)?.abort();
   dequeueMeshcoreRoomLogin(nodeId);
 }
 
 /** Abort the active login and drop all queued room logins. */
 export function meshcoreCancelAllRoomLogins(): void {
+  for (const controller of roomLoginOuterAbortControllers.values()) {
+    controller.abort();
+  }
+  roomLoginOuterAbortControllers.clear();
   for (const controller of roomLoginAbortControllers.values()) {
     controller.abort();
   }
@@ -85,9 +140,7 @@ export function meshcoreCancelAllRoomLogins(): void {
 }
 
 function throwIfRoomLoginAborted(signal: AbortSignal | undefined): void {
-  if (signal?.aborted) {
-    throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
-  }
+  meshcoreThrowIfRoomLoginAborted(signal);
 }
 
 function beginRoomLoginAbortSignal(nodeId: number, externalSignal?: AbortSignal): AbortSignal {
@@ -135,6 +188,10 @@ export function meshcoreRoomCliRequiresAdmin(command: string): boolean {
 }
 
 export function meshcoreClearAllRoomSessions(): void {
+  for (const controller of roomLoginOuterAbortControllers.values()) {
+    controller.abort();
+  }
+  roomLoginOuterAbortControllers.clear();
   for (const controller of roomLoginAbortControllers.values()) {
     controller.abort();
   }
diff --git a/src/renderer/runtime/useMeshcoreRuntime.ts b/src/renderer/runtime/useMeshcoreRuntime.ts
index 47c612142..d6a382af4 100644
--- a/src/renderer/runtime/useMeshcoreRuntime.ts
+++ b/src/renderer/runtime/useMeshcoreRuntime.ts
@@ -316,8 +316,11 @@ import {
   MESHCORE_ROOM_LOGIN_ABORT_MESSAGE,
   MESHCORE_ROOM_LOGIN_NO_ROUTE_MESSAGE,
   MESHCORE_ROOM_LOGIN_PATH_SYNC_FAILED_MESSAGE,
+  meshcoreAbortablePromise,
+  meshcoreBeginRoomLoginOperation,
   meshcoreCancelRoomLogin,
   meshcoreClearAllRoomSessions,
+  meshcoreEndRoomLoginOperation,
   meshcoreGetRoomSession,
   meshcoreIsRoomLoggedIn,
   meshcoreIsRoomLoginAbortError,
@@ -329,6 +332,7 @@ import {
   meshcoreRoomLogout,
   meshcoreRoomLogoutFailureMessage,
   meshcoreRoomTryRelogin,
+  meshcoreThrowIfRoomLoginAborted,
   meshcoreTryRemoteServerLogin,
 } from '../lib/meshcoreRoomSession';
 import { pickMostOverdueRoom, type RoomSyncSchedulerNode } from '../lib/meshcoreRoomSyncScheduler';
@@ -6197,28 +6201,44 @@ export function useMeshcoreRuntime() {
       console.debug(
         `[useMeshcoreRuntime] loginRoom node=0x${nodeId.toString(16)} hopsAway=${hopsAway} uiHops=${String(uiHops ?? 'n/a')} outPathLen=${outPathLen}`,
       );
-      const loginAbort = new AbortController();
+      // Outer abort covers path resolve + SendLogin so Cancel works before the login queue starts.
+      const loginAbortSignal = meshcoreBeginRoomLoginOperation(nodeId);
       try {
         await withTimeout(
           (async (): Promise<void> => {
+            meshcoreThrowIfRoomLoginAborted(loginAbortSignal);
+            if (opts?.abortIfStale?.()) {
+              throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
+            }
             const activeConn = connRef.current;
             if (!activeConn) {
               throw new Error(MESHCORE_ERR_NOT_CONNECTED);
             }
             // Route prime can take 10s+ — do not hold repeaterRemoteRpc (SendLogin) mutex during flood/path wait.
-            const storedPath = await resolveRoomLoginStoredPath(nodeId, hopsAway, pubKey);
+            const storedPath = await meshcoreAbortablePromise(
+              resolveRoomLoginStoredPath(nodeId, hopsAway, pubKey),
+              loginAbortSignal,
+            );
+            meshcoreThrowIfRoomLoginAborted(loginAbortSignal);
+            if (opts?.abortIfStale?.()) {
+              throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
+            }
             if (hopsAway > 0 && (!storedPath || storedPath.length <= 1)) {
               throw new Error(MESHCORE_ROOM_LOGIN_NO_ROUTE_MESSAGE);
             }
-            const pathSync = await syncMeshcoreRoomContactPathBeforeLogin(
-              activeConn,
-              nodeId,
-              pubKey,
-              getIdentityNode(meshcoreIdentityIdRef.current, nodeId),
-              storedPath,
-              hopsAway,
-              (fn) => repeaterRemoteRpcRef.current(fn),
+            const pathSync = await meshcoreAbortablePromise(
+              syncMeshcoreRoomContactPathBeforeLogin(
+                activeConn,
+                nodeId,
+                pubKey,
+                getIdentityNode(meshcoreIdentityIdRef.current, nodeId),
+                storedPath,
+                hopsAway,
+                (fn) => repeaterRemoteRpcRef.current(fn),
+              ),
+              loginAbortSignal,
             );
+            meshcoreThrowIfRoomLoginAborted(loginAbortSignal);
             if (hopsAway > 0 && !pathSync.synced) {
               throw new Error(
                 serializeMeshcoreUserMessage(
@@ -6237,23 +6257,27 @@ export function useMeshcoreRuntime() {
             if (opts?.abortIfStale?.()) {
               throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
             }
-            await repeaterRemoteRpcRef.current(async () => {
-              if (opts?.abortIfStale?.()) {
-                throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
-              }
-              const rpcConn = connRef.current;
-              if (!rpcConn) {
-                throw new Error(MESHCORE_ERR_NOT_CONNECTED);
-              }
-              await meshcoreRoomLogin(rpcConn, nodeId, pubKey, password, {
-                adminPassword,
-                guestPassword,
-                hopsAway,
-                companionTransport: meshcoreConnectTypeRef.current,
-                forceRelogin: opts?.forceRelogin,
-                signal: loginAbort.signal,
-              });
-            });
+            await meshcoreAbortablePromise(
+              repeaterRemoteRpcRef.current(async () => {
+                meshcoreThrowIfRoomLoginAborted(loginAbortSignal);
+                if (opts?.abortIfStale?.()) {
+                  throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
+                }
+                const rpcConn = connRef.current;
+                if (!rpcConn) {
+                  throw new Error(MESHCORE_ERR_NOT_CONNECTED);
+                }
+                await meshcoreRoomLogin(rpcConn, nodeId, pubKey, password, {
+                  adminPassword,
+                  guestPassword,
+                  hopsAway,
+                  companionTransport: meshcoreConnectTypeRef.current,
+                  forceRelogin: opts?.forceRelogin,
+                  signal: loginAbortSignal,
+                });
+              }),
+              loginAbortSignal,
+            );
             if (opts?.rememberPassword) {
               await setMeshcoreRoomCredential(nodeId, { guestPassword, adminPassword });
               const syncCfg = getMeshcoreRoomSyncConfig(nodeId);
@@ -6270,10 +6294,11 @@ export function useMeshcoreRuntime() {
         );
       } catch (e: unknown) {
         if (errLikeToLogString(e).includes('loginRoom timed out')) {
-          loginAbort.abort();
           meshcoreCancelRoomLogin(nodeId);
         }
         throw e;
+      } finally {
+        meshcoreEndRoomLoginOperation(nodeId, loginAbortSignal);
       }
     },
     [resolveRoomLoginHopsForNode, resolveRoomLoginStoredPath],

From 77bc3dc8bda9d494b67f292b8fed31b1910ac4ce Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 09:27:37 -0600
Subject: [PATCH 5/9] fix(reticulum): honor Full mode with RMAP via
 ignore_config_warnings

Stop silently showing config Full while RNS runs Access Point: stamp the
upstream opt-out, surface runtime_mode when it diverges, and audit the clash.
---
 docs/reticulum.md                             |  30 +-
 .../src/stack/auto_path_policy.rs             |   2 +
 reticulum-sidecar/src/stack/config.rs         | 528 ++++++++++++++++++
 reticulum-sidecar/src/stack/config_audit.rs   | 146 +++++
 reticulum-sidecar/src/stack/live.rs           |   6 +
 .../src/stack/local_rnode_primary.rs          |   2 +
 reticulum-sidecar/src/stack/lxmf_outbound.rs  |   2 +
 reticulum-sidecar/src/stack/mod.rs            |  12 +
 reticulum-sidecar/src/stack/nomad_timeouts.rs |   2 +
 reticulum-sidecar/src/stack/path_failover.rs  |   2 +
 reticulum-sidecar/src/stack/persistence.rs    |   2 +
 reticulum-sidecar/src/stack/rf_profiles.rs    |   2 +
 reticulum-sidecar/src/stack/types.rs          |  37 ++
 reticulum-sidecar/src/stack/via.rs            |  65 +++
 .../ReticulumInterfacesPanel.test.tsx         |  54 ++
 .../reticulum/ReticulumInterfacesPanel.tsx    |  50 +-
 .../reticulum/reticulumConfigAudit.test.ts    |   1 +
 .../reticulumInterfaceExtraConfig.test.ts     |  10 +
 .../reticulumInterfaceExtraConfig.ts          |   1 +
 .../reticulum/reticulumInterfaceMode.test.ts  |  19 +
 .../lib/reticulum/reticulumInterfaceMode.ts   |  42 +-
 .../reticulum/reticulumRmapDiscovery.test.ts  |   3 +
 .../lib/reticulum/reticulumSidecarReads.ts    |   2 +
 .../useReticulumInterfaceSnapshot.ts          |  10 +
 src/renderer/locales/cs/translation.json      |   9 +-
 src/renderer/locales/de/translation.json      |   9 +-
 src/renderer/locales/en/translation.json      |   7 +-
 src/renderer/locales/es/translation.json      |   9 +-
 src/renderer/locales/fr/translation.json      |   9 +-
 src/renderer/locales/id/translation.json      |   9 +-
 src/renderer/locales/it/translation.json      |   9 +-
 src/renderer/locales/ja/translation.json      |   9 +-
 src/renderer/locales/ko/translation.json      |   9 +-
 src/renderer/locales/nl/translation.json      |   9 +-
 src/renderer/locales/pl/translation.json      |   9 +-
 src/renderer/locales/pt-BR/translation.json   |   9 +-
 src/renderer/locales/ru/translation.json      |   9 +-
 src/renderer/locales/tr/translation.json      |   9 +-
 src/renderer/locales/uk/translation.json      |   9 +-
 src/renderer/locales/zh/translation.json      |   9 +-
 40 files changed, 1131 insertions(+), 41 deletions(-)

diff --git a/docs/reticulum.md b/docs/reticulum.md
index 0a37b4738..6c8836fa1 100644
--- a/docs/reticulum.md
+++ b/docs/reticulum.md
@@ -266,17 +266,31 @@ Config lives under `userData/reticulum/config/` (rnsd INI). The Connection tab s
 
 rnsd **mode** applies to every interface type (TCP, I2P, RNode, …), not only radios. It controls path expiry, path seeking, and announce propagation between segments.
 
-| Mode             | Path Expiry | Path Seeking | When to use on an RNode                                                                                     |
-| ---------------- | ----------- | ------------ | ----------------------------------------------------------------------------------------------------------- |
-| `full`           | 7 days      | No           | Primary nodes, repeaters, fixed infrastructure — full mesh participation, auto-announces, routes traffic    |
-| `access_point`   | 24 hours    | Yes          | High-elevation or wide-area radios serving intermittent users — stays quiet until queried, fast path expiry |
-| `roaming`        | 6 hours     | Yes          | Mobile/handheld or vehicular RNodes moving between coverage areas — short path timeouts, active discovery   |
-| `boundary`       | 7 days      | No           | Linking a LoRa segment to an Internet/TCP backbone — isolates local traffic, selective announce bridging    |
-| `gateway`        | 7 days      | Yes          | Client-facing interface that resolves unknown paths on behalf of connected nodes                            |
-| `point_to_point` | 7 days      | No           | Dedicated direct link between exactly two nodes — no routing, no announce propagation                       |
+| Mode             | Path Expiry | Path Seeking | When to use on an RNode                                                                                                                                                                                                                                                                                          |
+| ---------------- | ----------- | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `full`           | 7 days      | No           | Primary nodes, repeaters, fixed infrastructure — full mesh participation, auto-announces, routes traffic. **Note:** with RMAP `discoverable = Yes`, RNS silently rewrites to Access Point unless `ignore_config_warnings = Yes` (mesh-client stamps this when publish is on and you keep Full/Roaming/Boundary). |
+| `access_point`   | 24 hours    | Yes          | High-elevation or wide-area radios serving intermittent users — stays quiet until queried, fast path expiry                                                                                                                                                                                                      |
+| `roaming`        | 6 hours     | Yes          | Mobile/handheld or vehicular RNodes moving between coverage areas — short path timeouts, active discovery                                                                                                                                                                                                        |
+| `boundary`       | 7 days      | No           | Linking a LoRa segment to an Internet/TCP backbone — isolates local traffic, selective announce bridging                                                                                                                                                                                                         |
+| `gateway`        | 7 days      | Yes          | Client-facing interface that resolves unknown paths on behalf of connected nodes                                                                                                                                                                                                                                 |
+| `point_to_point` | 7 days      | No           | Dedicated direct link between exactly two nodes — no routing, no announce propagation                                                                                                                                                                                                                            |
 
 > When adding an RNode, the type default is **Access point** — a good starting point for most radio deployments. Switch to **Roaming** if the radio moves, or **Full** for a fixed high-participation LoRa node. For Internet/LoRa bridging, keep the RNode on Access point (or Roaming) and set the TCP/I2P hub interface to **Boundary** (mesh-client’s hub default).
 
+### RMAP publish and interface mode
+
+Reticulum requires discoverable interfaces to run as **Gateway**, **Internal**, or **Access Point**. Enabling RMAP publish (`discoverable = Yes`) on an RNode configured as Full, Roaming, Boundary, or Point-to-point causes rsReticulum to **auto-correct the runtime mode to Access Point** unless the interface INI sets `ignore_config_warnings = Yes`.
+
+mesh-client **honors an explicit Full (or other non-AP/Gateway) mode with publish** by writing that opt-out when you enable RMAP on such an interface (and on stack start for existing configs). Connection shows an **Effective: Access Point** badge when live stats still differ from the configured mode (e.g. before restart).
+
+| Config                      | Runtime after restart | Idle RF announce behavior                                                                                                                             |
+| --------------------------- | --------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Full + RMAP publish         | Full (with opt-out)   | LXMF delivery announces egress the RNode on `announce_interval_sec` (default **1 hour**), plus RMAP discovery announces on the per-interface interval |
+| Access point + RMAP publish | Access point          | Quiet until queried; RMAP discovery announces only; 24 h path expiry                                                                                  |
+| Full, publish off           | Full                  | LXMF delivery announces on the radio; no RMAP publish                                                                                                 |
+
+Turning publish off clears `ignore_config_warnings` when it is no longer needed. Do not hand-edit the flag unless you know you need the upstream opt-out.
+
 `point_to_point` is omitted from the official Reticulum manual’s interface-modes section but is defined in RNS (`MODE_POINT_TO_POINT`) and included in mesh-client’s mode catalog.
 
 Inbound “other apps / nodes connect to me” on this machine uses **Share instance** under **Network → stack settings** (runtime `SharedInstanceServer`), not a separate TCP server interface type. See also [diagnostics.md](diagnostics.md) SharedInstance notes.
diff --git a/reticulum-sidecar/src/stack/auto_path_policy.rs b/reticulum-sidecar/src/stack/auto_path_policy.rs
index bef4efca3..cd9d5455e 100644
--- a/reticulum-sidecar/src/stack/auto_path_policy.rs
+++ b/reticulum-sidecar/src/stack/auto_path_policy.rs
@@ -291,6 +291,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: vec![],
             discoverable,
             latitude,
@@ -303,6 +304,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: HashMap::default(),
diff --git a/reticulum-sidecar/src/stack/config.rs b/reticulum-sidecar/src/stack/config.rs
index 95775e0de..f9686b45f 100644
--- a/reticulum-sidecar/src/stack/config.rs
+++ b/reticulum-sidecar/src/stack/config.rs
@@ -61,6 +61,7 @@ const KNOWN_IFACE_CONFIG_KEYS: &[&str] = &[
     "network_name",
     "passphrase",
     "flow_control",
+    "ignore_config_warnings",
 ];
 
 fn is_known_iface_config_key(key: &str) -> bool {
@@ -452,6 +453,7 @@ fn interface_block_to_row(block: &IniBlock) -> Option<InterfaceRow> {
                 }
             }
         }),
+        runtime_mode: None,
         seed_addresses,
         discoverable: block.get_bool("discoverable"),
         latitude: block.get("latitude").and_then(|v| v.parse().ok()),
@@ -470,6 +472,7 @@ fn interface_block_to_row(block: &IniBlock) -> Option<InterfaceRow> {
         } else {
             None
         },
+        ignore_config_warnings: block.get_bool("ignore_config_warnings"),
         tx_queue_used: None,
         tx_queue_max: None,
         extra_config: {
@@ -560,6 +563,9 @@ fn interface_row_to_block(row: &InterfaceRow) -> IniBlock {
             block.set("flow_control", &bool_to_ini(v));
         }
     }
+    if let Some(v) = row.ignore_config_warnings {
+        block.set("ignore_config_warnings", &bool_to_ini(v));
+    }
 
     // Preserve unknown keys; typed fields take priority on key collision.
     // Skip keys/values with line breaks so API/disk corruption cannot inject INI sections.
@@ -744,9 +750,69 @@ fn apply_discovery_patch(
             validate_lat_lon(lat, lon)?;
         }
     }
+    reconcile_ignore_config_warnings(row);
     Ok(())
 }
 
+/// Map live `GetInterfaceStats.mode` Debug names (`AccessPoint`, `Full`, …)
+/// to canonical rnsd mode strings. Naive `to_lowercase()` is wrong
+/// (`AccessPoint` → `accesspoint`). Unknown / empty → `None`.
+pub(crate) fn live_interface_runtime_mode(raw: &str) -> Option<String> {
+    let trimmed = raw.trim();
+    if trimmed.is_empty() {
+        return None;
+    }
+    let canonical = match trimmed {
+        "Full" | "full" => "full",
+        "AccessPoint" | "access_point" | "ap" | "AP" => "access_point",
+        "PointToPoint" | "point_to_point" => "point_to_point",
+        "Roaming" | "roaming" => "roaming",
+        "Boundary" | "boundary" => "boundary",
+        "Gateway" | "gateway" | "gw" | "GW" => "gateway",
+        "Internal" | "internal" => "internal",
+        other => {
+            // Accept already-canonical values; reject Debug leftovers.
+            let lower = other.to_ascii_lowercase();
+            match lower.as_str() {
+                "full" | "access_point" | "point_to_point" | "roaming" | "boundary" | "gateway"
+                | "internal" => return Some(lower),
+                _ => return None,
+            }
+        }
+    };
+    Some(canonical.to_string())
+}
+
+/// Modes RNS allows for discoverable interfaces without `ignore_config_warnings`.
+fn mode_allows_discovery_without_opt_out(mode: &str) -> bool {
+    matches!(mode, "access_point" | "gateway")
+}
+
+/// Stamp or clear `ignore_config_warnings` so discoverable + Full/Roaming/Boundary
+/// keeps the configured mode (upstream RNS opt-out). Omitted mode does not write
+/// the flag (RNode type default is AP). Clear when discoverable is off or mode is
+/// already AP/Gateway.
+pub(crate) fn reconcile_ignore_config_warnings(row: &mut InterfaceRow) {
+    let discoverable = row.discoverable == Some(true);
+    let explicit_mode = row
+        .mode
+        .as_deref()
+        .map(str::trim)
+        .filter(|m| !m.is_empty())
+        .and_then(|m| normalize_interface_mode(m).ok().flatten());
+
+    let should_opt_out = discoverable
+        && explicit_mode
+            .as_deref()
+            .is_some_and(|m| !mode_allows_discovery_without_opt_out(m));
+
+    if should_opt_out {
+        row.ignore_config_warnings = Some(true);
+    } else {
+        row.ignore_config_warnings = None;
+    }
+}
+
 const I2P_B32_SUFFIX: &str = ".b32.i2p";
 
 fn validate_i2p_peers(peers: &str) -> Result<(), String> {
@@ -825,6 +891,7 @@ pub fn add_interface_to_config(
         callsign: req.callsign.clone(),
         id_interval: req.id_interval,
         mode,
+        runtime_mode: None,
         seed_addresses: req.seed_addresses.clone(),
         discoverable: req.discoverable,
         latitude: req.latitude,
@@ -840,12 +907,14 @@ pub fn add_interface_to_config(
         flow_control: req
             .flow_control
             .or_else(|| default_flow_control_for_iface_type(&req.iface_type)),
+        ignore_config_warnings: req.ignore_config_warnings,
         tx_queue_used: None,
         tx_queue_max: None,
         extra_config: req.extra_config.clone(),
     };
 
     apply_preset_defaults(&mut row);
+    reconcile_ignore_config_warnings(&mut row);
 
     let content = read_config(config_dir)?;
     let mut parsed = parse_config(&content)?;
@@ -960,6 +1029,10 @@ pub fn update_interface_in_config(
         apply_preset_defaults(&mut row);
     }
 
+    // Mode / discoverable may have changed outside apply_discovery_patch (mode
+    // patch, or discovery fields omitted). Always reconcile before write.
+    reconcile_ignore_config_warnings(&mut row);
+
     if row.iface_type == "i2p" {
         validate_i2p_peers(row.host.as_deref().unwrap_or(""))?;
     }
@@ -1087,6 +1160,32 @@ pub fn repair_rnode_radio_fields_in_config(config_dir: &Path) -> Result<bool, St
     Ok(changed)
 }
 
+/// Stamp `ignore_config_warnings` on discoverable interfaces whose configured
+/// mode would be silently rewritten to Access Point / Gateway by RNS. Also
+/// clears a stale opt-out when mode is already AP/Gateway or publish is off.
+/// Runs at stack start so existing Full+publish configs get the key before RNS
+/// reads the INI. Explicit `No` on Full+discoverable is overwritten (B1 honor).
+pub fn repair_ignore_config_warnings_in_config(config_dir: &Path) -> Result<bool, String> {
+    let content = read_config(config_dir)?;
+    let mut parsed = parse_config(&content)?;
+    let mut changed = false;
+    for block in &mut parsed.interfaces {
+        let Some(mut row) = interface_block_to_row(block) else {
+            continue;
+        };
+        let before = row.ignore_config_warnings;
+        reconcile_ignore_config_warnings(&mut row);
+        if row.ignore_config_warnings != before {
+            *block = interface_row_to_block(&row);
+            changed = true;
+        }
+    }
+    if changed {
+        write_config(config_dir, &serialize_config(&parsed))?;
+    }
+    Ok(changed)
+}
+
 /// One-time migration: enable `flow_control` on RF interfaces that omit the key,
 /// so existing configs get TX backpressure. Explicit `False`/`No` is preserved.
 /// Non-RF blocks are never touched (no key injected).
@@ -2589,6 +2688,7 @@ target_port = 4242
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -2601,6 +2701,7 @@ target_port = 4242
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: {
@@ -3204,4 +3305,431 @@ target_port = 4242
         assert!(!disk.contains("flow_control"), "{disk}");
         let _ = fs::remove_dir_all(&dir);
     }
+
+    #[test]
+    fn ignore_config_warnings_key_is_known() {
+        assert!(is_known_iface_config_key("ignore_config_warnings"));
+        assert!(is_known_iface_config_key("Ignore_Config_Warnings"));
+    }
+
+    #[test]
+    fn live_interface_runtime_mode_maps_debug_names() {
+        let cases = [
+            ("Full", Some("full")),
+            ("AccessPoint", Some("access_point")),
+            ("PointToPoint", Some("point_to_point")),
+            ("Roaming", Some("roaming")),
+            ("Boundary", Some("boundary")),
+            ("Gateway", Some("gateway")),
+            ("Internal", Some("internal")),
+            ("full", Some("full")),
+            ("access_point", Some("access_point")),
+            ("ap", Some("access_point")),
+            ("", None),
+            ("   ", None),
+            ("NotAMode", None),
+            // Naive to_lowercase would produce "accesspoint" — must not match.
+            ("accesspoint", None),
+        ];
+        for (raw, expected) in cases {
+            assert_eq!(
+                live_interface_runtime_mode(raw).as_deref(),
+                expected,
+                "raw={raw:?}"
+            );
+        }
+    }
+
+    #[test]
+    fn ignore_config_warnings_parsed_as_typed_not_extra_config() {
+        let content = r#"
+[interfaces]
+[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = full
+discoverable = Yes
+ignore_config_warnings = Yes
+"#;
+        let rows = interfaces_from_parsed(&parse_config(content).unwrap());
+        let rnode = rows.iter().find(|r| r.iface_type == "rnode").unwrap();
+        assert_eq!(rnode.ignore_config_warnings, Some(true));
+        assert!(!rnode.extra_config.contains_key("ignore_config_warnings"));
+    }
+
+    #[test]
+    fn ignore_config_warnings_round_trips() {
+        for (value, expected_ini) in [
+            (true, "ignore_config_warnings = Yes"),
+            (false, "ignore_config_warnings = No"),
+        ] {
+            let dir = fresh_config_dir();
+            let added = add_interface_to_config(
+                &dir,
+                &AddInterfaceRequest {
+                    iface_type: "rnode".into(),
+                    name: Some("RNode".into()),
+                    serial_port: Some("/dev/ttyUSB0".into()),
+                    callsign: Some("N0CALL".into()),
+                    mode: Some("full".into()),
+                    discoverable: Some(true),
+                    latitude: Some(40.0),
+                    longitude: Some(-105.0),
+                    ignore_config_warnings: Some(value),
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            // add_interface reconciles to Some(true) for Full+discoverable regardless
+            // of the request's false — B1 always stamps Yes when needed.
+            let disk = read_config(&dir).unwrap();
+            if value {
+                assert!(disk.contains(expected_ini), "{disk}");
+            } else {
+                // reconcile overwrites explicit No on Full+discoverable.
+                assert!(disk.contains("ignore_config_warnings = Yes"), "{disk}");
+            }
+            let rows = interfaces_from_config_dir(&dir).unwrap();
+            let row = rows.iter().find(|r| r.id == added.id).unwrap();
+            assert_eq!(row.ignore_config_warnings, Some(true));
+            assert!(!row.extra_config.contains_key("ignore_config_warnings"));
+            let _ = fs::remove_dir_all(&dir);
+        }
+    }
+
+    #[test]
+    fn reconcile_stamps_for_full_discoverable_clears_for_ap() {
+        let mut row = InterfaceRow {
+            id: "x".into(),
+            name: "RNode".into(),
+            iface_type: "rnode".into(),
+            enabled: true,
+            status: "up".into(),
+            host: None,
+            port: None,
+            preset: None,
+            serial_port: Some("/dev/ttyUSB0".into()),
+            frequency: None,
+            bandwidth: None,
+            txpower: None,
+            spreading_factor: None,
+            coding_rate: None,
+            callsign: None,
+            id_interval: None,
+            mode: Some("full".into()),
+            runtime_mode: None,
+            seed_addresses: Vec::new(),
+            discoverable: Some(true),
+            latitude: Some(40.0),
+            longitude: Some(-105.0),
+            height: None,
+            discovery_name: None,
+            announce_interval_min: None,
+            connectable: None,
+            reachable_on: None,
+            network_name: None,
+            passphrase: None,
+            flow_control: Some(true),
+            ignore_config_warnings: None,
+            tx_queue_used: None,
+            tx_queue_max: None,
+            extra_config: HashMap::new(),
+        };
+        reconcile_ignore_config_warnings(&mut row);
+        assert_eq!(row.ignore_config_warnings, Some(true));
+
+        for mode in ["roaming", "boundary", "point_to_point"] {
+            row.mode = Some(mode.into());
+            row.ignore_config_warnings = None;
+            reconcile_ignore_config_warnings(&mut row);
+            assert_eq!(
+                row.ignore_config_warnings,
+                Some(true),
+                "mode={mode} should stamp opt-out"
+            );
+        }
+
+        row.mode = Some("access_point".into());
+        reconcile_ignore_config_warnings(&mut row);
+        assert_eq!(row.ignore_config_warnings, None);
+
+        row.mode = Some("gateway".into());
+        row.ignore_config_warnings = Some(true);
+        reconcile_ignore_config_warnings(&mut row);
+        assert_eq!(row.ignore_config_warnings, None);
+
+        row.mode = Some("full".into());
+        row.discoverable = Some(false);
+        row.ignore_config_warnings = Some(true);
+        reconcile_ignore_config_warnings(&mut row);
+        assert_eq!(row.ignore_config_warnings, None);
+
+        // Omitted mode (RNode default AP) must not stamp.
+        row.mode = None;
+        row.discoverable = Some(true);
+        row.ignore_config_warnings = Some(true);
+        reconcile_ignore_config_warnings(&mut row);
+        assert_eq!(row.ignore_config_warnings, None);
+    }
+
+    #[test]
+    fn update_discovery_stamps_and_clears_ignore_config_warnings() {
+        let dir = fresh_config_dir();
+        let added = add_interface_to_config(
+            &dir,
+            &AddInterfaceRequest {
+                iface_type: "rnode".into(),
+                name: Some("RNode".into()),
+                serial_port: Some("/dev/ttyUSB0".into()),
+                callsign: Some("N0CALL".into()),
+                mode: Some("full".into()),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        assert_eq!(added.ignore_config_warnings, None);
+
+        let updated = update_interface_in_config(
+            &dir,
+            &added.id,
+            &UpdateInterfacePatch {
+                discoverable: Some(true),
+                latitude: Some(40.0),
+                longitude: Some(-105.0),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        assert_eq!(updated.ignore_config_warnings, Some(true));
+        let disk = read_config(&dir).unwrap();
+        assert!(disk.contains("ignore_config_warnings = Yes"), "{disk}");
+
+        let cleared = update_interface_in_config(
+            &dir,
+            &added.id,
+            &UpdateInterfacePatch {
+                discoverable: Some(false),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        assert_eq!(cleared.ignore_config_warnings, None);
+        let disk = read_config(&dir).unwrap();
+        assert!(!disk.contains("ignore_config_warnings"), "{disk}");
+
+        // Gateway + discoverable does not need the opt-out.
+        let gw = update_interface_in_config(
+            &dir,
+            &added.id,
+            &UpdateInterfacePatch {
+                mode: Some("gateway".into()),
+                discoverable: Some(true),
+                latitude: Some(40.0),
+                longitude: Some(-105.0),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        assert_eq!(gw.ignore_config_warnings, None);
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn update_preserves_extra_config_when_stamping_ignore_warnings() {
+        let dir = fresh_config_dir();
+        write_config(
+            &dir,
+            r#"[interfaces]
+[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = full
+forward_interval = 300
+"#,
+        )
+        .unwrap();
+        let id = interface_id_from_name("LoRa");
+        update_interface_in_config(
+            &dir,
+            &id,
+            &UpdateInterfacePatch {
+                discoverable: Some(true),
+                latitude: Some(40.0),
+                longitude: Some(-105.0),
+                ..Default::default()
+            },
+        )
+        .unwrap();
+        let disk = read_config(&dir).unwrap();
+        assert!(disk.contains("ignore_config_warnings = Yes"), "{disk}");
+        assert!(disk.contains("forward_interval = 300"), "{disk}");
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn repair_ignore_config_warnings_stamps_full_discoverable() {
+        let dir = fresh_config_dir();
+        write_config(
+            &dir,
+            r#"[interfaces]
+[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = full
+discoverable = Yes
+latitude = 40.0
+longitude = -105.0
+"#,
+        )
+        .unwrap();
+        assert!(repair_ignore_config_warnings_in_config(&dir).unwrap());
+        let disk = read_config(&dir).unwrap();
+        assert!(disk.contains("ignore_config_warnings = Yes"), "{disk}");
+        assert!(!repair_ignore_config_warnings_in_config(&dir).unwrap());
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn repair_ignore_config_warnings_skips_ap_discoverable() {
+        let dir = fresh_config_dir();
+        write_config(
+            &dir,
+            r#"[interfaces]
+[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = access_point
+discoverable = Yes
+latitude = 40.0
+longitude = -105.0
+"#,
+        )
+        .unwrap();
+        assert!(!repair_ignore_config_warnings_in_config(&dir).unwrap());
+        let disk = read_config(&dir).unwrap();
+        assert!(!disk.contains("ignore_config_warnings"), "{disk}");
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn repair_ignore_config_warnings_clears_stale_yes_on_ap() {
+        let dir = fresh_config_dir();
+        write_config(
+            &dir,
+            r#"[interfaces]
+[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = access_point
+discoverable = Yes
+latitude = 40.0
+longitude = -105.0
+ignore_config_warnings = Yes
+"#,
+        )
+        .unwrap();
+        assert!(repair_ignore_config_warnings_in_config(&dir).unwrap());
+        let disk = read_config(&dir).unwrap();
+        assert!(!disk.contains("ignore_config_warnings"), "{disk}");
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn repair_ignore_config_warnings_overwrites_explicit_no_on_full_discoverable() {
+        let dir = fresh_config_dir();
+        write_config(
+            &dir,
+            r#"[interfaces]
+[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = full
+discoverable = Yes
+latitude = 40.0
+longitude = -105.0
+ignore_config_warnings = No
+"#,
+        )
+        .unwrap();
+        assert!(repair_ignore_config_warnings_in_config(&dir).unwrap());
+        let disk = read_config(&dir).unwrap();
+        assert!(disk.contains("ignore_config_warnings = Yes"), "{disk}");
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn repair_ignore_config_warnings_leaves_tcp_untouched() {
+        let dir = fresh_config_dir();
+        write_config(
+            &dir,
+            r#"[interfaces]
+[[Hub]]
+type = TCPClientInterface
+interface_enabled = Yes
+name = Hub
+target_host = example.org
+target_port = 4242
+mode = boundary
+discoverable = Yes
+latitude = 40.0
+longitude = -105.0
+"#,
+        )
+        .unwrap();
+        // Boundary + discoverable would stamp on any type; TCP is allowed to stamp too
+        // per reconcile (not RF-gated). Assert it does stamp so behavior is documented.
+        assert!(repair_ignore_config_warnings_in_config(&dir).unwrap());
+        let disk = read_config(&dir).unwrap();
+        assert!(disk.contains("ignore_config_warnings = Yes"), "{disk}");
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn tcp_discoverable_boundary_stamps_opt_out() {
+        // Non-RF types still get the opt-out when mode would be autocorrected.
+        let mut row = InterfaceRow {
+            id: "tcp".into(),
+            name: "Hub".into(),
+            iface_type: "tcp".into(),
+            enabled: true,
+            status: "up".into(),
+            host: Some("example.org".into()),
+            port: Some(4242),
+            preset: None,
+            serial_port: None,
+            frequency: None,
+            bandwidth: None,
+            txpower: None,
+            spreading_factor: None,
+            coding_rate: None,
+            callsign: None,
+            id_interval: None,
+            mode: Some("boundary".into()),
+            runtime_mode: None,
+            seed_addresses: Vec::new(),
+            discoverable: Some(true),
+            latitude: Some(1.0),
+            longitude: Some(2.0),
+            height: None,
+            discovery_name: None,
+            announce_interval_min: None,
+            connectable: None,
+            reachable_on: None,
+            network_name: None,
+            passphrase: None,
+            flow_control: None,
+            ignore_config_warnings: None,
+            tx_queue_used: None,
+            tx_queue_max: None,
+            extra_config: HashMap::new(),
+        };
+        reconcile_ignore_config_warnings(&mut row);
+        assert_eq!(row.ignore_config_warnings, Some(true));
+    }
 }
diff --git a/reticulum-sidecar/src/stack/config_audit.rs b/reticulum-sidecar/src/stack/config_audit.rs
index edcbd7a33..209191b15 100644
--- a/reticulum-sidecar/src/stack/config_audit.rs
+++ b/reticulum-sidecar/src/stack/config_audit.rs
@@ -329,6 +329,36 @@ fn audit_rmap_discovery(
                 Some("edit"),
             ));
         }
+
+        // Discoverable + Full/Roaming/Boundary (etc.) is silently rewritten to AP
+        // by RNS unless ignore_config_warnings is set. Omitted mode defaults to AP
+        // for RNode — no issue in that case.
+        if is_local_rnode_publish_target(row) {
+            let mode = row.mode.as_deref().map(str::trim).filter(|m| !m.is_empty());
+            if let Some(mode) = mode {
+                let normalized = mode.to_ascii_lowercase();
+                let canonical = match normalized.as_str() {
+                    "ap" => "access_point",
+                    "gw" => "gateway",
+                    other => other,
+                };
+                let discovery_safe = matches!(canonical, "access_point" | "gateway");
+                let opt_out = row.ignore_config_warnings == Some(true);
+                if !discovery_safe && !opt_out {
+                    issues.push(issue(
+                        "rmap_mode_autocorrect",
+                        "warning",
+                        Some(row.id.clone()),
+                        Some(row.name.clone()),
+                        format!(
+                            "Interface \"{}\" is discoverable with mode {} — RNS will auto-correct to Access Point unless ignore_config_warnings is set",
+                            row.name, canonical
+                        ),
+                        Some("edit"),
+                    ));
+                }
+            }
+        }
     }
 
     if any_discoverable && !stack_settings.enable_transport {
@@ -647,6 +677,7 @@ target_port = 4242
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -659,6 +690,7 @@ target_port = 4242
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
@@ -755,4 +787,118 @@ target_port = 4242
         assert!(!issues.iter().any(|i| i.kind.starts_with("rmap_")));
         let _ = fs::remove_dir_all(&dir);
     }
+
+    #[test]
+    fn rmap_mode_autocorrect_when_full_discoverable_without_opt_out() {
+        let dir = std::env::temp_dir().join(format!("mesh_reticulum_audit_{}", Uuid::new_v4()));
+        fs::create_dir_all(&dir).unwrap();
+        write_sample_config(
+            &dir,
+            r#"[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = full
+discoverable = Yes
+latitude = 40.0
+longitude = -105.0
+
+[[RMAP World]]
+type = TCPClientInterface
+interface_enabled = Yes
+name = RMAP World
+target_host = rmap.world
+target_port = 4242
+"#,
+        );
+        let rows = config::interfaces_from_config_dir(&dir).unwrap();
+        let settings = StackSettings {
+            enable_transport: true,
+            ..Default::default()
+        };
+        let issues = audit_config(&dir, &rows, &settings, false).unwrap();
+        assert!(issues.iter().any(|i| i.kind == "rmap_mode_autocorrect"));
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn rmap_mode_autocorrect_absent_when_opt_out_set() {
+        let dir = std::env::temp_dir().join(format!("mesh_reticulum_audit_{}", Uuid::new_v4()));
+        fs::create_dir_all(&dir).unwrap();
+        write_sample_config(
+            &dir,
+            r#"[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = full
+discoverable = Yes
+latitude = 40.0
+longitude = -105.0
+ignore_config_warnings = Yes
+
+[[RMAP World]]
+type = TCPClientInterface
+interface_enabled = Yes
+name = RMAP World
+target_host = rmap.world
+target_port = 4242
+"#,
+        );
+        let rows = config::interfaces_from_config_dir(&dir).unwrap();
+        let settings = StackSettings {
+            enable_transport: true,
+            ..Default::default()
+        };
+        let issues = audit_config(&dir, &rows, &settings, false).unwrap();
+        assert!(!issues.iter().any(|i| i.kind == "rmap_mode_autocorrect"));
+        let _ = fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn rmap_mode_autocorrect_absent_for_ap_or_gateway() {
+        for mode in ["access_point", "gateway", "roaming"] {
+            let dir = std::env::temp_dir().join(format!("mesh_reticulum_audit_{}", Uuid::new_v4()));
+            fs::create_dir_all(&dir).unwrap();
+            write_sample_config(
+                &dir,
+                &format!(
+                    r#"[[LoRa]]
+type = RNodeInterface
+enabled = Yes
+port = /dev/ttyUSB0
+mode = {mode}
+discoverable = Yes
+latitude = 40.0
+longitude = -105.0
+
+[[RMAP World]]
+type = TCPClientInterface
+interface_enabled = Yes
+name = RMAP World
+target_host = rmap.world
+target_port = 4242
+"#
+                ),
+            );
+            let rows = config::interfaces_from_config_dir(&dir).unwrap();
+            let settings = StackSettings {
+                enable_transport: true,
+                ..Default::default()
+            };
+            let issues = audit_config(&dir, &rows, &settings, false).unwrap();
+            if mode == "roaming" {
+                assert!(
+                    issues.iter().any(|i| i.kind == "rmap_mode_autocorrect"),
+                    "roaming should warn"
+                );
+            } else {
+                assert!(
+                    !issues.iter().any(|i| i.kind == "rmap_mode_autocorrect"),
+                    "mode={mode} should not warn"
+                );
+            }
+            let _ = fs::remove_dir_all(&dir);
+        }
+    }
 }
diff --git a/reticulum-sidecar/src/stack/live.rs b/reticulum-sidecar/src/stack/live.rs
index 3cb644b0e..c9604e0ab 100644
--- a/reticulum-sidecar/src/stack/live.rs
+++ b/reticulum-sidecar/src/stack/live.rs
@@ -2502,6 +2502,7 @@ impl LiveBridge {
                                     callsign: None,
                                     id_interval: None,
                                     mode: None,
+                                    runtime_mode: config::live_interface_runtime_mode(&s.mode),
                                     seed_addresses: Vec::new(),
                                     discoverable: None,
                                     latitude: None,
@@ -2514,6 +2515,7 @@ impl LiveBridge {
                                     network_name: None,
                                     passphrase: None,
                                     flow_control: None,
+                                    ignore_config_warnings: None,
                                     tx_queue_used,
                                     tx_queue_max,
                                     extra_config: std::collections::HashMap::new(),
@@ -4150,6 +4152,7 @@ impl LiveBridge {
                     callsign: None,
                     id_interval: None,
                     mode: None,
+                    runtime_mode: config::live_interface_runtime_mode(&s.mode),
                     seed_addresses: Vec::new(),
                     discoverable: None,
                     latitude: None,
@@ -4162,6 +4165,7 @@ impl LiveBridge {
                     network_name: None,
                     passphrase: None,
                     flow_control: None,
+                    ignore_config_warnings: None,
                     tx_queue_used,
                     tx_queue_max,
                     extra_config: std::collections::HashMap::new(),
@@ -6715,6 +6719,7 @@ mod nomad_private_first_failover_tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: vec![],
             discoverable,
             latitude,
@@ -6727,6 +6732,7 @@ mod nomad_private_first_failover_tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::default(),
diff --git a/reticulum-sidecar/src/stack/local_rnode_primary.rs b/reticulum-sidecar/src/stack/local_rnode_primary.rs
index 803f60de6..7c163ea0a 100644
--- a/reticulum-sidecar/src/stack/local_rnode_primary.rs
+++ b/reticulum-sidecar/src/stack/local_rnode_primary.rs
@@ -302,6 +302,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -314,6 +315,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
diff --git a/reticulum-sidecar/src/stack/lxmf_outbound.rs b/reticulum-sidecar/src/stack/lxmf_outbound.rs
index a06bfc4b5..cbfad6b98 100644
--- a/reticulum-sidecar/src/stack/lxmf_outbound.rs
+++ b/reticulum-sidecar/src/stack/lxmf_outbound.rs
@@ -2294,6 +2294,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: vec![],
             discoverable,
             latitude,
@@ -2306,6 +2307,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::default(),
diff --git a/reticulum-sidecar/src/stack/mod.rs b/reticulum-sidecar/src/stack/mod.rs
index d055d8855..fe5841cc3 100644
--- a/reticulum-sidecar/src/stack/mod.rs
+++ b/reticulum-sidecar/src/stack/mod.rs
@@ -246,6 +246,18 @@ impl StackHandle {
             }
         }
 
+        match config::repair_ignore_config_warnings_in_config(&config_dir) {
+            Ok(true) => {
+                tracing::info!(
+                    "reconciled ignore_config_warnings for discoverable interfaces with non-AP/Gateway mode"
+                );
+            }
+            Ok(false) => {}
+            Err(e) => {
+                tracing::warn!("failed to reconcile ignore_config_warnings in config: {e}");
+            }
+        }
+
         let mut persisted = PersistedState::load(&config_dir, &storage_dir);
         persisted.ensure_defaults();
         if let Ok(ifaces) = config::interfaces_from_config_dir(&config_dir) {
diff --git a/reticulum-sidecar/src/stack/nomad_timeouts.rs b/reticulum-sidecar/src/stack/nomad_timeouts.rs
index 4db7dae9c..c3620c840 100644
--- a/reticulum-sidecar/src/stack/nomad_timeouts.rs
+++ b/reticulum-sidecar/src/stack/nomad_timeouts.rs
@@ -152,6 +152,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -164,6 +165,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
diff --git a/reticulum-sidecar/src/stack/path_failover.rs b/reticulum-sidecar/src/stack/path_failover.rs
index efabb0214..15686af43 100644
--- a/reticulum-sidecar/src/stack/path_failover.rs
+++ b/reticulum-sidecar/src/stack/path_failover.rs
@@ -292,6 +292,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: vec![],
             discoverable,
             latitude,
@@ -304,6 +305,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::default(),
diff --git a/reticulum-sidecar/src/stack/persistence.rs b/reticulum-sidecar/src/stack/persistence.rs
index 23ce1f18c..ab6a44ebe 100644
--- a/reticulum-sidecar/src/stack/persistence.rs
+++ b/reticulum-sidecar/src/stack/persistence.rs
@@ -284,6 +284,7 @@ impl PersistedState {
             callsign: req.callsign,
             id_interval: req.id_interval,
             mode: req.mode,
+            runtime_mode: None,
             seed_addresses: req.seed_addresses,
             discoverable: req.discoverable,
             latitude: req.latitude,
@@ -298,6 +299,7 @@ impl PersistedState {
             flow_control: req
                 .flow_control
                 .or_else(|| super::config::default_flow_control_for_iface_type(&req.iface_type)),
+            ignore_config_warnings: req.ignore_config_warnings,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: req.extra_config,
diff --git a/reticulum-sidecar/src/stack/rf_profiles.rs b/reticulum-sidecar/src/stack/rf_profiles.rs
index 053817244..89a5e8a4c 100644
--- a/reticulum-sidecar/src/stack/rf_profiles.rs
+++ b/reticulum-sidecar/src/stack/rf_profiles.rs
@@ -201,6 +201,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -213,6 +214,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
diff --git a/reticulum-sidecar/src/stack/types.rs b/reticulum-sidecar/src/stack/types.rs
index 3d0e1a5f7..287fdea73 100644
--- a/reticulum-sidecar/src/stack/types.rs
+++ b/reticulum-sidecar/src/stack/types.rs
@@ -31,6 +31,11 @@ pub struct InterfaceRow {
     pub callsign: Option<String>,
     pub id_interval: Option<u32>,
     pub mode: Option<String>,
+    /// Effective RNS interface mode from live `GetInterfaceStats` (Debug name
+    /// mapped to canonical rnsd values). None when offline / unknown. Config
+    /// `mode` remains the user-configured value; the UI compares the two.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub runtime_mode: Option<String>,
     #[serde(default)]
     pub seed_addresses: Vec<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -59,6 +64,11 @@ pub struct InterfaceRow {
     /// bursts do not overflow the bounded TX queue. Only meaningful for RF types.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub flow_control: Option<bool>,
+    /// Upstream RNS opt-out: keep configured mode when `discoverable` would
+    /// otherwise auto-correct to Access Point / Gateway. Derived by mesh-client
+    /// when publish is on and mode is not AP/Gateway.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub ignore_config_warnings: Option<bool>,
     /// Host outbound TX mpsc fill from live `GetInterfaceStats` (None when offline / unknown).
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub tx_queue_used: Option<u64>,
@@ -268,6 +278,8 @@ pub struct AddInterfaceRequest {
     #[serde(default)]
     pub flow_control: Option<bool>,
     #[serde(default)]
+    pub ignore_config_warnings: Option<bool>,
+    #[serde(default)]
     pub extra_config: HashMap<String, String>,
 }
 
@@ -324,6 +336,7 @@ mod tx_queue_serde_tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -336,6 +349,7 @@ mod tx_queue_serde_tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: HashMap::default(),
@@ -349,6 +363,8 @@ mod tx_queue_serde_tests {
         let obj = value.as_object().expect("object");
         assert!(!obj.contains_key("tx_queue_used"));
         assert!(!obj.contains_key("tx_queue_max"));
+        assert!(!obj.contains_key("runtime_mode"));
+        assert!(!obj.contains_key("ignore_config_warnings"));
     }
 
     #[test]
@@ -361,6 +377,8 @@ mod tx_queue_serde_tests {
         let roundtrip: InterfaceRow = serde_json::from_value(value).expect("deserialize");
         assert_eq!(roundtrip.tx_queue_used, None);
         assert_eq!(roundtrip.tx_queue_max, None);
+        assert_eq!(roundtrip.runtime_mode, None);
+        assert_eq!(roundtrip.ignore_config_warnings, None);
     }
 
     #[test]
@@ -376,6 +394,25 @@ mod tx_queue_serde_tests {
         assert_eq!(roundtrip.tx_queue_max, Some(256));
     }
 
+    #[test]
+    fn runtime_mode_and_ignore_warnings_round_trip() {
+        let mut row = minimal_row();
+        row.runtime_mode = Some("access_point".into());
+        row.ignore_config_warnings = Some(true);
+        let value = serde_json::to_value(&row).expect("serialize");
+        assert_eq!(
+            value.get("runtime_mode"),
+            Some(&Value::from("access_point"))
+        );
+        assert_eq!(
+            value.get("ignore_config_warnings"),
+            Some(&Value::Bool(true))
+        );
+        let roundtrip: InterfaceRow = serde_json::from_value(value).expect("deserialize");
+        assert_eq!(roundtrip.runtime_mode.as_deref(), Some("access_point"));
+        assert_eq!(roundtrip.ignore_config_warnings, Some(true));
+    }
+
     #[test]
     fn offline_live_statistics_yield_none() {
         let mut row = minimal_row();
diff --git a/reticulum-sidecar/src/stack/via.rs b/reticulum-sidecar/src/stack/via.rs
index e20a7e332..4a09c6b39 100644
--- a/reticulum-sidecar/src/stack/via.rs
+++ b/reticulum-sidecar/src/stack/via.rs
@@ -219,6 +219,7 @@ pub fn merge_live_interfaces_with_config(
             live_row.callsign = cfg.callsign.clone();
             live_row.id_interval = cfg.id_interval;
             live_row.mode = cfg.mode.clone();
+            // Keep live `runtime_mode` (effective RNS mode); do not clobber with config.
             live_row.discoverable = cfg.discoverable;
             live_row.latitude = cfg.latitude;
             live_row.longitude = cfg.longitude;
@@ -230,6 +231,8 @@ pub fn merge_live_interfaces_with_config(
             // Config is source of truth for IFAC / extras / BLE seeds (live stats omit them).
             live_row.network_name = cfg.network_name.clone();
             live_row.passphrase = cfg.passphrase.clone();
+            live_row.flow_control = cfg.flow_control;
+            live_row.ignore_config_warnings = cfg.ignore_config_warnings;
             live_row.extra_config = cfg.extra_config.clone();
             live_row.seed_addresses = cfg.seed_addresses.clone();
             // Config INI is the source of truth for user enable/disable; live stats only
@@ -284,6 +287,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -296,6 +300,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
@@ -412,6 +417,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -424,6 +430,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
@@ -452,6 +459,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -464,6 +472,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
@@ -486,6 +495,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -498,6 +508,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
@@ -533,6 +544,7 @@ mod tests {
                 callsign: None,
                 id_interval: None,
                 mode: None,
+                runtime_mode: None,
                 seed_addresses: Vec::new(),
                 discoverable: None,
                 latitude: None,
@@ -545,6 +557,7 @@ mod tests {
                 network_name: None,
                 passphrase: None,
                 flow_control: None,
+                ignore_config_warnings: None,
                 tx_queue_used: None,
                 tx_queue_max: None,
                 extra_config: std::collections::HashMap::new(),
@@ -567,6 +580,7 @@ mod tests {
                 callsign: None,
                 id_interval: None,
                 mode: None,
+                runtime_mode: None,
                 seed_addresses: Vec::new(),
                 discoverable: None,
                 latitude: None,
@@ -579,6 +593,7 @@ mod tests {
                 network_name: None,
                 passphrase: None,
                 flow_control: None,
+                ignore_config_warnings: None,
                 tx_queue_used: None,
                 tx_queue_max: None,
                 extra_config: std::collections::HashMap::new(),
@@ -612,6 +627,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -624,6 +640,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
@@ -657,6 +674,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: Some("boundary".into()),
+            runtime_mode: None,
             seed_addresses: vec!["AA:BB:CC:DD:EE:FF".into()],
             discoverable: None,
             latitude: None,
@@ -669,6 +687,7 @@ mod tests {
             network_name: Some("ttp_internal".into()),
             passphrase: Some("resistance202606".into()),
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: extra.clone(),
@@ -691,6 +710,7 @@ mod tests {
             callsign: None,
             id_interval: None,
             mode: None,
+            runtime_mode: None,
             seed_addresses: Vec::new(),
             discoverable: None,
             latitude: None,
@@ -703,6 +723,7 @@ mod tests {
             network_name: None,
             passphrase: None,
             flow_control: None,
+            ignore_config_warnings: None,
             tx_queue_used: None,
             tx_queue_max: None,
             extra_config: std::collections::HashMap::new(),
@@ -749,4 +770,48 @@ mod tests {
         assert_eq!(merged[0].tx_queue_used, None);
         assert_eq!(merged[0].tx_queue_max, None);
     }
+
+    #[test]
+    fn merge_preserves_runtime_mode_while_config_mode_wins() {
+        // Silent-lie case: UI config says full; live RNS rewrote to Access Point.
+        let mut config = sample_iface("cfg-1", "RNode USB", "rnode", true, "down");
+        config.mode = Some("full".into());
+        config.discoverable = Some(true);
+        config.ignore_config_warnings = Some(true);
+        config.flow_control = Some(true);
+
+        let mut live = sample_iface("rns-0", "RNode USB", "AccessPoint", true, "up");
+        live.runtime_mode = Some("access_point".into());
+
+        let merged = merge_live_interfaces_with_config(&[config], vec![live]);
+        assert_eq!(merged.len(), 1);
+        assert_eq!(merged[0].iface_type, "rnode");
+        assert_eq!(merged[0].mode.as_deref(), Some("full"));
+        assert_eq!(merged[0].runtime_mode.as_deref(), Some("access_point"));
+        assert_eq!(merged[0].ignore_config_warnings, Some(true));
+        assert_eq!(merged[0].flow_control, Some(true));
+        assert_eq!(merged[0].discoverable, Some(true));
+    }
+
+    #[test]
+    fn merge_preserves_matching_runtime_mode() {
+        let mut config = sample_iface("cfg-1", "RNode USB", "rnode", true, "down");
+        config.mode = Some("full".into());
+        let mut live = sample_iface("rns-0", "RNode USB", "Full", true, "up");
+        live.runtime_mode = Some("full".into());
+        let merged = merge_live_interfaces_with_config(&[config], vec![live]);
+        assert_eq!(merged[0].mode.as_deref(), Some("full"));
+        assert_eq!(merged[0].runtime_mode.as_deref(), Some("full"));
+    }
+
+    #[test]
+    fn merge_offline_runtime_mode_stays_unset() {
+        let mut config = sample_iface("cfg-1", "RNode USB", "rnode", true, "up");
+        config.mode = Some("full".into());
+        let mut live = sample_iface("rns-0", "RNode USB", "AccessPoint", true, "down");
+        live.runtime_mode = None;
+        let merged = merge_live_interfaces_with_config(&[config], vec![live]);
+        assert_eq!(merged[0].runtime_mode, None);
+        assert_eq!(merged[0].mode.as_deref(), Some("full"));
+    }
 }
diff --git a/src/renderer/components/reticulum/ReticulumInterfacesPanel.test.tsx b/src/renderer/components/reticulum/ReticulumInterfacesPanel.test.tsx
index d174fedab..85ce80718 100644
--- a/src/renderer/components/reticulum/ReticulumInterfacesPanel.test.tsx
+++ b/src/renderer/components/reticulum/ReticulumInterfacesPanel.test.tsx
@@ -2141,4 +2141,58 @@ describe('ReticulumInterfacesPanel', () => {
       ).not.toBeInTheDocument();
     });
   });
+
+  describe('effective runtime mode badge', () => {
+    const divergedRnode: ReticulumInterfaceRow = {
+      ...rmapCapableRnode,
+      mode: 'full',
+      runtime_mode: 'access_point',
+      discoverable: true,
+    };
+
+    it('shows effective-mode badge when configured and runtime modes diverge', async () => {
+      const { container } = render(
+        <ReticulumInterfacesPanel {...defaultProps} interfaces={[divergedRnode, rmapWorldHub]} />,
+      );
+      expect(screen.getByTestId('reticulum-runtime-mode-rnode-41f4')).toBeInTheDocument();
+      expect(
+        screen.getAllByLabelText('connectionPanel.reticulumInterfaces.effectiveModeAria').length,
+      ).toBeGreaterThanOrEqual(2);
+      expect(
+        screen.getByRole('checkbox', {
+          name: 'connectionPanel.reticulumInterfaces.rmapDiscoverableAria',
+        }),
+      ).toBeInTheDocument();
+      expect(screen.getByTestId('reticulum-runtime-mode-rnode-41f4-rmap')).toBeInTheDocument();
+      hydrateAxeThemeColors(container);
+      expect(await axe(container)).toHaveNoViolations();
+    });
+
+    it('hides badge when modes match or runtime_mode is omitted', () => {
+      const { rerender } = render(
+        <ReticulumInterfacesPanel
+          {...defaultProps}
+          interfaces={[{ ...rmapCapableRnode, mode: 'full', runtime_mode: 'full' }, rmapWorldHub]}
+        />,
+      );
+      expect(screen.queryByTestId('reticulum-runtime-mode-rnode-41f4')).not.toBeInTheDocument();
+
+      rerender(
+        <ReticulumInterfacesPanel
+          {...defaultProps}
+          interfaces={[{ ...rmapCapableRnode, mode: 'full' }, rmapWorldHub]}
+        />,
+      );
+      expect(screen.queryByTestId('reticulum-runtime-mode-rnode-41f4')).not.toBeInTheDocument();
+    });
+
+    it('shows effective-mode badge next to mode select while editing', async () => {
+      const user = userEvent.setup();
+      render(<ReticulumInterfacesPanel {...defaultProps} interfaces={[divergedRnode]} />);
+      await user.click(
+        screen.getByRole('button', { name: 'connectionPanel.reticulumInterfaces.edit' }),
+      );
+      expect(screen.getByTestId('reticulum-runtime-mode-rnode-41f4-edit')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/src/renderer/components/reticulum/ReticulumInterfacesPanel.tsx b/src/renderer/components/reticulum/ReticulumInterfacesPanel.tsx
index e2ce62bd0..11f41ded9 100644
--- a/src/renderer/components/reticulum/ReticulumInterfacesPanel.tsx
+++ b/src/renderer/components/reticulum/ReticulumInterfacesPanel.tsx
@@ -54,6 +54,7 @@ import {
   defaultModeForIfaceType,
   normalizeReticulumInterfaceMode,
   RETICULUM_INTERFACE_MODES,
+  reticulumInterfaceModesDiverge,
 } from '@/renderer/lib/reticulum/reticulumInterfaceMode';
 import {
   deriveReticulumInterfaceName,
@@ -1339,6 +1340,38 @@ function ReticulumInterfaceModeDescription({
   );
 }
 
+/** Amber badge when live RNS mode differs from configured mode (silent AP rewrite). */
+function ReticulumEffectiveModeBadge({
+  iface,
+  idSuffix,
+}: {
+  iface: Pick<ReticulumInterfaceRow, 'id' | 'mode' | 'runtime_mode'>;
+  idSuffix?: string;
+}) {
+  const { t } = useTranslation();
+  if (!reticulumInterfaceModesDiverge(iface.mode, iface.runtime_mode)) {
+    return null;
+  }
+  const runtime = normalizeReticulumInterfaceMode(iface.runtime_mode);
+  if (!runtime) return null;
+  const modeLabel = t(`connectionPanel.reticulumInterfaces.modeOption.${runtime}`);
+  const tip = t('connectionPanel.reticulumInterfaces.effectiveModeTooltip');
+  const testId = `reticulum-runtime-mode-${iface.id}${idSuffix ? `-${idSuffix}` : ''}`;
+  return (
+    <span
+      id={testId}
+      className="rounded bg-amber-900/50 px-1.5 py-0.5 text-xs font-medium text-amber-200"
+      title={tip}
+      aria-label={t('connectionPanel.reticulumInterfaces.effectiveModeAria', {
+        mode: modeLabel,
+      })}
+      data-testid={testId}
+    >
+      {t('connectionPanel.reticulumInterfaces.effectiveModeBadge', { mode: modeLabel })}
+    </span>
+  );
+}
+
 function ReticulumInterfaceModeSelect({
   value,
   onChange,
@@ -1554,6 +1587,7 @@ function InterfaceEditPanel({
           emptyOptionKey="connectionPanel.reticulumInterfaces.modeDefaultEdit"
           showDescription={false}
         />
+        <ReticulumEffectiveModeBadge iface={iface} idSuffix="edit" />
         {uiType === 'tcp' || uiType === 'udp' ? (
           <>
             <label className="text-xs text-gray-400">
@@ -2552,6 +2586,7 @@ function InterfacesSection({
                                     {t('connectionPanel.reticulumInterfaces.decommissionedBadge')}
                                   </span>
                                 ) : null}
+                                <ReticulumEffectiveModeBadge iface={iface} />
                                 {showBleRnodeSignal ? (
                                   <span
                                     className="text-muted flex shrink-0 items-center gap-1 text-xs"
@@ -2694,7 +2729,14 @@ function InterfacesSection({
                               </button>
                             ) : null}
                             {isReticulumRmapDiscoveryCapable(iface) && !help.isSystemManaged ? (
-                              <label className="flex cursor-pointer items-center gap-1 text-xs text-gray-300">
+                              <label
+                                className="flex cursor-pointer items-center gap-1 text-xs text-gray-300"
+                                title={
+                                  reticulumInterfaceModesDiverge(iface.mode, iface.runtime_mode)
+                                    ? t('connectionPanel.reticulumInterfaces.rmapFullModeHint')
+                                    : undefined
+                                }
+                              >
                                 <input
                                   type="checkbox"
                                   checked={iface.discoverable === true}
@@ -2703,11 +2745,17 @@ function InterfacesSection({
                                     'connectionPanel.reticulumInterfaces.rmapDiscoverableAria',
                                     { name: iface.name },
                                   )}
+                                  aria-describedby={
+                                    reticulumInterfaceModesDiverge(iface.mode, iface.runtime_mode)
+                                      ? `reticulum-runtime-mode-${iface.id}-rmap`
+                                      : undefined
+                                  }
                                   onChange={() => {
                                     onToggleRmapDiscoverable(iface);
                                   }}
                                 />
                                 {t('connectionPanel.reticulumInterfaces.rmapDiscoverableShort')}
+                                <ReticulumEffectiveModeBadge iface={iface} idSuffix="rmap" />
                               </label>
                             ) : null}
                             {!help.isSystemManaged ? (
diff --git a/src/renderer/lib/reticulum/reticulumConfigAudit.test.ts b/src/renderer/lib/reticulum/reticulumConfigAudit.test.ts
index 29e71e1ab..13bb9127d 100644
--- a/src/renderer/lib/reticulum/reticulumConfigAudit.test.ts
+++ b/src/renderer/lib/reticulum/reticulumConfigAudit.test.ts
@@ -100,6 +100,7 @@ describe('reticulumConfigAudit', () => {
     'rmap_no_tcp_hub',
     'rmap_transport_disabled',
     'rmap_i2p_not_connectable',
+    'rmap_mode_autocorrect',
   ] as const)('auditIssuesToDiagnosticRows maps %s i18n key', (kind) => {
     const rows = auditIssuesToDiagnosticRows(
       [
diff --git a/src/renderer/lib/reticulum/reticulumInterfaceExtraConfig.test.ts b/src/renderer/lib/reticulum/reticulumInterfaceExtraConfig.test.ts
index 5a4450082..5ae2ac6fb 100644
--- a/src/renderer/lib/reticulum/reticulumInterfaceExtraConfig.test.ts
+++ b/src/renderer/lib/reticulum/reticulumInterfaceExtraConfig.test.ts
@@ -12,6 +12,7 @@ describe('reticulumInterfaceExtraConfig', () => {
     expect(isKnownIfaceUiKey('Passphrase')).toBe(true);
     expect(isKnownIfaceUiKey('flow_control')).toBe(true);
     expect(isKnownIfaceUiKey('Flow_Control')).toBe(true);
+    expect(isKnownIfaceUiKey('ignore_config_warnings')).toBe(true);
     expect(isKnownIfaceUiKey('forward_interval')).toBe(false);
   });
 
@@ -24,6 +25,15 @@ forward_interval = 300
     expect(parsed.reservedKeys).toContain('flow_control');
   });
 
+  it('drops ignore_config_warnings from Advanced parse as a reserved typed key', () => {
+    const parsed = parseInterfaceExtraConfig(`
+ignore_config_warnings = Yes
+forward_interval = 300
+`);
+    expect(parsed.extraConfig).toEqual({ forward_interval: '300' });
+    expect(parsed.reservedKeys).toContain('ignore_config_warnings');
+  });
+
   it('formats and parses extra_config round-trip', () => {
     const text = formatInterfaceExtraConfig({
       forward_interval: '300',
diff --git a/src/renderer/lib/reticulum/reticulumInterfaceExtraConfig.ts b/src/renderer/lib/reticulum/reticulumInterfaceExtraConfig.ts
index bad470698..a7f4adfd3 100644
--- a/src/renderer/lib/reticulum/reticulumInterfaceExtraConfig.ts
+++ b/src/renderer/lib/reticulum/reticulumInterfaceExtraConfig.ts
@@ -36,6 +36,7 @@ export const KNOWN_IFACE_UI_KEYS: ReadonlySet<string> = new Set([
   'network_name',
   'passphrase',
   'flow_control',
+  'ignore_config_warnings',
 ]);
 
 export function isKnownIfaceUiKey(key: string): boolean {
diff --git a/src/renderer/lib/reticulum/reticulumInterfaceMode.test.ts b/src/renderer/lib/reticulum/reticulumInterfaceMode.test.ts
index e560c7ab4..1b824cffe 100644
--- a/src/renderer/lib/reticulum/reticulumInterfaceMode.test.ts
+++ b/src/renderer/lib/reticulum/reticulumInterfaceMode.test.ts
@@ -6,6 +6,7 @@ import {
   RETICULUM_HUB_INTERFACE_MODE,
   RETICULUM_INTERFACE_MODES,
   reticulumInterfaceModeLabelKey,
+  reticulumInterfaceModesDiverge,
 } from '@/renderer/lib/reticulum/reticulumInterfaceMode';
 
 describe('reticulumInterfaceMode', () => {
@@ -18,6 +19,13 @@ describe('reticulumInterfaceMode', () => {
     expect(normalizeReticulumInterfaceMode('nonsense')).toBeNull();
   });
 
+  it('normalizes live stats Debug names', () => {
+    expect(normalizeReticulumInterfaceMode('AccessPoint')).toBe('access_point');
+    expect(normalizeReticulumInterfaceMode('Full')).toBe('full');
+    expect(normalizeReticulumInterfaceMode('PointToPoint')).toBe('point_to_point');
+    expect(normalizeReticulumInterfaceMode('accesspoint')).toBeNull();
+  });
+
   it('defaults modes by interface type', () => {
     expect(defaultModeForIfaceType('tcp')).toBe('boundary');
     expect(defaultModeForIfaceType('udp')).toBe('boundary');
@@ -38,4 +46,15 @@ describe('reticulumInterfaceMode', () => {
     expect(RETICULUM_INTERFACE_MODES.length).toBeGreaterThan(0);
     expect(RETICULUM_INTERFACE_MODES).toContain('boundary');
   });
+
+  it('detects configured vs runtime mode divergence', () => {
+    expect(reticulumInterfaceModesDiverge('full', 'access_point')).toBe(true);
+    expect(reticulumInterfaceModesDiverge('full', 'AccessPoint')).toBe(true);
+    expect(reticulumInterfaceModesDiverge('full', 'full')).toBe(false);
+    expect(reticulumInterfaceModesDiverge('ap', 'access_point')).toBe(false);
+    expect(reticulumInterfaceModesDiverge('full', null)).toBe(false);
+    expect(reticulumInterfaceModesDiverge('full', undefined)).toBe(false);
+    expect(reticulumInterfaceModesDiverge(null, 'access_point')).toBe(false);
+    expect(reticulumInterfaceModesDiverge('', 'access_point')).toBe(false);
+  });
 });
diff --git a/src/renderer/lib/reticulum/reticulumInterfaceMode.ts b/src/renderer/lib/reticulum/reticulumInterfaceMode.ts
index 2b8f18b9f..8ef3211c9 100644
--- a/src/renderer/lib/reticulum/reticulumInterfaceMode.ts
+++ b/src/renderer/lib/reticulum/reticulumInterfaceMode.ts
@@ -16,12 +16,33 @@ export type ReticulumInterfaceMode = (typeof RETICULUM_INTERFACE_MODES)[number];
 
 const MODE_SET = new Set<string>(RETICULUM_INTERFACE_MODES);
 
+/** Live stats Debug names (`format!("{:?}", InterfaceMode)`) → canonical. */
+function liveStatsModeAlias(raw: string): ReticulumInterfaceMode | null {
+  switch (raw) {
+    case 'Full':
+      return 'full';
+    case 'AccessPoint':
+      return 'access_point';
+    case 'PointToPoint':
+      return 'point_to_point';
+    case 'Roaming':
+      return 'roaming';
+    case 'Boundary':
+      return 'boundary';
+    case 'Gateway':
+      return 'gateway';
+    default:
+      return null;
+  }
+}
+
 /** Recommended hub / outbound-boundary mode. */
 export const RETICULUM_HUB_INTERFACE_MODE: ReticulumInterfaceMode = 'boundary';
 
 /**
  * Normalize a config / API mode string to a canonical rnsd value.
- * Accepts shorthands `ap` → `access_point`, `gw` → `gateway`.
+ * Accepts shorthands `ap` → `access_point`, `gw` → `gateway`, and live-stats
+ * Debug names (`AccessPoint`, `Full`, …).
  * Empty / whitespace returns null; unknown values return null.
  */
 export function normalizeReticulumInterfaceMode(
@@ -30,11 +51,30 @@ export function normalizeReticulumInterfaceMode(
   if (raw == null) return null;
   const trimmed = raw.trim();
   if (!trimmed) return null;
+  const fromLive = liveStatsModeAlias(trimmed);
+  if (fromLive != null) {
+    return fromLive;
+  }
   const lower = trimmed.toLowerCase();
   const canonical = lower === 'ap' ? 'access_point' : lower === 'gw' ? 'gateway' : lower;
   return MODE_SET.has(canonical) ? (canonical as ReticulumInterfaceMode) : null;
 }
 
+/**
+ * True when configured `mode` and live `runtime_mode` both normalize and differ.
+ * Missing `runtime_mode` (offline / unknown) → false (no effective-mode badge).
+ */
+export function reticulumInterfaceModesDiverge(
+  configuredMode: string | null | undefined,
+  runtimeMode: string | null | undefined,
+): boolean {
+  const runtime = normalizeReticulumInterfaceMode(runtimeMode);
+  if (runtime == null) return false;
+  const configured = normalizeReticulumInterfaceMode(configuredMode);
+  if (configured == null) return false;
+  return configured !== runtime;
+}
+
 /** Recommended default when adding an interface with no explicit mode. */
 export function defaultModeForIfaceType(ifaceType: string): ReticulumInterfaceMode | null {
   switch (ifaceType) {
diff --git a/src/renderer/lib/reticulum/reticulumRmapDiscovery.test.ts b/src/renderer/lib/reticulum/reticulumRmapDiscovery.test.ts
index 36367c573..639455385 100644
--- a/src/renderer/lib/reticulum/reticulumRmapDiscovery.test.ts
+++ b/src/renderer/lib/reticulum/reticulumRmapDiscovery.test.ts
@@ -161,6 +161,9 @@ describe('reticulumRmapDiscovery', () => {
     expect(rnodePatch.latitude).toBe(40);
     expect(rnodePatch.announce_interval_min).toBe(90);
     expect(rnodePatch.connectable).toBeUndefined();
+    // Sidecar owns ignore_config_warnings / mode — patch must not rewrite them.
+    expect(rnodePatch).not.toHaveProperty('mode');
+    expect(rnodePatch).not.toHaveProperty('ignore_config_warnings');
 
     const i2pPatch = buildRmapDiscoveryPatch(row({ id: 'i', type: 'i2p' }), {
       coords: { lat: 48.8, lon: 2.3 },
diff --git a/src/renderer/lib/reticulum/reticulumSidecarReads.ts b/src/renderer/lib/reticulum/reticulumSidecarReads.ts
index 06be701f8..98a724d37 100644
--- a/src/renderer/lib/reticulum/reticulumSidecarReads.ts
+++ b/src/renderer/lib/reticulum/reticulumSidecarReads.ts
@@ -89,6 +89,7 @@ export interface ReticulumSidecarInterfaceRow {
   callsign?: string | null;
   preset?: string | null;
   mode?: string | null;
+  runtime_mode?: string | null;
   seed_addresses?: string[];
   discoverable?: boolean | null;
   latitude?: number | null;
@@ -101,6 +102,7 @@ export interface ReticulumSidecarInterfaceRow {
   network_name?: string | null;
   passphrase?: string | null;
   flow_control?: boolean | null;
+  ignore_config_warnings?: boolean | null;
   tx_queue_used?: number | null;
   tx_queue_max?: number | null;
   extra_config?: Record<string, string> | null;
diff --git a/src/renderer/lib/reticulum/useReticulumInterfaceSnapshot.ts b/src/renderer/lib/reticulum/useReticulumInterfaceSnapshot.ts
index 464bf091a..ae91fbed4 100644
--- a/src/renderer/lib/reticulum/useReticulumInterfaceSnapshot.ts
+++ b/src/renderer/lib/reticulum/useReticulumInterfaceSnapshot.ts
@@ -48,6 +48,11 @@ export interface ReticulumInterfaceRow {
   preset?: string | null;
   /** rnsd interface mode (`full`, `boundary`, `access_point`, …). */
   mode?: string | null;
+  /**
+   * Effective RNS mode from live sidecar stats (canonical rnsd value).
+   * When it differs from `mode`, the stack rewrote a discoverable interface.
+   */
+  runtime_mode?: string | null;
   seed_addresses?: string[];
   discoverable?: boolean | null;
   latitude?: number | null;
@@ -63,6 +68,11 @@ export interface ReticulumInterfaceRow {
   passphrase?: string | null;
   /** RNode/KISS TX ready-gate. Only present for RF interface types. */
   flow_control?: boolean | null;
+  /**
+   * Upstream RNS opt-out so discoverable + Full/Roaming/Boundary keeps the
+   * configured mode. Sidecar-derived; not edited in the UI form.
+   */
+  ignore_config_warnings?: boolean | null;
   /** Host outbound TX mpsc fill from live sidecar stats. */
   tx_queue_used?: number | null;
   /** Host outbound TX mpsc capacity from live sidecar stats. */
diff --git a/src/renderer/locales/cs/translation.json b/src/renderer/locales/cs/translation.json
index 206f0c173..eeeb0d05c 100644
--- a/src/renderer/locales/cs/translation.json
+++ b/src/renderer/locales/cs/translation.json
@@ -1219,7 +1219,11 @@
       "backboneEnableGuidanceBody": "—2 je ideální místo pro redundanci bez zbytečného nafukování šířky pásma. Zaměřte se na 1 globální rozbočovač a 1 regionální bránu a povolte speciální rozhraní (jako je I2P nebo Yggdrasil) přesně podle potřeby. Lokálně připojené RNodes a místní LAN rozhraní se do tohoto limitu páteřní sítě nezapočítávají.",
       "defaultHubsPickerHint": "Začněte primární a globální páteří plus svým regionem. Zapněte nejvýše 1 až 3 páteřní brány (2 je optimum). Místní RNode a LAN rozhraní se nepočítají. Nové položky se přidávají vypnuté ke kontrole. Sync také vypne zbývající vyřazené oficiální testnet huby (Amsterdam).",
       "rnodeTransportBleHint": "Ble vazby se mohou desynchronizovat s macOS (Forget + re-pair). Preferujte USB sériové nebo Wi-Fi (tcp://), pokud je rádio v blízkosti.",
-      "flowControl": "Řízení toku (TX ready-gate)"
+      "flowControl": "Řízení toku (TX ready-gate)",
+      "rmapFullModeHint": "Plný režim s publikováním RMAP udržuje Plný prostřednictvím ignore_config_warnings. Oznámení o doručení LXMF opustí toto rádio v intervalu oznámení zásobníku (výchozí 1 hodina).",
+      "effectiveModeBadge": "Účinnost: {{mode}}",
+      "effectiveModeAria": "Efektivní režim běhu {{mode}}. Konfigurovaný režim se liší od toho, co běží Reticulum.",
+      "effectiveModeTooltip": "Reticulum přepsalo toto zjistitelné rozhraní na přístupový bod (nebo jiný povolený režim), protože zjistitelný vyžaduje bránu, interní nebo přístupový bod, pokud není nastaveno ignore_config_warnings. Restartujte zásobník po razítkách mesh-klienta, které se odhlásí, takže se projeví Full (nebo váš nakonfigurovaný režim) (mesh-client)."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1697,7 +1701,8 @@
         "rmap_no_tcp_hub": "Detekovatelný místní RNode nemá aktivované TCP klientské centrum pro dostupnost internetu.",
         "rmap_transport_disabled": "Detekovatelná rozhraní jsou nakonfigurována, ale režim přenosu je vypnutý.",
         "rmap_i2p_not_connectable": "Rozhraní I2P „{{name}}“ je zjistitelné, ale připojitelné není ano.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "Rozhraní „{{name}}“ je zjistitelné s režimem non-AP/Gateway — Reticulum jej spustí jako přístupový bod, pokud není nastaveno ignore_config_warnings. Upravte rozhraní nebo restartujte zásobník, aby mesh-client mohl orazítkovat odhlášení."
       },
       "runtime": {
         "rnsNotReady": "Zásobník RNS není připraven",
diff --git a/src/renderer/locales/de/translation.json b/src/renderer/locales/de/translation.json
index 0c7adbb62..1f2e3a6a8 100644
--- a/src/renderer/locales/de/translation.json
+++ b/src/renderer/locales/de/translation.json
@@ -1216,7 +1216,11 @@
       "backboneEnableGuidanceBody": "—2 ist optimal für Redundanz ohne unnötigen Bandbreitenverbrauch. Streben Sie 1 globalen Hub und 1 regionales Gateway an, und aktivieren Sie Spezialschnittstellen (wie I2P oder Yggdrasil) nur bei Bedarf. Lokal verbundene RNodes und lokale LAN-Schnittstellen zählen nicht zu diesem Backbone-Limit.",
       "defaultHubsPickerHint": "Beginnen Sie mit Primär & Global plus Ihrer Region. Aktivieren Sie höchstens 1 bis 3 Backbone-Gateways (2 ist optimal). Lokale RNodes und LAN-Schnittstellen zählen nicht. Neue Einträge werden deaktiviert hinzugefügt, damit Sie sie prüfen können. Sync deaktiviert außerdem verbleibende außer Betrieb genommene offizielle Testnet-Hubs (Amsterdam).",
       "rnodeTransportBleHint": "BLE-Bindungen können mit macOS desynchronisiert werden (Forget + Re-Pair). Bevorzugen Sie USB seriell oder Wi-Fi (tcp://), wenn das Radio in der Nähe ist.",
-      "flowControl": "Flusskontrolle (TX Ready-Gate)"
+      "flowControl": "Flusskontrolle (TX Ready-Gate)",
+      "rmapFullModeHint": "Der Vollmodus mit RMAP-Veröffentlichung hält Full über ignore_config_warnings. LXMF-Lieferansagen verlassen dieses Radio im Stack-Ankündigungsintervall (Standard 1 Stunde).",
+      "effectiveModeBadge": "Gültig ab: {{mode}}",
+      "effectiveModeAria": "Effektiver Laufzeitmodus {{mode}}. Der konfigurierte Modus unterscheidet sich von dem, was Reticulum ausführt.",
+      "effectiveModeTooltip": "Reticulum hat diese auffindbare Schnittstelle zum Access Point (oder einem anderen zulässigen Modus) neu geschrieben, da auffindbar Gateway, Intern oder Access Point erfordert, es sei denn, ignore_config_warnings ist eingestellt. Starten Sie den Stack neu, nachdem der mesh-client abgestempelt hat, dass die Abmeldung wirksam wird, damit Full (oder Ihr konfigurierter Modus) wirksam wird."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "Der auffindbare lokale RNode hat keinen aktivierten TCP-Client-Hub für die Internet-Erreichbarkeit.",
         "rmap_transport_disabled": "Erkennbare Schnittstellen sind konfiguriert, aber der Transportmodus ist ausgeschaltet.",
         "rmap_i2p_not_connectable": "Die I2P-Schnittstelle \"{{name}}\" ist auffindbar, aber anschließbar ist nicht ja.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "Die Schnittstelle „{{name}}“ ist mit einem Nicht-AP-/Gateway-Modus auffindbar — Reticulum führt sie als Access Point aus, es sei denn, ignore_config_warnings ist festgelegt. Bearbeiten Sie die Schnittstelle oder starten Sie den Stack neu, damit der mesh-client das Opt-Out stempeln kann."
       },
       "runtime": {
         "rnsNotReady": "Der RNS-Stack ist nicht bereit",
diff --git a/src/renderer/locales/en/translation.json b/src/renderer/locales/en/translation.json
index 02e886516..59f12db2d 100644
--- a/src/renderer/locales/en/translation.json
+++ b/src/renderer/locales/en/translation.json
@@ -1241,6 +1241,10 @@
       "auditRepairNoChanges": "No config changes were needed for this repair.",
       "rmapDiscoverableShort": "RMAP",
       "rmapDiscoverableAria": "Publish {{name}} on RMAP v4",
+      "rmapFullModeHint": "Full mode with RMAP publish keeps Full via ignore_config_warnings. LXMF delivery announces will egress this radio on the stack announce interval (default 1 hour).",
+      "effectiveModeBadge": "Effective: {{mode}}",
+      "effectiveModeAria": "Effective runtime mode {{mode}}. Configured mode differs from what Reticulum is running.",
+      "effectiveModeTooltip": "Reticulum rewrote this discoverable interface to Access Point (or another allowed mode) because discoverable requires Gateway, Internal, or Access Point unless ignore_config_warnings is set. Restart the stack after mesh-client stamps that opt-out so Full (or your configured mode) takes effect.",
       "rmapEnableSuccess": "RMAP discovery enabled on {{name}}.",
       "rmapDisableSuccess": "RMAP discovery disabled on {{name}}.",
       "rmapToggleFailed": "RMAP change failed for {{name}}: {{error}}",
@@ -1798,7 +1802,8 @@
         "rmap_missing_coordinates": "Interface \"{{name}}\" is discoverable but missing valid map coordinates.",
         "rmap_no_tcp_hub": "Discoverable local RNode has no enabled TCP client hub for internet reachability.",
         "rmap_transport_disabled": "Discoverable interfaces are configured but transport mode is off.",
-        "rmap_i2p_not_connectable": "I2P interface \"{{name}}\" is discoverable but connectable is not yes."
+        "rmap_i2p_not_connectable": "I2P interface \"{{name}}\" is discoverable but connectable is not yes.",
+        "rmap_mode_autocorrect": "Interface \"{{name}}\" is discoverable with a non-AP/Gateway mode — Reticulum will run it as Access Point unless ignore_config_warnings is set. Edit the interface or restart the stack so mesh-client can stamp the opt-out."
       }
     }
   },
diff --git a/src/renderer/locales/es/translation.json b/src/renderer/locales/es/translation.json
index 254d919c2..174ef153d 100644
--- a/src/renderer/locales/es/translation.json
+++ b/src/renderer/locales/es/translation.json
@@ -1218,7 +1218,11 @@
       "backboneEnableGuidanceBody": "—2 es el punto óptimo para la redundancia sin una saturación innecesaria del ancho de banda. Apunte a 1 centro global y 1 puerta de enlace regional, y habilite interfaces especializadas (como I2P o Yggdrasil) estrictamente según sea necesario. Los RNodes conectados localmente y las interfaces LAN locales no cuentan para este límite de red troncal.",
       "defaultHubsPickerHint": "Empiece con Primario y global más su región. Active como máximo 1 a 3 puertas de enlace de backbone (2 es el punto óptimo). Los RNodes locales y las interfaces LAN no cuentan. Las entradas nuevas se añaden desactivadas para que pueda revisarlas. Sync también desactiva hubs de testnet oficiales fuera de servicio restantes (Ámsterdam).",
       "rnodeTransportBleHint": "Los enlaces ble pueden desincronizarse con macOS (olvidar + volver a emparejar). Prefiera USB serie o Wi-Fi (tcp://) cuando la radio esté cerca.",
-      "flowControl": "Control de flujo (puerta lista para TX)"
+      "flowControl": "Control de flujo (puerta lista para TX)",
+      "rmapFullModeHint": "El modo completo con RMAP Publish se mantiene completo a través de ignore_config_Warnings. Los anuncios de entrega LXMF emitirán esta radio en el intervalo de anuncio de pila (por defecto 1 hora).",
+      "effectiveModeBadge": "Vigencia: {{mode}}",
+      "effectiveModeAria": "Modo de tiempo de ejecución efectivo {{mode}}. El modo configurado difiere de lo que está ejecutando Reticulum.",
+      "effectiveModeTooltip": "Reticulum reescribió esta interfaz detectable en Access Point (u otro modo permitido) porque Discoverable requiere Gateway, Internal o Access Point a menos que se establezca ignore_config_warnings. Reinicie la pila después de los sellos de cliente de malla que optan por no participar para que Full (o su modo configurado) surta efecto (mesh-client)."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "El RNode local detectable no tiene un concentrador de clientes TCP habilitado para la accesibilidad a Internet.",
         "rmap_transport_disabled": "Las interfaces detectables están configuradas, pero el modo de transporte está desactivado.",
         "rmap_i2p_not_connectable": "La interfaz I2P \"{{name}}\" es detectable pero no es conectable.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "La interfaz \"{{name}}\" se puede descubrir con un modo no AP/Gateway: Reticulum la ejecutará como punto de acceso a menos que se establezca ignore_config_warnings. Edite la interfaz o reinicie la pila para que el cliente de malla pueda sellar la exclusión voluntaria (mesh-client)."
       },
       "runtime": {
         "rnsNotReady": "La pila RNS no está lista",
diff --git a/src/renderer/locales/fr/translation.json b/src/renderer/locales/fr/translation.json
index 321be98bb..25f633e2a 100644
--- a/src/renderer/locales/fr/translation.json
+++ b/src/renderer/locales/fr/translation.json
@@ -1217,7 +1217,11 @@
       "backboneEnableGuidanceBody": "—2 est l’optimum pour la redondance sans gaspiller la bande passante. Visez 1 hub mondial et 1 passerelle régionale, et activez les interfaces spécialisées (comme I2P ou Yggdrasil) seulement si besoin. Les RNodes connectés localement et les interfaces LAN locales ne comptent pas dans cette limite de backbone.",
       "defaultHubsPickerHint": "Commencez par Primaire et mondial plus votre région. Activez au plus 1 à 3 passerelles backbone (2 est l’optimum). Les RNodes locaux et les interfaces LAN ne comptent pas. Les nouvelles entrées sont ajoutées désactivées pour révision. Sync désactive aussi les hubs de testnet officiels hors service restants (Amsterdam).",
       "rnodeTransportBleHint": "Les liaisons ble peuvent se désynchroniser avec macOS (Forget + re-pair). Préférez USB série ou Wi-Fi (tcp ://) lorsque la radio est à proximité.",
-      "flowControl": "Contrôle de flux (porte prête TX)"
+      "flowControl": "Contrôle de flux (porte prête TX)",
+      "rmapFullModeHint": "Le mode complet avec RMAP publish conserve Full via ignore_config_warnings. Les annonces de livraison LXMF quitteront cette radio sur l'intervalle d'annonce de pile (par défaut 1 heure).",
+      "effectiveModeBadge": "En vigueur le : {{mode}}",
+      "effectiveModeAria": "Mode d'exécution effectif {{mode}}. Le mode configuré diffère de ce que Reticulum exécute.",
+      "effectiveModeTooltip": "Reticulum a réécrit cette interface découvrable au point d'accès (ou à un autre mode autorisé) car découvrable nécessite Gateway, Internal ou Access Point sauf si ignore_config_warnings est défini. Redémarrez la pile après que les tampons maillés-clients qui se désengagent de sorte que Full (ou votre mode configuré) prennent effet (mesh-client)."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "Le RNode local détectable n'a pas de concentrateur client TCP activé pour l'accessibilité à Internet.",
         "rmap_transport_disabled": "Les interfaces détectables sont configurées mais le mode de transport est désactivé.",
         "rmap_i2p_not_connectable": "L'interface I2P « {{name}} » est détectable mais connectable n'est pas oui.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "L'interface \"{{name}}\" est détectable avec un mode non-AP/Gateway — Reticulum l'exécutera en tant que point d'accès sauf si ignore_config_warnings est défini. Modifiez l'interface ou redémarrez la pile afin que mesh-client puisse estampiller l'opt-out."
       },
       "runtime": {
         "rnsNotReady": "La pile RNS n'est pas prête",
diff --git a/src/renderer/locales/id/translation.json b/src/renderer/locales/id/translation.json
index bc2e579c9..3ea32ffb4 100644
--- a/src/renderer/locales/id/translation.json
+++ b/src/renderer/locales/id/translation.json
@@ -1218,7 +1218,11 @@
       "backboneEnableGuidanceBody": "—2 adalah titik ideal untuk redundansi tanpa pemborosan bandwidth. Bidik 1 hub global dan 1 gateway regional, dan aktifkan antarmuka khusus (seperti I2P atau Yggdrasil) hanya jika diperlukan. RNode yang terhubung lokal dan antarmuka LAN lokal tidak dihitung dalam batas backbone ini.",
       "defaultHubsPickerHint": "Mulai dengan Utama & Global plus wilayah Anda. Aktifkan paling banyak 1 hingga 3 gateway backbone (2 adalah titik ideal). RNode lokal dan antarmuka LAN tidak dihitung. Entri baru ditambahkan dalam keadaan nonaktif agar bisa ditinjau. Sync juga menonaktifkan sisa hub testnet resmi yang sudah dinonaktifkan (Amsterdam).",
       "rnodeTransportBleHint": "Ikatan BLE dapat desinkronisasi dengan macOS (Forget + re-pair). Lebih suka USB serial atau Wi-Fi (tcp://) saat radio ada di dekatnya.",
-      "flowControl": "Kontrol aliran (gerbang siap TX)"
+      "flowControl": "Kontrol aliran (gerbang siap TX)",
+      "rmapFullModeHint": "Mode penuh dengan RMAP publikasikan tetap Penuh melalui ignore_config_warnings. Pengiriman LXMF mengumumkan akan keluar dari radio ini pada interval pengumuman stack (default 1 jam).",
+      "effectiveModeBadge": "Berlaku: {{mode}}",
+      "effectiveModeAria": "Mode runtime efektif {{mode}}. Mode yang dikonfigurasi berbeda dari yang dijalankan Reticulum.",
+      "effectiveModeTooltip": "Reticulum menulis ulang antarmuka yang dapat ditemukan ini ke Access Point (atau mode lain yang diizinkan) karena dapat ditemukan memerlukan Gateway, Internal, atau Access Point kecuali jika ignore_config_warnings ditetapkan. Mulai ulang tumpukan setelah stempel mesh-client yang menyisih sehingga Full (atau mode terkonfigurasi Anda) berlaku."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "RNode lokal yang dapat ditemukan tidak memiliki hub klien TCP yang diaktifkan untuk jangkauan internet.",
         "rmap_transport_disabled": "Antarmuka yang dapat ditemukan dikonfigurasi tetapi mode transportasi tidak aktif.",
         "rmap_i2p_not_connectable": "Antarmuka I2P \"{{name}}\" dapat ditemukan tetapi terhubung bukan ya.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "Antarmuka \"{{name}}\" dapat ditemukan dengan mode non — AP/Gateway — Reticulum akan menjalankannya sebagai Access Point kecuali jika ignore_config_warnings ditetapkan. Edit antarmuka atau mulai ulang tumpukan sehingga mesh-client dapat mencap opt - out."
       },
       "runtime": {
         "rnsNotReady": "Tumpukan RNS belum siap",
diff --git a/src/renderer/locales/it/translation.json b/src/renderer/locales/it/translation.json
index b63eb924d..9273f7f27 100644
--- a/src/renderer/locales/it/translation.json
+++ b/src/renderer/locales/it/translation.json
@@ -1216,7 +1216,11 @@
       "backboneEnableGuidanceBody": "—2 è l’optimum per la ridondanza senza spreco di banda. Punta a 1 hub globale e 1 gateway regionale, e abilita interfacce speciali (come I2P o Yggdrasil) solo se necessario. Gli RNode collegati in locale e le interfacce LAN locali non contano verso questo limite di dorsale.",
       "defaultHubsPickerHint": "Inizia con Primaria e globale più la tua regione. Abilita al massimo da 1 a 3 gateway di dorsale (2 è l’optimum). Gli RNode locali e le interfacce LAN non contano. Le nuove voci vengono aggiunte disabilitate per la revisione. Sync disabilita anche gli hub testnet ufficiali fuori servizio rimanenti (Amsterdam).",
       "rnodeTransportBleHint": "I legami BLE possono essere desincronizzati con macOS (Forget + re-pair). Preferire USB seriale o Wi-Fi (tcp://) quando la radio è nelle vicinanze.",
-      "flowControl": "Controllo del flusso (TX ready-gate)"
+      "flowControl": "Controllo del flusso (TX ready-gate)",
+      "rmapFullModeHint": "La modalità Full con RMAP Publish mantiene Full tramite ignore_config_warnings. La consegna LXMF annuncia che uscirà da questa radio sull'intervallo di annuncio dello stack (predefinito 1 ora).",
+      "effectiveModeBadge": "In vigore: {{mode}}",
+      "effectiveModeAria": "Modalità runtime effettiva {{mode}}. La modalità configurata differisce da quella in esecuzione su Reticulum.",
+      "effectiveModeTooltip": "Reticulum ha riscritto questa interfaccia rilevabile su Access Point (o un'altra modalità consentita) perché Discoverable richiede Gateway, Internal o Access Point a meno che non sia impostato ignore_config_warnings. Riavviare lo stack dopo i timbri mesh-client che l'opt-out in modo Full (o la modalità configurata) ha effetto."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "RNode locale individuabile non ha un hub client TCP abilitato per la raggiungibilità di Internet.",
         "rmap_transport_disabled": "Le interfacce individuabili sono configurate ma la modalità di trasporto è disattivata.",
         "rmap_i2p_not_connectable": "L'interfaccia I2P \"{{name}}\" è rilevabile ma collegabile non è sì.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "L'interfaccia \"{{name}}\" è rilevabile con una modalità non AP/Gateway: Reticulum la eseguirà come punto di accesso a meno che non sia impostato ignore_config_warnings. Modificare l'interfaccia o riavviare lo stack in modo che il client mesh possa timbrare l'opt-out (mesh-client)."
       },
       "runtime": {
         "rnsNotReady": "Lo stack RNS non è pronto",
diff --git a/src/renderer/locales/ja/translation.json b/src/renderer/locales/ja/translation.json
index 10fe090cc..79d97953f 100644
--- a/src/renderer/locales/ja/translation.json
+++ b/src/renderer/locales/ja/translation.json
@@ -1218,7 +1218,11 @@
       "backboneEnableGuidanceBody": "—冗長性を保ちつつ不要な帯域を増やさない最適は 2 です。グローバルハブ 1 つと地域ゲートウェイ 1 つを目安にし、I2P や Yggdrasil などの特殊インターフェースは必要なときだけ有効にしてください。ローカル接続の RNode とローカル LAN インターフェースはこのバックボーン上限に数えません。",
       "defaultHubsPickerHint": "プライマリおよびグローバルに加え、自分の地域から始めてください。バックボーンゲートウェイは最大 1〜3（最適は 2）まで有効にします。ローカル RNode と LAN インターフェースは数えません。新規エントリは確認しやすいよう無効で追加されます。Sync は残っている廃止済み公式テストネットハブ（アムステルダム）も無効化します。",
       "rnodeTransportBleHint": "BLEボンドはmacOSと同期ずれすることがあります（忘れる+再ペアリング）。ラジオが近くにある場合は、USBシリアルまたはWi-Fi（tcp://）を優先してください。",
-      "flowControl": "フロー制御（TXレディゲート）"
+      "flowControl": "フロー制御（TXレディゲート）",
+      "rmapFullModeHint": "RMAP発行のフルモードは、IGNORE_CONFIG_WARNINGSを介してフルを維持します。LXMF配信アナウンスは、スタックアナウンス間隔（デフォルトは1時間）でこの無線を出力します。",
+      "effectiveModeBadge": "有効期限： {{mode}}",
+      "effectiveModeAria": "有効なランタイムモード{{mode}}。設定モードは、Reticulumが実行しているモードとは異なります。",
+      "effectiveModeTooltip": "Reticulumは、ignore_config_warningsが設定されていない限り、DISCOVERABLEにはゲートウェイ、内部、またはアクセスポイントが必要なため、この検出可能なインターフェイスをアクセスポイント（または別の許可されたモード）に書き換えました。フル（または設定モード）が有効になるようにオプトアウトするmesh-clientスタンプの後、スタックを再起動します。"
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "検出可能なローカルRNodeには、インターネット到達可能性のために有効なTCPクライアントハブがありません。",
         "rmap_transport_disabled": "検出可能なインターフェイスが設定されていますが、トランスポートモードはオフです。",
         "rmap_i2p_not_connectable": "I 2 Pインターフェース「{{name}}」は検出可能ですが、接続可能ではありません。",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "インターフェース「{{name}}」は、非AP/ゲートウェイモードで検出可能です。Reticulumは、ignore_config_warningsが設定されていない限り、アクセスポイントとして実行します。mesh-clientがオプトアウトをスタンプできるように、インターフェースを編集するか、スタックを再起動します。"
       },
       "runtime": {
         "rnsNotReady": "RNS スタックの準備ができていません",
diff --git a/src/renderer/locales/ko/translation.json b/src/renderer/locales/ko/translation.json
index e132fa535..462c28375 100644
--- a/src/renderer/locales/ko/translation.json
+++ b/src/renderer/locales/ko/translation.json
@@ -1218,7 +1218,11 @@
       "backboneEnableGuidanceBody": "-2는 불필요한 대역폭 부풀림이 없는 이중화를 위한 스윗 스팟입니다. 글로벌 허브 1개와 지역 게이트웨이 1개를 목표로 하고 필요에 따라 특수 인터페이스 (예: I2P 또는 Yggdrasil) 를 엄격하게 활성화합니다. 로컬로 연결된 RNode 및 로컬 LAN 인터페이스는 이 백본 제한에 포함되지 않습니다.",
       "defaultHubsPickerHint": "기본 및 글로벌 백본에 지역을 더해 시작하세요. 백본 게이트웨이는 최대 1~3개(이상적은 2개)만 사용하세요. 로컬 RNode와 LAN 인터페이스는 포함되지 않습니다. 새 항목은 검토할 수 있도록 비활성으로 추가됩니다. Sync는 남은 폐기된 공식 테스트넷 허브(암스테르담)도 비활성화합니다.",
       "rnodeTransportBleHint": "BLE 본드는 macOS와 비동기화할 수 있습니다 (Forget + re-pair). 라디오가 근처에 있을 때는 USB 직렬 또는 Wi-Fi (tcp://) 를 선호합니다.",
-      "flowControl": "흐름 제어(TX Ready-Gate)"
+      "flowControl": "흐름 제어(TX Ready-Gate)",
+      "rmapFullModeHint": "RMAP 게시의 전체 모드는 IGNORE_CONFIG_WARNINGS를 통해 전체 모드를 유지합니다. LXMF 배달 알림은 스택 알림 간격 (기본 1시간) 에서 이 라디오를 내보냅니다.",
+      "effectiveModeBadge": "유효: {{mode}}",
+      "effectiveModeAria": "유효 런타임 모드 {{mode}}. 설정된 모드는 Reticulum이 실행 중인 모드와 다릅니다.",
+      "effectiveModeTooltip": "Reticulum은 ignore_config_warnings가 설정되지 않는 한 검색 가능한 인터페이스를 게이트웨이, 내부 또는 액세스 포인트가 필요하기 때문에 이 검색 가능한 인터페이스를 액세스 포인트 (또는 다른 허용 모드) 에 다시 작성했습니다. mesh-client 스탬프 후 스택을 다시 시작하여 Full (또는 구성된 모드) 이 적용되도록 옵트아웃합니다."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "검색 가능한 로컬 RNode에는 인터넷에 연결할 수 있는 TCP 클라이언트 허브가 없습니다.",
         "rmap_transport_disabled": "검색 가능한 인터페이스가 구성되었지만 전송 모드가 꺼져 있습니다.",
         "rmap_i2p_not_connectable": "I2P 인터페이스 \"{{name}}\" 는 검색 가능하지만 연결 가능은 예가 아닙니다.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "비 AP/게이트웨이 모드에서 인터페이스 \"{{name}}\" 을 (를) 검색할 수 있습니다. Reticulum은 ignore_config_warnings를 설정하지 않는 한 액세스 포인트로 실행합니다. mesh-client가 옵트아웃 스탬프를 찍을 수 있도록 인터페이스를 편집하거나 스택을 다시 시작하십시오."
       },
       "runtime": {
         "rnsNotReady": "RNS 스택이 준비되지 않았습니다.",
diff --git a/src/renderer/locales/nl/translation.json b/src/renderer/locales/nl/translation.json
index 16f5e2ef3..0eae033af 100644
--- a/src/renderer/locales/nl/translation.json
+++ b/src/renderer/locales/nl/translation.json
@@ -1217,7 +1217,11 @@
       "backboneEnableGuidanceBody": "—2 is ideaal voor redundantie zonder onnodige bandbreedte. Streef naar 1 globale hub en 1 regionale gateway, en schakel speciale interfaces (zoals I2P of Yggdrasil) alleen in als nodig. Lokaal verbonden RNodes en lokale LAN-interfaces tellen niet mee voor deze backbone-limiet.",
       "defaultHubsPickerHint": "Begin met Primair & globaal plus uw regio. Schakel hoogstens 1 tot 3 backbone-gateways in (2 is ideaal). Lokale RNodes en LAN-interfaces tellen niet mee. Nieuwe items worden uitgeschakeld toegevoegd zodat u ze kunt beoordelen. Sync schakelt ook resterende buiten gebruik gestelde officiële testnet-hubs uit (Amsterdam).",
       "rnodeTransportBleHint": "BLE-bindingen kunnen desynchroniseren met macOS (vergeten + opnieuw koppelen). Geef de voorkeur aan USB-serieel of Wi-Fi (tcp://) wanneer de radio in de buurt is.",
-      "flowControl": "Stromingsregeling (TX ready-gate)"
+      "flowControl": "Stromingsregeling (TX ready-gate)",
+      "rmapFullModeHint": "De volledige modus met RMAP-publicatie blijft vol via ignore_config_warnings. LXMF-leveringsaankondigingen verlaten deze radio op het aankondigingsinterval van de stapel (standaard 1 uur).",
+      "effectiveModeBadge": "Met ingang van: {{mode}}",
+      "effectiveModeAria": "Effectieve runtime-modus {{mode}}. Geconfigureerde modus verschilt van wat Reticulum draait.",
+      "effectiveModeTooltip": "Reticulum herschreef deze detecteerbare interface naar Access Point (of een andere toegestane modus) omdat detecteerbaar Gateway, Intern of Access Point vereist, tenzij ignore_config_warnings is ingesteld. Herstart de stack na mesh-client stempels die zich afmelden zodat Full (of uw geconfigureerde modus) van kracht wordt."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "Ontdekbare lokale RNode heeft geen ingeschakelde TCP-clienthub voor internetbereikbaarheid.",
         "rmap_transport_disabled": "Ontdekbare interfaces zijn geconfigureerd, maar de transportmodus is uitgeschakeld.",
         "rmap_i2p_not_connectable": "I2P-interface \"{{name}}\" is detecteerbaar, maar aansluitbaar is niet ja.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "Interface \"{{name}}\" is detecteerbaar met een niet-AP/Gateway-modus — Reticulum zal het als toegangspunt uitvoeren, tenzij ignore_config_warnings is ingesteld. Bewerk de interface of start de stack opnieuw, zodat de mesh-client de opt-out kan afstempelen."
       },
       "runtime": {
         "rnsNotReady": "RNS-stack is niet gereed",
diff --git a/src/renderer/locales/pl/translation.json b/src/renderer/locales/pl/translation.json
index 308d64a1e..644b66b68 100644
--- a/src/renderer/locales/pl/translation.json
+++ b/src/renderer/locales/pl/translation.json
@@ -1220,7 +1220,11 @@
       "backboneEnableGuidanceBody": "—2 to optimum dla nadmiarowości bez zbędnego zużycia pasma. Celuj w 1 globalny hub i 1 regionalną bramę, a specjalne interfejsy (jak I2P lub Yggdrasil) włączaj tylko gdy trzeba. Lokalnie podłączone RNode i lokalne interfejsy LAN nie wliczają się do tego limitu magistrali.",
       "defaultHubsPickerHint": "Zacznij od Podstawowej i globalnej magistrali oraz swojego regionu. Włącz co najwyżej 1–3 bramy magistrali (2 to optimum). Lokalne RNode i interfejsy LAN się nie liczą. Nowe wpisy są dodawane wyłączone, by je przejrzeć. Sync wyłącza też pozostałe wycofane oficjalne huby testnetu (Amsterdam).",
       "rnodeTransportBleHint": "Wiązania BLE mogą być desynchronizowane z macOS (Forget + repair). Preferuj port szeregowy USB lub Wi-Fi (tcp://), gdy radio znajduje się w pobliżu.",
-      "flowControl": "Kontrola przepływu (bramka gotowa TX)"
+      "flowControl": "Kontrola przepływu (bramka gotowa TX)",
+      "rmapFullModeHint": "Tryb pełny z publikacją RMAP utrzymuje pełny przez ignore_CONFIG_WARNINGS. Powiadomienia o dostawie LXMF opuszczą to radio w interwale powiadomień o stosie (domyślnie 1 godzina).",
+      "effectiveModeBadge": "Obowiązuje: {{mode}}",
+      "effectiveModeAria": "Efektywny tryb czasu pracy {{mode}}. Tryb skonfigurowany różni się od uruchomionego programu Reticulum.",
+      "effectiveModeTooltip": "Reticulum przepisała ten wykrywalny interfejs do punktu dostępu (lub innego dozwolonego trybu), ponieważ wykrywalny wymaga bramy, wewnętrznego lub punktu dostępu, chyba że ustawiono ignore_config_warnings. Zrestartuj stos po stemplach klienta siatkowego, które rezygnują, aby zadziałał tryb Full (lub skonfigurowany tryb) (mesh-client)."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1699,7 +1703,8 @@
         "rmap_no_tcp_hub": "Wykrywalny lokalny RNode nie ma włączonego węzła klienta TCP dla dostępności internetowej.",
         "rmap_transport_disabled": "Wykrywalne interfejsy są skonfigurowane, ale tryb transportu jest wyłączony.",
         "rmap_i2p_not_connectable": "Interfejs I2P „{{name}}” można wykryć, ale nie można go podłączyć.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "Interfejs „{{name}}” można wykryć w trybie innym niż AP/Gateway — Reticulum uruchomi go jako punkt dostępu, chyba że ustawiono ignore_config_warnings. Edytuj interfejs lub uruchom ponownie stos, aby klient-siatka mógł stemplować opt-out (mesh-client)."
       },
       "runtime": {
         "rnsNotReady": "Stos RNS nie jest gotowy",
diff --git a/src/renderer/locales/pt-BR/translation.json b/src/renderer/locales/pt-BR/translation.json
index dd1601eb1..f3facb5d8 100644
--- a/src/renderer/locales/pt-BR/translation.json
+++ b/src/renderer/locales/pt-BR/translation.json
@@ -1218,7 +1218,11 @@
       "backboneEnableGuidanceBody": "—2 é o ponto ideal para redundância sem inchaço desnecessário da largura de banda. Aponte para 1 hub global e 1 gateway regional e habilite interfaces especializadas (como I2P ou Yggdrasil) estritamente conforme necessário. Os RNodes conectados localmente e as interfaces de LAN locais não contam para esse limite de backbone.",
       "defaultHubsPickerHint": "Comece com Primário e global mais sua região. Ative no máximo 1 a 3 gateways de backbone (2 é o ponto ideal). RNodes locais e interfaces LAN não contam. Novas entradas são adicionadas desativadas para revisão. Sync também desativa hubs de testnet oficiais desativados restantes (Amsterdã).",
       "rnodeTransportBleHint": "As ligações BLE podem dessincronizar com o macOS (Forget + re-pair). Prefira USB serial ou Wi-Fi (tcp://) quando o rádio estiver próximo.",
-      "flowControl": "Controle de fluxo (portão pronto para TX)"
+      "flowControl": "Controle de fluxo (portão pronto para TX)",
+      "rmapFullModeHint": "Modo completo com publicação RMAP mantém Completo via ignore_CONFIG_WARNINGS. A entrega LXMF anuncia que sairá deste rádio no intervalo de anúncio da pilha (padrão 1 hora).",
+      "effectiveModeBadge": "Em vigor: {{mode}}",
+      "effectiveModeAria": "Modo de tempo de execução efetivo {{mode}}. O modo configurado difere do que o Reticulum está executando.",
+      "effectiveModeTooltip": "Reticulum reescreveu essa interface detectável para o Ponto de Acesso (ou outro modo permitido) porque o detectável requer Gateway, Interno ou Ponto de Acesso, a menos que ignore_config_warnings esteja definido. Reinicie a pilha após os carimbos mesh-client que desativam o Full (ou seu modo configurado) entrarem em vigor."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "RNode local detectável não tem hub de cliente TCP habilitado para acessibilidade à Internet.",
         "rmap_transport_disabled": "As interfaces detectáveis estão configuradas, mas o modo de transporte está desligado.",
         "rmap_i2p_not_connectable": "A interface I2P \"{{name}}\" é detectável, mas conectável não é sim.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "A interface \"{{name}}\" pode ser detectada com um modo não AP/Gateway — Reticulum o executará como ponto de acesso, a menos que ignore_config_warnings esteja definido. Edite a interface ou reinicie a pilha para que o mesh-client possa carimbar a desativação."
       },
       "runtime": {
         "rnsNotReady": "A pilha RNS não está pronta",
diff --git a/src/renderer/locales/ru/translation.json b/src/renderer/locales/ru/translation.json
index 579fad95a..0d7737b2a 100644
--- a/src/renderer/locales/ru/translation.json
+++ b/src/renderer/locales/ru/translation.json
@@ -1220,7 +1220,11 @@
       "backboneEnableGuidanceBody": "—2 — оптимум для избыточности без лишней нагрузки на канал. Цель: 1 глобальный хаб и 1 региональный шлюз; специальные интерфейсы (I2P или Yggdrasil) включайте только по необходимости. Локально подключённые RNode и локальные LAN-интерфейсы не входят в этот лимит магистрали.",
       "defaultHubsPickerHint": "Начните с первичной и глобальной магистрали плюс ваш регион. Включайте не более 1–3 магистральных шлюзов (2 — оптимум). Локальные RNode и LAN-интерфейсы не учитываются. Новые записи добавляются выключенными для проверки. Sync также отключает оставшиеся выведенные из эксплуатации официальные тестовые хабы (Амстердам).",
       "rnodeTransportBleHint": "Связи BLE могут рассинхронизироваться с macOS (Forget + re-pair). Предпочитайте последовательный USB или Wi-Fi (tcp://), когда радиостанция находится поблизости.",
-      "flowControl": "Управление потоком (шлюз готовности к передаче)"
+      "flowControl": "Управление потоком (шлюз готовности к передаче)",
+      "rmapFullModeHint": "Полный режим с публикацией RMAP сохраняется через ignore_config_warnings. Объявления о доставке LXMF выведут это радио на интервал объявления стека (по умолчанию 1 час).",
+      "effectiveModeBadge": "Действует с: {{mode}}",
+      "effectiveModeAria": "Эффективный режим работы {{mode}}. Настроенный режим отличается от того, что работает Reticulum.",
+      "effectiveModeTooltip": "Reticulum переписала этот обнаруживаемый интерфейс на точку доступа (или другой разрешенный режим), поскольку для обнаружения требуется шлюз, внутренний или точка доступа, если не установлено ignore_config_warnings. Перезапустите стек после того, как вступят в силу метки mesh-client, которые откажутся от режима Full (или настроенного вами режима)."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1697,7 +1701,8 @@
         "rmap_no_tcp_hub": "Обнаруживаемый локальный RNode не имеет включенного клиентского концентратора TCP для доступа в Интернет.",
         "rmap_transport_disabled": "Обнаруживаемые интерфейсы настроены, но режим транспортировки выключен.",
         "rmap_i2p_not_connectable": "Интерфейс I2P \"{{name}}\" обнаруживается, но не подключается.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "Интерфейс \"{{name}}\" обнаруживается в режиме не-AP/Gateway — Reticulum будет запускать его как точку доступа, если не установлено ignore_config_warnings. Отредактируйте интерфейс или перезапустите стек, чтобы mesh-client мог штамповать отказ."
       },
       "runtime": {
         "rnsNotReady": "Стек RNS не готов",
diff --git a/src/renderer/locales/tr/translation.json b/src/renderer/locales/tr/translation.json
index bcd012af2..f21d09097 100644
--- a/src/renderer/locales/tr/translation.json
+++ b/src/renderer/locales/tr/translation.json
@@ -1218,7 +1218,11 @@
       "backboneEnableGuidanceBody": "—2 gereksiz bant genişliği şişmesi olmadan fazlalık için en uygun noktadır. 1 küresel merkez ve 1 bölgesel ağ geçidini hedefleyin ve kesinlikle gerektiğinde özel arayüzleri (I2P veya Yggdrasil gibi) etkinleştirin. Yerel olarak bağlı RNode'lar ve yerel lan arayüzleri bu omurga sınırına dahil edilmez.",
       "defaultHubsPickerHint": "Birincil ve küresel omurga ile bölgenizden başlayın. En fazla 1–3 omurga ağ geçidi etkinleştirin (2 idealdir). Yerel RNode ve LAN arayüzleri sayılmaz. Yeni girdiler inceleme için kapalı eklenir. Sync ayrıca kalan kullanım dışı resmi testnet hub’larını da kapatır (Amsterdam).",
       "rnodeTransportBleHint": "BLE bağları macOS ile senkronize olmayabilir (Forget + re-pair). Radyo yakındayken USB seri veya Wi-Fi (tcp://) tercih edin.",
-      "flowControl": "Akış kontrolü (TX hazır kapısı)"
+      "flowControl": "Akış kontrolü (TX hazır kapısı)",
+      "rmapFullModeHint": "RMAP yayınlı tam mod, ignore_config_warnings aracılığıyla Tam tutar. LXMF teslimat duyuruları, bu radyoyu yığın duyuru aralığından çıkaracaktır (varsayılan 1 saat).",
+      "effectiveModeBadge": "Yürürlük Tarihi: {{mode}}",
+      "effectiveModeAria": "Etkin çalışma zamanı modu {{mode}}. Yapılandırılmış mod, Reticulum'un çalıştığından farklıdır.",
+      "effectiveModeTooltip": "Reticulum, bu keşfedilebilir arayüzü Erişim Noktasına (veya izin verilen başka bir moda) yeniden yazdı, çünkü keşfedilebilir, ignore_config_warnings ayarlanmadığı sürece Ağ Geçidi, Dahili veya Erişim Noktası gerektirir. Tam (veya yapılandırılmış modunuzun) etkili olması için devre dışı bırakılan mesh-client damgalarından sonra yığını yeniden başlatın."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "Bulunabilir yerel RNode'un internet erişilebilirliği için etkinleştirilmiş bir TCP istemci merkezi yoktur.",
         "rmap_transport_disabled": "Bulunabilir arayüzler yapılandırılmış ancak taşıma modu kapalı.",
         "rmap_i2p_not_connectable": "\"{{name}}\" I2P arayüzü keşfedilebilir ancak bağlanılabilir evet değildir.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "\"{{name}}\" arayüzü, AP/Ağ Geçidi olmayan bir modda bulunabilir — Reticulum, ignore_config_warnings ayarlanmadığı sürece bunu Erişim Noktası olarak çalıştıracaktır. Arayüzü düzenleyin veya yığını yeniden başlatın, böylece mesh istemcisi devre dışı bırakma işlemini damgalayabilir (mesh-client)."
       },
       "runtime": {
         "rnsNotReady": "RNS yığını hazır değil",
diff --git a/src/renderer/locales/uk/translation.json b/src/renderer/locales/uk/translation.json
index 4c6a7c585..d0a789c1b 100644
--- a/src/renderer/locales/uk/translation.json
+++ b/src/renderer/locales/uk/translation.json
@@ -1220,7 +1220,11 @@
       "backboneEnableGuidanceBody": "—2 - це солодка пляма для надлишковості без зайвого роздування пропускної здатності. Створіть 1 глобальний хаб та 1 регіональний шлюз, а також увімкніть спеціалізовані інтерфейси (такі як I2P або Yggdrasil) строго за потреби. Місцеві з'єднані RNodes та локальні інтерфейси локальної мережі не враховуються до цієї межі магістралі.",
       "defaultHubsPickerHint": "Почніть з первинної та глобальної магістралі плюс ваш регіон. Увімкніть не більше 1–3 магістральних шлюзів (2 — оптимум). Локальні RNode та LAN-інтерфейси не враховуються. Нові записи додаються вимкненими для перевірки. Sync також вимикає залишкові виведені з експлуатації офіційні тестові хаби (Амстердам).",
       "rnodeTransportBleHint": "Зв'язки BLE можуть розсинхронізуватися з macOS (Forget + re-pair). Якщо радіоприймач поруч, віддайте перевагу USB serial або Wi-Fi (tcp://).",
-      "flowControl": "Контроль потоку (TX ready-gate)"
+      "flowControl": "Контроль потоку (TX ready-gate)",
+      "rmapFullModeHint": "Повний режим з публікацією RMAP зберігається повним через ignore_config_warnings. Оголошення про доставку LXMF виведуть цей радіоприймач на інтервал оголошення стека (за замовчуванням 1 година).",
+      "effectiveModeBadge": "Вступає в силу: {{mode}}",
+      "effectiveModeAria": "Ефективний режим роботи {{mode}}. Налаштований режим відрізняється від того, що працює Reticulum.",
+      "effectiveModeTooltip": "Reticulum переписав цей інтерфейс виявлення до точки доступу (або іншого дозволеного режиму), оскільки для виявлення потрібен шлюз, внутрішній або точка доступу, якщо не встановлено ignore_config_warnings. Перезапустіть стек після того, як почнуть діяти штампи mesh-client, які відмовляються від повноцінного (або налаштованого вами режиму)."
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1697,7 +1701,8 @@
         "rmap_no_tcp_hub": "Локальний вузол Discoverable RNode не має ввімкненого клієнтського концентратора TCP для доступу до Інтернету.",
         "rmap_transport_disabled": "Інтерфейси, які можна виявити, налаштовані, але режим транспортування вимкнено.",
         "rmap_i2p_not_connectable": "Інтерфейс I2P \"{{name}}\" можна виявити, але неможливо підключити.",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "Інтерфейс \"{{name}}\" можна виявити в режимі без AP/шлюзу — Reticulum запускатиме його як точку доступу, якщо не встановлено ignore_config_warnings. Відредагуйте інтерфейс або перезапустіть стек, щоб mesh-client міг відмітити відмову."
       },
       "runtime": {
         "rnsNotReady": "Стек RNS не готовий",
diff --git a/src/renderer/locales/zh/translation.json b/src/renderer/locales/zh/translation.json
index 819d0ddf4..376d42f01 100644
--- a/src/renderer/locales/zh/translation.json
+++ b/src/renderer/locales/zh/translation.json
@@ -1218,7 +1218,11 @@
       "backboneEnableGuidanceBody": "—2是冗余的最佳选择，不会造成不必要的带宽膨胀。瞄准1个全球集线器和1个区域网关，并严格根据需要启用专业接口（如I2P或Yggdrasil ）。本地连接的RNode和本地LAN接口不计入此骨干限制。",
       "defaultHubsPickerHint": "从“主要和全球骨干网”加上您的区域开始。最多启用 1 到 3 个骨干网关（2 个较理想）。本地 RNode 和局域网接口不计入。新条目默认禁用，便于您审阅后再启用。同步还会禁用剩余已停用的官方测试网枢纽（阿姆斯特丹）。",
       "rnodeTransportBleHint": "BLE绑定可以与macOS取消同步（忘记+重新配对）。当收音机在附近时，首选USB串行或Wi-Fi （ tcp://）。",
-      "flowControl": "流量控制（TX 就绪门）"
+      "flowControl": "流量控制（TX 就绪门）",
+      "rmapFullModeHint": "RMAP发布的完整模式通过IGNORE_CONFIG_WARNINGS保持完整。LXMF传递公告将在堆栈公告间隔（默认为1小时）上退出此无线电。",
+      "effectiveModeBadge": "有效期： {{mode}}",
+      "effectiveModeAria": "有效运行时模式{{mode}}。配置的模式与Reticulum正在运行的模式不同。",
+      "effectiveModeTooltip": "Reticulum将此可发现接口重写到接入点（或其他允许的模式） ，因为除非设置了ignore_config_warnings ，否则DISCOVERABLE需要网关、内部或接入点。在选择退出的mesh-client戳后重新启动堆栈，以便完整（或您配置的模式）生效。"
     },
     "reticulumPeers": {
       "hops": "Hops",
@@ -1695,7 +1699,8 @@
         "rmap_no_tcp_hub": "可发现的本地RNode没有启用TCP客户端集线器以实现互联网可访问性。",
         "rmap_transport_disabled": "已配置可发现的接口，但传输模式已关闭。",
         "rmap_i2p_not_connectable": "I2P接口“{{name}}”是可发现的，但不是可连接的。",
-        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started."
+        "shared_instance_client": "Share instance attached as a client of another app — local TCP hubs in this config are not started.",
+        "rmap_mode_autocorrect": "接口“{{name}}”可通过非AP/网关模式发现—除非设置ignore_config_warnings ，否则Reticulum将作为接入点运行。编辑界面或重新启动堆栈，以便mesh-client可以标记选择退出。"
       },
       "runtime": {
         "rnsNotReady": "RNS 堆栈尚未准备好",

From 6cf11b8d03e5b5719263e357a4e027fe600ab0bc Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 11:16:11 -0600
Subject: [PATCH 6/9] fix(meshcore): show RF advert names instead of Node-XXXX
 / pubkey hash

Companion advert push is pubkey-only, so apply on-air ADVERT name and role to the store and revive tombstoned contacts. Hide MeshCore hex ids in the node detail modal.
---
 .../components/NodeDetailModal.test.tsx       |  2 +
 src/renderer/components/NodeDetailModal.tsx   | 16 ++--
 .../meshcoreLiveContactPersist.test.ts        | 16 ++++
 .../meshcore/meshcoreLiveContactPersist.ts    | 34 +++++++--
 .../lib/meshcore/meshcoreRfRxRuntime.test.ts  | 74 +++++++++++++++++++
 .../lib/meshcore/meshcoreRfRxRuntime.ts       | 72 +++++++++++++++++-
 6 files changed, 197 insertions(+), 17 deletions(-)

diff --git a/src/renderer/components/NodeDetailModal.test.tsx b/src/renderer/components/NodeDetailModal.test.tsx
index eedb87582..ec2e6bb0d 100644
--- a/src/renderer/components/NodeDetailModal.test.tsx
+++ b/src/renderer/components/NodeDetailModal.test.tsx
@@ -320,6 +320,8 @@ describe('NodeDetailModal MeshCore actions', () => {
 
     const pubkeyEl = await screen.findByText(pubkeyHex);
     expect(pubkeyEl).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: 'Test Node' })).toBeInTheDocument();
+    expect(screen.queryByText('!abababab')).not.toBeInTheDocument();
 
     hydrateAxeThemeColors(container);
     expect(await axe(container)).toHaveNoViolations();
diff --git a/src/renderer/components/NodeDetailModal.tsx b/src/renderer/components/NodeDetailModal.tsx
index 53ec474c6..1a89fa5af 100644
--- a/src/renderer/components/NodeDetailModal.tsx
+++ b/src/renderer/components/NodeDetailModal.tsx
@@ -15,6 +15,7 @@ import { getOfflineIdentityIdForProtocol } from '@/renderer/lib/offlineProtocolI
 import { writeClipboardText } from '@/renderer/lib/writeClipboardText';
 import { formatIsoDateTime } from '@/shared/formatIsoDate';
 import { buildMeshcoreContactAddUri, type MeshcoreContactType } from '@/shared/meshClientDeepLink';
+import { meshcoreContactDisplayName } from '@/shared/meshcoreContactSanitize';
 import { isDeleteActiveMqttIdentityError } from '@/shared/meshtasticDeleteNodeError';
 import { formatMeshtasticNodeId } from '@/shared/nodeNameUtils';
 
@@ -46,7 +47,6 @@ import {
   MESHCORE_CONTACTS_CRITICAL_THRESHOLD,
   MESHCORE_MAX_CONTACTS,
   meshcoreContactTypeFromHwModel,
-  meshcorePubkeyShortId,
   meshcoreTracePathLenToHops,
 } from '../lib/meshcoreUtils';
 import {
@@ -582,13 +582,13 @@ export default function NodeDetailModal({
 
   if (!node) return null;
 
-  const hexId =
-    protocol === 'meshcore'
-      ? (meshcorePubkeyShortId(contactPubkey) ?? formatMeshtasticNodeId(node.node_id))
-      : formatMeshtasticNodeId(node.node_id);
+  const hexId = formatMeshtasticNodeId(node.node_id);
   const awaitingNodeInfo =
     protocol === 'meshtastic' && meshtasticNodeAwaitingNodeInfo(node, { isConnected });
-  const displayName = node.short_name || node.long_name || hexId;
+  const displayName =
+    protocol === 'meshcore'
+      ? meshcoreContactDisplayName(node.node_id, node.long_name)
+      : node.short_name || node.long_name || hexId;
   const isOurNode = node.node_id === homeNode?.node_id;
   const nodeStatus = getNodeStatus(node.last_heard, nodeStaleThresholdMs, nodeOfflineThresholdMs);
   const nodeStatusUi =
@@ -687,7 +687,9 @@ export default function NodeDetailModal({
                 )}
               </div>
               <div className="mt-0.5 flex items-center gap-2">
-                <span className="text-muted font-mono text-xs">{hexId}</span>
+                {protocol !== 'meshcore' && (
+                  <span className="text-muted font-mono text-xs">{hexId}</span>
+                )}
                 {headerHopsDisplay != null && (
                   <span
                     className={`text-xs ${headerHopsDisplay === 0 ? 'text-bright-green' : 'text-gray-400'}`}
diff --git a/src/renderer/lib/meshcore/meshcoreLiveContactPersist.test.ts b/src/renderer/lib/meshcore/meshcoreLiveContactPersist.test.ts
index 5eca14fc4..12bc7f94f 100644
--- a/src/renderer/lib/meshcore/meshcoreLiveContactPersist.test.ts
+++ b/src/renderer/lib/meshcore/meshcoreLiveContactPersist.test.ts
@@ -2,6 +2,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { upsertNode, useNodeStore } from '../../stores/nodeStore';
+import {
+  markMeshcoreLocallyDeletedContact,
+  resetMeshcoreLocallyDeletedContactsForTests,
+} from '../meshcoreLocallyDeletedContacts';
 import type { NodeInfoEvent } from '../protocols/Protocol';
 import {
   persistMeshcoreNodeInfoAfterAdvert,
@@ -25,6 +29,7 @@ function advertEvent(overrides?: Partial<NodeInfoEvent>): NodeInfoEvent {
 describe('meshcoreLiveContactPersist', () => {
   beforeEach(() => {
     useNodeStore.setState({ nodes: {}, traceRoutes: {}, waypoints: {}, neighborInfo: {} });
+    resetMeshcoreLocallyDeletedContactsForTests();
     vi.clearAllMocks();
     vi.mocked(window.electronAPI.db.updateMeshcoreContactAdvert).mockResolvedValue(undefined);
     vi.mocked(window.electronAPI.db.saveMeshcoreContact).mockResolvedValue(undefined);
@@ -71,4 +76,15 @@ describe('meshcoreLiveContactPersist', () => {
       }),
     );
   });
+
+  it('clears a local delete tombstone and inserts when a live advert arrives', () => {
+    markMeshcoreLocallyDeletedContact(NODE_ID);
+    persistMeshcoreNodeInfoAfterAdvert(ID, advertEvent());
+    expect(window.electronAPI.db.saveMeshcoreContact).toHaveBeenCalledWith(
+      expect.objectContaining({
+        node_id: NODE_ID,
+        adv_name: 'Alice',
+      }),
+    );
+  });
 });
diff --git a/src/renderer/lib/meshcore/meshcoreLiveContactPersist.ts b/src/renderer/lib/meshcore/meshcoreLiveContactPersist.ts
index 88e85dc91..5d9dfe8f3 100644
--- a/src/renderer/lib/meshcore/meshcoreLiveContactPersist.ts
+++ b/src/renderer/lib/meshcore/meshcoreLiveContactPersist.ts
@@ -10,11 +10,15 @@ import { bytesToHex } from '@/shared/hexBytes';
 import { useNodeStore } from '../../stores/nodeStore';
 import { usePositionHistoryStore } from '../../stores/positionHistoryStore';
 import { errLikeToLogString } from '../errLikeToLogString';
-import { shouldApplyMeshcoreContact } from '../meshcoreLocallyDeletedContacts';
+import {
+  clearMeshcoreLocallyDeletedContact,
+  shouldApplyMeshcoreContact,
+} from '../meshcoreLocallyDeletedContacts';
 import {
   CONTACT_TYPE_LABELS,
   mergeHwModelOnContactUpdate,
   meshcoreContactTypeFromHwModel,
+  meshcoreIsPlaceholderNodeLongName,
   meshcoreMinimalNodeFromAdvertEvent,
   pubkeyToNodeId,
 } from '../meshcoreUtils';
@@ -50,7 +54,11 @@ export function persistMeshcoreNodeInfoAfterAdvert(
 
   const nodeId = event.nodeId > 0 ? event.nodeId : pubkeyToNodeId(publicKey);
   if (nodeId === 0) return;
-  if (!shouldApplyMeshcoreContact(nodeId)) return;
+  const tombstoned = !shouldApplyMeshcoreContact(nodeId);
+  if (tombstoned) {
+    // Live radio advert (128/138 / RF) means the companion re-added the contact.
+    clearMeshcoreLocallyDeletedContact(nodeId);
+  }
 
   registerMeshcorePubKey(nodeId, publicKey);
 
@@ -95,16 +103,22 @@ export function persistMeshcoreNodeInfoAfterAdvert(
   });
 
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- Runtime guard protects external or callback-mutated state.
-  if (!existingRecord) {
+  if (!existingRecord || tombstoned) {
     if (built) {
+      let advName: string | null =
+        typeof event.longName === 'string' && event.longName.trim() ? event.longName.trim() : null;
+      if (!advName) {
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- Node may be absent when its identity bucket is missing.
+        const stored = existingRecord?.longName?.trim();
+        if (stored && !meshcoreIsPlaceholderNodeLongName(existingRecord.longName, nodeId)) {
+          advName = stored;
+        }
+      }
       void window.electronAPI.db
         .saveMeshcoreContact({
           node_id: nodeId,
           public_key: bytesToHex(publicKey),
-          adv_name:
-            typeof event.longName === 'string' && event.longName.trim()
-              ? event.longName.trim()
-              : null,
+          adv_name: advName,
           contact_type: built.contactType,
           last_advert: lastAdvert,
           adv_lat: built.persistAdvLatDeg,
@@ -125,7 +139,11 @@ export function persistMeshcoreNodeInfoAfterAdvert(
     typeof event.longName === 'string' && event.longName.trim() ? event.longName.trim() : undefined;
   const existingHw = existingRecord.hwModel;
   let persistAdvName: string | undefined;
-  if (advNameTrim && !existingRecord.longName?.trim()) {
+  if (
+    advNameTrim &&
+    (!existingRecord.longName?.trim() ||
+      meshcoreIsPlaceholderNodeLongName(existingRecord.longName, nodeId))
+  ) {
     persistAdvName = advNameTrim;
   }
   if (opts?.contactType != null && Number.isFinite(opts.contactType)) {
diff --git a/src/renderer/lib/meshcore/meshcoreRfRxRuntime.test.ts b/src/renderer/lib/meshcore/meshcoreRfRxRuntime.test.ts
index 31b75e6b9..004c70ee5 100644
--- a/src/renderer/lib/meshcore/meshcoreRfRxRuntime.test.ts
+++ b/src/renderer/lib/meshcore/meshcoreRfRxRuntime.test.ts
@@ -2,6 +2,11 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { useDiagnosticsStore } from '../../stores/diagnosticsStore';
 import { upsertNodeRecord, useNodeStore } from '../../stores/nodeStore';
+import {
+  markMeshcoreLocallyDeletedContact,
+  resetMeshcoreLocallyDeletedContactsForTests,
+} from '../meshcoreLocallyDeletedContacts';
+import { pubkeyToNodeId } from '../meshcoreUtils';
 import { setMeshtasticConnectedMyNodeNum } from '../meshtasticConnectedNodeRef';
 import { meshNodeToNodeRecord } from '../storeRecordAdapters';
 import type { MeshNode, TelemetryPoint } from '../types';
@@ -77,6 +82,7 @@ describe('handleMeshcoreRfRx', () => {
   afterEach(() => {
     useNodeStore.setState({ nodes: {} });
     setMeshtasticConnectedMyNodeNum(0);
+    resetMeshcoreLocallyDeletedContactsForTests();
     vi.restoreAllMocks();
   });
 
@@ -233,3 +239,71 @@ describe('handleMeshcoreRfRx', () => {
     expect(setStateSpy).not.toHaveBeenCalled();
   });
 });
+
+function buildFloodAdvertPacket(opts: {
+  publicKey: Uint8Array;
+  name: string;
+  deviceRole: number;
+}): Uint8Array {
+  const nameBytes = new TextEncoder().encode(opts.name);
+  const raw = new Uint8Array(2 + 32 + 4 + 64 + 1 + nameBytes.length);
+  raw[0] = (4 << 2) | 1; // ADVERT + FLOOD
+  raw[1] = 0; // 0 hops
+  raw.set(opts.publicKey, 2);
+  new DataView(raw.buffer).setUint32(34, 1_700_000_000, true);
+  raw[102] = 0x80 | (opts.deviceRole & 0x0f);
+  raw.set(nameBytes, 103);
+  return raw;
+}
+
+describe('handleMeshcoreRfRx advert identity', () => {
+  afterEach(() => {
+    useNodeStore.setState({ nodes: {} });
+    resetMeshcoreLocallyDeletedContactsForTests();
+    vi.restoreAllMocks();
+  });
+
+  it('upserts advert name and Room hw_model from an on-air ADVERT packet', () => {
+    const publicKey = Uint8Array.from({ length: 32 }, (_, i) => (i + 3) & 0xff);
+    const nodeId = pubkeyToNodeId(publicKey);
+    const name = '🛜 NV0N PW=hello';
+    const { deps } = makeDeps({ myNodeNumRef: ref(1) });
+    vi.mocked(window.electronAPI.db.saveMeshcoreContact).mockResolvedValue(undefined);
+
+    handleMeshcoreRfRx(
+      {
+        lastSnr: 12,
+        lastRssi: -22,
+        raw: buildFloodAdvertPacket({ publicKey, name, deviceRole: 3 }),
+      },
+      deps,
+    );
+
+    expect(useNodeStore.getState().nodes[ID][nodeId]).toMatchObject({
+      longName: name,
+      hwModel: 'Room',
+    });
+  });
+
+  it('revives a locally deleted contact when a live RF advert is heard', () => {
+    const publicKey = Uint8Array.from({ length: 32 }, (_, i) => (i + 5) & 0xff);
+    const nodeId = pubkeyToNodeId(publicKey);
+    markMeshcoreLocallyDeletedContact(nodeId);
+    const { deps } = makeDeps({ myNodeNumRef: ref(1) });
+    vi.mocked(window.electronAPI.db.saveMeshcoreContact).mockResolvedValue(undefined);
+
+    handleMeshcoreRfRx(
+      {
+        lastSnr: 12,
+        lastRssi: -22,
+        raw: buildFloodAdvertPacket({ publicKey, name: 'NV0N Room', deviceRole: 3 }),
+      },
+      deps,
+    );
+
+    expect(useNodeStore.getState().nodes[ID][nodeId].longName).toBe('NV0N Room');
+    expect(window.electronAPI.db.saveMeshcoreContact).toHaveBeenCalledWith(
+      expect.objectContaining({ adv_name: 'NV0N Room', contact_type: 3 }),
+    );
+  });
+});
diff --git a/src/renderer/lib/meshcore/meshcoreRfRxRuntime.ts b/src/renderer/lib/meshcore/meshcoreRfRxRuntime.ts
index e810a0c19..9d7ffda61 100644
--- a/src/renderer/lib/meshcore/meshcoreRfRxRuntime.ts
+++ b/src/renderer/lib/meshcore/meshcoreRfRxRuntime.ts
@@ -12,7 +12,7 @@ import { errLikeToLogString } from '@/renderer/lib/errLikeToLogString';
 import { parseMeshCoreRfPacket } from '../../../shared/meshcoreRfPacketParse';
 import { MAX_DEVICE_LOGS, MAX_TELEMETRY_POINTS } from '../../hooks/meshcore/meshcoreHookPreamble';
 import { useDiagnosticsStore } from '../../stores/diagnosticsStore';
-import { upsertNodeRecord } from '../../stores/nodeStore';
+import { upsertNode, upsertNodeRecord, useNodeStore } from '../../stores/nodeStore';
 import {
   classifyPayload,
   classifyProximity,
@@ -29,7 +29,12 @@ import {
   meshcoreRfResolvePathSender,
 } from '../meshcoreRawPacketSender';
 import { shouldCoalesceSelfFloodAdvert } from '../meshcoreRawSelfFloodAdvertCoalesce';
-import { meshcoreMergeContactHopsAwayFromPrevious, pubkeyToNodeId } from '../meshcoreUtils';
+import {
+  CONTACT_TYPE_LABELS,
+  mergeHwModelOnContactUpdate,
+  meshcoreMergeContactHopsAwayFromPrevious,
+  pubkeyToNodeId,
+} from '../meshcoreUtils';
 import { getMeshtasticConnectedMyNodeNum } from '../meshtasticConnectedNodeRef';
 import type { DomainEvent } from '../protocols/Protocol';
 import { MAX_RAW_PACKET_LOG_ENTRIES } from '../rawPacketLogConstants';
@@ -38,6 +43,7 @@ import { meshNodeToNodeRecord } from '../storeRecordAdapters';
 import { MESHCORE_RAW_SELF_FLOOD_ADVERT_COALESCE_MS } from '../timeConstants';
 import type { MeshNode, MQTTStatus, TelemetryPoint } from '../types';
 import type { DeviceLogEntry, MeshCoreSelfInfo, RxPacketEntry } from './meshcoreHookTypes';
+import { persistMeshcoreNodeInfoAfterAdvert } from './meshcoreLiveContactPersist';
 import {
   type MeshcoreMqttPacketLogBucket,
   tryTakeMeshcoreMqttPacketLogToken,
@@ -321,6 +327,67 @@ export function applyMeshcoreRfHopsAwayUpdate(
   persistMeshcoreRfHopHistory(fromNodeId, now, mergedHopsAway ?? hopCount, snr, rssi);
 }
 
+/**
+ * Companion push 128 is pubkey-only. Apply the on-air ADVERT name + device role so the contact
+ * list / Rooms tab show the advertised identity instead of `Node-XXXXXXXX`.
+ */
+function applyMeshcoreRfAdvertToStore(
+  ctx: MeshcoreRfParseContext,
+  now: number,
+  snr: number,
+  rssi: number,
+  deps: MeshcoreRfRxDeps,
+): void {
+  if (!ctx.parsed.ok || ctx.parsed.advert == null) return;
+  const advert = ctx.parsed.advert;
+  const identityId = deps.meshcoreIdentityIdRef.current;
+  if (!identityId) return;
+  const publicKey = advert.publicKey;
+  if (publicKey.length !== 32) return;
+  const nodeId = pubkeyToNodeId(publicKey);
+  if (nodeId === 0 || nodeId === deps.myNodeNumRef.current) return;
+
+  const name = advert.name.trim();
+  const incomingHw = CONTACT_TYPE_LABELS[advert.deviceRole] ?? 'Unknown';
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- Identity bucket may be absent at runtime.
+  const existing = useNodeStore.getState().nodes[identityId]?.[nodeId];
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- Node may be absent when its identity bucket is missing.
+  const hwModel = mergeHwModelOnContactUpdate(existing?.hwModel, incomingHw);
+  const lastHeardAt = advert.timestampSec > 0 ? advert.timestampSec : Math.floor(now / 1000);
+
+  upsertNode(identityId, {
+    nodeId,
+    ...(name ? { longName: name } : {}),
+    hwModel,
+    lastHeardAt,
+    publicKey,
+  });
+
+  const after = useNodeStore.getState().nodes[identityId][nodeId];
+  const mergedHops = meshcoreMergeContactHopsAwayFromPrevious(ctx.hopCount, after.hopsAway, 0);
+  upsertNodeRecord(identityId, {
+    ...after,
+    hopsAway: mergedHops ?? ctx.hopCount,
+    snr,
+    rssi,
+    source: 'rf',
+    heardViaMqttOnly: false,
+    viaMqtt: false,
+  });
+
+  persistMeshcoreNodeInfoAfterAdvert(
+    identityId,
+    {
+      nodeId,
+      longName: name || undefined,
+      lastHeardAt,
+      publicKey,
+      hwModel,
+    },
+    { contactType: advert.deviceRole },
+  );
+}
+
 function buildMeshcoreRfRawPacketEntry(
   ctx: MeshcoreRfParseContext,
   effectiveFromNodeId: number | null,
@@ -637,6 +704,7 @@ export function handleMeshcoreRfRx(payload: MeshcoreRfRxPayload, deps: MeshcoreR
   if (rawU8) {
     const ctx = buildMeshcoreRfParseContext(rawU8, deps.pubKeyPrefixMapRef.current);
     applyMeshcoreRfHopsAwayUpdate(ctx.fromNodeId, ctx.hopCount, now, snr, rssi, cachedDeps);
+    applyMeshcoreRfAdvertToStore(ctx, now, snr, rssi, deps);
 
     const effectiveFromNodeId =
       ctx.fromNodeId ?? meshtasticSenderIdForRawLogFallback(ctx.parseOk, rawU8);

From 260b54da76c45592b8594ee38f35f7b54a1becc9 Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 12:30:04 -0600
Subject: [PATCH 7/9] fix(meshcore): fix room login ACL, hops, and history
 catch-up

Parse LoginSuccess permissions (not the legacy reserved flag), ignore sticky hops without a path, reset companion sync_since for ring catch-up after login, and translate room login errors in the UI.
---
 docs/meshcore-meshtastic-parity.md            |  4 +-
 docs/troubleshooting.md                       |  3 +-
 patches/@liamcottle__meshcore.js@1.14.0.patch | 37 ++++++++++--
 pnpm-lock.yaml                                |  6 +-
 src/renderer/components/RoomsPanel.test.tsx   | 27 ++++++++-
 src/renderer/components/RoomsPanel.tsx        | 15 +++--
 .../lib/meshcoreRoomLoginPathSync.test.ts     | 43 ++++++++++++++
 src/renderer/lib/meshcoreRoomLoginPathSync.ts | 56 +++++++++++++++++++
 .../lib/meshcoreRoomLoginQueue.test.ts        | 22 ++++++++
 src/renderer/lib/meshcoreRoomLoginQueue.ts    |  6 +-
 src/renderer/lib/meshcoreRoomLoginRpc.ts      |  2 +-
 src/renderer/lib/meshcoreRoomSession.test.ts  | 49 ++++++++++++++--
 src/renderer/lib/meshcoreRoomSession.ts       | 51 +++++++++++++----
 src/renderer/lib/meshcoreUtils.test.ts        |  7 ++-
 src/renderer/lib/meshcoreUtils.ts             | 13 ++++-
 src/renderer/locales/cs/translation.json      |  2 +-
 src/renderer/locales/de/translation.json      |  2 +-
 src/renderer/locales/en/translation.json      |  2 +-
 src/renderer/locales/es/translation.json      |  2 +-
 src/renderer/locales/fr/translation.json      |  2 +-
 src/renderer/locales/id/translation.json      |  2 +-
 src/renderer/locales/it/translation.json      |  2 +-
 src/renderer/locales/ja/translation.json      |  2 +-
 src/renderer/locales/ko/translation.json      |  2 +-
 src/renderer/locales/nl/translation.json      |  2 +-
 src/renderer/locales/pl/translation.json      |  2 +-
 src/renderer/locales/pt-BR/translation.json   |  2 +-
 src/renderer/locales/ru/translation.json      |  2 +-
 src/renderer/locales/tr/translation.json      |  2 +-
 src/renderer/locales/uk/translation.json      |  2 +-
 src/renderer/locales/zh/translation.json      |  2 +-
 src/renderer/runtime/useMeshcoreRuntime.ts    | 36 +++++++++++-
 32 files changed, 353 insertions(+), 56 deletions(-)

diff --git a/docs/meshcore-meshtastic-parity.md b/docs/meshcore-meshtastic-parity.md
index bbb95a806..d2628ff1a 100644
--- a/docs/meshcore-meshtastic-parity.md
+++ b/docs/meshcore-meshtastic-parity.md
@@ -52,11 +52,11 @@ Shared UI gates use `ProtocolCapabilities` in [`src/renderer/lib/radio/BaseRadio
 
 Room servers (`hw_model === 'Room'`, contact type 3) are BBS nodes on the mesh. The companion radio must be connected over **RF** (BLE, serial, or TCP); **MQTT does not carry room login/post**.
 
-**Login:** Blank guest Login sends **zero password bytes** (read-only when `allow.read.only` is on; same wire as **Continue read-only**). **`hello`** is the default read/write guest password. Admin login uses the configured password. LoginSuccess ACL byte is read from meshcore.js `reserved` (or `permissions`). Login RPC, queue, and path sync live under `src/renderer/lib/meshcoreRoom*.ts` (e.g. [`meshcoreRoomLoginRpc.ts`](../src/renderer/lib/meshcoreRoomLoginRpc.ts), [`meshcoreRoomLoginQueue.ts`](../src/renderer/lib/meshcoreRoomLoginQueue.ts)); timeouts are shorter on TCP and 0-hop paths ([`timeConstants.ts`](../src/renderer/lib/timeConstants.ts)).
+**Login:** Blank guest Login sends **zero password bytes** (read-only when `allow.read.only` is on; same wire as **Continue read-only**). **`hello`** is the default read/write guest password. Admin login uses the configured password. LoginSuccess ACL is the companion v7+ `permissions` byte (PERM_ACL_*); `reserved` is only the legacy admin/guest hint (do not treat as ACL). Login RPC, queue, and path sync live under `src/renderer/lib/meshcoreRoom*.ts` (e.g. [`meshcoreRoomLoginRpc.ts`](../src/renderer/lib/meshcoreRoomLoginRpc.ts), [`meshcoreRoomLoginQueue.ts`](../src/renderer/lib/meshcoreRoomLoginQueue.ts)); timeouts are shorter on TCP and 0-hop paths ([`timeConstants.ts`](../src/renderer/lib/timeConstants.ts)).
 
 **Posts:** Outbound room posts use plain UTF-8 (`TXT_TYPE_PLAIN`) after login and are **single-packet** — mesh-client does not emit multi-part `[i/N]` room posts; over-limit text is blocked in the composer (same rationale as chat/DM). Inbound **SignedPlain** pushes include a four-byte author prefix; the **Rooms** UI strips it, and inbound multi-part from other clients is still merged for display. Posts appear in the **Rooms** tab (channel `-2`), not Chat channel pills.
 
-**Sync:** Firmware only **pushes new posts** after login (no history backfill). **Auto-sync** re-logs in on a timer while the radio stays connected (minimum 60 minutes per room, [`meshcoreRoomSyncScheduler.ts`](../src/renderer/lib/meshcoreRoomSyncScheduler.ts)). Saved passwords: SQLite `app_settings` (same pattern as Meshtastic remote admin keys). Session clears on disconnect.
+**Sync:** After login, the room server pushes posts newer than the companion `sync_since` watermark (ring buffer, typically ~32). mesh-client resets that watermark when the device has no local last-post time yet, then drains waiting messages. **Auto-sync** re-logs in on a timer while the radio stays connected (minimum 60 minutes per room, [`meshcoreRoomSyncScheduler.ts`](../src/renderer/lib/meshcoreRoomSyncScheduler.ts)). Saved passwords: SQLite `app_settings` (same pattern as Meshtastic remote admin keys). Session clears on disconnect.
 
 **Unread:** Room BBS traffic increments the **Rooms** sidebar badge ([`meshcoreRoomsUnread.ts`](../src/renderer/lib/meshcoreRoomsUnread.ts)) and system-tray unread when backgrounded; it does not increment the **Chat** tab badge.
 
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 0c0b1bec7..d44c21a4e 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -920,7 +920,8 @@ The client deduplicates overlapping RF and MQTT hears within **5 minutes** (cros
 
 **No room history after login**:
 
-- Firmware only **pushes new posts** after a successful login; it does not backfill old BBS messages. Enable **Auto-sync** on the Rooms tab to periodic re-login while connected.
+- Room servers keep a **short ring buffer** of recent posts and push anything newer than your companion’s `sync_since` watermark after LoginSuccess. mesh-client resets that watermark (remove+re-add contact) when this device has **no local last-post watermark** yet, then drains waiting messages after login.
+- Posts older than the ring (or already past `sync_since`) will not appear. Enable **Auto-sync** on the Rooms tab to periodic re-login while connected so you stay current.
 - mesh-client stores posts received while you are logged in on **this device**. Quitting the app or staying logged out for days means posts from that period will not appear later unless they were persisted locally. See the **Rooms** tab history note under Auto-sync.
 
 **pyMC / server console shows posts but Rooms tab does not (cross-client)**:
diff --git a/patches/@liamcottle__meshcore.js@1.14.0.patch b/patches/@liamcottle__meshcore.js@1.14.0.patch
index 673139607..8a1b5f8d8 100644
--- a/patches/@liamcottle__meshcore.js@1.14.0.patch
+++ b/patches/@liamcottle__meshcore.js@1.14.0.patch
@@ -1,5 +1,5 @@
 diff --git a/src/buffer_reader.js b/src/buffer_reader.js
-index 9142fbc..2f8cf2d 100644
+index 9142fbc9fda24c07082d63ced24117a35b29dc93..2f8cf2d68d1c32c1d7cc489f33527c9ad89545d4 100644
 --- a/src/buffer_reader.js
 +++ b/src/buffer_reader.js
 @@ -24,7 +24,10 @@ class BufferReader {
@@ -15,7 +15,7 @@ index 9142fbc..2f8cf2d 100644
  
      readCString(maxLength) {
 diff --git a/src/connection/connection.js b/src/connection/connection.js
-index 541ce73..50a3bef 100644
+index 541ce732e52444d094043e49fef295752da3d7bc..209edb4f2cccff89efee83c708796a5c226dff8d 100644
 --- a/src/connection/connection.js
 +++ b/src/connection/connection.js
 @@ -338,6 +338,14 @@ class Connection extends EventEmitter {
@@ -49,7 +49,34 @@ index 541ce73..50a3bef 100644
          }
  
      }
-@@ -498,15 +512,25 @@ class Connection extends EventEmitter {
+@@ -457,10 +471,22 @@ class Connection extends EventEmitter {
+     }
+ 
+     onLoginSuccessPush(bufferReader) {
+-        this.emit(Constants.PushCodes.LoginSuccess, {
+-            reserved: bufferReader.readByte(), // reserved
+-            pubKeyPrefix: bufferReader.readBytes(6), // 6 bytes of public key this login success is from
+-        });
++        // Companion v7+ LoginSuccess: legacyFlag(1) + pubKeyPrefix(6) + serverTimestamp(4) + aclPermissions(1) + firmwareVerLevel(1).
++        // Room servers put PERM_ACL_* in aclPermissions; legacyFlag is NOT the ACL (0=RW/RO, 1=admin, 2=guest).
++        const reserved = bufferReader.readByte(); // legacy is_admin / guest hint (data[6])
++        const pubKeyPrefix = bufferReader.readBytes(6);
++        const payload = {
++            reserved: reserved,
++            pubKeyPrefix: pubKeyPrefix,
++        };
++        if (bufferReader.getRemainingBytesCount() >= 5) {
++            payload.serverTimestamp = bufferReader.readUInt32LE();
++            payload.permissions = bufferReader.readByte(); // ACL permissions (data[7])
++            if (bufferReader.getRemainingBytesCount() >= 1) {
++                payload.firmwareVerLevel = bufferReader.readByte();
++            }
++        }
++        this.emit(Constants.PushCodes.LoginSuccess, payload);
+     }
+ 
+     onStatusResponsePush(bufferReader) {
+@@ -498,15 +524,25 @@ class Connection extends EventEmitter {
      onTraceDataPush(bufferReader) {
          const reserved = bufferReader.readByte();
          const pathLen = bufferReader.readUInt8();
@@ -81,7 +108,7 @@ index 541ce73..50a3bef 100644
          });
      }
  
-@@ -586,11 +610,30 @@ class Connection extends EventEmitter {
+@@ -586,11 +622,30 @@ class Connection extends EventEmitter {
      }
  
      onDeviceInfoResponse(bufferReader) {
@@ -116,7 +143,7 @@ index 541ce73..50a3bef 100644
          });
      }
  
-@@ -2401,6 +2444,33 @@ class Connection extends EventEmitter {
+@@ -2401,6 +2456,33 @@ class Connection extends EventEmitter {
          });
      }
  
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e92d40fd7..50fcb1d71 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,7 +29,7 @@ overrides:
 patchedDependencies:
   '@jsr/meshtastic__core@2.6.6': 93604a080fa754cbde3dc78ef46ee50c2996c34d6d85720acacecfd6ebd7c652
   '@jsr/meshtastic__transport-web-serial@0.2.5': 27a2418bae8605e0e5ab6f1fcfd391abd9dc3110433da5754e934f38475dab74
-  '@liamcottle/meshcore.js@1.14.0': 3b4aec317b533236af763c913077fb9b2ba93d74e9b35a065b0b6f96d833cf11
+  '@liamcottle/meshcore.js@1.14.0': f54000776dc3e57c071056a4a29cec4a566f7f8368165ca313b147378669e39f
   debug@4.4.3: cf37fa96f5df733456b16c82c9e1c9054a92f6216692aa33d5e2e1e208888e37
   readable-stream@4.7.0: 96023d9278085d7490d08bce1a5079dd202f7782a0daa66fa81c6b1424ef8ab1
   usb@2.18.0: 6b746e2d49b9b006a88aec5bed7a13c629d7f5ba7b40e9f1e039136754c32533
@@ -128,7 +128,7 @@ importers:
         version: 10.0.1(eslint@10.8.1(jiti@2.7.0)(supports-color@8.1.1))
       '@liamcottle/meshcore.js':
         specifier: ^1.14.0
-        version: 1.14.0(patch_hash=3b4aec317b533236af763c913077fb9b2ba93d74e9b35a065b0b6f96d833cf11)(supports-color@8.1.1)
+        version: 1.14.0(patch_hash=f54000776dc3e57c071056a4a29cec4a566f7f8368165ca313b147378669e39f)(supports-color@8.1.1)
       '@meshtastic/core':
         specifier: npm:@jsr/meshtastic__core@^2.6.6
         version: '@jsr/meshtastic__core@2.6.6(patch_hash=93604a080fa754cbde3dc78ef46ee50c2996c34d6d85720acacecfd6ebd7c652)(buffer@6.0.3)'
@@ -5086,7 +5086,7 @@ snapshots:
     transitivePeerDependencies:
       - buffer
 
-  '@liamcottle/meshcore.js@1.14.0(patch_hash=3b4aec317b533236af763c913077fb9b2ba93d74e9b35a065b0b6f96d833cf11)(supports-color@8.1.1)':
+  '@liamcottle/meshcore.js@1.14.0(patch_hash=f54000776dc3e57c071056a4a29cec4a566f7f8368165ca313b147378669e39f)(supports-color@8.1.1)':
     dependencies:
       '@noble/curves': 1.9.7
       serialport: 13.0.0(supports-color@8.1.1)
diff --git a/src/renderer/components/RoomsPanel.test.tsx b/src/renderer/components/RoomsPanel.test.tsx
index 73482ed9b..d20f1971b 100644
--- a/src/renderer/components/RoomsPanel.test.tsx
+++ b/src/renderer/components/RoomsPanel.test.tsx
@@ -64,7 +64,15 @@ vi.mock('@tanstack/react-virtual', () => ({
 
 vi.mock('react-i18next', () => ({
   useTranslation: () => ({
-    t: (key: string) => key,
+    t: (key: string, opts?: Record<string, unknown>) => {
+      if (key === 'meshcore.errors.roomLogin.noRoute') {
+        return 'No route to this room server. Trace the node from the map or wait for path adverts, then try again.';
+      }
+      if (key === 'roomsPanel.autoLoginFailed' && typeof opts?.error === 'string') {
+        return `Auto-login failed: ${opts.error}`;
+      }
+      return key;
+    },
   }),
 }));
 
@@ -278,6 +286,23 @@ describe('RoomsPanel', () => {
     });
   });
 
+  it('translates meshcore roomLogin.noRoute instead of showing the raw key', async () => {
+    meshcoreClearAllRoomSessions();
+    const room = makeRoom(0x1005, 'No Route Room');
+    const nodes = new Map<number, MeshNode>([[room.node_id, room]]);
+    const onLoginRoom = vi.fn().mockRejectedValue(new Error('meshcore.errors.roomLogin.noRoute'));
+    renderRoomsPanel(nodes, { initialRoomTarget: room.node_id, onLoginRoom });
+    fireEvent.click(screen.getByText('roomsPanel.loginButton'));
+    await waitFor(() => {
+      expect(
+        screen.getByText(
+          'No route to this room server. Trace the node from the map or wait for path adverts, then try again.',
+        ),
+      ).toBeInTheDocument();
+    });
+    expect(screen.queryByText('meshcore.errors.roomLogin.noRoute')).not.toBeInTheDocument();
+  });
+
   it('allows Login with empty guest password and sends blank', async () => {
     meshcoreClearAllRoomSessions();
     const room = makeRoom(0x1004, 'Empty Guest Room');
diff --git a/src/renderer/components/RoomsPanel.tsx b/src/renderer/components/RoomsPanel.tsx
index ec8b2c85e..56f3bc7aa 100644
--- a/src/renderer/components/RoomsPanel.tsx
+++ b/src/renderer/components/RoomsPanel.tsx
@@ -44,6 +44,7 @@ import { ROOM_LOGIN_PROGRESS_DOT } from '@/renderer/lib/connectionHeaderStatus';
 import { errLikeToLogString } from '@/renderer/lib/errLikeToLogString';
 import { ICON_MD } from '@/renderer/lib/icons/iconClass';
 import { useParentIconTrigger } from '@/renderer/lib/icons/iconMotionContext';
+import { translateMeshcoreUserMessage } from '@/renderer/lib/meshcore/meshcoreMessageI18n';
 import { repairMeshcoreHydrationStaleRoomSends } from '@/renderer/lib/meshcoreDbCacheHydration';
 import {
   type MeshcoreRoomAclEntry,
@@ -1286,10 +1287,16 @@ export default function RoomsPanel({
     : 'w-full cursor-not-allowed rounded border border-gray-600 bg-gray-700 px-3 py-2 text-sm font-medium text-gray-500';
   const selectedRoomLeaveLoading =
     selectedRoomId != null && leaveLoadingRoomIds.has(selectedRoomId);
-  const loginError =
+  const loginErrorRaw =
     selectedRoomId != null ? (loginErrorsByRoom.get(selectedRoomId) ?? null) : null;
-  const leaveError =
+  const loginError = loginErrorRaw != null ? translateMeshcoreUserMessage(t, loginErrorRaw) : null;
+  const leaveErrorRaw =
     selectedRoomId != null ? (leaveErrorsByRoom.get(selectedRoomId) ?? null) : null;
+  const leaveError = leaveErrorRaw != null ? translateMeshcoreUserMessage(t, leaveErrorRaw) : null;
+  const autoLoginFailureRaw =
+    selectedRoomId != null ? getMeshcoreRoomAutoLoginFailure(selectedRoomId) : null;
+  const autoLoginFailureDisplay =
+    autoLoginFailureRaw != null ? translateMeshcoreUserMessage(t, autoLoginFailureRaw) : null;
   const canPost = selectedRoomId != null && meshcoreRoomCanPost(selectedRoomId);
   const sessionRole = selectedRoomId != null ? meshcoreGetRoomSession(selectedRoomId)?.role : null;
   const selectedRoomSecretsSummary =
@@ -1756,10 +1763,10 @@ export default function RoomsPanel({
                   {t('roomsPanel.continueReadOnly')}
                 </button>
                 {loginError && <p className="text-sm text-red-400">{loginError}</p>}
-                {getMeshcoreRoomAutoLoginFailure(selectedRoomId) && !loginError && (
+                {autoLoginFailureDisplay && !loginError && (
                   <p className="text-sm text-red-400" role="alert">
                     {t('roomsPanel.autoLoginFailed', {
-                      error: getMeshcoreRoomAutoLoginFailure(selectedRoomId),
+                      error: autoLoginFailureDisplay,
                     })}
                   </p>
                 )}
diff --git a/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts b/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
index 889d5df11..93931cb71 100644
--- a/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
+++ b/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
@@ -103,3 +103,46 @@ describe('syncMeshcoreRoomContactPathBeforeLogin', () => {
     expect(addOrUpdateContact).toHaveBeenCalled();
   });
 });
+
+describe('resetMeshcoreRoomCompanionSyncSinceForCatchUp', () => {
+  it('skips when remove/add APIs are missing', async () => {
+    const pubKey = makePubKey(2);
+    const conn = { getContacts: vi.fn(), setContactPath: vi.fn() };
+    const { resetMeshcoreRoomCompanionSyncSinceForCatchUp } =
+      await import('./meshcoreRoomLoginPathSync');
+    await expect(
+      resetMeshcoreRoomCompanionSyncSinceForCatchUp(conn, pubkeyToNodeId(pubKey), pubKey),
+    ).resolves.toBe('skipped');
+  });
+
+  it('remove+readds room contact to zero companion sync_since', async () => {
+    const pubKey = makePubKey(0x40);
+    const nodeId = pubkeyToNodeId(pubKey);
+    const contact: MeshCoreContactRaw = {
+      publicKey: pubKey,
+      type: 3,
+      flags: 0,
+      outPathLen: 0,
+      outPath: new Uint8Array(64),
+      advName: 'CatchUp Room',
+      lastAdvert: 1,
+      advLat: 0,
+      advLon: 0,
+    };
+    const removeContact = vi.fn().mockResolvedValue(undefined);
+    const addOrUpdateContact = vi.fn().mockResolvedValue(undefined);
+    const conn = {
+      getContacts: vi.fn().mockResolvedValue([contact]),
+      setContactPath: vi.fn(),
+      removeContact,
+      addOrUpdateContact,
+    };
+    const { resetMeshcoreRoomCompanionSyncSinceForCatchUp } =
+      await import('./meshcoreRoomLoginPathSync');
+    await expect(resetMeshcoreRoomCompanionSyncSinceForCatchUp(conn, nodeId, pubKey)).resolves.toBe(
+      'reset',
+    );
+    expect(removeContact).toHaveBeenCalledWith(pubKey);
+    expect(addOrUpdateContact).toHaveBeenCalled();
+  });
+});
diff --git a/src/renderer/lib/meshcoreRoomLoginPathSync.ts b/src/renderer/lib/meshcoreRoomLoginPathSync.ts
index 67e35279a..d01e1fad1 100644
--- a/src/renderer/lib/meshcoreRoomLoginPathSync.ts
+++ b/src/renderer/lib/meshcoreRoomLoginPathSync.ts
@@ -26,6 +26,62 @@ export interface MeshcoreRoomLoginPathSyncConn {
     advLat: number,
     advLon: number,
   ): Promise<void>;
+  removeContact?(pubKey: Uint8Array): Promise<void>;
+}
+
+/**
+ * Force companion `ContactInfo.sync_since = 0` so room login requests the ring-buffer catch-up.
+ * Firmware only zeroes sync_since on *new* contacts; updates preserve the watermark.
+ * Failure point: remove/re-add fails — caller continues login (may still get live posts).
+ */
+export async function resetMeshcoreRoomCompanionSyncSinceForCatchUp(
+  conn: MeshcoreRoomLoginPathSyncConn,
+  nodeId: number,
+  pubKey: Uint8Array,
+): Promise<'reset' | 'skipped' | 'failed'> {
+  if (!conn.removeContact || !conn.addOrUpdateContact) return 'skipped';
+  let contact: MeshCoreContactRaw | undefined;
+  try {
+    const contacts = await withTimeout(
+      conn.getContacts(),
+      MESHCORE_ROOM_LOGIN_PATH_SYNC_TIMEOUT_MS,
+      'meshcoreRoomSyncSinceResetGetContacts',
+    );
+    contact = findRadioContact(contacts, nodeId);
+  } catch {
+    // catch-no-log-ok getContacts timeout/failure — caller treats 'failed' and continues login
+    return 'failed';
+  }
+  if (!contact) return 'skipped';
+  try {
+    await withTimeout(
+      conn.removeContact(pubKey),
+      MESHCORE_ROOM_LOGIN_PATH_SYNC_TIMEOUT_MS,
+      'meshcoreRoomSyncSinceResetRemove',
+    );
+    await withTimeout(
+      conn.addOrUpdateContact(
+        pubKey,
+        contact.type,
+        contact.flags,
+        contact.outPathLen ?? 0,
+        contact.outPath instanceof Uint8Array ? contact.outPath : new Uint8Array(64),
+        contact.advName,
+        contact.lastAdvert,
+        contact.advLat,
+        contact.advLon,
+      ),
+      MESHCORE_ROOM_LOGIN_PATH_SYNC_TIMEOUT_MS,
+      'meshcoreRoomSyncSinceResetAdd',
+    );
+    return 'reset';
+  } catch (e: unknown) {
+    console.warn(
+      '[meshcoreRoomLoginPathSync] sync_since catch-up reset failed ' +
+        (e instanceof Error ? e.message : String(e)),
+    );
+    return 'failed';
+  }
 }
 
 function packContactOutPath(path: Uint8Array): Uint8Array {
diff --git a/src/renderer/lib/meshcoreRoomLoginQueue.test.ts b/src/renderer/lib/meshcoreRoomLoginQueue.test.ts
index 8b65fef7a..5c52600a8 100644
--- a/src/renderer/lib/meshcoreRoomLoginQueue.test.ts
+++ b/src/renderer/lib/meshcoreRoomLoginQueue.test.ts
@@ -78,4 +78,26 @@ describe('meshcoreRoomLoginQueue', () => {
       name: 'AbortError',
     });
   });
+
+  it('new enqueue after cancel of active login is not sticky-skipped', async () => {
+    let releaseFirst: (() => void) | undefined;
+    const firstGate = new Promise<void>((resolve) => {
+      releaseFirst = resolve;
+    });
+    const first = enqueueMeshcoreRoomLogin(42, async () => {
+      await firstGate;
+    });
+    await Promise.resolve();
+    expect(getMeshcoreRoomLoginQueueSnapshot().activeNodeId).toBe(42);
+
+    // Cancel while active: abort path marks skipped even though the job already started.
+    dequeueMeshcoreRoomLogin(42);
+    releaseFirst?.();
+    await expect(first).resolves.toBeUndefined();
+
+    const ran = vi.fn(() => Promise.resolve());
+    const third = enqueueMeshcoreRoomLogin(42, ran);
+    await expect(third).resolves.toBeUndefined();
+    expect(ran).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/src/renderer/lib/meshcoreRoomLoginQueue.ts b/src/renderer/lib/meshcoreRoomLoginQueue.ts
index e89fd6594..59c7ce131 100644
--- a/src/renderer/lib/meshcoreRoomLoginQueue.ts
+++ b/src/renderer/lib/meshcoreRoomLoginQueue.ts
@@ -53,12 +53,16 @@ export function meshcoreRoomLoginQueueSize(): number {
  * Failure point: prior jobs block the queue — callers should not assume immediate start.
  */
 export function enqueueMeshcoreRoomLogin(nodeId: number, run: () => Promise<void>): Promise<void> {
+  // A new enqueue means the user wants another attempt. Clear a leftover skip from
+  // canceling an *active* login (dequeue marks skipped even when the job already started).
+  skippedNodeIds.delete(nodeId);
   pendingNodeIds.add(nodeId);
   notifyQueueChanged();
 
   const job = chain.then(async () => {
     pendingNodeIds.delete(nodeId);
-    if (skippedNodeIds.has(nodeId)) {
+    const wasSkipped = skippedNodeIds.has(nodeId);
+    if (wasSkipped) {
       skippedNodeIds.delete(nodeId);
       throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
     }
diff --git a/src/renderer/lib/meshcoreRoomLoginRpc.ts b/src/renderer/lib/meshcoreRoomLoginRpc.ts
index fff6cb109..1d77a58db 100644
--- a/src/renderer/lib/meshcoreRoomLoginRpc.ts
+++ b/src/renderer/lib/meshcoreRoomLoginRpc.ts
@@ -126,7 +126,7 @@ export function runMeshcoreRoomLogin(
         return;
       }
       console.debug(
-        `[meshcoreRoomLoginRpc] LoginSuccess prefix=${prefixToHex(prefix)} permissions=${String(r.permissions ?? r.reserved ?? 'n/a')}`,
+        `[meshcoreRoomLoginRpc] LoginSuccess prefix=${prefixToHex(prefix)} reserved=${String(r.reserved ?? 'n/a')} permissions=${String(r.permissions ?? 'n/a')}`,
       );
       succeed(r);
     };
diff --git a/src/renderer/lib/meshcoreRoomSession.test.ts b/src/renderer/lib/meshcoreRoomSession.test.ts
index 9ce28811b..2345d4780 100644
--- a/src/renderer/lib/meshcoreRoomSession.test.ts
+++ b/src/renderer/lib/meshcoreRoomSession.test.ts
@@ -108,9 +108,27 @@ describe('meshcoreRoomSession', () => {
     expect(meshcoreRoomCanPost(42)).toBe(true);
   });
 
-  it('login uses meshcore.js reserved ACL byte over empty-password hint', async () => {
+  it('login maps legacy reserved=0 (non-guest) to read-write when ACL byte absent', async () => {
+    meshcoreClearAllRoomSessions();
+    // Companion data[6]: 0 = not guest (read-write or read-only ACL); without permissions, treat as RW.
+    mockRunMeshcoreRoomLogin.mockResolvedValue({ reserved: 0 });
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    await meshcoreRoomLogin(conn, 42, pubKey, 'hello', {
+      guestPassword: 'hello',
+      adminPassword: '',
+    });
+    expect(meshcoreGetRoomSession(42)?.role).toBe('readwrite');
+    expect(meshcoreRoomCanPost(42)).toBe(true);
+  });
+
+  it('login maps legacy reserved=2 (guest hint) to read-only when ACL byte absent', async () => {
     meshcoreClearAllRoomSessions();
-    // Empty password hint would be readonly; reserved=2 (read-write) must win.
     mockRunMeshcoreRoomLogin.mockResolvedValue({ reserved: 2 });
     const conn = {
       on: vi.fn(),
@@ -123,13 +141,14 @@ describe('meshcoreRoomSession', () => {
       guestPassword: '',
       adminPassword: '',
     });
-    expect(meshcoreGetRoomSession(42)?.role).toBe('readwrite');
-    expect(meshcoreRoomCanPost(42)).toBe(true);
+    expect(meshcoreGetRoomSession(42)?.role).toBe('readonly');
+    expect(meshcoreRoomCanPost(42)).toBe(false);
   });
 
-  it('login treats reserved guest ACL as read-only', async () => {
+  it('login prefers permissions ACL over legacy reserved flag', async () => {
     meshcoreClearAllRoomSessions();
-    mockRunMeshcoreRoomLogin.mockResolvedValue({ reserved: 0 });
+    // reserved=0 looks like RW legacy; permissions=0 is true guest ACL.
+    mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: 0, reserved: 0 });
     const conn = {
       on: vi.fn(),
       off: vi.fn(),
@@ -162,6 +181,24 @@ describe('meshcoreRoomSession', () => {
     expect(meshcoreGetRoomSession(42)?.role).toBe('admin');
   });
 
+  it('login with permissions=2 grants read-write (hello guest password)', async () => {
+    meshcoreClearAllRoomSessions();
+    mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: 2, reserved: 0 });
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    await meshcoreRoomLogin(conn, 42, pubKey, 'hello', {
+      guestPassword: 'hello',
+      adminPassword: '',
+    });
+    expect(meshcoreGetRoomSession(42)?.role).toBe('readwrite');
+    expect(meshcoreRoomCanPost(42)).toBe(true);
+  });
+
   it('skips relogin when already logged in without forceRelogin', async () => {
     meshcoreClearAllRoomSessions();
     mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: 2 });
diff --git a/src/renderer/lib/meshcoreRoomSession.ts b/src/renderer/lib/meshcoreRoomSession.ts
index 234c238e6..ae1f40dc3 100644
--- a/src/renderer/lib/meshcoreRoomSession.ts
+++ b/src/renderer/lib/meshcoreRoomSession.ts
@@ -212,9 +212,20 @@ function roleFromPermissionsByte(permissions: number): MeshcoreRoomRole {
   if (roleBits === MESHCORE_ROOM_PERM_ADMIN) return 'admin';
   if (roleBits === MESHCORE_ROOM_PERM_READ_WRITE) return 'readwrite';
   if (roleBits === MESHCORE_ROOM_PERM_GUEST) return 'readonly';
+  // PERM_ACL_READ_ONLY (1) and unknown → read-only UI.
   return 'readonly';
 }
 
+/**
+ * Companion `LoginSuccess.reserved` is the legacy data[6] flag from room/repeater login OK —
+ * NOT PERM_ACL_*. Firmware: admin→1, guest(perm==0)→2, otherwise→0 (includes read-write).
+ */
+function roleFromLegacyLoginFlag(legacyFlag: number): MeshcoreRoomRole {
+  if (legacyFlag === 1) return 'admin';
+  if (legacyFlag === 2) return 'readonly';
+  return 'readwrite';
+}
+
 function roleFromPasswordHint(
   password: string,
   adminPassword: string,
@@ -227,19 +238,38 @@ function roleFromPasswordHint(
   return 'readwrite';
 }
 
-/** Prefer `permissions`; meshcore.js LoginSuccess puts the ACL byte in `reserved`. */
-function parseLoginResponsePermissions(response: unknown): number | null {
+/**
+ * Prefer v7+ `permissions` (PERM_ACL_*). Do not treat `reserved` as ACL — that byte is the
+ * legacy admin/guest hint (0=RW, 1=admin, 2=guest) and inverts read-write vs guest.
+ */
+export function parseLoginResponsePermissions(response: unknown): number | null {
   if (!response || typeof response !== 'object') return null;
   const r = response as Record<string, unknown>;
   if (typeof r.permissions === 'number' && Number.isFinite(r.permissions)) {
     return r.permissions & 0xff;
   }
-  if (typeof r.reserved === 'number' && Number.isFinite(r.reserved)) {
-    return r.reserved & 0xff;
-  }
   return null;
 }
 
+export function resolveMeshcoreRoomLoginRole(
+  response: unknown,
+  password: string,
+  adminPassword: string,
+  guestPassword: string,
+): MeshcoreRoomRole {
+  const permByte = parseLoginResponsePermissions(response);
+  if (permByte != null) {
+    return roleFromPermissionsByte(permByte);
+  }
+  if (response && typeof response === 'object') {
+    const reserved = (response as Record<string, unknown>).reserved;
+    if (typeof reserved === 'number' && Number.isFinite(reserved)) {
+      return roleFromLegacyLoginFlag(reserved & 0xff);
+    }
+  }
+  return roleFromPasswordHint(password, adminPassword, guestPassword);
+}
+
 export function meshcoreApplyRoomSession(
   nodeId: number,
   params: {
@@ -359,11 +389,12 @@ export async function meshcoreRoomLogin(
             signal,
           });
           throwIfRoomLoginAborted(signal);
-          const permByte = parseLoginResponsePermissions(response);
-          const role =
-            permByte != null
-              ? roleFromPermissionsByte(permByte)
-              : roleFromPasswordHint(password, adminPassword, guestPassword);
+          const role = resolveMeshcoreRoomLoginRole(
+            response,
+            password,
+            adminPassword,
+            guestPassword,
+          );
           const lastPostMs = getMeshcoreRoomLastPostAt(nodeId);
           meshcoreApplyRoomSession(nodeId, {
             guestPassword,
diff --git a/src/renderer/lib/meshcoreUtils.test.ts b/src/renderer/lib/meshcoreUtils.test.ts
index 2d8942603..057f9aa0d 100644
--- a/src/renderer/lib/meshcoreUtils.test.ts
+++ b/src/renderer/lib/meshcoreUtils.test.ts
@@ -498,7 +498,7 @@ describe('meshcoreInferHopsFromOutPath', () => {
 });
 
 describe('resolveMeshcoreRoomLoginHopsAway', () => {
-  it('prefers positive hops_away on the node', () => {
+  it('prefers positive hops_away when a multi-hop path exists', () => {
     expect(resolveMeshcoreRoomLoginHopsAway({ hops_away: 4 }, new Uint8Array([1, 2]))).toBe(4);
   });
 
@@ -510,6 +510,11 @@ describe('resolveMeshcoreRoomLoginHopsAway', () => {
   it('returns 0 for direct room with no path', () => {
     expect(resolveMeshcoreRoomLoginHopsAway({ hops_away: 0 }, undefined)).toBe(0);
   });
+
+  it('ignores sticky UI hops when outPath is empty (0-hop SendLogin)', () => {
+    expect(resolveMeshcoreRoomLoginHopsAway({ hops_away: 1 }, undefined)).toBe(0);
+    expect(resolveMeshcoreRoomLoginHopsAway({ hops_away: 3 }, new Uint8Array())).toBe(0);
+  });
 });
 
 describe('meshcoreMergeContactHopsAwayFromPrevious', () => {
diff --git a/src/renderer/lib/meshcoreUtils.ts b/src/renderer/lib/meshcoreUtils.ts
index 2c4b08d17..19f3b2814 100644
--- a/src/renderer/lib/meshcoreUtils.ts
+++ b/src/renderer/lib/meshcoreUtils.ts
@@ -562,15 +562,18 @@ export function meshcoreInferHopsFromOutPath(contact: {
 }
 
 /**
- * Hop count for room login timeout scaling when UI `hops_away` is 0/unknown but a route exists.
- * Failure point: firmware reports direct (0 hops) while `outPath` still holds multi-hop bytes.
+ * Hop count for room login path/timeout decisions.
+ * Prefer route bytes when UI reports 0 but `outPath` still holds multi-hop path.
+ * Do not trust sticky UI `hops_away > 0` alone with an empty path — that blocks 0-hop
+ * SendLogin (noRoute) for rooms that are actually direct (contact merge keeps old hops).
  */
 export function resolveMeshcoreRoomLoginHopsAway(
   node: Pick<MeshNode, 'hops_away'> | undefined,
   outPathBytes?: Uint8Array,
 ): number {
   const hops = node?.hops_away;
-  if (typeof hops === 'number' && Number.isFinite(hops) && hops > 0) {
+  const hasMultiHopPath = Boolean(outPathBytes && outPathBytes.length > 1);
+  if (typeof hops === 'number' && Number.isFinite(hops) && hops > 0 && hasMultiHopPath) {
     return Math.trunc(hops);
   }
   if (outPathBytes && outPathBytes.length > 0) {
@@ -582,6 +585,10 @@ export function resolveMeshcoreRoomLoginHopsAway(
       return Math.max(1, outPathBytes.length - 1);
     }
   }
+  // Sticky multi-hop with no route bytes → treat as direct for login.
+  if (typeof hops === 'number' && Number.isFinite(hops) && hops >= 0 && !hasMultiHopPath) {
+    return 0;
+  }
   if (typeof hops === 'number' && Number.isFinite(hops) && hops >= 0) {
     return Math.trunc(hops);
   }
diff --git a/src/renderer/locales/cs/translation.json b/src/renderer/locales/cs/translation.json
index eeeb0d05c..4f7d8738a 100644
--- a/src/renderer/locales/cs/translation.json
+++ b/src/renderer/locales/cs/translation.json
@@ -4539,7 +4539,7 @@
     "legendNotSavedTooltip": "Prázdný kruh — pro tuto místnost není uloženo žádné heslo",
     "legendSavedTooltip": "Modrý polokruh — heslo uloženo; přihlaste se pro otevření relace",
     "legendLoggedInTooltip": "Zelená tečka — aktivní relace klienta (opuste místnost, pokud je server offline)",
-    "historyLocalHint": "Příspěvky se zobrazují pouze, když jste na tomto zařízení přihlášeni do této místnosti. Povolte automatickou synchronizaci, abyste zůstali přihlášeni k odběru; historie není zaplněna z pokojového serveru.",
+    "historyLocalHint": "Při přihlášení mesh-client vyžádá nedávné příspěvky stále v kruhové vyrovnávací paměti serveru místnosti (pokud toto zařízení ještě nemá místní vodoznak). Povolte automatickou synchronizaci, abyste zůstali přihlášeni k odběru při připojení.",
     "loginAllSavedDisabledNoSavedPasswords": "Pro použití všech přihlašovacích údajů si nejprve uložte heslo místnosti",
     "membersHeadingWithCount": "Členové ({{count}})",
     "collapseRoomList": "Sbalit seznam místností",
diff --git a/src/renderer/locales/de/translation.json b/src/renderer/locales/de/translation.json
index 1f2e3a6a8..68b012f2d 100644
--- a/src/renderer/locales/de/translation.json
+++ b/src/renderer/locales/de/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "Leerer Kreis — kein Passwort für diesen Raum gespeichert",
     "legendSavedTooltip": "Himmelblauer Halbkreis — Passwort gespeichert; melden Sie sich an, um eine Sitzung zu öffnen",
     "legendLoggedInTooltip": "Grüner Punkt — aktive Client-Sitzung (Raum verlassen, wenn der Server offline ist)",
-    "historyLocalHint": "Beiträge werden nur angezeigt, wenn Sie auf diesem Gerät in diesem Raum angemeldet sind. Aktivieren Sie die automatische Synchronisierung, um abonniert zu bleiben; der Verlauf wird nicht vom Raumserver zurückgegeben.",
+    "historyLocalHint": "Bei der Anmeldung fordert mesh-client aktuelle Beiträge an, die noch im Ringpuffer des Raumservers liegen (wenn dieses Gerät noch kein lokales Wasserzeichen hat). Aktivieren Sie die automatische Synchronisierung, um bei Verbindung abonniert zu bleiben.",
     "loginAllSavedDisabledNoSavedPasswords": "Speichern Sie zuerst ein Raumpasswort, um alle Anmeldedaten zu verwenden",
     "membersHeadingWithCount": "Mitglieder ({{count}})",
     "collapseRoomList": "Raumliste ausblenden",
diff --git a/src/renderer/locales/en/translation.json b/src/renderer/locales/en/translation.json
index 59f12db2d..d19080efd 100644
--- a/src/renderer/locales/en/translation.json
+++ b/src/renderer/locales/en/translation.json
@@ -4844,7 +4844,7 @@
     "rememberPassword": "Remember password",
     "autoSync": "Auto-sync",
     "autoSyncTooltip": "Periodically re-login to fetch new posts when the radio is connected",
-    "historyLocalHint": "Posts appear only while you are logged in to this room on this device. Enable Auto-sync to stay subscribed; history is not backfilled from the room server.",
+    "historyLocalHint": "On login, mesh-client requests recent posts still in the room server ring buffer (when this device has no local watermark yet). Enable Auto-sync to stay subscribed while connected.",
     "syncIntervalLabel": "Sync interval",
     "syncInterval60": "Every 60 minutes",
     "syncInterval120": "Every 2 hours",
diff --git a/src/renderer/locales/es/translation.json b/src/renderer/locales/es/translation.json
index 174ef153d..9b1124284 100644
--- a/src/renderer/locales/es/translation.json
+++ b/src/renderer/locales/es/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "Círculo vacío — no hay contraseña almacenada para esta sala",
     "legendSavedTooltip": "Semicírculo celeste — contraseña guardada; inicia sesión para abrir una sesión",
     "legendLoggedInTooltip": "Punto verde — sesión de cliente activa (abandona la sala si el servidor está fuera de línea)",
-    "historyLocalHint": "Las publicaciones solo aparecen mientras está conectado a esta sala en este dispositivo. Habilite la sincronización automática para permanecer suscrito; el historial no se rellena desde el servidor de la sala.",
+    "historyLocalHint": "Al iniciar sesión, mesh-client solicita publicaciones recientes que aún estén en el búfer circular del servidor de la sala (cuando este dispositivo aún no tiene marca de agua local). Habilite la sincronización automática para permanecer suscrito mientras esté conectado.",
     "loginAllSavedDisabledNoSavedPasswords": "Guarde primero una contraseña de sala para usar el inicio de sesión en todo",
     "membersHeadingWithCount": "Miembros ({{count}})",
     "collapseRoomList": "Contraer lista de salas",
diff --git a/src/renderer/locales/fr/translation.json b/src/renderer/locales/fr/translation.json
index 25f633e2a..d2fe4c662 100644
--- a/src/renderer/locales/fr/translation.json
+++ b/src/renderer/locales/fr/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "Cercle vide — aucun mot de passe stocké pour cette salle",
     "legendSavedTooltip": "Demi-cercle bleu ciel — mot de passe enregistré ; connectez-vous pour ouvrir une session",
     "legendLoggedInTooltip": "Point vert — session client active (quittez la salle si le serveur est hors ligne)",
-    "historyLocalHint": "Les publications n'apparaissent que lorsque vous êtes connecté à cette pièce sur cet appareil. Activez la synchronisation automatique pour rester abonné ; l'historique n'est pas remblayé à partir du serveur de la salle.",
+    "historyLocalHint": "À la connexion, mesh-client demande les publications récentes encore présentes dans le tampon circulaire du serveur de salle (lorsque cet appareil n’a pas encore de filigrane local). Activez la synchronisation automatique pour rester abonné pendant la connexion.",
     "loginAllSavedDisabledNoSavedPasswords": "Enregistrez d'abord un mot de passe de pièce pour utiliser la connexion tout",
     "membersHeadingWithCount": "Membres ({{count}})",
     "collapseRoomList": "Réduire la liste des salles",
diff --git a/src/renderer/locales/id/translation.json b/src/renderer/locales/id/translation.json
index 3ea32ffb4..529198681 100644
--- a/src/renderer/locales/id/translation.json
+++ b/src/renderer/locales/id/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "Lingkaran kosong — tidak ada kata sandi yang disimpan untuk ruangan ini",
     "legendSavedTooltip": "Setengah lingkaran biru langit — kata sandi disimpan; masuk untuk membuka sesi",
     "legendLoggedInTooltip": "Titik hijau — sesi klien aktif (tinggalkan ruangan jika server offline)",
-    "historyLocalHint": "Pos hanya muncul saat Anda masuk ke ruangan ini di perangkat ini. Aktifkan Sinkronisasi otomatis untuk tetap berlangganan; riwayat tidak diisi ulang dari server ruangan.",
+    "historyLocalHint": "Saat login, mesh-client meminta pos terbaru yang masih ada di buffer cincin server ruangan (ketika perangkat ini belum punya watermark lokal). Aktifkan Sinkronisasi otomatis agar tetap berlangganan saat terhubung.",
     "loginAllSavedDisabledNoSavedPasswords": "Simpan kata sandi ruangan terlebih dahulu untuk menggunakan log masuk semua",
     "membersHeadingWithCount": "Anggota ({{count}})",
     "collapseRoomList": "Ciutkan daftar ruangan",
diff --git a/src/renderer/locales/it/translation.json b/src/renderer/locales/it/translation.json
index 9273f7f27..a056cb254 100644
--- a/src/renderer/locales/it/translation.json
+++ b/src/renderer/locales/it/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "Cerchio vuoto — nessuna password memorizzata per questa stanza",
     "legendSavedTooltip": "Semicerchio azzurro — password memorizzata; accedi per aprire una sessione",
     "legendLoggedInTooltip": "Punto verde — sessione client attiva (esci dalla stanza se il server è offline)",
-    "historyLocalHint": "I post vengono visualizzati solo quando si è connessi a questa stanza su questo dispositivo. Abilita la sincronizzazione automatica per rimanere iscritto; la cronologia non viene riempita dal server della stanza.",
+    "historyLocalHint": "All’accesso, mesh-client richiede i post recenti ancora presenti nel buffer ad anello del server della stanza (quando questo dispositivo non ha ancora una filigrana locale). Abilita la sincronizzazione automatica per rimanere iscritto mentre sei connesso.",
     "loginAllSavedDisabledNoSavedPasswords": "Salva prima una password della stanza per utilizzare l'accesso a tutti",
     "membersHeadingWithCount": "Membri ({{count}})",
     "collapseRoomList": "Comprimi l'elenco delle sale",
diff --git a/src/renderer/locales/ja/translation.json b/src/renderer/locales/ja/translation.json
index 79d97953f..ac0bc4f21 100644
--- a/src/renderer/locales/ja/translation.json
+++ b/src/renderer/locales/ja/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "空の円—このルームにはパスワードが保存されていません",
     "legendSavedTooltip": "空色の半円 — パスワード保存済み。ログインしてセッションを開く",
     "legendLoggedInTooltip": "緑の点 — アクティブなクライアントセッション（サーバーがオフラインの場合はルームを退出）",
-    "historyLocalHint": "投稿は、このデバイスでこのルームにログインしている間にのみ表示されます。自動同期を有効にして購読したままにします。履歴はルームサーバーから埋め戻されません。",
+    "historyLocalHint": "ログイン時、mesh-client はこのデバイスにまだローカルのウォーターマークがない場合、ルームサーバーのリングバッファに残っている最近の投稿を要求します。接続中に購読を維持するには自動同期を有効にしてください。",
     "loginAllSavedDisabledNoSavedPasswords": "すべてログインするには、まずルームパスワードを保存してください",
     "membersHeadingWithCount": "メンバー（ {{count}} ）",
     "collapseRoomList": "ルームリストを折りたたむ",
diff --git a/src/renderer/locales/ko/translation.json b/src/renderer/locales/ko/translation.json
index 462c28375..62b8671a2 100644
--- a/src/renderer/locales/ko/translation.json
+++ b/src/renderer/locales/ko/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "빈 원 — 이 룸에 대한 비밀번호가 저장되지 않음",
     "legendSavedTooltip": "하늘 반원 — 비밀번호가 저장되었습니다. 로그인하여 세션을 여세요",
     "legendLoggedInTooltip": "녹색 점 — 활성 클라이언트 세션 (서버가 오프라인이면 룸을 나가세요)",
-    "historyLocalHint": "게시물은 이 기기에서 이 룸에 로그인한 경우에만 표시됩니다. 자동 동기화를 활성화하여 구독 상태를 유지하세요. 기록은 룸 서버에서 채워지지 않습니다.",
+    "historyLocalHint": "로그인 시 mesh-client는 이 기기에 아직 로컬 워터마크가 없을 때 룸 서버 링 버퍼에 남아 있는 최근 게시물을 요청합니다. 연결된 동안 구독을 유지하려면 자동 동기화를 활성화하세요.",
     "loginAllSavedDisabledNoSavedPasswords": "전체 로그인을 사용하려면 먼저 룸 비밀번호를 저장하세요.",
     "membersHeadingWithCount": "회원 ({{count}})",
     "collapseRoomList": "방 목록 접기",
diff --git a/src/renderer/locales/nl/translation.json b/src/renderer/locales/nl/translation.json
index 0eae033af..bd9b96641 100644
--- a/src/renderer/locales/nl/translation.json
+++ b/src/renderer/locales/nl/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "Lege cirkel — geen wachtwoord opgeslagen voor deze ruimte",
     "legendSavedTooltip": "Lichtblauwe halve cirkel — wachtwoord opgeslagen; log in om een sessie te openen",
     "legendLoggedInTooltip": "Groene stip — actieve clientsessie (verlaat de ruimte als de server offline is)",
-    "historyLocalHint": "Berichten worden alleen weergegeven terwijl u bent ingelogd in deze ruimte op dit apparaat. Schakel automatisch synchroniseren in om geabonneerd te blijven; de geschiedenis wordt niet opnieuw ingevuld vanaf de roomserver.",
+    "historyLocalHint": "Bij het inloggen vraagt mesh-client recente berichten op die nog in de ringbuffer van de roomserver staan (wanneer dit apparaat nog geen lokaal watermerk heeft). Schakel automatisch synchroniseren in om geabonneerd te blijven terwijl u verbonden bent.",
     "loginAllSavedDisabledNoSavedPasswords": "Sla eerst een ruimtewachtwoord op om alles in te loggen",
     "membersHeadingWithCount": "Leden ({{count}})",
     "collapseRoomList": "Ruimtelijst samenvouwen",
diff --git a/src/renderer/locales/pl/translation.json b/src/renderer/locales/pl/translation.json
index 644b66b68..fcf589d07 100644
--- a/src/renderer/locales/pl/translation.json
+++ b/src/renderer/locales/pl/translation.json
@@ -4541,7 +4541,7 @@
     "legendNotSavedTooltip": "Pusty okrąg — nie zapisano hasła do tego pokoju",
     "legendSavedTooltip": "Niebieski półokrąg — hasło zapisane; zaloguj się, aby otworzyć sesję",
     "legendLoggedInTooltip": "Zielona kropka — aktywna sesja klienta (opuść pokój, jeśli serwer jest offline)",
-    "historyLocalHint": "Wpisy pojawiają się tylko wtedy, gdy jesteś zalogowany do tego pokoju na tym urządzeniu. Włącz automatyczną synchronizację, aby pozostać subskrybentem; historia nie jest uzupełniana z serwera pokojowego.",
+    "historyLocalHint": "Po zalogowaniu mesh-client żąda ostatnich wpisów nadal znajdujących się w buforze pierścieniowym serwera pokoju (gdy to urządzenie nie ma jeszcze lokalnego znaku wodnego). Włącz automatyczną synchronizację, aby pozostać subskrybentem podczas połączenia.",
     "loginAllSavedDisabledNoSavedPasswords": "Najpierw zapisz hasło do pokoju, aby użyć log in all",
     "membersHeadingWithCount": "Członkowie ({{count}})",
     "collapseRoomList": "Zwiń listę pokoi",
diff --git a/src/renderer/locales/pt-BR/translation.json b/src/renderer/locales/pt-BR/translation.json
index f3facb5d8..2e67e1964 100644
--- a/src/renderer/locales/pt-BR/translation.json
+++ b/src/renderer/locales/pt-BR/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "Círculo vazio — nenhuma senha armazenada para esta sala",
     "legendSavedTooltip": "Meio círculo azul-céu — senha armazenada; faça login para abrir uma sessão",
     "legendLoggedInTooltip": "Ponto verde — sessão ativa do cliente (saia da sala se o servidor estiver offline)",
-    "historyLocalHint": "As postagens aparecem apenas enquanto você está conectado a esta sala neste dispositivo. Ative a sincronização automática para permanecer subscrito; o histórico não é preenchido a partir do servidor da sala.",
+    "historyLocalHint": "Ao entrar, o mesh-client solicita publicações recentes ainda no buffer circular do servidor da sala (quando este dispositivo ainda não tem marca d’água local). Ative a sincronização automática para permanecer subscrito enquanto estiver conectado.",
     "loginAllSavedDisabledNoSavedPasswords": "Salve uma senha de sala primeiro para usar o login em todos",
     "membersHeadingWithCount": "Membros ({{count}})",
     "collapseRoomList": "Recolher lista de salas",
diff --git a/src/renderer/locales/ru/translation.json b/src/renderer/locales/ru/translation.json
index 0d7737b2a..307bfea40 100644
--- a/src/renderer/locales/ru/translation.json
+++ b/src/renderer/locales/ru/translation.json
@@ -4539,7 +4539,7 @@
     "legendNotSavedTooltip": "Пустой круг — пароль для этой комнаты не сохранен",
     "legendSavedTooltip": "Полукруг неба — пароль сохранен; войдите, чтобы открыть сессию",
     "legendLoggedInTooltip": "Зелёная точка — активная клиентская сессия (покиньте комнату, если сервер не в сети)",
-    "historyLocalHint": "Публикации появляются только при входе в эту комнату на этом устройстве. Включите автоматическую синхронизацию, чтобы оставаться подписанным; история не заполняется с сервера комнаты.",
+    "historyLocalHint": "При входе mesh-client запрашивает недавние публикации, ещё находящиеся в кольцевом буфере сервера комнаты (если на этом устройстве ещё нет локальной метки). Включите автоматическую синхронизацию, чтобы оставаться подписанным во время подключения.",
     "loginAllSavedDisabledNoSavedPasswords": "Сначала сохраните пароль комнаты, чтобы использовать вход во все",
     "membersHeadingWithCount": "Участники ({{count}})",
     "collapseRoomList": "Свернуть список комнат",
diff --git a/src/renderer/locales/tr/translation.json b/src/renderer/locales/tr/translation.json
index f21d09097..84be787f0 100644
--- a/src/renderer/locales/tr/translation.json
+++ b/src/renderer/locales/tr/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "Boş daire — bu oda için saklanan parola yok",
     "legendSavedTooltip": "Gökyüzü yarım daire — parola saklanır; bir oturumu açmak için oturum açın",
     "legendLoggedInTooltip": "Yeşil nokta — aktif istemci oturumu (sunucu çevrimdışıysa odayı terk edin)",
-    "historyLocalHint": "Gönderiler yalnızca bu cihazda bu odaya giriş yaptığınızda görünür. Abone kalmak için Otomatik senkronizasyonu etkinleştirin; geçmiş oda sunucusundan doldurulmaz.",
+    "historyLocalHint": "Girişte mesh-client, bu cihazda henüz yerel filigran yokken oda sunucusu halka belleğinde kalan son gönderileri ister. Bağlıyken abone kalmak için Otomatik senkronizasyonu etkinleştirin.",
     "loginAllSavedDisabledNoSavedPasswords": "Tüm oturum açma bilgilerini kullanmak için önce bir oda parolasını kaydedin",
     "membersHeadingWithCount": "Üyeler ({{count}})",
     "collapseRoomList": "Oda listesini daralt",
diff --git a/src/renderer/locales/uk/translation.json b/src/renderer/locales/uk/translation.json
index d0a789c1b..8c64ed1c8 100644
--- a/src/renderer/locales/uk/translation.json
+++ b/src/renderer/locales/uk/translation.json
@@ -4539,7 +4539,7 @@
     "legendNotSavedTooltip": "Порожнє коло — для цієї кімнати не збережено пароль",
     "legendSavedTooltip": "Напівкруг неба — пароль збережено; увійдіть, щоб відкрити сеанс",
     "legendLoggedInTooltip": "Зелена крапка — активна клієнтська сесія (вийдіть із кімнати, якщо сервер не в мережі)",
-    "historyLocalHint": "Дописи з'являються лише під час входу в цю кімнату на цьому пристрої. Увімкніть автоматичну синхронізацію, щоб залишатися передплаченим; історія не заповнюється з сервера кімнати.",
+    "historyLocalHint": "Під час входу mesh-client запитує недавні дописи, що ще є в кільцевому буфері сервера кімнати (коли на цьому пристрої ще немає локальної мітки). Увімкніть автоматичну синхронізацію, щоб залишатися передплаченим під час з’єднання.",
     "loginAllSavedDisabledNoSavedPasswords": "Спочатку збережіть пароль кімнати, щоб увійти в усі",
     "membersHeadingWithCount": "Учасники ({{count}})",
     "collapseRoomList": "Згорнути список кімнат",
diff --git a/src/renderer/locales/zh/translation.json b/src/renderer/locales/zh/translation.json
index 376d42f01..f141364f2 100644
--- a/src/renderer/locales/zh/translation.json
+++ b/src/renderer/locales/zh/translation.json
@@ -4537,7 +4537,7 @@
     "legendNotSavedTooltip": "空圆—此房间未存储密码",
     "legendSavedTooltip": "天空半圆—密码已存储；登录以打开会话",
     "legendLoggedInTooltip": "绿点—活动客户端会话（服务器离线时请离开房间）",
-    "historyLocalHint": "仅当您在此设备上登录此聊天室时，帖子才会显示。启用自动同步以保持订阅状态；历史记录不会从聊天室服务器回填。",
+    "historyLocalHint": "登录时，若此设备尚无本地水印，mesh-client 会请求聊天室服务器环形缓冲区中仍保留的最近帖子。启用自动同步以在连接期间保持订阅。",
     "loginAllSavedDisabledNoSavedPasswords": "首先保存房间密码以使用全部登录",
     "membersHeadingWithCount": "成员({{count}})",
     "collapseRoomList": "折叠房间列表",
diff --git a/src/renderer/runtime/useMeshcoreRuntime.ts b/src/renderer/runtime/useMeshcoreRuntime.ts
index d6a382af4..29e98ec2d 100644
--- a/src/renderer/runtime/useMeshcoreRuntime.ts
+++ b/src/renderer/runtime/useMeshcoreRuntime.ts
@@ -303,7 +303,10 @@ import {
   MESHCORE_ROOM_CREDENTIAL_SETTING_PREFIX,
   setMeshcoreRoomCredential,
 } from '../lib/meshcoreRoomCredentialStorage';
-import { syncMeshcoreRoomContactPathBeforeLogin } from '../lib/meshcoreRoomLoginPathSync';
+import {
+  resetMeshcoreRoomCompanionSyncSinceForCatchUp,
+  syncMeshcoreRoomContactPathBeforeLogin,
+} from '../lib/meshcoreRoomLoginPathSync';
 import { meshcoreIsRoomLoginQueued } from '../lib/meshcoreRoomLoginQueue';
 import { resolveMeshcoreRoomLoginRouteBytes } from '../lib/meshcoreRoomLoginRouteResolve';
 import { applyMeshcoreRoomLoginFailure } from '../lib/meshcoreRoomSavedSecrets';
@@ -337,6 +340,7 @@ import {
 } from '../lib/meshcoreRoomSession';
 import { pickMostOverdueRoom, type RoomSyncSchedulerNode } from '../lib/meshcoreRoomSyncScheduler';
 import {
+  getMeshcoreRoomLastPostAt,
   getMeshcoreRoomSyncConfig,
   listMeshcoreRoomAutoLoginOnConnectNodeIds,
   listMeshcoreRoomSyncEnabledNodeIds,
@@ -6254,6 +6258,13 @@ export function useMeshcoreRuntime() {
             console.debug(
               `[useMeshcoreRuntime] loginRoom pathSync node=0x${nodeId.toString(16)} ${JSON.stringify(pathSync)} storedPathLen=${storedPath?.length ?? 0}`,
             );
+            // No local posts yet → zero companion sync_since so login requests ring-buffer catch-up.
+            if (getMeshcoreRoomLastPostAt(nodeId) == null) {
+              await meshcoreAbortablePromise(
+                resetMeshcoreRoomCompanionSyncSinceForCatchUp(activeConn, nodeId, pubKey),
+                loginAbortSignal,
+              );
+            }
             if (opts?.abortIfStale?.()) {
               throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
             }
@@ -6288,6 +6299,27 @@ export function useMeshcoreRuntime() {
               });
             }
             clearMeshcoreRoomAutoLoginFailure(nodeId);
+            // Room servers begin pushing ring-buffer posts ~2s after LoginSuccess; drain may have
+            // been busy/timed out during SendLogin — kick silent drains to ingest history.
+            for (const delayMs of [2_500, 8_000, 20_000]) {
+              window.setTimeout(() => {
+                scheduleMeshcoreWaitingMessagesDrain(
+                  async () => {
+                    try {
+                      await processWaitingMessagesRef.current?.({ showSyncBanner: false });
+                    } catch (e: unknown) {
+                      // catch-no-log-ok logMeshcoreWaitingMessagesDrainError handles logging
+                      logMeshcoreWaitingMessagesDrainError(
+                        'post-login room history drain failed',
+                        e,
+                        false,
+                      );
+                    }
+                  },
+                  { isMounted: () => meshcoreHookMountedRef.current },
+                );
+              }, delayMs);
+            }
           })(),
           MESHCORE_ROOM_LOGIN_TOTAL_TIMEOUT_MS,
           'loginRoom',
@@ -6725,7 +6757,7 @@ export function useMeshcoreRuntime() {
       const storeId = meshcoreIdentityIdRef.current;
       const canonicalId = addMessage(tempMsg);
       try {
-        const hopsAway = getIdentityNode(meshcoreIdentityIdRef.current, nodeId)?.hops_away ?? 0;
+        const hopsAway = resolveRoomLoginHopsForNode(nodeId);
         console.debug(
           `[useMeshcoreRuntime] sendRoomPost mode=post txtType=${MESHCORE_TXT_TYPE_PLAIN} bodyLen=${new TextEncoder().encode(text).length} room=0x${nodeId.toString(16)} hops=${hopsAway} transport=${meshcoreConnectTypeRef.current ?? 'unknown'}`,
         );

From 465fa644b7e0ac0cf6c210346631ef3f12bc5437 Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 12:53:01 -0600
Subject: [PATCH 8/9] fix(meshcore): harden room login abort, catch-up restore,
 and shared sync path

Cancel now interrupts TX-spacing and in-flight SendLogin; catch-up retries
companion restore after remove; auto-sync/reconnect reuse loginRoom. Also bump
@zip.js/zip.js from pnpm update.
---
 docs/agents/meshcore-rooms.md                 |   6 +-
 docs/agents/reticulum.md                      |   2 +-
 package.json                                  |   2 +-
 patches/@liamcottle__meshcore.js@1.14.0.patch |   2 +-
 pnpm-lock.yaml                                |  32 ++--
 src/renderer/components/RoomsPanel.test.tsx   |  28 ++++
 ...meshcoreHookPreamble.resolvePubKey.test.ts |  59 ++++++-
 .../hooks/meshcore/meshcoreHookPreamble.ts    |  33 +++-
 .../lib/meshcoreRoomLoginPathSync.test.ts     |  52 ++++++
 src/renderer/lib/meshcoreRoomLoginPathSync.ts |  55 +++++--
 .../meshcoreRoomLoginQueue.spacing.test.ts    |  31 ++++
 src/renderer/lib/meshcoreRoomLoginQueue.ts    |  18 ++-
 src/renderer/lib/meshcoreRoomSession.test.ts  |  70 ++++++++
 src/renderer/lib/meshcoreRoomSession.ts       |  52 +++---
 src/renderer/lib/timeConstants.ts             |   3 +
 src/renderer/runtime/useMeshcoreRuntime.ts    | 150 +++++-------------
 16 files changed, 422 insertions(+), 173 deletions(-)
 create mode 100644 src/renderer/lib/meshcoreRoomLoginQueue.spacing.test.ts

diff --git a/docs/agents/meshcore-rooms.md b/docs/agents/meshcore-rooms.md
index 39f54130f..a0c0d0f96 100644
--- a/docs/agents/meshcore-rooms.md
+++ b/docs/agents/meshcore-rooms.md
@@ -2,12 +2,12 @@
 
 Deep subsystem reference for AI assistants. Open this when a task touches MeshCore Rooms login/post, session RPCs, saved passwords, auto-sync scheduling, or room wire text. Hard rules live in [`AGENTS.md`](../../AGENTS.md).
 
-- **UI:** `RoomsPanel.tsx` — login overlay, post composer (`ChatComposer`), auto-sync toggles, Members ACL refresh (`get acl`); **Manage on Repeaters** jumps to Repeaters & Rooms ops (CLI / setperm / infra). Sidebar badge via `meshcoreRoomsUnread.ts` (`mesh-client:meshcoreRoomsUnread`). Blank guest **Login** = read-only when allowed; **`"hello"`** is the default read/write guest password; **Continue read-only** also sends blank. **Cancel login** aborts the outer login op (path resolve + SendLogin) via `meshcoreBeginRoomLoginOperation` / `meshcoreCancelRoomLogin`.
+- **UI:** `RoomsPanel.tsx` — login overlay, post composer (`ChatComposer`), auto-sync toggles, Members ACL refresh (`get acl`); **Manage on Repeaters** jumps to Repeaters & Rooms ops (CLI / setperm / infra). Sidebar badge via `meshcoreRoomsUnread.ts` (`mesh-client:meshcoreRoomsUnread`). Blank guest **Login** = read-only when allowed; **`"hello"`** is the default read/write guest password; **Continue read-only** also sends blank. **Cancel login** aborts the outer login op (path resolve + SendLogin) via `meshcoreBeginRoomLoginOperation` / `meshcoreCancelRoomLogin`; queue TX-spacing waits are interruptible so Cancel does not sit out the 60s mesh spacing.
 - **Ops (not on Rooms tab):** Ping / Status / Neighbors / Sensor / CLI / ACL setperm live on `RepeatersPanel` (mixed Repeater + Room table). **Open room** on a room row jumps back to Rooms. Guest passwords stay in `meshcoreRoomCredentialStorage`; ops admin uses `meshcoreInfraAdminSecrets` (admin-only records allowed).
 - **Room remote CLI:** needs room **admin** password via SendLogin ACL (`meshcoreCancelRoomLogin` then admin login inside `sendRepeaterCliCommand`); guest BBS login is not enough (`repeatersPanel.roomCliNeedsAdminPassword`).
 - **Post length (single-packet):** room posts use the shared `ChatComposer` (`variant="room"`) and are **single-packet** like MeshCore chat — over the room payload limit (`getMeshcoreRoomPayloadLimit` in `chatComposerLimits.ts`) the send is blocked with the same `meshcoreSingleNotice` callout rather than split into `[i/N]` parts, and the ~5s fast-send advisory applies. See [`chat.md`](chat.md) (Composer limits / send cadence).
-- **Session / RPC:** `meshcoreRoomSession.ts`, `meshcoreRoomLoginRpc.ts`, `meshcoreRoomPostRpc.ts`, `meshcoreRoomLogoutRpc.ts`, `meshcoreRoomLoginQueue.ts`, `meshcoreRoomLoginPathSync.ts`, `meshcoreRoomSentWait.ts`; credentials in `meshcoreRoomCredentialStorage.ts` / `meshcoreRoomSyncStorage.ts`.
+- **Session / RPC:** `meshcoreRoomSession.ts`, `meshcoreRoomLoginRpc.ts`, `meshcoreRoomPostRpc.ts`, `meshcoreRoomLogoutRpc.ts`, `meshcoreRoomLoginQueue.ts`, `meshcoreRoomLoginPathSync.ts`, `meshcoreRoomSentWait.ts`; credentials in `meshcoreRoomCredentialStorage.ts` / `meshcoreRoomSyncStorage.ts`. **LoginSuccess:** prefer v7+ `permissions` (PERM_ACL_*); `reserved` is the legacy admin/guest hint (0=RW, 1=admin, 2=guest) — do not treat it as ACL. **Hops:** `resolveMeshcoreRoomLoginHopsAway` uses route bytes when UI hops are 0, and treats sticky UI hops with an empty path as 0-hop so SendLogin is not blocked as noRoute. **History catch-up:** `resetMeshcoreRoomCompanionSyncSinceForCatchUp` remove+re-adds the companion contact (firmware zeroes `sync_since` only on new contacts) when this device has no local last-post watermark; add is retried if remove already succeeded so the contact is not left deleted.
 - **Saved passwords:** `meshcoreRoomSavedSecrets.ts` — sidebar/overlay **Forget** / **Stop auto-login**; `forgetMeshcoreRoomSavedSecrets` clears credential + disables auto-login and auto-sync; `disableMeshcoreRoomLoginAfterAuthFailure` disables both without clearing password or in-memory failure UI.
-- **Scheduler:** `meshcoreRoomSyncScheduler.ts` + `useMeshcoreRuntime.ts` — periodic re-login (Auto-sync, RF-only); single-flight ticks; background route resolve uses `skipTrace` / `MESHCORE_ROOM_SYNC_ROUTE_RESOLVE_FAST_MS`. Auth failure disables auto-sync and auto-login via `disableMeshcoreRoomLoginAfterAuthFailure`. Timeouts in `timeConstants.ts` (shorter for TCP / 0-hop).
+- **Scheduler:** `meshcoreRoomSyncScheduler.ts` + `useMeshcoreRuntime.ts` — periodic re-login (Auto-sync, RF-only) goes through the same `loginRoom` path as the UI (path sync, catch-up, abort, waiting-message drain) with `schedulerFastPath` (skipTrace / `MESHCORE_ROOM_SYNC_ROUTE_RESOLVE_FAST_MS`). Single-flight ticks. Auth failure disables auto-sync and auto-login via `disableMeshcoreRoomLoginAfterAuthFailure`. Timeouts in `timeConstants.ts` (shorter for TCP / 0-hop).
 - **Connect auto-login:** `meshcoreRoomAutoLoginOnConnect.ts` + `useMeshcoreRuntime.ts` — 500ms debounce (`MESHCORE_ROOM_AUTO_LOGIN_DEBOUNCE_MS`) when Room contacts appear (`roomAutoLoginReadyKey`, including pubkey-ready). Overlapping triggers share one pass (`runMeshcoreRoomAutoLoginSingleFlight`) and dirty-re-run so a second room hydrating mid-pathSync still logs in. Disconnect bumps a generation so a dying pass must not `SendLogin` on the new conn. Skips logged-in, queued (`meshcoreIsRoomLoginQueued`), failed (`getMeshcoreRoomAutoLoginFailure`), and not-yet-hydrated contacts.
 - **Wire text:** `meshcoreChannelText.ts` — channel/DM/room payloads, SignedPlain inbound strip, tapback/reply lines; `meshcoreGifWire.ts` — Open `g:GIFID`; `meshcoreOpenReaction.ts` — Open `r:HASH:INDEX`. Default companion keyless outbound; opt-in Open wire via Radio `meshcoreOpenWireCompatEnabled` (UI on `RadioPanel`).
diff --git a/docs/agents/reticulum.md b/docs/agents/reticulum.md
index d38b58d36..84208a621 100644
--- a/docs/agents/reticulum.md
+++ b/docs/agents/reticulum.md
@@ -12,7 +12,7 @@ Deep subsystem reference for AI assistants. Open this when a task touches the Re
 - **Propagation mode / sync:** Network → Propagation nodes owns Off/Auto/Manual (default **Off**; persisted values including legacy App-panel `auto` are honored). Auto one-time syncs via `startPropagationSyncCascade` + sidecar `destination_hash` sync in order: **finite-hop discovered** (no Add/Preferred) → **configured remotes** → **unknown-hop discovered** → local-prop (skips remotes when no enabled interfaces); runtime hook `useReticulumPropagationAutoSync`. Sidecar `start_propagation_sync` is **client `/get`-primary** (inbox retrieval; UI progress from `PropagationClient`) — peer `/offer` inventory push stays on the local-host peer loop when serving (avoids AwaitingResponse hangs against non-peer remotes with a nonempty messagestore). Hard-fails with `PROPAGATION_PATH_UNKNOWN` when `ensure_path_for_direct` fails after announce settle (same path gate as offer probe). Manual uses Preferred, else picks the best configured remote **for that sync only** (no Preferred write), then the remaining remotes, then local-prop. Off = **no PN support**: `startPropagationSyncCascade` returns early (per-row Sync is disabled in UI), `hasEffectiveReticulumPropagationTarget` / `hasReticulumPnCascadeCapacity` are false, `ReticulumPropagationNotice` is hidden, and the sidecar disarms the outbound PN plus empties cascade candidates (`propagation_mode` in `mesh_client_stack.json`, `POST /api/v1/propagation/mode`, `candidates_for_propagation_mode`); renderer pushes the mode on change and on sidecar-ready. **Ignore for Auto:** `POST/DELETE /api/v1/propagation/auto-blacklist` persists `propagation_auto_blacklist` (32-hex, cap 256); filters Auto sync ranking **and** Auto deposit (`auto_discovered_candidates` + configured retain in Auto); Manual Prefer/Sync still allowed. Ownership: mode in renderer localStorage (+ sidecar mirror); blacklist + deposit candidates in sidecar; sync cascade orchestration in `reticulumPropagationAutoApply.ts`; `startSync` attempt stamps must be unique across same-ms supersession. `reticulumPropagationStore` / `reticulumPropagationSync.ts` — Establishing stall (~45s) + hard ceiling (~180s), auto-sync interval from last success with failure cooldown, error keys for identity / non-PN / path-unknown / peering stamp; stamps `lastPropagationSyncAttemptAt` / `activePropagationSyncAttemptAt` for WS correlation. Cancel mid-`/get` must call `PropagationClient::abort_transfer` (rsLXMF overlay) or the next Sync stays `PROPAGATION_RETRIEVE_BUSY`. Silent Host `/get` terminal clear must only drop the latch when `propagation_sync_target` still equals that peer. **Nothing-to-sync is not a failure:** when the cascade contacts no node it writes `syncNoTarget` / `syncLocalLoading` / `syncRetrieveBusy` (never overwriting a real error from an attempted node), the local row reports sidecar `status: "loading"` while the messagestore reads (`local_propagation_status` + `PropagationBridge::messagestore_load_pending`, per-row Sync disabled), and the 30 s tick calls `refreshFromSidecar` while `hasPropagationCascadeCandidate` is false so a fresh stack recovers on its own — `refreshFromSidecar` must **not** clear the active attempt while `sync.active`. Debug snapshot `propagationClient` exposes mode/preferred/autoTarget/resolvedSyncTargetId/autoBlacklist. **Auto also deposits on Discovered PNs:** sidecar `auto_discovered_candidates` (`pn_cascade.rs`, Auto only, cap 3, hop-sorted with `MAX_PLAUSIBLE_PROPAGATION_HOPS=32`, skips inactive / self / already-configured / Auto-blacklist / over `max_peering_cost`) appends after configured remotes and before local-prop, rebuilt from the shared `rebuild_pn_cascade_candidates` helper in `live.rs`; capacity helpers count non-blacklisted discovered rows in Auto. **Chat notice dismiss:** `chatNoticeDismissed` with **Don't show again** / Network toggle. **Named sync target:** `startSync` stamps `syncTargetId`. **Attempts settle before the cascade advances:** `startSync` returns `accepted` | `deferred` | `failed`. Soft-defer (`PROPAGATION_SYNC_OUTBOUND_BUSY` / `PROPAGATION_RETRIEVE_BUSY` / `PROPAGATION_STACK_NOT_LIVE`) advances **without** 15‑min backoff; all-remote soft-defer + local-only settle must **not** advance `lastPropagationSyncAt` as a full success. Remote budget `PROPAGATION_CASCADE_BUDGET_MS` (5 min); per-attempt ~60s; single-flight cascade. Auto `/api/v1/interfaces` probe **fails closed** (treat read/rate-limit as no interfaces → local-only settle). **Retrieval vs peer sync:** User Sync progress is **client `/get`-primary**. Peer `/offer` runs only on the **local Host peer loop**. Logs: `propagation-retrieve` (`retrieve_mode=get|get_post_peer|get_periodic|local`); peer-offer `propagation-sync … peer_outcome=*` (**not** retrieval). `local-prop` Sync uses `drain_local_inbox` and returns `PROPAGATION_STACK_NOT_LIVE` when live is absent.
 - **Host PN fabric → Chat (lxmd-style glue):** When local Host is enabled, mesh-client is both PN and end-client on rsLXMF (not a second lxmd). Path: outbound deposit → host peer `/offer` push (generation-gated; lxmd terminal bookkeeping: `sync_complete` / `mark_offer_generation_processed` / `take_handled_updates` + `save_peer`); inbound peer Resource accept → `request_inbox_drain` → maintenance `drain_local_inbox` → `delivery_callback` → Chat; after host peer `/offer` Completes for peer `P`, sequenced **silent** client `/get` (`retrieve_mode=get_post_peer`); while serving and quiet, **~90s** periodic silent `/get` round-robin over peered remotes (Prefer/outbound first, `retrieve_mode=get_periodic`) for inbox catch-up — not a timed empty re-`/offer`. Re-`/offer` when `offer_generation` advances, offer policy changes, or a partial sync left work; maintenance polls every ~2s but only _starts_ work when idle. Guards: coalesce drain; one internal `/get`; skip when user Sync target / outbound deposit owns the hash or `sync_active` / `client_download_active`. Do **not** re-attach peer `/offer` to the Sync button. Dual full-index exchange in one Link stays upstream rsLXMF; remote inventory for re-propagation arrives when peers `/offer` to our serve path.
 - **PN hosting:** Network **Advanced PN hosting** / `ReticulumPnHostingDangerZone`; shared `pnHostingPolicy.ts` + sidecar `pn_hosting_policy.rs` / `pn_hosting_apply.rs`; `POST /api/v1/propagation/hosting-policy`; rsLXMF policy-setters overlay ([ratspeak/rsLXMF#6](https://github.com/ratspeak/rsLXMF/pull/6)). Messagestore loads in background on live attach; enabled `local-prop` serve/announce waits until load completes.
-- **Interface modes:** rnsd `mode` via `reticulumInterfaceMode.ts` + sidecar `normalize_interface_mode` (keep catalogs in sync — `pnpm run check:reticulum-interface-modes` in pre-commit/`release.sh`); add defaults TCP/UDP/I2P → `boundary`, RNode → `access_point`; UI in `ReticulumInterfacesPanel`; default hub presets add/repair missing mode to `boundary` (do not overwrite valid non-boundary). See [../reticulum.md#interface-modes](../reticulum.md#interface-modes).
+- **Interface modes:** rnsd `mode` via `reticulumInterfaceMode.ts` + sidecar `normalize_interface_mode` (keep catalogs in sync — `pnpm run check:reticulum-interface-modes` in pre-commit/`release.sh`); add defaults TCP/UDP/I2P → `boundary`, RNode → `access_point`; UI in `ReticulumInterfacesPanel`; default hub presets add/repair missing mode to `boundary` (do not overwrite valid non-boundary). Discoverable + Full/Roaming/Boundary stamps `ignore_config_warnings = Yes` (`reconcile_ignore_config_warnings` / `repair_ignore_config_warnings_in_config`) so RNS does not auto-correct runtime mode to Access Point; Connection shows **Effective: Access Point** when live `runtime_mode` still diverges. See [../reticulum.md#interface-modes](../reticulum.md#interface-modes) and [../reticulum.md#rmap-publish-and-interface-mode](../reticulum.md#rmap-publish-and-interface-mode).
 - **Share instance defaults:** missing keys bootstrap to `share_instance = No` / `instance_name = mesh-client` (does not overwrite explicit Yes/`default`); SharedInstanceClient banner + `disable_share_instance` repair; offline lint via `reticulum:validateConfig` / Network **Check config** / `pnpm run reticulum:config:check`
 - **LXMF replies:** sidecar stamps `FIELD_REPLY_TO` / capped `FIELD_REPLY_QUOTE` before sign; renderer ingest/Chat use `reticulum_reply_to_hash` + quote preview + jump-by-hash
 - **RNode flasher timeouts:** `RNODE_COMMAND_TIMEOUT_MS` (30 s serial), `RNODE_BT_PAIRING_TIMEOUT_MS` (90 s BLE pairing), `ESP32_FLASH_STALL_TIMEOUT_MS` / `NRF52_DFU_STALL_TIMEOUT_MS` (60 s no-progress → `ESP32_FLASH_STALLED` / `NRF52_DFU_STALLED`); humanized via `flasherErrorHumanize.ts`
diff --git a/package.json b/package.json
index df430f93d..8f2afc6a1 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
     "@stoprocent/noble": "^2.7.1",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/xterm": "^6.0.0",
-    "@zip.js/zip.js": "^2.8.47",
+    "@zip.js/zip.js": "^2.8.51",
     "builder-util-runtime": "9.7.0",
     "dompurify": "^3.4.13",
     "electron-updater": "^6.8.9",
diff --git a/patches/@liamcottle__meshcore.js@1.14.0.patch b/patches/@liamcottle__meshcore.js@1.14.0.patch
index 8a1b5f8d8..ff440781b 100644
--- a/patches/@liamcottle__meshcore.js@1.14.0.patch
+++ b/patches/@liamcottle__meshcore.js@1.14.0.patch
@@ -67,7 +67,7 @@ index 541ce732e52444d094043e49fef295752da3d7bc..209edb4f2cccff89efee83c708796a5c
 +        };
 +        if (bufferReader.getRemainingBytesCount() >= 5) {
 +            payload.serverTimestamp = bufferReader.readUInt32LE();
-+            payload.permissions = bufferReader.readByte(); // ACL permissions (data[7])
++            payload.permissions = bufferReader.readByte(); // PERM_ACL_* after timestamp
 +            if (bufferReader.getRemainingBytesCount() >= 1) {
 +                payload.firmwareVerLevel = bufferReader.readByte();
 +            }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 50fcb1d71..4a1783d27 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,7 +29,7 @@ overrides:
 patchedDependencies:
   '@jsr/meshtastic__core@2.6.6': 93604a080fa754cbde3dc78ef46ee50c2996c34d6d85720acacecfd6ebd7c652
   '@jsr/meshtastic__transport-web-serial@0.2.5': 27a2418bae8605e0e5ab6f1fcfd391abd9dc3110433da5754e934f38475dab74
-  '@liamcottle/meshcore.js@1.14.0': f54000776dc3e57c071056a4a29cec4a566f7f8368165ca313b147378669e39f
+  '@liamcottle/meshcore.js@1.14.0': cb795713dfd60da6415b04d0a81a863876163d355ca946b1a50440f0c38e2f49
   debug@4.4.3: cf37fa96f5df733456b16c82c9e1c9054a92f6216692aa33d5e2e1e208888e37
   readable-stream@4.7.0: 96023d9278085d7490d08bce1a5079dd202f7782a0daa66fa81c6b1424ef8ab1
   usb@2.18.0: 6b746e2d49b9b006a88aec5bed7a13c629d7f5ba7b40e9f1e039136754c32533
@@ -54,8 +54,8 @@ importers:
         specifier: ^6.0.0
         version: 6.0.0
       '@zip.js/zip.js':
-        specifier: ^2.8.47
-        version: 2.8.47
+        specifier: ^2.8.51
+        version: 2.8.51
       builder-util-runtime:
         specifier: 9.7.0
         version: 9.7.0(supports-color@8.1.1)
@@ -128,7 +128,7 @@ importers:
         version: 10.0.1(eslint@10.8.1(jiti@2.7.0)(supports-color@8.1.1))
       '@liamcottle/meshcore.js':
         specifier: ^1.14.0
-        version: 1.14.0(patch_hash=f54000776dc3e57c071056a4a29cec4a566f7f8368165ca313b147378669e39f)(supports-color@8.1.1)
+        version: 1.14.0(patch_hash=cb795713dfd60da6415b04d0a81a863876163d355ca946b1a50440f0c38e2f49)(supports-color@8.1.1)
       '@meshtastic/core':
         specifier: npm:@jsr/meshtastic__core@^2.6.6
         version: '@jsr/meshtastic__core@2.6.6(patch_hash=93604a080fa754cbde3dc78ef46ee50c2996c34d6d85720acacecfd6ebd7c652)(buffer@6.0.3)'
@@ -1476,8 +1476,8 @@ packages:
   '@yarnpkg/lockfile@1.1.0':
     resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==}
 
-  '@zip.js/zip.js@2.8.47':
-    resolution: {integrity: sha512-zQzidM6FD1teXUXL3Xy7g+b7k3jybQArLRVi2mIPt74JtxBVVPheDCW5q6nhEr4Pq+myXHoC9GsHIgxGQ6T8ow==}
+  '@zip.js/zip.js@2.8.51':
+    resolution: {integrity: sha512-xCEMRBwBh6JPMQKy5D/RE0Ra9NJvrvjcCHNXo+NzMYCdZy3R0oAX9zJKRb1c393HNMbLYfoD2MRSPgB8L6Jskw==}
     engines: {bun: '>=0.7.0', deno: '>=1.0.0', node: '>=18.0.0'}
 
   abbrev@4.0.0:
@@ -1630,8 +1630,8 @@ packages:
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.11.13:
-    resolution: {integrity: sha512-k9HNuUVMlqVjQ9UHzfPjIqiDbWw7WqT1AoT7GL8VwvF3r0ZfArtgiSPAlmupyNquNgOJHTuH4CKYf8ttMTWBTQ==}
+  baseline-browser-mapping@2.11.14:
+    resolution: {integrity: sha512-JyJ954WzuIR8/FFzX0o5krdSTrBAkcCSRfWSleRsIHSWV+cZe2FI1PKggVkFke1hBldRs+LRxUczzE9iPmgZww==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
@@ -2044,8 +2044,8 @@ packages:
   electron-publish@26.15.3:
     resolution: {integrity: sha512-g/2bn8YTavY4cuS5F+jOS7zmZbXXBV8KZ8yHKfJjFPoKtzBqrpCdNPxBd3tqdBwP7BVd0lGzf7Bk2s0KesWZ4Q==}
 
-  electron-to-chromium@1.5.405:
-    resolution: {integrity: sha512-bNglH7lPH5l+yHOes7Zr4VqxhOy4BQ9ZBUX4VdoFgxMpzJk7W1ZoO3Vgd9Pxa9PyjQ76sfm2aKH/nzEcCNRlew==}
+  electron-to-chromium@1.5.406:
+    resolution: {integrity: sha512-hWH5ORBi3d0IipnMh7BN5GDTaAmrSSSWmznwt2zltdiRNEWoEQyTwF0FFSBxzHO7hLSRT6loQu3IQGV0wg/Tvg==}
 
   electron-updater@6.8.9:
     resolution: {integrity: sha512-ZhVxM9iGONUpZGI1FxdMRgJjUFXi7AYGVa5PwKlO1tV1/4zDxQmfKpXOHVztKrd6L9rLcFjERvi1Mf2vxyTkig==}
@@ -5086,7 +5086,7 @@ snapshots:
     transitivePeerDependencies:
       - buffer
 
-  '@liamcottle/meshcore.js@1.14.0(patch_hash=f54000776dc3e57c071056a4a29cec4a566f7f8368165ca313b147378669e39f)(supports-color@8.1.1)':
+  '@liamcottle/meshcore.js@1.14.0(patch_hash=cb795713dfd60da6415b04d0a81a863876163d355ca946b1a50440f0c38e2f49)(supports-color@8.1.1)':
     dependencies:
       '@noble/curves': 1.9.7
       serialport: 13.0.0(supports-color@8.1.1)
@@ -5787,7 +5787,7 @@ snapshots:
 
   '@yarnpkg/lockfile@1.1.0': {}
 
-  '@zip.js/zip.js@2.8.47': {}
+  '@zip.js/zip.js@2.8.51': {}
 
   abbrev@4.0.0: {}
 
@@ -5992,7 +5992,7 @@ snapshots:
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.11.13: {}
+  baseline-browser-mapping@2.11.14: {}
 
   bidi-js@1.0.3:
     dependencies:
@@ -6027,9 +6027,9 @@ snapshots:
 
   browserslist@4.28.8:
     dependencies:
-      baseline-browser-mapping: 2.11.13
+      baseline-browser-mapping: 2.11.14
       caniuse-lite: 1.0.30001809
-      electron-to-chromium: 1.5.405
+      electron-to-chromium: 1.5.406
       node-releases: 2.0.53
       update-browserslist-db: 1.3.1(browserslist@4.28.8)
 
@@ -6430,7 +6430,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  electron-to-chromium@1.5.405: {}
+  electron-to-chromium@1.5.406: {}
 
   electron-updater@6.8.9(supports-color@8.1.1):
     dependencies:
diff --git a/src/renderer/components/RoomsPanel.test.tsx b/src/renderer/components/RoomsPanel.test.tsx
index d20f1971b..14924c35d 100644
--- a/src/renderer/components/RoomsPanel.test.tsx
+++ b/src/renderer/components/RoomsPanel.test.tsx
@@ -11,6 +11,7 @@ import {
   type StarredMessage,
 } from '@/renderer/lib/chatPanelProtocolStorage';
 import { VIRTUALIZER_SCROLL_END_THRESHOLD } from '@/renderer/lib/chatScrollUtils';
+import { serializeMeshcoreUserMessage } from '@/renderer/lib/meshcore/meshcoreMessageI18n';
 import { buildMeshcoreRoomIncomingMessage } from '@/renderer/lib/meshcoreChannelText';
 import {
   clearAllMeshcoreRoomAutoLoginFailures,
@@ -68,6 +69,10 @@ vi.mock('react-i18next', () => ({
       if (key === 'meshcore.errors.roomLogin.noRoute') {
         return 'No route to this room server. Trace the node from the map or wait for path adverts, then try again.';
       }
+      if (key === 'meshcore.errors.roomLogin.pathSyncFailedDetail') {
+        const detail = typeof opts?.detail === 'string' ? opts.detail : '';
+        return `Could not program the route on your radio before login. Reconnect the device and try again.${detail}`;
+      }
       if (key === 'roomsPanel.autoLoginFailed' && typeof opts?.error === 'string') {
         return `Auto-login failed: ${opts.error}`;
       }
@@ -303,6 +308,29 @@ describe('RoomsPanel', () => {
     expect(screen.queryByText('meshcore.errors.roomLogin.noRoute')).not.toBeInTheDocument();
   });
 
+  it('translates serialized pathSyncFailedDetail including radio error detail', async () => {
+    meshcoreClearAllRoomSessions();
+    const room = makeRoom(0x1006, 'Path Sync Room');
+    const nodes = new Map<number, MeshNode>([[room.node_id, room]]);
+    const onLoginRoom = vi.fn().mockRejectedValue(
+      new Error(
+        serializeMeshcoreUserMessage({
+          key: 'meshcore.errors.roomLogin.pathSyncFailedDetail',
+          params: { detail: ' (timeout)' },
+        }),
+      ),
+    );
+    renderRoomsPanel(nodes, { initialRoomTarget: room.node_id, onLoginRoom });
+    fireEvent.click(screen.getByText('roomsPanel.loginButton'));
+    await waitFor(() => {
+      expect(
+        screen.getByText(
+          'Could not program the route on your radio before login. Reconnect the device and try again. (timeout)',
+        ),
+      ).toBeInTheDocument();
+    });
+  });
+
   it('allows Login with empty guest password and sends blank', async () => {
     meshcoreClearAllRoomSessions();
     const room = makeRoom(0x1004, 'Empty Guest Room');
diff --git a/src/renderer/hooks/meshcore/meshcoreHookPreamble.resolvePubKey.test.ts b/src/renderer/hooks/meshcore/meshcoreHookPreamble.resolvePubKey.test.ts
index b36aa6cf9..887ced6c5 100644
--- a/src/renderer/hooks/meshcore/meshcoreHookPreamble.resolvePubKey.test.ts
+++ b/src/renderer/hooks/meshcore/meshcoreHookPreamble.resolvePubKey.test.ts
@@ -5,7 +5,10 @@ import {
   registerMeshcorePubKey,
 } from '../../lib/meshcore/meshcorePubKeyRegistry';
 import { pubkeyToNodeId } from '../../lib/meshcoreUtils';
-import { resolveMeshcoreNodePubKey } from './meshcoreHookPreamble';
+import {
+  reloadMeshcorePubKeyIfNodeIdMismatch,
+  resolveMeshcoreNodePubKey,
+} from './meshcoreHookPreamble';
 
 const PEER_PUBKEY_HEX = '0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20';
 
@@ -54,4 +57,58 @@ describe('resolveMeshcoreNodePubKey', () => {
     await expect(resolveMeshcoreNodePubKey(PEER_NODE_ID, new Map())).resolves.toEqual(PEER_PUBKEY);
     expect(window.electronAPI.db.getMeshcoreContactById).toHaveBeenCalledWith(PEER_NODE_ID);
   });
+
+  it('ignores a map key that does not hash to nodeId and loads from SQLite', async () => {
+    const mismatched = new Uint8Array(32);
+    mismatched.fill(0xab);
+    expect(pubkeyToNodeId(mismatched)).not.toBe(PEER_NODE_ID);
+    vi.mocked(window.electronAPI.db.getMeshcoreContactById).mockResolvedValue({
+      public_key: PEER_PUBKEY_HEX,
+    } as { node_id: number; public_key: string; on_radio: number });
+
+    const map = new Map([[PEER_NODE_ID, mismatched]]);
+    await expect(resolveMeshcoreNodePubKey(PEER_NODE_ID, map)).resolves.toEqual(PEER_PUBKEY);
+    expect(window.electronAPI.db.getMeshcoreContactById).toHaveBeenCalledWith(PEER_NODE_ID);
+  });
+});
+
+describe('reloadMeshcorePubKeyIfNodeIdMismatch', () => {
+  beforeEach(() => {
+    vi.mocked(window.electronAPI.db.getMeshcoreContactById).mockResolvedValue(null);
+    clearMeshcorePubKeyRegistry();
+  });
+
+  it('returns the same key when it already matches nodeId', async () => {
+    const map = new Map([[PEER_NODE_ID, PEER_PUBKEY]]);
+    await expect(
+      reloadMeshcorePubKeyIfNodeIdMismatch(PEER_NODE_ID, PEER_PUBKEY, map, 'test'),
+    ).resolves.toEqual(PEER_PUBKEY);
+  });
+
+  it('replaces a mismatched map key from SQLite', async () => {
+    const mismatched = new Uint8Array(32);
+    mismatched.fill(0xcd);
+    const map = new Map([[PEER_NODE_ID, mismatched]]);
+    vi.mocked(window.electronAPI.db.getMeshcoreContactById).mockResolvedValue({
+      public_key: PEER_PUBKEY_HEX,
+    } as { node_id: number; public_key: string; on_radio: number });
+
+    const resolved = await reloadMeshcorePubKeyIfNodeIdMismatch(
+      PEER_NODE_ID,
+      mismatched,
+      map,
+      'test',
+    );
+    expect(resolved).toEqual(PEER_PUBKEY);
+    expect(map.get(PEER_NODE_ID)).toEqual(PEER_PUBKEY);
+  });
+
+  it('throws when no matching key can be loaded', async () => {
+    const mismatched = new Uint8Array(32);
+    mismatched.fill(0xee);
+    const map = new Map([[PEER_NODE_ID, mismatched]]);
+    await expect(
+      reloadMeshcorePubKeyIfNodeIdMismatch(PEER_NODE_ID, mismatched, map, 'test'),
+    ).rejects.toThrow(/Room key out of sync/);
+  });
 });
diff --git a/src/renderer/hooks/meshcore/meshcoreHookPreamble.ts b/src/renderer/hooks/meshcore/meshcoreHookPreamble.ts
index b78083641..cd4b4b916 100644
--- a/src/renderer/hooks/meshcore/meshcoreHookPreamble.ts
+++ b/src/renderer/hooks/meshcore/meshcoreHookPreamble.ts
@@ -865,18 +865,22 @@ export function meshcoreFullPubKeyBytesFromContactDbHex(raw: string): Uint8Array
  * Resolve a 32-byte MeshCore contact pubkey for export/share/DM paths.
  * Order: runtime map → global registry → live store slice → SQLite contact row.
  */
+function meshcorePubKeyMatchesNodeId(pubKey: Uint8Array, nodeId: number): boolean {
+  return pubKey.length === 32 && pubkeyToNodeId(pubKey) === nodeId;
+}
+
 export async function resolveMeshcoreNodePubKey(
   nodeId: number,
   pubKeyByNodeId: ReadonlyMap<number, Uint8Array>,
   storePublicKey?: Uint8Array,
 ): Promise<Uint8Array | null> {
   const fromMap = pubKeyByNodeId.get(nodeId);
-  if (fromMap?.length === 32) return fromMap;
+  if (fromMap && meshcorePubKeyMatchesNodeId(fromMap, nodeId)) return fromMap;
 
   const fromRegistry = getMeshcorePubKey(nodeId);
-  if (fromRegistry?.length === 32) return fromRegistry;
+  if (fromRegistry && meshcorePubKeyMatchesNodeId(fromRegistry, nodeId)) return fromRegistry;
 
-  if (storePublicKey?.length === 32) return storePublicKey;
+  if (storePublicKey && meshcorePubKeyMatchesNodeId(storePublicKey, nodeId)) return storePublicKey;
 
   try {
     const contact = (await window.electronAPI.db.getMeshcoreContactById(nodeId)) as
@@ -893,6 +897,29 @@ export async function resolveMeshcoreNodePubKey(
   return null;
 }
 
+/**
+ * When the runtime map's 32-byte key does not hash to `nodeId`, reload from registry/DB
+ * and update the map. Throws if the key is still mismatched.
+ */
+export async function reloadMeshcorePubKeyIfNodeIdMismatch(
+  nodeId: number,
+  pubKey: Uint8Array,
+  pubKeyMap: Map<number, Uint8Array>,
+  logTag: string,
+): Promise<Uint8Array> {
+  if (meshcorePubKeyMatchesNodeId(pubKey, nodeId)) return pubKey;
+  try {
+    const resolved = await resolveMeshcoreNodePubKey(nodeId, pubKeyMap);
+    if (resolved && meshcorePubKeyMatchesNodeId(resolved, nodeId)) {
+      pubKeyMap.set(nodeId, resolved);
+      return resolved;
+    }
+  } catch (e: unknown) {
+    console.warn(`[${logTag}] pubkey reload failed ` + errLikeToLogString(e));
+  }
+  throw new Error('Room key out of sync — reconnect or refresh contacts.');
+}
+
 /** Pre-seed global pubkey registry from SQLite before PacketRouter subscribe (DM prefix decode). */
 export function registerMeshcorePubKeysFromContactDbRows(
   rows: readonly Pick<MeshcoreContactDbRow, 'node_id' | 'public_key'>[],
diff --git a/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts b/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
index 93931cb71..59585cf1c 100644
--- a/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
+++ b/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
@@ -145,4 +145,56 @@ describe('resetMeshcoreRoomCompanionSyncSinceForCatchUp', () => {
     expect(removeContact).toHaveBeenCalledWith(pubKey);
     expect(addOrUpdateContact).toHaveBeenCalled();
   });
+
+  it('retries add after remove if the first add fails', async () => {
+    const pubKey = makePubKey(0x41);
+    const nodeId = pubkeyToNodeId(pubKey);
+    const contact: MeshCoreContactRaw = {
+      publicKey: pubKey,
+      type: 3,
+      flags: 0,
+      outPathLen: 0,
+      outPath: new Uint8Array(64),
+      advName: 'Retry Room',
+      lastAdvert: 1,
+      advLat: 0,
+      advLon: 0,
+    };
+    const removeContact = vi.fn().mockResolvedValue(undefined);
+    const addOrUpdateContact = vi
+      .fn()
+      .mockRejectedValueOnce(new Error('timeout'))
+      .mockResolvedValueOnce(undefined);
+    const conn = {
+      getContacts: vi.fn().mockResolvedValue([contact]),
+      setContactPath: vi.fn(),
+      removeContact,
+      addOrUpdateContact,
+    };
+    const { resetMeshcoreRoomCompanionSyncSinceForCatchUp } =
+      await import('./meshcoreRoomLoginPathSync');
+    await expect(resetMeshcoreRoomCompanionSyncSinceForCatchUp(conn, nodeId, pubKey)).resolves.toBe(
+      'reset',
+    );
+    expect(removeContact).toHaveBeenCalledTimes(1);
+    expect(addOrUpdateContact).toHaveBeenCalledTimes(2);
+  });
+
+  it('skips catch-up reset when the login abort signal is already aborted', async () => {
+    const pubKey = makePubKey(0x42);
+    const conn = {
+      getContacts: vi.fn(),
+      setContactPath: vi.fn(),
+      removeContact: vi.fn(),
+      addOrUpdateContact: vi.fn(),
+    };
+    const { resetMeshcoreRoomCompanionSyncSinceForCatchUp } =
+      await import('./meshcoreRoomLoginPathSync');
+    const signal = AbortSignal.abort();
+    await expect(
+      resetMeshcoreRoomCompanionSyncSinceForCatchUp(conn, pubkeyToNodeId(pubKey), pubKey, signal),
+    ).resolves.toBe('skipped');
+    expect(conn.getContacts).not.toHaveBeenCalled();
+    expect(conn.removeContact).not.toHaveBeenCalled();
+  });
 });
diff --git a/src/renderer/lib/meshcoreRoomLoginPathSync.ts b/src/renderer/lib/meshcoreRoomLoginPathSync.ts
index d01e1fad1..566e79981 100644
--- a/src/renderer/lib/meshcoreRoomLoginPathSync.ts
+++ b/src/renderer/lib/meshcoreRoomLoginPathSync.ts
@@ -38,8 +38,12 @@ export async function resetMeshcoreRoomCompanionSyncSinceForCatchUp(
   conn: MeshcoreRoomLoginPathSyncConn,
   nodeId: number,
   pubKey: Uint8Array,
+  signal?: AbortSignal,
 ): Promise<'reset' | 'skipped' | 'failed'> {
-  if (!conn.removeContact || !conn.addOrUpdateContact) return 'skipped';
+  const removeContact = conn.removeContact;
+  const addOrUpdate = conn.addOrUpdateContact;
+  if (!removeContact || !addOrUpdate) return 'skipped';
+  if (signal?.aborted) return 'skipped';
   let contact: MeshCoreContactRaw | undefined;
   try {
     const contacts = await withTimeout(
@@ -53,34 +57,57 @@ export async function resetMeshcoreRoomCompanionSyncSinceForCatchUp(
     return 'failed';
   }
   if (!contact) return 'skipped';
+  if (signal?.aborted) return 'skipped';
+  const existing = contact;
   try {
     await withTimeout(
-      conn.removeContact(pubKey),
+      removeContact(pubKey),
       MESHCORE_ROOM_LOGIN_PATH_SYNC_TIMEOUT_MS,
       'meshcoreRoomSyncSinceResetRemove',
     );
-    await withTimeout(
-      conn.addOrUpdateContact(
+  } catch (e: unknown) {
+    console.warn(
+      '[meshcoreRoomLoginPathSync] sync_since catch-up remove failed ' +
+        (e instanceof Error ? e.message : String(e)),
+    );
+    return 'failed';
+  }
+  const addContact = (): Promise<void> =>
+    withTimeout(
+      addOrUpdate(
         pubKey,
-        contact.type,
-        contact.flags,
-        contact.outPathLen ?? 0,
-        contact.outPath instanceof Uint8Array ? contact.outPath : new Uint8Array(64),
-        contact.advName,
-        contact.lastAdvert,
-        contact.advLat,
-        contact.advLon,
+        existing.type,
+        existing.flags,
+        existing.outPathLen ?? 0,
+        existing.outPath instanceof Uint8Array ? existing.outPath : new Uint8Array(64),
+        existing.advName,
+        existing.lastAdvert,
+        existing.advLat,
+        existing.advLon,
       ),
       MESHCORE_ROOM_LOGIN_PATH_SYNC_TIMEOUT_MS,
       'meshcoreRoomSyncSinceResetAdd',
     );
+  // Once remove succeeds, always try to restore the contact (retry once). Do not abort
+  // between remove and add — that would drop the room from the companion table.
+  try {
+    await addContact();
     return 'reset';
   } catch (e: unknown) {
     console.warn(
-      '[meshcoreRoomLoginPathSync] sync_since catch-up reset failed ' +
+      '[meshcoreRoomLoginPathSync] sync_since catch-up add failed, retrying restore ' +
         (e instanceof Error ? e.message : String(e)),
     );
-    return 'failed';
+    try {
+      await addContact();
+      return 'reset';
+    } catch (e2: unknown) {
+      console.warn(
+        '[meshcoreRoomLoginPathSync] sync_since catch-up restore failed; contact may be missing ' +
+          (e2 instanceof Error ? e2.message : String(e2)),
+      );
+      return 'failed';
+    }
   }
 }
 
diff --git a/src/renderer/lib/meshcoreRoomLoginQueue.spacing.test.ts b/src/renderer/lib/meshcoreRoomLoginQueue.spacing.test.ts
new file mode 100644
index 000000000..03bf764db
--- /dev/null
+++ b/src/renderer/lib/meshcoreRoomLoginQueue.spacing.test.ts
@@ -0,0 +1,31 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import {
+  dequeueMeshcoreRoomLogin,
+  enqueueMeshcoreRoomLogin,
+  resetMeshcoreRoomLoginQueue,
+} from './meshcoreRoomLoginQueue';
+import { MESHCORE_ROOM_LOGIN_ABORT_MESSAGE } from './meshcoreRoomLoginRpc';
+
+describe('meshcoreRoomLoginQueue TX spacing', () => {
+  afterEach(() => {
+    vi.useRealTimers();
+    resetMeshcoreRoomLoginQueue();
+  });
+
+  it('dequeue during TX spacing wait aborts without waiting the full interval', async () => {
+    vi.useFakeTimers();
+    const first = enqueueMeshcoreRoomLogin(1, () => Promise.resolve());
+    await first;
+
+    const ranSecond = vi.fn(() => Promise.resolve());
+    const second = enqueueMeshcoreRoomLogin(2, ranSecond);
+    dequeueMeshcoreRoomLogin(2);
+    await vi.advanceTimersByTimeAsync(100);
+    await expect(second).rejects.toMatchObject({
+      message: MESHCORE_ROOM_LOGIN_ABORT_MESSAGE,
+      name: 'AbortError',
+    });
+    expect(ranSecond).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/renderer/lib/meshcoreRoomLoginQueue.ts b/src/renderer/lib/meshcoreRoomLoginQueue.ts
index 59c7ce131..06601ca41 100644
--- a/src/renderer/lib/meshcoreRoomLoginQueue.ts
+++ b/src/renderer/lib/meshcoreRoomLoginQueue.ts
@@ -1,5 +1,8 @@
 import { MESHCORE_ROOM_LOGIN_ABORT_MESSAGE } from './meshcoreRoomLoginRpc';
-import { MESHCORE_ROOM_SYNC_MIN_MESH_TX_SPACING_MS } from './timeConstants';
+import {
+  MESHCORE_ROOM_LOGIN_QUEUE_SKIP_POLL_MS,
+  MESHCORE_ROOM_SYNC_MIN_MESH_TX_SPACING_MS,
+} from './timeConstants';
 
 /** One radio login at a time; many rooms can be queued. */
 let chain: Promise<void> = Promise.resolve();
@@ -23,6 +26,17 @@ function sleepMs(ms: number): Promise<void> {
   });
 }
 
+/** Wait up to `ms`, returning early when this room is cancelled (skipped). */
+async function sleepMsUnlessSkipped(ms: number, nodeId: number): Promise<void> {
+  const deadline = Date.now() + ms;
+  while (Date.now() < deadline) {
+    if (skippedNodeIds.has(nodeId)) return;
+    const slice = Math.min(MESHCORE_ROOM_LOGIN_QUEUE_SKIP_POLL_MS, deadline - Date.now());
+    if (slice <= 0) return;
+    await sleepMs(slice);
+  }
+}
+
 export function getMeshcoreRoomLoginQueueSnapshot(): {
   activeNodeId: number | null;
   pendingNodeIds: number[];
@@ -73,7 +87,7 @@ export function enqueueMeshcoreRoomLogin(nodeId: number, run: () => Promise<void
         ? Math.max(0, MESHCORE_ROOM_SYNC_MIN_MESH_TX_SPACING_MS - (Date.now() - lastMeshLoginTxAt))
         : 0;
     if (waitMs > 0) {
-      await sleepMs(waitMs);
+      await sleepMsUnlessSkipped(waitMs, nodeId);
     }
     if (skippedNodeIds.has(nodeId)) {
       skippedNodeIds.delete(nodeId);
diff --git a/src/renderer/lib/meshcoreRoomSession.test.ts b/src/renderer/lib/meshcoreRoomSession.test.ts
index 2345d4780..ddf70def9 100644
--- a/src/renderer/lib/meshcoreRoomSession.test.ts
+++ b/src/renderer/lib/meshcoreRoomSession.test.ts
@@ -4,6 +4,7 @@ import {
   MESHCORE_ROOM_DEFAULT_GUEST_PASSWORD,
   MESHCORE_ROOM_LOGIN_ABORT_MESSAGE,
   MESHCORE_ROOM_LOGIN_NO_ROUTE_MESSAGE,
+  MESHCORE_ROOM_PERM_READ_ONLY,
   meshcoreAbortablePromise,
   meshcoreApplyRoomSession,
   meshcoreBeginRoomLoginOperation,
@@ -199,6 +200,24 @@ describe('meshcoreRoomSession', () => {
     expect(meshcoreRoomCanPost(42)).toBe(true);
   });
 
+  it('login maps permissions=1 (PERM_ACL_READ_ONLY) to read-only', async () => {
+    meshcoreClearAllRoomSessions();
+    mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: MESHCORE_ROOM_PERM_READ_ONLY });
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    await meshcoreRoomLogin(conn, 42, pubKey, 'hello', {
+      guestPassword: 'hello',
+      adminPassword: '',
+    });
+    expect(meshcoreGetRoomSession(42)?.role).toBe('readonly');
+    expect(meshcoreRoomCanPost(42)).toBe(false);
+  });
+
   it('skips relogin when already logged in without forceRelogin', async () => {
     meshcoreClearAllRoomSessions();
     mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: 2 });
@@ -319,6 +338,34 @@ describe('meshcoreRoomSession', () => {
     expect(meshcoreIsRoomLoggedIn(42)).toBe(true);
   });
 
+  it('aborts during retry backoff without waiting for the delay', async () => {
+    vi.useFakeTimers();
+    meshcoreClearAllRoomSessions();
+    mockRunMeshcoreRoomLogin.mockRejectedValue(new Error('timeout'));
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    const loginPromise = meshcoreRoomLogin(conn, 42, pubKey, 'hello', {});
+    const settled = loginPromise.then(
+      () => ({ ok: true as const }),
+      (err: unknown) => ({ ok: false as const, err }),
+    );
+    await Promise.resolve();
+    await Promise.resolve();
+    meshcoreCancelRoomLogin(42);
+    await vi.advanceTimersByTimeAsync(0);
+    const result = await settled;
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(meshcoreIsRoomLoginAbortError(result.err)).toBe(true);
+    }
+    expect(mockRunMeshcoreRoomLogin).toHaveBeenCalledTimes(1);
+  });
+
   it('tryRelogin reuses stored guest password before posting', async () => {
     meshcoreClearAllRoomSessions();
     mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: 2 });
@@ -342,6 +389,29 @@ describe('meshcoreRoomSession', () => {
     });
   });
 
+  it('tryRelogin rethrows abort instead of treating it as a failed relogin', async () => {
+    meshcoreClearAllRoomSessions();
+    mockRunMeshcoreRoomLogin.mockReturnValue(new Promise(() => undefined));
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    meshcoreApplyRoomSession(42, {
+      guestPassword: 'hello',
+      adminPassword: '',
+      role: 'readwrite',
+    });
+    const relogin = meshcoreRoomTryRelogin(conn, 42, pubKey, 'post');
+    await vi.waitFor(() => {
+      expect(mockRunMeshcoreRoomLogin).toHaveBeenCalled();
+    });
+    meshcoreCancelRoomLogin(42);
+    await expect(relogin).rejects.toSatisfy((err: unknown) => meshcoreIsRoomLoginAbortError(err));
+  });
+
   it('tryRelogin admin uses facade admin when session only has guest', async () => {
     meshcoreClearAllRoomSessions();
     const { setMeshcoreRoomCredential } = await import('./meshcoreRoomCredentialStorage');
diff --git a/src/renderer/lib/meshcoreRoomSession.ts b/src/renderer/lib/meshcoreRoomSession.ts
index ae1f40dc3..8b56acebd 100644
--- a/src/renderer/lib/meshcoreRoomSession.ts
+++ b/src/renderer/lib/meshcoreRoomSession.ts
@@ -42,6 +42,7 @@ export type MeshcoreRoomLoginConn = MeshcoreRadioConnection;
 
 /** Firmware PERM_ACL_ROLE_MASK values (CommonCLI / room server ACL). */
 export const MESHCORE_ROOM_PERM_GUEST = 0;
+export const MESHCORE_ROOM_PERM_READ_ONLY = 1;
 export const MESHCORE_ROOM_PERM_READ_WRITE = 2;
 export const MESHCORE_ROOM_PERM_ADMIN = 3;
 
@@ -209,11 +210,16 @@ export function meshcoreClearRoomSession(nodeId: number): void {
 
 function roleFromPermissionsByte(permissions: number): MeshcoreRoomRole {
   const roleBits = permissions & 0x03;
-  if (roleBits === MESHCORE_ROOM_PERM_ADMIN) return 'admin';
-  if (roleBits === MESHCORE_ROOM_PERM_READ_WRITE) return 'readwrite';
-  if (roleBits === MESHCORE_ROOM_PERM_GUEST) return 'readonly';
-  // PERM_ACL_READ_ONLY (1) and unknown → read-only UI.
-  return 'readonly';
+  switch (roleBits) {
+    case MESHCORE_ROOM_PERM_ADMIN:
+      return 'admin';
+    case MESHCORE_ROOM_PERM_READ_WRITE:
+      return 'readwrite';
+    case MESHCORE_ROOM_PERM_GUEST:
+    case MESHCORE_ROOM_PERM_READ_ONLY:
+    default:
+      return 'readonly';
+  }
 }
 
 /**
@@ -383,11 +389,14 @@ export async function meshcoreRoomLogin(
       for (let attempt = 1; attempt <= MESHCORE_ROOM_LOGIN_MAX_ATTEMPTS; attempt++) {
         throwIfRoomLoginAborted(signal);
         try {
-          const response = await runMeshcoreRoomLogin(conn, pubKey, password, {
-            hopsAway: opts?.hopsAway,
-            companionTransport: opts?.companionTransport,
+          const response = await meshcoreAbortablePromise(
+            runMeshcoreRoomLogin(conn, pubKey, password, {
+              hopsAway: opts?.hopsAway,
+              companionTransport: opts?.companionTransport,
+              signal,
+            }),
             signal,
-          });
+          );
           throwIfRoomLoginAborted(signal);
           const role = resolveMeshcoreRoomLoginRole(
             response,
@@ -413,7 +422,7 @@ export async function meshcoreRoomLogin(
               `[meshcoreRoomSession] room login attempt ${attempt}/${MESHCORE_ROOM_LOGIN_MAX_ATTEMPTS} failed ${errMsg}`,
             );
             throwIfRoomLoginAborted(signal);
-            await sleepMs(MESHCORE_ROOM_LOGIN_RETRY_DELAY_MS);
+            await meshcoreAbortablePromise(sleepMs(MESHCORE_ROOM_LOGIN_RETRY_DELAY_MS), signal);
           } else {
             console.warn('[meshcoreRoomSession] room login failed ' + errMsg);
           }
@@ -481,17 +490,18 @@ export async function meshcoreRoomTryRelogin(
       : session.adminPassword;
   const password = mode === 'admin' ? adminPassword : session.guestPassword;
   if (!password.trim()) return false;
-  const ok = await meshcoreRoomLogin(conn, nodeId, pubKey, password, {
-    adminPassword: adminPassword || session.adminPassword,
-    guestPassword: session.guestPassword,
-    hopsAway: opts?.hopsAway,
-    companionTransport: opts?.companionTransport,
-    forceRelogin: true,
-  }).then(
-    () => true,
-    () => false,
-  );
-  if (!ok) return false;
+  try {
+    await meshcoreRoomLogin(conn, nodeId, pubKey, password, {
+      adminPassword: adminPassword || session.adminPassword,
+      guestPassword: session.guestPassword,
+      hopsAway: opts?.hopsAway,
+      companionTransport: opts?.companionTransport,
+      forceRelogin: true,
+    });
+  } catch (e: unknown) {
+    if (meshcoreIsRoomLoginAbortError(e)) throw e;
+    return false;
+  }
   const roleOk = mode === 'admin' ? meshcoreRoomCanAdmin(nodeId) : meshcoreRoomCanPost(nodeId);
   return roleOk;
 }
diff --git a/src/renderer/lib/timeConstants.ts b/src/renderer/lib/timeConstants.ts
index bd6c77966..137e02c32 100644
--- a/src/renderer/lib/timeConstants.ts
+++ b/src/renderer/lib/timeConstants.ts
@@ -209,6 +209,9 @@ export const RF_SERIAL_OPEN_RETRY_DELAY_MS = 2_000;
 /** Minimum spacing between mesh TX operations used by room sync (login counts as TX). */
 export const MESHCORE_ROOM_SYNC_MIN_MESH_TX_SPACING_MS = 60_000;
 
+/** Poll while waiting for mesh TX spacing so Cancel can skip the remainder. */
+export const MESHCORE_ROOM_LOGIN_QUEUE_SKIP_POLL_MS = 50;
+
 /** Minimum auto-sync interval per room (minutes). */
 export const MESHCORE_ROOM_SYNC_MIN_INTERVAL_MINUTES = 60;
 
diff --git a/src/renderer/runtime/useMeshcoreRuntime.ts b/src/renderer/runtime/useMeshcoreRuntime.ts
index 29e98ec2d..fa207b0bc 100644
--- a/src/renderer/runtime/useMeshcoreRuntime.ts
+++ b/src/renderer/runtime/useMeshcoreRuntime.ts
@@ -64,7 +64,6 @@ import {
   MESHCORE_TRACE_TIMEOUT_MS,
   meshcoreContactRawFromDevice,
   meshcoreDmAckKeyU32,
-  meshcoreFullPubKeyBytesFromContactDbHex,
   meshcoreMessageDedupeKey,
   meshcorePendingDmAckMapKeys,
   meshcoreTraceRouteRejectReason,
@@ -73,6 +72,7 @@ import {
   type PendingDmAckEntry,
   persistMeshcoreMessageSenderRepairs,
   registerMeshcorePubKeysFromContactDbRows,
+  reloadMeshcorePubKeyIfNodeIdMismatch,
   resolveMeshcoreNodePubKey,
   retryRadioRemoveDeletedContacts,
   serializeErrorLike,
@@ -6155,6 +6155,8 @@ export function useMeshcoreRuntime() {
         rememberPassword?: boolean;
         forceRelogin?: boolean;
         abortIfStale?: () => boolean;
+        /** Skip trace/prime during background auto-sync (short route-resolve budget). */
+        schedulerFastPath?: boolean;
       },
     ): Promise<void> => {
       let pubKey = pubKeyMapRef.current.get(nodeId);
@@ -6169,27 +6171,12 @@ export function useMeshcoreRuntime() {
           'Room has no RF encryption key — wait for contact sync or reconnect radio.',
         );
       }
-      if (pubkeyToNodeId(pubKey) !== nodeId) {
-        try {
-          const rows =
-            (await window.electronAPI.db.getMeshcoreContacts()) as MeshcoreContactDbRow[];
-          const row = rows.find((r) => r.node_id === nodeId);
-          if (row) {
-            const bytes = meshcoreFullPubKeyBytesFromContactDbHex(row.public_key);
-            if (bytes && pubkeyToNodeId(bytes) === nodeId) {
-              pubKeyMapRef.current.set(nodeId, bytes);
-              pubKey = bytes;
-            }
-          }
-        } catch (e: unknown) {
-          console.warn(
-            '[useMeshcoreRuntime] loginRoom pubkey reload from DB failed ' + errLikeToLogString(e),
-          );
-        }
-        if (pubkeyToNodeId(pubKey) !== nodeId) {
-          throw new Error('Room key out of sync — reconnect or refresh contacts.');
-        }
-      }
+      pubKey = await reloadMeshcorePubKeyIfNodeIdMismatch(
+        nodeId,
+        pubKey,
+        pubKeyMapRef.current,
+        'useMeshcoreRuntime loginRoom',
+      );
       const conn = connRef.current;
       if (!conn) {
         throw new Error(MESHCORE_ERR_NOT_CONNECTED);
@@ -6220,7 +6207,9 @@ export function useMeshcoreRuntime() {
             }
             // Route prime can take 10s+ — do not hold repeaterRemoteRpc (SendLogin) mutex during flood/path wait.
             const storedPath = await meshcoreAbortablePromise(
-              resolveRoomLoginStoredPath(nodeId, hopsAway, pubKey),
+              resolveRoomLoginStoredPath(nodeId, hopsAway, pubKey, {
+                schedulerFastPath: opts?.schedulerFastPath,
+              }),
               loginAbortSignal,
             );
             meshcoreThrowIfRoomLoginAborted(loginAbortSignal);
@@ -6248,10 +6237,12 @@ export function useMeshcoreRuntime() {
                 serializeMeshcoreUserMessage(
                   pathSync.reason === 'no_path'
                     ? MESHCORE_ROOM_LOGIN_NO_ROUTE_MESSAGE
-                    : {
-                        key: 'meshcore.errors.roomLogin.pathSyncFailedDetail',
-                        params: { detail: pathSync.error ? ` (${pathSync.error})` : '' },
-                      },
+                    : pathSync.error
+                      ? {
+                          key: 'meshcore.errors.roomLogin.pathSyncFailedDetail',
+                          params: { detail: ` (${pathSync.error})` },
+                        }
+                      : MESHCORE_ROOM_LOGIN_PATH_SYNC_FAILED_MESSAGE,
                 ),
               );
             }
@@ -6261,7 +6252,12 @@ export function useMeshcoreRuntime() {
             // No local posts yet → zero companion sync_since so login requests ring-buffer catch-up.
             if (getMeshcoreRoomLastPostAt(nodeId) == null) {
               await meshcoreAbortablePromise(
-                resetMeshcoreRoomCompanionSyncSinceForCatchUp(activeConn, nodeId, pubKey),
+                resetMeshcoreRoomCompanionSyncSinceForCatchUp(
+                  activeConn,
+                  nodeId,
+                  pubKey,
+                  loginAbortSignal,
+                ),
                 loginAbortSignal,
               );
             }
@@ -6351,26 +6347,12 @@ export function useMeshcoreRuntime() {
     if (meshcoreIsSyntheticPlaceholderPubKeyHex(pubKeyHex)) {
       throw new Error('Room has no RF encryption key — wait for contact sync or reconnect radio.');
     }
-    if (pubkeyToNodeId(pubKey) !== nodeId) {
-      try {
-        const rows = (await window.electronAPI.db.getMeshcoreContacts()) as MeshcoreContactDbRow[];
-        const row = rows.find((r) => r.node_id === nodeId);
-        if (row) {
-          const bytes = meshcoreFullPubKeyBytesFromContactDbHex(row.public_key);
-          if (bytes && pubkeyToNodeId(bytes) === nodeId) {
-            pubKeyMapRef.current.set(nodeId, bytes);
-            pubKey = bytes;
-          }
-        }
-      } catch (e: unknown) {
-        console.warn(
-          '[useMeshcoreRuntime] leaveRoom pubkey reload from DB failed ' + errLikeToLogString(e),
-        );
-      }
-      if (pubkeyToNodeId(pubKey) !== nodeId) {
-        throw new Error('Room key out of sync — reconnect or refresh contacts.');
-      }
-    }
+    pubKey = await reloadMeshcorePubKeyIfNodeIdMismatch(
+      nodeId,
+      pubKey,
+      pubKeyMapRef.current,
+      'useMeshcoreRuntime leaveRoom',
+    );
     const conn = connRef.current;
     if (!conn) {
       throw new Error(MESHCORE_ERR_NOT_CONNECTED);
@@ -6487,41 +6469,12 @@ export function useMeshcoreRuntime() {
 
     try {
       const password = meshcoreRoomEffectiveGuestPassword(cred.guestPassword ?? '');
-      const activeConn = connRef.current;
-      if (!activeConn) return;
-      const syncHops = resolveRoomLoginHopsForNode(target.nodeId);
-      const storedPath = await resolveRoomLoginStoredPath(target.nodeId, syncHops, pubKey, {
+      if (!connRef.current) return;
+      await loginRoom(target.nodeId, password, {
+        guestPassword: password,
+        adminPassword: cred.adminPassword ?? '',
         schedulerFastPath: true,
       });
-      if (syncHops > 0 && (!storedPath || storedPath.length <= 1)) {
-        await touchMeshcoreRoomLastSyncAt(target.nodeId, Date.now());
-        return;
-      }
-      const pathSync = await syncMeshcoreRoomContactPathBeforeLogin(
-        activeConn,
-        target.nodeId,
-        pubKey,
-        getIdentityNode(meshcoreIdentityIdRef.current, target.nodeId),
-        storedPath,
-        syncHops,
-        (fn) => repeaterRemoteRpcRef.current(fn),
-      );
-      if (syncHops > 0 && !pathSync.synced) {
-        if (pathSync.reason === 'no_path') {
-          await touchMeshcoreRoomLastSyncAt(target.nodeId, Date.now());
-          return;
-        }
-        throw new Error(MESHCORE_ROOM_LOGIN_PATH_SYNC_FAILED_MESSAGE);
-      }
-      await repeaterRemoteRpcRef.current(async () => {
-        const rpcConn = connRef.current;
-        if (!rpcConn) return;
-        await meshcoreRoomLogin(rpcConn, target.nodeId, pubKey, password, {
-          guestPassword: password,
-          adminPassword: cred.adminPassword ?? '',
-          hopsAway: syncHops,
-        });
-      });
       lastMeshcoreRoomSyncTxAtRef.current = Date.now();
       await touchMeshcoreRoomLastSyncAt(target.nodeId, Date.now());
       roomSyncSchedulerWarnedNodesRef.current.delete(target.nodeId);
@@ -6546,7 +6499,7 @@ export function useMeshcoreRuntime() {
         console.warn(logLine);
       }
     }
-  }, [resolveRoomLoginHopsForNode, resolveRoomLoginStoredPath]);
+  }, [loginRoom]);
 
   const runRoomSyncSchedulerTick = useCallback(async (): Promise<void> => {
     if (!connRef.current || (state.status !== 'configured' && state.status !== 'connected')) {
@@ -6634,40 +6587,17 @@ export function useMeshcoreRuntime() {
     if (!pubKey) return;
     try {
       const password = meshcoreRoomEffectiveGuestPassword(cred.guestPassword ?? '');
-      const activeConn = connRef.current;
-      if (!activeConn) return;
-      const syncHops = resolveRoomLoginHopsForNode(target.nodeId);
-      const storedPath = await resolveRoomLoginStoredPath(target.nodeId, syncHops, pubKey);
-      if (syncHops > 0 && (!storedPath || storedPath.length <= 1)) {
-        throw new Error(MESHCORE_ROOM_LOGIN_NO_ROUTE_MESSAGE);
-      }
-      const pathSync = await syncMeshcoreRoomContactPathBeforeLogin(
-        activeConn,
-        target.nodeId,
-        pubKey,
-        getIdentityNode(meshcoreIdentityIdRef.current, target.nodeId),
-        storedPath,
-        syncHops,
-        (fn) => repeaterRemoteRpcRef.current(fn),
-      );
-      if (syncHops > 0 && !pathSync.synced) {
-        throw new Error(MESHCORE_ROOM_LOGIN_PATH_SYNC_FAILED_MESSAGE);
-      }
-      await repeaterRemoteRpcRef.current(async () => {
-        const rpcConn = connRef.current;
-        if (!rpcConn) return;
-        await meshcoreRoomLogin(rpcConn, target.nodeId, pubKey, password, {
-          guestPassword: password,
-          adminPassword: cred.adminPassword ?? '',
-          hopsAway: syncHops,
-        });
+      if (!connRef.current) return;
+      await loginRoom(target.nodeId, password, {
+        guestPassword: password,
+        adminPassword: cred.adminPassword ?? '',
       });
       lastMeshcoreRoomSyncTxAtRef.current = Date.now();
       await touchMeshcoreRoomLastSyncAt(target.nodeId, Date.now());
     } catch (e: unknown) {
       console.debug('[useMeshcoreRuntime] room reconnect sync failed ' + errLikeToLogString(e));
     }
-  }, [resolveRoomLoginHopsForNode, resolveRoomLoginStoredPath]);
+  }, [loginRoom]);
 
   meshcoreRoomReconnectSyncRef.current = () => {
     triggerRoomAutoLoginRef.current();

From fb20d5b43692549258ebec8d898c4e998187268a Mon Sep 17 00:00:00 2001
From: Joey Stanford <joey@stanford.tel>
Date: Sat, 15 Aug 2026 13:18:06 -0600
Subject: [PATCH 9/9] fix(meshcore): harden room login races, RF persist, and
 RMAP opt-out

Keep cancelled queue jobs from reviving on retry, persist fresh RF adverts as inserts, and leave unrecognized interface modes' ignore_config_warnings flag intact. Blank readwrite guest relogin, trimmed-path hop inference, and translated sidebar auto-login errors follow the same review pass.
---
 docs/troubleshooting.md                       |  4 +-
 reticulum-sidecar/src/stack/config.rs         | 64 +++++++++++++----
 reticulum-sidecar/src/stack/live.rs           | 29 +++++++-
 src/renderer/components/RadioPanel.test.tsx   | 12 +++-
 src/renderer/components/RoomsPanel.test.tsx   | 22 ++++++
 src/renderer/components/RoomsPanel.tsx        |  8 ++-
 ...meshcoreHookPreamble.resolvePubKey.test.ts | 14 ++++
 .../hooks/meshcore/meshcoreHookPreamble.ts    |  3 +-
 .../lib/meshcore/meshcoreRfRxRuntime.test.ts  | 26 +++++++
 .../lib/meshcore/meshcoreRfRxRuntime.ts       | 24 +++----
 .../lib/meshcoreRoomCredentialStorage.ts      |  1 -
 .../lib/meshcoreRoomLoginPathSync.test.ts     | 68 +++++++++++++++++++
 src/renderer/lib/meshcoreRoomLoginPathSync.ts |  5 +-
 .../meshcoreRoomLoginQueue.spacing.test.ts    |  4 ++
 .../lib/meshcoreRoomLoginQueue.test.ts        | 25 +++++++
 src/renderer/lib/meshcoreRoomLoginQueue.ts    | 46 +++++++------
 src/renderer/lib/meshcoreRoomSession.test.ts  | 23 +++++++
 src/renderer/lib/meshcoreRoomSession.ts       |  4 +-
 src/renderer/lib/meshcoreUtils.test.ts        |  6 ++
 src/renderer/lib/meshcoreUtils.ts             | 18 +++--
 src/renderer/runtime/useMeshcoreRuntime.ts    |  9 ++-
 21 files changed, 344 insertions(+), 71 deletions(-)

diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index d44c21a4e..2d937034c 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -921,12 +921,12 @@ The client deduplicates overlapping RF and MQTT hears within **5 minutes** (cros
 **No room history after login**:
 
 - Room servers keep a **short ring buffer** of recent posts and push anything newer than your companion’s `sync_since` watermark after LoginSuccess. mesh-client resets that watermark (remove+re-add contact) when this device has **no local last-post watermark** yet, then drains waiting messages after login.
-- Posts older than the ring (or already past `sync_since`) will not appear. Enable **Auto-sync** on the Rooms tab to periodic re-login while connected so you stay current.
+- Posts older than the ring (or already past `sync_since`) will not appear. Enable **Auto-sync** on the Rooms tab to periodically re-login while connected so you stay current.
 - mesh-client stores posts received while you are logged in on **this device**. Quitting the app or staying logged out for days means posts from that period will not appear later unless they were persisted locally. See the **Rooms** tab history note under Auto-sync.
 
 **pyMC / server console shows posts but Rooms tab does not (cross-client)**:
 
-- The room **server log** (e.g. pyMC) lists everything the BBS stored. mesh-client and the official app only show posts **pushed to your radio while you are logged in** to that room (see above). Posts made before your login, or while you were logged out, will not appear until someone posts again after you re-login (or use **Auto-sync** to periodic re-login).
+- The room **server log** (e.g. pyMC) lists everything the BBS stored. mesh-client and the official app only show posts **pushed to your radio while you are logged in** to that room (see above). Posts made before your login, or while you were logged out, will not appear until someone posts again after you re-login (or use **Auto-sync** to periodically re-login).
 - For a fair test: keep **both** clients logged into the **same room** while connected, then post from one side and confirm the other receives it within ~30 seconds on RF.
 - mesh-client sends outbound room posts as **`TXT_TYPE_PLAIN`**; inbound BBS pushes use **`TXT_TYPE_SIGNED_PLAIN`** (author prefix stripped in the Rooms UI).
 
diff --git a/reticulum-sidecar/src/stack/config.rs b/reticulum-sidecar/src/stack/config.rs
index f9686b45f..d50866774 100644
--- a/reticulum-sidecar/src/stack/config.rs
+++ b/reticulum-sidecar/src/stack/config.rs
@@ -791,21 +791,19 @@ fn mode_allows_discovery_without_opt_out(mode: &str) -> bool {
 /// Stamp or clear `ignore_config_warnings` so discoverable + Full/Roaming/Boundary
 /// keeps the configured mode (upstream RNS opt-out). Omitted mode does not write
 /// the flag (RNode type default is AP). Clear when discoverable is off or mode is
-/// already AP/Gateway.
+/// already AP/Gateway. Unrecognized non-empty mode is left untouched.
 pub(crate) fn reconcile_ignore_config_warnings(row: &mut InterfaceRow) {
     let discoverable = row.discoverable == Some(true);
-    let explicit_mode = row
-        .mode
-        .as_deref()
-        .map(str::trim)
-        .filter(|m| !m.is_empty())
-        .and_then(|m| normalize_interface_mode(m).ok().flatten());
-
-    let should_opt_out = discoverable
-        && explicit_mode
-            .as_deref()
-            .is_some_and(|m| !mode_allows_discovery_without_opt_out(m));
+    let raw_mode = row.mode.as_deref().map(str::trim).filter(|m| !m.is_empty());
+    let Some(raw_mode) = raw_mode else {
+        row.ignore_config_warnings = None;
+        return;
+    };
+    let Ok(Some(canonical)) = normalize_interface_mode(raw_mode) else {
+        return;
+    };
 
+    let should_opt_out = discoverable && !mode_allows_discovery_without_opt_out(&canonical);
     if should_opt_out {
         row.ignore_config_warnings = Some(true);
     } else {
@@ -3732,4 +3730,46 @@ longitude = -105.0
         reconcile_ignore_config_warnings(&mut row);
         assert_eq!(row.ignore_config_warnings, Some(true));
     }
+
+    #[test]
+    fn reconcile_unrecognized_mode_preserves_existing_opt_out() {
+        let mut row = InterfaceRow {
+            id: "rnode".into(),
+            name: "LoRa".into(),
+            iface_type: "rnode".into(),
+            enabled: true,
+            status: "up".into(),
+            host: None,
+            port: None,
+            preset: None,
+            serial_port: Some("/dev/ttyUSB0".into()),
+            frequency: None,
+            bandwidth: None,
+            txpower: None,
+            spreading_factor: None,
+            coding_rate: None,
+            callsign: None,
+            id_interval: None,
+            mode: Some("not_a_real_mode".into()),
+            runtime_mode: None,
+            seed_addresses: Vec::new(),
+            discoverable: Some(true),
+            latitude: Some(40.0),
+            longitude: Some(-105.0),
+            height: None,
+            discovery_name: None,
+            announce_interval_min: None,
+            connectable: None,
+            reachable_on: None,
+            network_name: None,
+            passphrase: None,
+            flow_control: None,
+            ignore_config_warnings: Some(true),
+            tx_queue_used: None,
+            tx_queue_max: None,
+            extra_config: HashMap::new(),
+        };
+        reconcile_ignore_config_warnings(&mut row);
+        assert_eq!(row.ignore_config_warnings, Some(true));
+    }
 }
diff --git a/reticulum-sidecar/src/stack/live.rs b/reticulum-sidecar/src/stack/live.rs
index c9604e0ab..5283b9ac4 100644
--- a/reticulum-sidecar/src/stack/live.rs
+++ b/reticulum-sidecar/src/stack/live.rs
@@ -117,6 +117,15 @@ pub(crate) fn live_interface_tx_queue_fields(
     }
 }
 
+/// Live `GetInterfaceStats.mode` is only meaningful while the interface is online.
+pub(crate) fn live_interface_runtime_mode_if_online(online: bool, mode: &str) -> Option<String> {
+    if online {
+        config::live_interface_runtime_mode(mode)
+    } else {
+        None
+    }
+}
+
 pub struct LiveBridge {
     config_dir: PathBuf,
     storage_dir: PathBuf,
@@ -2502,7 +2511,9 @@ impl LiveBridge {
                                     callsign: None,
                                     id_interval: None,
                                     mode: None,
-                                    runtime_mode: config::live_interface_runtime_mode(&s.mode),
+                                    runtime_mode: live_interface_runtime_mode_if_online(
+                                        s.online, &s.mode,
+                                    ),
                                     seed_addresses: Vec::new(),
                                     discoverable: None,
                                     latitude: None,
@@ -4152,7 +4163,7 @@ impl LiveBridge {
                     callsign: None,
                     id_interval: None,
                     mode: None,
-                    runtime_mode: config::live_interface_runtime_mode(&s.mode),
+                    runtime_mode: live_interface_runtime_mode_if_online(s.online, &s.mode),
                     seed_addresses: Vec::new(),
                     discoverable: None,
                     latitude: None,
@@ -7088,7 +7099,7 @@ mod reply_field_tests {
 
 #[cfg(test)]
 mod live_tx_queue_fields_tests {
-    use super::live_interface_tx_queue_fields;
+    use super::{live_interface_runtime_mode_if_online, live_interface_tx_queue_fields};
 
     #[test]
     fn online_stats_populate_used_and_max() {
@@ -7110,4 +7121,16 @@ mod live_tx_queue_fields_tests {
         assert_eq!(live_interface_tx_queue_fields(true, 0, 0), (None, None));
         assert_eq!(live_interface_tx_queue_fields(true, 10, 0), (None, None));
     }
+
+    #[test]
+    fn offline_exposes_no_runtime_mode() {
+        assert_eq!(
+            live_interface_runtime_mode_if_online(false, "AccessPoint"),
+            None
+        );
+        assert_eq!(
+            live_interface_runtime_mode_if_online(true, "AccessPoint").as_deref(),
+            Some("access_point")
+        );
+    }
 }
diff --git a/src/renderer/components/RadioPanel.test.tsx b/src/renderer/components/RadioPanel.test.tsx
index 31e8fcb40..876c7e9fb 100644
--- a/src/renderer/components/RadioPanel.test.tsx
+++ b/src/renderer/components/RadioPanel.test.tsx
@@ -115,7 +115,7 @@ describe('RadioPanel MeshCore Device User / Identity', () => {
   it('enables Apply and calls onSetOwner when MeshCore capabilities provide the handler', async () => {
     const user = userEvent.setup();
     const onSetOwner = vi.fn().mockResolvedValue(undefined);
-    render(
+    const { container } = render(
       <ToastProvider>
         <RadioPanel
           {...defaultProps}
@@ -127,6 +127,8 @@ describe('RadioPanel MeshCore Device User / Identity', () => {
     );
 
     await openDeviceUserSection(user);
+    hydrateAxeThemeColors(container);
+    expect(await axe(container)).toHaveNoViolations();
 
     const nameInput = screen.getByLabelText('Name');
     await user.clear(nameInput);
@@ -147,20 +149,22 @@ describe('RadioPanel MeshCore Device User / Identity', () => {
 
   it('keeps Apply disabled when MeshCore capabilities are set but onSetOwner is missing', async () => {
     const user = userEvent.setup();
-    render(
+    const { container } = render(
       <ToastProvider>
         <RadioPanel {...defaultProps} isConnected capabilities={MESHCORE_CAPABILITIES} />
       </ToastProvider>,
     );
 
     await openDeviceUserSection(user);
+    hydrateAxeThemeColors(container);
+    expect(await axe(container)).toHaveNoViolations();
 
     expect(screen.getByRole('button', { name: 'Apply Device User / Identity' })).toBeDisabled();
   });
 
   it('prefills the MeshCore name field from deviceOwner', async () => {
     const user = userEvent.setup();
-    render(
+    const { container } = render(
       <ToastProvider>
         <RadioPanel
           {...defaultProps}
@@ -173,6 +177,8 @@ describe('RadioPanel MeshCore Device User / Identity', () => {
     );
 
     await openDeviceUserSection(user);
+    hydrateAxeThemeColors(container);
+    expect(await axe(container)).toHaveNoViolations();
 
     expect(screen.getByLabelText('Name')).toHaveValue('TagName');
   });
diff --git a/src/renderer/components/RoomsPanel.test.tsx b/src/renderer/components/RoomsPanel.test.tsx
index 14924c35d..019767092 100644
--- a/src/renderer/components/RoomsPanel.test.tsx
+++ b/src/renderer/components/RoomsPanel.test.tsx
@@ -73,6 +73,9 @@ vi.mock('react-i18next', () => ({
         const detail = typeof opts?.detail === 'string' ? opts.detail : '';
         return `Could not program the route on your radio before login. Reconnect the device and try again.${detail}`;
       }
+      if (key === 'meshcore.errors.roomLogin.timedOut') {
+        return 'Room login timed out. The room may be out of range or not responding.';
+      }
       if (key === 'roomsPanel.autoLoginFailed' && typeof opts?.error === 'string') {
         return `Auto-login failed: ${opts.error}`;
       }
@@ -888,6 +891,25 @@ describe('RoomsPanel', () => {
     expect(marker.className).toContain('ring-red-500');
   });
 
+  it('translates serialized auto-login failure in the sidebar marker', () => {
+    const room = makeRoom(0x1010, 'Serialized Auto Fail Room');
+    const nodes = new Map<number, MeshNode>([[room.node_id, room]]);
+    const serialized = serializeMeshcoreUserMessage({
+      key: 'meshcore.errors.roomLogin.timedOut',
+    });
+    setMeshcoreRoomAutoLoginFailure(room.node_id, serialized);
+
+    renderRoomsPanel(nodes);
+
+    expect(screen.getByLabelText('roomsPanel.autoLoginFailedAria')).toBeInTheDocument();
+    expect(
+      screen.getByTitle(
+        'Auto-login failed: Room login timed out. The room may be out of range or not responding.',
+      ),
+    ).toBeInTheDocument();
+    expect(screen.queryByText(serialized)).not.toBeInTheDocument();
+  });
+
   it('clears auto-login failure when re-enabling auto-login on connect', async () => {
     const room = makeRoom(0x1023, 'Re-enable Auto Room');
     const nodes = new Map<number, MeshNode>([[room.node_id, room]]);
diff --git a/src/renderer/components/RoomsPanel.tsx b/src/renderer/components/RoomsPanel.tsx
index 56f3bc7aa..a2efbb50b 100644
--- a/src/renderer/components/RoomsPanel.tsx
+++ b/src/renderer/components/RoomsPanel.tsx
@@ -1484,6 +1484,8 @@ export default function RoomsPanel({
                 const isLoggingIn = isRoomLoginInProgress(room.node_id) && !isLogged;
                 const isLeaving = leaveLoadingRoomIds.has(room.node_id);
                 const autoLoginFailed = getMeshcoreRoomAutoLoginFailure(room.node_id);
+                const autoLoginFailedDisplay =
+                  autoLoginFailed != null ? translateMeshcoreUserMessage(t, autoLoginFailed) : '';
                 const showAutoLoginFailed =
                   Boolean(autoLoginFailed) && !isLogged && !isLoggingIn && !isLeaving;
                 const marker = resolveMeshcoreRoomSidebarMarker({
@@ -1496,7 +1498,7 @@ export default function RoomsPanel({
                   : isLeaving
                     ? t('roomsPanel.leaveRoomInProgress')
                     : showAutoLoginFailed
-                      ? t('roomsPanel.autoLoginFailed', { error: autoLoginFailed ?? '' })
+                      ? t('roomsPanel.autoLoginFailed', { error: autoLoginFailedDisplay })
                       : hasSaved
                         ? t('roomsPanel.legendSavedTooltip')
                         : t('roomsPanel.legendNotSavedTooltip');
@@ -1603,7 +1605,9 @@ export default function RoomsPanel({
                               aria-hidden={!showAutoLoginFailed}
                               aria-label={
                                 showAutoLoginFailed
-                                  ? t('roomsPanel.autoLoginFailedAria', { error: autoLoginFailed })
+                                  ? t('roomsPanel.autoLoginFailedAria', {
+                                      error: autoLoginFailedDisplay,
+                                    })
                                   : undefined
                               }
                               title={markerTitle}
diff --git a/src/renderer/hooks/meshcore/meshcoreHookPreamble.resolvePubKey.test.ts b/src/renderer/hooks/meshcore/meshcoreHookPreamble.resolvePubKey.test.ts
index 887ced6c5..99cd06ed7 100644
--- a/src/renderer/hooks/meshcore/meshcoreHookPreamble.resolvePubKey.test.ts
+++ b/src/renderer/hooks/meshcore/meshcoreHookPreamble.resolvePubKey.test.ts
@@ -58,6 +58,20 @@ describe('resolveMeshcoreNodePubKey', () => {
     expect(window.electronAPI.db.getMeshcoreContactById).toHaveBeenCalledWith(PEER_NODE_ID);
   });
 
+  it('ignores a SQLite pubkey that does not hash to nodeId', async () => {
+    const mismatched = new Uint8Array(32);
+    mismatched.fill(0xab);
+    const mismatchedHex = Array.from(mismatched)
+      .map((b) => b.toString(16).padStart(2, '0'))
+      .join('');
+    expect(pubkeyToNodeId(mismatched)).not.toBe(PEER_NODE_ID);
+    vi.mocked(window.electronAPI.db.getMeshcoreContactById).mockResolvedValue({
+      public_key: mismatchedHex,
+    } as { node_id: number; public_key: string; on_radio: number });
+
+    await expect(resolveMeshcoreNodePubKey(PEER_NODE_ID, new Map())).resolves.toBeNull();
+  });
+
   it('ignores a map key that does not hash to nodeId and loads from SQLite', async () => {
     const mismatched = new Uint8Array(32);
     mismatched.fill(0xab);
diff --git a/src/renderer/hooks/meshcore/meshcoreHookPreamble.ts b/src/renderer/hooks/meshcore/meshcoreHookPreamble.ts
index cd4b4b916..a1308e1f0 100644
--- a/src/renderer/hooks/meshcore/meshcoreHookPreamble.ts
+++ b/src/renderer/hooks/meshcore/meshcoreHookPreamble.ts
@@ -886,7 +886,8 @@ export async function resolveMeshcoreNodePubKey(
     const contact = (await window.electronAPI.db.getMeshcoreContactById(nodeId)) as
       Pick<MeshcoreContactDbRow, 'public_key'> | null | undefined;
     if (contact?.public_key) {
-      return meshcoreFullPubKeyBytesFromContactDbHex(contact.public_key);
+      const fromDb = meshcoreFullPubKeyBytesFromContactDbHex(contact.public_key);
+      if (fromDb && meshcorePubKeyMatchesNodeId(fromDb, nodeId)) return fromDb;
     }
   } catch (e: unknown) {
     console.warn(
diff --git a/src/renderer/lib/meshcore/meshcoreRfRxRuntime.test.ts b/src/renderer/lib/meshcore/meshcoreRfRxRuntime.test.ts
index 004c70ee5..2ffb9f82e 100644
--- a/src/renderer/lib/meshcore/meshcoreRfRxRuntime.test.ts
+++ b/src/renderer/lib/meshcore/meshcoreRfRxRuntime.test.ts
@@ -283,6 +283,32 @@ describe('handleMeshcoreRfRx advert identity', () => {
       longName: name,
       hwModel: 'Room',
     });
+    expect(window.electronAPI.db.saveMeshcoreContact).toHaveBeenCalledWith(
+      expect.objectContaining({ adv_name: name, contact_type: 3 }),
+    );
+  });
+
+  it('persists a fresh non-tombstoned RF advert via saveMeshcoreContact', () => {
+    const publicKey = Uint8Array.from({ length: 32 }, (_, i) => (i + 7) & 0xff);
+    const nodeId = pubkeyToNodeId(publicKey);
+    const { deps } = makeDeps({ myNodeNumRef: ref(1) });
+    vi.mocked(window.electronAPI.db.saveMeshcoreContact).mockResolvedValue(undefined);
+    vi.mocked(window.electronAPI.db.updateMeshcoreContactAdvert).mockResolvedValue(undefined);
+
+    handleMeshcoreRfRx(
+      {
+        lastSnr: 8,
+        lastRssi: -30,
+        raw: buildFloodAdvertPacket({ publicKey, name: 'Alice', deviceRole: 1 }),
+      },
+      deps,
+    );
+
+    expect(useNodeStore.getState().nodes[ID][nodeId].longName).toBe('Alice');
+    expect(window.electronAPI.db.saveMeshcoreContact).toHaveBeenCalledWith(
+      expect.objectContaining({ adv_name: 'Alice', contact_type: 1, on_radio: 1 }),
+    );
+    expect(window.electronAPI.db.updateMeshcoreContactAdvert).not.toHaveBeenCalled();
   });
 
   it('revives a locally deleted contact when a live RF advert is heard', () => {
diff --git a/src/renderer/lib/meshcore/meshcoreRfRxRuntime.ts b/src/renderer/lib/meshcore/meshcoreRfRxRuntime.ts
index 9d7ffda61..2625635b5 100644
--- a/src/renderer/lib/meshcore/meshcoreRfRxRuntime.ts
+++ b/src/renderer/lib/meshcore/meshcoreRfRxRuntime.ts
@@ -355,6 +355,18 @@ function applyMeshcoreRfAdvertToStore(
   const hwModel = mergeHwModelOnContactUpdate(existing?.hwModel, incomingHw);
   const lastHeardAt = advert.timestampSec > 0 ? advert.timestampSec : Math.floor(now / 1000);
 
+  persistMeshcoreNodeInfoAfterAdvert(
+    identityId,
+    {
+      nodeId,
+      longName: name || undefined,
+      lastHeardAt,
+      publicKey,
+      hwModel,
+    },
+    { contactType: advert.deviceRole },
+  );
+
   upsertNode(identityId, {
     nodeId,
     ...(name ? { longName: name } : {}),
@@ -374,18 +386,6 @@ function applyMeshcoreRfAdvertToStore(
     heardViaMqttOnly: false,
     viaMqtt: false,
   });
-
-  persistMeshcoreNodeInfoAfterAdvert(
-    identityId,
-    {
-      nodeId,
-      longName: name || undefined,
-      lastHeardAt,
-      publicKey,
-      hwModel,
-    },
-    { contactType: advert.deviceRole },
-  );
 }
 
 function buildMeshcoreRfRawPacketEntry(
diff --git a/src/renderer/lib/meshcoreRoomCredentialStorage.ts b/src/renderer/lib/meshcoreRoomCredentialStorage.ts
index d972cf8a4..80653cce1 100644
--- a/src/renderer/lib/meshcoreRoomCredentialStorage.ts
+++ b/src/renderer/lib/meshcoreRoomCredentialStorage.ts
@@ -29,7 +29,6 @@ function parseCredentialValue(raw: unknown): MeshcoreRoomStoredCredential | unde
       const adminPassword = adminRaw.length > 0 ? adminRaw : undefined;
       // Persist when guestPassword key was saved (including empty) or admin is non-empty.
       if (!hasExplicitGuestPassword && !guestPassword && !adminPassword) return undefined;
-      if (!(hasExplicitGuestPassword || guestPassword || adminPassword)) return undefined;
       const out: MeshcoreRoomStoredCredential = {};
       if (hasExplicitGuestPassword || guestPassword.length > 0) {
         out.guestPassword = guestPassword;
diff --git a/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts b/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
index 59585cf1c..fb03f41a6 100644
--- a/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
+++ b/src/renderer/lib/meshcoreRoomLoginPathSync.test.ts
@@ -180,6 +180,74 @@ describe('resetMeshcoreRoomCompanionSyncSinceForCatchUp', () => {
     expect(addOrUpdateContact).toHaveBeenCalledTimes(2);
   });
 
+  it('returns failed when both add attempts reject after remove', async () => {
+    const pubKey = makePubKey(0x44);
+    const nodeId = pubkeyToNodeId(pubKey);
+    const contact: MeshCoreContactRaw = {
+      publicKey: pubKey,
+      type: 3,
+      flags: 0,
+      outPathLen: 0,
+      outPath: new Uint8Array(64),
+      advName: 'Missing Room',
+      lastAdvert: 1,
+      advLat: 0,
+      advLon: 0,
+    };
+    const removeContact = vi.fn().mockResolvedValue(undefined);
+    const addOrUpdateContact = vi.fn().mockRejectedValue(new Error('timeout'));
+    const conn = {
+      getContacts: vi.fn().mockResolvedValue([contact]),
+      setContactPath: vi.fn(),
+      removeContact,
+      addOrUpdateContact,
+    };
+    const { resetMeshcoreRoomCompanionSyncSinceForCatchUp } =
+      await import('./meshcoreRoomLoginPathSync');
+    await expect(resetMeshcoreRoomCompanionSyncSinceForCatchUp(conn, nodeId, pubKey)).resolves.toBe(
+      'failed',
+    );
+    expect(removeContact).toHaveBeenCalledTimes(1);
+    expect(addOrUpdateContact).toHaveBeenCalledTimes(2);
+  });
+
+  it('invokes catch-up remove/add with conn as this', async () => {
+    const pubKey = makePubKey(0x43);
+    const nodeId = pubkeyToNodeId(pubKey);
+    const contact: MeshCoreContactRaw = {
+      publicKey: pubKey,
+      type: 3,
+      flags: 0,
+      outPathLen: 0,
+      outPath: new Uint8Array(64),
+      advName: 'This Room',
+      lastAdvert: 1,
+      advLat: 0,
+      advLon: 0,
+    };
+    const conn = {
+      commands: [] as string[],
+      getContacts() {
+        return Promise.resolve([contact]);
+      },
+      setContactPath: vi.fn(),
+      removeContact(this: { commands: string[] }) {
+        this.commands.push('remove');
+        return Promise.resolve();
+      },
+      addOrUpdateContact(this: { commands: string[] }) {
+        this.commands.push('add');
+        return Promise.resolve();
+      },
+    };
+    const { resetMeshcoreRoomCompanionSyncSinceForCatchUp } =
+      await import('./meshcoreRoomLoginPathSync');
+    await expect(resetMeshcoreRoomCompanionSyncSinceForCatchUp(conn, nodeId, pubKey)).resolves.toBe(
+      'reset',
+    );
+    expect(conn.commands).toEqual(['remove', 'add']);
+  });
+
   it('skips catch-up reset when the login abort signal is already aborted', async () => {
     const pubKey = makePubKey(0x42);
     const conn = {
diff --git a/src/renderer/lib/meshcoreRoomLoginPathSync.ts b/src/renderer/lib/meshcoreRoomLoginPathSync.ts
index 566e79981..f7e0836a4 100644
--- a/src/renderer/lib/meshcoreRoomLoginPathSync.ts
+++ b/src/renderer/lib/meshcoreRoomLoginPathSync.ts
@@ -61,7 +61,7 @@ export async function resetMeshcoreRoomCompanionSyncSinceForCatchUp(
   const existing = contact;
   try {
     await withTimeout(
-      removeContact(pubKey),
+      removeContact.call(conn, pubKey),
       MESHCORE_ROOM_LOGIN_PATH_SYNC_TIMEOUT_MS,
       'meshcoreRoomSyncSinceResetRemove',
     );
@@ -74,7 +74,8 @@ export async function resetMeshcoreRoomCompanionSyncSinceForCatchUp(
   }
   const addContact = (): Promise<void> =>
     withTimeout(
-      addOrUpdate(
+      addOrUpdate.call(
+        conn,
         pubKey,
         existing.type,
         existing.flags,
diff --git a/src/renderer/lib/meshcoreRoomLoginQueue.spacing.test.ts b/src/renderer/lib/meshcoreRoomLoginQueue.spacing.test.ts
index 03bf764db..d5c39c27a 100644
--- a/src/renderer/lib/meshcoreRoomLoginQueue.spacing.test.ts
+++ b/src/renderer/lib/meshcoreRoomLoginQueue.spacing.test.ts
@@ -3,6 +3,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 import {
   dequeueMeshcoreRoomLogin,
   enqueueMeshcoreRoomLogin,
+  getMeshcoreRoomLoginQueueSnapshot,
   resetMeshcoreRoomLoginQueue,
 } from './meshcoreRoomLoginQueue';
 import { MESHCORE_ROOM_LOGIN_ABORT_MESSAGE } from './meshcoreRoomLoginRpc';
@@ -20,6 +21,9 @@ describe('meshcoreRoomLoginQueue TX spacing', () => {
 
     const ranSecond = vi.fn(() => Promise.resolve());
     const second = enqueueMeshcoreRoomLogin(2, ranSecond);
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(getMeshcoreRoomLoginQueueSnapshot().activeNodeId).toBe(2);
     dequeueMeshcoreRoomLogin(2);
     await vi.advanceTimersByTimeAsync(100);
     await expect(second).rejects.toMatchObject({
diff --git a/src/renderer/lib/meshcoreRoomLoginQueue.test.ts b/src/renderer/lib/meshcoreRoomLoginQueue.test.ts
index 5c52600a8..b7978d9bf 100644
--- a/src/renderer/lib/meshcoreRoomLoginQueue.test.ts
+++ b/src/renderer/lib/meshcoreRoomLoginQueue.test.ts
@@ -100,4 +100,29 @@ describe('meshcoreRoomLoginQueue', () => {
     await expect(third).resolves.toBeUndefined();
     expect(ran).toHaveBeenCalledTimes(1);
   });
+
+  it('cancel of a pending job does not revive it when the same node is re-enqueued', async () => {
+    let releaseFirst: (() => void) | undefined;
+    const firstGate = new Promise<void>((resolve) => {
+      releaseFirst = resolve;
+    });
+    const first = enqueueMeshcoreRoomLogin(1, async () => {
+      await firstGate;
+    });
+    const ranCancelled = vi.fn(() => Promise.resolve());
+    const cancelled = enqueueMeshcoreRoomLogin(2, ranCancelled);
+    dequeueMeshcoreRoomLogin(2);
+    const ranReplacement = vi.fn(() => Promise.resolve());
+    const replacement = enqueueMeshcoreRoomLogin(2, ranReplacement);
+
+    releaseFirst?.();
+    await expect(first).resolves.toBeUndefined();
+    await expect(cancelled).rejects.toMatchObject({
+      message: MESHCORE_ROOM_LOGIN_ABORT_MESSAGE,
+      name: 'AbortError',
+    });
+    await expect(replacement).resolves.toBeUndefined();
+    expect(ranCancelled).not.toHaveBeenCalled();
+    expect(ranReplacement).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/src/renderer/lib/meshcoreRoomLoginQueue.ts b/src/renderer/lib/meshcoreRoomLoginQueue.ts
index 06601ca41..12813aa40 100644
--- a/src/renderer/lib/meshcoreRoomLoginQueue.ts
+++ b/src/renderer/lib/meshcoreRoomLoginQueue.ts
@@ -8,7 +8,8 @@ import {
 let chain: Promise<void> = Promise.resolve();
 let activeNodeId: number | null = null;
 const pendingNodeIds = new Set<number>();
-const skippedNodeIds = new Set<number>();
+/** Bumped on enqueue and dequeue so a cancelled pending job cannot be revived. */
+const jobGenerationByNode = new Map<number, number>();
 let lastMeshLoginTxAt = 0;
 
 type QueueListener = () => void;
@@ -20,23 +21,35 @@ function notifyQueueChanged(): void {
   }
 }
 
+function bumpJobGeneration(nodeId: number): number {
+  const next = (jobGenerationByNode.get(nodeId) ?? 0) + 1;
+  jobGenerationByNode.set(nodeId, next);
+  return next;
+}
+
 function sleepMs(ms: number): Promise<void> {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
   });
 }
 
-/** Wait up to `ms`, returning early when this room is cancelled (skipped). */
-async function sleepMsUnlessSkipped(ms: number, nodeId: number): Promise<void> {
+/** Wait up to `ms`, returning early when this job's generation is stale (cancelled). */
+async function sleepMsUnlessStale(ms: number, nodeId: number, gen: number): Promise<void> {
   const deadline = Date.now() + ms;
   while (Date.now() < deadline) {
-    if (skippedNodeIds.has(nodeId)) return;
+    if (jobGenerationByNode.get(nodeId) !== gen) return;
     const slice = Math.min(MESHCORE_ROOM_LOGIN_QUEUE_SKIP_POLL_MS, deadline - Date.now());
     if (slice <= 0) return;
     await sleepMs(slice);
   }
 }
 
+function throwIfJobStale(nodeId: number, gen: number): void {
+  if (jobGenerationByNode.get(nodeId) !== gen) {
+    throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
+  }
+}
+
 export function getMeshcoreRoomLoginQueueSnapshot(): {
   activeNodeId: number | null;
   pendingNodeIds: number[];
@@ -67,19 +80,13 @@ export function meshcoreRoomLoginQueueSize(): number {
  * Failure point: prior jobs block the queue — callers should not assume immediate start.
  */
 export function enqueueMeshcoreRoomLogin(nodeId: number, run: () => Promise<void>): Promise<void> {
-  // A new enqueue means the user wants another attempt. Clear a leftover skip from
-  // canceling an *active* login (dequeue marks skipped even when the job already started).
-  skippedNodeIds.delete(nodeId);
+  const gen = bumpJobGeneration(nodeId);
   pendingNodeIds.add(nodeId);
   notifyQueueChanged();
 
   const job = chain.then(async () => {
     pendingNodeIds.delete(nodeId);
-    const wasSkipped = skippedNodeIds.has(nodeId);
-    if (wasSkipped) {
-      skippedNodeIds.delete(nodeId);
-      throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
-    }
+    throwIfJobStale(nodeId, gen);
     activeNodeId = nodeId;
     notifyQueueChanged();
     const waitMs =
@@ -87,12 +94,9 @@ export function enqueueMeshcoreRoomLogin(nodeId: number, run: () => Promise<void
         ? Math.max(0, MESHCORE_ROOM_SYNC_MIN_MESH_TX_SPACING_MS - (Date.now() - lastMeshLoginTxAt))
         : 0;
     if (waitMs > 0) {
-      await sleepMsUnlessSkipped(waitMs, nodeId);
-    }
-    if (skippedNodeIds.has(nodeId)) {
-      skippedNodeIds.delete(nodeId);
-      throw new DOMException(MESHCORE_ROOM_LOGIN_ABORT_MESSAGE, 'AbortError');
+      await sleepMsUnlessStale(waitMs, nodeId, gen);
     }
+    throwIfJobStale(nodeId, gen);
     try {
       await run();
       lastMeshLoginTxAt = Date.now();
@@ -111,9 +115,9 @@ export function enqueueMeshcoreRoomLogin(nodeId: number, run: () => Promise<void
   return job;
 }
 
-/** Remove a room from the pending queue (does not abort an active login). */
+/** Remove a room from the pending queue (does not abort an already-started run()). */
 export function dequeueMeshcoreRoomLogin(nodeId: number): void {
-  skippedNodeIds.add(nodeId);
+  bumpJobGeneration(nodeId);
   pendingNodeIds.delete(nodeId);
   notifyQueueChanged();
 }
@@ -121,7 +125,7 @@ export function dequeueMeshcoreRoomLogin(nodeId: number): void {
 /** Skip all pending logins; active login must be aborted separately. */
 export function clearMeshcoreRoomLoginQueue(): void {
   for (const nodeId of pendingNodeIds) {
-    skippedNodeIds.add(nodeId);
+    bumpJobGeneration(nodeId);
   }
   pendingNodeIds.clear();
   notifyQueueChanged();
@@ -132,7 +136,7 @@ export function resetMeshcoreRoomLoginQueue(): void {
   chain = Promise.resolve();
   activeNodeId = null;
   pendingNodeIds.clear();
-  skippedNodeIds.clear();
+  jobGenerationByNode.clear();
   lastMeshLoginTxAt = 0;
   notifyQueueChanged();
 }
diff --git a/src/renderer/lib/meshcoreRoomSession.test.ts b/src/renderer/lib/meshcoreRoomSession.test.ts
index ddf70def9..946b96199 100644
--- a/src/renderer/lib/meshcoreRoomSession.test.ts
+++ b/src/renderer/lib/meshcoreRoomSession.test.ts
@@ -389,6 +389,29 @@ describe('meshcoreRoomSession', () => {
     });
   });
 
+  it('tryRelogin post sends blank guest password for a blank readwrite session', async () => {
+    meshcoreClearAllRoomSessions();
+    mockRunMeshcoreRoomLogin.mockResolvedValue({ permissions: 2 });
+    const conn = {
+      on: vi.fn(),
+      off: vi.fn(),
+      once: vi.fn(),
+      sendToRadioFrame: vi.fn(),
+    };
+    const pubKey = new Uint8Array(32);
+    meshcoreApplyRoomSession(42, {
+      guestPassword: '',
+      adminPassword: '',
+      role: 'readwrite',
+    });
+    const ok = await meshcoreRoomTryRelogin(conn, 42, pubKey, 'post');
+    expect(ok).toBe(true);
+    expect(mockRunMeshcoreRoomLogin).toHaveBeenCalledWith(conn, pubKey, '', {
+      hopsAway: undefined,
+      signal: expect.any(AbortSignal),
+    });
+  });
+
   it('tryRelogin rethrows abort instead of treating it as a failed relogin', async () => {
     meshcoreClearAllRoomSessions();
     mockRunMeshcoreRoomLogin.mockReturnValue(new Promise(() => undefined));
diff --git a/src/renderer/lib/meshcoreRoomSession.ts b/src/renderer/lib/meshcoreRoomSession.ts
index 8b56acebd..c35abd4b6 100644
--- a/src/renderer/lib/meshcoreRoomSession.ts
+++ b/src/renderer/lib/meshcoreRoomSession.ts
@@ -489,7 +489,9 @@ export async function meshcoreRoomTryRelogin(
       ? resolveRoomAdminPassword(nodeId, session.adminPassword)
       : session.adminPassword;
   const password = mode === 'admin' ? adminPassword : session.guestPassword;
-  if (!password.trim()) return false;
+  // Admin must have a non-empty password. Blank guest is a valid read-only / RW
+  // recovery SendLogin after reconnect (explicit remembered empty guest).
+  if (mode === 'admin' && !password.trim()) return false;
   try {
     await meshcoreRoomLogin(conn, nodeId, pubKey, password, {
       adminPassword: adminPassword || session.adminPassword,
diff --git a/src/renderer/lib/meshcoreUtils.test.ts b/src/renderer/lib/meshcoreUtils.test.ts
index 057f9aa0d..14d390258 100644
--- a/src/renderer/lib/meshcoreUtils.test.ts
+++ b/src/renderer/lib/meshcoreUtils.test.ts
@@ -515,6 +515,12 @@ describe('resolveMeshcoreRoomLoginHopsAway', () => {
     expect(resolveMeshcoreRoomLoginHopsAway({ hops_away: 1 }, undefined)).toBe(0);
     expect(resolveMeshcoreRoomLoginHopsAway({ hops_away: 3 }, new Uint8Array())).toBe(0);
   });
+
+  it('treats a padded direct route as 0-hop during room login', () => {
+    expect(resolveMeshcoreRoomLoginHopsAway({ hops_away: 3 }, new Uint8Array([0x42, 0, 0]))).toBe(
+      0,
+    );
+  });
 });
 
 describe('meshcoreMergeContactHopsAwayFromPrevious', () => {
diff --git a/src/renderer/lib/meshcoreUtils.ts b/src/renderer/lib/meshcoreUtils.ts
index 19f3b2814..18b31acea 100644
--- a/src/renderer/lib/meshcoreUtils.ts
+++ b/src/renderer/lib/meshcoreUtils.ts
@@ -572,20 +572,18 @@ export function resolveMeshcoreRoomLoginHopsAway(
   outPathBytes?: Uint8Array,
 ): number {
   const hops = node?.hops_away;
-  const hasMultiHopPath = Boolean(outPathBytes && outPathBytes.length > 1);
+  const inferred =
+    outPathBytes && outPathBytes.length > 0
+      ? meshcoreInferHopsFromOutPath({ outPath: outPathBytes, outPathLen: -1 })
+      : undefined;
+  const hasMultiHopPath = inferred != null && inferred > 0;
   if (typeof hops === 'number' && Number.isFinite(hops) && hops > 0 && hasMultiHopPath) {
     return Math.trunc(hops);
   }
-  if (outPathBytes && outPathBytes.length > 0) {
-    const inferred = meshcoreInferHopsFromOutPath({ outPath: outPathBytes, outPathLen: -1 });
-    if (inferred != null && inferred > 0) {
-      return inferred;
-    }
-    if (outPathBytes.length > 1) {
-      return Math.max(1, outPathBytes.length - 1);
-    }
+  if (inferred != null && inferred > 0) {
+    return inferred;
   }
-  // Sticky multi-hop with no route bytes → treat as direct for login.
+  // Sticky multi-hop with no (trimmed) route bytes → treat as direct for login.
   if (typeof hops === 'number' && Number.isFinite(hops) && hops >= 0 && !hasMultiHopPath) {
     return 0;
   }
diff --git a/src/renderer/runtime/useMeshcoreRuntime.ts b/src/renderer/runtime/useMeshcoreRuntime.ts
index fa207b0bc..1ec9f8566 100644
--- a/src/renderer/runtime/useMeshcoreRuntime.ts
+++ b/src/renderer/runtime/useMeshcoreRuntime.ts
@@ -6321,7 +6321,7 @@ export function useMeshcoreRuntime() {
           'loginRoom',
         );
       } catch (e: unknown) {
-        if (errLikeToLogString(e).includes('loginRoom timed out')) {
+        if (!meshcoreIsRoomLoginAbortError(e)) {
           meshcoreCancelRoomLogin(nodeId);
         }
         throw e;
@@ -6467,6 +6467,10 @@ export function useMeshcoreRuntime() {
       return;
     }
 
+    if (meshcoreIsRoomLoginQueued(target.nodeId)) {
+      return;
+    }
+
     try {
       const password = meshcoreRoomEffectiveGuestPassword(cred.guestPassword ?? '');
       if (!connRef.current) return;
@@ -6585,6 +6589,9 @@ export function useMeshcoreRuntime() {
     if (!cred) return;
     const pubKey = pubKeyMapRef.current.get(target.nodeId);
     if (!pubKey) return;
+    if (meshcoreIsRoomLoginQueued(target.nodeId)) {
+      return;
+    }
     try {
       const password = meshcoreRoomEffectiveGuestPassword(cred.guestPassword ?? '');
       if (!connRef.current) return;