chore: sync develop from master (2.0.0-rc.4)

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to **adn-server** are documented here.
 
+## [2.0.0-rc.4] - 2026-06-18
+
+### Added
+
+- **Docs (MkDocs EN/ES):** bridges vs subscriptions, performance notes, report-proxy guide for legacy dashboards, Mermaid diagrams in architecture/monitoring pages.
+
+### Fixed
+
+- **Echo TG 9990** — excluded from SINGLE/UA session locks; inject-only monitor remap for echo TX legs; bridge TX report field 5 resolves hotspot radio id for ECHO/hotspot live chips.
+- **Dynamic TG restore** — `sync_restored_dynamic_tgs` passes `now=` as keyword (fixes TypeError on echo startup after DB restore).
+
+### Compatibility
+
+- **Monitor:** adn-monitor **2.0.0-rc.5**.
+
 ## [2.0.0-rc.3] - 2026-06-17
 
 ### Added

README.md

@@ -1,6 +1,6 @@
 # ADN DMR Peer Server
 
-**Version 2.0.0-rc.3** — pairs with **adn-monitor 2.0.0-rc.4** (report v2 slim wire + JSON HELLO).
+**Version 2.0.0-rc.4** — pairs with **adn-monitor 2.0.0-rc.5** (report v2 slim wire + JSON HELLO).
 
 ADN DMR conference bridge server. Configuration is YAML; the codebase follows clean architecture (domain, application, infrastructure). v2 adds integrated **PROXY**, **SubscriptionStore** routing, report v2 to the monitor, and a unified **`adn-server.py`** entrypoint (`--echo`, `--doctor`, `--no-proxy`). See [CHANGELOG.md](CHANGELOG.md).
 

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "adn-server"
-version = "2.0.0-rc.3"
+version = "2.0.0-rc.4"
 description = "ADN DMR Peer Server"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

src/adn_server/__init__.py

@@ -37,4 +37,4 @@
 
 """ADN DMR Peer Server — conference bridge (rewrite of bridge_master)."""
 
-__version__ = "2.0.0-rc.3"
+__version__ = "2.0.0-rc.4"