Merge remote-tracking branch 'origin/main' into remote-admin

# Conflicts:
#	contact/ui/contact_ui.py
#	contact/ui/control_ui.py

.vscode/launch.json

@@ -17,6 +17,14 @@
             "cwd": "${workspaceFolder}",
             "module": "contact.__main__",
             "args": ["--host","192.168.86.69"]
+        },
+        {
+            "name": "Python Debugger: tcp-remote",
+            "type": "debugpy",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "module": "contact.__main__",
+            "args": ["--host","100.89.187.29"]
         }
     ]
 }

README.md

@@ -45,6 +45,14 @@ All messages will saved in a SQLite DB and restored upon relaunch of the app.  Y
 
 By navigating to Settings -> App Settings, you may customize your UI's icons, colors, and more!
 
+### Notification sounds
+
+Add audio files to Contact's `contact/sounds/` folder, then choose one in Settings → App Settings → Notification sound. `alert.mp3` is the default selection; choose `None` to disable notification audio. Supported file types are MP3, WAV, OGG, AIFF, and FLAC.
+
+### Remote administration
+
+With the Nodes pane selected, press `` ` `` or `F12` and choose **Remote admin** for the highlighted node. Contact requests the node's settings through Meshtastic Remote Admin and displays an error if the node does not authorize your public key. Remote App Settings are intentionally unavailable because they apply only to the local Contact client.
+
 For smaller displays you may wish to enable `single_pane_mode`:
 
 <img width="486" height="194" alt="Screenshot 2025-08-22 at 11 15 54 PM" src="https://github.com/user-attachments/assets/447c5d30-0850-4a4f-b0d4-976e4c5e329d" />
@@ -60,7 +68,6 @@ For smaller displays you may wish to enable `single_pane_mode`:
 - `CTRL` + `t` or `F4` = With the Node List highlighted, send a traceroute to the selected node
 - `F5` = Display a node's info
 - `CTRL` + `f` = With the Node List highlighted, favorite the selected node
-- `CTRL` + `b` = Enable/Disable Autoresponder Bot (ping / pong)
 - `CTRL` + `g` = With the Node List highlighted, ignore the selected node 
 - `CTRL` + `d` = With the Channel List hightlighted, archive a chat to reduce UI clutter. Messages will be saved in the db and repopulate if you send or receive a DM from this user.
 - `CTRL` + `d` = With the Note List highlghted, remove a node from your nodedb.

contact/localisations/en.ini

@@ -81,7 +81,6 @@ help.traceroute, "Ctrl+T or F4 = Traceroute", ""
 help.node_info, "F5 = Full node info", ""
 help.archive_chat, "Ctrl+D = Archive chat / remove node", ""
 help.favorite, "Ctrl+F = Favorite", ""
-help.bot_responder, "Ctrl+B = Toggle Bot Responder", ""
 help.ignore, "Ctrl+G = Ignore", ""
 help.search, "Ctrl+/ or / = Search", ""
 help.help, "Ctrl+K = Help", ""
@@ -94,11 +93,6 @@ confirm.remove_ignored, "Remove {name} from Ignored?", ""
 confirm.region_unset, "Your region is UNSET.  Set it now?", ""
 dialog.resize_title, "Resize Terminal", ""
 dialog.resize_body, "Please resize the terminal to at least {rows} rows.", ""
-bot.status.enabled, "Enabled", ""
-bot.status.disabled, "Disabled", ""
-bot.dialog.title, "Bot Responder", ""
-bot.dialog.body, "Bot responder is now {status}.", ""
-bot.status.message, "Bot responder is now {status}.", ""
 
 [User Settings]
 user, "User"
@@ -118,7 +112,7 @@ language, "Language", "UI language for labels and help text."
 message_prefix, "Message prefix", ""
 sent_message_prefix, "Sent message prefix", ""
 notification_symbol, "Notification symbol", ""
-notification_sound, "Notification sound", ""
+notification_sound, "Notification sound", "Select a sound file from Contact's sounds folder, or None to disable notification audio."
 ack_implicit_str, "ACK (implicit)", ""
 ack_str, "ACK", ""
 nak_str, "NAK", ""
@@ -132,6 +126,7 @@ COLOR_CONFIG_GREEN, "Theme colors (green)", ""
 
 [app_settings.ping_bot]
 title, "Ping Bot", ""
+enabled, "Enabled", "Enable automatic Ping Bot responses."
 catch_words, "Catch words", "Semicolon-separated bot trigger words."
 response_word, "Response word", "Bot response word."
 
@@ -257,6 +252,8 @@ heading_bold, "Heading bold", "The heading can be hard to read when 'INVERTED' o
 wake_on_tap_or_motion, "Wake on tap or motion", "This option enables the ability to wake the device screen when motion, such as a tap on the device, is detected via an attached accelerometer, or a capacitive touch button."
 compass_orientation, "Compass orientation", "Whether to rotate the compass."
 use_12h_clock, "Use 12 hour clock"
+use_long_node_name, "Use long node name", "Show each node's long name on the device display when space permits."
+enable_message_bubbles, "Enable message bubbles", "Display messages in chat-style bubbles on supported device displays."
 
 [config.device_ui]
 title, "Device UI"
@@ -275,6 +272,10 @@ node_filter, "Node Filter", ""
 node_highlight, "Node Highlight", ""
 calibration_data, "Calibration Data", ""
 map_data, "Map Data", ""
+compass_mode, "Compass mode", "Controls whether the compass is dynamic, fixed, or freezes its heading."
+screen_rgb_color, "Screen RGB color", "Sets the display color on supported RGB screens."
+is_clockface_analog, "Analog clock face", "Use an analog clock face on supported device displays."
+gps_format, "GPS coordinate format", "Select the coordinate format used by the device UI."
 
 [config.device_ui.node_filter]
 title, "Node Filter"
@@ -300,6 +301,12 @@ home, "Home", ""
 style, "Style", ""
 follow_gps, "Follow GPS", ""
 
+[config.device_ui.map_data.home]
+title, "Home location", ""
+zoom, "Zoom", "Map zoom level for the home location."
+latitude, "Latitude", "Latitude of the home location."
+longitude, "Longitude", "Longitude of the home location."
+
 [config.lora]
 title, "LoRa"
 use_preset, "Use modem preset", "Presets are pre-defined modem settings (Bandwidth, Spread Factor, and Coding Rate) which influence both message speed and range. The vast majority of users use a preset."
@@ -319,6 +326,8 @@ override_frequency, "Override frequency in MHz", "Overrides frequency slot. May
 pa_fan_disabled, "PA Fan Disabled", "If true, disable the build-in PA FAN using pin define in RF95_FAN_EN"
 ignore_mqtt, "Ignore MQTT", "Ignores any messages it receives via LoRa that came via MQTT somewhere along the path towards the device."
 config_ok_to_mqtt, "OK to MQTT", "Indicates that the user approves their packets to be uplinked to MQTT brokers."
+fem_lna_mode, "FEM LNA mode", "Configures the front-end module low-noise amplifier mode on supported hardware."
+serial_hal_only, "Serial HAL only", "Use only the serial hardware abstraction layer on supported hardware."
 
 [config.bluetooth]
 title, "Bluetooth"
@@ -335,6 +344,7 @@ serial_enabled, "Enable serial console", ""
 debug_log_api_enabled, "Enable debug log", "Set this to true to continue outputting live debug logs over serial or Bluetooth when the API is active."
 admin_channel_enabled, "Enable legacy admin channel", "If the node you need to administer or be administered by is running 2.4.x or earlier, you should set this to enabled. Requires a secondary channel named 'admin' be present on both nodes."
 admin_key, "Admin keys", "The public key(s) authorized to send administrative messages to this node. Only messages signed by these keys will be accepted for administrative control. Up to 3."
+packet_signature_policy, "Packet signature policy", "Controls how the node validates packet signatures."
 
 [module.mqtt]
 title, "MQTT"
@@ -366,6 +376,7 @@ override_console_serial_port, "Override console serial port", "If set to true, t
 
 [module.external_notification]
 title, "External Notification"
+ringtone, "Ringtone", "RTTTL ringtone played by supported external-notification hardware."
 enabled, "Enabled", "Enables the module."
 output_ms, "Length", "Specifies how long in milliseconds you would like your GPIOs to be active. In case of the repeat option, this is the duration of every tone and pause."
 output, "Output GPIO", "Define the output pin GPIO setting Defaults to EXT_NOTIFY_OUT if set for the board. In standalone devices this pin should drive the LED to match the UI."
@@ -396,6 +407,7 @@ title, "Range Test"
 enabled, "Enabled", "Enables the module."
 sender, "Sender interval", "How long to wait between sending sequential test packets in seconds. 0 is default which disables sending messages."
 save, "Save CSV file", "If enabled, all received messages are saved to the device's flash memory in a file named rangetest.csv. Leave disabled when using the Android or Apple apps. Saves directly to the device's flash memory (without the need for a smartphone). [warning]Only available on ESP32-based devices.[/warning]"
+clear_on_reboot, "Clear CSV on reboot", "Delete the RangeTest.csv file when the device reboots. [warning]Only available on ESP32-based devices.[/warning]"
 
 [module.telemetry]
 title, "Telemetry"
@@ -413,9 +425,11 @@ health_measurement_enabled, "Health telemetry interval", "This option is used to
 health_update_interval, "Health telemetry enabled", "This option is used to enable/disable the sending of health data from an attached supported sensor over the mesh network."
 health_screen_enabled, "Health screen enabled", "Show the health telemetry data on the device display."
 device_telemetry_enabled, "Device telemetry enabled", "Enable the Device Telemetry"
+air_quality_screen_enabled, "Air quality screen enabled", "Show air-quality telemetry on the device display."
 
 [module.canned_message]
 title, "Canned Message"
+messages, "Messages", "Pipe-separated canned messages, for example: Hi|On my way|Yes|No."
 rotary1_enabled, "Rotary encoder enabled", "Enable the default rotary encoder."
 inputbroker_pin_a, "Input broker pin A", "GPIO Pin Value (1-39) For encoder port A."
 inputbroker_pin_b, "Input broker pin B", "GPIO Pin Value (1-39) For encoder port B."
@@ -473,5 +487,52 @@ use_pullup, "Use pull-up", "Whether or not use INPUT_PULLUP mode for GPIO pin. O
 title, "Paxcounter"
 enabled, "Enabled", "Enables the module."
 paxcounter_update_interval, "Update interval", "The interval in seconds of how often we can send a message to the mesh when a state change is detected."
-Wi-Fi_threshold, "Wi-Fi Threshold", "WiFi RSSI threshold. Defaults to -80"
+wifi_threshold, "Wi-Fi threshold", "Wi-Fi RSSI threshold. Defaults to -80."
 ble_threshold, "BLE Threshold", "BLE RSSI threshold. Defaults to -80"
+
+[module.statusmessage]
+title, "Status Message"
+node_status, "Node status", ""
+
+[module.traffic_management]
+title, "Traffic Management"
+position_min_interval_secs, "Position minimum interval", "Minimum seconds between position updates from the same node. Set to 0 to disable position-update suppression."
+nodeinfo_direct_response_max_hops, "NodeInfo direct-response maximum hops", "Maximum hop distance at which cached NodeInfo requests receive a direct response. Set to 0 to disable direct responses."
+rate_limit_window_secs, "Rate-limit window", "Per-node rate-limit window in seconds. Set to 0 to disable rate limiting."
+rate_limit_max_packets, "Rate-limit maximum packets", "Maximum packets allowed per node during the rate-limit window. Set to 0 to disable rate limiting."
+unknown_packet_threshold, "Unknown-packet threshold", "Maximum unknown or undecryptable packets per rate-limit window before packets from that source are dropped. Set to 0 to disable filtering."
+
+[module.tak]
+title, "Tak"
+team, "Team", "Your team color."
+role, "Role", "Your role in the team."
+
+[module.mesh_beacon]
+title, "Mesh Beacon", ""
+flags, "Beacon options", "Bitwise combination of the listen, broadcast, and legacy-split options."
+broadcast_send_as_node, "Broadcast as node", "Optional node ID to use as the sender of beacon packets. Leave unset to send as this node."
+broadcast_message, "Broadcast message", "Message included in each beacon broadcast. Maximum 100 bytes."
+broadcast_offer_channel, "Offered channel", "Optional channel name and key to advertise in the beacon offer."
+broadcast_offer_region, "Offered region", "Optional LoRa region to advertise in the beacon offer."
+broadcast_offer_preset, "Offered modem preset", "Optional modem preset to advertise in the beacon offer."
+broadcast_on_channel, "Broadcast channel", "Optional channel settings to use when transmitting beacons. Uses the primary channel when unset."
+broadcast_on_region, "Broadcast region", "Optional LoRa region to use when transmitting beacons."
+broadcast_on_preset, "Broadcast modem preset", "Optional modem preset to use when transmitting beacons."
+broadcast_interval_secs, "Broadcast interval", "How often to broadcast beacons in seconds. The minimum and default is 3600 seconds."
+broadcast_targets, "Broadcast targets", "Optional list of channel, region, and modem-preset targets for beacon broadcasts."
+
+[module.mesh_beacon.broadcast_offer_channel]
+title, "Offered channel", ""
+psk, "PSK", "Encryption key for the offered channel."
+name, "Name", "Name of the offered channel."
+
+[module.mesh_beacon.broadcast_on_channel]
+title, "Broadcast channel", ""
+psk, "PSK", "Encryption key for the broadcast channel."
+name, "Name", "Name of the broadcast channel."
+
+[module.mesh_beacon.broadcast_targets]
+title, "Broadcast targets", ""
+preset, "Modem preset", "Optional modem preset for this beacon target."
+region, "Region", "LoRa region for this beacon target."
+channel_index, "Channel index", "Index of the configured channel to use for this beacon target."

contact/localisations/fr.ini

@@ -78,16 +78,10 @@ help.traceroute, "Ctrl+T ou F4 = Traceroute", ""
 help.node_info, "F5 = Informations complètes du nœud", ""
 help.archive_chat, "Ctrl+D = Archiver la discussion / supprimer le nœud", ""
 help.favorite, "Ctrl+F = Favori", ""
-help.bot_responder, "Ctrl+B = Activer/désactiver le bot répondeur", ""
 help.ignore, "Ctrl+G = Ignorer", ""
 help.search, "Ctrl+/ ou / = Rechercher", ""
 help.help, "Ctrl+K = Aide", ""
 help.no_help, "Aucune aide disponible.", ""
-bot.status.enabled, "Activé", ""
-bot.status.disabled, "Désactivé", ""
-bot.dialog.title, "Bot répondeur", ""
-bot.dialog.body, "Le bot répondeur est maintenant {status}.", ""
-bot.status.message, "Le bot répondeur est maintenant {status}.", ""
 
 [User Settings]
 user, "Utilisateur", ""
@@ -118,6 +112,7 @@ ping_bot, "Bot Ping", ""
 
 [app_settings.ping_bot]
 title, "Bot Ping", ""
+enabled, "Activé", "Activer les réponses automatiques du bot Ping."
 catch_words, "Mots déclencheurs", "Mots déclencheurs du bot séparés par des points-virgules."
 response_word, "Mot de réponse", "Mot de réponse du bot."
 

contact/localisations/ru.ini

@@ -78,7 +78,6 @@ help.traceroute, "Ctrl+T или F4 = Traceroute", ""
 help.node_info, "F5 = Полная информация об узле", ""
 help.archive_chat, "Ctrl+D = Архив чата / удалить узел", ""
 help.favorite, "Ctrl+F = Избранное", ""
-help.bot_responder, "Ctrl+B = Вкл/выкл автоответчик", ""
 help.ignore, "Ctrl+G = Игнорировать", ""
 help.search, "Ctrl+/ или / = Поиск", ""
 help.help, "Ctrl+K = Справка", ""
@@ -91,11 +90,6 @@ confirm.remove_ignored, "Убрать {name} из игнорируемых?", ""
 confirm.region_unset, "Ваш регион НЕ ЗАДАН. Установить сейчас?", ""
 dialog.resize_title, "Увеличьте окно", ""
 dialog.resize_body, "Пожалуйста, увеличьте окно до {rows} строк.", ""
-bot.status.enabled, "Включен", ""
-bot.status.disabled, "Выключен", ""
-bot.dialog.title, "Автоответчик", ""
-bot.dialog.body, "Автоответчик теперь {status}.", ""
-bot.status.message, "Автоответчик теперь {status}.", ""
 
 [User Settings]
 user, "Пользователь"
@@ -129,6 +123,7 @@ COLOR_CONFIG_GREEN, "Цвета темы (зеленая)", ""
 
 [app_settings.ping_bot]
 title, "Пинг-бот", ""
+enabled, "Включен", "Включить автоматические ответы пинг-бота."
 catch_words, "Слова-триггеры", "Слова для активации бота, разделенные точкой с запятой."
 response_word, "Ответное слово", "Ответное слово бота."
 

contact/message_handlers/bot_handler.py

@@ -5,7 +5,7 @@ import time
 from typing import Any, Dict
 
 import contact.ui.default_config as config
-from contact.utilities.singleton import app_state, interface_state, ui_state
+from contact.utilities.singleton import app_state, interface_state
 from contact.message_handlers.tx_handler import send_message
 
 BOT_RESPONSE_DELAY_SECONDS = 2.3
@@ -24,9 +24,15 @@ def is_bot_message(message: str) -> bool:
     """Return True when the incoming message should trigger an automatic response."""
     return message.strip().casefold() in _get_bot_catch_words()
 
+
+def is_bot_enabled() -> bool:
+    """Return whether automatic responses are enabled in app settings."""
+    value = getattr(config, "ping_bot_enabled", False)
+    return value if isinstance(value, bool) else str(value).strip().casefold() == "true"
+
 def bot_respond(packet: Dict[str, Any], message: str, send_channel: int) -> bool:
     """Send a basic response when bot mode is enabled."""
-    if not ui_state.bot_mode_enabled:
+    if not is_bot_enabled():
         return False
 
     if not is_bot_message(message):
@@ -40,7 +46,8 @@ def bot_respond(packet: Dict[str, Any], message: str, send_channel: int) -> bool
         return False
     snr = packet.get('rxSnr', -128)
     rssi = packet.get('rxRssi', -128)
-    replyIDset = (packet.get('decoded') or {}).get('replyId', False)
+    incoming_reply_id = (packet.get('decoded') or {}).get('replyId')
+    packet_id = packet.get("id")
     hop_start = packet.get('hopStart', 0)
     hop_limit = packet.get('hopLimit', 0)
     transport_type = packet.get('transportMechanism', None)
@@ -53,8 +60,8 @@ def bot_respond(packet: Dict[str, Any], message: str, send_channel: int) -> bool
         details.append(f"RSSI: {rssi}")
     if hops != 0:
         details.append(f"Hops: {hops}")
-    if replyIDset:
-        details.append(f"Relay: {replyIDset}")
+    if incoming_reply_id:
+        details.append(f"Relay: {incoming_reply_id}")
     transport_text = str(transport_type).upper() if transport_type is not None else ""
     for transport_name in ("UDP", "MQTT"):
         if transport_name in transport_text:
@@ -69,10 +76,12 @@ def bot_respond(packet: Dict[str, Any], message: str, send_channel: int) -> bool
             time.sleep(BOT_RESPONSE_DELAY_SECONDS)
 
             with app_state.lock:
-                if not ui_state.bot_mode_enabled:
+                if not is_bot_enabled():
                     return
 
-                send_message(response_data_string,channel=send_channel)
+                # Use the triggering packet's ID so Meshtastic clients render this
+                # automatic response as a native reply when that ID is available.
+                send_message(response_data_string, channel=send_channel, reply_id=packet_id)
 
             # Import locally to avoid circular import at module import time.
             from contact.ui.contact_ui import request_ui_redraw

contact/message_handlers/rx_handler.py

@@ -66,37 +66,34 @@ from contact.message_handlers.bot_handler import bot_respond
 
 def play_sound():
     try:
-        system = platform.system()
-        sound_path = None
-        executable = None
+        selected_sound = str(getattr(config, "notification_sound", "None"))
+        if selected_sound.casefold() in {"none", "false", ""}:
+            return
+        sound_path = os.path.join(config.parent_dir, "sounds", selected_sound)
+        if not os.path.isfile(sound_path):
+            logging.warning("Configured notification sound is unavailable: %s", sound_path)
+            return
 
-        if system == "Darwin":  # macOS
-            sound_path = "/System/Library/Sounds/Ping.aiff"
-            executable = "afplay"
-
-        elif system == "Linux":
-            ogg_path = "/usr/share/sounds/freedesktop/stereo/complete.oga"
-            wav_path = "/usr/share/sounds/alsa/Front_Center.wav"  # common fallback
-
-            if shutil.which("paplay") and os.path.exists(ogg_path):
-                executable = "paplay"
-                sound_path = ogg_path
-            elif shutil.which("ffplay") and os.path.exists(ogg_path):
-                executable = "ffplay"
-                sound_path = ogg_path
-            elif shutil.which("aplay") and os.path.exists(wav_path):
-                executable = "aplay"
-                sound_path = wav_path
-            else:
-                logging.warning("No suitable sound player or sound file found on Linux")
+        executable = "afplay" if platform.system() == "Darwin" else next(
+            (shutil.which(player) for player in ("ffplay", "mpg123", "mpv", "cvlc", "paplay") if shutil.which(player)),
+            None,
+        )
 
         if executable and sound_path:
+            player = os.path.basename(executable)
             cmd = [executable, sound_path]
-            if executable == "ffplay":
+            if player == "ffplay":
                 cmd = [executable, "-nodisp", "-autoexit", sound_path]
+            elif player == "mpv":
+                cmd = [executable, "--no-video", sound_path]
+            elif player == "cvlc":
+                cmd = [executable, "--play-and-exit", sound_path]
 
             subprocess.run(cmd, check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
             return
+        logging.warning(
+            "No suitable sound player found for notification sound; install ffmpeg (ffplay), mpg123, mpv, or VLC."
+        )
 
     except subprocess.CalledProcessError as e:
         logging.error(f"Sound playback failed: {e}")
@@ -144,7 +141,7 @@ def on_receive(packet: Dict[str, Any], interface: Any) -> None:
                 hops = hop_start - hop_limit
 
 
-                if config.notification_sound == "True":
+                if str(config.notification_sound).casefold() not in {"none", "false", ""}:
                     schedule_notification_sound()
 
                 message_bytes = packet["decoded"]["payload"]

contact/ui/contact_ui.py

@@ -1,5 +1,6 @@
 import curses
 import logging
+from typing import Optional
 import time
 import traceback
 from numbers import Real
@@ -383,6 +384,41 @@ def main_ui(stdscr: curses.window) -> None:
     handle_resize(stdscr, True)
 
     while True:
+        interface = interface_state.interface
+        if (
+            hasattr(interface, "stream")
+            and interface.stream is None
+            and not ui_state.reconnect_attempted
+        ):
+            ui_state.reconnect_attempted = True
+            status_win = show_connection_status(stdscr, "Disconnected", "Trying to reconnect…")
+            try:
+                from contact.ui.control_ui import reconnect_interface_with_splash
+
+                reconnect_interface_with_splash(stdscr, interface)
+                if status_win is not None:
+                    status_win.erase()
+                    status_win.refresh()
+                ui_state.reconnect_attempted = False
+                handle_resize(stdscr, False)
+            except Exception:
+                if status_win is not None:
+                    status_win.erase()
+                    status_win.refresh()
+                handle_resize(stdscr, False)
+                logging.exception("Automatic reconnect after transport disconnect failed")
+                retry = get_list_input(
+                    "Contact could not reconnect after 20 seconds.",
+                    "Retry",
+                    ["Retry", "Cancel"],
+                    mandatory=True,
+                )
+                if retry == "Retry":
+                    ui_state.reconnect_attempted = False
+                    handle_resize(stdscr, False)
+                    continue
+                handle_resize(stdscr, False)
+
         with app_state.lock:
             process_pending_ui_updates(stdscr)
         entry_display = f"{ui_state.reply_context}{input_text or ''}"
@@ -468,9 +504,6 @@ def main_ui(stdscr: curses.window) -> None:
         elif char == chr(6):  # Ctrl + F to toggle favorite
             handle_ctrl_f(stdscr)
 
-        elif char == chr(2):  # Ctrl + B to toggle bot responder
-            handle_ctrl_b(stdscr)
-
         elif char == chr(7):  # Ctrl + G to toggle ignored
             handle_ctlr_g(stdscr)
 
@@ -655,12 +688,27 @@ def handle_enter(input_text: str) -> str:
             )
             return input_text
         # Enter key pressed, send user input as message
-        send_message(
-            input_text,
-            channel=ui_state.selected_channel,
-            reply_id=ui_state.reply_id,
-            reply_context=ui_state.reply_context,
-        )
+        try:
+            send_message(
+                input_text,
+                channel=ui_state.selected_channel,
+                reply_id=ui_state.reply_id,
+                reply_context=ui_state.reply_context,
+            )
+        except Exception as exc:
+            logging.warning("Message send failed; reconnecting interface: %s", exc)
+            try:
+                from contact.ui.control_ui import reconnect_interface_with_splash
+
+                reconnect_interface_with_splash(root_win, interface_state.interface)
+                contact.ui.dialog.dialog("Reconnected", "Connection restored. Your message was not sent; press Enter to retry.")
+            except Exception as reconnect_exc:
+                logging.exception("Automatic reconnect failed")
+                contact.ui.dialog.dialog(
+                    "Reconnect failed",
+                    "Contact could not reconnect after 20 seconds. Check the radio connection and retry your message.",
+                )
+            return input_text
         ui_state.reply_id = None
         ui_state.reply_context = ""
         ui_state.reply_id_unavailable = False
@@ -941,7 +989,65 @@ def handle_backtick(stdscr: curses.window) -> None:
     curses.curs_set(0)
     previous_window = ui_state.current_window
     ui_state.current_window = 4
-    settings_menu(stdscr, interface_state.interface)
+    interface = interface_state.interface
+    if previous_window != 2:
+        settings_menu(stdscr, interface)
+        ui_state.current_window = previous_window
+        ui_state.single_pane_mode = config.single_pane_mode.lower() == "true"
+        curses.curs_set(1)
+        get_channels()
+        refresh_node_list()
+        handle_resize(stdscr, False)
+        return
+
+    options = ["Local settings"]
+    remote_node_num = None
+    if ui_state.node_list:
+        remote_node_num = ui_state.node_list[ui_state.selected_node]
+        options.append(f"Remote admin: {get_name_from_database(remote_node_num)}")
+    choice = get_list_input("Open settings for", None, options)
+    if choice == "Local settings":
+        settings_menu(stdscr, interface)
+    elif remote_node_num is not None:
+        wait_win = None
+
+        def remote_status(message: Optional[str]) -> None:
+            nonlocal wait_win
+            if message is None:
+                if wait_win is not None:
+                    wait_win.erase()
+                    wait_win.refresh()
+                    wait_win = None
+                return
+            if wait_win is None:
+                wait_win = show_remote_admin_wait(stdscr, get_name_from_database(remote_node_num))
+            update_remote_admin_wait(wait_win, message)
+
+        try:
+            settings_menu(
+                stdscr,
+                interface,
+                # Settings requests configs explicitly; avoid getNode's
+                # implicit channel request racing that setup.
+                node=interface.getNode(remote_node_num, False),
+                remote=True,
+                status_callback=remote_status,
+            )
+        except SystemExit as exc:
+            logging.warning("Remote admin was rejected for %s: %s", remote_node_num, exc)
+            if wait_win is not None:
+                wait_win.erase()
+                wait_win.refresh()
+            contact.ui.dialog.dialog(
+                "Remote admin rejected",
+                "The selected node did not authorize this admin request.",
+            )
+        except Exception as exc:
+            logging.exception("Remote admin failed for %s", remote_node_num)
+            if wait_win is not None:
+                wait_win.erase()
+                wait_win.refresh()
+            contact.ui.dialog.dialog("Remote admin failed", str(exc))
     ui_state.current_window = previous_window
     ui_state.single_pane_mode = config.single_pane_mode.lower() == "true"
     curses.curs_set(1)
@@ -950,6 +1056,55 @@ def handle_backtick(stdscr: curses.window) -> None:
     handle_resize(stdscr, False)
 
 
+def show_remote_admin_wait(stdscr: curses.window, node_name: str) -> curses.window | None:
+    """Show progress while Meshtastic retrieves remote-admin settings."""
+    message = f"Attempting remote admin of {node_name}, waiting for response..."
+    try:
+        height, width = stdscr.getmaxyx()
+        box_width = min(width - 4, max(len(message) + 4, 36))
+        box_height = 5
+        wait_win = curses.newwin(box_height, box_width, max(0, (height - box_height) // 2), max(0, (width - box_width) // 2))
+        wait_win.bkgd(get_color("background"))
+        wait_win.attrset(get_color("window_frame"))
+        wait_win.border()
+        wait_win.addstr(0, 2, " Remote Admin ", get_color("settings_default"))
+        wait_win.addstr(2, 2, message[: box_width - 4], get_color("settings_default"))
+        wait_win.refresh()
+        return wait_win
+    except curses.error:
+        return None
+
+
+def show_connection_status(stdscr: curses.window, title: str, message: str) -> curses.window | None:
+    """Display a non-blocking connection-status dialog over the current UI."""
+    try:
+        height, width = stdscr.getmaxyx()
+        box_width = min(width - 4, max(len(message) + 4, len(title) + 6, 32))
+        win = curses.newwin(5, box_width, max(0, (height - 5) // 2), max(0, (width - box_width) // 2))
+        win.bkgd(get_color("background"))
+        win.attrset(get_color("window_frame"))
+        win.border()
+        win.addstr(0, 2, f" {title} ", get_color("settings_default"))
+        win.addstr(2, 2, message[: box_width - 4], get_color("settings_default"))
+        win.refresh()
+        return win
+    except curses.error:
+        return None
+
+
+def update_remote_admin_wait(wait_win: curses.window | None, message: str) -> None:
+    """Append the current remote-admin request to the waiting overlay."""
+    if wait_win is None:
+        return
+    try:
+        _, width = wait_win.getmaxyx()
+        wait_win.addstr(3, 2, " " * (width - 4), get_color("settings_default"))
+        wait_win.addstr(3, 2, message[: width - 4], get_color("settings_default"))
+        wait_win.refresh()
+    except curses.error:
+        pass
+
+
 def handle_ctrl_p() -> None:
     """Handle Ctrl + P key events to toggle the packet log display."""
     # Display packet log
@@ -1023,7 +1178,6 @@ def handle_ctrl_k(stdscr: curses.window) -> None:
         t("ui.help.node_info", default="F5 = Full node info"),
         t("ui.help.archive_chat", default="Ctrl+D = Archive chat / remove node"),
         t("ui.help.favorite", default="Ctrl+F = Favorite"),
-        t("ui.help.bot_responder", default="Ctrl+B = Toggle Bot Responder"),
         t("ui.help.ignore", default="Ctrl+G = Ignore"),
         t("ui.help.search", default="Ctrl+/ = Search"),
         t("ui.help.help", default="Ctrl+K = Help"),
@@ -1035,32 +1189,6 @@ def handle_ctrl_k(stdscr: curses.window) -> None:
     handle_resize(stdscr, False)
 
 
-def handle_ctrl_b(stdscr: curses.window) -> None:
-    """Handle Ctrl + B key events to toggle automatic bot responses."""
-    ui_state.bot_mode_enabled = not ui_state.bot_mode_enabled
-    status = t("ui.bot.status.enabled", default="Enabled") if ui_state.bot_mode_enabled else t(
-        "ui.bot.status.disabled", default="Disabled"
-    )
-
-    curses.curs_set(0)
-    contact.ui.dialog.dialog(
-        t("ui.bot.dialog.title", default="Bot Responder"),
-        t("ui.bot.dialog.body", default="Bot responder is now {status}.", status=status),
-    )
-
-    if ui_state.channel_list:
-        channel_id = ui_state.channel_list[ui_state.selected_channel]
-        add_new_message(
-            channel_id,
-            f"{config.message_prefix} Info: ",
-            t("ui.bot.status.message", default="Bot responder is now {status}.", status=status.lower()),
-        )
-        draw_messages_window(True)
-
-    curses.curs_set(1)
-    handle_resize(stdscr, False)
-
-
 def handle_ctrl_d() -> None:
     if ui_state.current_window == 0:
         if isinstance(ui_state.channel_list[ui_state.selected_channel], int):
@@ -1705,21 +1833,25 @@ def remove_notification(channel_number: int) -> None:
 
 def draw_text_field(win: curses.window, text: str, color: int) -> None:
     win.border()
+    height, width = win.getmaxyx()
 
     # Put a small hint in the border of the message entry field.
     # We key off the "Message:" prompt to avoid affecting other bordered fields.
     if isinstance(text, str) and text.startswith("Message:"):
         hint = " Ctrl+K Help "
-        h, w = win.getmaxyx()
-        x = max(2, w - len(hint) - 2)
+        x = max(2, width - len(hint) - 2)
         try:
             win.addstr(0, x, hint, get_color("commands"))
         except curses.error:
             pass
 
-    # Draw the actual field text
+    # Clear the row before redrawing.  Reply context can be longer than the
+    # next value (or empty after Ctrl+R cancels it), so simply overwriting the
+    # new text leaves trailing characters from the old context on screen.
     try:
-        win.addstr(1, 1, text, color)
+        if height > 2 and width > 2:
+            win.addstr(1, 1, " " * (width - 2), color)
+        win.addstr(1, 1, text[: max(0, width - 2)], color)
     except curses.error:
         pass
 

contact/ui/control_ui.py

@@ -4,6 +4,8 @@ import ipaddress
 import logging
 import os
 import sys
+import threading
+import time
 from typing import List
 from meshtastic.protobuf import admin_pb2
 
@@ -25,7 +27,6 @@ from contact.ui.colors import get_color
 from contact.ui.dialog import dialog
 from contact.ui.menus import generate_menu_from_protobuf
 from contact.ui.nav_utils import move_highlight, draw_arrows, update_help_window
-from contact.ui.splash import draw_splash
 from contact.ui.user_config import json_editor
 from contact.utilities.arg_parser import setup_parser
 from contact.utilities.singleton import interface_state, menu_state
@@ -34,6 +35,8 @@ from contact.utilities.singleton import interface_state, menu_state
 MAX_MENU_WIDTH = 80  # desired max; will shrink on small terminals
 save_option = "Save Changes"
 max_help_lines = 0
+REMOTE_ADMIN_REQUEST_TIMEOUT_SECONDS = 15
+admin_target_label = ""
 help_win = None
 sensitive_settings = ["Reboot", "Reset Node DB", "Shutdown", "Factory Reset", "factory_reset_config"]
 
@@ -86,7 +89,8 @@ def get_translated_header(menu_path: List[str]) -> str:
             continue
         full_key = ".".join(transformed_path[:idx])
         translated_parts.append(field_mapping.get(full_key, part))
-    return " > ".join(translated_parts)
+    breadcrumb = " > ".join(translated_parts)
+    return f"{admin_target_label} | {breadcrumb}" if admin_target_label else breadcrumb
 
 
 def display_menu() -> tuple[object, object]:
@@ -232,9 +236,6 @@ def reconnect_interface_with_splash(stdscr: object, interface: object) -> object
     except Exception:
         pass
 
-    stdscr.clear()
-    stdscr.refresh()
-    draw_splash(stdscr)
     new_interface = reconnect_interface(setup_parser().parse_args())
     interface_state.interface = new_interface
     redraw_main_ui_after_reconnect(stdscr)
@@ -279,10 +280,80 @@ def redraw_main_ui_after_reconnect(stdscr: object) -> None:
         logging.debug("Skipping main UI redraw after reconnect", exc_info=True)
 
 
-def settings_menu(stdscr: object, interface: object) -> None:
-    curses.update_lines_cols()
+def _request_remote_with_timeout(request, *args) -> None:
+    """Run a Meshtastic remote request without allowing its ACK wait to hang the UI."""
+    failure = []
 
-    menu = generate_menu_from_protobuf(interface)
+    def run_request() -> None:
+        try:
+            request(*args)
+        except BaseException as exc:
+            failure.append(exc)
+
+    worker = threading.Thread(target=run_request, name="remote-admin-request", daemon=True)
+    worker.start()
+    worker.join(REMOTE_ADMIN_REQUEST_TIMEOUT_SECONDS)
+    if worker.is_alive():
+        raise TimeoutError("Timed out waiting for the remote node to answer the admin request.")
+    if failure:
+        raise failure[0]
+
+
+def _request_remote_channels_with_timeout(node: object) -> None:
+    """Retrieve a remote node's channel list without leaving the UI waiting forever."""
+    node.requestChannels()
+    deadline = time.monotonic() + REMOTE_ADMIN_REQUEST_TIMEOUT_SECONDS
+    while getattr(node, "channels", None) is None:
+        if time.monotonic() >= deadline:
+            raise TimeoutError("Timed out waiting for the remote node's channel list.")
+        time.sleep(0.1)
+
+
+def _request_remote_section(node: object, menu_path: List[str], selected_option: str, status_callback=None) -> bool:
+    """Fetch exactly the remote-admin section the user is opening.
+
+    Meshtastic returns radio and module settings one protobuf section at a
+    time.  Asking for all of them on menu entry is both slow and unreliable on
+    long paths, so leave the top-level menu immediately available.
+    """
+    if menu_path == ["Main Menu"] and selected_option == "Channels":
+        if status_callback:
+            status_callback("Requesting channel list…")
+        _request_remote_channels_with_timeout(node)
+        return True
+
+    if len(menu_path) != 2:
+        return False
+
+    category = menu_path[-1]
+    if category == "Radio Settings":
+        config = node.localConfig
+    elif category == "Module Settings":
+        config = node.moduleConfig
+    else:
+        return False
+
+    field = config.DESCRIPTOR.fields_by_name.get(selected_option)
+    if field is None or field.name in {"version", "sessionkey"}:
+        return False
+    if status_callback:
+        status_callback(f"Requesting {selected_option} config…")
+    _request_remote_with_timeout(node.requestConfig, field)
+    return True
+
+
+def settings_menu(
+    stdscr: object, interface: object, node: object = None, remote: bool = False, status_callback=None
+) -> None:
+    curses.update_lines_cols()
+    global admin_target_label
+    node = node or interface.localNode
+    node_num = getattr(node, "nodeNum", 0)
+    node_info = interface.getMyNodeInfo() if not remote else getattr(interface, "nodesByNum", {}).get(node_num, {})
+    node_name = node_info.get("user", {}).get("longName") if isinstance(node_info, dict) else None
+    admin_target_label = node_name or f"!{node_num:08x}"
+
+    menu = generate_menu_from_protobuf(interface, node=node, include_app_settings=not remote)
     menu_state.current_menu = menu["Main Menu"]
     menu_state.menu_path = ["Main Menu"]
 
@@ -387,12 +458,14 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 help_win.refresh()
 
             if menu_state.show_save_option and menu_state.selected_index == len(options):
-                reconnect_required = save_changes(interface, modified_settings, menu_state)
+                reconnect_required = save_changes(interface, modified_settings, menu_state, node=node)
                 modified_settings.clear()
                 logging.info("Changes Saved")
+                if remote:
+                    break
                 if reconnect_required:
                     interface = reconnect_interface_with_splash(stdscr, interface)
-                    menu = generate_menu_from_protobuf(interface)
+                    menu = generate_menu_from_protobuf(interface, node=node, include_app_settings=not remote)
 
                 if len(menu_state.menu_path) > 1:
                     menu_state.menu_path.pop()
@@ -492,7 +565,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 continue
 
             elif selected_option == "Config URL":
-                current_value = interface.localNode.getURL()
+                current_value = node.getURL()
                 new_value = get_text_input(
                     t(
                         "ui.prompt.config_url_current",
@@ -510,7 +583,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                         ["Yes", "No"],
                     )
                     if overwrite == "Yes":
-                        interface.localNode.setURL(new_value)
+                        node.setURL(new_value)
                         logging.info(f"New Config URL sent to node")
                 menu_state.start_index.pop()
                 continue
@@ -521,7 +594,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 )
                 if confirmation == "Yes":
                     interface = reconnect_after_admin_action(
-                        stdscr, interface, interface.localNode.reboot, "Node Reboot Requested by menu"
+                        stdscr, interface, node.reboot, "Node Reboot Requested by menu"
                     )
                     menu = rebuild_menu_at_current_path(interface, menu_state)
                 menu_state.start_index.pop()
@@ -535,7 +608,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 )
                 if confirmation == "Yes":
                     interface = reconnect_after_admin_action(
-                        stdscr, interface, interface.localNode.resetNodeDb, "Node DB Reset Requested by menu"
+                        stdscr, interface, node.resetNodeDb, "Node DB Reset Requested by menu"
                     )
                     menu = rebuild_menu_at_current_path(interface, menu_state)
                 menu_state.start_index.pop()
@@ -546,7 +619,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                     t("ui.confirm.shutdown", default="Are you sure you want to Shutdown?"), None, ["Yes", "No"]
                 )
                 if confirmation == "Yes":
-                    interface.localNode.shutdown()
+                    node.shutdown()
                     logging.info(f"Node Shutdown Requested by menu")
                 menu_state.start_index.pop()
                 continue
@@ -561,7 +634,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                     interface = reconnect_after_admin_action(
                         stdscr,
                         interface,
-                        lambda: request_factory_reset(interface.localNode, full=True),
+                        lambda: request_factory_reset(node, full=True),
                         "Factory Reset Requested by menu",
                     )
                     menu = rebuild_menu_at_current_path(interface, menu_state)
@@ -578,7 +651,7 @@ def settings_menu(stdscr: object, interface: object) -> None:
                     interface = reconnect_after_admin_action(
                         stdscr,
                         interface,
-                        lambda: request_factory_reset(interface.localNode, full=False),
+                        lambda: request_factory_reset(node, full=False),
                         "Factory Reset Config Requested by menu",
                     )
                     menu = rebuild_menu_at_current_path(interface, menu_state)
@@ -609,6 +682,24 @@ def settings_menu(stdscr: object, interface: object) -> None:
                 # Fetch human-readable name from field_mapping
                 human_readable_name = field_mapping.get(full_key, selected_option)
 
+                if field is None and selected_option in ("ringtone", "messages"):
+                    is_ringtone = selected_option == "ringtone"
+                    getter_name = "get_ringtone" if is_ringtone else "get_canned_message"
+                    setter_name = "set_ringtone" if is_ringtone else "set_canned_message"
+                    getter = getattr(node, getter_name, None)
+                    setter = getattr(node, setter_name, None)
+                    fetched_value = getter() if callable(getter) else None
+                    current_value = fetched_value if fetched_value is not None else current_value
+                    new_value = get_text_input(
+                        f"{human_readable_name} is currently: {current_value}", selected_option, None
+                    )
+                    if new_value is not None and new_value != current_value and callable(setter):
+                        setter(new_value)
+                        menu_state.current_menu[selected_option] = (field, new_value)
+                    menu_state.start_index.pop()
+                    menu_state.need_redraw = True
+                    continue
+
                 if selected_option in ["longName", "shortName", "isLicensed"]:
                     if selected_option in ["longName", "shortName"]:
                         new_value = get_text_input(
@@ -717,7 +808,28 @@ def settings_menu(stdscr: object, interface: object) -> None:
 
                 menu_state.current_menu[selected_option] = (field, new_value)
             else:
-                menu_state.current_menu = menu_state.current_menu[selected_option]
+                requested_remote_section = False
+                if remote:
+                    try:
+                        requested_remote_section = _request_remote_section(
+                            node, menu_state.menu_path, selected_option, status_callback
+                        )
+                    finally:
+                        if status_callback:
+                            status_callback(None)
+                    if requested_remote_section:
+                        # The response updates the node's protobufs. Rebuild
+                        # the menu before entering the requested section so
+                        # the newly received values are what the user sees.
+                        menu = generate_menu_from_protobuf(interface, node=node, include_app_settings=False)
+                        refreshed_menu = menu["Main Menu"]
+                        for path_step in menu_state.menu_path[1:]:
+                            refreshed_menu = refreshed_menu[path_step]
+                        menu_state.current_menu = refreshed_menu[selected_option]
+                    else:
+                        menu_state.current_menu = menu_state.current_menu[selected_option]
+                else:
+                    menu_state.current_menu = menu_state.current_menu[selected_option]
                 menu_state.menu_path.append(selected_option)
                 menu_state.menu_index.append(menu_state.selected_index)
                 menu_state.selected_index = 0

contact/ui/default_config.py

@@ -235,7 +235,7 @@ def initialize_config() -> Dict[str, object]:
         "message_prefix": ">>",
         "sent_message_prefix": ">> Sent",
         "notification_symbol": "*",
-        "notification_sound": "True",
+        "notification_sound": "alert.mp3",
         "ack_implicit_str": "[◌]",
         "ack_str": "[✓]",
         "nak_str": "[x]",
@@ -243,6 +243,7 @@ def initialize_config() -> Dict[str, object]:
         "node_sort": "lastHeard",
         "theme": "dark",
         "ping_bot": {
+            "enabled": "False",
             "catch_words": "ping; test",
             "response_word": "Pong!",
         },
@@ -263,6 +264,15 @@ def initialize_config() -> Dict[str, object]:
     # Check and add missing variables
     updated = update_dict(default_config_variables, loaded_config)
 
+    # Migrate the legacy boolean notification preference to the file-based
+    # sound selection introduced in 1.5.12.
+    if loaded_config.get("notification_sound") == "True":
+        loaded_config["notification_sound"] = "alert.mp3"
+        updated = True
+    elif loaded_config.get("notification_sound") == "False":
+        loaded_config["notification_sound"] = "None"
+        updated = True
+
     # Update the JSON file if any variables were missing
     if updated:
         formatted_json = format_json_single_line_arrays(loaded_config)
@@ -280,7 +290,7 @@ def assign_config_variables(loaded_config: Dict[str, object]) -> None:
     global notification_symbol, ack_implicit_str, ack_str, nak_str, ack_unknown_str
     global node_list_16ths, channel_list_16ths, single_pane_mode
     global theme, COLOR_CONFIG, language
-    global node_sort, notification_sound, ping_bot_catch_words, ping_bot_response_word
+    global node_sort, notification_sound, ping_bot_enabled, ping_bot_catch_words, ping_bot_response_word
 
     channel_list_16ths = loaded_config["channel_list_16ths"]
     node_list_16ths = loaded_config["node_list_16ths"]
@@ -300,6 +310,7 @@ def assign_config_variables(loaded_config: Dict[str, object]) -> None:
     node_sort = loaded_config["node_sort"]
     theme = loaded_config["theme"]
     ping_bot = loaded_config.get("ping_bot", {})
+    ping_bot_enabled = ping_bot.get("enabled", "False")
     ping_bot_catch_words = ping_bot.get("catch_words", "ping; test")
     ping_bot_response_word = ping_bot.get("response_word", "Pong!")
     if theme == "dark":

contact/ui/menus.py

@@ -57,14 +57,17 @@ def extract_fields(
     return menu
 
 
-def generate_menu_from_protobuf(interface: object) -> Dict[str, Any]:
+def generate_menu_from_protobuf(interface: object, node: Any = None, include_app_settings: bool = True) -> Dict[str, Any]:
     """
     Builds the full settings menu structure from the protobuf definitions.
     """
     menu_structure = {"Main Menu": {}}
 
     # Add User Settings
-    current_node_info = interface.getMyNodeInfo() if interface else None
+    node = node or (interface.localNode if interface else None)
+    current_node_info = interface.getMyNodeInfo() if interface and node is interface.localNode else None
+    if current_node_info is None and interface and node is not None:
+        current_node_info = getattr(interface, "nodesByNum", {}).get(getattr(node, "nodeNum", None))
 
     if current_node_info:
         current_user_config = current_node_info.get("user", None)
@@ -79,28 +82,28 @@ def generate_menu_from_protobuf(interface: object) -> Dict[str, Any]:
             menu_structure["Main Menu"]["User Settings"] = "No user settings available"
     else:
         logging.info("Node Info not available")
-        menu_structure["Main Menu"]["User Settings"] = "Node Info not available"
+        menu_structure["Main Menu"]["User Settings"] = {}
 
     # Add Channels
     channel = channel_pb2.ChannelSettings()
     menu_structure["Main Menu"]["Channels"] = {}
-    if interface:
+    if node:
         for i in range(8):
-            current_channel = interface.localNode.getChannelByChannelIndex(i)
+            current_channel = node.getChannelByChannelIndex(i)
             if current_channel:
                 channel_config = extract_fields(channel, current_channel.settings)
                 menu_structure["Main Menu"]["Channels"][f"Channel {i + 1}"] = channel_config
 
     # Add Radio Settings
     radio = config_pb2.Config()
-    current_radio_config = interface.localNode.localConfig if interface else None
+    current_radio_config = node.localConfig if node else None
     menu_structure["Main Menu"]["Radio Settings"] = extract_fields(radio, current_radio_config)
 
     # Add Lat/Lon/Alt
     position_data = {
-        "latitude": (None, current_node_info["position"].get("latitude", 0.0)),
-        "longitude": (None, current_node_info["position"].get("longitude", 0.0)),
-        "altitude": (None, current_node_info["position"].get("altitude", 0)),
+        "latitude": (None, (current_node_info or {}).get("position", {}).get("latitude", 0.0)),
+        "longitude": (None, (current_node_info or {}).get("position", {}).get("longitude", 0.0)),
+        "altitude": (None, (current_node_info or {}).get("position", {}).get("altitude", 0)),
     }
 
     existing_position_menu = menu_structure["Main Menu"]["Radio Settings"].get("position", {})
@@ -117,11 +120,24 @@ def generate_menu_from_protobuf(interface: object) -> Dict[str, Any]:
 
     # Add Module Settings
     module = module_config_pb2.ModuleConfig()
-    current_module_config = interface.localNode.moduleConfig if interface else None
-    menu_structure["Main Menu"]["Module Settings"] = extract_fields(module, current_module_config)
+    current_module_config = node.moduleConfig if node else None
+    module_settings = extract_fields(module, current_module_config)
+    if node:
+        # These values use dedicated admin requests rather than ModuleConfig
+        # fields, so expose them alongside their related module settings.
+        module_settings.setdefault("external_notification", {})["ringtone"] = (
+            None,
+            getattr(node, "ringtone", "") or "",
+        )
+        module_settings.setdefault("canned_message", {})["messages"] = (
+            None,
+            getattr(node, "cannedPluginMessage", "") or "",
+        )
+    menu_structure["Main Menu"]["Module Settings"] = module_settings
 
     # Add App Settings
-    menu_structure["Main Menu"]["App Settings"] = {"Open": "app_settings"}
+    if include_app_settings:
+        menu_structure["Main Menu"]["App Settings"] = {"Open": "app_settings"}
 
     # Additional settings options
     menu_structure["Main Menu"].update(

contact/ui/ui_state.py

@@ -27,8 +27,6 @@ class ChatUIState:
     current_window: int = 0
     last_sent_time: float = 0.0
     last_traceroute_time: float = 0.0
-    bot_mode_enabled: bool = False
-
     selected_index: int = 0
     start_index: List[int] = field(default_factory=lambda: [0, 0, 0])
     show_save_option: bool = False
@@ -41,6 +39,7 @@ class ChatUIState:
     redraw_full_ui: bool = False
     scroll_messages_to_bottom: bool = False
     preserve_message_selection: bool = False
+    reconnect_attempted: bool = False
     oldest_message_rowid: Dict[Union[str, int], int] = field(default_factory=dict)
     has_older_messages: Dict[Union[str, int], bool] = field(default_factory=dict)
     message_line_ranges: Dict[Union[str, int], List[tuple]] = field(default_factory=dict)

contact/ui/user_config.py

@@ -115,6 +115,23 @@ def edit_color_pair(key: str, display_label: str, current_value: List[str]) -> L
 
 def edit_value(key: str, display_label: str, current_value: str) -> str:
 
+    if key in ("single_pane_mode", "enabled"):
+        return get_list_input(display_label, current_value, ["True", "False"])
+
+    if key == "notification_sound":
+        sounds_dir = os.path.join(config.parent_dir, "sounds")
+        try:
+            sound_options = sorted(
+                filename for filename in os.listdir(sounds_dir)
+                if filename.lower().endswith((".mp3", ".wav", ".ogg", ".aiff", ".flac"))
+            )
+        except OSError:
+            sound_options = []
+        sound_options = ["None"] + sound_options
+        if current_value not in sound_options:
+            sound_options.append(current_value)
+        return get_list_input(display_label, current_value, sound_options)
+
     w = get_effective_width()
     height = 10
     input_width = w - 16  # Allow space for "New Value: "
@@ -170,14 +187,6 @@ def edit_value(key: str, display_label: str, current_value: str) -> str:
         sort_options = ["lastHeard", "name", "hops"]
         return get_list_input(display_label, current_value, sort_options)
 
-    elif key == "notification_sound":
-        sound_options = ["True", "False"]
-        return get_list_input(display_label, current_value, sound_options)
-
-    elif key == "single_pane_mode":
-        sound_options = ["True", "False"]
-        return get_list_input(display_label, current_value, sound_options)
-
     # Standard Input Mode (Scrollable)
     edit_win.addstr(7, 2, t("ui.label.new_value", default="New Value: "), get_color("settings_default"))
     curses.curs_set(1)

contact/utilities/interfaces.py

@@ -44,15 +44,21 @@ def initialize_interface(args):
         logging.critical(f"Fatal error initializing interface: {ex}")
 
 
-def reconnect_interface(args, attempts: int = 15, delay_seconds: float = 1.0):
+def reconnect_interface(args, attempts: int = 20, delay_seconds: float = 1.0):
     last_error = None
 
     for attempt in range(attempts):
         try:
             interface = initialize_interface(args)
-            if interface is not None:
+            if interface is not None and getattr(interface, "localNode", None) is not None and getattr(
+                interface.localNode, "localConfig", None
+            ) is not None and (not hasattr(interface, "stream") or interface.stream is not None):
                 return interface
-            last_error = RuntimeError("initialize_interface returned None")
+            last_error = RuntimeError("interface did not complete connection setup")
+            try:
+                interface.close()
+            except Exception:
+                pass
         except Exception as ex:
             last_error = ex
 

contact/utilities/save_to_radio.py

@@ -78,7 +78,7 @@ def _requires_reconnect(menu_state, modified_settings) -> bool:
     return True
 
 
-def save_changes(interface, modified_settings, menu_state):
+def save_changes(interface, modified_settings, menu_state, node=None):
     """
     Save changes to the device based on modified settings.
     :param interface: Meshtastic interface instance
@@ -90,7 +90,7 @@ def save_changes(interface, modified_settings, menu_state):
             logging.info("No changes to save. modified_settings is empty.")
             return False
 
-        node = interface.getNode("^local")
+        node = node or interface.getNode("^local")
         admin_key_backup = None
         if "admin_key" in modified_settings:
             # Get reference to security config
@@ -134,7 +134,7 @@ def save_changes(interface, modified_settings, menu_state):
                 lon = float(modified_settings.get("longitude", 0.0))
                 alt = int(modified_settings.get("altitude", 0))
 
-                interface.localNode.setFixedPosition(lat, lon, alt)
+                node.setFixedPosition(lat, lon, alt)
                 logging.info(f"Updated {config_category} with Latitude: {lat} and Longitude {lon} and Altitude {alt}")
                 return False
 

contact/utilities/utils.py

@@ -179,8 +179,9 @@ def build_reply_prefix(prefix: str, message: str) -> str:
     else:
         sender_text = re.sub(r"^(?:>>|<<)\s*(?:\[[^]]+\]\s*)?", "", sender_text)
         sender_match = re.search(r"(.+?)\s*:\s*$", sender_text)
-        sender = sender_match.group(1).strip() if sender_match else "me"
-    excerpt = " ".join(message.replace("\x00", "").split())[:REPLY_EXCERPT_LENGTH]
+        sender = sender_match.group(1).strip() if sender_match else ""
+    message_without_reply_marker = re.sub(r"^<Re:\s*[^>]*>\s*", "", message.replace("\x00", ""))
+    excerpt = " ".join(message_without_reply_marker.split())[:REPLY_EXCERPT_LENGTH]
     return f"<Re: {sender}: {excerpt}> "
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "contact"
-version = "1.5.10"
+version = "1.6.2"
 description = "This Python curses client for Meshtastic is a terminal-based client designed to manage device settings, enable mesh chat communication, and handle configuration backups and restores."
 authors = [
     {name = "Ben Lipsey",email = "ben@pdxlocations.com"}

tests/test_bot_handler.py

@@ -5,6 +5,8 @@ import types
 from unittest import mock
 
 import contact.ui.default_config as config
+from contact.utilities.singleton import interface_state
+from tests.test_support import reset_singletons
 
 
 class BotHandlerTests(unittest.TestCase):
@@ -16,6 +18,13 @@ class BotHandlerTests(unittest.TestCase):
         )
         cls.bot_handler = importlib.import_module("contact.message_handlers.bot_handler")
 
+    def setUp(self) -> None:
+        reset_singletons()
+        self.bot_handler.send_message.reset_mock()
+
+    def tearDown(self) -> None:
+        reset_singletons()
+
     def test_is_bot_message_uses_configured_catch_words(self) -> None:
         with mock.patch.object(config, "ping_bot_catch_words", "ping; test; pong"):
             self.assertTrue(self.bot_handler.is_bot_message("PING"))
@@ -26,6 +35,29 @@ class BotHandlerTests(unittest.TestCase):
         with mock.patch.object(config, "ping_bot_catch_words", " ;  ; "):
             self.assertTrue(self.bot_handler.is_bot_message("ping"))
 
+    def test_bot_response_replies_to_triggering_packet(self) -> None:
+        interface_state.myNodeNum = 111
+        packet = {"id": 900, "from": 222, "decoded": {}}
+
+        with mock.patch.object(config, "ping_bot_enabled", "True"):
+            with mock.patch.object(self.bot_handler.threading, "Thread") as thread:
+                self.assertTrue(self.bot_handler.bot_respond(packet, "ping", 0))
+                send_response = thread.call_args.kwargs["target"]
+                with mock.patch.object(self.bot_handler.time, "sleep"):
+                    with mock.patch.dict(
+                        sys.modules,
+                        {"contact.ui.contact_ui": types.SimpleNamespace(request_ui_redraw=mock.Mock())},
+                    ):
+                        send_response()
+
+        self.bot_handler.send_message.assert_called_once_with(
+            "Pong!", channel=0, reply_id=900
+        )
+
+    def test_bot_response_requires_enabled_app_setting(self) -> None:
+        with mock.patch.object(config, "ping_bot_enabled", "False"):
+            self.assertFalse(self.bot_handler.bot_respond({"from": 222}, "ping", 0))
+
 
 if __name__ == "__main__":
     unittest.main()

tests/test_contact_ui.py

@@ -39,6 +39,49 @@ class ContactUiTests(unittest.TestCase):
         self.assertEqual(curs_set.call_args_list[-1].args, (1,))
         self.assertEqual(ui_state.current_window, 1)
 
+    def test_handle_backtick_shows_error_when_remote_admin_is_rejected(self) -> None:
+        stdscr = mock.Mock()
+        ui_state.current_window = 2
+        ui_state.node_list = [123]
+        ui_state.selected_node = 0
+        contact_ui.interface_state.interface = mock.Mock()
+        contact_ui.interface_state.interface.getNode.return_value = mock.Mock()
+
+        with mock.patch.object(contact_ui.curses, "curs_set"):
+            with mock.patch.object(contact_ui, "get_channels"):
+                with mock.patch.object(contact_ui, "refresh_node_list"):
+                    with mock.patch.object(contact_ui, "handle_resize"):
+                        with mock.patch.object(contact_ui, "get_list_input", return_value="Remote admin: node"):
+                            with mock.patch.object(contact_ui, "get_name_from_database", return_value="node"):
+                                with mock.patch.object(contact_ui, "settings_menu", side_effect=SystemExit(1)):
+                                    with mock.patch("contact.ui.dialog.dialog") as dialog:
+                                        contact_ui.handle_backtick(stdscr)
+
+        dialog.assert_called_once_with(
+            "Remote admin rejected",
+            "The selected node did not authorize this admin request.",
+        )
+
+    def test_show_remote_admin_wait_draws_status(self) -> None:
+        stdscr = mock.Mock()
+        stdscr.getmaxyx.return_value = (24, 100)
+        wait_win = mock.Mock()
+
+        with mock.patch.object(contact_ui.curses, "newwin", return_value=wait_win):
+            result = contact_ui.show_remote_admin_wait(stdscr, "Remote")
+
+        self.assertIs(result, wait_win)
+        self.assertIn("Attempting remote admin of Remote", wait_win.addstr.call_args_list[-1].args[2])
+        wait_win.refresh.assert_called_once()
+
+    def test_update_remote_admin_wait_replaces_status_line(self) -> None:
+        wait_win = mock.Mock()
+        wait_win.getmaxyx.return_value = (5, 40)
+
+        contact_ui.update_remote_admin_wait(wait_win, "Requesting lora config…")
+
+        self.assertIn("Requesting lora config", wait_win.addstr.call_args_list[-1].args[2])
+
     def test_process_pending_ui_updates_draws_requested_windows(self) -> None:
         stdscr = mock.Mock()
         ui_state.redraw_channels = True
@@ -120,6 +163,14 @@ class ContactUiTests(unittest.TestCase):
 
         self.assertEqual(reply, "<Re: LRY: Thank> ")
 
+    def test_build_reply_prefix_does_not_nest_an_existing_reply_marker(self) -> None:
+        reply = contact_ui.build_reply_prefix(
+            "[06:27:25] >> xT1e: ",
+            "<Re: CATS: Woot!> Woot indeed",
+        )
+
+        self.assertEqual(reply, "<Re: xT1e: Woot > ")
+
     def test_handle_ctrl_r_prefills_reply_for_message_at_cursor(self) -> None:
         ui_state.current_window = 1
         ui_state.channel_list = ["Primary"]
@@ -144,6 +195,15 @@ class ContactUiTests(unittest.TestCase):
         self.assertEqual(ui_state.reply_context, "")
         self.assertFalse(ui_state.reply_id_unavailable)
 
+    def test_draw_text_field_clears_stale_reply_context(self) -> None:
+        win = mock.Mock()
+        win.getmaxyx.return_value = (3, 30)
+
+        contact_ui.draw_text_field(win, "Message: ", 1)
+
+        self.assertIn(mock.call(1, 1, " " * 28, 1), win.addstr.call_args_list)
+        self.assertIn(mock.call(1, 1, "Message: ", 1), win.addstr.call_args_list)
+
     def test_handle_ctrl_r_shows_context_when_message_id_is_unavailable(self) -> None:
         ui_state.current_window = 1
         ui_state.channel_list = ["Primary"]

tests/test_i18n.py

@@ -57,15 +57,10 @@ class I18nTests(unittest.TestCase):
             self.assertEqual(i18n.t("missing", default="fallback"), "fallback")
             self.assertEqual(parse_ini_file.call_count, 2)
 
-    def test_bot_ui_translation_keys_exist_in_all_locales(self) -> None:
+    def test_ping_bot_settings_translation_keys_exist_in_all_locales(self) -> None:
         required_keys = {
-            "ui.help.bot_responder",
-            "ui.bot.status.enabled",
-            "ui.bot.status.disabled",
-            "ui.bot.dialog.title",
-            "ui.bot.dialog.body",
-            "ui.bot.status.message",
             "app_settings.ping_bot",
+            "app_settings.ping_bot.enabled",
             "app_settings.ping_bot.catch_words",
             "app_settings.ping_bot.response_word",
         }

tests/test_menus.py

@@ -26,3 +26,21 @@ class MenusTests(unittest.TestCase):
 
         self.assertLess(keys.index("Factory Reset"), keys.index("factory_reset_config"))
         self.assertEqual(keys[keys.index("Factory Reset") + 1], "factory_reset_config")
+
+    def test_module_settings_include_ringtone_and_canned_messages(self) -> None:
+        local_node = SimpleNamespace(
+            localConfig=config_pb2.Config(),
+            moduleConfig=module_config_pb2.ModuleConfig(),
+            ringtone="tone",
+            cannedPluginMessage="Hi|Bye",
+            getChannelByChannelIndex=lambda _: None,
+        )
+        interface = SimpleNamespace(
+            localNode=local_node,
+            getMyNodeInfo=lambda: {"position": {"latitude": 0.0, "longitude": 0.0, "altitude": 0}},
+        )
+
+        module_settings = generate_menu_from_protobuf(interface)["Main Menu"]["Module Settings"]
+
+        self.assertEqual(module_settings["external_notification"]["ringtone"], (None, "tone"))
+        self.assertEqual(module_settings["canned_message"]["messages"], (None, "Hi|Bye"))

tests/test_user_config.py

@@ -0,0 +1,18 @@
+import unittest
+from unittest import mock
+
+import contact.ui.default_config  # Initialize config before the color helpers.
+from contact.ui import user_config
+
+
+class UserConfigTests(unittest.TestCase):
+    def test_ping_bot_enabled_uses_boolean_picker(self) -> None:
+        with mock.patch.object(user_config, "get_list_input", return_value="True") as picker:
+            result = user_config.edit_value("enabled", "Enabled", "False")
+
+        self.assertEqual(result, "True")
+        picker.assert_called_once_with("Enabled", "False", ["True", "False"])
+
+
+if __name__ == "__main__":
+    unittest.main()