From bf7068b02be762b0cb393cff554e547a8380b2b7 Mon Sep 17 00:00:00 2001
From: vicliu <vicliu@outlook.com>
Date: Tue, 19 May 2026 16:04:42 +0800
Subject: [PATCH] 0.1.26-alpha release

* refactor: render chat rows from presentation state

* Fix Meshtastic channel sync and add MeshCore CN preset

* Add granular chat notification settings

* Add SD settings backup and restore

* Prepare 0.1.26-alpha release

---------

Co-authored-by: vicliu624 <vicliu@outlook.com>
---
 .github/PULL_REQUEST_TEMPLATE.md              |   34 +
 .github/workflows/cardputer-zero-linux.yml    |   88 -
 .github/workflows/linux-simulator.yml         |   63 +
 .github/workflows/uconsole-linux.yml          |   62 +
 CHANGELOG.md                                  |  Bin 88480 -> 92322 bytes
 CMakeLists.txt                                |    9 +-
 apps/README.md                                |   11 +-
 apps/esp32_lvgl/APP_SHELL_MANIFEST.md         |   79 +
 apps/esp32_lvgl/CMakeLists.txt                |  111 +
 apps/esp32_lvgl/README.md                     |   76 +
 apps/esp32_lvgl/library.json                  |   81 +
 apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp  |   54 +
 apps/esp32_lvgl/src/esp32_lvgl_app_shell.h    |   44 +
 .../src/esp32_lvgl_arduino_app_registry.cpp}  |    7 +-
 ...esp32_lvgl_arduino_app_runtime_access.cpp} |    8 +-
 .../esp32_lvgl_arduino_app_runtime_access.h}  |    4 +-
 .../src/esp32_lvgl_arduino_entry.cpp          |   19 +
 .../esp32_lvgl/src/esp32_lvgl_arduino_entry.h |    9 +
 .../src/esp32_lvgl_arduino_loop_runtime.cpp}  |   19 +-
 .../src/esp32_lvgl_arduino_loop_runtime.h     |    8 +
 .../esp32_lvgl_arduino_startup_runtime.cpp}   |   22 +-
 .../src/esp32_lvgl_arduino_startup_runtime.h  |    8 +
 ...sp32_lvgl_historical_source_descriptor.cpp |   13 +
 .../esp32_lvgl_historical_source_descriptor.h |   16 +
 .../src/esp32_lvgl_loop_runtime.cpp}          |   34 +-
 apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.h |   11 +
 .../src/esp32_lvgl_runtime_config.cpp         |   70 +
 .../src/esp32_lvgl_runtime_config.h           |   28 +
 .../src/esp32_lvgl_startup_runtime.cpp}       |   39 +-
 .../src/esp32_lvgl_startup_runtime.h          |   11 +
 .../tests/esp32_lvgl_app_shell_smoke.cpp      |   38 +
 ...vgl_historical_source_descriptor_smoke.cpp |   18 +
 .../tests/esp32_lvgl_loop_runtime_smoke.cpp   |   13 +
 .../tests/esp32_lvgl_runtime_config_smoke.cpp |   28 +
 .../esp32_lvgl_startup_runtime_smoke.cpp      |   13 +
 apps/esp_idf/CMakeLists.txt                   |  325 --
 apps/esp_idf/README.md                        |   38 -
 apps/esp_idf/idf_component.yml                |    3 -
 .../include/apps/esp_idf/app_facade_runtime.h |   12 -
 .../include/apps/esp_idf/app_runtime_access.h |   20 -
 .../include/apps/esp_idf/loop_runtime.h       |   10 -
 .../include/apps/esp_idf/runtime_config.h     |   25 -
 .../include/apps/esp_idf/startup_runtime.h    |   10 -
 apps/esp_idf/src/app_facade_runtime.cpp       | 1705 --------
 apps/esp_idf/src/app_registry.cpp             |   47 -
 apps/esp_idf/src/app_runtime_access.cpp       |   70 -
 apps/esp_idf/src/gps_service_api.cpp          |   97 -
 apps/esp_idf/src/gps_tracker_overlay.cpp      |   42 -
 apps/esp_idf/src/idf_component_anchor.cpp     |    3 -
 apps/esp_idf/src/idf_entry.cpp                |    7 -
 apps/esp_idf/src/mt_packet_wire_idf.cpp       |  143 -
 apps/esp_idf/src/runtime_config.cpp           |   52 -
 apps/esp_idf/src/team_ui_store.cpp            |  585 ---
 apps/esp_idf/targets/t_display_p4/README.md   |   27 -
 .../targets/t_display_p4_amoled/README.md     |   29 -
 .../targets/t_display_p4_tft/README.md        |   28 -
 apps/esp_idf/targets/tab5/README.md           |   18 -
 apps/esp_pio/README.md                        |   20 -
 .../include/apps/esp_pio/arduino_entry.h      |    9 -
 .../include/apps/esp_pio/loop_runtime.h       |    8 -
 .../include/apps/esp_pio/startup_runtime.h    |    8 -
 apps/esp_pio/library.json                     |   31 -
 apps/esp_pio/src/arduino_entry.cpp            |   35 -
 .../apps/gat562_mesh_evb_pro/arduino_entry.h  |    9 -
 .../apps/gat562_mesh_evb_pro/loop_runtime.h   |    8 -
 .../gat562_mesh_evb_pro/startup_runtime.h     |    8 -
 apps/gat562_mesh_evb_pro/library.json         |   27 -
 .../gat562_mesh_evb_pro/src/arduino_entry.cpp |   19 -
 apps/gat562_mesh_evb_pro/src/loop_runtime.cpp |   16 -
 apps/linux_rpi/CMakeLists.txt                 |   70 -
 apps/linux_rpi/CMakePresets.json              |   35 -
 apps/linux_rpi/README.md                      |   91 -
 apps/linux_rpi/SConstruct                     |   30 -
 apps/linux_rpi/config_defaults.mk             |    5 -
 .../cardputer-zero-adaptation-spec.md         |  374 --
 .../feature-migration-checklist.md            |  179 -
 .../docs/specification/migration-path.md      |   89 -
 .../docs/specification/project-baseline.md    |  117 -
 apps/linux_rpi/main/SConstruct                |   45 -
 apps/linux_rpi/main/include/main.h            |    1 -
 apps/linux_rpi/main/src/main.cpp              |  195 -
 apps/linux_rpi/scripts/build-device.sh        |   16 -
 apps/linux_rpi/scripts/build-sdk-device.sh    |   82 -
 apps/linux_rpi/scripts/run-device.sh          |   16 -
 apps/linux_rpi/scripts/run-sdk-device.sh      |   17 -
 apps/linux_rpi/src/targets/device_main.cpp    |   53 -
 apps/linux_sim/.dockerignore                  |    2 -
 apps/linux_sim/CMakeLists.txt                 |  108 -
 apps/linux_sim/CMakePresets.json              |  137 -
 apps/linux_sim/README.md                      |  103 -
 .../linux_sim/docker/dev-simulator.Dockerfile |   32 -
 apps/linux_sim/scripts/build-dev-container.sh |   59 -
 apps/linux_sim/scripts/build-simulator.ps1    |   26 -
 apps/linux_sim/scripts/build-simulator.sh     |   17 -
 .../scripts/generate-windows-solution.ps1     |   27 -
 .../scripts/open-windows-solution.ps1         |   19 -
 apps/linux_sim/scripts/run-dev-container.ps1  |  135 -
 apps/linux_sim/scripts/run-dev-container.sh   |  209 -
 apps/linux_sim/scripts/run-simulator.ps1      |   29 -
 apps/linux_sim/scripts/run-simulator.sh       |   21 -
 apps/linux_sim/scripts/wsl-validate.sh        |  121 -
 .../src/platform/simulator/sdl_simulator.cpp  | 1135 ------
 .../src/platform/simulator/sdl_simulator.h    |   26 -
 apps/linux_sim/src/targets/simulator_main.cpp |   84 -
 apps/linux_sim/tests/demo_app_smoke.cpp       |   72 -
 apps/linux_sim/tests/linux_runtime_smoke.cpp  |  386 --
 apps/linux_sim/tests/path_safety_smoke.cpp    |  233 --
 apps/linux_sim_shell/APP_SHELL_MANIFEST.md    |   76 +
 apps/linux_sim_shell/CMakeLists.txt           |  214 +
 apps/linux_sim_shell/README.md                |   58 +
 .../src/linux_sim_app_shell.cpp               |   59 +
 .../linux_sim_shell/src/linux_sim_app_shell.h |   41 +
 ...linux_sim_historical_source_descriptor.cpp |   12 +
 .../linux_sim_historical_source_descriptor.h  |   15 +
 .../src/linux_sim_runtime_entry.cpp           |   65 +
 .../src/linux_sim_runtime_entry.h             |   43 +
 ...linux_sim_runtime_entry_adoption_probe.cpp |   59 +
 .../linux_sim_runtime_entry_adoption_probe.h  |   35 +
 .../src/linux_sim_runtime_renderer.cpp        |   79 +
 .../src/linux_sim_runtime_renderer.h          |   35 +
 .../tests/linux_sim_app_shell_smoke.cpp       |   38 +
 ...sim_historical_source_descriptor_smoke.cpp |   18 +
 ...sim_runtime_entry_adoption_probe_smoke.cpp |   18 +
 ...linux_sim_runtime_entry_fallback_smoke.cpp |   23 +
 .../tests/linux_sim_runtime_entry_smoke.cpp   |   22 +
 .../linux_sim_runtime_renderer_smoke.cpp      |   36 +
 apps/linux_uconsole/CMakeLists.txt            |  307 --
 apps/linux_uconsole/CMakePresets.json         |   67 -
 apps/linux_uconsole/README.md                 |  168 -
 apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md |   76 +
 apps/linux_uconsole_gtk/CMakeLists.txt        |  256 ++
 apps/linux_uconsole_gtk/README.md             |   59 +
 .../packaging/trailmate-uconsole.desktop      |    0
 .../packaging/trailmate-uconsole.png          |  Bin
 .../src/linux_uconsole_gtk_app_shell.cpp      |   60 +
 .../src/linux_uconsole_gtk_app_shell.h        |   40 +
 ...nsole_gtk_historical_source_descriptor.cpp |   13 +
 ...console_gtk_historical_source_descriptor.h |   16 +
 ...ux_uconsole_gtk_page_registry_adoption.cpp |   83 +
 ...inux_uconsole_gtk_page_registry_adoption.h |   45 +
 ...ux_uconsole_gtk_page_registry_renderer.cpp |   78 +
 ...inux_uconsole_gtk_page_registry_renderer.h |   34 +
 ...nsole_gtk_runtime_entry_adoption_probe.cpp |   60 +
 ...console_gtk_runtime_entry_adoption_probe.h |   35 +
 .../platform/desktop/sdl_window_presenter.cpp |    0
 .../platform/desktop/sdl_window_presenter.h   |    0
 .../src/platform/gtk/gtk_uconsole_app.cpp     |    0
 .../src/platform/gtk/gtk_uconsole_app.h       |    0
 .../src/platform/gtk/gtk_uconsole_app_state.h |    0
 .../platform/gtk/gtk_uconsole_chat_layout.cpp |    0
 .../platform/gtk/gtk_uconsole_chat_logic.cpp  |    0
 .../platform/gtk/gtk_uconsole_data_layout.cpp |    0
 .../platform/gtk/gtk_uconsole_data_logic.cpp  |    0
 .../gtk/gtk_uconsole_hardware_layout.cpp      |    0
 .../gtk/gtk_uconsole_hardware_logic.cpp       |    0
 .../platform/gtk/gtk_uconsole_layout_spec.h   |    0
 .../platform/gtk/gtk_uconsole_logs_layout.cpp |    0
 .../platform/gtk/gtk_uconsole_logs_logic.cpp  |    0
 .../platform/gtk/gtk_uconsole_map_layout.cpp  |    0
 .../platform/gtk/gtk_uconsole_map_logic.cpp   |    0
 .../gtk/gtk_uconsole_mqtt_settings.cpp        |    0
 .../platform/gtk/gtk_uconsole_mqtt_settings.h |    0
 .../gtk/gtk_uconsole_overview_layout.cpp      |    0
 .../gtk/gtk_uconsole_overview_logic.cpp       |    0
 .../src/platform/gtk/gtk_uconsole_pages.cpp   |    0
 .../src/platform/gtk/gtk_uconsole_pages.h     |    0
 .../gtk/gtk_uconsole_settings_layout.cpp      |    0
 .../gtk/gtk_uconsole_settings_logic.cpp       |    0
 .../src/platform/gtk/gtk_uconsole_shell.cpp   |    0
 .../src/platform/gtk/gtk_uconsole_shell.h     |    0
 .../src/platform/gtk/gtk_uconsole_style.cpp   |    0
 .../src/platform/gtk/gtk_uconsole_style.h     |    0
 .../src/platform/gtk/gtk_uconsole_widgets.cpp |    0
 .../src/platform/gtk/gtk_uconsole_widgets.h   |    0
 .../src/targets/uconsole_main.cpp             |    0
 .../linux_uconsole_gtk_app_shell_smoke.cpp    |   39 +
 ...gtk_historical_source_descriptor_smoke.cpp |   19 +
 ...nsole_gtk_page_registry_adoption_smoke.cpp |   24 +
 ...nsole_gtk_page_registry_fallback_smoke.cpp |   26 +
 ...nsole_gtk_page_registry_renderer_smoke.cpp |   40 +
 ...gtk_runtime_entry_adoption_probe_smoke.cpp |   19 +
 .../tests/uconsole_chat_dedup_smoke.cpp       |    0
 .../uconsole_chat_sqlite_store_smoke.cpp      |    0
 .../tests/uconsole_chat_workspace_smoke.cpp   |    0
 .../tests/uconsole_map_workspace_smoke.cpp    |    6 +
 ...uconsole_meshtastic_node_payload_smoke.cpp |    0
 .../tools/sx1262_probe.cpp                    |    0
 apps/linux_unoq/README.md                     |    5 -
 apps/nrf52_node/APP_SHELL_MANIFEST.md         |   73 +
 apps/nrf52_node/README.md                     |   64 +
 apps/nrf52_node/library.json                  |   70 +
 .../nrf52_historical_source_descriptor.cpp    |   12 +
 .../src/nrf52_historical_source_descriptor.h  |   17 +
 .../src/nrf52_node_app_facade_runtime.cpp}    |   82 +-
 .../src/nrf52_node_app_facade_runtime.h}      |   11 +-
 .../src/nrf52_node_app_runtime_access.cpp}    |   28 +-
 .../src/nrf52_node_app_runtime_access.h}      |    6 +-
 apps/nrf52_node/src/nrf52_node_app_shell.cpp  |   51 +
 apps/nrf52_node/src/nrf52_node_app_shell.h    |   44 +
 .../src/nrf52_node_arduino_entry.cpp          |   19 +
 .../nrf52_node/src/nrf52_node_arduino_entry.h |    9 +
 .../src/nrf52_node_loop_runtime.cpp           |   16 +
 apps/nrf52_node/src/nrf52_node_loop_runtime.h |    8 +
 .../src/nrf52_node_runtime_config.cpp         |   29 +
 .../src/nrf52_node_runtime_config.h           |   20 +
 .../src/nrf52_node_self_identity_provider.h}  |    6 +-
 .../src/nrf52_node_startup_runtime.cpp}       |   26 +-
 .../src/nrf52_node_startup_runtime.h          |    8 +
 .../src/nrf52_node_ui_runtime.cpp}            |   16 +-
 .../src/nrf52_node_ui_runtime.h}              |    6 +-
 ...f52_historical_source_descriptor_smoke.cpp |   20 +
 .../tests/nrf52_node_app_shell_smoke.cpp      |   28 +
 .../tests/nrf52_node_runtime_config_smoke.cpp |   11 +
 boards/cardputerzero/BOARD.md                 |   23 +
 boards/cardputerzero/board_facts.h            |   28 +
 boards/gat562_mesh_evb_pro/BOARD.md           |   67 +
 boards/gat562_mesh_evb_pro/board_facts.h      |   63 +
 boards/tab5/BOARD.md                          |   28 +
 boards/tab5/board_facts.h                     |   39 +
 boards/tdeck/BOARD.md                         |   29 +
 boards/tdeck/board_facts.h                    |   33 +
 boards/tdisplayp4/BOARD.md                    |   27 +
 boards/tdisplayp4/board_facts.h               |   40 +
 boards/tlora_pager/BOARD.md                   |   33 +
 boards/tlora_pager/board_facts.h              |   36 +
 .../boards/tlora_pager/tlora_pager_board.h    |    2 -
 boards/twatch/BOARD.md                        |   29 +
 boards/twatch/board_facts.h                   |   28 +
 boards/uconsole/BOARD.md                      |   25 +
 boards/uconsole/board_facts.h                 |   30 +
 builds/README.md                              |   35 +
 builds/esp_idf/CMakeLists.txt                 |   23 +
 .../esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake   |   26 +
 builds/esp_idf/README.md                      |   44 +
 builds/esp_idf/target_profiles.cmake          |   20 +
 builds/esp_idf/targets/README.md              |   19 +
 .../esp_idf/targets/tab5/sdkconfig.defaults   |    1 -
 .../esp_idf/targets/tdeck/sdkconfig.defaults  |    9 +
 .../tdisplayp4_amoled}/sdkconfig.defaults     |    0
 .../tdisplayp4_tft}/sdkconfig.defaults        |    0
 .../targets/tlora_pager/sdkconfig.defaults    |    9 +
 .../esp_idf/targets/twatch/sdkconfig.defaults |    9 +
 builds/linux_cmake/CMakeLists.txt             |   27 +
 builds/linux_cmake/CMakePresets.json          |   98 +
 builds/linux_cmake/README.md                  |   61 +
 builds/pio_nrf52/README.md                    |   38 +
 builds/pio_nrf52/platformio.ini               |  137 +
 builds/pio_nrf52/src/gat562_mesh_evb_pro.cpp  |   20 +
 .../src/nrf52_node_wrapper_baseline.cpp       |   26 +
 cmake/TrailMateLinuxSources.cmake             |  204 +-
 cmake/TrailMateUxPacks.cmake                  |   46 +
 docs/LINUX_ADAPTATION_GUIDE.md                |   36 +-
 docs/REPOSITORY_MIGRATION_PLAN.md             |   44 +
 docs/archive/REMOVED_LEGACY_ROOTS.md          |  214 +
 docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md |  112 +
 docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md  |  132 +
 .../BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md   |  203 +
 .../CHAT_DELIVERY_ACTION_OWNERSHIP_AUDIT.md   |   92 +
 .../CHAT_DELIVERY_EVENT_PROJECTION_AUDIT.md   |   87 +
 docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md  |  139 +
 .../CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md   |   84 +
 docs/audits/CHAT_PENDING_FAILURE_AUDIT.md     |  112 +
 docs/audits/CHAT_RUNTIME_EVENT_PUMP_AUDIT.md  |   52 +
 .../CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md      |   57 +
 ...AT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md |  102 +
 .../ESP_IDF_FINAL_OWNER_MIGRATION_PLAN.md     |   57 +
 ...F_RUNTIME_SOURCE_OWNER_EXTRACTION_AUDIT.md |   24 +
 ...ESP_IDF_TARGET_DEFAULTS_MIGRATION_AUDIT.md |   25 +
 .../ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md      |   98 +
 docs/audits/GPS_CONSUMER_BOUNDARY_AUDIT.md    |   38 +
 .../GPS_RUNTIME_SCHEDULING_OWNERSHIP_AUDIT.md |   50 +
 ...TION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md |  106 +
 .../KEY_VERIFICATION_OWNERSHIP_AUDIT.md       |  122 +
 ...APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md |  259 ++
 docs/audits/LEGACY_BURNDOWN_REGISTER.md       |   87 +
 .../LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md   | 1486 +++++++
 .../audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md | 1476 +++++++
 ...EGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md |   76 +
 .../LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md |   86 +
 ...P_OVERLAY_ROUTE_TRACKER_OWNERSHIP_AUDIT.md |   79 +
 .../audits/MAP_PRESENTATION_BOUNDARY_AUDIT.md |  174 +
 .../MAP_TILE_RENDER_QUEUE_CACHE_AUDIT.md      |   54 +
 .../MAP_TILE_SOURCE_CACHE_OWNERSHIP_AUDIT.md  |   66 +
 docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md  |   98 +
 .../PHASE10_FINAL_PRIMARY_PATH_REPORT.md      |   46 +
 .../PHASE10_PRIMARY_PATH_MIGRATION_REPORT.md  |  122 +
 ..._RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md |  144 +
 .../PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md  |   31 +
 .../PHASE12_FALLBACK_DELETION_READINESS.md    |   37 +
 docs/audits/PHASE5_FINAL_READINESS_REPORT.md  |  133 +
 docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md  |  224 ++
 .../PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md   |   73 +
 .../PHASE5_PRESENTATION_CONFORMANCE_MATRIX.md |   70 +
 .../PHASE5_RENDERER_HARDENING_SUMMARY.md      |   88 +
 .../PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md  |   60 +
 .../PHASE6_COMPOSITION_READINESS_REPORT.md    |  122 +
 docs/audits/PHASE6_INPUT_PLAN.md              |   97 +
 ...0_MAP_TILE_SOURCE_CACHE_BURNDOWN_REPORT.md |   44 +
 ...7_11_MAP_TILE_RENDER_QUEUE_CACHE_REPORT.md |   42 +
 ...SE7_12_MAP_OVERLAY_ROUTE_TRACKER_REPORT.md |   32 +
 ...PHASE7_13_GPS_RUNTIME_SCHEDULING_REPORT.md |   33 +
 .../audits/PHASE7_6_LEGACY_BURNDOWN_REPORT.md |   46 +
 .../PHASE7_7_EVENT_PUMP_BURNDOWN_REPORT.md    |   45 +
 ...SE7_8_TEAM_RICH_PAYLOAD_BURNDOWN_REPORT.md |   53 +
 ..._9_TEAM_POSITION_PICKER_BURNDOWN_REPORT.md |   47 +
 .../PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md     |   23 +
 ...INAL_RUNTIME_OWNERSHIP_READINESS_REPORT.md |   44 +
 .../PHASE7_RUNTIME_OWNERSHIP_REGISTER.md      |  304 ++
 .../PHASE8_RUNTIME_UI_ADOPTION_REPORT.md      |   48 +
 .../PHASE9_FALLBACK_CONTAINMENT_LEDGER.md     |   34 +
 docs/audits/PHASE9_FINAL_READINESS_REPORT.md  |  103 +
 docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md  |  108 +
 docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md |  111 +
 .../PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md   |  111 +
 .../POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md    |   67 +
 .../PRODUCT_COMPOSITION_BOUNDARY_AUDIT.md     |  124 +
 docs/audits/RENDERER_BOUNDARY_AUDIT.md        |  134 +
 docs/audits/RENDERER_HARDENING_BASELINE.md    |   66 +
 .../REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md  |  236 ++
 .../TARGET_UI_FINAL_OWNERSHIP_REPORT.md       |   97 +
 docs/audits/TARGET_UX_PACK_GAP_REPORT.md      |   30 +
 docs/audits/TEAM_ACTION_OWNERSHIP_AUDIT.md    |  111 +
 docs/audits/TEAM_CHAT_PRESENTATION_AUDIT.md   |  138 +
 .../TEAM_POSITION_PICKER_RENDERER_AUDIT.md    |   59 +
 .../TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md   |   98 +
 docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md |   78 +
 .../UI_SHARED_COMPATIBILITY_SHIM_POLICY.md    |   86 +
 docs/audits/UI_SHARED_SPLIT_AUDIT.md          |  252 ++
 docs/boards/BOARD_MANIFEST_TEMPLATE.yaml      |   47 +
 docs/boards/gat562.board.yaml                 |   88 +
 docs/boards/t-deck.board.yaml                 |   85 +
 docs/boards/t-lora-pager.board.yaml           |   81 +
 docs/boards/uconsole-aio2.board.yaml          |   66 +
 docs/decisions/ADR_BUILD_ENTRYPOINTS.md       |  149 +
 docs/devices/lilygo-t-lora-pager.md           |    7 +-
 ...M_PRODUCT_ARCHITECTURE_REVIEW_CHECKLIST.md |  147 +
 .../APP_SHELL_ARCHITECTURE_SPEC.md            |  216 +
 docs/specification/BOARD_PACKAGE_SPEC.md      |   97 +
 .../CAPABILITY_AUTHORITY_GLOSSARY.md          |  325 ++
 .../CHAT_DELIVERY_ACTION_RUNTIME_SPEC.md      |  127 +
 .../CHAT_DELIVERY_RUNTIME_SPEC.md             |  155 +
 .../CHAT_PRESENTATION_IDENTITY_SPEC.md        |  192 +
 .../CHAT_RUNTIME_EVENT_PUMP_SPEC.md           |  123 +
 .../CHAT_WORKSPACE_MODEL_SPEC.md              |  148 +
 ...ROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md |  211 +
 .../DEVICE_UX_PACK_ARCHITECTURE_SPEC.md       |  309 ++
 .../GPS_RUNTIME_SCHEDULING_SPEC.md            |   75 +
 .../KEY_VERIFICATION_RUNTIME_SPEC.md          |  149 +
 docs/{specs => specification}/LOCALE_PACKS.md |    0
 .../LOCALE_PACK_RELEASE_SPEC.md               |    0
 .../LOCALIZATION_SPEC.md                      |    0
 .../MAP_OVERLAY_ROUTE_TRACKER_RUNTIME_SPEC.md |  131 +
 .../MAP_TILE_RENDER_QUEUE_CACHE_SPEC.md       |   71 +
 .../MAP_TILE_SOURCE_CACHE_RUNTIME_SPEC.md     |   70 +
 .../specification/MAP_WORKSPACE_MODEL_SPEC.md |  218 +
 .../POST_REFACTOR_ARCHITECTURE_FREEZE.md      |   68 +
 .../PRESENTATION_WORKSPACE_SPEC.md            |  138 +
 .../PRODUCT_COMPOSITION_ARCHITECTURE_SPEC.md  |  182 +
 .../REPOSITORY_LAYOUT_ARCHITECTURE_SPEC.md    |  350 ++
 .../specification/RUNTIME_CONCURRENCY_SPEC.md |  175 +
 docs/specification/TARGET_MANIFEST_SPEC.md    |  111 +
 .../specification/TEAM_ACTION_RUNTIME_SPEC.md |  106 +
 .../TEAM_POSITION_PICKER_RENDERER_SPEC.md     |   88 +
 .../TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md    |  124 +
 .../UI_PRESENTATION_ARCHITECTURE_SPEC.md      |  174 +
 ...form_Product_Architecture_Specification.md | 3555 +++++++++++++++++
 docs/targets/README.md                        |   41 +
 docs/targets/TARGET_MANIFEST_TEMPLATE.yaml    |  146 +
 docs/targets/TARGET_MATRIX.md                 |   37 +
 .../targets/esp-t-deck-lvgl.capabilities.yaml |  138 +
 .../esp-t-lora-pager-lvgl.capabilities.yaml   |  138 +
 docs/targets/esp32_lvgl_targets.md            |   36 +
 docs/targets/linux-headless.capabilities.yaml |  133 +
 .../linux-uconsole-ascii.capabilities.yaml    |  133 +
 .../linux-uconsole-gtk.capabilities.yaml      |  136 +
 docs/targets/linux_targets.md                 |   39 +
 .../nrf52-gat562-node.capabilities.yaml       |  138 +
 docs/targets/nrf52_node_targets.md            |   35 +
 docs/ux_profiles/README.md                    |   39 +
 docs/ux_profiles/cardputer_wide.md            |   48 +
 docs/ux_profiles/deck_full.md                 |   51 +
 docs/ux_profiles/pager_compact.md             |   50 +
 docs/ux_profiles/tab5_touch.md                |   51 +
 docs/ux_profiles/tiny_node_status.md          |   48 +
 docs/ux_profiles/uconsole_desktop.md          |   51 +
 docs/ux_profiles/watch_quick.md               |   47 +
 .../chat_conversation_mapper.h                |   16 +
 .../chat_message_mapper.h                     |   13 +
 .../chat_presentation_adapters/library.json   |   17 +
 .../src/chat_conversation_mapper.cpp          |  100 +
 .../src/chat_message_mapper.cpp               |   50 +
 .../tests/test_chat_conversation_mapper.cpp   |  134 +
 .../tests/test_chat_message_mapper.cpp        |   89 +
 .../include/chat/ble/meshcore_phone_core.h    |  156 +-
 .../include/chat/ble/meshtastic_defaults.h    |   20 +-
 .../chat/ble/meshtastic_phone_config_bridge.h |  243 +-
 .../include/chat/ble/meshtastic_phone_core.h  |  236 +-
 .../chat/ble/meshtastic_phone_session.h       |   27 +-
 .../include/chat/ble/phone_runtime_context.h  |   83 +-
 .../delivery/chat_delivery_action_service.h   |   35 +
 .../chat/delivery/chat_delivery_action_sink.h |   17 +
 .../delivery/chat_delivery_action_types.h     |   53 +
 .../chat/delivery/chat_delivery_event_port.h  |   36 +
 .../delivery/chat_delivery_event_projector.h  |   45 +
 .../chat/delivery/chat_delivery_read_model.h  |   27 +
 .../chat/delivery/chat_delivery_types.h       |   58 +
 .../delivery/legacy_chat_delivery_bridge.h    |   16 +
 .../delivery/legacy_chat_send_result_mapper.h |   34 +
 .../include/chat/domain/chat_types.h          |   78 +-
 .../chat/infra/meshcore/mc_region_presets.h   |    1 +
 .../chat/infra/meshtastic/mt_radio_config.h   |    2 +
 .../delivery/chat_delivery_action_service.cpp |   88 +
 .../src/delivery/chat_delivery_event_port.cpp |   45 +
 .../chat_delivery_event_projector.cpp         |   86 +
 .../src/delivery/chat_delivery_read_model.cpp |   93 +
 .../delivery/legacy_chat_delivery_bridge.cpp  |   63 +
 .../legacy_chat_send_result_mapper.cpp        |   63 +
 .../src/infra/meshcore/mc_region_presets.cpp  |   33 +-
 .../meshcore/meshcore_payload_helpers.cpp     |   12 +-
 .../meshcore/meshcore_protocol_helpers.cpp    |  202 +-
 .../src/infra/meshtastic/mt_node_payload.cpp  |    5 +-
 .../src/infra/meshtastic/mt_pki_crypto.cpp    |  342 +-
 .../src/infra/meshtastic/mt_radio_config.cpp  |   18 +-
 .../meshtastic_self_announcement_core.cpp     |   43 +-
 .../test_chat_delivery_action_service.cpp     |  134 +
 .../tests/test_chat_delivery_event_port.cpp   |   41 +
 .../test_chat_delivery_event_projector.cpp    |   76 +
 .../tests/test_chat_delivery_read_model.cpp   |   65 +
 .../test_legacy_chat_delivery_bridge.cpp      |   55 +
 .../test_legacy_chat_send_result_mapper.cpp   |   53 +
 .../include/device/authority_types.h          |   30 +
 .../core_device/include/device/board_types.h  |   40 +
 .../include/device/capability_types.h         |   69 +
 .../core_device/include/device/host_types.h   |   18 +
 .../include/device/platform_types.h           |   17 +
 .../include/device/runtime_types.h            |   38 +
 .../include/device/target_manifest_types.h    |   60 +
 modules/core_device/include/device/ui_types.h |   37 +
 .../core_device}/library.json                 |    6 +-
 .../src/device/capability_types.cpp           |  100 +
 modules/core_gps/README.md                    |   17 +
 .../core_gps/include/gps/domain/gps_status.h  |   36 +
 .../include/gps/domain/location_fix.h         |   66 +
 .../include/gps/domain/satellite_info.h       |   17 +
 .../core_gps/include/gps/domain/time_fact.h   |   27 +
 .../include/gps/ports/i_gnss_byte_stream.h    |   43 +
 .../include/gps/ports/i_gps_config_applier.h  |   42 +
 .../include/gps/ports/i_gps_power_control.h   |   26 +
 .../include/gps/ports/i_location_event_sink.h |   31 +
 .../include/gps/ports/i_location_source.h     |   32 +
 .../include/gps/ports/i_time_authority.h      |   27 +
 .../include/gps/protocol/nmea/nmea_parser.h   |   46 +
 .../include/gps/protocol/nmea/nmea_sentence.h |   33 +
 .../include/gps/protocol/ubx/ubx_parser.h     |   20 +
 .../include/gps/usecase/gps_runtime_config.h  |    4 +
 .../include/gps/usecase/location_service.h    |   39 +
 .../include/gps/usecase/time_authority.h      |   49 +
 .../src/protocol/nmea/nmea_parser.cpp         |  382 ++
 .../src/protocol/nmea/nmea_sentence.cpp       |  116 +
 .../core_gps/src/usecase/location_service.cpp |   82 +
 .../core_gps/src/usecase/time_authority.cpp   |   90 +
 .../core_gps/tests/test_location_service.cpp  |   85 +
 modules/core_gps/tests/test_nmea_parser.cpp   |   69 +
 .../core_gps/tests/test_time_authority.cpp    |   58 +
 modules/core_mesh/README.md                   |   15 +
 .../include/mesh/domain/direct_message.h      |   78 +
 .../include/mesh/domain/local_identity.h      |   15 +
 .../include/mesh/domain/mesh_message.h        |   49 +
 .../include/mesh/domain/mesh_packet.h         |   55 +
 .../include/mesh/domain/mesh_protocol_kind.h  |   15 +
 .../include/mesh/domain/mesh_result.h         |   79 +
 .../core_mesh/include/mesh/domain/node_id.h   |   40 +
 .../include/mesh/domain/peer_identity.h       |   18 +
 .../include/mesh/domain/radio_packet.h        |   68 +
 .../core_mesh/include/mesh/ports/i_clock.h    |   16 +
 .../include/mesh/ports/i_crypto_provider.h    |   70 +
 .../mesh/ports/i_local_identity_store.h       |   19 +
 .../include/mesh/ports/i_mesh_event_sink.h    |   47 +
 .../include/mesh/ports/i_mesh_logger.h        |   16 +
 .../include/mesh/ports/i_mesh_runtime.h       |   14 +
 .../include/mesh/ports/i_node_store.h         |   25 +
 .../include/mesh/ports/i_packet_radio.h       |   19 +
 .../include/mesh/ports/i_peer_key_store.h     |   21 +
 .../mesh/protocol/mesh_protocol_strategy.h    |   49 +
 .../meshcore/mc_direct_message_flow.h         |   20 +
 .../mesh/protocol/meshcore/mc_identity_flow.h |   49 +
 .../mesh/protocol/meshcore/mc_packet_codec.h  |   20 +
 .../mesh/protocol/meshcore/mc_receive_flow.h  |   20 +
 .../meshcore/meshcore_protocol_strategy.h     |   39 +
 .../meshtastic/meshtastic_protocol_strategy.h |   23 +
 .../meshtastic/mt_direct_message_flow.h       |   20 +
 .../protocol/meshtastic/mt_identity_flow.h    |   20 +
 .../protocol/meshtastic/mt_packet_codec.h     |   20 +
 .../mesh/protocol/meshtastic/mt_pki_flow.h    |   29 +
 .../protocol/meshtastic/mt_receive_flow.h     |   20 +
 .../mesh/usecase/direct_message_service.h     |   32 +
 .../include/mesh/usecase/mesh_dedup_service.h |   34 +
 .../include/mesh/usecase/mesh_retry_policy.h  |   15 +
 .../include/mesh/usecase/mesh_runtime_state.h |   25 +
 .../include/mesh/usecase/mesh_session.h       |   37 +
 .../mesh/usecase/peer_identity_service.h      |   34 +
 .../mesh/usecase/receive_packet_service.h     |   33 +
 modules/core_mesh/library.json                |   18 +
 .../protocol/meshcore/mc_identity_flow.cpp    |  135 +
 .../meshcore/meshcore_protocol_strategy.cpp   |  456 +++
 .../meshtastic_protocol_strategy.cpp          |  181 +
 .../src/protocol/meshtastic/mt_pki_flow.cpp   |   63 +
 .../src/usecase/direct_message_service.cpp    |  102 +
 .../src/usecase/mesh_dedup_service.cpp        |   50 +
 .../core_mesh/src/usecase/mesh_session.cpp    |   69 +
 .../src/usecase/peer_identity_service.cpp     |   93 +
 .../src/usecase/receive_packet_service.cpp    |   59 +
 .../tests/contract/store_contracts.h          |  108 +
 .../tests/fake/fake_mesh_dependencies.h       |  332 ++
 .../tests/test_direct_message_service.cpp     |  157 +
 modules/core_mesh/tests/test_mesh_session.cpp |   54 +
 .../tests/test_meshcore_protocol_strategy.cpp |  107 +
 .../test_meshtastic_protocol_strategy.cpp     |   51 +
 .../tests/test_peer_identity_service.cpp      |   54 +
 .../tests/test_receive_packet_service.cpp     |   72 +
 .../core_mesh/tests/test_store_contracts.cpp  |   13 +
 .../include/phone/common/phone_app_facade.h   |  154 +
 .../include/phone/common/phone_facade.h       |   81 +
 .../include/phone/common/phone_io.h           |   31 +
 .../include/phone/common/phone_result.h       |   42 +
 .../phone/common/phone_runtime_context.h      |   10 +
 .../phone/meshcore/meshcore_phone_core.h      |  155 +
 .../phone/meshtastic/meshtastic_defaults.h    |   26 +
 .../meshtastic_phone_config_bridge.h          |  250 ++
 .../phone/meshtastic/meshtastic_phone_core.h  |  231 ++
 .../meshtastic/meshtastic_phone_session.h     |   33 +
 modules/core_phone/library.json               |   23 +
 .../src/meshcore}/meshcore_phone_core.cpp     |  395 +-
 .../src/meshtastic}/meshtastic_phone_core.cpp |  351 +-
 .../meshtastic}/meshtastic_phone_session.cpp  |   10 +-
 .../tests/fake_phone_runtime_context.h        |  292 ++
 .../tests/test_phone_core_smoke.cpp           |  238 ++
 modules/core_sys/include/app/app_config.h     |    4 +-
 .../core_sys/include/platform/ui/README.md    |    3 +
 .../platform/ui/settings_backup_runtime.h     |   22 +
 .../product_composition/app_services_bundle.h |   30 +
 .../product_composition/composition_status.h  |   16 +
 .../product_composition/presentation_bundle.h |   36 +
 .../product_composition/target_app_shell.h    |   16 +
 .../target_build_binding.h                    |   21 +
 .../product_composition/target_profile.h      |   57 +
 .../product_composition/target_ux_binding.h   |   20 +
 modules/product_composition/library.json      |    8 +
 .../src/target_build_binding.cpp              |  122 +
 .../src/target_profile.cpp                    |  239 ++
 .../src/target_ux_binding.cpp                 |   50 +
 .../tests/test_presentation_bundle_shape.cpp  |  133 +
 .../tests/test_target_build_binding.cpp       |   65 +
 .../tests/test_target_profile.cpp             |   78 +
 .../tests/test_target_ux_binding.cpp          |   38 +
 .../ascii_descriptor_renderer.h               |   34 +
 .../ascii_menu_runtime_adapter.h              |   28 +
 .../ascii_runtime_entry_adoption.h            |   27 +
 .../ascii_runtime_screen_graph_presenter.h    |   26 +
 .../ascii_screen_graph_bridge.h               |   38 +
 .../ascii_screen_host_adapter.h               |   22 +
 .../src/ascii_descriptor_renderer.cpp         |   75 +
 .../src/ascii_menu_runtime_adapter.cpp        |   46 +
 .../src/ascii_runtime_entry_adoption.cpp      |   34 +
 .../ascii_runtime_screen_graph_presenter.cpp  |   39 +
 .../src/ascii_screen_graph_bridge.cpp         |   90 +
 .../src/ascii_screen_host_adapter.cpp         |   42 +
 .../ascii_menu_runtime_adapter_smoke.cpp      |   42 +
 .../ascii_runtime_entry_adoption_smoke.cpp    |   28 +
 ...i_runtime_screen_graph_presenter_smoke.cpp |   53 +
 .../tests/ascii_screen_graph_bridge_smoke.cpp |   56 +
 .../tests/ascii_screen_host_adapter_smoke.cpp |   50 +
 .../tests/test_ascii_descriptor_renderer.cpp  |   35 +
 modules/ui_chat_runtime/README.md             |   20 +
 .../chat_delivery_action_port.h               |   16 +
 .../chat_delivery_action_port_adapter.h       |   31 +
 .../chat_delivery_event_port.h                |   11 +
 .../chat_delivery_event_projection_adapter.h  |   40 +
 .../chat_page_runtime_event_pump.h            |   61 +
 .../ui_chat_runtime/chat_ui_refresh_sink.h    |   22 +
 modules/ui_chat_runtime/library.json          |   30 +
 .../src/chat_delivery_action_port_adapter.cpp |   57 +
 ...chat_delivery_event_projection_adapter.cpp |   68 +
 .../src/chat_page_runtime_event_pump.cpp      |  173 +
 modules/ui_chat_runtime/tests/.gitkeep        |    1 +
 ...test_chat_delivery_action_port_adapter.cpp |  105 +
 ...chat_delivery_event_projection_adapter.cpp |  116 +
 modules/ui_gps_runtime/README.md              |   21 +
 .../ui_gps_runtime/gps_page_runtime_pump.h    |   46 +
 .../ui_gps_runtime/gps_ui_refresh_sink.h      |   20 +
 modules/ui_gps_runtime/library.json           |   11 +
 .../src/gps_page_runtime_pump.cpp             |   57 +
 .../tests/test_gps_page_runtime_pump.cpp      |   75 +
 .../gtk_descriptor_page_registry.h            |   31 +
 .../ui_gtk_runtime/gtk_menu_runtime_adapter.h |   28 +
 .../gtk_runtime_entry_adoption.h              |   27 +
 .../ui_gtk_runtime/gtk_screen_host_adapter.h  |   22 +
 .../gtk_uconsole_screen_graph_bridge.h        |   32 +
 .../gtk_uconsole_screen_graph_presenter.h     |   26 +
 .../src/gtk_descriptor_page_registry.cpp      |   69 +
 .../src/gtk_menu_runtime_adapter.cpp          |   46 +
 .../src/gtk_runtime_entry_adoption.cpp        |   34 +
 .../src/gtk_screen_host_adapter.cpp           |   42 +
 .../src/gtk_uconsole_screen_graph_bridge.cpp  |   83 +
 .../gtk_uconsole_screen_graph_presenter.cpp   |   40 +
 .../tests/gtk_menu_runtime_adapter_smoke.cpp  |   73 +
 .../gtk_runtime_entry_adoption_smoke.cpp      |   28 +
 .../tests/gtk_screen_host_adapter_smoke.cpp   |   83 +
 ...gtk_uconsole_screen_graph_bridge_smoke.cpp |   81 +
 ..._uconsole_screen_graph_presenter_smoke.cpp |   79 +
 .../test_gtk_descriptor_page_registry.cpp     |   34 +
 .../headless_descriptor_consumer.h            |   43 +
 .../src/headless_descriptor_consumer.cpp      |   64 +
 .../test_headless_descriptor_consumer.cpp     |   34 +
 modules/ui_key_verification_runtime/README.md |    5 +
 .../key_verification_action_sink.h            |   42 +
 .../key_verification_presentation_source.h    |   54 +
 .../key_verification_session_adapter.h        |   28 +
 .../ui_key_verification_runtime/library.json  |   18 +
 .../src/key_verification_action_sink.cpp      |  162 +
 .../key_verification_presentation_source.cpp  |  291 ++
 ...test_key_verification_runtime_adapters.cpp |  293 ++
 modules/ui_legacy_adapters/README.md          |   21 +
 .../legacy_chat_delivery_action_bridge.h      |   13 +
 .../legacy_chat_delivery_event_bridge.h       |   12 +
 .../legacy_key_verification_action_sink.h     |   12 +
 .../legacy_key_verification_session.h         |   12 +
 .../legacy_key_verification_source.h          |   12 +
 .../legacy_map_overlay_source.h               |   17 +
 modules/ui_legacy_adapters/library.json       |   35 +
 ...at_delivery_action_bridge_legacy_alias.cpp |   12 +
 ...hat_delivery_event_bridge_legacy_alias.cpp |   12 +
 ...key_verification_adapters_legacy_alias.cpp |   22 +
 ...legacy_map_overlay_source_legacy_alias.cpp |   20 +
 modules/ui_lvgl_core/README.md                |   24 +
 .../include/ui_lvgl_core/.gitkeep             |    1 +
 .../include/ui_lvgl_core/lvgl_focus_group.h   |   10 +
 modules/ui_lvgl_core/library.json             |   16 +
 modules/ui_lvgl_core/src/.gitkeep             |    1 +
 modules/ui_lvgl_ux_packs/README.md            |   24 +
 .../common/key_verification_modal_renderer.h  |   49 +
 .../common/team_position_picker_renderer.h    |   63 +
 .../packs/compatibility_ux_pack.h             |   18 +
 .../packs/simulator_full_ux_pack.h            |   18 +
 .../packs/tiny_node_status_ux_pack.h          |   18 +
 .../packs/uconsole_desktop_ux_pack.h          |   18 +
 .../runtime/compatibility_screen_factory.h    |   25 +
 .../runtime/lvgl_descriptor_menu_model.h      |   31 +
 .../runtime/lvgl_descriptor_renderer_probe.h  |   34 +
 .../runtime/lvgl_menu_runtime_adapter.h       |   28 +
 .../lvgl_primary_screen_graph_runtime.h       |   43 +
 .../runtime/lvgl_runtime_adoption_probe.h     |   29 +
 .../runtime/lvgl_runtime_entry_adoption.h     |   27 +
 .../lvgl_runtime_screen_graph_presenter.h     |   26 +
 .../runtime/lvgl_screen_graph_bridge.h        |   32 +
 .../runtime/lvgl_screen_host_adapter.h        |   22 +
 .../ui_lvgl_ux_packs/ux/device_ux_profile.h   |   79 +
 .../ui_lvgl_ux_packs/ux/input_binding_set.h   |   52 +
 .../ui_lvgl_ux_packs/ux/screen_registry.h     |   57 +
 .../ui_lvgl_ux_packs/ux/ux_feature_set.h      |   45 +
 .../ui_lvgl_ux_packs/ux/ux_menu_model.h       |   11 +
 .../ui_lvgl_ux_packs/ux/ux_menu_provider.h    |   10 +
 .../include/ui_lvgl_ux_packs/ux/ux_pack.h     |   24 +
 .../ui_lvgl_ux_packs/ux/ux_pack_registry.h    |   10 +
 .../ux/ux_screen_menu_adapter.h               |   15 +
 modules/ui_lvgl_ux_packs/library.json         |   30 +
 .../key_verification_modal_renderer.cpp       |  268 ++
 .../common/team_position_picker_renderer.cpp  |  414 ++
 .../src/packs/compatibility_ux_pack.cpp       |   75 +
 .../src/packs/simulator_full_ux_pack.cpp      |   75 +
 .../src/packs/tiny_node_status_ux_pack.cpp    |   63 +
 .../src/packs/uconsole_desktop_ux_pack.cpp    |   71 +
 .../runtime/compatibility_screen_factory.cpp  |   80 +
 .../runtime/lvgl_descriptor_menu_model.cpp    |   68 +
 .../lvgl_descriptor_renderer_probe.cpp        |   82 +
 .../src/runtime/lvgl_menu_runtime_adapter.cpp |   46 +
 .../lvgl_primary_screen_graph_runtime.cpp     |   68 +
 .../runtime/lvgl_runtime_adoption_probe.cpp   |   41 +
 .../runtime/lvgl_runtime_entry_adoption.cpp   |   34 +
 .../lvgl_runtime_screen_graph_presenter.cpp   |   38 +
 .../src/runtime/lvgl_screen_graph_bridge.cpp  |   80 +
 .../src/runtime/lvgl_screen_host_adapter.cpp  |   36 +
 .../src/ux/input_binding_set.cpp              |   37 +
 .../src/ux/screen_registry.cpp                |   37 +
 .../ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp |    9 +
 .../src/ux/ux_menu_provider.cpp               |   28 +
 .../src/ux/ux_pack_registry.cpp               |   43 +
 .../src/ux/ux_screen_menu_adapter.cpp         |   62 +
 .../tests/test_compatibility_menu_binding.cpp |   40 +
 .../test_compatibility_screen_factory.cpp     |   49 +
 .../tests/test_compatibility_ux_pack.cpp      |   28 +
 .../tests/test_input_binding_set.cpp          |   22 +
 .../tests/test_lvgl_descriptor_menu_model.cpp |   36 +
 .../test_lvgl_descriptor_renderer_probe.cpp   |   41 +
 .../tests/test_lvgl_menu_runtime_adapter.cpp  |   34 +
 ...test_lvgl_primary_screen_graph_runtime.cpp |   42 +
 .../test_lvgl_runtime_adoption_probe.cpp      |   37 +
 .../test_lvgl_runtime_entry_adoption.cpp      |   34 +
 ...st_lvgl_runtime_screen_graph_presenter.cpp |   60 +
 .../tests/test_lvgl_screen_graph_bridge.cpp   |   61 +
 .../tests/test_lvgl_screen_host_adapter.cpp   |   20 +
 .../tests/test_screen_registry.cpp            |   23 +
 .../tests/test_simulator_full_ux_pack.cpp     |   25 +
 .../tests/test_tiny_node_status_ux_pack.cpp   |   24 +
 .../tests/test_uconsole_desktop_ux_pack.cpp   |   26 +
 .../tests/test_ux_menu_provider.cpp           |   46 +
 .../tests/test_ux_pack_registry.cpp           |   32 +
 .../tests/test_ux_screen_menu_adapter.cpp     |   26 +
 modules/ui_map_runtime/README.md              |   23 +
 .../map_overlay/map_overlay_projector.h       |   33 +
 .../map_overlay_projection_adapter.h          |   54 +
 .../map_overlay_snapshot_source.h             |   28 +
 .../map_tiles/filesystem_map_tile_source.h    |   41 +
 .../ui_map_runtime/map_tiles/map_tile_cache.h |   20 +
 .../map_tiles/map_tile_decoder_cache.h        |   20 +
 .../map_tiles/map_tile_render_queue.h         |   53 +
 .../map_tiles/map_tile_resolver.h             |   31 +
 .../map_tiles/map_tile_source.h               |   41 +
 .../ui_map_runtime/map_tiles/map_tile_types.h |   67 +
 modules/ui_map_runtime/library.json           |   12 +
 .../src/map_overlay/map_overlay_projector.cpp |  125 +
 .../src/map_overlay_projection_adapter.cpp    |   57 +
 .../src/map_overlay_snapshot_source.cpp       |   22 +
 .../map_tiles/filesystem_map_tile_source.cpp  |   94 +
 .../src/map_tiles/map_tile_render_queue.cpp   |   36 +
 .../src/map_tiles/map_tile_resolver.cpp       |  267 ++
 .../tests/test_filesystem_map_tile_source.cpp |  127 +
 .../tests/test_map_overlay_projector.cpp      |   83 +
 .../test_map_overlay_snapshot_source.cpp      |  100 +
 .../tests/test_map_tile_render_queue.cpp      |   64 +
 .../tests/test_map_tile_resolver.cpp          |   73 +
 modules/ui_mono_128x64/library.json           |   29 +
 modules/ui_mono_128x64/src/runtime.cpp        |   20 +-
 .../ui_presentation/chat/chat_action_sink.h   |   20 +
 .../ui_presentation/chat/chat_identity.h      |   61 +
 .../ui_presentation/chat/chat_message_ref.h   |   55 +
 .../chat/chat_presentation_source.h           |   28 +
 .../chat/chat_workspace_model.h               |   40 +
 .../chat/chat_workspace_snapshot.h            |  121 +
 .../ui_presentation/common/fixed_text.h       |   47 +
 .../common/presentation_profile.h             |   28 +
 .../ui_presentation/common/snapshot_header.h  |   15 +
 .../ui_presentation/common/ui_action.h        |   25 +
 .../ui_presentation/common/ui_action_result.h |   41 +
 .../device/device_status_model.h              |   19 +
 .../device/device_status_snapshot.h           |   42 +
 .../device/device_status_source.h             |   16 +
 .../ui_presentation/gps/gps_status_model.h    |   19 +
 .../ui_presentation/gps/gps_status_snapshot.h |   37 +
 .../ui_presentation/gps/gps_status_source.h   |   16 +
 .../key_verification_action_sink.h            |   23 +
 .../key_verification/key_verification_model.h |   37 +
 .../key_verification_snapshot.h               |   68 +
 .../key_verification_source.h                 |   29 +
 .../ui_presentation/layout/layout_profile.h   |   28 +
 .../ui_presentation/map/map_action_sink.h     |   21 +
 .../map/map_overlay_snapshot.h                |   70 +
 .../ui_presentation/map/map_overlay_source.h  |   19 +
 .../map/map_presentation_source.h             |   23 +
 .../ui_presentation/map/map_workspace_model.h |   33 +
 .../map/map_workspace_snapshot.h              |   88 +
 .../include/ui_presentation/menu/menu_model.h |   55 +
 .../ui_presentation/mesh/mesh_status_model.h  |   19 +
 .../mesh/mesh_status_snapshot.h               |   42 +
 .../ui_presentation/mesh/mesh_status_source.h |   16 +
 .../ui_presentation/page/page_manifest.h      |   42 +
 .../screen/screen_binding_registry.h          |   44 +
 .../ui_presentation/screen/screen_route.h     |   36 +
 .../settings/settings_action_sink.h           |   17 +
 .../ui_presentation/settings/settings_model.h |   22 +
 .../settings/settings_snapshot.h              |   51 +
 .../settings/settings_source.h                |   16 +
 .../ui_presentation/target_ui_profile.h       |   65 +
 .../workspace/presentation_workspace.h        |   50 +
 .../workspace/presentation_workspace_probe.h  |   16 +
 .../presentation_workspace_snapshot.h         |   30 +
 modules/ui_presentation/library.json          |    8 +
 .../src/chat/chat_workspace_model.cpp         |   98 +
 .../src/device/device_status_model.cpp        |   21 +
 .../src/gps/gps_status_model.cpp              |   21 +
 .../key_verification_model.cpp                |  121 +
 .../src/layout/layout_profile.cpp             |   49 +
 .../src/map/map_workspace_model.cpp           |   74 +
 .../ui_presentation/src/menu/menu_model.cpp   |   36 +
 .../src/mesh/mesh_status_model.cpp            |   21 +
 .../src/page/page_manifest.cpp                |  115 +
 .../src/screen/screen_binding_registry.cpp    |   50 +
 .../src/settings/settings_model.cpp           |   27 +
 .../ui_presentation/src/target_ui_profile.cpp |  177 +
 .../presentation_workspace_probe.cpp          |   55 +
 .../tests/fake/fake_chat_action_sink.h        |   45 +
 .../fake/fake_chat_presentation_source.h      |   35 +
 .../tests/fake/fake_device_status_source.h    |   25 +
 .../tests/fake/fake_gps_status_source.h       |   25 +
 .../tests/fake/fake_map_action_sink.h         |   65 +
 .../tests/fake/fake_map_presentation_source.h |   36 +
 .../tests/fake/fake_mesh_status_source.h      |   25 +
 .../tests/fake/fake_settings_action_sink.h    |   23 +
 .../tests/fake/fake_settings_source.h         |   25 +
 .../tests/test_chat_presentation_identity.cpp |   88 +
 .../tests/test_chat_workspace_model.cpp       |  169 +
 .../tests/test_device_status_model.cpp        |   39 +
 .../ui_presentation/tests/test_fixed_text.cpp |   59 +
 .../tests/test_gps_status_model.cpp           |   51 +
 .../tests/test_key_verification_model.cpp     |  177 +
 .../tests/test_layout_profile.cpp             |   35 +
 .../tests/test_map_workspace_model.cpp        |  125 +
 .../tests/test_mesh_status_model.cpp          |   45 +
 .../tests/test_page_manifest.cpp              |   49 +
 .../tests/test_presentation_workspace.cpp     |   80 +
 .../test_presentation_workspace_probe.cpp     |  125 +
 .../tests/test_screen_binding_registry.cpp    |   34 +
 .../tests/test_settings_model.cpp             |   53 +
 .../tests/test_target_ui_profile.cpp          |   36 +
 .../include/ui/assets/fonts/font_utils.h      |    5 +-
 .../ui/map_overlay/map_overlay_projector.h    |    3 +
 .../legacy_filesystem_map_tile_source.h       |    3 +
 .../include/ui/map_tiles/map_tile_cache.h     |    3 +
 .../ui/map_tiles/map_tile_decoder_cache.h     |    3 +
 .../ui/map_tiles/map_tile_render_queue.h      |    3 +
 .../include/ui/map_tiles/map_tile_resolver.h  |    3 +
 .../include/ui/map_tiles/map_tile_source.h    |    3 +
 .../include/ui/map_tiles/map_tile_types.h     |    3 +
 .../ui_shared/include/ui/menu/menu_layout.h   |    2 +
 .../chat_presentation_source.h                |   43 +
 .../legacy_air_device_status_source.h         |   16 +
 .../legacy_chat_action_sink.h                 |   35 +
 .../legacy_chat_delivery_action_bridge.h      |   13 +
 .../legacy_chat_delivery_event_bridge.h       |   12 +
 .../legacy_gps_status_source.h                |   16 +
 .../legacy_key_verification_action_sink.h     |   12 +
 .../legacy_key_verification_session.h         |   12 +
 .../legacy_key_verification_source.h          |   12 +
 .../legacy_map_action_sink.h                  |   43 +
 .../legacy_map_overlay_source.h               |   17 +
 .../legacy_map_presentation_source.h          |   43 +
 .../legacy_map_presentation_state.h           |   28 +
 .../legacy_mesh_status_source.h               |   16 +
 .../legacy_settings_action_sink.h             |   16 +
 .../legacy_settings_source.h                  |   16 +
 .../team_chat_action_sink.h                   |   59 +
 .../team_chat_presentation_source.h           |   44 +
 .../chat/chat_conversation_components.h       |   14 +-
 .../chat/chat_page_runtime_event_pump.h       |    3 +
 .../ui/screens/chat/chat_ui_controller.h      |   97 +-
 .../ui/screens/chat/chat_ui_refresh_sink.h    |    3 +
 .../chat/key_verification_modal_renderer.h    |    3 +
 .../chat/team_position_picker_renderer.h      |    3 +
 .../chat_conversation_components_watch.h      |   14 +-
 .../ui/screens/gps/gps_page_runtime_pump.h    |    3 +
 .../include/ui/screens/gps/gps_state.h        |    1 +
 .../ui/screens/gps/gps_ui_refresh_sink.h      |    3 +
 .../node_info/node_info_page_components.h     |    1 +
 .../ui/screens/settings/settings_state.h      |    5 +-
 modules/ui_shared/include/ui/startup_shell.h  |    1 +
 .../ui_shared/include/ui/startup_ui_shell.h   |    1 +
 .../include/ui/support/lvgl_fs_utils.h        |   16 +-
 .../team_actions/legacy_team_action_bridge.h  |   50 +
 .../ui/team_actions/team_action_sink.h        |   26 +
 .../ui/team_actions/team_action_types.h       |   66 +
 .../team_rich_payload_display.h               |   60 +
 .../team_rich_payload_projector.h             |   16 +
 .../include/ui/widgets/map/map_viewport.h     |    3 +
 modules/ui_shared/library.json                |   36 +-
 .../src/ui/assets/fonts/font_utils.cpp        |    2 +-
 .../src/ui/components/air_status_footer.cpp   |  125 +-
 .../src/ui/i18n/resource_pack_registry.cpp    |  236 +-
 .../menu/dashboard/dashboard_gps_widget.cpp   |   63 +-
 .../menu/dashboard/dashboard_mesh_widget.cpp  |   47 +-
 modules/ui_shared/src/ui/menu/menu_layout.cpp |  123 +-
 .../chat_presentation_source.cpp              |  223 ++
 .../legacy_air_device_status_source.cpp       |  162 +
 .../legacy_chat_action_sink.cpp               |   71 +
 .../legacy_gps_status_source.cpp              |   88 +
 .../legacy_map_action_sink.cpp                |   67 +
 .../legacy_map_presentation_source.cpp        |  114 +
 .../legacy_mesh_status_source.cpp             |   78 +
 .../legacy_settings_action_sink.cpp           |   71 +
 .../legacy_settings_source.cpp                |   34 +
 .../team_chat_action_sink.cpp                 |  139 +
 .../team_chat_presentation_source.cpp         |  190 +
 .../src/ui/runtime/memory_profile.cpp         |    4 +-
 .../chat/chat_conversation_components.cpp     |  130 +-
 .../src/ui/screens/chat/chat_page_runtime.cpp |  269 +-
 .../ui/screens/chat/chat_ui_controller.cpp    | 1380 ++-----
 .../chat_conversation_components_watch.cpp    |   60 +-
 .../contacts/contacts_page_components.cpp     |   88 +-
 .../extensions/extensions_page_runtime.cpp    |    2 +
 .../src/ui/screens/gps/gps_page_runtime.cpp   |  349 +-
 .../node_info/node_info_page_components.cpp   |  239 +-
 .../settings/settings_page_components.cpp     |  316 +-
 modules/ui_shared/src/ui/startup_shell.cpp    |    8 +
 modules/ui_shared/src/ui/startup_ui_shell.cpp |    7 +
 .../legacy_team_action_bridge.cpp             |  342 ++
 .../team_rich_payload_projector.cpp           |  242 ++
 modules/ui_shared/src/ui/ui_status.cpp        |   13 +-
 .../src/ui/widgets/ime/ime_widget.cpp         |    7 +-
 .../src/ui/widgets/map/map_viewport.cpp       |  147 +-
 .../tests/test_chat_presentation_source.cpp   |  220 +
 .../test_legacy_map_presentation_adapters.cpp |  183 +
 .../tests/test_legacy_team_action_bridge.cpp  |  207 +
 .../tests/test_team_action_types.cpp          |   34 +
 .../tests/test_team_chat_action_sink.cpp      |  191 +
 .../test_team_chat_presentation_source.cpp    |  142 +
 .../test_team_rich_payload_projector.cpp      |  127 +
 packs/ar/locales/ar/strings.tsv               |   20 +
 packs/ar/package.ini                          |    2 +-
 packs/europe-cyrillic-ext/README.md           |    2 +-
 .../locales/ru/strings.tsv                    |   20 +
 packs/europe-cyrillic-ext/package.ini         |    2 +-
 packs/europe-latin-ext/README.md              |    2 +-
 packs/europe-latin-ext/locales/de/strings.tsv |   20 +
 packs/europe-latin-ext/locales/es/strings.tsv |   20 +
 packs/europe-latin-ext/locales/fr/strings.tsv |   20 +
 packs/europe-latin-ext/locales/it/strings.tsv |   20 +
 packs/europe-latin-ext/locales/nl/strings.tsv |   20 +
 packs/europe-latin-ext/locales/pl/strings.tsv |   20 +
 .../locales/pt-PT/strings.tsv                 |   20 +
 packs/europe-latin-ext/package.ini            |    2 +-
 packs/ja/README.md                            |    2 +-
 packs/ja/locales/ja/strings.tsv               |   20 +
 packs/ja/package.ini                          |    2 +-
 packs/ko/README.md                            |    2 +-
 packs/ko/locales/ko/strings.tsv               |   20 +
 packs/ko/package.ini                          |    2 +-
 packs/zh-Hans/README.md                       |    2 +-
 packs/zh-Hans/locales/zh-Hans/strings.tsv     |   20 +
 packs/zh-Hans/package.ini                     |    2 +-
 packs/zh-Hant/README.md                       |    2 +-
 packs/zh-Hant/locales/zh-Hant/strings.tsv     |   20 +
 packs/zh-Hant/package.ini                     |    2 +-
 .../arduino_common/include/app}/app_context.h |   27 +-
 .../include/ble/app_phone_facade.h            |  147 +
 .../arduino_common/include/ble/meshcore_ble.h |   59 +-
 .../include/ble/meshtastic_ble.h              |   93 +-
 .../ble/meshtastic_ble_observer_bridge.h      |   33 +
 .../chat/infra/meshtastic/mt_adapter.h        |   20 +-
 .../esp/arduino_common/gps/gps_service_api.h  |    6 +
 .../mesh/esp_mesh_runtime_shell.h             |   23 +
 .../mesh/esp_meshtastic_adapter_bridge.h      |   97 +
 .../esp_preferences_mesh_identity_store.h     |   63 +
 .../team/runtime/team_track_source_gps.h      |    7 +
 .../include/ui/widgets/map/map_tiles.h        |    7 +-
 platform/esp/arduino_common/library.json      |   15 +
 .../esp/arduino_common/src/LV_Helper_v9.cpp   |   74 +-
 .../arduino_common/src/app_config_store.cpp   |  121 +-
 .../esp/arduino_common}/src/app_context.cpp   |   10 +-
 .../src/app_context_time_sync.cpp             |    6 +-
 .../src/app_event_runtime_support.cpp         |   21 +-
 .../src/app_runtime_bootstrap_support.cpp     |    2 +-
 .../src/app_runtime_support.cpp               |   28 +-
 .../src/ble/app_phone_facade.cpp              |  730 ++++
 .../arduino_common/src/ble/meshcore_ble.cpp   |   26 +-
 .../src/ble/meshcore_ble_owner_hooks.cpp      |  100 +-
 .../arduino_common/src/ble/meshtastic_ble.cpp |   37 +-
 .../ble/meshtastic_ble_observer_bridge.cpp    |   65 +
 .../src/ble/meshtastic_ble_owner_hooks.cpp    |  136 +-
 .../chat/infra/meshcore/meshcore_adapter.cpp  |  165 +-
 .../src/chat/infra/meshtastic/mt_adapter.cpp  |  364 +-
 .../src/gps/gps_service_api.cpp               |   78 +
 .../src/mesh/esp_mesh_runtime_shell.cpp       |   37 +
 .../mesh/esp_meshtastic_adapter_bridge.cpp    |  193 +
 .../esp_preferences_mesh_identity_store.cpp   |  383 ++
 .../platform_ui_settings_backup_runtime.cpp   |  991 +++++
 .../team/runtime/team_track_source_gps.cpp    |   18 +-
 .../src/ui/runtime/pack_repository.cpp        |  721 +++-
 .../src/ui/widgets/map/map_tiles.cpp          |  619 +--
 .../platform/esp/common/settings_store_impl.h |    2 +
 .../platform_ui_settings_backup_runtime.cpp   |   36 +
 platform/esp/radio/README.md                  |   21 +
 .../esp/radio}/meshtastic_radio_adapter.cpp   |   28 +-
 .../esp/radio}/meshtastic_radio_adapter.h     |    8 +-
 .../chat/linux_raw_lora_mesh_adapter.h        |   84 +-
 .../linux/mesh/linux_mesh_runtime_shell.h     |   23 +
 .../mesh/linux_sqlite_mesh_identity_store.h   |   61 +
 .../common/include/ui/widgets/map/map_tiles.h |    4 +
 .../common/src/app/linux_app_services.cpp     |    7 +
 .../src/chat/linux_raw_lora_mesh_adapter.cpp  | 1172 +++++-
 .../src/mesh/linux_mesh_runtime_shell.cpp     |   37 +
 .../mesh/linux_sqlite_mesh_identity_store.cpp |  347 ++
 .../platform/ui/settings_backup_runtime.cpp   |   36 +
 .../common/src/ui/widgets/map/map_tiles.cpp   |  251 +-
 .../uconsole/uconsole_map_workspace_model.h   |   24 +
 .../src/uconsole_chat_workspace_model.cpp     |   20 +-
 .../src/uconsole_map_workspace_model.cpp      |   50 +-
 platform/nrf52/README.md                      |   12 +
 .../include/ble/app_phone_facade.h            |  144 +
 .../arduino_common/include/ble/meshcore_ble.h |   47 +-
 .../include/ble/meshtastic_ble.h              |   89 +-
 .../ble/meshtastic_ble_observer_bridge.h      |   32 +
 .../ble/meshtastic_ble_persistence_bridge.h   |   13 +
 .../mesh/nrf52_mesh_runtime_shell.h           |   23 +
 .../mesh/nrf52_settings_mesh_identity_store.h |   61 +
 platform/nrf52/arduino_common/library.json    |   12 +-
 .../src/ble/app_phone_facade.cpp              |  704 ++++
 .../arduino_common/src/ble/meshcore_ble.cpp   |   43 +-
 .../arduino_common/src/ble/meshtastic_ble.cpp |  330 +-
 .../ble/meshtastic_ble_observer_bridge.cpp    |   59 +
 .../ble/meshtastic_ble_persistence_bridge.cpp |  142 +
 .../meshtastic/meshtastic_radio_adapter.cpp   |  132 +-
 .../src/mesh/nrf52_mesh_runtime_shell.cpp     |   37 +
 .../nrf52_settings_mesh_identity_store.cpp    |  329 ++
 .../platform_ui_settings_backup_runtime.cpp   |   36 +
 .../nrf52/debug/nrf52_debug_console.cpp       |    6 +-
 .../nrf52/debug/nrf52_debug_console.h         |    6 +-
 platform/nrf52/library.json                   |   54 +
 .../nrf52/protocol/nrf52_protocol_factory.cpp |    6 +-
 .../nrf52/protocol/nrf52_protocol_factory.h   |    6 +-
 .../runtime/nrf52_runtime_apply_service.cpp   |   32 +-
 .../runtime/nrf52_runtime_apply_service.h     |    6 +-
 .../ble/app_config_phone_snapshot_bridge.h    |   14 +-
 .../ble/meshtastic_phone_runtime_bridge.h     |   58 +-
 .../platform/shared/ble/phone_ble_runtime.h   |   21 +
 platformio.ini                                |   13 +-
 site/assets/.gitignore                        |    8 +
 .../dividers/divider-line-teal.svg            |    1 +
 .../animal-island/footer/footer-tree.webp     |  Bin 0 -> 29254 bytes
 .../animal-island/icons/icon-camera.svg       |    7 +
 site/assets/animal-island/icons/icon-chat.svg |    7 +
 .../animal-island/icons/icon-design.svg       |    7 +
 site/assets/animal-island/icons/icon-diy.svg  |    8 +
 .../animal-island/icons/icon-helicopter.svg   |   13 +
 site/assets/animal-island/icons/icon-leaf.png |  Bin 0 -> 3337 bytes
 site/assets/animal-island/icons/icon-map.svg  |   15 +
 .../assets/animal-island/icons/icon-miles.svg |   11 +
 .../animal-island/icons/icon-shopping.svg     |    6 +
 site/assets/animal-island/icons/location.svg  |    4 +
 site/assets/animal-island/icons/wifi.svg      |    9 +
 site/data/packs.json                          |   58 +-
 site/index.html                               |  812 ++--
 site/main.js                                  |  876 +++-
 site/styles.css                               | 1742 ++++++--
 src/CMakeLists.txt                            |    6 +-
 src/main.cpp                                  |   12 +-
 .../KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md  |  393 ++
 .../check_all_target_architecture_ready.py    |  181 +
 .../check_board_facts_boundary_ready.py       |   43 +
 ...check_esp_arduino_real_targets_restored.py |  205 +
 ...ck_esp_idf_final_owner_extraction_ready.py |  150 +
 .../check_esp_idf_real_targets_restored.py    |   55 +
 .../check_legacy_app_roots_burndown_ready.py  |  456 +++
 ...heck_legacy_compat_temp_inventory_ready.py |  176 +
 ...heck_legacy_disposition_execution_ready.py |  285 ++
 .../check_no_intermediate_ui_layer_ready.py   |   77 +
 .../check_no_root_legacy_preflight_ready.py   |   82 +
 .../check_no_root_legacy_ready.py             |   71 +
 .../check_phase10_primary_path_ready.py       |  306 ++
 ...heck_phase11_renderer_consumption_ready.py |  278 ++
 tools/architecture/check_phase45_ready.py     |  408 ++
 .../architecture/check_phase5_final_ready.py  |  153 +
 tools/architecture/check_phase5_ready.py      |  664 +++
 .../check_phase5_renderer_ready.py            |  548 +++
 .../check_phase5_workspace_ready.py           |  340 ++
 .../check_phase6_composition_ready.py         |  388 ++
 .../check_phase7_runtime_ownership_ready.py   | 2909 ++++++++++++++
 .../architecture/check_phase8_layout_ready.py | 2549 ++++++++++++
 .../architecture/check_phase9_final_ready.py  |  237 ++
 .../check_phase9_legacy_burndown_ready.py     |  580 +++
 .../check_phase9_runtime_adoption_ready.py    |  487 +++
 .../check_pio_real_env_restored.py            |   77 +
 .../check_post_refactor_final_ready.py        |  316 ++
 .../check_product_architecture_boundaries.py  |  542 +++
 ...k_real_target_regression_recovery_ready.py |   48 +
 ...ck_target_architecture_foundation_ready.py |  131 +
 .../check_uconsole_real_ui_restored.py        |   61 +
 .../phase5_renderer_legacy_baseline.json      |  128 +
 .../phase6_composition_legacy_baseline.json   |  106 +
 .../scan_legacy_compat_temp_surfaces.py       |  197 +
 .../envs/gat562_mesh_evb_pro.ini              |   18 +-
 .../lilygo_tlora_pager/envs/tlora_pager.ini   |   49 -
 .../envs/lilygo_twatch_s3.ini                 |    2 +
 1071 files changed, 78913 insertions(+), 14110 deletions(-)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 delete mode 100644 .github/workflows/cardputer-zero-linux.yml
 create mode 100644 .github/workflows/linux-simulator.yml
 create mode 100644 .github/workflows/uconsole-linux.yml
 create mode 100644 apps/esp32_lvgl/APP_SHELL_MANIFEST.md
 create mode 100644 apps/esp32_lvgl/CMakeLists.txt
 create mode 100644 apps/esp32_lvgl/README.md
 create mode 100644 apps/esp32_lvgl/library.json
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_app_shell.h
 rename apps/{esp_pio/src/app_registry.cpp => esp32_lvgl/src/esp32_lvgl_arduino_app_registry.cpp} (99%)
 rename apps/{esp_pio/src/app_runtime_access.cpp => esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.cpp} (89%)
 rename apps/{esp_pio/include/apps/esp_pio/app_runtime_access.h => esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.h} (64%)
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.cpp
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.h
 rename apps/{esp_pio/src/loop_runtime.cpp => esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.cpp} (72%)
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.h
 rename apps/{esp_pio/src/startup_runtime.cpp => esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.cpp} (80%)
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.h
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.cpp
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.h
 rename apps/{esp_idf/src/loop_runtime.cpp => esp32_lvgl/src/esp32_lvgl_loop_runtime.cpp} (68%)
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.h
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_runtime_config.cpp
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_runtime_config.h
 rename apps/{esp_idf/src/startup_runtime.cpp => esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp} (86%)
 create mode 100644 apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.h
 create mode 100644 apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp
 create mode 100644 apps/esp32_lvgl/tests/esp32_lvgl_historical_source_descriptor_smoke.cpp
 create mode 100644 apps/esp32_lvgl/tests/esp32_lvgl_loop_runtime_smoke.cpp
 create mode 100644 apps/esp32_lvgl/tests/esp32_lvgl_runtime_config_smoke.cpp
 create mode 100644 apps/esp32_lvgl/tests/esp32_lvgl_startup_runtime_smoke.cpp
 delete mode 100644 apps/esp_idf/CMakeLists.txt
 delete mode 100644 apps/esp_idf/README.md
 delete mode 100644 apps/esp_idf/idf_component.yml
 delete mode 100644 apps/esp_idf/include/apps/esp_idf/app_facade_runtime.h
 delete mode 100644 apps/esp_idf/include/apps/esp_idf/app_runtime_access.h
 delete mode 100644 apps/esp_idf/include/apps/esp_idf/loop_runtime.h
 delete mode 100644 apps/esp_idf/include/apps/esp_idf/runtime_config.h
 delete mode 100644 apps/esp_idf/include/apps/esp_idf/startup_runtime.h
 delete mode 100644 apps/esp_idf/src/app_facade_runtime.cpp
 delete mode 100644 apps/esp_idf/src/app_registry.cpp
 delete mode 100644 apps/esp_idf/src/app_runtime_access.cpp
 delete mode 100644 apps/esp_idf/src/gps_service_api.cpp
 delete mode 100644 apps/esp_idf/src/gps_tracker_overlay.cpp
 delete mode 100644 apps/esp_idf/src/idf_component_anchor.cpp
 delete mode 100644 apps/esp_idf/src/idf_entry.cpp
 delete mode 100644 apps/esp_idf/src/mt_packet_wire_idf.cpp
 delete mode 100644 apps/esp_idf/src/runtime_config.cpp
 delete mode 100644 apps/esp_idf/src/team_ui_store.cpp
 delete mode 100644 apps/esp_idf/targets/t_display_p4/README.md
 delete mode 100644 apps/esp_idf/targets/t_display_p4_amoled/README.md
 delete mode 100644 apps/esp_idf/targets/t_display_p4_tft/README.md
 delete mode 100644 apps/esp_idf/targets/tab5/README.md
 delete mode 100644 apps/esp_pio/README.md
 delete mode 100644 apps/esp_pio/include/apps/esp_pio/arduino_entry.h
 delete mode 100644 apps/esp_pio/include/apps/esp_pio/loop_runtime.h
 delete mode 100644 apps/esp_pio/include/apps/esp_pio/startup_runtime.h
 delete mode 100644 apps/esp_pio/library.json
 delete mode 100644 apps/esp_pio/src/arduino_entry.cpp
 delete mode 100644 apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/arduino_entry.h
 delete mode 100644 apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/loop_runtime.h
 delete mode 100644 apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/startup_runtime.h
 delete mode 100644 apps/gat562_mesh_evb_pro/library.json
 delete mode 100644 apps/gat562_mesh_evb_pro/src/arduino_entry.cpp
 delete mode 100644 apps/gat562_mesh_evb_pro/src/loop_runtime.cpp
 delete mode 100644 apps/linux_rpi/CMakeLists.txt
 delete mode 100644 apps/linux_rpi/CMakePresets.json
 delete mode 100644 apps/linux_rpi/README.md
 delete mode 100644 apps/linux_rpi/SConstruct
 delete mode 100644 apps/linux_rpi/config_defaults.mk
 delete mode 100644 apps/linux_rpi/docs/specification/cardputer-zero-adaptation-spec.md
 delete mode 100644 apps/linux_rpi/docs/specification/feature-migration-checklist.md
 delete mode 100644 apps/linux_rpi/docs/specification/migration-path.md
 delete mode 100644 apps/linux_rpi/docs/specification/project-baseline.md
 delete mode 100644 apps/linux_rpi/main/SConstruct
 delete mode 100644 apps/linux_rpi/main/include/main.h
 delete mode 100644 apps/linux_rpi/main/src/main.cpp
 delete mode 100644 apps/linux_rpi/scripts/build-device.sh
 delete mode 100644 apps/linux_rpi/scripts/build-sdk-device.sh
 delete mode 100644 apps/linux_rpi/scripts/run-device.sh
 delete mode 100644 apps/linux_rpi/scripts/run-sdk-device.sh
 delete mode 100644 apps/linux_rpi/src/targets/device_main.cpp
 delete mode 100644 apps/linux_sim/.dockerignore
 delete mode 100644 apps/linux_sim/CMakeLists.txt
 delete mode 100644 apps/linux_sim/CMakePresets.json
 delete mode 100644 apps/linux_sim/README.md
 delete mode 100644 apps/linux_sim/docker/dev-simulator.Dockerfile
 delete mode 100644 apps/linux_sim/scripts/build-dev-container.sh
 delete mode 100644 apps/linux_sim/scripts/build-simulator.ps1
 delete mode 100644 apps/linux_sim/scripts/build-simulator.sh
 delete mode 100644 apps/linux_sim/scripts/generate-windows-solution.ps1
 delete mode 100644 apps/linux_sim/scripts/open-windows-solution.ps1
 delete mode 100644 apps/linux_sim/scripts/run-dev-container.ps1
 delete mode 100644 apps/linux_sim/scripts/run-dev-container.sh
 delete mode 100644 apps/linux_sim/scripts/run-simulator.ps1
 delete mode 100644 apps/linux_sim/scripts/run-simulator.sh
 delete mode 100644 apps/linux_sim/scripts/wsl-validate.sh
 delete mode 100644 apps/linux_sim/src/platform/simulator/sdl_simulator.cpp
 delete mode 100644 apps/linux_sim/src/platform/simulator/sdl_simulator.h
 delete mode 100644 apps/linux_sim/src/targets/simulator_main.cpp
 delete mode 100644 apps/linux_sim/tests/demo_app_smoke.cpp
 delete mode 100644 apps/linux_sim/tests/linux_runtime_smoke.cpp
 delete mode 100644 apps/linux_sim/tests/path_safety_smoke.cpp
 create mode 100644 apps/linux_sim_shell/APP_SHELL_MANIFEST.md
 create mode 100644 apps/linux_sim_shell/CMakeLists.txt
 create mode 100644 apps/linux_sim_shell/README.md
 create mode 100644 apps/linux_sim_shell/src/linux_sim_app_shell.cpp
 create mode 100644 apps/linux_sim_shell/src/linux_sim_app_shell.h
 create mode 100644 apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.cpp
 create mode 100644 apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h
 create mode 100644 apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp
 create mode 100644 apps/linux_sim_shell/src/linux_sim_runtime_entry.h
 create mode 100644 apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp
 create mode 100644 apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h
 create mode 100644 apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp
 create mode 100644 apps/linux_sim_shell/src/linux_sim_runtime_renderer.h
 create mode 100644 apps/linux_sim_shell/tests/linux_sim_app_shell_smoke.cpp
 create mode 100644 apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp
 create mode 100644 apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp
 create mode 100644 apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp
 create mode 100644 apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp
 create mode 100644 apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp
 delete mode 100644 apps/linux_uconsole/CMakeLists.txt
 delete mode 100644 apps/linux_uconsole/CMakePresets.json
 delete mode 100644 apps/linux_uconsole/README.md
 create mode 100644 apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md
 create mode 100644 apps/linux_uconsole_gtk/CMakeLists.txt
 create mode 100644 apps/linux_uconsole_gtk/README.md
 rename apps/{linux_uconsole => linux_uconsole_gtk}/packaging/trailmate-uconsole.desktop (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/packaging/trailmate-uconsole.png (100%)
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.cpp
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.h
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.cpp
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.cpp
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.h
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp
 create mode 100644 apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.h
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/desktop/sdl_window_presenter.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/desktop/sdl_window_presenter.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_app.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_app.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_app_state.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_chat_layout.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_chat_logic.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_data_layout.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_data_logic.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_hardware_layout.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_hardware_logic.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_layout_spec.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_logs_layout.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_logs_logic.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_map_layout.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_map_logic.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_mqtt_settings.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_mqtt_settings.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_overview_layout.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_overview_logic.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_pages.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_pages.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_settings_layout.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_settings_logic.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_shell.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_shell.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_style.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_style.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_widgets.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/platform/gtk/gtk_uconsole_widgets.h (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/src/targets/uconsole_main.cpp (100%)
 create mode 100644 apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_app_shell_smoke.cpp
 create mode 100644 apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp
 create mode 100644 apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp
 create mode 100644 apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp
 create mode 100644 apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_renderer_smoke.cpp
 create mode 100644 apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp
 rename apps/{linux_uconsole => linux_uconsole_gtk}/tests/uconsole_chat_dedup_smoke.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/tests/uconsole_chat_sqlite_store_smoke.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/tests/uconsole_chat_workspace_smoke.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/tests/uconsole_map_workspace_smoke.cpp (96%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/tests/uconsole_meshtastic_node_payload_smoke.cpp (100%)
 rename apps/{linux_uconsole => linux_uconsole_gtk}/tools/sx1262_probe.cpp (100%)
 delete mode 100644 apps/linux_unoq/README.md
 create mode 100644 apps/nrf52_node/APP_SHELL_MANIFEST.md
 create mode 100644 apps/nrf52_node/README.md
 create mode 100644 apps/nrf52_node/library.json
 create mode 100644 apps/nrf52_node/src/nrf52_historical_source_descriptor.cpp
 create mode 100644 apps/nrf52_node/src/nrf52_historical_source_descriptor.h
 rename apps/{gat562_mesh_evb_pro/src/app_facade_runtime.cpp => nrf52_node/src/nrf52_node_app_facade_runtime.cpp} (85%)
 rename apps/{gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/app_facade_runtime.h => nrf52_node/src/nrf52_node_app_facade_runtime.h} (95%)
 rename apps/{gat562_mesh_evb_pro/src/app_runtime_access.cpp => nrf52_node/src/nrf52_node_app_runtime_access.cpp} (65%)
 rename apps/{gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/app_runtime_access.h => nrf52_node/src/nrf52_node_app_runtime_access.h} (51%)
 create mode 100644 apps/nrf52_node/src/nrf52_node_app_shell.cpp
 create mode 100644 apps/nrf52_node/src/nrf52_node_app_shell.h
 create mode 100644 apps/nrf52_node/src/nrf52_node_arduino_entry.cpp
 create mode 100644 apps/nrf52_node/src/nrf52_node_arduino_entry.h
 create mode 100644 apps/nrf52_node/src/nrf52_node_loop_runtime.cpp
 create mode 100644 apps/nrf52_node/src/nrf52_node_loop_runtime.h
 create mode 100644 apps/nrf52_node/src/nrf52_node_runtime_config.cpp
 create mode 100644 apps/nrf52_node/src/nrf52_node_runtime_config.h
 rename apps/{gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/self_identity_provider.h => nrf52_node/src/nrf52_node_self_identity_provider.h} (61%)
 rename apps/{gat562_mesh_evb_pro/src/startup_runtime.cpp => nrf52_node/src/nrf52_node_startup_runtime.cpp} (65%)
 create mode 100644 apps/nrf52_node/src/nrf52_node_startup_runtime.h
 rename apps/{gat562_mesh_evb_pro/src/ui_runtime.cpp => nrf52_node/src/nrf52_node_ui_runtime.cpp} (93%)
 rename apps/{gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/ui_runtime.h => nrf52_node/src/nrf52_node_ui_runtime.h} (66%)
 create mode 100644 apps/nrf52_node/tests/nrf52_historical_source_descriptor_smoke.cpp
 create mode 100644 apps/nrf52_node/tests/nrf52_node_app_shell_smoke.cpp
 create mode 100644 apps/nrf52_node/tests/nrf52_node_runtime_config_smoke.cpp
 create mode 100644 boards/cardputerzero/BOARD.md
 create mode 100644 boards/cardputerzero/board_facts.h
 create mode 100644 boards/gat562_mesh_evb_pro/BOARD.md
 create mode 100644 boards/gat562_mesh_evb_pro/board_facts.h
 create mode 100644 boards/tab5/BOARD.md
 create mode 100644 boards/tab5/board_facts.h
 create mode 100644 boards/tdeck/BOARD.md
 create mode 100644 boards/tdeck/board_facts.h
 create mode 100644 boards/tdisplayp4/BOARD.md
 create mode 100644 boards/tdisplayp4/board_facts.h
 create mode 100644 boards/tlora_pager/BOARD.md
 create mode 100644 boards/tlora_pager/board_facts.h
 create mode 100644 boards/twatch/BOARD.md
 create mode 100644 boards/twatch/board_facts.h
 create mode 100644 boards/uconsole/BOARD.md
 create mode 100644 boards/uconsole/board_facts.h
 create mode 100644 builds/README.md
 create mode 100644 builds/esp_idf/CMakeLists.txt
 create mode 100644 builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake
 create mode 100644 builds/esp_idf/README.md
 create mode 100644 builds/esp_idf/target_profiles.cmake
 create mode 100644 builds/esp_idf/targets/README.md
 rename {apps => builds}/esp_idf/targets/tab5/sdkconfig.defaults (99%)
 create mode 100644 builds/esp_idf/targets/tdeck/sdkconfig.defaults
 rename {apps/esp_idf/targets/t_display_p4_amoled => builds/esp_idf/targets/tdisplayp4_amoled}/sdkconfig.defaults (100%)
 rename {apps/esp_idf/targets/t_display_p4_tft => builds/esp_idf/targets/tdisplayp4_tft}/sdkconfig.defaults (100%)
 create mode 100644 builds/esp_idf/targets/tlora_pager/sdkconfig.defaults
 create mode 100644 builds/esp_idf/targets/twatch/sdkconfig.defaults
 create mode 100644 builds/linux_cmake/CMakeLists.txt
 create mode 100644 builds/linux_cmake/CMakePresets.json
 create mode 100644 builds/linux_cmake/README.md
 create mode 100644 builds/pio_nrf52/README.md
 create mode 100644 builds/pio_nrf52/platformio.ini
 create mode 100644 builds/pio_nrf52/src/gat562_mesh_evb_pro.cpp
 create mode 100644 builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp
 create mode 100644 cmake/TrailMateUxPacks.cmake
 create mode 100644 docs/archive/REMOVED_LEGACY_ROOTS.md
 create mode 100644 docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md
 create mode 100644 docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md
 create mode 100644 docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md
 create mode 100644 docs/audits/CHAT_DELIVERY_ACTION_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/CHAT_DELIVERY_EVENT_PROJECTION_AUDIT.md
 create mode 100644 docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md
 create mode 100644 docs/audits/CHAT_PENDING_FAILURE_AUDIT.md
 create mode 100644 docs/audits/CHAT_RUNTIME_EVENT_PUMP_AUDIT.md
 create mode 100644 docs/audits/CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md
 create mode 100644 docs/audits/CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/ESP_IDF_FINAL_OWNER_MIGRATION_PLAN.md
 create mode 100644 docs/audits/ESP_IDF_RUNTIME_SOURCE_OWNER_EXTRACTION_AUDIT.md
 create mode 100644 docs/audits/ESP_IDF_TARGET_DEFAULTS_MIGRATION_AUDIT.md
 create mode 100644 docs/audits/ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md
 create mode 100644 docs/audits/GPS_CONSUMER_BOUNDARY_AUDIT.md
 create mode 100644 docs/audits/GPS_RUNTIME_SCHEDULING_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md
 create mode 100644 docs/audits/KEY_VERIFICATION_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md
 create mode 100644 docs/audits/LEGACY_BURNDOWN_REGISTER.md
 create mode 100644 docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md
 create mode 100644 docs/audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md
 create mode 100644 docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md
 create mode 100644 docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md
 create mode 100644 docs/audits/MAP_OVERLAY_ROUTE_TRACKER_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/MAP_PRESENTATION_BOUNDARY_AUDIT.md
 create mode 100644 docs/audits/MAP_TILE_RENDER_QUEUE_CACHE_AUDIT.md
 create mode 100644 docs/audits/MAP_TILE_SOURCE_CACHE_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/PHASE10_FINAL_PRIMARY_PATH_REPORT.md
 create mode 100644 docs/audits/PHASE10_PRIMARY_PATH_MIGRATION_REPORT.md
 create mode 100644 docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md
 create mode 100644 docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md
 create mode 100644 docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md
 create mode 100644 docs/audits/PHASE5_FINAL_READINESS_REPORT.md
 create mode 100644 docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md
 create mode 100644 docs/audits/PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md
 create mode 100644 docs/audits/PHASE5_PRESENTATION_CONFORMANCE_MATRIX.md
 create mode 100644 docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md
 create mode 100644 docs/audits/PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md
 create mode 100644 docs/audits/PHASE6_COMPOSITION_READINESS_REPORT.md
 create mode 100644 docs/audits/PHASE6_INPUT_PLAN.md
 create mode 100644 docs/audits/PHASE7_10_MAP_TILE_SOURCE_CACHE_BURNDOWN_REPORT.md
 create mode 100644 docs/audits/PHASE7_11_MAP_TILE_RENDER_QUEUE_CACHE_REPORT.md
 create mode 100644 docs/audits/PHASE7_12_MAP_OVERLAY_ROUTE_TRACKER_REPORT.md
 create mode 100644 docs/audits/PHASE7_13_GPS_RUNTIME_SCHEDULING_REPORT.md
 create mode 100644 docs/audits/PHASE7_6_LEGACY_BURNDOWN_REPORT.md
 create mode 100644 docs/audits/PHASE7_7_EVENT_PUMP_BURNDOWN_REPORT.md
 create mode 100644 docs/audits/PHASE7_8_TEAM_RICH_PAYLOAD_BURNDOWN_REPORT.md
 create mode 100644 docs/audits/PHASE7_9_TEAM_POSITION_PICKER_BURNDOWN_REPORT.md
 create mode 100644 docs/audits/PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md
 create mode 100644 docs/audits/PHASE7_FINAL_RUNTIME_OWNERSHIP_READINESS_REPORT.md
 create mode 100644 docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md
 create mode 100644 docs/audits/PHASE8_RUNTIME_UI_ADOPTION_REPORT.md
 create mode 100644 docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md
 create mode 100644 docs/audits/PHASE9_FINAL_READINESS_REPORT.md
 create mode 100644 docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md
 create mode 100644 docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md
 create mode 100644 docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md
 create mode 100644 docs/audits/POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md
 create mode 100644 docs/audits/PRODUCT_COMPOSITION_BOUNDARY_AUDIT.md
 create mode 100644 docs/audits/RENDERER_BOUNDARY_AUDIT.md
 create mode 100644 docs/audits/RENDERER_HARDENING_BASELINE.md
 create mode 100644 docs/audits/REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md
 create mode 100644 docs/audits/TARGET_UI_FINAL_OWNERSHIP_REPORT.md
 create mode 100644 docs/audits/TARGET_UX_PACK_GAP_REPORT.md
 create mode 100644 docs/audits/TEAM_ACTION_OWNERSHIP_AUDIT.md
 create mode 100644 docs/audits/TEAM_CHAT_PRESENTATION_AUDIT.md
 create mode 100644 docs/audits/TEAM_POSITION_PICKER_RENDERER_AUDIT.md
 create mode 100644 docs/audits/TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md
 create mode 100644 docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md
 create mode 100644 docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md
 create mode 100644 docs/audits/UI_SHARED_SPLIT_AUDIT.md
 create mode 100644 docs/boards/BOARD_MANIFEST_TEMPLATE.yaml
 create mode 100644 docs/boards/gat562.board.yaml
 create mode 100644 docs/boards/t-deck.board.yaml
 create mode 100644 docs/boards/t-lora-pager.board.yaml
 create mode 100644 docs/boards/uconsole-aio2.board.yaml
 create mode 100644 docs/decisions/ADR_BUILD_ENTRYPOINTS.md
 create mode 100644 docs/review/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_REVIEW_CHECKLIST.md
 create mode 100644 docs/specification/APP_SHELL_ARCHITECTURE_SPEC.md
 create mode 100644 docs/specification/BOARD_PACKAGE_SPEC.md
 create mode 100644 docs/specification/CAPABILITY_AUTHORITY_GLOSSARY.md
 create mode 100644 docs/specification/CHAT_DELIVERY_ACTION_RUNTIME_SPEC.md
 create mode 100644 docs/specification/CHAT_DELIVERY_RUNTIME_SPEC.md
 create mode 100644 docs/specification/CHAT_PRESENTATION_IDENTITY_SPEC.md
 create mode 100644 docs/specification/CHAT_RUNTIME_EVENT_PUMP_SPEC.md
 create mode 100644 docs/specification/CHAT_WORKSPACE_MODEL_SPEC.md
 create mode 100644 docs/specification/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md
 create mode 100644 docs/specification/DEVICE_UX_PACK_ARCHITECTURE_SPEC.md
 create mode 100644 docs/specification/GPS_RUNTIME_SCHEDULING_SPEC.md
 create mode 100644 docs/specification/KEY_VERIFICATION_RUNTIME_SPEC.md
 rename docs/{specs => specification}/LOCALE_PACKS.md (100%)
 rename docs/{specs => specification}/LOCALE_PACK_RELEASE_SPEC.md (100%)
 rename docs/{specs => specification}/LOCALIZATION_SPEC.md (100%)
 create mode 100644 docs/specification/MAP_OVERLAY_ROUTE_TRACKER_RUNTIME_SPEC.md
 create mode 100644 docs/specification/MAP_TILE_RENDER_QUEUE_CACHE_SPEC.md
 create mode 100644 docs/specification/MAP_TILE_SOURCE_CACHE_RUNTIME_SPEC.md
 create mode 100644 docs/specification/MAP_WORKSPACE_MODEL_SPEC.md
 create mode 100644 docs/specification/POST_REFACTOR_ARCHITECTURE_FREEZE.md
 create mode 100644 docs/specification/PRESENTATION_WORKSPACE_SPEC.md
 create mode 100644 docs/specification/PRODUCT_COMPOSITION_ARCHITECTURE_SPEC.md
 create mode 100644 docs/specification/REPOSITORY_LAYOUT_ARCHITECTURE_SPEC.md
 create mode 100644 docs/specification/RUNTIME_CONCURRENCY_SPEC.md
 create mode 100644 docs/specification/TARGET_MANIFEST_SPEC.md
 create mode 100644 docs/specification/TEAM_ACTION_RUNTIME_SPEC.md
 create mode 100644 docs/specification/TEAM_POSITION_PICKER_RENDERER_SPEC.md
 create mode 100644 docs/specification/TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md
 create mode 100644 docs/specification/UI_PRESENTATION_ARCHITECTURE_SPEC.md
 create mode 100644 docs/specs/Cross_Platform_Product_Architecture_Specification.md
 create mode 100644 docs/targets/README.md
 create mode 100644 docs/targets/TARGET_MANIFEST_TEMPLATE.yaml
 create mode 100644 docs/targets/TARGET_MATRIX.md
 create mode 100644 docs/targets/esp-t-deck-lvgl.capabilities.yaml
 create mode 100644 docs/targets/esp-t-lora-pager-lvgl.capabilities.yaml
 create mode 100644 docs/targets/esp32_lvgl_targets.md
 create mode 100644 docs/targets/linux-headless.capabilities.yaml
 create mode 100644 docs/targets/linux-uconsole-ascii.capabilities.yaml
 create mode 100644 docs/targets/linux-uconsole-gtk.capabilities.yaml
 create mode 100644 docs/targets/linux_targets.md
 create mode 100644 docs/targets/nrf52-gat562-node.capabilities.yaml
 create mode 100644 docs/targets/nrf52_node_targets.md
 create mode 100644 docs/ux_profiles/README.md
 create mode 100644 docs/ux_profiles/cardputer_wide.md
 create mode 100644 docs/ux_profiles/deck_full.md
 create mode 100644 docs/ux_profiles/pager_compact.md
 create mode 100644 docs/ux_profiles/tab5_touch.md
 create mode 100644 docs/ux_profiles/tiny_node_status.md
 create mode 100644 docs/ux_profiles/uconsole_desktop.md
 create mode 100644 docs/ux_profiles/watch_quick.md
 create mode 100644 modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_conversation_mapper.h
 create mode 100644 modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_message_mapper.h
 create mode 100644 modules/chat_presentation_adapters/library.json
 create mode 100644 modules/chat_presentation_adapters/src/chat_conversation_mapper.cpp
 create mode 100644 modules/chat_presentation_adapters/src/chat_message_mapper.cpp
 create mode 100644 modules/chat_presentation_adapters/tests/test_chat_conversation_mapper.cpp
 create mode 100644 modules/chat_presentation_adapters/tests/test_chat_message_mapper.cpp
 create mode 100644 modules/core_chat/include/chat/delivery/chat_delivery_action_service.h
 create mode 100644 modules/core_chat/include/chat/delivery/chat_delivery_action_sink.h
 create mode 100644 modules/core_chat/include/chat/delivery/chat_delivery_action_types.h
 create mode 100644 modules/core_chat/include/chat/delivery/chat_delivery_event_port.h
 create mode 100644 modules/core_chat/include/chat/delivery/chat_delivery_event_projector.h
 create mode 100644 modules/core_chat/include/chat/delivery/chat_delivery_read_model.h
 create mode 100644 modules/core_chat/include/chat/delivery/chat_delivery_types.h
 create mode 100644 modules/core_chat/include/chat/delivery/legacy_chat_delivery_bridge.h
 create mode 100644 modules/core_chat/include/chat/delivery/legacy_chat_send_result_mapper.h
 create mode 100644 modules/core_chat/src/delivery/chat_delivery_action_service.cpp
 create mode 100644 modules/core_chat/src/delivery/chat_delivery_event_port.cpp
 create mode 100644 modules/core_chat/src/delivery/chat_delivery_event_projector.cpp
 create mode 100644 modules/core_chat/src/delivery/chat_delivery_read_model.cpp
 create mode 100644 modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp
 create mode 100644 modules/core_chat/src/delivery/legacy_chat_send_result_mapper.cpp
 create mode 100644 modules/core_chat/tests/test_chat_delivery_action_service.cpp
 create mode 100644 modules/core_chat/tests/test_chat_delivery_event_port.cpp
 create mode 100644 modules/core_chat/tests/test_chat_delivery_event_projector.cpp
 create mode 100644 modules/core_chat/tests/test_chat_delivery_read_model.cpp
 create mode 100644 modules/core_chat/tests/test_legacy_chat_delivery_bridge.cpp
 create mode 100644 modules/core_chat/tests/test_legacy_chat_send_result_mapper.cpp
 create mode 100644 modules/core_device/include/device/authority_types.h
 create mode 100644 modules/core_device/include/device/board_types.h
 create mode 100644 modules/core_device/include/device/capability_types.h
 create mode 100644 modules/core_device/include/device/host_types.h
 create mode 100644 modules/core_device/include/device/platform_types.h
 create mode 100644 modules/core_device/include/device/runtime_types.h
 create mode 100644 modules/core_device/include/device/target_manifest_types.h
 create mode 100644 modules/core_device/include/device/ui_types.h
 rename {apps/esp_idf => modules/core_device}/library.json (62%)
 create mode 100644 modules/core_device/src/device/capability_types.cpp
 create mode 100644 modules/core_gps/include/gps/domain/gps_status.h
 create mode 100644 modules/core_gps/include/gps/domain/location_fix.h
 create mode 100644 modules/core_gps/include/gps/domain/satellite_info.h
 create mode 100644 modules/core_gps/include/gps/domain/time_fact.h
 create mode 100644 modules/core_gps/include/gps/ports/i_gnss_byte_stream.h
 create mode 100644 modules/core_gps/include/gps/ports/i_gps_config_applier.h
 create mode 100644 modules/core_gps/include/gps/ports/i_gps_power_control.h
 create mode 100644 modules/core_gps/include/gps/ports/i_location_event_sink.h
 create mode 100644 modules/core_gps/include/gps/ports/i_location_source.h
 create mode 100644 modules/core_gps/include/gps/ports/i_time_authority.h
 create mode 100644 modules/core_gps/include/gps/protocol/nmea/nmea_parser.h
 create mode 100644 modules/core_gps/include/gps/protocol/nmea/nmea_sentence.h
 create mode 100644 modules/core_gps/include/gps/protocol/ubx/ubx_parser.h
 create mode 100644 modules/core_gps/include/gps/usecase/location_service.h
 create mode 100644 modules/core_gps/include/gps/usecase/time_authority.h
 create mode 100644 modules/core_gps/src/protocol/nmea/nmea_parser.cpp
 create mode 100644 modules/core_gps/src/protocol/nmea/nmea_sentence.cpp
 create mode 100644 modules/core_gps/src/usecase/location_service.cpp
 create mode 100644 modules/core_gps/src/usecase/time_authority.cpp
 create mode 100644 modules/core_gps/tests/test_location_service.cpp
 create mode 100644 modules/core_gps/tests/test_nmea_parser.cpp
 create mode 100644 modules/core_gps/tests/test_time_authority.cpp
 create mode 100644 modules/core_mesh/README.md
 create mode 100644 modules/core_mesh/include/mesh/domain/direct_message.h
 create mode 100644 modules/core_mesh/include/mesh/domain/local_identity.h
 create mode 100644 modules/core_mesh/include/mesh/domain/mesh_message.h
 create mode 100644 modules/core_mesh/include/mesh/domain/mesh_packet.h
 create mode 100644 modules/core_mesh/include/mesh/domain/mesh_protocol_kind.h
 create mode 100644 modules/core_mesh/include/mesh/domain/mesh_result.h
 create mode 100644 modules/core_mesh/include/mesh/domain/node_id.h
 create mode 100644 modules/core_mesh/include/mesh/domain/peer_identity.h
 create mode 100644 modules/core_mesh/include/mesh/domain/radio_packet.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_clock.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_crypto_provider.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_local_identity_store.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_mesh_event_sink.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_mesh_logger.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_mesh_runtime.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_node_store.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_packet_radio.h
 create mode 100644 modules/core_mesh/include/mesh/ports/i_peer_key_store.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/mesh_protocol_strategy.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshcore/mc_direct_message_flow.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshcore/mc_identity_flow.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshcore/mc_packet_codec.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshcore/mc_receive_flow.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshcore/meshcore_protocol_strategy.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshtastic/meshtastic_protocol_strategy.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshtastic/mt_direct_message_flow.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshtastic/mt_identity_flow.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshtastic/mt_packet_codec.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshtastic/mt_pki_flow.h
 create mode 100644 modules/core_mesh/include/mesh/protocol/meshtastic/mt_receive_flow.h
 create mode 100644 modules/core_mesh/include/mesh/usecase/direct_message_service.h
 create mode 100644 modules/core_mesh/include/mesh/usecase/mesh_dedup_service.h
 create mode 100644 modules/core_mesh/include/mesh/usecase/mesh_retry_policy.h
 create mode 100644 modules/core_mesh/include/mesh/usecase/mesh_runtime_state.h
 create mode 100644 modules/core_mesh/include/mesh/usecase/mesh_session.h
 create mode 100644 modules/core_mesh/include/mesh/usecase/peer_identity_service.h
 create mode 100644 modules/core_mesh/include/mesh/usecase/receive_packet_service.h
 create mode 100644 modules/core_mesh/library.json
 create mode 100644 modules/core_mesh/src/protocol/meshcore/mc_identity_flow.cpp
 create mode 100644 modules/core_mesh/src/protocol/meshcore/meshcore_protocol_strategy.cpp
 create mode 100644 modules/core_mesh/src/protocol/meshtastic/meshtastic_protocol_strategy.cpp
 create mode 100644 modules/core_mesh/src/protocol/meshtastic/mt_pki_flow.cpp
 create mode 100644 modules/core_mesh/src/usecase/direct_message_service.cpp
 create mode 100644 modules/core_mesh/src/usecase/mesh_dedup_service.cpp
 create mode 100644 modules/core_mesh/src/usecase/mesh_session.cpp
 create mode 100644 modules/core_mesh/src/usecase/peer_identity_service.cpp
 create mode 100644 modules/core_mesh/src/usecase/receive_packet_service.cpp
 create mode 100644 modules/core_mesh/tests/contract/store_contracts.h
 create mode 100644 modules/core_mesh/tests/fake/fake_mesh_dependencies.h
 create mode 100644 modules/core_mesh/tests/test_direct_message_service.cpp
 create mode 100644 modules/core_mesh/tests/test_mesh_session.cpp
 create mode 100644 modules/core_mesh/tests/test_meshcore_protocol_strategy.cpp
 create mode 100644 modules/core_mesh/tests/test_meshtastic_protocol_strategy.cpp
 create mode 100644 modules/core_mesh/tests/test_peer_identity_service.cpp
 create mode 100644 modules/core_mesh/tests/test_receive_packet_service.cpp
 create mode 100644 modules/core_mesh/tests/test_store_contracts.cpp
 create mode 100644 modules/core_phone/include/phone/common/phone_app_facade.h
 create mode 100644 modules/core_phone/include/phone/common/phone_facade.h
 create mode 100644 modules/core_phone/include/phone/common/phone_io.h
 create mode 100644 modules/core_phone/include/phone/common/phone_result.h
 create mode 100644 modules/core_phone/include/phone/common/phone_runtime_context.h
 create mode 100644 modules/core_phone/include/phone/meshcore/meshcore_phone_core.h
 create mode 100644 modules/core_phone/include/phone/meshtastic/meshtastic_defaults.h
 create mode 100644 modules/core_phone/include/phone/meshtastic/meshtastic_phone_config_bridge.h
 create mode 100644 modules/core_phone/include/phone/meshtastic/meshtastic_phone_core.h
 create mode 100644 modules/core_phone/include/phone/meshtastic/meshtastic_phone_session.h
 create mode 100644 modules/core_phone/library.json
 rename modules/{core_chat/src/ble => core_phone/src/meshcore}/meshcore_phone_core.cpp (84%)
 rename modules/{core_chat/src/ble => core_phone/src/meshtastic}/meshtastic_phone_core.cpp (88%)
 rename modules/{core_chat/src/ble => core_phone/src/meshtastic}/meshtastic_phone_session.cpp (87%)
 create mode 100644 modules/core_phone/tests/fake_phone_runtime_context.h
 create mode 100644 modules/core_phone/tests/test_phone_core_smoke.cpp
 create mode 100644 modules/core_sys/include/platform/ui/settings_backup_runtime.h
 create mode 100644 modules/product_composition/include/product_composition/app_services_bundle.h
 create mode 100644 modules/product_composition/include/product_composition/composition_status.h
 create mode 100644 modules/product_composition/include/product_composition/presentation_bundle.h
 create mode 100644 modules/product_composition/include/product_composition/target_app_shell.h
 create mode 100644 modules/product_composition/include/product_composition/target_build_binding.h
 create mode 100644 modules/product_composition/include/product_composition/target_profile.h
 create mode 100644 modules/product_composition/include/product_composition/target_ux_binding.h
 create mode 100644 modules/product_composition/library.json
 create mode 100644 modules/product_composition/src/target_build_binding.cpp
 create mode 100644 modules/product_composition/src/target_profile.cpp
 create mode 100644 modules/product_composition/src/target_ux_binding.cpp
 create mode 100644 modules/product_composition/tests/test_presentation_bundle_shape.cpp
 create mode 100644 modules/product_composition/tests/test_target_build_binding.cpp
 create mode 100644 modules/product_composition/tests/test_target_profile.cpp
 create mode 100644 modules/product_composition/tests/test_target_ux_binding.cpp
 create mode 100644 modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_descriptor_renderer.h
 create mode 100644 modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_menu_runtime_adapter.h
 create mode 100644 modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_entry_adoption.h
 create mode 100644 modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h
 create mode 100644 modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h
 create mode 100644 modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_host_adapter.h
 create mode 100644 modules/ui_ascii_runtime/src/ascii_descriptor_renderer.cpp
 create mode 100644 modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp
 create mode 100644 modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp
 create mode 100644 modules/ui_ascii_runtime/src/ascii_runtime_screen_graph_presenter.cpp
 create mode 100644 modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp
 create mode 100644 modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp
 create mode 100644 modules/ui_ascii_runtime/tests/ascii_menu_runtime_adapter_smoke.cpp
 create mode 100644 modules/ui_ascii_runtime/tests/ascii_runtime_entry_adoption_smoke.cpp
 create mode 100644 modules/ui_ascii_runtime/tests/ascii_runtime_screen_graph_presenter_smoke.cpp
 create mode 100644 modules/ui_ascii_runtime/tests/ascii_screen_graph_bridge_smoke.cpp
 create mode 100644 modules/ui_ascii_runtime/tests/ascii_screen_host_adapter_smoke.cpp
 create mode 100644 modules/ui_ascii_runtime/tests/test_ascii_descriptor_renderer.cpp
 create mode 100644 modules/ui_chat_runtime/README.md
 create mode 100644 modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h
 create mode 100644 modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h
 create mode 100644 modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h
 create mode 100644 modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h
 create mode 100644 modules/ui_chat_runtime/include/ui_chat_runtime/chat_page_runtime_event_pump.h
 create mode 100644 modules/ui_chat_runtime/include/ui_chat_runtime/chat_ui_refresh_sink.h
 create mode 100644 modules/ui_chat_runtime/library.json
 create mode 100644 modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp
 create mode 100644 modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp
 create mode 100644 modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp
 create mode 100644 modules/ui_chat_runtime/tests/.gitkeep
 create mode 100644 modules/ui_chat_runtime/tests/test_chat_delivery_action_port_adapter.cpp
 create mode 100644 modules/ui_chat_runtime/tests/test_chat_delivery_event_projection_adapter.cpp
 create mode 100644 modules/ui_gps_runtime/README.md
 create mode 100644 modules/ui_gps_runtime/include/ui_gps_runtime/gps_page_runtime_pump.h
 create mode 100644 modules/ui_gps_runtime/include/ui_gps_runtime/gps_ui_refresh_sink.h
 create mode 100644 modules/ui_gps_runtime/library.json
 create mode 100644 modules/ui_gps_runtime/src/gps_page_runtime_pump.cpp
 create mode 100644 modules/ui_gps_runtime/tests/test_gps_page_runtime_pump.cpp
 create mode 100644 modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_descriptor_page_registry.h
 create mode 100644 modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_menu_runtime_adapter.h
 create mode 100644 modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_runtime_entry_adoption.h
 create mode 100644 modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_screen_host_adapter.h
 create mode 100644 modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h
 create mode 100644 modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h
 create mode 100644 modules/ui_gtk_runtime/src/gtk_descriptor_page_registry.cpp
 create mode 100644 modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp
 create mode 100644 modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp
 create mode 100644 modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp
 create mode 100644 modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp
 create mode 100644 modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_presenter.cpp
 create mode 100644 modules/ui_gtk_runtime/tests/gtk_menu_runtime_adapter_smoke.cpp
 create mode 100644 modules/ui_gtk_runtime/tests/gtk_runtime_entry_adoption_smoke.cpp
 create mode 100644 modules/ui_gtk_runtime/tests/gtk_screen_host_adapter_smoke.cpp
 create mode 100644 modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_bridge_smoke.cpp
 create mode 100644 modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_presenter_smoke.cpp
 create mode 100644 modules/ui_gtk_runtime/tests/test_gtk_descriptor_page_registry.cpp
 create mode 100644 modules/ui_headless_runtime/include/ui_headless_runtime/headless_descriptor_consumer.h
 create mode 100644 modules/ui_headless_runtime/src/headless_descriptor_consumer.cpp
 create mode 100644 modules/ui_headless_runtime/tests/test_headless_descriptor_consumer.cpp
 create mode 100644 modules/ui_key_verification_runtime/README.md
 create mode 100644 modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h
 create mode 100644 modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h
 create mode 100644 modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h
 create mode 100644 modules/ui_key_verification_runtime/library.json
 create mode 100644 modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp
 create mode 100644 modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp
 create mode 100644 modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp
 create mode 100644 modules/ui_legacy_adapters/README.md
 create mode 100644 modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h
 create mode 100644 modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h
 create mode 100644 modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h
 create mode 100644 modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h
 create mode 100644 modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h
 create mode 100644 modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h
 create mode 100644 modules/ui_legacy_adapters/library.json
 create mode 100644 modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp
 create mode 100644 modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp
 create mode 100644 modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp
 create mode 100644 modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp
 create mode 100644 modules/ui_lvgl_core/README.md
 create mode 100644 modules/ui_lvgl_core/include/ui_lvgl_core/.gitkeep
 create mode 100644 modules/ui_lvgl_core/include/ui_lvgl_core/lvgl_focus_group.h
 create mode 100644 modules/ui_lvgl_core/library.json
 create mode 100644 modules/ui_lvgl_core/src/.gitkeep
 create mode 100644 modules/ui_lvgl_ux_packs/README.md
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/key_verification_modal_renderer.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/team_position_picker_renderer.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/compatibility_ux_pack.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/simulator_full_ux_pack.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/tiny_node_status_ux_pack.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/uconsole_desktop_ux_pack.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_menu_model.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_renderer_probe.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_adoption_probe.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/device_ux_profile.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/input_binding_set.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/screen_registry.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_feature_set.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_model.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_provider.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack_registry.h
 create mode 100644 modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h
 create mode 100644 modules/ui_lvgl_ux_packs/library.json
 create mode 100644 modules/ui_lvgl_ux_packs/src/common/key_verification_modal_renderer.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/common/team_position_picker_renderer.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/packs/simulator_full_ux_pack.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/packs/tiny_node_status_ux_pack.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/packs/uconsole_desktop_ux_pack.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_menu_model.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_adoption_probe.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_entry_adoption.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_screen_graph_presenter.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/ux/input_binding_set.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/ux/screen_registry.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_compatibility_menu_binding.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_compatibility_screen_factory.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_compatibility_ux_pack.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_input_binding_set.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_menu_model.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_renderer_probe.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_menu_runtime_adapter.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_primary_screen_graph_runtime.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_adoption_probe.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_entry_adoption.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_screen_graph_presenter.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_graph_bridge.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_host_adapter.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_screen_registry.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_simulator_full_ux_pack.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_tiny_node_status_ux_pack.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_uconsole_desktop_ux_pack.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_ux_menu_provider.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_ux_pack_registry.cpp
 create mode 100644 modules/ui_lvgl_ux_packs/tests/test_ux_screen_menu_adapter.cpp
 create mode 100644 modules/ui_map_runtime/README.md
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_overlay/map_overlay_projector.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_cache.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_decoder_cache.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_render_queue.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_resolver.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_source.h
 create mode 100644 modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_types.h
 create mode 100644 modules/ui_map_runtime/library.json
 create mode 100644 modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp
 create mode 100644 modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp
 create mode 100644 modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp
 create mode 100644 modules/ui_map_runtime/src/map_tiles/filesystem_map_tile_source.cpp
 create mode 100644 modules/ui_map_runtime/src/map_tiles/map_tile_render_queue.cpp
 create mode 100644 modules/ui_map_runtime/src/map_tiles/map_tile_resolver.cpp
 create mode 100644 modules/ui_map_runtime/tests/test_filesystem_map_tile_source.cpp
 create mode 100644 modules/ui_map_runtime/tests/test_map_overlay_projector.cpp
 create mode 100644 modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp
 create mode 100644 modules/ui_map_runtime/tests/test_map_tile_render_queue.cpp
 create mode 100644 modules/ui_map_runtime/tests/test_map_tile_resolver.cpp
 create mode 100644 modules/ui_mono_128x64/library.json
 create mode 100644 modules/ui_presentation/include/ui_presentation/chat/chat_action_sink.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/chat/chat_identity.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/chat/chat_message_ref.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/chat/chat_presentation_source.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/chat/chat_workspace_snapshot.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/common/fixed_text.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/common/presentation_profile.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/common/snapshot_header.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/common/ui_action.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/common/ui_action_result.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/device/device_status_model.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/device/device_status_snapshot.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/device/device_status_source.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/gps/gps_status_model.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/gps/gps_status_snapshot.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/gps/gps_status_source.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/key_verification/key_verification_action_sink.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/key_verification/key_verification_model.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/key_verification/key_verification_snapshot.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/key_verification/key_verification_source.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/layout/layout_profile.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/map/map_action_sink.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/map/map_overlay_snapshot.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/map/map_overlay_source.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/map/map_presentation_source.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/map/map_workspace_model.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/map/map_workspace_snapshot.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/menu/menu_model.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/mesh/mesh_status_model.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/mesh/mesh_status_snapshot.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/mesh/mesh_status_source.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/page/page_manifest.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/screen/screen_binding_registry.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/screen/screen_route.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/settings/settings_action_sink.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/settings/settings_model.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/settings/settings_snapshot.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/settings/settings_source.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/target_ui_profile.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_probe.h
 create mode 100644 modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_snapshot.h
 create mode 100644 modules/ui_presentation/library.json
 create mode 100644 modules/ui_presentation/src/chat/chat_workspace_model.cpp
 create mode 100644 modules/ui_presentation/src/device/device_status_model.cpp
 create mode 100644 modules/ui_presentation/src/gps/gps_status_model.cpp
 create mode 100644 modules/ui_presentation/src/key_verification/key_verification_model.cpp
 create mode 100644 modules/ui_presentation/src/layout/layout_profile.cpp
 create mode 100644 modules/ui_presentation/src/map/map_workspace_model.cpp
 create mode 100644 modules/ui_presentation/src/menu/menu_model.cpp
 create mode 100644 modules/ui_presentation/src/mesh/mesh_status_model.cpp
 create mode 100644 modules/ui_presentation/src/page/page_manifest.cpp
 create mode 100644 modules/ui_presentation/src/screen/screen_binding_registry.cpp
 create mode 100644 modules/ui_presentation/src/settings/settings_model.cpp
 create mode 100644 modules/ui_presentation/src/target_ui_profile.cpp
 create mode 100644 modules/ui_presentation/src/workspace/presentation_workspace_probe.cpp
 create mode 100644 modules/ui_presentation/tests/fake/fake_chat_action_sink.h
 create mode 100644 modules/ui_presentation/tests/fake/fake_chat_presentation_source.h
 create mode 100644 modules/ui_presentation/tests/fake/fake_device_status_source.h
 create mode 100644 modules/ui_presentation/tests/fake/fake_gps_status_source.h
 create mode 100644 modules/ui_presentation/tests/fake/fake_map_action_sink.h
 create mode 100644 modules/ui_presentation/tests/fake/fake_map_presentation_source.h
 create mode 100644 modules/ui_presentation/tests/fake/fake_mesh_status_source.h
 create mode 100644 modules/ui_presentation/tests/fake/fake_settings_action_sink.h
 create mode 100644 modules/ui_presentation/tests/fake/fake_settings_source.h
 create mode 100644 modules/ui_presentation/tests/test_chat_presentation_identity.cpp
 create mode 100644 modules/ui_presentation/tests/test_chat_workspace_model.cpp
 create mode 100644 modules/ui_presentation/tests/test_device_status_model.cpp
 create mode 100644 modules/ui_presentation/tests/test_fixed_text.cpp
 create mode 100644 modules/ui_presentation/tests/test_gps_status_model.cpp
 create mode 100644 modules/ui_presentation/tests/test_key_verification_model.cpp
 create mode 100644 modules/ui_presentation/tests/test_layout_profile.cpp
 create mode 100644 modules/ui_presentation/tests/test_map_workspace_model.cpp
 create mode 100644 modules/ui_presentation/tests/test_mesh_status_model.cpp
 create mode 100644 modules/ui_presentation/tests/test_page_manifest.cpp
 create mode 100644 modules/ui_presentation/tests/test_presentation_workspace.cpp
 create mode 100644 modules/ui_presentation/tests/test_presentation_workspace_probe.cpp
 create mode 100644 modules/ui_presentation/tests/test_screen_binding_registry.cpp
 create mode 100644 modules/ui_presentation/tests/test_settings_model.cpp
 create mode 100644 modules/ui_presentation/tests/test_target_ui_profile.cpp
 create mode 100644 modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h
 create mode 100644 modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h
 create mode 100644 modules/ui_shared/include/ui/map_tiles/map_tile_cache.h
 create mode 100644 modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h
 create mode 100644 modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h
 create mode 100644 modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h
 create mode 100644 modules/ui_shared/include/ui/map_tiles/map_tile_source.h
 create mode 100644 modules/ui_shared/include/ui/map_tiles/map_tile_types.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_air_device_status_source.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_chat_action_sink.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_gps_status_source.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_state.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_mesh_status_source.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_settings_action_sink.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/legacy_settings_source.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h
 create mode 100644 modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h
 create mode 100644 modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h
 create mode 100644 modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h
 create mode 100644 modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h
 create mode 100644 modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h
 create mode 100644 modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h
 create mode 100644 modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h
 create mode 100644 modules/ui_shared/include/ui/team_actions/legacy_team_action_bridge.h
 create mode 100644 modules/ui_shared/include/ui/team_actions/team_action_sink.h
 create mode 100644 modules/ui_shared/include/ui/team_actions/team_action_types.h
 create mode 100644 modules/ui_shared/include/ui/team_presentation/team_rich_payload_display.h
 create mode 100644 modules/ui_shared/include/ui/team_presentation/team_rich_payload_projector.h
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/legacy_air_device_status_source.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/legacy_chat_action_sink.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/legacy_gps_status_source.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/legacy_mesh_status_source.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/legacy_settings_action_sink.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/legacy_settings_source.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/team_chat_action_sink.cpp
 create mode 100644 modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp
 create mode 100644 modules/ui_shared/src/ui/team_actions/legacy_team_action_bridge.cpp
 create mode 100644 modules/ui_shared/src/ui/team_presentation/team_rich_payload_projector.cpp
 create mode 100644 modules/ui_shared/tests/test_chat_presentation_source.cpp
 create mode 100644 modules/ui_shared/tests/test_legacy_map_presentation_adapters.cpp
 create mode 100644 modules/ui_shared/tests/test_legacy_team_action_bridge.cpp
 create mode 100644 modules/ui_shared/tests/test_team_action_types.cpp
 create mode 100644 modules/ui_shared/tests/test_team_chat_action_sink.cpp
 create mode 100644 modules/ui_shared/tests/test_team_chat_presentation_source.cpp
 create mode 100644 modules/ui_shared/tests/test_team_rich_payload_projector.cpp
 rename {apps/esp_pio/include/apps/esp_pio => platform/esp/arduino_common/include/app}/app_context.h (93%)
 create mode 100644 platform/esp/arduino_common/include/ble/app_phone_facade.h
 create mode 100644 platform/esp/arduino_common/include/ble/meshtastic_ble_observer_bridge.h
 create mode 100644 platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_mesh_runtime_shell.h
 create mode 100644 platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_meshtastic_adapter_bridge.h
 create mode 100644 platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_preferences_mesh_identity_store.h
 rename {apps/esp_pio => platform/esp/arduino_common}/src/app_context.cpp (99%)
 rename {apps/esp_pio => platform/esp/arduino_common}/src/app_context_time_sync.cpp (96%)
 create mode 100644 platform/esp/arduino_common/src/ble/app_phone_facade.cpp
 create mode 100644 platform/esp/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp
 create mode 100644 platform/esp/arduino_common/src/mesh/esp_mesh_runtime_shell.cpp
 create mode 100644 platform/esp/arduino_common/src/mesh/esp_meshtastic_adapter_bridge.cpp
 create mode 100644 platform/esp/arduino_common/src/mesh/esp_preferences_mesh_identity_store.cpp
 create mode 100644 platform/esp/arduino_common/src/platform_ui_settings_backup_runtime.cpp
 create mode 100644 platform/esp/idf_common/src/platform_ui_settings_backup_runtime.cpp
 create mode 100644 platform/esp/radio/README.md
 rename {apps/esp_idf/src => platform/esp/radio}/meshtastic_radio_adapter.cpp (96%)
 rename {apps/esp_idf/include/apps/esp_idf => platform/esp/radio}/meshtastic_radio_adapter.h (95%)
 create mode 100644 platform/linux/common/include/platform/linux/mesh/linux_mesh_runtime_shell.h
 create mode 100644 platform/linux/common/include/platform/linux/mesh/linux_sqlite_mesh_identity_store.h
 create mode 100644 platform/linux/common/src/mesh/linux_mesh_runtime_shell.cpp
 create mode 100644 platform/linux/common/src/mesh/linux_sqlite_mesh_identity_store.cpp
 create mode 100644 platform/linux/common/src/platform/ui/settings_backup_runtime.cpp
 create mode 100644 platform/nrf52/README.md
 create mode 100644 platform/nrf52/arduino_common/include/ble/app_phone_facade.h
 create mode 100644 platform/nrf52/arduino_common/include/ble/meshtastic_ble_observer_bridge.h
 create mode 100644 platform/nrf52/arduino_common/include/ble/meshtastic_ble_persistence_bridge.h
 create mode 100644 platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/mesh/nrf52_mesh_runtime_shell.h
 create mode 100644 platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/mesh/nrf52_settings_mesh_identity_store.h
 create mode 100644 platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp
 create mode 100644 platform/nrf52/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp
 create mode 100644 platform/nrf52/arduino_common/src/ble/meshtastic_ble_persistence_bridge.cpp
 create mode 100644 platform/nrf52/arduino_common/src/mesh/nrf52_mesh_runtime_shell.cpp
 create mode 100644 platform/nrf52/arduino_common/src/mesh/nrf52_settings_mesh_identity_store.cpp
 create mode 100644 platform/nrf52/arduino_common/src/platform_ui_settings_backup_runtime.cpp
 rename apps/gat562_mesh_evb_pro/src/debug_console.cpp => platform/nrf52/debug/nrf52_debug_console.cpp (88%)
 rename apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/debug_console.h => platform/nrf52/debug/nrf52_debug_console.h (56%)
 create mode 100644 platform/nrf52/library.json
 rename apps/gat562_mesh_evb_pro/src/protocol_factory.cpp => platform/nrf52/protocol/nrf52_protocol_factory.cpp (90%)
 rename apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/protocol_factory.h => platform/nrf52/protocol/nrf52_protocol_factory.h (88%)
 rename apps/gat562_mesh_evb_pro/src/runtime_apply_service.cpp => platform/nrf52/runtime/nrf52_runtime_apply_service.cpp (67%)
 rename apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/runtime_apply_service.h => platform/nrf52/runtime/nrf52_runtime_apply_service.h (91%)
 create mode 100644 platform/shared/include/platform/shared/ble/phone_ble_runtime.h
 create mode 100644 site/assets/animal-island/dividers/divider-line-teal.svg
 create mode 100644 site/assets/animal-island/footer/footer-tree.webp
 create mode 100644 site/assets/animal-island/icons/icon-camera.svg
 create mode 100644 site/assets/animal-island/icons/icon-chat.svg
 create mode 100644 site/assets/animal-island/icons/icon-design.svg
 create mode 100644 site/assets/animal-island/icons/icon-diy.svg
 create mode 100644 site/assets/animal-island/icons/icon-helicopter.svg
 create mode 100644 site/assets/animal-island/icons/icon-leaf.png
 create mode 100644 site/assets/animal-island/icons/icon-map.svg
 create mode 100644 site/assets/animal-island/icons/icon-miles.svg
 create mode 100644 site/assets/animal-island/icons/icon-shopping.svg
 create mode 100644 site/assets/animal-island/icons/location.svg
 create mode 100644 site/assets/animal-island/icons/wifi.svg
 create mode 100644 tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md
 create mode 100644 tools/architecture/check_all_target_architecture_ready.py
 create mode 100644 tools/architecture/check_board_facts_boundary_ready.py
 create mode 100644 tools/architecture/check_esp_arduino_real_targets_restored.py
 create mode 100644 tools/architecture/check_esp_idf_final_owner_extraction_ready.py
 create mode 100644 tools/architecture/check_esp_idf_real_targets_restored.py
 create mode 100644 tools/architecture/check_legacy_app_roots_burndown_ready.py
 create mode 100644 tools/architecture/check_legacy_compat_temp_inventory_ready.py
 create mode 100644 tools/architecture/check_legacy_disposition_execution_ready.py
 create mode 100644 tools/architecture/check_no_intermediate_ui_layer_ready.py
 create mode 100644 tools/architecture/check_no_root_legacy_preflight_ready.py
 create mode 100644 tools/architecture/check_no_root_legacy_ready.py
 create mode 100644 tools/architecture/check_phase10_primary_path_ready.py
 create mode 100644 tools/architecture/check_phase11_renderer_consumption_ready.py
 create mode 100644 tools/architecture/check_phase45_ready.py
 create mode 100644 tools/architecture/check_phase5_final_ready.py
 create mode 100644 tools/architecture/check_phase5_ready.py
 create mode 100644 tools/architecture/check_phase5_renderer_ready.py
 create mode 100644 tools/architecture/check_phase5_workspace_ready.py
 create mode 100644 tools/architecture/check_phase6_composition_ready.py
 create mode 100644 tools/architecture/check_phase7_runtime_ownership_ready.py
 create mode 100644 tools/architecture/check_phase8_layout_ready.py
 create mode 100644 tools/architecture/check_phase9_final_ready.py
 create mode 100644 tools/architecture/check_phase9_legacy_burndown_ready.py
 create mode 100644 tools/architecture/check_phase9_runtime_adoption_ready.py
 create mode 100644 tools/architecture/check_pio_real_env_restored.py
 create mode 100644 tools/architecture/check_post_refactor_final_ready.py
 create mode 100644 tools/architecture/check_product_architecture_boundaries.py
 create mode 100644 tools/architecture/check_real_target_regression_recovery_ready.py
 create mode 100644 tools/architecture/check_target_architecture_foundation_ready.py
 create mode 100644 tools/architecture/check_uconsole_real_ui_restored.py
 create mode 100644 tools/architecture/phase5_renderer_legacy_baseline.json
 create mode 100644 tools/architecture/phase6_composition_legacy_baseline.json
 create mode 100644 tools/architecture/scan_legacy_compat_temp_surfaces.py

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..aa6a8c8f
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,34 @@
+## Summary
+
+-
+
+## Architecture Review
+
+Architecture layer changed:
+
+Target manifest updated: yes/no/not applicable
+
+Board manifest updated: yes/no/not applicable
+
+Runtime/concurrency impact:
+
+Known boundary exceptions:
+
+Checklist:
+
+- [ ] I identified whether this change is Target, Board, Platform, Runtime, Capability, Protocol, UseCase, AppService, PresentationModel, Renderer, or CompositionRoot work.
+- [ ] Board code does not own business behavior.
+- [ ] Platform drivers do not interpret protocol semantics.
+- [ ] BLE host code does not own Meshtastic/MeshCore phone protocol behavior.
+- [ ] Radio adapters do not own direct message, PKI, peer key, or contact policy.
+- [ ] GPS drivers do not directly serve UI, BLE, Mesh, or storage policy.
+- [ ] Renderers consume presentation snapshots and emit UI actions only.
+- [ ] Cross-thread work uses event queues, command queues, snapshots, or declared storage locks.
+- [ ] UI updates stay on the UI owner thread/task.
+
+See `docs/review/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_REVIEW_CHECKLIST.md`.
+
+## Validation
+
+-
+
diff --git a/.github/workflows/cardputer-zero-linux.yml b/.github/workflows/cardputer-zero-linux.yml
deleted file mode 100644
index 1cea56bf..00000000
--- a/.github/workflows/cardputer-zero-linux.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Cardputer Zero Linux
-
-on:
-  push:
-    paths:
-      - "apps/linux_sim/**"
-      - "apps/linux_rpi/**"
-      - "apps/linux_uconsole/**"
-      - "platform/linux/**"
-      - ".github/workflows/cardputer-zero-linux.yml"
-  pull_request:
-    paths:
-      - "apps/linux_sim/**"
-      - "apps/linux_rpi/**"
-      - "apps/linux_uconsole/**"
-      - "platform/linux/**"
-      - ".github/workflows/cardputer-zero-linux.yml"
-
-jobs:
-  linux-shell:
-    name: Linux Simulator Shell
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Verify shared/platform UI boundaries
-        run: python3 scripts/check_platform_ui_boundaries.py
-
-      - name: Install Linux simulator dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ninja-build dpkg-dev xorg-dev libasound2-dev libegl1-mesa-dev libwayland-dev libxkbcommon-dev wayland-protocols libgtk-4-dev libsqlite3-dev libcurl4-openssl-dev
-
-      - name: Configure simulator
-        working-directory: apps/linux_sim
-        run: cmake --preset linux-simulator-debug
-
-      - name: Build simulator
-        working-directory: apps/linux_sim
-        run: cmake --build --preset linux-simulator-debug-build
-
-      - name: Configure smoke tests
-        working-directory: apps/linux_sim
-        run: cmake --preset linux-test-debug
-
-      - name: Build smoke tests
-        working-directory: apps/linux_sim
-        run: cmake --build --preset linux-test-debug-build
-
-      - name: Run smoke tests
-        working-directory: apps/linux_sim
-        run: ctest --preset linux-debug-test
-
-      - name: Configure Pi OS device shell
-        working-directory: apps/linux_rpi
-        run: cmake --preset linux-device-debug
-
-      - name: Build Pi OS device shell
-        working-directory: apps/linux_rpi
-        run: cmake --build --preset linux-device-debug-build
-
-      - name: Configure uConsole Linux shell
-        working-directory: apps/linux_uconsole
-        run: cmake --preset linux-uconsole-debug
-
-      - name: Build uConsole Linux shell
-        working-directory: apps/linux_uconsole
-        run: cmake --build --preset linux-uconsole-debug-build
-
-      - name: Configure uConsole Debian package
-        working-directory: apps/linux_uconsole
-        run: cmake --preset linux-uconsole-release
-
-      - name: Build uConsole Debian package
-        working-directory: apps/linux_uconsole
-        run: cmake --build --preset linux-uconsole-deb
-
-      - name: Upload uConsole Debian package
-        uses: actions/upload-artifact@v4
-        with:
-          name: trailmate-uconsole-deb
-          path: apps/linux_uconsole/build/uconsole-release/*.deb
-          if-no-files-found: error
-
-      - name: Verify split Linux workflow from WSL-style entrypoint
-        working-directory: apps/linux_sim
-        run: bash scripts/wsl-validate.sh
diff --git a/.github/workflows/linux-simulator.yml b/.github/workflows/linux-simulator.yml
new file mode 100644
index 00000000..1c1eab98
--- /dev/null
+++ b/.github/workflows/linux-simulator.yml
@@ -0,0 +1,63 @@
+name: Linux Simulator
+
+on:
+  push:
+    paths:
+      - "apps/linux_sim_shell/**"
+      - "builds/linux_cmake/**"
+      - "cmake/**"
+      - "modules/core_chat/**"
+      - "modules/core_sys/**"
+      - "modules/product_composition/**"
+      - "modules/ui_ascii_runtime/**"
+      - "modules/ui_key_verification_runtime/**"
+      - "modules/ui_legacy_adapters/**"
+      - "modules/ui_lvgl_ux_packs/**"
+      - "modules/ui_map_runtime/**"
+      - "modules/ui_presentation/**"
+      - "platform/linux/**"
+      - ".github/workflows/linux-simulator.yml"
+  pull_request:
+    paths:
+      - "apps/linux_sim_shell/**"
+      - "builds/linux_cmake/**"
+      - "cmake/**"
+      - "modules/core_chat/**"
+      - "modules/core_sys/**"
+      - "modules/product_composition/**"
+      - "modules/ui_ascii_runtime/**"
+      - "modules/ui_key_verification_runtime/**"
+      - "modules/ui_legacy_adapters/**"
+      - "modules/ui_lvgl_ux_packs/**"
+      - "modules/ui_map_runtime/**"
+      - "modules/ui_presentation/**"
+      - "platform/linux/**"
+      - ".github/workflows/linux-simulator.yml"
+
+jobs:
+  simulator:
+    name: Linux simulator shell
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Verify shared/platform UI boundaries
+        run: python3 scripts/check_platform_ui_boundaries.py
+
+      - name: Install simulator build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ninja-build
+
+      - name: Configure simulator
+        working-directory: builds/linux_cmake
+        run: cmake --preset linux-simulator-debug
+
+      - name: Build simulator
+        working-directory: builds/linux_cmake
+        run: cmake --build --preset linux-simulator-debug-build
+
+      - name: Run simulator smoke tests
+        working-directory: builds/linux_cmake
+        run: ctest --preset linux-simulator-debug-test
diff --git a/.github/workflows/uconsole-linux.yml b/.github/workflows/uconsole-linux.yml
new file mode 100644
index 00000000..d9a94c16
--- /dev/null
+++ b/.github/workflows/uconsole-linux.yml
@@ -0,0 +1,62 @@
+name: uConsole Linux
+
+on:
+  push:
+    paths:
+      - "apps/linux_uconsole_gtk/**"
+      - "builds/linux_cmake/**"
+      - "cmake/**"
+      - "modules/**"
+      - "platform/linux/**"
+      - ".github/workflows/uconsole-linux.yml"
+  pull_request:
+    paths:
+      - "apps/linux_uconsole_gtk/**"
+      - "builds/linux_cmake/**"
+      - "cmake/**"
+      - "modules/**"
+      - "platform/linux/**"
+      - ".github/workflows/uconsole-linux.yml"
+
+jobs:
+  uconsole:
+    name: uConsole GTK shell
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Verify shared/platform UI boundaries
+        run: python3 scripts/check_platform_ui_boundaries.py
+
+      - name: Install uConsole build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ninja-build dpkg-dev xorg-dev libasound2-dev libegl1-mesa-dev libwayland-dev libxkbcommon-dev wayland-protocols libgtk-4-dev libsqlite3-dev libcurl4-openssl-dev
+
+      - name: Configure uConsole Linux shell
+        working-directory: builds/linux_cmake
+        run: cmake --preset linux-uconsole-debug
+
+      - name: Build uConsole Linux shell
+        working-directory: builds/linux_cmake
+        run: cmake --build --preset linux-uconsole-debug-build
+
+      - name: Run uConsole smoke tests
+        working-directory: builds/linux_cmake
+        run: ctest --preset linux-uconsole-debug-test
+
+      - name: Configure uConsole Debian package
+        working-directory: builds/linux_cmake
+        run: cmake --preset linux-uconsole-release
+
+      - name: Build uConsole Debian package
+        working-directory: builds/linux_cmake
+        run: cmake --build --preset linux-uconsole-deb
+
+      - name: Upload uConsole Debian package
+        uses: actions/upload-artifact@v4
+        with:
+          name: trailmate-uconsole-deb
+          path: builds/linux_cmake/build/uconsole-release/*.deb
+          if-no-files-found: error
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea8fc48e657719ed9f77adc0af1113d2222c5ebb..faeca57eef4b731ff809fc5280fd9cc74ebd284d 100644
GIT binary patch
delta 2836
zcmb7GZERCz6n-ytU4U)`x((-?y96d*+j^NWLlXjX7*ybvwPj;rZnWK9+l+p&e&A3k
zNY&}Y6<<Q}hhhwB{5N8PkslC4;D-qb(}b89KmL$llmH1KenjhY-nVzG1B|BGdhdD9
zIqx~=Ip;b3;Ipz1C(9<bS(G;3X<4eQ<)>b0%y`)_GnkJh@qd7+_zvMoWdX=zEP+om
zi?iKAV-S*I7QyLu_AGPYImM!|2t!6TF}4@)2IL8N3Byi>glvZJG>Gq*u%<i0&{3Jc
z20|Z<0uZTqB4Lb0`Qh{R>zi?Az|4o!q;Nw{WUwi5)&%VU>BBCDAj3$3QVBy6<hRZ=
zER8{8;3UCFcRSmG|8e1Qs3;@*2%mq&K9|Ca!5X^!l+`}}o^*J7SDj}!`~`)F5tN4R
zrC0)xA|3G@g?s>VDuxQ(6tssSp-jV5u_T2w2)iV|v92MLVjZwCGci!!O{|@H*&5cy
zT8qBPnn1cIGI4H*vPOl531b|(3FLIYTE-C()h9*u<>Tk;GY<H%_BI8rZimsVXVcdX
zC;D!B{tw(&pYL_`x|}-GSLmmM+2Exk+2BmnROapvglvT$_cOiC*l7?VgmfbR>1@Tm
zC?bL)&=jo{Fh!dJD`SGCX#b@PzZl<=QncyNsWYG}i&~Q>{qsVKHVqh*gF2fevax*3
zR=BEv<x#z;+P~wK4gS%$!9P3L5uAhStH5#qA30<mwh^*Gu`imDa1`l|@LRq1M(QH!
z_#xat14Pq7n2QP_6dEUk8}T)DR9AXa#V{qHPd&JpJ;7Ref5pOXAME2|Oey>@bRF;;
zg2&|4Qxx8*)YNU;m<QhxoRbw{5@u-;%Lv}vaqcD!o_T8FJR0mU{Dj~&h3>JOT+C-}
zUQn&GF6huH(FpZ_l*Ra}l)X(3d=Y7Jmc%J_-00EYcitxloGk0+>Ni#V?L7}?CXDxY
zT+lPFWhoUGY{a3@lTDu;i)PAu{?aS;Z^ut~Y=zg}xRR!lQR0gBlW}gpqCIzDd5@wU
zIqu0RnoLsBwC=yV6fJk`%MnF06H{5GE?Zq?<hQP{BKUQ{=oI%oCN8{VROpYme&}L3
z&HZZUwVcXizH_+GSYF;CYs-I*)bTqnS1o@KI;+W-z*AI*?ajA8s?_?Z(}-_<pbP@i
z2Uv(psZ3N#9~y%sq(`hv8nQKLDo7%UveYsG$YZF60aE)#Tf~oVu<^d9twW{_&Czc7
zl7LCtpq46)hG>}@V+elC$&q)PG0e0#{Uav6=f&F0-E7F0nLf28Wh^rr5F|a#5;@WS
zDUOFYl?_kcDC$zL4{oN_87NzORm`mHf0bPhymN$LzPR7&cIu;%*e;T={zPY`?mh75
zOJ{U?w;a0NWh+qIJ?X#UxvE>;E8U+2+T5h?7<}A&Ip7?Tlpt*;JrfC%IrR$IJJDVj
zgg5&cy~ZCx%aBkK!WJG|S8G8v`1*Ktx!k=m{@#*Bb5*vAwa7odX=QzL8)`tA#zpXE
zkJ7*o7uO@u71aR6@X3$rcM|2(_+kyBf_I6+TnjYxdm%UJV0tCZl}a9{HzZyXZA>1K
zl%tfS9MGiREs_)b%GDCVw_K+OBaIn}>mZ_{-w<+56SCA<w1y}{NeI`+*qddZ@nb5}
zigjqk61-mxLZklt?ZF8{b5E-oINBK9c4ETFrfK#GMnJaCU8L?JeVEkYU_>1ftJA~E
zuGfvG;9K743n$0c_UHFy(@jCGyT-$FeXV>+u4bXEm`R&73nR!Okk7Oz)wSj@5Z{_y
zFG`;8oTXGdIzSgw%MKNjGfe+iv$a_CEm-s#J}TSFo?-j=+=I0hCHL|ETs6Pau%LmQ
zQUwXOG^$5Gd<ZAv2T1s2-oBEknQ$f@;zNoxiJqa=LNc;mCGKnF9ltg5!FQ{8<vH8@
z1Z*T$gvl@)$?ut`*k_Y585!JleQ^uXsm*H)Z5egy={_Ro2PA<@vT45IVpT?FpFMtd
z%vLD#{OTtcm%K;&9_q0sF=Dx`otynm{8%ufUDiDnADnzQ{xLLt9+%5juzBwo-@BB+
o*|GAT8~Z4)84*Ljq;7aWT@GxSe)}N5d9&(}ZuwldDDJL*0C^~*^Z)<=

delta 18
ZcmZ2<k#)gl)(rv7%|SxjgM=6Z!T?9E27Lek

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24752eb8..ad49a797 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 3.16.0)
 set(TRAIL_MATE_IDF_TARGET "tab5" CACHE STRING "Active ESP-IDF target")
 set_property(CACHE TRAIL_MATE_IDF_TARGET PROPERTY STRINGS
     tab5
-    t_display_p4_tft
-    t_display_p4_amoled
+    tdisplayp4_tft
+    tdisplayp4_amoled
 )
 
-set(TRAIL_MATE_IDF_TARGET_DIR "${CMAKE_SOURCE_DIR}/apps/esp_idf/targets/${TRAIL_MATE_IDF_TARGET}")
+set(TRAIL_MATE_IDF_TARGET_DIR "${CMAKE_SOURCE_DIR}/builds/esp_idf/targets/${TRAIL_MATE_IDF_TARGET}")
 if(NOT EXISTS "${TRAIL_MATE_IDF_TARGET_DIR}/sdkconfig.defaults")
     message(FATAL_ERROR "Missing sdkconfig.defaults for TRAIL_MATE_IDF_TARGET='${TRAIL_MATE_IDF_TARGET}' at ${TRAIL_MATE_IDF_TARGET_DIR}")
 endif()
@@ -18,13 +18,12 @@ endif()
 set(SDKCONFIG "${CMAKE_BINARY_DIR}/sdkconfig.${TRAIL_MATE_IDF_TARGET}")
 set(SDKCONFIG_DEFAULTS "${TRAIL_MATE_IDF_TARGET_DIR}/sdkconfig.defaults")
 
-# `apps/esp_idf` is now the shared ESP-IDF component root.
+# `builds/esp_idf` owns ESP-IDF target defaults after root legacy removal.
 # Board choice stays explicit via `TRAIL_MATE_IDF_TARGET`, while board-specific
 # runtime logic continues to live under `platform/esp/boards/<board>`.
 message(STATUS "trail-mate IDF target: ${TRAIL_MATE_IDF_TARGET}")
 message(STATUS "trail-mate SDKCONFIG path: ${SDKCONFIG}")
 set(EXTRA_COMPONENT_DIRS
-    apps/esp_idf
     platform/esp/idf_components
 )
 
diff --git a/apps/README.md b/apps/README.md
index 226eb1c3..f4b7ec8a 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -14,7 +14,10 @@ The directories here define the target structure we are converging toward.
 
 For Linux bring-up:
 
-- `apps/linux_sim` is the simulator and developer-tooling shell
-- `apps/linux_rpi` is the real Pi OS device shell for Cardputer Zero
-- `apps/linux_uconsole` is the desktop-class Linux handheld shell for
-  uConsole/AIO2-class targets
+- `apps/linux_sim_shell` is the final simulator and developer-tooling app shell.
+- `apps/linux_uconsole_gtk` is the final GTK/uConsole app shell.
+- `removed root linux_sim` and
+  `removed root linux_uconsole` are transitional historical roots
+  that may be reached only through declared compatibility adapters.
+- `removed root linux_rpi` remains a historical bring-up root
+  until a final Linux device app shell owns the product path.
diff --git a/apps/esp32_lvgl/APP_SHELL_MANIFEST.md b/apps/esp32_lvgl/APP_SHELL_MANIFEST.md
new file mode 100644
index 00000000..5808fb9d
--- /dev/null
+++ b/apps/esp32_lvgl/APP_SHELL_MANIFEST.md
@@ -0,0 +1,79 @@
+# App Shell Manifest: esp32_lvgl
+
+## Role
+
+Product app shell / target app shell.
+
+## Target Family
+
+ESP / ESP32-P4.
+
+## Renderer Family
+
+LVGL.
+
+## Build Entrypoint
+
+Future authoritative build entrypoint:
+
+- `builds/esp_idf`
+
+Historical source identity:
+
+- `removed root esp_idf`
+
+## Future Responsibilities
+
+May:
+
+- select ESP target profile
+- select board package
+- select LVGL UX pack
+- invoke product composition
+- hand off to runtime facade
+
+Must not:
+
+- own build host files
+- own ESP-IDF CMake project files
+- define board facts
+- implement HAL details
+- implement screen internals
+- assemble Chat/Map/GPS runtime directly in build wrapper
+
+## Thin App Shell Entrypoint Declaration
+
+Current source-level shell descriptor:
+
+```text
+src/esp32_lvgl_app_shell.h
+src/esp32_lvgl_app_shell.cpp
+trailmate_esp32_lvgl_app_shell
+```
+
+## Current Status
+
+Executable app shell baseline.
+
+Default UX Pack:
+
+- `compatibility`
+
+UX Pack Runtime Binding:
+
+- `Esp32LvglAppShell::validate()` resolves `default_ux_pack_id` through
+  `findUxPackById`.
+
+Current ESP-IDF final owner surfaces:
+
+- `esp32_lvgl_startup_runtime.*`
+- `esp32_lvgl_loop_runtime.*`
+- `esp32_lvgl_runtime_config.*`
+
+Component source ownership:
+
+- `builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake`
+
+Forbidden active dependency:
+
+- `esp_idf_legacy_implementation_adapter.cpp`
diff --git a/apps/esp32_lvgl/CMakeLists.txt b/apps/esp32_lvgl/CMakeLists.txt
new file mode 100644
index 00000000..2695c582
--- /dev/null
+++ b/apps/esp32_lvgl/CMakeLists.txt
@@ -0,0 +1,111 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(TrailMateEsp32LvglAppShell LANGUAGES CXX)
+
+set(TRAIL_MATE_REPO_ROOT
+    "${CMAKE_CURRENT_LIST_DIR}/../.."
+    CACHE PATH "Trail Mate repository root")
+
+include("${TRAIL_MATE_REPO_ROOT}/cmake/TrailMateUxPacks.cmake")
+trailmate_add_ui_lvgl_ux_packs(trailmate_ui_lvgl_ux_packs)
+include(CTest)
+
+add_library(trailmate_esp32_lvgl_app_shell
+    src/esp32_lvgl_app_shell.cpp
+    src/esp32_lvgl_historical_source_descriptor.cpp
+    src/esp32_lvgl_startup_runtime.cpp
+    src/esp32_lvgl_loop_runtime.cpp
+    src/esp32_lvgl_runtime_config.cpp
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/src/target_profile.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/src/target_build_binding.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/src/target_ux_binding.cpp")
+
+target_include_directories(trailmate_esp32_lvgl_app_shell
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}/src"
+        "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/include")
+
+target_link_libraries(trailmate_esp32_lvgl_app_shell
+    PUBLIC
+        trailmate_ui_lvgl_ux_packs)
+
+target_compile_features(trailmate_esp32_lvgl_app_shell PUBLIC cxx_std_17)
+
+if(BUILD_TESTING)
+    add_executable(trailmate_esp32_lvgl_app_shell_smoke
+        tests/esp32_lvgl_app_shell_smoke.cpp)
+    target_link_libraries(trailmate_esp32_lvgl_app_shell_smoke
+        PRIVATE trailmate_esp32_lvgl_app_shell)
+    add_test(NAME trailmate_esp32_lvgl_app_shell_smoke
+             COMMAND trailmate_esp32_lvgl_app_shell_smoke)
+
+    add_executable(trailmate_esp32_lvgl_historical_source_descriptor_smoke
+        tests/esp32_lvgl_historical_source_descriptor_smoke.cpp)
+    target_link_libraries(trailmate_esp32_lvgl_historical_source_descriptor_smoke
+        PRIVATE trailmate_esp32_lvgl_app_shell)
+    add_test(NAME trailmate_esp32_lvgl_historical_source_descriptor_smoke
+             COMMAND trailmate_esp32_lvgl_historical_source_descriptor_smoke)
+
+    add_executable(trailmate_esp32_lvgl_startup_runtime_smoke
+        tests/esp32_lvgl_startup_runtime_smoke.cpp)
+    target_link_libraries(trailmate_esp32_lvgl_startup_runtime_smoke
+        PRIVATE trailmate_esp32_lvgl_app_shell)
+    add_test(NAME trailmate_esp32_lvgl_startup_runtime_smoke
+             COMMAND trailmate_esp32_lvgl_startup_runtime_smoke)
+
+    add_executable(trailmate_esp32_lvgl_loop_runtime_smoke
+        tests/esp32_lvgl_loop_runtime_smoke.cpp)
+    target_link_libraries(trailmate_esp32_lvgl_loop_runtime_smoke
+        PRIVATE trailmate_esp32_lvgl_app_shell)
+    add_test(NAME trailmate_esp32_lvgl_loop_runtime_smoke
+             COMMAND trailmate_esp32_lvgl_loop_runtime_smoke)
+
+    add_executable(trailmate_esp32_lvgl_runtime_config_smoke
+        tests/esp32_lvgl_runtime_config_smoke.cpp)
+    target_link_libraries(trailmate_esp32_lvgl_runtime_config_smoke
+        PRIVATE trailmate_esp32_lvgl_app_shell)
+    add_test(NAME trailmate_esp32_lvgl_runtime_config_smoke
+             COMMAND trailmate_esp32_lvgl_runtime_config_smoke)
+
+    add_executable(trailmate_product_target_profile_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/tests/test_target_profile.cpp")
+    target_link_libraries(trailmate_product_target_profile_smoke
+        PRIVATE trailmate_esp32_lvgl_app_shell)
+    add_test(NAME trailmate_product_target_profile_smoke
+             COMMAND trailmate_product_target_profile_smoke)
+
+    add_executable(trailmate_product_target_build_binding_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/tests/test_target_build_binding.cpp")
+    target_link_libraries(trailmate_product_target_build_binding_smoke
+        PRIVATE trailmate_esp32_lvgl_app_shell)
+    add_test(NAME trailmate_product_target_build_binding_smoke
+             COMMAND trailmate_product_target_build_binding_smoke)
+
+    add_executable(trailmate_product_target_ux_binding_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/tests/test_target_ux_binding.cpp")
+    target_link_libraries(trailmate_product_target_ux_binding_smoke
+        PRIVATE trailmate_esp32_lvgl_app_shell)
+    add_test(NAME trailmate_product_target_ux_binding_smoke
+             COMMAND trailmate_product_target_ux_binding_smoke)
+
+    add_executable(trailmate_ui_presentation_target_ui_profile_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/tests/test_target_ui_profile.cpp")
+    target_link_libraries(trailmate_ui_presentation_target_ui_profile_smoke
+        PRIVATE trailmate_ui_lvgl_ux_packs)
+    add_test(NAME trailmate_ui_presentation_target_ui_profile_smoke
+             COMMAND trailmate_ui_presentation_target_ui_profile_smoke)
+
+    add_executable(trailmate_ui_presentation_page_manifest_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/tests/test_page_manifest.cpp")
+    target_link_libraries(trailmate_ui_presentation_page_manifest_smoke
+        PRIVATE trailmate_ui_lvgl_ux_packs)
+    add_test(NAME trailmate_ui_presentation_page_manifest_smoke
+             COMMAND trailmate_ui_presentation_page_manifest_smoke)
+
+    add_executable(trailmate_ui_presentation_layout_profile_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/tests/test_layout_profile.cpp")
+    target_link_libraries(trailmate_ui_presentation_layout_profile_smoke
+        PRIVATE trailmate_ui_lvgl_ux_packs)
+    add_test(NAME trailmate_ui_presentation_layout_profile_smoke
+             COMMAND trailmate_ui_presentation_layout_profile_smoke)
+endif()
diff --git a/apps/esp32_lvgl/README.md b/apps/esp32_lvgl/README.md
new file mode 100644
index 00000000..425147fe
--- /dev/null
+++ b/apps/esp32_lvgl/README.md
@@ -0,0 +1,76 @@
+# `apps/esp32_lvgl`
+
+Role = product app shell / target app shell.
+
+`apps/esp32_lvgl` is the ESP + LVGL product app shell executable baseline.
+
+It is not an ESP-IDF project directory. Batch 2 gives this app shell final
+ownership of ESP32 LVGL startup, loop, and runtime-config source.
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+## Build Entrypoint
+
+Build entrypoint = `builds/esp_idf`
+
+Historical source identity = `removed root esp_idf`
+
+Component source list = `builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake`
+
+## Future Responsibilities
+
+May:
+
+- select ESP target profile
+- select board package
+- select LVGL UX pack
+- invoke product composition
+- hand off to runtime facade
+
+must not own:
+
+- own build host files
+- own ESP-IDF CMake project files
+- define board facts
+- implement HAL details
+- implement screen internals
+- assemble Chat/Map/GPS runtime directly in build wrapper
+
+## Thin App Shell Entrypoint Declaration
+
+Current source-level shell descriptor:
+
+```text
+src/esp32_lvgl_app_shell.h
+src/esp32_lvgl_app_shell.cpp
+trailmate_esp32_lvgl_app_shell
+```
+
+Current config:
+
+```text
+target_family = esp32_lvgl
+default_ux_pack_id = compatibility
+build_entrypoint = builds/esp_idf
+component_sources = builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake
+historical_root_name = removed root esp_idf
+historical_role = pre-refactor ESP-IDF/LVGL implementation root
+replacement_owner = apps/esp32_lvgl + builds/esp_idf
+```
+
+Runtime owner files:
+
+```text
+src/esp32_lvgl_startup_runtime.*
+src/esp32_lvgl_loop_runtime.*
+src/esp32_lvgl_runtime_config.*
+```
+
+`apps/esp32_lvgl` must not compile
+`esp_idf_legacy_implementation_adapter.cpp`.
diff --git a/apps/esp32_lvgl/library.json b/apps/esp32_lvgl/library.json
new file mode 100644
index 00000000..6cd5a3b2
--- /dev/null
+++ b/apps/esp32_lvgl/library.json
@@ -0,0 +1,81 @@
+{
+  "name": "trailmate_esp32_lvgl_app_shell",
+  "version": "0.1.0",
+  "frameworks": [
+    "arduino"
+  ],
+  "build": {
+    "includeDir": "src",
+    "srcDir": "src",
+    "srcFilter": [
+      "-<*>",
+      "+<esp32_lvgl_arduino_app_registry.cpp>",
+      "+<esp32_lvgl_arduino_app_runtime_access.cpp>",
+      "+<esp32_lvgl_arduino_entry.cpp>",
+      "+<esp32_lvgl_arduino_loop_runtime.cpp>",
+      "+<esp32_lvgl_arduino_startup_runtime.cpp>"
+    ],
+    "flags": [
+      "-I../../modules/ui_shared/include",
+      "-I../../modules/core_device/include",
+      "-I../../modules/core_mesh/include",
+      "-I../../modules/core_phone/include",
+      "-I../../modules/core_sys/include",
+      "-I../../modules/core_chat/include",
+      "-I../../modules/core_gps/include",
+      "-I../../modules/core_hostlink/include",
+      "-I../../modules/core_team/include",
+      "-I../../modules/ui_presentation/include",
+      "-I../../modules/chat_presentation_adapters/include",
+      "-I../../modules/ui_chat_runtime/include",
+      "-I../../modules/ui_map_runtime/include",
+      "-I../../modules/ui_gps_runtime/include",
+      "-I../../modules/ui_legacy_adapters/include",
+      "-I../../modules/ui_lvgl_core/include",
+      "-I../../modules/ui_lvgl_ux_packs/include",
+      "-I../../platform/esp/arduino_common/include",
+      "-I../../platform/esp/common/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_device"
+    },
+    {
+      "name": "core_mesh"
+    },
+    {
+      "name": "core_phone"
+    },
+    {
+      "name": "chat_presentation_adapters"
+    },
+    {
+      "name": "ui_chat_runtime"
+    },
+    {
+      "name": "ui_map_runtime"
+    },
+    {
+      "name": "ui_gps_runtime"
+    },
+    {
+      "name": "ui_legacy_adapters"
+    },
+    {
+      "name": "ui_lvgl_core"
+    },
+    {
+      "name": "ui_lvgl_ux_packs"
+    },
+    {
+      "name": "esp_arduino_common"
+    },
+    {
+      "name": "esp_boards"
+    },
+    {
+      "name": "Preferences"
+    }
+  ]
+}
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp b/apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp
new file mode 100644
index 00000000..9c3f04c2
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp
@@ -0,0 +1,54 @@
+#include "esp32_lvgl_app_shell.h"
+
+#include "product_composition/target_ux_binding.h"
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+
+#include <cstring>
+
+namespace trailmate
+{
+namespace apps
+{
+namespace esp32_lvgl
+{
+
+const Esp32LvglAppShellConfig& Esp32LvglAppShell::config() const
+{
+    return config_;
+}
+
+const char* Esp32LvglAppShell::targetId() const
+{
+    return config_.target_id;
+}
+
+const product_composition::TargetProfile* Esp32LvglAppShell::targetProfile() const
+{
+    return product_composition::findTargetProfile(targetId());
+}
+
+const char* Esp32LvglAppShell::activeUxPackId() const
+{
+    const auto* binding = product_composition::findTargetUxBinding(targetId());
+    return binding != nullptr ? binding->active_ux_pack_id : nullptr;
+}
+
+bool Esp32LvglAppShell::validate() const
+{
+    return config_.target_id != nullptr &&
+           targetProfile() != nullptr &&
+           product_composition::findTargetUxBinding(targetId()) != nullptr &&
+           config_.target_family != nullptr &&
+           config_.default_ux_pack_id != nullptr &&
+           std::strcmp(config_.default_ux_pack_id, activeUxPackId()) == 0 &&
+           ui_lvgl_ux::findUxPackById(activeUxPackId()) != nullptr &&
+           config_.build_entrypoint != nullptr &&
+           config_.component_sources != nullptr &&
+           config_.historical_root_name != nullptr &&
+           config_.historical_role != nullptr &&
+           config_.replacement_owner != nullptr;
+}
+
+} // namespace esp32_lvgl
+} // namespace apps
+} // namespace trailmate
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_app_shell.h b/apps/esp32_lvgl/src/esp32_lvgl_app_shell.h
new file mode 100644
index 00000000..5bc8da45
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_app_shell.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "esp32_lvgl_historical_source_descriptor.h"
+
+#include "product_composition/target_profile.h"
+
+namespace trailmate
+{
+namespace apps
+{
+namespace esp32_lvgl
+{
+
+struct Esp32LvglAppShellConfig
+{
+    const char* target_id = "tab5";
+    const char* target_family = "esp32_lvgl";
+    const char* default_ux_pack_id = "compatibility";
+    const char* build_entrypoint = "builds/esp_idf";
+    const char* component_sources = "builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake";
+    const char* historical_root_name =
+        esp32LvglHistoricalSourceDescriptor().historical_root_name;
+    const char* historical_role =
+        esp32LvglHistoricalSourceDescriptor().historical_role;
+    const char* replacement_owner =
+        esp32LvglHistoricalSourceDescriptor().replacement_owner;
+};
+
+class Esp32LvglAppShell
+{
+  public:
+    const Esp32LvglAppShellConfig& config() const;
+    const char* targetId() const;
+    const product_composition::TargetProfile* targetProfile() const;
+    const char* activeUxPackId() const;
+    bool validate() const;
+
+  private:
+    Esp32LvglAppShellConfig config_{};
+};
+
+} // namespace esp32_lvgl
+} // namespace apps
+} // namespace trailmate
diff --git a/apps/esp_pio/src/app_registry.cpp b/apps/esp32_lvgl/src/esp32_lvgl_arduino_app_registry.cpp
similarity index 99%
rename from apps/esp_pio/src/app_registry.cpp
rename to apps/esp32_lvgl/src/esp32_lvgl_arduino_app_registry.cpp
index 4b9931f4..ee26801c 100644
--- a/apps/esp_pio/src/app_registry.cpp
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_app_registry.cpp
@@ -1,7 +1,4 @@
 #include "ui/app_registry.h"
-#include "ui/app_catalog_builder.h"
-
-#include <cstdio>
 
 #include "platform/ui/device_runtime.h"
 #include "platform/ui/hostlink_runtime.h"
@@ -11,9 +8,13 @@
 #include "platform/ui/tracker_runtime.h"
 #include "platform/ui/usb_support_runtime.h"
 #include "platform/ui/walkie_runtime.h"
+#include "ui/app_catalog_builder.h"
+
+#include <cstdio>
 
 namespace
 {
+
 #define APP_REG_LOG(...) std::printf("[UI][Registry] " __VA_ARGS__)
 
 ui::app_catalog_builder::FeatureFlags buildFeatureFlags()
diff --git a/apps/esp_pio/src/app_runtime_access.cpp b/apps/esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.cpp
similarity index 89%
rename from apps/esp_pio/src/app_runtime_access.cpp
rename to apps/esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.cpp
index 0c8852f4..17501956 100644
--- a/apps/esp_pio/src/app_runtime_access.cpp
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.cpp
@@ -1,13 +1,13 @@
-#include "apps/esp_pio/app_runtime_access.h"
+#include "esp32_lvgl_arduino_app_runtime_access.h"
 
 #include <Arduino.h>
 
-#include "apps/esp_pio/app_context.h"
+#include "app/app_context.h"
 #include "platform/esp/arduino_common/app_runtime_bootstrap_support.h"
 #include "platform/esp/arduino_common/app_runtime_support.h"
 #include "platform/esp/boards/board_runtime.h"
 
-namespace apps::esp_pio::app_runtime_access
+namespace trailmate::apps::esp32_lvgl::arduino_app_runtime_access
 {
 namespace
 {
@@ -72,4 +72,4 @@ const Status& status()
     return s_status;
 }
 
-} // namespace apps::esp_pio::app_runtime_access
+} // namespace trailmate::apps::esp32_lvgl::arduino_app_runtime_access
diff --git a/apps/esp_pio/include/apps/esp_pio/app_runtime_access.h b/apps/esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.h
similarity index 64%
rename from apps/esp_pio/include/apps/esp_pio/app_runtime_access.h
rename to apps/esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.h
index 08effc92..8f469d3a 100644
--- a/apps/esp_pio/include/apps/esp_pio/app_runtime_access.h
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.h
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace apps::esp_pio::app_runtime_access
+namespace trailmate::apps::esp32_lvgl::arduino_app_runtime_access
 {
 
 struct Status
@@ -15,4 +15,4 @@ bool initialize(bool use_mock);
 void tick();
 const Status& status();
 
-} // namespace apps::esp_pio::app_runtime_access
+} // namespace trailmate::apps::esp32_lvgl::arduino_app_runtime_access
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.cpp b/apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.cpp
new file mode 100644
index 00000000..ceb1479a
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.cpp
@@ -0,0 +1,19 @@
+#include "esp32_lvgl_arduino_entry.h"
+
+#include "esp32_lvgl_arduino_loop_runtime.h"
+#include "esp32_lvgl_arduino_startup_runtime.h"
+
+namespace trailmate::apps::esp32_lvgl::arduino_entry
+{
+
+void setup()
+{
+    arduino_startup_runtime::run();
+}
+
+void loop()
+{
+    arduino_loop_runtime::tick();
+}
+
+} // namespace trailmate::apps::esp32_lvgl::arduino_entry
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.h b/apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.h
new file mode 100644
index 00000000..220649e9
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.h
@@ -0,0 +1,9 @@
+#pragma once
+
+namespace trailmate::apps::esp32_lvgl::arduino_entry
+{
+
+void setup();
+void loop();
+
+} // namespace trailmate::apps::esp32_lvgl::arduino_entry
diff --git a/apps/esp_pio/src/loop_runtime.cpp b/apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.cpp
similarity index 72%
rename from apps/esp_pio/src/loop_runtime.cpp
rename to apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.cpp
index 6582ada9..d83b1f4d 100644
--- a/apps/esp_pio/src/loop_runtime.cpp
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.cpp
@@ -1,10 +1,11 @@
-#include "apps/esp_pio/loop_runtime.h"
+#include "esp32_lvgl_arduino_loop_runtime.h"
 
 #include <Arduino.h>
 
-#include "apps/esp_pio/app_runtime_access.h"
 #include "board/BoardBase.h"
+#include "esp32_lvgl_arduino_app_runtime_access.h"
 #include "platform/esp/arduino_common/display_runtime.h"
+#include "platform/esp/boards/board_runtime.h"
 #include "ui/app_runtime.h"
 #include "ui/loop_shell.h"
 
@@ -41,7 +42,7 @@ void log_loop_interval(uint32_t now_ms)
 
 } // namespace
 
-namespace apps::esp_pio::loop_runtime
+namespace trailmate::apps::esp32_lvgl::arduino_loop_runtime
 {
 
 void tick()
@@ -54,9 +55,15 @@ void tick()
         return ui_is_overlay_active();
     };
     hooks.handle_power_button = []()
-    { board.handlePowerButton(); };
+    {
+        const auto handles = platform::esp::boards::resolveAppContextInitHandles();
+        if (handles.board)
+        {
+            handles.board->handlePowerButton();
+        }
+    };
     hooks.update_runtime = []()
-    { apps::esp_pio::app_runtime_access::tick(); };
+    { trailmate::apps::esp32_lvgl::arduino_app_runtime_access::tick(); };
     hooks.display_tick_if_due = [](uint32_t now_ms)
     {
         log_loop_interval(now_ms);
@@ -71,4 +78,4 @@ void tick()
     ui::loop_shell::tick(hooks);
 }
 
-} // namespace apps::esp_pio::loop_runtime
+} // namespace trailmate::apps::esp32_lvgl::arduino_loop_runtime
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.h b/apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.h
new file mode 100644
index 00000000..00f71a2d
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace trailmate::apps::esp32_lvgl::arduino_loop_runtime
+{
+
+void tick();
+
+} // namespace trailmate::apps::esp32_lvgl::arduino_loop_runtime
diff --git a/apps/esp_pio/src/startup_runtime.cpp b/apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.cpp
similarity index 80%
rename from apps/esp_pio/src/startup_runtime.cpp
rename to apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.cpp
index d3acbfbb..df6df144 100644
--- a/apps/esp_pio/src/startup_runtime.cpp
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.cpp
@@ -1,13 +1,14 @@
-#include "apps/esp_pio/startup_runtime.h"
+#include "esp32_lvgl_arduino_startup_runtime.h"
 
 #include <Arduino.h>
 
 #include "app/app_facade_access.h"
-#include "apps/esp_pio/app_runtime_access.h"
 #include "board/BoardBase.h"
 #include "display/DisplayConfig.h"
+#include "esp32_lvgl_arduino_app_runtime_access.h"
 #include "platform/esp/arduino_common/display_runtime.h"
 #include "platform/esp/arduino_common/startup_support.h"
+#include "platform/esp/boards/board_runtime.h"
 #include "platform/ui/settings_store.h"
 #include "ui/app_registry.h"
 #include "ui/app_runtime.h"
@@ -30,7 +31,12 @@ void initializeShell()
             saved < DEVICE_MIN_BRIGHTNESS_LEVEL
                 ? DEVICE_MIN_BRIGHTNESS_LEVEL
                 : (saved > DEVICE_MAX_BRIGHTNESS_LEVEL ? DEVICE_MAX_BRIGHTNESS_LEVEL : saved);
-        board.setBrightness(static_cast<uint8_t>(clamped));
+
+        const auto handles = platform::esp::boards::resolveAppContextInitHandles();
+        if (handles.board)
+        {
+            handles.board->setBrightness(static_cast<uint8_t>(clamped));
+        }
     };
     hooks.show_main_menu = menu_show;
     hooks.watch_face = ui::startup_shell::defaultWatchFaceHooks();
@@ -48,7 +54,7 @@ void finishStartup(bool waking_from_sleep)
 
 } // namespace
 
-namespace apps::esp_pio::startup_runtime
+namespace trailmate::apps::esp32_lvgl::arduino_startup_runtime
 {
 
 void run()
@@ -79,9 +85,9 @@ void run()
 
     bool use_mock = false;
     ui::boot::set_log_line("Initializing app context...");
-    if (apps::esp_pio::app_runtime_access::initialize(use_mock))
+    if (trailmate::apps::esp32_lvgl::arduino_app_runtime_access::initialize(use_mock))
     {
-        const auto& runtime_status = apps::esp_pio::app_runtime_access::status();
+        const auto& runtime_status = trailmate::apps::esp32_lvgl::arduino_app_runtime_access::status();
         Serial.printf("[Setup] AppContext initialized handles=%d bound=%d tasks=%d\n",
                       runtime_status.board_handles_ready ? 1 : 0,
                       runtime_status.app_context_bound ? 1 : 0,
@@ -89,7 +95,7 @@ void run()
     }
     else
     {
-        const auto& runtime_status = apps::esp_pio::app_runtime_access::status();
+        const auto& runtime_status = trailmate::apps::esp32_lvgl::arduino_app_runtime_access::status();
         Serial.printf("[Setup] WARNING: AppContext init failed handles=%d bound=%d tasks=%d\n",
                       runtime_status.board_handles_ready ? 1 : 0,
                       runtime_status.app_context_bound ? 1 : 0,
@@ -102,4 +108,4 @@ void run()
     finishStartup(waking_from_sleep);
 }
 
-} // namespace apps::esp_pio::startup_runtime
+} // namespace trailmate::apps::esp32_lvgl::arduino_startup_runtime
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.h b/apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.h
new file mode 100644
index 00000000..4aa7860a
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace trailmate::apps::esp32_lvgl::arduino_startup_runtime
+{
+
+void run();
+
+} // namespace trailmate::apps::esp32_lvgl::arduino_startup_runtime
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.cpp b/apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.cpp
new file mode 100644
index 00000000..310eb44a
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.cpp
@@ -0,0 +1,13 @@
+#include "esp32_lvgl_historical_source_descriptor.h"
+
+namespace trailmate::apps::esp32_lvgl
+{
+
+const Esp32LvglHistoricalSourceDescriptor&
+esp32LvglHistoricalSourceDescriptor()
+{
+    static const Esp32LvglHistoricalSourceDescriptor descriptor{};
+    return descriptor;
+}
+
+} // namespace trailmate::apps::esp32_lvgl
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.h b/apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.h
new file mode 100644
index 00000000..23ece452
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace trailmate::apps::esp32_lvgl
+{
+
+struct Esp32LvglHistoricalSourceDescriptor
+{
+    const char* historical_root_name = "removed root esp_idf";
+    const char* historical_role = "pre-refactor ESP-IDF/LVGL implementation root";
+    const char* replacement_owner = "apps/esp32_lvgl + builds/esp_idf";
+};
+
+const Esp32LvglHistoricalSourceDescriptor&
+esp32LvglHistoricalSourceDescriptor();
+
+} // namespace trailmate::apps::esp32_lvgl
diff --git a/apps/esp_idf/src/loop_runtime.cpp b/apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.cpp
similarity index 68%
rename from apps/esp_idf/src/loop_runtime.cpp
rename to apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.cpp
index b0855d74..ced85e21 100644
--- a/apps/esp_idf/src/loop_runtime.cpp
+++ b/apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.cpp
@@ -1,5 +1,6 @@
-#include "apps/esp_idf/loop_runtime.h"
+#include "esp32_lvgl_loop_runtime.h"
 
+#if defined(ESP_PLATFORM)
 #include "apps/esp_idf/app_runtime_access.h"
 
 #include "esp_log.h"
@@ -7,16 +8,18 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "ui/loop_shell.h"
+#endif
 
-namespace apps::esp_idf::loop_runtime
+namespace trailmate::apps::esp32_lvgl
 {
 namespace
 {
 
+#if defined(ESP_PLATFORM)
 struct LoopState
 {
     TaskHandle_t task = nullptr;
-    RuntimeConfig config{};
+    Esp32LvglRuntimeConfig config{};
 };
 
 LoopState s_loop{};
@@ -31,7 +34,7 @@ void loopTask(void* parameter)
         return static_cast<uint32_t>(esp_timer_get_time() / 1000ULL);
     };
     hooks.update_runtime = []()
-    { app_runtime_access::tick(); };
+    { apps::esp_idf::app_runtime_access::tick(); };
     hooks.yield_now = []()
     { taskYIELD(); };
     hooks.sleep_ms = [](uint32_t ms)
@@ -44,11 +47,27 @@ void loopTask(void* parameter)
         ui::loop_shell::tick(hooks);
     }
 }
+#endif
 
 } // namespace
 
-void start(const RuntimeConfig& config)
+bool canStartEsp32LvglLoopRuntime(const Esp32LvglRuntimeConfig& config)
 {
+    return config.log_tag != nullptr &&
+           config.target_name != nullptr &&
+           config.loop_task_name != nullptr &&
+           config.loop_delay_ms > 0 &&
+           config.loop_stack_size > 0;
+}
+
+void startEsp32LvglLoopRuntime(const Esp32LvglRuntimeConfig& config)
+{
+    if (!canStartEsp32LvglLoopRuntime(config))
+    {
+        return;
+    }
+
+#if defined(ESP_PLATFORM)
     if (s_loop.task)
     {
         return;
@@ -73,6 +92,9 @@ void start(const RuntimeConfig& config)
     }
 
     ESP_LOGI(s_loop.config.log_tag, "IDF app loop task started for %s", s_loop.config.target_name);
+#else
+    (void)config;
+#endif
 }
 
-} // namespace apps::esp_idf::loop_runtime
+} // namespace trailmate::apps::esp32_lvgl
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.h b/apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.h
new file mode 100644
index 00000000..d57a2d5a
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "esp32_lvgl_runtime_config.h"
+
+namespace trailmate::apps::esp32_lvgl
+{
+
+bool canStartEsp32LvglLoopRuntime(const Esp32LvglRuntimeConfig& config);
+void startEsp32LvglLoopRuntime(const Esp32LvglRuntimeConfig& config);
+
+} // namespace trailmate::apps::esp32_lvgl
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_runtime_config.cpp b/apps/esp32_lvgl/src/esp32_lvgl_runtime_config.cpp
new file mode 100644
index 00000000..0a4ba27e
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_runtime_config.cpp
@@ -0,0 +1,70 @@
+#include "esp32_lvgl_runtime_config.h"
+
+#include "product_composition/target_profile.h"
+
+#if __has_include("sdkconfig.h")
+#include "sdkconfig.h"
+#endif
+
+namespace trailmate::apps::esp32_lvgl
+{
+
+const Esp32LvglRuntimeConfig& esp32LvglRuntimeConfig()
+{
+#if defined(TRAIL_MATE_ESP_BOARD_TAB5)
+    static const Esp32LvglRuntimeConfig kConfig = {
+        "tab5",
+        "trail-mate-tab5",
+        "Tab5",
+        "tab5_app_loop",
+        10,
+        4096,
+        5,
+    };
+#elif defined(TRAIL_MATE_ESP_BOARD_T_DISPLAY_P4)
+#if defined(CONFIG_TRAIL_MATE_T_DISPLAY_P4_PANEL_RM69A10) || defined(TRAIL_MATE_ESP_BOARD_T_DISPLAY_P4_AMOLED)
+    static const Esp32LvglRuntimeConfig kConfig = {
+        "tdisplayp4_amoled",
+        "trail-mate-t-display-p4-amoled",
+        "T-Display-P4 AMOLED",
+        "t_display_p4_amoled_app_loop",
+        10,
+        4096,
+        5,
+    };
+#else
+    static const Esp32LvglRuntimeConfig kConfig = {
+        "tdisplayp4_tft",
+        "trail-mate-t-display-p4-tft",
+        "T-Display-P4 TFT",
+        "t_display_p4_tft_app_loop",
+        10,
+        4096,
+        5,
+    };
+#endif
+#else
+    static const Esp32LvglRuntimeConfig kConfig = {
+        "esp_idf",
+        "trail-mate-idf",
+        "esp-idf",
+        "idf_app_loop",
+        10,
+        4096,
+        5,
+    };
+#endif
+    return kConfig;
+}
+
+const product_composition::TargetProfile* esp32LvglRuntimeTargetProfile()
+{
+    return product_composition::findTargetProfile(esp32LvglRuntimeConfig().target_id);
+}
+
+bool hasEsp32LvglRuntimeTargetProfile()
+{
+    return esp32LvglRuntimeTargetProfile() != nullptr;
+}
+
+} // namespace trailmate::apps::esp32_lvgl
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_runtime_config.h b/apps/esp32_lvgl/src/esp32_lvgl_runtime_config.h
new file mode 100644
index 00000000..979ef5b5
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_runtime_config.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <cstdint>
+
+namespace product_composition
+{
+struct TargetProfile;
+}
+
+namespace trailmate::apps::esp32_lvgl
+{
+
+struct Esp32LvglRuntimeConfig
+{
+    const char* target_id = "esp_idf";
+    const char* log_tag = "trail-mate-idf";
+    const char* target_name = "esp-idf";
+    const char* loop_task_name = "idf_app_loop";
+    uint32_t loop_delay_ms = 10;
+    uint32_t loop_stack_size = 4096;
+    uint32_t loop_priority = 5;
+};
+
+const Esp32LvglRuntimeConfig& esp32LvglRuntimeConfig();
+const product_composition::TargetProfile* esp32LvglRuntimeTargetProfile();
+bool hasEsp32LvglRuntimeTargetProfile();
+
+} // namespace trailmate::apps::esp32_lvgl
diff --git a/apps/esp_idf/src/startup_runtime.cpp b/apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp
similarity index 86%
rename from apps/esp_idf/src/startup_runtime.cpp
rename to apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp
index de170648..ef8922b8 100644
--- a/apps/esp_idf/src/startup_runtime.cpp
+++ b/apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp
@@ -1,7 +1,9 @@
-#include "apps/esp_idf/startup_runtime.h"
+#include "esp32_lvgl_startup_runtime.h"
 
+#include "esp32_lvgl_loop_runtime.h"
+
+#if defined(ESP_PLATFORM)
 #include "apps/esp_idf/app_runtime_access.h"
-#include "apps/esp_idf/loop_runtime.h"
 
 #include "app/app_config.h"
 #include "app/app_facade_access.h"
@@ -17,12 +19,14 @@
 #include "ui/app_registry.h"
 #include "ui/app_runtime.h"
 #include "ui/startup_shell.h"
+#endif
 
-namespace apps::esp_idf::startup_runtime
+namespace trailmate::apps::esp32_lvgl
 {
 namespace
 {
 
+#if defined(ESP_PLATFORM)
 bool lockUi(uint32_t timeout_ms)
 {
     return platform::esp::boards::lockDisplay(timeout_ms);
@@ -33,7 +37,7 @@ void unlockUi()
     platform::esp::boards::unlockDisplay();
 }
 
-void applyPlatformRuntimeConfig(const RuntimeConfig& config)
+void applyPlatformRuntimeConfig(const Esp32LvglRuntimeConfig& config)
 {
     if (!app::hasAppFacade())
     {
@@ -82,16 +86,30 @@ ui::startup_shell::Hooks buildShellHooks()
     };
     return hooks;
 }
+#endif
 
 } // namespace
 
+#if defined(ESP_PLATFORM)
 extern "C" void trail_mate_idf_note_user_activity(void)
 {
     platform::ui::screen::update_user_activity();
 }
+#endif
 
-void run(const RuntimeConfig& config)
+bool canRunEsp32LvglStartupRuntime(const Esp32LvglRuntimeConfig& config)
 {
+    return canStartEsp32LvglLoopRuntime(config);
+}
+
+void runEsp32LvglStartupRuntime(const Esp32LvglRuntimeConfig& config)
+{
+    if (!canRunEsp32LvglStartupRuntime(config))
+    {
+        return;
+    }
+
+#if defined(ESP_PLATFORM)
     constexpr bool waking_from_sleep = false;
 
     platform::esp::idf_common::startup_support::logStartupBanner(config.log_tag);
@@ -116,7 +134,7 @@ void run(const RuntimeConfig& config)
         ESP_LOGW(config.log_tag, "prepareBootUi failed to acquire LVGL lock");
     }
 
-    app_runtime_access::initialize(config);
+    apps::esp_idf::app_runtime_access::initialize(config);
     applyPlatformRuntimeConfig(config);
 
     const ui::startup_shell::Hooks shell_hooks = buildShellHooks();
@@ -134,7 +152,7 @@ void run(const RuntimeConfig& config)
         ESP_LOGW(config.log_tag, "initializeShell failed to acquire LVGL lock");
     }
 
-    const auto& runtime_status = app_runtime_access::status();
+    const auto& runtime_status = apps::esp_idf::app_runtime_access::status();
     ESP_LOGI(config.log_tag,
              "%s runtime status handles=%d lifecycle=%d bound=%d",
              config.target_name,
@@ -154,9 +172,12 @@ void run(const RuntimeConfig& config)
         ESP_LOGW(config.log_tag, "finalizeStartup failed to acquire LVGL lock");
     }
 
-    loop_runtime::start(config);
+    startEsp32LvglLoopRuntime(config);
 
     ESP_LOGI(config.log_tag, "%s startup runtime initialized", config.target_name);
+#else
+    (void)config;
+#endif
 }
 
-} // namespace apps::esp_idf::startup_runtime
+} // namespace trailmate::apps::esp32_lvgl
diff --git a/apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.h b/apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.h
new file mode 100644
index 00000000..e149df62
--- /dev/null
+++ b/apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "esp32_lvgl_runtime_config.h"
+
+namespace trailmate::apps::esp32_lvgl
+{
+
+bool canRunEsp32LvglStartupRuntime(const Esp32LvglRuntimeConfig& config);
+void runEsp32LvglStartupRuntime(const Esp32LvglRuntimeConfig& config);
+
+} // namespace trailmate::apps::esp32_lvgl
diff --git a/apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp b/apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp
new file mode 100644
index 00000000..5b18af32
--- /dev/null
+++ b/apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp
@@ -0,0 +1,38 @@
+#include "esp32_lvgl_app_shell.h"
+
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    trailmate::apps::esp32_lvgl::Esp32LvglAppShell shell;
+    assert(shell.validate());
+
+    const auto& config = shell.config();
+    assert(std::strcmp(config.target_id, "tab5") == 0);
+    assert(std::strcmp(shell.targetId(), "tab5") == 0);
+    assert(std::strcmp(config.target_family, "esp32_lvgl") == 0);
+    assert(std::strcmp(config.default_ux_pack_id, "compatibility") == 0);
+    assert(std::strcmp(shell.activeUxPackId(), "compatibility") == 0);
+    assert(shell.targetProfile() != nullptr);
+    assert(std::strcmp(shell.targetProfile()->ux_pack_id, "tab5_touch") == 0);
+    assert(std::strcmp(config.build_entrypoint, "builds/esp_idf") == 0);
+    assert(std::strcmp(config.component_sources,
+                       "builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake") == 0);
+    assert(std::strcmp(config.historical_root_name,
+                       "removed root esp_idf") == 0);
+    assert(std::strcmp(config.historical_role,
+                       "pre-refactor ESP-IDF/LVGL implementation root") == 0);
+    assert(std::strcmp(config.replacement_owner,
+                       "apps/esp32_lvgl + builds/esp_idf") == 0);
+    assert(ui_lvgl_ux::findUxPackById(shell.activeUxPackId()) != nullptr);
+
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack(shell.activeUxPackId(), menu));
+    assert(menu.size() > 0);
+    return 0;
+}
diff --git a/apps/esp32_lvgl/tests/esp32_lvgl_historical_source_descriptor_smoke.cpp b/apps/esp32_lvgl/tests/esp32_lvgl_historical_source_descriptor_smoke.cpp
new file mode 100644
index 00000000..cf724071
--- /dev/null
+++ b/apps/esp32_lvgl/tests/esp32_lvgl_historical_source_descriptor_smoke.cpp
@@ -0,0 +1,18 @@
+#include "esp32_lvgl_historical_source_descriptor.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    const auto& descriptor =
+        trailmate::apps::esp32_lvgl::esp32LvglHistoricalSourceDescriptor();
+
+    assert(std::strcmp(descriptor.historical_root_name,
+                       "removed root esp_idf") == 0);
+    assert(std::strcmp(descriptor.historical_role,
+                       "pre-refactor ESP-IDF/LVGL implementation root") == 0);
+    assert(std::strcmp(descriptor.replacement_owner,
+                       "apps/esp32_lvgl + builds/esp_idf") == 0);
+    return 0;
+}
diff --git a/apps/esp32_lvgl/tests/esp32_lvgl_loop_runtime_smoke.cpp b/apps/esp32_lvgl/tests/esp32_lvgl_loop_runtime_smoke.cpp
new file mode 100644
index 00000000..a380e458
--- /dev/null
+++ b/apps/esp32_lvgl/tests/esp32_lvgl_loop_runtime_smoke.cpp
@@ -0,0 +1,13 @@
+#include "esp32_lvgl_loop_runtime.h"
+
+#include <cassert>
+
+int main()
+{
+    auto config = trailmate::apps::esp32_lvgl::esp32LvglRuntimeConfig();
+    assert(trailmate::apps::esp32_lvgl::canStartEsp32LvglLoopRuntime(config));
+
+    config.loop_task_name = nullptr;
+    assert(!trailmate::apps::esp32_lvgl::canStartEsp32LvglLoopRuntime(config));
+    return 0;
+}
diff --git a/apps/esp32_lvgl/tests/esp32_lvgl_runtime_config_smoke.cpp b/apps/esp32_lvgl/tests/esp32_lvgl_runtime_config_smoke.cpp
new file mode 100644
index 00000000..ab9aa9cd
--- /dev/null
+++ b/apps/esp32_lvgl/tests/esp32_lvgl_runtime_config_smoke.cpp
@@ -0,0 +1,28 @@
+#include "esp32_lvgl_runtime_config.h"
+
+#include "product_composition/target_profile.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    const auto& config = trailmate::apps::esp32_lvgl::esp32LvglRuntimeConfig();
+    assert(config.target_id != nullptr);
+    assert(config.log_tag != nullptr);
+    assert(config.target_name != nullptr);
+    assert(config.loop_task_name != nullptr);
+    assert(config.loop_delay_ms == 10);
+    assert(config.loop_stack_size == 4096);
+    assert(config.loop_priority == 5);
+
+    assert(product_composition::findTargetProfile("tab5") != nullptr);
+    assert(product_composition::findTargetProfile("tdisplayp4_tft") != nullptr);
+    assert(product_composition::findTargetProfile("tdisplayp4_amoled") != nullptr);
+
+    if (std::strcmp(config.target_id, "esp_idf") != 0)
+    {
+        assert(trailmate::apps::esp32_lvgl::hasEsp32LvglRuntimeTargetProfile());
+    }
+    return 0;
+}
diff --git a/apps/esp32_lvgl/tests/esp32_lvgl_startup_runtime_smoke.cpp b/apps/esp32_lvgl/tests/esp32_lvgl_startup_runtime_smoke.cpp
new file mode 100644
index 00000000..47c82fc6
--- /dev/null
+++ b/apps/esp32_lvgl/tests/esp32_lvgl_startup_runtime_smoke.cpp
@@ -0,0 +1,13 @@
+#include "esp32_lvgl_startup_runtime.h"
+
+#include <cassert>
+
+int main()
+{
+    auto config = trailmate::apps::esp32_lvgl::esp32LvglRuntimeConfig();
+    assert(trailmate::apps::esp32_lvgl::canRunEsp32LvglStartupRuntime(config));
+
+    config.log_tag = nullptr;
+    assert(!trailmate::apps::esp32_lvgl::canRunEsp32LvglStartupRuntime(config));
+    return 0;
+}
diff --git a/apps/esp_idf/CMakeLists.txt b/apps/esp_idf/CMakeLists.txt
deleted file mode 100644
index 489e81b6..00000000
--- a/apps/esp_idf/CMakeLists.txt
+++ /dev/null
@@ -1,325 +0,0 @@
-#Shared ESP - IDF application component.
-#This component builds the migrated shared modules plus the shared IDF app shell.
-
-file(GLOB_RECURSE trail_mate_idf_local_sources
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.c
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.cc
-    ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp
-)
-
-file(GLOB_RECURSE trail_mate_idf_external_sources
-    ${CMAKE_SOURCE_DIR}/modules/core_sys/src/*.c
-    ${CMAKE_SOURCE_DIR}/modules/core_sys/src/*.cc
-    ${CMAKE_SOURCE_DIR}/modules/core_sys/src/*.cpp
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/src/*.c
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/src/*.cc
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/src/*.cpp
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/generated/*.c
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/generated/*.cc
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/generated/*.cpp
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/third_party/nanopb/*.c
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/third_party/nanopb/*.cc
-    ${CMAKE_SOURCE_DIR}/modules/core_chat/third_party/nanopb/*.cpp
-    ${CMAKE_SOURCE_DIR}/modules/core_gps/src/*.c
-    ${CMAKE_SOURCE_DIR}/modules/core_gps/src/*.cc
-    ${CMAKE_SOURCE_DIR}/modules/core_gps/src/*.cpp
-    ${CMAKE_SOURCE_DIR}/modules/core_hostlink/src/*.c
-    ${CMAKE_SOURCE_DIR}/modules/core_hostlink/src/*.cc
-    ${CMAKE_SOURCE_DIR}/modules/core_hostlink/src/*.cpp
-    ${CMAKE_SOURCE_DIR}/modules/core_team/src/*.c
-    ${CMAKE_SOURCE_DIR}/modules/core_team/src/*.cc
-    ${CMAKE_SOURCE_DIR}/modules/core_team/src/*.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/idf_common/src/*.c
-    ${CMAKE_SOURCE_DIR}/platform/esp/idf_common/src/*.cc
-    ${CMAKE_SOURCE_DIR}/platform/esp/idf_common/src/*.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/idf_common/src/gps_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/sys/event_bus.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/hostlink/hostlink_service.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/hostlink/hostlink_bridge_radio.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/hostlink/hostlink_config_service.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/sstv/decode_sstv.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/sstv/cordic.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/sstv/half_band_filter2.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/sstv/sstv_service.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/walkie/walkie_service.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/boards/src/board_runtime.cpp
-)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../../third_party/codec2/codec2_sources.cmake)
-list(APPEND trail_mate_idf_external_sources
-    ${trail_mate_codec2_sources}
-)
-
-set(trail_mate_idf_requires
-    esp_app_format
-    esp_common
-    esp_event
-    esp_http_client
-    esp_lcd
-    esp_netif
-    esp_timer
-    json
-    log
-    lvgl__lvgl
-    nvs_flash
-    fatfs
-    sdmmc
-    esp_driver_gpio
-    esp_driver_i2c
-    esp_driver_i2s
-    esp_driver_ledc
-    esp_driver_spi
-    esp_driver_uart
-    esp_driver_usb_serial_jtag
-    esp_wifi
-    espressif__esp_codec_dev
-    espressif__esp_lvgl_port
-    mbedtls
-)
-
-set(trail_mate_idf_ui_shared_sources
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/app_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/app_catalog_builder.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/formatters.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/i18n/resource_pack_registry.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/loop_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/startup_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/menu_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/ui_status.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/menu_profile.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/menu_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/ui_boot.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/widgets/top_bar.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/widgets/busy_overlay.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/widgets/system_notification.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/widgets/map/map_viewport.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/widgets/toast/toast_widget.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/widgets/ime/ime_widget.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/widgets/ime/pinyin_ime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/fonts/font_utils.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/components/air_status_footer.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/components/info_card.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/components/two_pane_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/components/two_pane_styles.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/components/two_pane_nav.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/page/page_profile.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/runtime/memory_profile.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/runtime/pack_repository.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/common/placeholder_page.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_compose_components.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_compose_input.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_compose_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_compose_styles.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_conversation_input.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_conversation_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_conversation_styles.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_message_list_components.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_message_list_input.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_message_list_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_message_list_styles.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_protocol_support.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_send_flow.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/gnss/gnss_skyplot_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/gnss/gnss_skyplot_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/gps/gps_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_modal.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_page_components.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_page_input.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_page_layout.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_page_lifetime.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_page_map.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_page_styles.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_route_overlay.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/screens/gps/gps_tracker_overlay.cpp
-    ${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/src/ui/widgets/map/map_tiles.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/energy_sweep/energy_sweep_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/energy_sweep/energy_sweep_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/extensions/extensions_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/extensions/extensions_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/sstv/sstv_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/sstv/sstv_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/pc_link/pc_link_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/pc_link/pc_link_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/usb/usb_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/usb/usb_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/settings/settings_page_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/settings/settings_page_styles.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/settings/settings_page_input.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/settings/settings_page_components.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/settings/settings_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/settings/settings_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/settings/settings_state.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/contacts/contacts_page_components.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/contacts/contacts_page_input.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/contacts/contacts_page_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/contacts/contacts_page_styles.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/contacts/contacts_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/contacts/contacts_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/contacts/contacts_state.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/node_info/node_info_page_components.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/node_info/node_info_page_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/tracker/tracker_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/tracker/tracker_page_runtime.cpp
-    
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/tracker/tracker_page_components.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/tracker/tracker_page_input.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/tracker/tracker_page_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/tracker/tracker_state.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/team/team_page_input.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/team/team_page_layout.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/team/team_page_styles.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/team/team_page_components.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/team/team_state.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/team/team_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/team/team_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/walkie_talkie/walkie_talkie_page_shell.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/screens/walkie_talkie/walkie_talkie_page_runtime.cpp
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/logo.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/alert.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/AreaCleared.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/BaseCamp.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/Chat.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/GoodFind.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/gps.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/room-24px.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/gps_topbar.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/message_topbar.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/route_topbar.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/team_topbar.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/tracker_topbar.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/wifi_topbar.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/ble_topbar.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/Satellite.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/contact.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/ext.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/rally.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/Spectrum.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/sos.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/team.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/tracker.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/rf.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/sstv.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/img_usb.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/walkie_talkie.c
-    ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/assets/Setting.c
-)
-
-set(trail_mate_idf_include_dirs
-    "include"
-    "${CMAKE_SOURCE_DIR}/platform/shared/include"
-    "${CMAKE_SOURCE_DIR}/boards/tab5/include"
-    "${CMAKE_SOURCE_DIR}/boards/t_display_p4/include"
-    "${CMAKE_SOURCE_DIR}/modules/ui_shared/include"
-    "${CMAKE_SOURCE_DIR}/modules/core_sys/include"
-    "${CMAKE_SOURCE_DIR}/modules/core_chat/include"
-    "${CMAKE_SOURCE_DIR}/modules/core_chat/generated"
-    "${CMAKE_SOURCE_DIR}/modules/core_chat/third_party/nanopb"
-    "${CMAKE_SOURCE_DIR}/modules/core_gps/include"
-    "${CMAKE_SOURCE_DIR}/modules/core_hostlink/include"
-    "${CMAKE_SOURCE_DIR}/modules/core_team/include"
-    "${CMAKE_SOURCE_DIR}/platform/esp/idf_common/include"
-    "${CMAKE_SOURCE_DIR}/platform/esp/arduino_common/include"
-    "${CMAKE_SOURCE_DIR}/platform/esp/common/include"
-    "${CMAKE_SOURCE_DIR}/third_party/codec2/src"
-    "${CMAKE_SOURCE_DIR}/platform/esp/boards/include"
-)
-
-if(TRAIL_MATE_IDF_TARGET STREQUAL "tab5")
-    set(trail_mate_dashboard_sources
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/menu_dashboard.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_state.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_style.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_mesh_widget.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_recent_widget.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_compass_widget.cpp
-    )
-    list(APPEND trail_mate_idf_include_dirs
-        "${CMAKE_SOURCE_DIR}/platform/esp/idf_components/m5stack_tab5/include"
-        "${CMAKE_SOURCE_DIR}/platform/esp/idf_components/sensor_bmi270/include"
-    )
-    list(APPEND trail_mate_idf_requires
-        m5stack_tab5
-        sensor_bmi270
-    )
-    list(APPEND trail_mate_idf_external_sources
-        ${CMAKE_SOURCE_DIR}/boards/tab5/src/tab5_board.cpp
-        ${CMAKE_SOURCE_DIR}/boards/tab5/src/rtc_runtime.cpp
-        ${CMAKE_SOURCE_DIR}/boards/tab5/src/heading_runtime.cpp
-        ${CMAKE_SOURCE_DIR}/boards/tab5/src/codec_compat.cpp
-    )
-    list(APPEND trail_mate_idf_ui_shared_sources
-        ${trail_mate_dashboard_sources}
-    )
-elseif(TRAIL_MATE_IDF_TARGET STREQUAL "t_display_p4_tft" OR
-       TRAIL_MATE_IDF_TARGET STREQUAL "t_display_p4_amoled")
-    set(trail_mate_dashboard_sources
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/menu_dashboard.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_state.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_style.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_mesh_widget.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_recent_widget.cpp
-        ${CMAKE_SOURCE_DIR}/modules/ui_shared/src/ui/menu/dashboard/dashboard_compass_widget.cpp
-    )
-    list(APPEND trail_mate_idf_include_dirs
-        "${CMAKE_SOURCE_DIR}/platform/esp/idf_components/t_display_p4/include"
-    )
-    list(APPEND trail_mate_idf_requires
-        t_display_p4
-    )
-    list(APPEND trail_mate_idf_external_sources
-        ${CMAKE_SOURCE_DIR}/boards/t_display_p4/src/t_display_p4_board.cpp
-        ${CMAKE_SOURCE_DIR}/boards/t_display_p4/src/rtc_runtime.cpp
-    )
-    list(APPEND trail_mate_idf_ui_shared_sources
-        ${trail_mate_dashboard_sources}
-    )
-endif()
-
-list(FILTER trail_mate_idf_external_sources EXCLUDE REGEX ".*/modules/core_chat/src/infra/meshcore/meshcore_protocol_helpers\.cpp$")
-list(FILTER trail_mate_idf_external_sources EXCLUDE REGEX ".*/modules/core_chat/src/infra/meshtastic/mt_packet_wire\.cpp$")
-list(FILTER trail_mate_idf_external_sources EXCLUDE REGEX ".*/modules/core_chat/src/infra/meshtastic/mt_pki_crypto\.cpp$")
-list(FILTER trail_mate_idf_external_sources EXCLUDE REGEX ".*/modules/core_chat/src/ble/.*\.cpp$")
-list(FILTER trail_mate_idf_local_sources EXCLUDE REGEX ".*/src/idf_component_anchor\.cpp$")
-list(FILTER trail_mate_idf_local_sources EXCLUDE REGEX ".*/src/gps_tracker_overlay\.cpp$")
-
-idf_component_register(
-    SRCS "src/idf_component_anchor.cpp"
-    INCLUDE_DIRS
-        ${trail_mate_idf_include_dirs}
-    REQUIRES
-        ${trail_mate_idf_requires}
-)
-
-target_sources(${COMPONENT_LIB} PRIVATE
-    ${trail_mate_idf_local_sources}
-    ${trail_mate_idf_external_sources}
-    ${trail_mate_idf_ui_shared_sources}
-)
-
-if(TRAIL_MATE_IDF_TARGET STREQUAL "tab5")
-    target_compile_definitions(${COMPONENT_LIB} PRIVATE
-        TRAIL_MATE_ESP_BOARD_TAB5=1
-        TRAIL_MATE_LORA_TX_POWER_MAX_DBM=22
-    )
-elseif(TRAIL_MATE_IDF_TARGET STREQUAL "t_display_p4_tft")
-    target_compile_definitions(${COMPONENT_LIB} PRIVATE
-        TRAIL_MATE_ESP_BOARD_T_DISPLAY_P4=1
-        TRAIL_MATE_ESP_BOARD_T_DISPLAY_P4_TFT=1
-        TRAIL_MATE_LORA_TX_POWER_MAX_DBM=22
-    )
-elseif(TRAIL_MATE_IDF_TARGET STREQUAL "t_display_p4_amoled")
-    target_compile_definitions(${COMPONENT_LIB} PRIVATE
-        TRAIL_MATE_ESP_BOARD_T_DISPLAY_P4=1
-        TRAIL_MATE_ESP_BOARD_T_DISPLAY_P4_AMOLED=1
-        TRAIL_MATE_LORA_TX_POWER_MAX_DBM=22
-    )
-else()
-    message(FATAL_ERROR "Unsupported TRAIL_MATE_IDF_TARGET='${TRAIL_MATE_IDF_TARGET}' inside apps/esp_idf/CMakeLists.txt")
-endif()
diff --git a/apps/esp_idf/README.md b/apps/esp_idf/README.md
deleted file mode 100644
index ef02bdd9..00000000
--- a/apps/esp_idf/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# `apps/esp_idf`
-
-Common ESP-IDF application shell root.
-
-Purpose:
-
-- hold the shared ESP-IDF app-shell composition that is not tied to a single board
-- be the canonical ESP-IDF component root for the repository
-- host multiple IDF targets under `targets/` instead of growing one full app shell per board
-
-Dependency shape:
-
-- `apps/esp_idf/*` owns target-independent IDF app assembly
-- `apps/esp_idf/targets/<board>/*` owns target metadata such as `sdkconfig.defaults`, partitions, and board selection intent
-- `platform/esp/idf_common/*` owns shared IDF platform glue
-- `platform/esp/boards/<board>/*` owns board-specific pin/runtime capabilities
-
-Current status:
-
-- this directory is now the active ESP-IDF component root
-- board choice is selected by the top-level `TRAIL_MATE_IDF_TARGET` CMake cache variable
-- generated `sdkconfig` files now live under the chosen build directory instead of the source root, so `build.tab5` / `build.t_display_p4_tft` / `build.t_display_p4_amoled` do not reuse stale `sdkconfig.<target>` artifacts
-- shared `app_main()`, `runtime_config`, `app_registry`, `app_runtime_access`, `app_facade_runtime`, `loop_runtime`, and `startup_runtime` now live here
-- `startup_runtime` and `loop_runtime` are now thin adapters; the reusable boot/menu shell lives in `modules/ui_shared/src/ui/startup_shell.cpp` and the loop skeleton lives in `modules/ui_shared/src/ui/loop_shell.cpp`
-- `app_runtime_access` is now a thin status facade and uses `platform/esp/idf_common/app_runtime_support` for lifecycle ticking
-- IDF now compiles the full shared startup/menu/status runtime instead of the temporary skeleton path
-- unsupported capability pages are hidden from the IDF main menu instead of showing placeholder business pages
-- `targets/tab5`, `targets/t_display_p4_tft`, and `targets/t_display_p4_amoled` are the real IDF targets wired into this shared shell
-- `apps/esp_idf/src` no longer carries page implementations; page code now lives under `modules/ui_shared`
-- retired ESP-IDF compatibility stub files have been removed; the component anchor now lives in `src/idf_component_anchor.cpp`
-
-Recommended invocation:
-
-- `idf.py -B build.tab5 -DTRAIL_MATE_IDF_TARGET=tab5 reconfigure build`
-- `idf.py -B build.tab5 -DTRAIL_MATE_IDF_TARGET=tab5 -p COM6 flash`
-- for Tab5, prefer starting `monitor` separately after a manual `RESET` press instead of chaining `flash monitor`, because auto-reset can leave ESP32-P4 in ROM download mode
-- do not rely on a source-root `sdkconfig.tab5`; the build directory now owns the generated config state
-- VS Code workspace tasks now provide split `Tab5`, `T-Display-P4 TFT`, and `T-Display-P4 AMOLED` task entries through `tools/vscode/run_idf_task.ps1`
diff --git a/apps/esp_idf/idf_component.yml b/apps/esp_idf/idf_component.yml
deleted file mode 100644
index 38f07b59..00000000
--- a/apps/esp_idf/idf_component.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies:
-  espressif/esp_tinyusb: "^1.4.2"
-  idf: "^5.4"
diff --git a/apps/esp_idf/include/apps/esp_idf/app_facade_runtime.h b/apps/esp_idf/include/apps/esp_idf/app_facade_runtime.h
deleted file mode 100644
index afa0ac85..00000000
--- a/apps/esp_idf/include/apps/esp_idf/app_facade_runtime.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include "apps/esp_idf/runtime_config.h"
-
-namespace apps::esp_idf::app_facade_runtime
-{
-
-bool initialize(const RuntimeConfig& config);
-void tick();
-bool isBound();
-
-} // namespace apps::esp_idf::app_facade_runtime
diff --git a/apps/esp_idf/include/apps/esp_idf/app_runtime_access.h b/apps/esp_idf/include/apps/esp_idf/app_runtime_access.h
deleted file mode 100644
index f9158d06..00000000
--- a/apps/esp_idf/include/apps/esp_idf/app_runtime_access.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "apps/esp_idf/runtime_config.h"
-
-namespace apps::esp_idf::app_runtime_access
-{
-
-struct Status
-{
-    bool initialized = false;
-    bool board_handles_ready = false;
-    bool lifecycle_ready = false;
-    bool app_context_bound = false;
-};
-
-void initialize(const RuntimeConfig& config);
-void tick();
-const Status& status();
-
-} // namespace apps::esp_idf::app_runtime_access
diff --git a/apps/esp_idf/include/apps/esp_idf/loop_runtime.h b/apps/esp_idf/include/apps/esp_idf/loop_runtime.h
deleted file mode 100644
index 5dc7d62a..00000000
--- a/apps/esp_idf/include/apps/esp_idf/loop_runtime.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "apps/esp_idf/runtime_config.h"
-
-namespace apps::esp_idf::loop_runtime
-{
-
-void start(const RuntimeConfig& config);
-
-} // namespace apps::esp_idf::loop_runtime
\ No newline at end of file
diff --git a/apps/esp_idf/include/apps/esp_idf/runtime_config.h b/apps/esp_idf/include/apps/esp_idf/runtime_config.h
deleted file mode 100644
index 5068fd82..00000000
--- a/apps/esp_idf/include/apps/esp_idf/runtime_config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-namespace apps::esp_idf
-{
-
-struct RuntimeConfig
-{
-    const char* log_tag = "trail-mate-idf";
-    const char* target_name = "esp-idf";
-    const char* loop_task_name = "idf_app_loop";
-    uint32_t loop_delay_ms = 10;
-    uint32_t loop_stack_size = 4096;
-    uint32_t loop_priority = 5;
-};
-
-namespace runtime_config
-{
-
-const RuntimeConfig& get();
-
-} // namespace runtime_config
-
-} // namespace apps::esp_idf
diff --git a/apps/esp_idf/include/apps/esp_idf/startup_runtime.h b/apps/esp_idf/include/apps/esp_idf/startup_runtime.h
deleted file mode 100644
index 2e55a51e..00000000
--- a/apps/esp_idf/include/apps/esp_idf/startup_runtime.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "apps/esp_idf/runtime_config.h"
-
-namespace apps::esp_idf::startup_runtime
-{
-
-void run(const RuntimeConfig& config);
-
-} // namespace apps::esp_idf::startup_runtime
\ No newline at end of file
diff --git a/apps/esp_idf/src/app_facade_runtime.cpp b/apps/esp_idf/src/app_facade_runtime.cpp
deleted file mode 100644
index 9e38630d..00000000
--- a/apps/esp_idf/src/app_facade_runtime.cpp
+++ /dev/null
@@ -1,1705 +0,0 @@
-#include "apps/esp_idf/app_facade_runtime.h"
-#include "apps/esp_idf/meshtastic_radio_adapter.h"
-
-#include "app/app_config.h"
-#include "app/app_facade_access.h"
-#include "app/app_facades.h"
-#include "chat/domain/chat_model.h"
-#include "chat/infra/contact_store_core.h"
-#include "chat/infra/mesh_adapter_router_core.h"
-#include "chat/infra/node_store_core.h"
-#include "chat/infra/store/ram_store.h"
-#include "chat/usecase/chat_service.h"
-#include "chat/usecase/contact_service.h"
-#include "esp_log.h"
-#include "platform/esp/boards/board_runtime.h"
-#include "platform/ui/gps_runtime.h"
-#include "platform/ui/team_ui_store_runtime.h"
-#include "sys/clock.h"
-#include "sys/event_bus.h"
-#include "team/usecase/team_controller.h"
-#include "team/usecase/team_pairing_service.h"
-#include "team/usecase/team_service.h"
-#include "ui/chat_ui_runtime.h"
-#include "ui/screens/team/team_page_shell.h"
-
-#include <algorithm>
-#include <array>
-#include <cctype>
-#include <cstdio>
-#include <cstring>
-#include <ctime>
-#include <memory>
-#include <mutex>
-#include <utility>
-#include <vector>
-
-namespace apps::esp_idf::app_facade_runtime
-{
-namespace
-{
-
-class InMemoryNodeBlobStore final : public chat::contacts::INodeBlobStore
-{
-  public:
-    bool loadBlob(std::vector<uint8_t>& out) override
-    {
-        out = blob_;
-        return !blob_.empty();
-    }
-
-    bool saveBlob(const uint8_t* data, size_t len) override
-    {
-        if (!data || len == 0)
-        {
-            blob_.clear();
-            return true;
-        }
-
-        blob_.assign(data, data + len);
-        return true;
-    }
-
-    void clearBlob() override
-    {
-        blob_.clear();
-    }
-
-  private:
-    std::vector<uint8_t> blob_;
-};
-
-class InMemoryContactBlobStore final : public chat::IContactBlobStore
-{
-  public:
-    bool loadBlob(std::vector<uint8_t>& out) override
-    {
-        out = blob_;
-        return !blob_.empty();
-    }
-
-    bool saveBlob(const uint8_t* data, size_t len) override
-    {
-        if (!data || len == 0)
-        {
-            blob_.clear();
-            return true;
-        }
-
-        blob_.assign(data, data + len);
-        return true;
-    }
-
-  private:
-    std::vector<uint8_t> blob_;
-};
-
-class LoopbackMeshAdapter final : public chat::IMeshAdapter
-{
-  public:
-    explicit LoopbackMeshAdapter(chat::NodeId self_node_id)
-        : self_node_id_(self_node_id)
-    {
-    }
-
-    chat::MeshCapabilities getCapabilities() const override
-    {
-        chat::MeshCapabilities caps{};
-        caps.supports_unicast_text = true;
-        caps.supports_unicast_appdata = true;
-        caps.supports_node_info = true;
-        caps.supports_pki = true;
-        return caps;
-    }
-
-    bool sendText(chat::ChannelId channel, const std::string& text,
-                  chat::MessageId* out_msg_id, chat::NodeId peer) override
-    {
-        (void)channel;
-        (void)peer;
-
-        if (text.empty())
-        {
-            if (out_msg_id)
-            {
-                *out_msg_id = 0;
-            }
-            return false;
-        }
-
-        chat::MessageId msg_id = 0;
-        {
-            std::lock_guard<std::mutex> lock(mutex_);
-            msg_id = next_msg_id_++;
-            pending_send_results_.push_back(msg_id);
-        }
-
-        if (out_msg_id)
-        {
-            *out_msg_id = msg_id;
-        }
-        return true;
-    }
-
-    bool pollIncomingText(chat::MeshIncomingText* out) override
-    {
-        (void)out;
-        return false;
-    }
-
-    bool sendAppData(chat::ChannelId channel, uint32_t portnum,
-                     const uint8_t* payload, size_t len,
-                     chat::NodeId dest, bool want_ack,
-                     chat::MessageId packet_id,
-                     bool want_response) override
-    {
-        (void)channel;
-        (void)portnum;
-        (void)dest;
-        (void)want_ack;
-        (void)packet_id;
-        (void)want_response;
-        return payload && len > 0;
-    }
-
-    bool pollIncomingData(chat::MeshIncomingData* out) override
-    {
-        (void)out;
-        return false;
-    }
-
-    void applyConfig(const chat::MeshConfig& config) override
-    {
-        config_ = config;
-    }
-
-    bool isReady() const override
-    {
-        return true;
-    }
-
-    bool pollIncomingRawPacket(uint8_t* out_data, size_t& out_len, size_t max_len) override
-    {
-        (void)out_data;
-        (void)max_len;
-        out_len = 0;
-        return false;
-    }
-
-    chat::NodeId getNodeId() const override
-    {
-        return self_node_id_;
-    }
-
-    bool requestNodeInfo(chat::NodeId dest, bool want_response) override
-    {
-        (void)dest;
-        (void)want_response;
-        return true;
-    }
-
-    bool startKeyVerification(chat::NodeId dest) override
-    {
-        (void)dest;
-        return true;
-    }
-
-    bool submitKeyVerificationNumber(chat::NodeId dest, uint64_t nonce, uint32_t number) override
-    {
-        (void)dest;
-        (void)nonce;
-        (void)number;
-        return true;
-    }
-
-    void setUserInfo(const char* long_name, const char* short_name) override
-    {
-        copyString(long_name, long_name_, sizeof(long_name_));
-        copyString(short_name, short_name_, sizeof(short_name_));
-    }
-
-    bool drainSendResults(std::vector<chat::MessageId>& out)
-    {
-        std::lock_guard<std::mutex> lock(mutex_);
-        if (pending_send_results_.empty())
-        {
-            return false;
-        }
-        out.swap(pending_send_results_);
-        return true;
-    }
-
-  private:
-    static void copyString(const char* src, char* dst, size_t dst_len)
-    {
-        if (!dst || dst_len == 0)
-        {
-            return;
-        }
-
-        if (!src)
-        {
-            dst[0] = '\0';
-            return;
-        }
-
-        const size_t copy_len = std::min(std::strlen(src), dst_len - 1);
-        std::memcpy(dst, src, copy_len);
-        dst[copy_len] = '\0';
-    }
-
-    mutable std::mutex mutex_;
-    std::vector<chat::MessageId> pending_send_results_;
-    chat::MeshConfig config_{};
-    chat::NodeId self_node_id_ = 0;
-    chat::MessageId next_msg_id_ = 1;
-    char long_name_[32] = {};
-    char short_name_[16] = {};
-};
-
-class MinimalTeamRuntime final : public team::ITeamRuntime
-{
-  public:
-    uint32_t nowMillis() override
-    {
-        return sys::millis_now();
-    }
-
-    uint32_t nowUnixSeconds() override
-    {
-        return sys::millis_now() / 1000U;
-    }
-
-    void fillRandomBytes(uint8_t* out, size_t len) override
-    {
-        if (!out)
-        {
-            return;
-        }
-
-        if (rng_state_ == 0)
-        {
-            rng_state_ = sys::millis_now() ^ 0x13579BDFu;
-            if (rng_state_ == 0)
-            {
-                rng_state_ = 0x2468ACE1u;
-            }
-        }
-
-        for (size_t index = 0; index < len; ++index)
-        {
-            rng_state_ ^= (rng_state_ << 13);
-            rng_state_ ^= (rng_state_ >> 17);
-            rng_state_ ^= (rng_state_ << 5);
-            out[index] = static_cast<uint8_t>(rng_state_ & 0xFFu);
-        }
-    }
-
-  private:
-    uint32_t rng_state_ = 0;
-};
-
-class MinimalTeamCrypto final : public team::ITeamCrypto
-{
-  public:
-    bool deriveKey(const uint8_t* key, size_t key_len,
-                   const char* info,
-                   uint8_t* out, size_t out_len) override
-    {
-        if (!key || key_len == 0 || !info || !out || out_len == 0)
-        {
-            return false;
-        }
-
-        uint32_t state = 0x811C9DC5u;
-        mixBytes(state, key, key_len);
-        mixBytes(state,
-                 reinterpret_cast<const uint8_t*>(info),
-                 std::strlen(info));
-        for (size_t index = 0; index < out_len; ++index)
-        {
-            state ^= (state << 13);
-            state ^= (state >> 17);
-            state ^= (state << 5);
-            out[index] = static_cast<uint8_t>((state >> ((index & 0x3u) * 8)) & 0xFFu);
-        }
-        return true;
-    }
-
-    bool aeadEncrypt(const uint8_t* key, size_t key_len,
-                     const uint8_t* nonce, size_t nonce_len,
-                     const uint8_t* aad, size_t aad_len,
-                     const uint8_t* plain, size_t plain_len,
-                     std::vector<uint8_t>& out_cipher) override
-    {
-        if (!key || key_len == 0 || !nonce || nonce_len == 0 || !plain)
-        {
-            return false;
-        }
-
-        out_cipher.assign(plain_len + kPseudoTagSize, 0);
-        for (size_t index = 0; index < plain_len; ++index)
-        {
-            out_cipher[index] = plain[index] ^ streamByte(key, key_len, nonce, nonce_len, aad, aad_len, index);
-        }
-
-        uint8_t tag[kPseudoTagSize] = {};
-        computeTag(key, key_len, nonce, nonce_len, aad, aad_len,
-                   out_cipher.data(), plain_len, tag);
-        std::memcpy(out_cipher.data() + plain_len, tag, kPseudoTagSize);
-        return true;
-    }
-
-    bool aeadDecrypt(const uint8_t* key, size_t key_len,
-                     const uint8_t* nonce, size_t nonce_len,
-                     const uint8_t* aad, size_t aad_len,
-                     const uint8_t* cipher, size_t cipher_len,
-                     std::vector<uint8_t>& out_plain) override
-    {
-        if (!key || key_len == 0 || !nonce || nonce_len == 0 || !cipher || cipher_len < kPseudoTagSize)
-        {
-            return false;
-        }
-
-        const size_t plain_len = cipher_len - kPseudoTagSize;
-        const uint8_t* tag = cipher + plain_len;
-        uint8_t expected[kPseudoTagSize] = {};
-        computeTag(key, key_len, nonce, nonce_len, aad, aad_len, cipher, plain_len, expected);
-        if (std::memcmp(tag, expected, kPseudoTagSize) != 0)
-        {
-            out_plain.clear();
-            return false;
-        }
-
-        out_plain.assign(plain_len, 0);
-        for (size_t index = 0; index < plain_len; ++index)
-        {
-            out_plain[index] = cipher[index] ^ streamByte(key, key_len, nonce, nonce_len, aad, aad_len, index);
-        }
-        return true;
-    }
-
-  private:
-    static constexpr size_t kPseudoTagSize = 16;
-
-    static void mixBytes(uint32_t& state, const uint8_t* data, size_t len)
-    {
-        if (!data)
-        {
-            return;
-        }
-
-        for (size_t index = 0; index < len; ++index)
-        {
-            state ^= data[index];
-            state *= 16777619u;
-            state ^= (state >> 13);
-        }
-    }
-
-    static uint8_t streamByte(const uint8_t* key, size_t key_len,
-                              const uint8_t* nonce, size_t nonce_len,
-                              const uint8_t* aad, size_t aad_len,
-                              size_t index)
-    {
-        uint8_t value = key[index % key_len] ^ nonce[index % nonce_len] ^ static_cast<uint8_t>(index * 31u);
-        if (aad && aad_len > 0)
-        {
-            value ^= aad[index % aad_len];
-        }
-        value ^= static_cast<uint8_t>((index >> 3) & 0xFFu);
-        return value;
-    }
-
-    static void computeTag(const uint8_t* key, size_t key_len,
-                           const uint8_t* nonce, size_t nonce_len,
-                           const uint8_t* aad, size_t aad_len,
-                           const uint8_t* cipher, size_t cipher_len,
-                           uint8_t out[kPseudoTagSize])
-    {
-        uint32_t state = 0x9E3779B9u;
-        mixBytes(state, key, key_len);
-        mixBytes(state, nonce, nonce_len);
-        mixBytes(state, aad, aad_len);
-        mixBytes(state, cipher, cipher_len);
-        for (size_t index = 0; index < kPseudoTagSize; ++index)
-        {
-            state ^= (state << 13);
-            state ^= (state >> 17);
-            state ^= (state << 5);
-            out[index] = static_cast<uint8_t>((state >> ((index & 0x3u) * 8)) & 0xFFu);
-        }
-    }
-};
-
-class MinimalTeamEventSink final : public team::ITeamEventSink
-{
-  public:
-    void onTeamKick(const team::TeamKickEvent& event) override { (void)event; }
-    void onTeamTransferLeader(const team::TeamTransferLeaderEvent& event) override { (void)event; }
-    void onTeamKeyDist(const team::TeamKeyDistEvent& event) override { (void)event; }
-    void onTeamStatus(const team::TeamStatusEvent& event) override { (void)event; }
-    void onTeamPosition(const team::TeamPositionEvent& event) override { (void)event; }
-    void onTeamWaypoint(const team::TeamWaypointEvent& event) override { (void)event; }
-    void onTeamTrack(const team::TeamTrackEvent& event) override { (void)event; }
-    void onTeamChat(const team::TeamChatEvent& event) override { (void)event; }
-    void onTeamError(const team::TeamErrorEvent& event) override { (void)event; }
-};
-
-class MinimalTeamPairingService final : public team::TeamPairingService
-{
-  public:
-    void setIdentity(uint32_t self_node_id, const char* self_name)
-    {
-        self_node_id_ = self_node_id;
-        copyString(self_name, self_name_, sizeof(self_name_));
-    }
-
-    bool startLeader(const team::TeamId& team_id,
-                     uint32_t key_id,
-                     const uint8_t* psk,
-                     size_t psk_len,
-                     uint32_t leader_id,
-                     const char* team_name) override
-    {
-        if (leader_id == 0 || !psk || psk_len == 0)
-        {
-            return false;
-        }
-
-        resetStatus();
-        self_node_id_ = leader_id;
-        status_.role = team::TeamPairingRole::Leader;
-        status_.state = team::TeamPairingState::LeaderBeacon;
-        status_.team_id = team_id;
-        status_.has_team_id = true;
-        status_.key_id = key_id;
-        status_.peer_id = leader_id;
-        copyTeamName(team_name);
-        copyPsk(psk, psk_len);
-        phase_started_ms_ = sys::millis_now();
-
-        team::ui::TeamUiSnapshot snapshot = loadOrDefaultSnapshot();
-        const uint32_t now_s = phase_started_ms_ / 1000U;
-        snapshot.in_team = true;
-        snapshot.pending_join = true;
-        snapshot.pending_join_started_s = now_s;
-        snapshot.kicked_out = false;
-        snapshot.self_is_leader = true;
-        snapshot.team_id = team_id;
-        snapshot.has_team_id = true;
-        snapshot.security_round = key_id;
-        snapshot.last_update_s = now_s;
-        if (status_.has_team_name)
-        {
-            snapshot.team_name = status_.team_name;
-        }
-        applyPsk(snapshot);
-        ensureMember(snapshot, leader_id, selfDisplayName(), true, now_s);
-        saveSnapshot(snapshot);
-        return true;
-    }
-
-    bool startMember(uint32_t self_id) override
-    {
-        if (self_id == 0)
-        {
-            return false;
-        }
-
-        resetStatus();
-        self_node_id_ = self_id;
-
-        team::ui::TeamUiSnapshot snapshot = loadOrDefaultSnapshot();
-        if (!snapshot.has_team_id)
-        {
-            snapshot.team_id = {0x54, 0x4D, 0x35, 0x2D, 0x4A, 0x4F, 0x49, 0x4E};
-            snapshot.has_team_id = true;
-        }
-        if (snapshot.team_name.empty())
-        {
-            snapshot.team_name = "Tab5 Demo";
-        }
-        if (snapshot.security_round == 0)
-        {
-            snapshot.security_round = 1;
-        }
-        if (!snapshot.has_team_psk)
-        {
-            for (size_t i = 0; i < snapshot.team_psk.size(); ++i)
-            {
-                snapshot.team_psk[i] = static_cast<uint8_t>(0x40 + (i & 0x3F));
-            }
-            snapshot.has_team_psk = true;
-        }
-
-        status_.role = team::TeamPairingRole::Member;
-        status_.state = team::TeamPairingState::MemberScanning;
-        status_.team_id = snapshot.team_id;
-        status_.has_team_id = true;
-        status_.key_id = snapshot.security_round;
-        status_.peer_id = leaderIdFromSnapshot(snapshot);
-        copyTeamName(snapshot.team_name.c_str());
-        copyPsk(snapshot.team_psk.data(), snapshot.team_psk.size());
-        phase_started_ms_ = sys::millis_now();
-
-        const uint32_t now_s = phase_started_ms_ / 1000U;
-        snapshot.in_team = false;
-        snapshot.pending_join = true;
-        snapshot.pending_join_started_s = now_s;
-        snapshot.kicked_out = false;
-        snapshot.self_is_leader = false;
-        snapshot.last_update_s = now_s;
-        ensureMember(snapshot, self_id, selfDisplayName(), false, now_s);
-        saveSnapshot(snapshot);
-        return true;
-    }
-
-    void stop() override
-    {
-        if (status_.state != team::TeamPairingState::Idle)
-        {
-            team::ui::TeamUiSnapshot snapshot = loadOrDefaultSnapshot();
-            snapshot.pending_join = false;
-            snapshot.pending_join_started_s = 0;
-            snapshot.last_update_s = sys::millis_now() / 1000U;
-            if (status_.role == team::TeamPairingRole::Member &&
-                status_.state != team::TeamPairingState::Completed)
-            {
-                snapshot.in_team = false;
-                snapshot.self_is_leader = false;
-            }
-            saveSnapshot(snapshot);
-        }
-        resetStatus();
-    }
-
-    void update() override
-    {
-        if (status_.state == team::TeamPairingState::Idle ||
-            status_.state == team::TeamPairingState::Completed ||
-            status_.state == team::TeamPairingState::Failed)
-        {
-            return;
-        }
-
-        const uint32_t now_ms = sys::millis_now();
-        const uint32_t now_s = now_ms / 1000U;
-        const uint32_t elapsed_ms = now_ms - phase_started_ms_;
-
-        if (status_.role == team::TeamPairingRole::Leader)
-        {
-            if (status_.state == team::TeamPairingState::LeaderBeacon &&
-                elapsed_ms >= kLeaderCompleteDelayMs)
-            {
-                completeLeader(now_s);
-            }
-            return;
-        }
-
-        if (status_.role != team::TeamPairingRole::Member)
-        {
-            return;
-        }
-
-        if (status_.state == team::TeamPairingState::MemberScanning &&
-            elapsed_ms >= kMemberScanDelayMs)
-        {
-            status_.state = team::TeamPairingState::JoinSent;
-            phase_started_ms_ = now_ms;
-            persistPendingSnapshot(now_s);
-            return;
-        }
-
-        if (status_.state == team::TeamPairingState::JoinSent &&
-            elapsed_ms >= kMemberJoinDelayMs)
-        {
-            status_.state = team::TeamPairingState::WaitingKey;
-            phase_started_ms_ = now_ms;
-            persistPendingSnapshot(now_s);
-            return;
-        }
-
-        if (status_.state == team::TeamPairingState::WaitingKey &&
-            elapsed_ms >= kMemberKeyDelayMs)
-        {
-            completeMember(now_s);
-        }
-    }
-
-    team::TeamPairingStatus getStatus() const override
-    {
-        return status_;
-    }
-
-  private:
-    static constexpr uint32_t kLeaderCompleteDelayMs = 2500;
-    static constexpr uint32_t kMemberScanDelayMs = 1000;
-    static constexpr uint32_t kMemberJoinDelayMs = 1200;
-    static constexpr uint32_t kMemberKeyDelayMs = 1200;
-
-    static void copyString(const char* src, char* dst, size_t dst_len)
-    {
-        if (!dst || dst_len == 0)
-        {
-            return;
-        }
-
-        if (!src)
-        {
-            dst[0] = '\0';
-            return;
-        }
-
-        const size_t copy_len = std::min(std::strlen(src), dst_len - 1);
-        std::memcpy(dst, src, copy_len);
-        dst[copy_len] = '\0';
-    }
-
-    void copyTeamName(const char* team_name)
-    {
-        copyString(team_name, status_.team_name, sizeof(status_.team_name));
-        status_.has_team_name = status_.team_name[0] != '\0';
-    }
-
-    void copyPsk(const uint8_t* psk, size_t psk_len)
-    {
-        psk_.fill(0);
-        has_psk_ = psk && psk_len > 0;
-        if (!has_psk_)
-        {
-            return;
-        }
-
-        const size_t copy_len = std::min(psk_len, psk_.size());
-        std::copy_n(psk, copy_len, psk_.begin());
-    }
-
-    void applyPsk(team::ui::TeamUiSnapshot& snapshot) const
-    {
-        if (!has_psk_)
-        {
-            return;
-        }
-        snapshot.team_psk = psk_;
-        snapshot.has_team_psk = true;
-    }
-
-    team::ui::TeamUiSnapshot loadOrDefaultSnapshot() const
-    {
-        team::ui::TeamUiSnapshot snapshot{};
-        if (team::ui::team_ui_get_store().load(snapshot))
-        {
-            return snapshot;
-        }
-
-        snapshot.has_team_id = status_.has_team_id;
-        snapshot.team_id = status_.team_id;
-        snapshot.security_round = status_.key_id;
-        if (status_.has_team_name)
-        {
-            snapshot.team_name = status_.team_name;
-        }
-        applyPsk(snapshot);
-        return snapshot;
-    }
-
-    void saveSnapshot(const team::ui::TeamUiSnapshot& snapshot) const
-    {
-        team::ui::team_ui_get_store().save(snapshot);
-    }
-
-    uint32_t fallbackLeaderId() const
-    {
-        return self_node_id_ ? (self_node_id_ ^ 0x00A10001U) : 0xA11A0001U;
-    }
-
-    uint32_t leaderIdFromSnapshot(const team::ui::TeamUiSnapshot& snapshot) const
-    {
-        for (const auto& member : snapshot.members)
-        {
-            if (member.leader && member.node_id != 0)
-            {
-                return member.node_id;
-            }
-        }
-        for (const auto& member : snapshot.members)
-        {
-            if (member.node_id != 0 && member.node_id != self_node_id_)
-            {
-                return member.node_id;
-            }
-        }
-        return fallbackLeaderId();
-    }
-
-    const char* selfDisplayName() const
-    {
-        return self_name_[0] ? self_name_ : "You";
-    }
-
-    void ensureMember(team::ui::TeamUiSnapshot& snapshot,
-                      uint32_t node_id,
-                      const char* name,
-                      bool leader,
-                      uint32_t now_s) const
-    {
-        if (node_id == 0)
-        {
-            return;
-        }
-
-        if (leader)
-        {
-            for (auto& member : snapshot.members)
-            {
-                member.leader = false;
-            }
-        }
-
-        auto it = std::find_if(snapshot.members.begin(), snapshot.members.end(),
-                               [node_id](const team::ui::TeamMemberUi& member)
-                               {
-                                   return member.node_id == node_id;
-                               });
-        if (it == snapshot.members.end())
-        {
-            team::ui::TeamMemberUi member{};
-            member.node_id = node_id;
-            member.name = name ? name : "";
-            member.online = true;
-            member.leader = leader;
-            member.last_seen_s = now_s;
-            member.color_index = team::ui::team_color_index_from_node_id(node_id);
-            snapshot.members.push_back(std::move(member));
-            return;
-        }
-
-        it->online = true;
-        it->leader = leader;
-        it->last_seen_s = now_s;
-        it->color_index = team::ui::team_color_index_from_node_id(node_id);
-        if (name && name[0] != '\0')
-        {
-            it->name = name;
-        }
-    }
-
-    void persistPendingSnapshot(uint32_t now_s)
-    {
-        team::ui::TeamUiSnapshot snapshot = loadOrDefaultSnapshot();
-        snapshot.pending_join = true;
-        if (snapshot.pending_join_started_s == 0)
-        {
-            snapshot.pending_join_started_s = now_s;
-        }
-        snapshot.last_update_s = now_s;
-        snapshot.kicked_out = false;
-        if (status_.has_team_id)
-        {
-            snapshot.team_id = status_.team_id;
-            snapshot.has_team_id = true;
-        }
-        if (status_.has_team_name)
-        {
-            snapshot.team_name = status_.team_name;
-        }
-        if (status_.key_id != 0)
-        {
-            snapshot.security_round = status_.key_id;
-        }
-        applyPsk(snapshot);
-        saveSnapshot(snapshot);
-    }
-
-    void completeLeader(uint32_t now_s)
-    {
-        team::ui::TeamUiSnapshot snapshot = loadOrDefaultSnapshot();
-        snapshot.in_team = true;
-        snapshot.pending_join = false;
-        snapshot.pending_join_started_s = 0;
-        snapshot.kicked_out = false;
-        snapshot.self_is_leader = true;
-        snapshot.last_update_s = now_s;
-        if (status_.has_team_id)
-        {
-            snapshot.team_id = status_.team_id;
-            snapshot.has_team_id = true;
-        }
-        if (status_.has_team_name)
-        {
-            snapshot.team_name = status_.team_name;
-        }
-        if (status_.key_id != 0)
-        {
-            snapshot.security_round = status_.key_id;
-        }
-        applyPsk(snapshot);
-        ensureMember(snapshot, self_node_id_, selfDisplayName(), true, now_s);
-        saveSnapshot(snapshot);
-        status_.state = team::TeamPairingState::Completed;
-    }
-
-    void completeMember(uint32_t now_s)
-    {
-        team::ui::TeamUiSnapshot snapshot = loadOrDefaultSnapshot();
-        snapshot.in_team = true;
-        snapshot.pending_join = false;
-        snapshot.pending_join_started_s = 0;
-        snapshot.kicked_out = false;
-        snapshot.self_is_leader = false;
-        snapshot.last_update_s = now_s;
-        if (status_.has_team_id)
-        {
-            snapshot.team_id = status_.team_id;
-            snapshot.has_team_id = true;
-        }
-        if (status_.has_team_name)
-        {
-            snapshot.team_name = status_.team_name;
-        }
-        if (status_.key_id != 0)
-        {
-            snapshot.security_round = status_.key_id;
-        }
-        applyPsk(snapshot);
-
-        const uint32_t leader_id = status_.peer_id != 0 ? status_.peer_id : fallbackLeaderId();
-        ensureMember(snapshot, leader_id, "Leader", true, now_s);
-        ensureMember(snapshot, self_node_id_, selfDisplayName(), false, now_s);
-        saveSnapshot(snapshot);
-        if (status_.has_team_id)
-        {
-            (void)team::ui::team_ui_chatlog_append(status_.team_id,
-                                                   leader_id,
-                                                   true,
-                                                   now_s,
-                                                   "Joined shared Team runtime.");
-        }
-        status_.state = team::TeamPairingState::Completed;
-    }
-
-    void resetStatus()
-    {
-        status_ = team::TeamPairingStatus{};
-        phase_started_ms_ = 0;
-        psk_.fill(0);
-        has_psk_ = false;
-    }
-
-    team::TeamPairingStatus status_{};
-    uint32_t self_node_id_ = 0;
-    uint32_t phase_started_ms_ = 0;
-    std::array<uint8_t, team::proto::kTeamChannelPskSize> psk_{};
-    bool has_psk_ = false;
-    char self_name_[16] = {};
-};
-
-class MinimalAppFacade final : public app::IAppFacade
-{
-  public:
-    bool initialize(const RuntimeConfig& runtime_config)
-    {
-        if (initialized_)
-        {
-            return true;
-        }
-
-        runtime_config_ = runtime_config;
-        if (!sys::EventBus::init())
-        {
-            return false;
-        }
-
-        platform::esp::boards::AppContextInitHandles handles{};
-        if (!platform::esp::boards::tryResolveAppContextInitHandles(&handles) || !handles.isValid())
-        {
-            ESP_LOGE(runtime_config.log_tag,
-                     "%s board handles are not ready; refusing to bind shared AppFacade",
-                     runtime_config.target_name ? runtime_config.target_name : "esp-idf");
-            return false;
-        }
-        board_ = handles.board;
-        lora_board_ = handles.lora_board;
-
-        configureIdentity(runtime_config);
-        self_node_id_ = makeNodeId(runtime_config.target_name);
-
-        node_blob_store_ = std::make_unique<InMemoryNodeBlobStore>();
-        contact_blob_store_ = std::make_unique<InMemoryContactBlobStore>();
-        node_store_ = std::make_unique<chat::contacts::NodeStoreCore>(*node_blob_store_);
-        contact_store_ = std::make_unique<chat::contacts::ContactStoreCore>(*contact_blob_store_);
-        contact_service_ = std::make_unique<chat::contacts::ContactService>(*node_store_, *contact_store_);
-        contact_service_->begin();
-
-        team_pairing_ = std::make_unique<MinimalTeamPairingService>();
-        team_pairing_->setIdentity(self_node_id_, config_.short_name);
-
-        chat_model_ = std::make_unique<chat::ChatModel>();
-        chat_store_ = std::make_unique<chat::RamStore>();
-        mesh_router_ = std::make_unique<chat::MeshAdapterRouterCore>();
-        if (!installMeshBackend(config_.mesh_protocol))
-        {
-            return false;
-        }
-        if (mesh_router_)
-        {
-            self_node_id_ = mesh_router_->getNodeId();
-        }
-        team_pairing_->setIdentity(self_node_id_, config_.short_name);
-        chat_service_ = std::make_unique<chat::ChatService>(*chat_model_, *mesh_router_, *chat_store_, config_.mesh_protocol);
-
-        team_runtime_ = std::make_unique<MinimalTeamRuntime>();
-        team_crypto_ = std::make_unique<MinimalTeamCrypto>();
-        team_event_sink_ = std::make_unique<MinimalTeamEventSink>();
-        team_service_ = std::make_unique<team::TeamService>(*team_crypto_, *mesh_router_, *team_event_sink_, *team_runtime_);
-        team_controller_ = std::make_unique<team::TeamController>(*team_service_);
-
-        applyUserInfo();
-        applyChatDefaults();
-        clearLegacyDemoState();
-        syncTeamKeysFromStore();
-
-        app::bindAppFacade(*this);
-        initialized_ = true;
-        return true;
-    }
-
-    void tick()
-    {
-        if (!initialized_)
-        {
-            return;
-        }
-
-        if (mesh_router_)
-        {
-            mesh_router_->processSendQueue();
-        }
-
-        if (loopback_adapter_ && chat_service_)
-        {
-            std::vector<chat::MessageId> sent_ids;
-            if (loopback_adapter_->drainSendResults(sent_ids))
-            {
-                for (const chat::MessageId msg_id : sent_ids)
-                {
-                    chat_service_->handleSendResult(msg_id, true);
-                }
-            }
-        }
-
-        if (chat_service_)
-        {
-            chat_service_->processIncoming();
-            chat_service_->flushStore();
-        }
-
-        if (team_pairing_)
-        {
-            team_pairing_->update();
-        }
-
-        syncTeamKeysFromStore();
-
-        if (team_service_)
-        {
-            team_service_->processIncoming();
-        }
-    }
-
-    bool isBound() const
-    {
-        return initialized_ && app::hasAppFacade();
-    }
-
-    app::AppConfig& getConfig() override
-    {
-        return config_;
-    }
-
-    const app::AppConfig& getConfig() const override
-    {
-        return config_;
-    }
-
-    chat::MeshProtocol getMeshProtocol() const override
-    {
-        return config_.mesh_protocol;
-    }
-
-    void saveConfig() override {}
-
-    void applyMeshConfig() override
-    {
-        if (mesh_router_)
-        {
-            mesh_router_->applyConfig(config_.activeMeshConfig());
-        }
-    }
-
-    void applyUserInfo() override
-    {
-        if (mesh_router_)
-        {
-            mesh_router_->setUserInfo(config_.node_name, config_.short_name);
-        }
-    }
-
-    void applyPositionConfig() override
-    {
-        platform::ui::gps::set_enabled(config_.gps_enabled);
-        platform::ui::gps::set_collection_interval(config_.gps_interval_ms);
-        platform::ui::gps::set_power_strategy(config_.gps_strategy);
-        platform::ui::gps::set_gnss_config(config_.gps_mode, config_.gps_sat_mask);
-        platform::ui::gps::set_external_nmea_config(config_.external_nmea_output_hz,
-                                                    config_.external_nmea_sentence_mask);
-        platform::ui::gps::set_motion_idle_timeout(config_.motion_config.idle_timeout_ms);
-        platform::ui::gps::set_motion_sensor_id(config_.motion_config.sensor_id);
-    }
-    void applyNetworkLimits() override {}
-    void applyPrivacyConfig() override {}
-
-    void applyChatDefaults() override
-    {
-        if (!chat_service_)
-        {
-            return;
-        }
-
-        const chat::ChannelId channel = (config_.chat_channel == 1)
-                                            ? chat::ChannelId::SECONDARY
-                                            : chat::ChannelId::PRIMARY;
-        chat_service_->switchChannel(channel);
-    }
-
-    void getEffectiveUserInfo(char* out_long, std::size_t long_len,
-                              char* out_short, std::size_t short_len) const override
-    {
-        copyString(config_.node_name, out_long, long_len);
-        copyString(config_.short_name, out_short, short_len);
-    }
-
-    bool switchMeshProtocol(chat::MeshProtocol protocol, bool persist = true) override
-    {
-        (void)persist;
-        config_.mesh_protocol = protocol;
-        if (chat_service_)
-        {
-            chat_service_->setActiveProtocol(protocol);
-        }
-        if (!installMeshBackend(protocol))
-        {
-            return false;
-        }
-        if (mesh_router_)
-        {
-            self_node_id_ = mesh_router_->getNodeId();
-        }
-        if (team_pairing_)
-        {
-            team_pairing_->setIdentity(self_node_id_, config_.short_name);
-        }
-        applyMeshConfig();
-        return true;
-    }
-
-    chat::ChatService& getChatService() override
-    {
-        return *chat_service_;
-    }
-
-    chat::contacts::ContactService& getContactService() override
-    {
-        return *contact_service_;
-    }
-
-    chat::IMeshAdapter* getMeshAdapter() override
-    {
-        return mesh_router_.get();
-    }
-
-    const chat::IMeshAdapter* getMeshAdapter() const override
-    {
-        return mesh_router_.get();
-    }
-
-    chat::NodeId getSelfNodeId() const override
-    {
-        return self_node_id_;
-    }
-
-    team::TeamController* getTeamController() override
-    {
-        return team_controller_.get();
-    }
-
-    team::TeamPairingService* getTeamPairing() override
-    {
-        return team_pairing_.get();
-    }
-
-    team::TeamService* getTeamService() override
-    {
-        return team_service_.get();
-    }
-
-    const team::TeamService* getTeamService() const override
-    {
-        return team_service_.get();
-    }
-
-    team::TeamTrackSampler* getTeamTrackSampler() override
-    {
-        return nullptr;
-    }
-
-    void setTeamModeActive(bool active) override
-    {
-        (void)active;
-    }
-
-    void broadcastNodeInfo() override
-    {
-        if (!mesh_router_)
-        {
-            return;
-        }
-
-        if (meshtastic_adapter_)
-        {
-            (void)meshtastic_adapter_->broadcastNodeInfo();
-        }
-    }
-
-    void clearNodeDb() override
-    {
-        if (node_store_)
-        {
-            node_store_->clear();
-        }
-        if (contact_service_)
-        {
-            contact_service_->clearCache();
-        }
-    }
-
-    void clearMessageDb() override
-    {
-        if (chat_service_)
-        {
-            chat_service_->clearAllMessages();
-        }
-    }
-
-    ble::BleManager* getBleManager() override
-    {
-        return nullptr;
-    }
-
-    const ble::BleManager* getBleManager() const override
-    {
-        return nullptr;
-    }
-
-    bool isBleEnabled() const override
-    {
-        return ble_enabled_;
-    }
-
-    void setBleEnabled(bool enabled) override
-    {
-        ble_enabled_ = enabled;
-    }
-
-    void restartDevice() override
-    {
-        esp_restart();
-    }
-
-    chat::ui::IChatUiRuntime* getChatUiRuntime() override
-    {
-        return chat_ui_runtime_;
-    }
-
-    void setChatUiRuntime(chat::ui::IChatUiRuntime* runtime) override
-    {
-        chat_ui_runtime_ = runtime;
-    }
-
-    BoardBase* getBoard() override
-    {
-        return board_;
-    }
-
-    const BoardBase* getBoard() const override
-    {
-        return board_;
-    }
-
-    void updateCoreServices() override
-    {
-        tick();
-    }
-
-    void tickEventRuntime() override {}
-
-    void dispatchPendingEvents(std::size_t max_events = 32) override
-    {
-        sys::Event* event = nullptr;
-        for (std::size_t processed = 0;
-             processed < max_events && sys::EventBus::subscribe(&event, 0);)
-        {
-            if (!event)
-            {
-                continue;
-            }
-            ++processed;
-
-            switch (event->type)
-            {
-            case sys::EventType::ChatSendResult:
-            {
-                auto* result_event = static_cast<sys::ChatSendResultEvent*>(event);
-                if (chat_service_)
-                {
-                    chat_service_->handleSendResult(result_event->msg_id, result_event->success);
-                }
-                delete event;
-                continue;
-            }
-            case sys::EventType::NodeInfoUpdate:
-            {
-                auto* node_event = static_cast<sys::NodeInfoUpdateEvent*>(event);
-                contact_service_->updateNodeInfo(node_event->node_id,
-                                                 node_event->short_name,
-                                                 node_event->long_name,
-                                                 node_event->snr,
-                                                 node_event->rssi,
-                                                 node_event->timestamp,
-                                                 node_event->protocol,
-                                                 node_event->role,
-                                                 node_event->hops_away,
-                                                 node_event->hw_model,
-                                                 node_event->channel);
-                delete event;
-                continue;
-            }
-            case sys::EventType::NodeProtocolUpdate:
-            {
-                auto* node_event = static_cast<sys::NodeProtocolUpdateEvent*>(event);
-                contact_service_->updateNodeProtocol(node_event->node_id,
-                                                     node_event->protocol,
-                                                     node_event->timestamp);
-                delete event;
-                continue;
-            }
-            case sys::EventType::NodePositionUpdate:
-            {
-                auto* pos_event = static_cast<sys::NodePositionUpdateEvent*>(event);
-                chat::contacts::NodePosition pos{};
-                pos.valid = true;
-                pos.latitude_i = pos_event->latitude_i;
-                pos.longitude_i = pos_event->longitude_i;
-                pos.has_altitude = pos_event->has_altitude;
-                pos.altitude = pos_event->altitude;
-                pos.timestamp = pos_event->timestamp;
-                pos.precision_bits = pos_event->precision_bits;
-                pos.pdop = pos_event->pdop;
-                pos.hdop = pos_event->hdop;
-                pos.vdop = pos_event->vdop;
-                pos.gps_accuracy_mm = pos_event->gps_accuracy_mm;
-                contact_service_->updateNodePosition(pos_event->node_id, pos);
-                delete event;
-                continue;
-            }
-            case sys::EventType::TeamKick:
-            case sys::EventType::TeamTransferLeader:
-            case sys::EventType::TeamKeyDist:
-            case sys::EventType::TeamStatus:
-            case sys::EventType::TeamPosition:
-            case sys::EventType::TeamWaypoint:
-            case sys::EventType::TeamTrack:
-            case sys::EventType::TeamChat:
-            case sys::EventType::TeamPairing:
-            case sys::EventType::TeamError:
-            case sys::EventType::SystemTick:
-                team::ui::shell::handle_event(nullptr, event);
-                delete event;
-                continue;
-            default:
-                break;
-            }
-
-            if (chat_ui_runtime_)
-            {
-                chat_ui_runtime_->onChatEvent(event);
-                continue;
-            }
-
-            delete event;
-        }
-    }
-
-  private:
-    void clearLegacyDemoState()
-    {
-        team::ui::TeamUiSnapshot snapshot{};
-        if (!team::ui::team_ui_get_store().load(snapshot))
-        {
-            return;
-        }
-
-        static constexpr team::TeamId kLegacyDemoTeamId = {0x54, 0x4D, 0x35, 0x2D, 0x44, 0x45, 0x4D, 0x4F};
-        const bool looks_like_demo = snapshot.team_name == "Tab5 Demo" ||
-                                     (snapshot.has_team_id && snapshot.team_id == kLegacyDemoTeamId);
-        if (looks_like_demo)
-        {
-            team::ui::team_ui_get_store().clear();
-        }
-    }
-
-    void syncTeamKeysFromStore()
-    {
-        if (!team_controller_)
-        {
-            return;
-        }
-
-        team::ui::TeamUiSnapshot snapshot{};
-        const bool has_snapshot = team::ui::team_ui_get_store().load(snapshot);
-        const bool has_keys = has_snapshot && snapshot.has_team_id && snapshot.has_team_psk && snapshot.security_round != 0;
-        if (!has_keys)
-        {
-            if (team_keys_synced_)
-            {
-                team_controller_->clearKeys();
-            }
-            team_keys_synced_ = false;
-            synced_team_key_id_ = 0;
-            synced_team_id_ = {};
-            synced_team_psk_.fill(0);
-            return;
-        }
-
-        if (team_keys_synced_ &&
-            synced_team_key_id_ == snapshot.security_round &&
-            synced_team_id_ == snapshot.team_id &&
-            synced_team_psk_ == snapshot.team_psk)
-        {
-            return;
-        }
-
-        if (team_controller_->setKeysFromPsk(snapshot.team_id,
-                                             snapshot.security_round,
-                                             snapshot.team_psk.data(),
-                                             snapshot.team_psk.size()))
-        {
-            synced_team_id_ = snapshot.team_id;
-            synced_team_key_id_ = snapshot.security_round;
-            synced_team_psk_ = snapshot.team_psk;
-            team_keys_synced_ = true;
-            return;
-        }
-
-        team_keys_synced_ = false;
-    }
-
-    static void copyString(const char* src, char* dst, size_t dst_len)
-    {
-        if (!dst || dst_len == 0)
-        {
-            return;
-        }
-
-        if (!src)
-        {
-            dst[0] = '\0';
-            return;
-        }
-
-        const size_t copy_len = std::min(std::strlen(src), dst_len - 1);
-        std::memcpy(dst, src, copy_len);
-        dst[copy_len] = '\0';
-    }
-
-    static chat::NodeId makeNodeId(const char* target_name)
-    {
-        constexpr uint32_t kFnvOffset = 2166136261u;
-        constexpr uint32_t kFnvPrime = 16777619u;
-
-        uint32_t hash = kFnvOffset;
-        const char* text = target_name ? target_name : "idf";
-        while (*text)
-        {
-            hash ^= static_cast<uint8_t>(*text++);
-            hash *= kFnvPrime;
-        }
-
-        return hash != 0 ? hash : 0x00FDFD01u;
-    }
-
-    static void makeShortName(const char* target_name, char* out, size_t out_len)
-    {
-        if (!out || out_len == 0)
-        {
-            return;
-        }
-
-        size_t pos = 0;
-        const char* text = target_name ? target_name : "IDF";
-        while (*text && pos + 1 < out_len)
-        {
-            const unsigned char ch = static_cast<unsigned char>(*text++);
-            if (!std::isalnum(ch))
-            {
-                continue;
-            }
-            out[pos++] = static_cast<char>(std::toupper(ch));
-        }
-
-        if (pos == 0)
-        {
-            copyString("IDF", out, out_len);
-            return;
-        }
-        out[pos] = '\0';
-    }
-
-    void configureIdentity(const RuntimeConfig& runtime_config)
-    {
-        const auto identity = platform::esp::boards::defaultIdentity();
-        std::snprintf(config_.node_name, sizeof(config_.node_name), "%s",
-                      (identity.long_name && identity.long_name[0] != '\0') ? identity.long_name : "TrailMate");
-        std::snprintf(config_.short_name, sizeof(config_.short_name), "%s",
-                      (identity.short_name && identity.short_name[0] != '\0') ? identity.short_name : "TM");
-        if (config_.short_name[0] == '\0')
-        {
-            makeShortName(runtime_config.target_name, config_.short_name, sizeof(config_.short_name));
-        }
-        config_.mesh_protocol = chat::MeshProtocol::Meshtastic;
-        config_.chat_channel = 0;
-    }
-
-    bool installMeshBackend(chat::MeshProtocol protocol)
-    {
-        if (!mesh_router_)
-        {
-            return false;
-        }
-
-        loopback_adapter_ = nullptr;
-        meshtastic_adapter_ = nullptr;
-        if (protocol == chat::MeshProtocol::Meshtastic)
-        {
-            if (lora_board_ == nullptr)
-            {
-                ESP_LOGE(runtime_config_.log_tag,
-                         "%s requested Meshtastic backend without a resolved LoRa board handle",
-                         runtime_config_.target_name ? runtime_config_.target_name : "esp-idf");
-                return false;
-            }
-            auto backend = std::make_unique<apps::esp_idf::MeshtasticRadioAdapter>(
-                *lora_board_);
-            meshtastic_adapter_ = backend.get();
-            (void)mesh_router_->installBackend(protocol, std::move(backend));
-            return true;
-        }
-
-        auto backend = std::make_unique<LoopbackMeshAdapter>(self_node_id_);
-        loopback_adapter_ = backend.get();
-        (void)mesh_router_->installBackend(protocol, std::move(backend));
-        return true;
-    }
-
-    void seedDemoData()
-    {
-        if (!contact_service_ || !chat_store_)
-        {
-            return;
-        }
-
-        const uint32_t now = sys::epoch_seconds_now();
-        const uint32_t alpha = 0xA17A0001u;
-        const uint32_t bravo = 0xB22B0002u;
-
-        contact_service_->updateNodeInfo(alpha,
-                                         "ALPHA",
-                                         "Alpha Scout",
-                                         7.5f,
-                                         -62.0f,
-                                         now,
-                                         static_cast<uint8_t>(config_.mesh_protocol));
-        contact_service_->updateNodeInfo(bravo,
-                                         "BRAVO",
-                                         "Bravo Relay",
-                                         5.0f,
-                                         -71.0f,
-                                         now,
-                                         static_cast<uint8_t>(config_.mesh_protocol));
-        (void)contact_service_->addContact(alpha, "Alpha");
-        (void)contact_service_->addContact(bravo, "Bravo");
-
-        appendSeedMessage(config_.mesh_protocol,
-                          chat::ChannelId::PRIMARY,
-                          alpha,
-                          0,
-                          1,
-                          now > 180 ? now - 180 : now,
-                          "Tab5 shared startup/menu shell is online.",
-                          chat::MessageStatus::Incoming);
-
-        appendSeedMessage(config_.mesh_protocol,
-                          chat::ChannelId::PRIMARY,
-                          bravo,
-                          bravo,
-                          2,
-                          now > 120 ? now - 120 : now,
-                          "Direct chat runtime is now driven by the IDF facade.",
-                          chat::MessageStatus::Incoming);
-
-        appendSeedMessage(config_.mesh_protocol,
-                          chat::ChannelId::PRIMARY,
-                          0,
-                          bravo,
-                          3,
-                          now > 60 ? now - 60 : now,
-                          "Main menu -> shared Chat page is ready for migration.",
-                          chat::MessageStatus::Sent);
-
-        seedTeamUiSnapshot(now, alpha, bravo);
-    }
-
-    void seedTeamUiSnapshot(uint32_t now, uint32_t alpha, uint32_t bravo)
-    {
-        team::ui::TeamUiSnapshot snapshot{};
-        snapshot.in_team = true;
-        snapshot.self_is_leader = true;
-        snapshot.last_event_seq = 1;
-        snapshot.team_chat_unread = 1;
-        snapshot.has_team_id = true;
-        snapshot.team_id = {0x54, 0x4D, 0x35, 0x2D, 0x44, 0x45, 0x4D, 0x4F};
-        snapshot.team_name = "Tab5 Demo";
-        snapshot.security_round = 1;
-        snapshot.last_update_s = now;
-        for (size_t i = 0; i < snapshot.team_psk.size(); ++i)
-        {
-            snapshot.team_psk[i] = static_cast<uint8_t>(0x30 + (i & 0x3F));
-        }
-        snapshot.has_team_psk = true;
-
-        team::ui::TeamMemberUi self{};
-        self.node_id = self_node_id_;
-        self.name = config_.short_name[0] ? config_.short_name : "You";
-        self.online = true;
-        self.leader = true;
-        self.last_seen_s = now;
-        self.color_index = team::ui::team_color_index_from_node_id(self.node_id);
-
-        team::ui::TeamMemberUi member_alpha{};
-        member_alpha.node_id = alpha;
-        member_alpha.name = "Alpha";
-        member_alpha.online = true;
-        member_alpha.leader = false;
-        member_alpha.last_seen_s = now > 45 ? now - 45 : now;
-        member_alpha.color_index = team::ui::team_color_index_from_node_id(member_alpha.node_id);
-
-        team::ui::TeamMemberUi member_bravo{};
-        member_bravo.node_id = bravo;
-        member_bravo.name = "Bravo";
-        member_bravo.online = true;
-        member_bravo.leader = false;
-        member_bravo.last_seen_s = now > 90 ? now - 90 : now;
-        member_bravo.color_index = team::ui::team_color_index_from_node_id(member_bravo.node_id);
-
-        snapshot.members.push_back(self);
-        snapshot.members.push_back(member_alpha);
-        snapshot.members.push_back(member_bravo);
-
-        team::ui::team_ui_get_store().save(snapshot);
-        (void)team::ui::team_ui_chatlog_append(snapshot.team_id, alpha, true, now > 75 ? now - 75 : now, "Team demo channel ready.");
-        (void)team::ui::team_ui_chatlog_append(snapshot.team_id, bravo, true, now > 30 ? now - 30 : now, "Shared Team page is now running on IDF.");
-    }
-
-    void appendSeedMessage(chat::MeshProtocol protocol,
-                           chat::ChannelId channel,
-                           chat::NodeId from,
-                           chat::NodeId peer,
-                           chat::MessageId msg_id,
-                           uint32_t timestamp,
-                           const char* text,
-                           chat::MessageStatus status)
-    {
-        chat::ChatMessage message{};
-        message.protocol = protocol;
-        message.channel = channel;
-        message.from = from;
-        message.peer = peer;
-        message.msg_id = msg_id;
-        message.timestamp = timestamp;
-        message.text = text ? text : "";
-        message.status = status;
-        chat_store_->append(message);
-    }
-
-    bool initialized_ = false;
-    bool ble_enabled_ = false;
-    chat::NodeId self_node_id_ = 0;
-    RuntimeConfig runtime_config_{};
-    app::AppConfig config_{};
-    BoardBase* board_ = nullptr;
-    LoraBoard* lora_board_ = nullptr;
-    chat::ui::IChatUiRuntime* chat_ui_runtime_ = nullptr;
-
-    std::unique_ptr<InMemoryNodeBlobStore> node_blob_store_;
-    std::unique_ptr<InMemoryContactBlobStore> contact_blob_store_;
-    std::unique_ptr<chat::contacts::NodeStoreCore> node_store_;
-    std::unique_ptr<chat::contacts::ContactStoreCore> contact_store_;
-    std::unique_ptr<chat::contacts::ContactService> contact_service_;
-
-    std::unique_ptr<chat::ChatModel> chat_model_;
-    std::unique_ptr<chat::RamStore> chat_store_;
-    std::unique_ptr<chat::MeshAdapterRouterCore> mesh_router_;
-    LoopbackMeshAdapter* loopback_adapter_ = nullptr;
-    apps::esp_idf::MeshtasticRadioAdapter* meshtastic_adapter_ = nullptr;
-    std::unique_ptr<chat::ChatService> chat_service_;
-
-    std::unique_ptr<MinimalTeamRuntime> team_runtime_;
-    std::unique_ptr<MinimalTeamCrypto> team_crypto_;
-    std::unique_ptr<MinimalTeamEventSink> team_event_sink_;
-    std::unique_ptr<team::TeamService> team_service_;
-    std::unique_ptr<team::TeamController> team_controller_;
-    std::unique_ptr<MinimalTeamPairingService> team_pairing_;
-    team::TeamId synced_team_id_{};
-    std::array<uint8_t, team::proto::kTeamChannelPskSize> synced_team_psk_{};
-    uint32_t synced_team_key_id_ = 0;
-    bool team_keys_synced_ = false;
-};
-
-MinimalAppFacade s_facade;
-
-} // namespace
-
-bool initialize(const RuntimeConfig& config)
-{
-    const bool ok = s_facade.initialize(config);
-    if (ok)
-    {
-        ESP_LOGI(config.log_tag,
-                 "%s minimal shared AppFacade bound for Chat/Contacts/Team runtime",
-                 config.target_name);
-    }
-    return ok;
-}
-
-void tick()
-{
-    s_facade.tick();
-}
-
-bool isBound()
-{
-    return s_facade.isBound();
-}
-
-} // namespace apps::esp_idf::app_facade_runtime
diff --git a/apps/esp_idf/src/app_registry.cpp b/apps/esp_idf/src/app_registry.cpp
deleted file mode 100644
index 20282d6c..00000000
--- a/apps/esp_idf/src/app_registry.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "ui/app_registry.h"
-#include "ui/app_catalog_builder.h"
-
-#include "platform/ui/device_runtime.h"
-#include "platform/ui/hostlink_runtime.h"
-#include "platform/ui/lora_runtime.h"
-#include "platform/ui/route_storage.h"
-#include "platform/ui/sstv_runtime.h"
-#include "platform/ui/tracker_runtime.h"
-#include "platform/ui/usb_support_runtime.h"
-#include "platform/ui/walkie_runtime.h"
-
-namespace
-{
-
-ui::app_catalog_builder::FeatureFlags buildFeatureFlags()
-{
-    ui::app_catalog_builder::FeatureFlags flags{};
-    flags.profile = ui::app_catalog_builder::CatalogProfile::IdfDefault;
-    flags.include_gps_map = platform::ui::device::gps_supported();
-    flags.include_gnss_skyplot = platform::ui::device::gps_supported();
-    flags.include_energy_sweep = platform::ui::lora::is_supported();
-    flags.include_tracker = platform::ui::route_storage::is_supported() || platform::ui::tracker::is_supported();
-    flags.include_pc_link = platform::ui::hostlink::is_supported();
-    flags.include_sstv = platform::ui::sstv::is_supported();
-    flags.include_usb = platform::ui::usb_support::is_supported();
-    flags.include_extensions = true;
-    flags.include_walkie_talkie = platform::ui::walkie::is_supported();
-    return flags;
-}
-
-ui::AppCatalog buildCatalog()
-{
-    return ui::app_catalog_builder::build(buildFeatureFlags());
-}
-
-} // namespace
-
-namespace ui
-{
-
-AppCatalog appCatalog()
-{
-    return buildCatalog();
-}
-
-} // namespace ui
diff --git a/apps/esp_idf/src/app_runtime_access.cpp b/apps/esp_idf/src/app_runtime_access.cpp
deleted file mode 100644
index 8dd55620..00000000
--- a/apps/esp_idf/src/app_runtime_access.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "apps/esp_idf/app_runtime_access.h"
-
-#include "apps/esp_idf/app_facade_runtime.h"
-
-#include "app/app_facade_access.h"
-#include "platform/esp/boards/board_runtime.h"
-#include "platform/esp/idf_common/app_runtime_support.h"
-
-#include "esp_log.h"
-
-namespace apps::esp_idf::app_runtime_access
-{
-namespace
-{
-
-Status s_status{};
-RuntimeConfig s_runtime_config{};
-
-} // namespace
-
-void initialize(const RuntimeConfig& config)
-{
-    if (s_status.initialized)
-    {
-        return;
-    }
-
-    s_status = Status{};
-    s_status.initialized = true;
-    s_runtime_config = config;
-
-    s_status.app_context_bound = app_facade_runtime::initialize(config);
-    s_status.lifecycle_ready = s_status.app_context_bound && app::hasAppFacade();
-
-    platform::esp::boards::AppContextInitHandles handles{};
-    s_status.board_handles_ready = platform::esp::boards::tryResolveAppContextInitHandles(&handles) && handles.isValid();
-
-    if (s_status.board_handles_ready)
-    {
-        ESP_LOGI(s_runtime_config.log_tag,
-                 "%s board handles resolved for shared app shell",
-                 s_runtime_config.target_name);
-    }
-    else
-    {
-        ESP_LOGI(s_runtime_config.log_tag, "%s AppContext handles are not available yet", s_runtime_config.target_name);
-    }
-
-    ESP_LOGI(s_runtime_config.log_tag, "IDF application shell initialized for %s", s_runtime_config.target_name);
-}
-
-void tick()
-{
-    if (!s_status.initialized)
-    {
-        return;
-    }
-
-    if (s_status.lifecycle_ready)
-    {
-        platform::esp::idf_common::tickBoundLifecycle();
-    }
-}
-
-const Status& status()
-{
-    return s_status;
-}
-
-} // namespace apps::esp_idf::app_runtime_access
diff --git a/apps/esp_idf/src/gps_service_api.cpp b/apps/esp_idf/src/gps_service_api.cpp
deleted file mode 100644
index e6e68d62..00000000
--- a/apps/esp_idf/src/gps_service_api.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "platform/esp/arduino_common/gps/gps_service_api.h"
-
-#include <cmath>
-
-#include "platform/esp/idf_common/gps_runtime.h"
-
-namespace gps
-{
-
-GpsState gps_get_data()
-{
-    return platform::esp::idf_common::gps_runtime::get_data();
-}
-
-bool gps_get_gnss_snapshot(gps::GnssSatInfo* out, size_t max, size_t* out_count, gps::GnssStatus* status)
-{
-    return platform::esp::idf_common::gps_runtime::get_gnss_snapshot(out, max, out_count, status);
-}
-
-GpsDiagnosticsSnapshot gps_get_diagnostics()
-{
-    return platform::esp::idf_common::gps_runtime::diagnostics();
-}
-
-uint32_t gps_get_last_motion_ms()
-{
-    return platform::esp::idf_common::gps_runtime::last_motion_ms();
-}
-
-bool gps_is_enabled()
-{
-    return platform::esp::idf_common::gps_runtime::is_enabled();
-}
-
-bool gps_is_powered()
-{
-    return platform::esp::idf_common::gps_runtime::is_powered();
-}
-
-void gps_set_enabled(bool enabled)
-{
-    platform::esp::idf_common::gps_runtime::set_enabled(enabled);
-}
-
-void gps_set_collection_interval(uint32_t interval_ms)
-{
-    platform::esp::idf_common::gps_runtime::set_collection_interval(interval_ms);
-}
-
-void gps_set_power_strategy(uint8_t strategy)
-{
-    platform::esp::idf_common::gps_runtime::set_power_strategy(strategy);
-}
-
-void gps_set_gnss_config(uint8_t mode, uint8_t sat_mask)
-{
-    platform::esp::idf_common::gps_runtime::set_gnss_config(mode, sat_mask);
-}
-
-void gps_set_external_nmea_config(uint8_t output_hz, uint8_t sentence_mask)
-{
-    platform::esp::idf_common::gps_runtime::set_external_nmea_config(output_hz, sentence_mask);
-}
-
-void gps_set_receiver_init_config(const GpsReceiverInitConfig& config)
-{
-    platform::esp::idf_common::gps_runtime::set_receiver_init_config(config);
-}
-
-void gps_set_motion_idle_timeout(uint32_t timeout_ms)
-{
-    platform::esp::idf_common::gps_runtime::set_motion_idle_timeout(timeout_ms);
-}
-
-void gps_set_motion_sensor_id(uint8_t sensor_id)
-{
-    platform::esp::idf_common::gps_runtime::set_motion_sensor_id(sensor_id);
-}
-
-TaskHandle_t gps_get_task_handle()
-{
-    return platform::esp::idf_common::gps_runtime::get_task_handle();
-}
-
-double calculate_map_resolution(int zoom, double lat)
-{
-    const double max_lat = 85.05112878;
-    double lat_clamped = lat;
-    if (lat_clamped > max_lat) lat_clamped = max_lat;
-    if (lat_clamped < -max_lat) lat_clamped = -max_lat;
-
-    const double resolution_equator = 156543.03392 / std::pow(2.0, zoom);
-    const double lat_rad = lat_clamped * M_PI / 180.0;
-    return resolution_equator * std::cos(lat_rad);
-}
-
-} // namespace gps
diff --git a/apps/esp_idf/src/gps_tracker_overlay.cpp b/apps/esp_idf/src/gps_tracker_overlay.cpp
deleted file mode 100644
index aab6f34d..00000000
--- a/apps/esp_idf/src/gps_tracker_overlay.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "ui/screens/gps/gps_tracker_overlay.h"
-#include "ui/screens/gps/gps_state.h"
-
-#include <cstdio>
-
-GPSPageState g_gps_state{};
-
-void gps_tracker_open_modal()
-{
-    g_gps_state.tracker_overlay_active = true;
-}
-
-bool gps_tracker_load_file(const char* path, bool show_toast)
-{
-    (void)show_toast;
-    if (path == nullptr || path[0] == '\0')
-    {
-        return false;
-    }
-    FILE* file = std::fopen(path, "rb");
-    if (file == nullptr)
-    {
-        return false;
-    }
-    std::fclose(file);
-    g_gps_state.tracker_file = path;
-    g_gps_state.tracker_overlay_active = true;
-    return true;
-}
-
-void gps_tracker_draw_event(lv_event_t* e)
-{
-    (void)e;
-}
-
-void gps_tracker_cleanup()
-{
-    g_gps_state.tracker_overlay_active = false;
-    g_gps_state.tracker_file.clear();
-    g_gps_state.tracker_points.clear();
-    g_gps_state.tracker_screen_points.clear();
-}
diff --git a/apps/esp_idf/src/idf_component_anchor.cpp b/apps/esp_idf/src/idf_component_anchor.cpp
deleted file mode 100644
index 52cd0857..00000000
--- a/apps/esp_idf/src/idf_component_anchor.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// Intentionally minimal.
-// This translation unit anchors the shared ESP-IDF app component so
-// migrated sources can be attached via target_sources() in CMake.
diff --git a/apps/esp_idf/src/idf_entry.cpp b/apps/esp_idf/src/idf_entry.cpp
deleted file mode 100644
index 27278e73..00000000
--- a/apps/esp_idf/src/idf_entry.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "apps/esp_idf/runtime_config.h"
-#include "apps/esp_idf/startup_runtime.h"
-
-extern "C" void app_main(void)
-{
-    apps::esp_idf::startup_runtime::run(apps::esp_idf::runtime_config::get());
-}
diff --git a/apps/esp_idf/src/mt_packet_wire_idf.cpp b/apps/esp_idf/src/mt_packet_wire_idf.cpp
deleted file mode 100644
index e660a22b..00000000
--- a/apps/esp_idf/src/mt_packet_wire_idf.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "chat/infra/meshtastic/mt_packet_wire.h"
-
-#include "mbedtls/aes.h"
-
-#include <cstring>
-
-namespace chat
-{
-namespace meshtastic
-{
-namespace
-{
-
-void aes_ctr_crypt(const uint8_t* key,
-                   size_t key_len,
-                   uint8_t* nonce,
-                   uint8_t* buffer,
-                   size_t len)
-{
-    if (!key || !nonce || !buffer || len == 0)
-    {
-        return;
-    }
-
-    mbedtls_aes_context aes;
-    mbedtls_aes_init(&aes);
-    if (mbedtls_aes_setkey_enc(&aes, key, static_cast<unsigned>(key_len * 8U)) != 0)
-    {
-        mbedtls_aes_free(&aes);
-        return;
-    }
-
-    size_t nc_off = 0;
-    unsigned char stream_block[16] = {};
-    (void)mbedtls_aes_crypt_ctr(&aes, len, &nc_off, nonce, stream_block, buffer, buffer);
-    mbedtls_aes_free(&aes);
-}
-
-} // namespace
-
-bool buildWirePacket(const uint8_t* data_payload, size_t data_len,
-                     uint32_t from_node, uint32_t packet_id,
-                     uint32_t dest_node, uint8_t channel_hash,
-                     uint8_t hop_limit, bool want_ack,
-                     const uint8_t* psk, size_t psk_len,
-                     uint8_t* out_buffer, size_t* out_size)
-{
-    if (!data_payload || data_len == 0 || !out_buffer || !out_size)
-    {
-        return false;
-    }
-
-    uint8_t payload[256];
-    if (data_len > sizeof(payload))
-    {
-        return false;
-    }
-    std::memcpy(payload, data_payload, data_len);
-
-    if (psk && psk_len > 0)
-    {
-        uint8_t nonce[16] = {};
-        const uint64_t packet_id64 = static_cast<uint64_t>(packet_id);
-        std::memcpy(nonce, &packet_id64, sizeof(packet_id64));
-        std::memcpy(nonce + sizeof(packet_id64), &from_node, sizeof(from_node));
-        aes_ctr_crypt(psk, psk_len, nonce, payload, data_len);
-    }
-
-    PacketHeaderWire header{};
-    header.to = dest_node;
-    header.from = from_node;
-    header.id = packet_id;
-    header.flags =
-        (hop_limit & PACKET_FLAGS_HOP_LIMIT_MASK) |
-        ((hop_limit << PACKET_FLAGS_HOP_START_SHIFT) & PACKET_FLAGS_HOP_START_MASK) |
-        (want_ack ? PACKET_FLAGS_WANT_ACK_MASK : 0);
-    header.channel = channel_hash;
-    header.next_hop = 0;
-    header.relay_node = static_cast<uint8_t>(from_node & 0xFFU);
-
-    const size_t required = sizeof(header) + data_len;
-    if (*out_size < required)
-    {
-        *out_size = required;
-        return false;
-    }
-
-    std::memcpy(out_buffer, &header, sizeof(header));
-    std::memcpy(out_buffer + sizeof(header), payload, data_len);
-    *out_size = required;
-    return true;
-}
-
-bool parseWirePacket(const uint8_t* buffer, size_t size,
-                     PacketHeaderWire* out_header,
-                     uint8_t* out_payload, size_t* out_payload_size)
-{
-    if (!buffer || size < sizeof(PacketHeaderWire) || !out_header || !out_payload || !out_payload_size)
-    {
-        return false;
-    }
-
-    const size_t payload_len = size - sizeof(PacketHeaderWire);
-    if (*out_payload_size < payload_len)
-    {
-        *out_payload_size = payload_len;
-        return false;
-    }
-
-    std::memcpy(out_header, buffer, sizeof(PacketHeaderWire));
-    std::memcpy(out_payload, buffer + sizeof(PacketHeaderWire), payload_len);
-    *out_payload_size = payload_len;
-    return true;
-}
-
-bool decryptPayload(const PacketHeaderWire& header,
-                    const uint8_t* cipher, size_t cipher_len,
-                    const uint8_t* psk, size_t psk_len,
-                    uint8_t* out_plaintext, size_t* out_plain_len)
-{
-    if (!cipher || cipher_len == 0 || !psk || psk_len == 0 || !out_plaintext || !out_plain_len)
-    {
-        return false;
-    }
-
-    if (*out_plain_len < cipher_len)
-    {
-        *out_plain_len = cipher_len;
-        return false;
-    }
-
-    std::memcpy(out_plaintext, cipher, cipher_len);
-    uint8_t nonce[16] = {};
-    const uint64_t packet_id64 = static_cast<uint64_t>(header.id);
-    std::memcpy(nonce, &packet_id64, sizeof(packet_id64));
-    std::memcpy(nonce + sizeof(packet_id64), &header.from, sizeof(header.from));
-    aes_ctr_crypt(psk, psk_len, nonce, out_plaintext, cipher_len);
-    *out_plain_len = cipher_len;
-    return true;
-}
-
-} // namespace meshtastic
-} // namespace chat
diff --git a/apps/esp_idf/src/runtime_config.cpp b/apps/esp_idf/src/runtime_config.cpp
deleted file mode 100644
index d8a59117..00000000
--- a/apps/esp_idf/src/runtime_config.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "apps/esp_idf/runtime_config.h"
-
-#include "sdkconfig.h"
-
-namespace apps::esp_idf::runtime_config
-{
-
-const RuntimeConfig& get()
-{
-#if defined(TRAIL_MATE_ESP_BOARD_TAB5)
-    static const RuntimeConfig kConfig = {
-        "trail-mate-tab5",
-        "Tab5",
-        "tab5_app_loop",
-        10,
-        4096,
-        5,
-    };
-#elif defined(TRAIL_MATE_ESP_BOARD_T_DISPLAY_P4)
-#if defined(CONFIG_TRAIL_MATE_T_DISPLAY_P4_PANEL_RM69A10)
-    static const RuntimeConfig kConfig = {
-        "trail-mate-t-display-p4-amoled",
-        "T-Display-P4 AMOLED",
-        "t_display_p4_amoled_app_loop",
-        10,
-        4096,
-        5,
-    };
-#else
-    static const RuntimeConfig kConfig = {
-        "trail-mate-t-display-p4-tft",
-        "T-Display-P4 TFT",
-        "t_display_p4_tft_app_loop",
-        10,
-        4096,
-        5,
-    };
-#endif
-#else
-    static const RuntimeConfig kConfig = {
-        "trail-mate-idf",
-        "esp-idf",
-        "idf_app_loop",
-        10,
-        4096,
-        5,
-    };
-#endif
-    return kConfig;
-}
-
-} // namespace apps::esp_idf::runtime_config
diff --git a/apps/esp_idf/src/team_ui_store.cpp b/apps/esp_idf/src/team_ui_store.cpp
deleted file mode 100644
index 3a9c0508..00000000
--- a/apps/esp_idf/src/team_ui_store.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-#include "platform/ui/team_ui_store_runtime.h"
-
-#include <algorithm>
-#include <array>
-#include <cstdint>
-#include <cstdio>
-#include <map>
-#include <mutex>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "platform/esp/idf_common/bsp_runtime.h"
-#include "platform/ui/settings_store.h"
-
-namespace team::ui
-{
-
-bool TeamUiMemoryStore::has_snapshot_ = false;
-TeamUiSnapshot TeamUiMemoryStore::snapshot_{};
-
-namespace
-{
-
-constexpr const char* kStoreNs = "team_ui";
-constexpr const char* kSnapshotKey = "snapshot";
-constexpr size_t kMaxChatEntries = 128;
-constexpr size_t kMaxPosSamples = 256;
-constexpr uint16_t kSnapshotVersion = 1;
-constexpr uint32_t kMinValidEpoch = 1577836800U;
-
-class Writer
-{
-  public:
-    void u8(uint8_t value) { data_.push_back(value); }
-    void u32(uint32_t value)
-    {
-        for (int shift = 0; shift < 32; shift += 8)
-        {
-            data_.push_back(static_cast<uint8_t>((value >> shift) & 0xFF));
-        }
-    }
-    void boolean(bool value) { u8(value ? 1 : 0); }
-    void bytes(const uint8_t* ptr, std::size_t len)
-    {
-        u32(static_cast<uint32_t>(len));
-        if (ptr && len > 0)
-        {
-            data_.insert(data_.end(), ptr, ptr + len);
-        }
-    }
-    void text(const std::string& value)
-    {
-        bytes(reinterpret_cast<const uint8_t*>(value.data()), value.size());
-    }
-    const std::vector<uint8_t>& data() const { return data_; }
-
-  private:
-    std::vector<uint8_t> data_;
-};
-
-class Reader
-{
-  public:
-    explicit Reader(const std::vector<uint8_t>& data) : data_(data) {}
-
-    bool u8(uint8_t& value)
-    {
-        if (offset_ + 1 > data_.size())
-        {
-            return false;
-        }
-        value = data_[offset_++];
-        return true;
-    }
-    bool u32(uint32_t& value)
-    {
-        uint8_t b0 = 0, b1 = 0, b2 = 0, b3 = 0;
-        if (u8(b0) == false || u8(b1) == false || u8(b2) == false || u8(b3) == false)
-        {
-            return false;
-        }
-        value = static_cast<uint32_t>(b0) |
-                (static_cast<uint32_t>(b1) << 8) |
-                (static_cast<uint32_t>(b2) << 16) |
-                (static_cast<uint32_t>(b3) << 24);
-        return true;
-    }
-    bool boolean(bool& value)
-    {
-        uint8_t raw = 0;
-        if (u8(raw) == false)
-        {
-            return false;
-        }
-        value = raw != 0;
-        return true;
-    }
-    bool bytes(std::vector<uint8_t>& out)
-    {
-        uint32_t len = 0;
-        if (u32(len) == false || offset_ + len > data_.size())
-        {
-            return false;
-        }
-        out.assign(data_.begin() + static_cast<std::ptrdiff_t>(offset_),
-                   data_.begin() + static_cast<std::ptrdiff_t>(offset_ + len));
-        offset_ += len;
-        return true;
-    }
-    bool text(std::string& out)
-    {
-        std::vector<uint8_t> raw;
-        if (bytes(raw) == false)
-        {
-            return false;
-        }
-        out.assign(raw.begin(), raw.end());
-        return true;
-    }
-
-  private:
-    const std::vector<uint8_t>& data_;
-    std::size_t offset_ = 0;
-};
-
-class TeamUiStorePersisted : public ITeamUiStore
-{
-  public:
-    bool load(TeamUiSnapshot& out) override;
-    void save(const TeamUiSnapshot& in) override;
-    void clear() override;
-};
-
-TeamUiStorePersisted s_persisted_store;
-TeamUiMemoryStore s_memory_store;
-ITeamUiStore* s_store = &s_persisted_store;
-std::mutex s_mutex;
-bool s_snapshot_loaded = false;
-bool s_has_snapshot = false;
-TeamUiSnapshot s_snapshot{};
-std::vector<TeamChatLogEntry> s_chatlog;
-std::vector<TeamPosSample> s_posring;
-std::map<uint32_t, std::string> s_track_paths;
-
-void trim_chatlog()
-{
-    if (s_chatlog.size() > kMaxChatEntries)
-    {
-        s_chatlog.erase(s_chatlog.begin(), s_chatlog.begin() + static_cast<std::ptrdiff_t>(s_chatlog.size() - kMaxChatEntries));
-    }
-}
-
-void trim_posring()
-{
-    if (s_posring.size() > kMaxPosSamples)
-    {
-        s_posring.erase(s_posring.begin(), s_posring.begin() + static_cast<std::ptrdiff_t>(s_posring.size() - kMaxPosSamples));
-    }
-}
-
-void serialize_snapshot(const TeamUiSnapshot& snapshot, Writer& writer)
-{
-    writer.u8(static_cast<uint8_t>(kSnapshotVersion & 0xFF));
-    writer.u8(static_cast<uint8_t>((kSnapshotVersion >> 8) & 0xFF));
-    writer.boolean(snapshot.in_team);
-    writer.boolean(snapshot.pending_join);
-    writer.u32(snapshot.pending_join_started_s);
-    writer.boolean(snapshot.kicked_out);
-    writer.boolean(snapshot.self_is_leader);
-    writer.u32(snapshot.last_event_seq);
-    writer.u32(snapshot.team_chat_unread);
-    writer.boolean(snapshot.has_team_id);
-    writer.bytes(snapshot.team_id.data(), snapshot.team_id.size());
-    writer.text(snapshot.team_name);
-    writer.u32(snapshot.security_round);
-    writer.u32(snapshot.last_update_s);
-    writer.boolean(snapshot.has_team_psk);
-    writer.bytes(snapshot.team_psk.data(), snapshot.team_psk.size());
-    writer.u32(static_cast<uint32_t>(snapshot.members.size()));
-    for (const TeamMemberUi& member : snapshot.members)
-    {
-        writer.u32(member.node_id);
-        writer.text(member.name);
-        writer.boolean(member.online);
-        writer.boolean(member.leader);
-        writer.u32(member.last_seen_s);
-        writer.u8(member.color_index);
-    }
-}
-
-bool deserialize_snapshot(const std::vector<uint8_t>& blob, TeamUiSnapshot& out)
-{
-    Reader reader(blob);
-    uint8_t ver_lo = 0;
-    uint8_t ver_hi = 0;
-    if (reader.u8(ver_lo) == false || reader.u8(ver_hi) == false)
-    {
-        return false;
-    }
-    const uint16_t version = static_cast<uint16_t>(ver_lo | (static_cast<uint16_t>(ver_hi) << 8));
-    if (version != kSnapshotVersion)
-    {
-        return false;
-    }
-
-    TeamUiSnapshot snapshot{};
-    std::vector<uint8_t> team_id_bytes;
-    std::vector<uint8_t> psk_bytes;
-    uint32_t member_count = 0;
-    if (reader.boolean(snapshot.in_team) == false ||
-        reader.boolean(snapshot.pending_join) == false ||
-        reader.u32(snapshot.pending_join_started_s) == false ||
-        reader.boolean(snapshot.kicked_out) == false ||
-        reader.boolean(snapshot.self_is_leader) == false ||
-        reader.u32(snapshot.last_event_seq) == false ||
-        reader.u32(snapshot.team_chat_unread) == false ||
-        reader.boolean(snapshot.has_team_id) == false ||
-        reader.bytes(team_id_bytes) == false ||
-        reader.text(snapshot.team_name) == false ||
-        reader.u32(snapshot.security_round) == false ||
-        reader.u32(snapshot.last_update_s) == false ||
-        reader.boolean(snapshot.has_team_psk) == false ||
-        reader.bytes(psk_bytes) == false ||
-        reader.u32(member_count) == false)
-    {
-        return false;
-    }
-    if (team_id_bytes.size() != snapshot.team_id.size() || psk_bytes.size() != snapshot.team_psk.size())
-    {
-        return false;
-    }
-    std::copy(team_id_bytes.begin(), team_id_bytes.end(), snapshot.team_id.begin());
-    std::copy(psk_bytes.begin(), psk_bytes.end(), snapshot.team_psk.begin());
-    snapshot.members.reserve(member_count);
-    for (uint32_t i = 0; i < member_count; ++i)
-    {
-        TeamMemberUi member{};
-        if (reader.u32(member.node_id) == false ||
-            reader.text(member.name) == false ||
-            reader.boolean(member.online) == false ||
-            reader.boolean(member.leader) == false ||
-            reader.u32(member.last_seen_s) == false ||
-            reader.u8(member.color_index) == false)
-        {
-            return false;
-        }
-        snapshot.members.push_back(std::move(member));
-    }
-
-    out = std::move(snapshot);
-    return true;
-}
-
-void ensure_snapshot_loaded_locked()
-{
-    if (s_snapshot_loaded)
-    {
-        return;
-    }
-    platform::esp::idf_common::bsp_runtime::ensure_nvs_ready();
-    std::vector<uint8_t> blob;
-    if (platform::ui::settings_store::get_blob(kStoreNs, kSnapshotKey, blob))
-    {
-        TeamUiSnapshot snapshot;
-        if (deserialize_snapshot(blob, snapshot))
-        {
-            s_snapshot = std::move(snapshot);
-            s_has_snapshot = true;
-        }
-    }
-    s_snapshot_loaded = true;
-}
-
-void persist_snapshot_locked()
-{
-    Writer writer;
-    serialize_snapshot(s_snapshot, writer);
-    const std::vector<uint8_t>& blob = writer.data();
-    if (blob.empty() == false)
-    {
-        (void)platform::ui::settings_store::put_blob(kStoreNs, kSnapshotKey, blob.data(), blob.size());
-    }
-}
-
-bool ensure_dir(const std::string& path)
-{
-    struct stat st
-    {
-    };
-    if (stat(path.c_str(), &st) == 0)
-    {
-        return (st.st_mode & S_IFDIR) != 0;
-    }
-    return mkdir(path.c_str(), 0777) == 0;
-}
-
-std::string team_hex(const TeamId& team_id)
-{
-    char buf[team_id.size() * 2 + 1] = {0};
-    for (std::size_t i = 0; i < team_id.size(); ++i)
-    {
-        std::snprintf(buf + i * 2, 3, "%02X", team_id[i]);
-    }
-    return std::string(buf);
-}
-
-std::string iso_time(uint32_t ts)
-{
-    if (ts < kMinValidEpoch)
-    {
-        return std::string();
-    }
-    char buf[32] = {0};
-    std::time_t value = static_cast<std::time_t>(ts);
-    std::tm info{};
-    if (gmtime_r(&value, &info) == nullptr)
-    {
-        return std::string();
-    }
-    std::strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%SZ", &info);
-    return std::string(buf);
-}
-
-} // namespace
-
-bool TeamUiMemoryStore::load(TeamUiSnapshot& out)
-{
-    if (has_snapshot_ == false)
-    {
-        return false;
-    }
-    out = snapshot_;
-    return true;
-}
-
-void TeamUiMemoryStore::save(const TeamUiSnapshot& in)
-{
-    snapshot_ = in;
-    has_snapshot_ = true;
-}
-
-void TeamUiMemoryStore::clear()
-{
-    snapshot_ = TeamUiSnapshot{};
-    has_snapshot_ = false;
-}
-
-bool TeamUiStorePersisted::load(TeamUiSnapshot& out)
-{
-    std::lock_guard<std::mutex> lock(s_mutex);
-    ensure_snapshot_loaded_locked();
-    if (s_has_snapshot == false)
-    {
-        return false;
-    }
-    out = s_snapshot;
-    return true;
-}
-
-void TeamUiStorePersisted::save(const TeamUiSnapshot& in)
-{
-    std::lock_guard<std::mutex> lock(s_mutex);
-    ensure_snapshot_loaded_locked();
-    s_snapshot = in;
-    s_has_snapshot = true;
-    persist_snapshot_locked();
-}
-
-void TeamUiStorePersisted::clear()
-{
-    std::lock_guard<std::mutex> lock(s_mutex);
-    s_snapshot = TeamUiSnapshot{};
-    s_has_snapshot = false;
-    s_chatlog.clear();
-    s_posring.clear();
-    s_track_paths.clear();
-    const char* keys[] = {kSnapshotKey};
-    platform::ui::settings_store::remove_keys(kStoreNs, keys, 1);
-}
-
-ITeamUiStore& team_ui_get_store()
-{
-    return s_store ? *s_store : s_memory_store;
-}
-
-void team_ui_set_store(ITeamUiStore* store)
-{
-    s_store = store ? store : &s_persisted_store;
-}
-bool team_ui_append_key_event(const TeamId& team_id,
-                              TeamKeyEventType type,
-                              uint32_t event_seq,
-                              uint32_t ts,
-                              const uint8_t* payload,
-                              size_t len)
-{
-    (void)team_id;
-    (void)type;
-    (void)event_seq;
-    (void)ts;
-    (void)payload;
-    (void)len;
-    return true;
-}
-
-bool team_ui_posring_append(const TeamId& team_id,
-                            uint32_t member_id,
-                            int32_t lat_e7,
-                            int32_t lon_e7,
-                            int16_t alt_m,
-                            uint16_t speed_dmps,
-                            uint32_t ts)
-{
-    (void)team_id;
-    std::lock_guard<std::mutex> lock(s_mutex);
-    TeamPosSample sample{};
-    sample.member_id = member_id;
-    sample.lat_e7 = lat_e7;
-    sample.lon_e7 = lon_e7;
-    sample.alt_m = alt_m;
-    sample.speed_dmps = speed_dmps;
-    sample.ts = ts;
-    s_posring.push_back(sample);
-    trim_posring();
-    return true;
-}
-
-bool team_ui_posring_load_latest(const TeamId& team_id,
-                                 std::vector<TeamPosSample>& out)
-{
-    (void)team_id;
-    std::lock_guard<std::mutex> lock(s_mutex);
-    out = s_posring;
-    return true;
-}
-
-bool team_ui_chatlog_append(const TeamId& team_id,
-                            uint32_t peer_id,
-                            bool incoming,
-                            uint32_t ts,
-                            const std::string& text)
-{
-    std::vector<uint8_t> payload(text.begin(), text.end());
-    return team_ui_chatlog_append_structured(team_id,
-                                             peer_id,
-                                             incoming,
-                                             ts,
-                                             team::proto::TeamChatType::Text,
-                                             payload);
-}
-
-bool team_ui_chatlog_append_structured(const TeamId& team_id,
-                                       uint32_t peer_id,
-                                       bool incoming,
-                                       uint32_t ts,
-                                       team::proto::TeamChatType type,
-                                       const std::vector<uint8_t>& payload)
-{
-    (void)team_id;
-    std::lock_guard<std::mutex> lock(s_mutex);
-    TeamChatLogEntry entry{};
-    entry.incoming = incoming;
-    entry.ts = ts;
-    entry.peer_id = peer_id;
-    entry.type = type;
-    entry.payload = payload;
-    s_chatlog.push_back(std::move(entry));
-    trim_chatlog();
-    return true;
-}
-
-bool team_ui_chatlog_load_recent(const TeamId& team_id,
-                                 size_t max_count,
-                                 std::vector<TeamChatLogEntry>& out)
-{
-    (void)team_id;
-    std::lock_guard<std::mutex> lock(s_mutex);
-    out.clear();
-    if (s_chatlog.empty())
-    {
-        return true;
-    }
-    const size_t count = std::min(max_count, s_chatlog.size());
-    out.insert(out.end(), s_chatlog.end() - static_cast<std::ptrdiff_t>(count), s_chatlog.end());
-    return true;
-}
-
-bool team_ui_save_keys_now(const TeamId& team_id,
-                           uint32_t key_id,
-                           const std::array<uint8_t, team::proto::kTeamChannelPskSize>& psk)
-{
-    (void)key_id;
-    TeamUiSnapshot snapshot{};
-    if (team_ui_get_store().load(snapshot) == false)
-    {
-        snapshot = TeamUiSnapshot{};
-    }
-    snapshot.team_id = team_id;
-    snapshot.has_team_id = true;
-    snapshot.team_psk = psk;
-    snapshot.has_team_psk = true;
-    team_ui_get_store().save(snapshot);
-    return true;
-}
-bool team_ui_append_member_track(const TeamId& team_id,
-                                 uint32_t member_id,
-                                 const team::proto::TeamTrackMessage& track)
-{
-    if (platform::esp::idf_common::bsp_runtime::ensure_sdcard_ready() == false)
-    {
-        return false;
-    }
-    if (track.points.empty() || track.valid_mask == 0)
-    {
-        return false;
-    }
-
-    const std::string base_dir = std::string(platform::esp::idf_common::bsp_runtime::sdcard_mount_point()) + "/team";
-    const std::string team_dir = base_dir + "/" + team_hex(team_id);
-    if (ensure_dir(base_dir) == false || ensure_dir(team_dir) == false)
-    {
-        return false;
-    }
-
-    char name[32] = {0};
-    std::snprintf(name, sizeof(name), "%08lX.gpx", static_cast<unsigned long>(member_id));
-    const std::string path = team_dir + "/" + name;
-
-    FILE* file = std::fopen(path.c_str(), "w");
-    if (file == nullptr)
-    {
-        return false;
-    }
-
-    std::fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n", file);
-    std::fputs("<gpx version=\"1.1\" creator=\"Trail-Mate\" xmlns=\"http://www.topografix.com/GPX/1/1\">\n", file);
-    std::fputs("<trk><trkseg>\n", file);
-    for (size_t i = 0; i < track.points.size(); ++i)
-    {
-        if ((track.valid_mask & (1u << static_cast<uint32_t>(i))) == 0)
-        {
-            continue;
-        }
-        const auto& point = track.points[i];
-        const double lat = static_cast<double>(point.lat_e7) / 1e7;
-        const double lon = static_cast<double>(point.lon_e7) / 1e7;
-        const uint32_t ts = track.start_ts + static_cast<uint32_t>(track.interval_s) * static_cast<uint32_t>(i);
-        std::fprintf(file, "<trkpt lat=\"%.7f\" lon=\"%.7f\">\n", lat, lon);
-        const std::string time = iso_time(ts);
-        if (time.empty() == false)
-        {
-            std::fprintf(file, "  <time>%s</time>\n", time.c_str());
-        }
-        std::fputs("</trkpt>\n", file);
-    }
-    std::fputs("</trkseg></trk></gpx>\n", file);
-    std::fflush(file);
-    std::fclose(file);
-
-    std::lock_guard<std::mutex> lock(s_mutex);
-    s_track_paths[member_id] = path;
-    return true;
-}
-
-bool team_ui_get_member_track_path(const TeamId& team_id,
-                                   uint32_t member_id,
-                                   std::string& out_path)
-{
-    (void)team_id;
-    std::lock_guard<std::mutex> lock(s_mutex);
-    const auto it = s_track_paths.find(member_id);
-    if (it == s_track_paths.end())
-    {
-        out_path.clear();
-        return false;
-    }
-    out_path = it->second;
-    return true;
-}
-
-} // namespace team::ui
diff --git a/apps/esp_idf/targets/t_display_p4/README.md b/apps/esp_idf/targets/t_display_p4/README.md
deleted file mode 100644
index 587bb842..00000000
--- a/apps/esp_idf/targets/t_display_p4/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# `apps/esp_idf/targets/t_display_p4`
-
-This directory is now a family note, not a buildable target.
-
-`LILYGO T-Display-P4` exists in two real display/touch hardware variants, so the old generic
-`TRAIL_MATE_IDF_TARGET=t_display_p4` target was retired in favor of two explicit environments:
-
-- `TRAIL_MATE_IDF_TARGET=t_display_p4_tft`
-- `TRAIL_MATE_IDF_TARGET=t_display_p4_amoled`
-
-Use the target that matches the physical module on your board:
-
-- TFT variant:
-  [t_display_p4_tft](../t_display_p4_tft/README.md)
-- AMOLED variant:
-  [t_display_p4_amoled](../t_display_p4_amoled/README.md)
-
-Shared ownership stays the same:
-
-- `boards/t_display_p4/*`
-  Own shared board-family truth and hardware arbitration.
-- `platform/esp/idf_components/t_display_p4/*`
-  Own shared P4-side display/touch/LVGL runtime.
-- `platform/esp/idf_common/*`
-  Own shared glue only.
-
-The repo still builds only the ESP32-P4 firmware. The ESP32-C6 companion firmware remains an external flashing contract.
diff --git a/apps/esp_idf/targets/t_display_p4_amoled/README.md b/apps/esp_idf/targets/t_display_p4_amoled/README.md
deleted file mode 100644
index 7bac295c..00000000
--- a/apps/esp_idf/targets/t_display_p4_amoled/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# `apps/esp_idf/targets/t_display_p4_amoled`
-
-ESP-IDF target descriptor for the `LILYGO T-Display-P4` AMOLED variant.
-
-Hardware contract:
-
-- display: `RM69A10`
-- touch: `GT9895`
-- resolution: `568x1232`
-- build target: `TRAIL_MATE_IDF_TARGET=t_display_p4_amoled`
-- build directory: `build.t_display_p4_amoled`
-
-Recommended Windows PowerShell workflow:
-
-```powershell
-powershell -ExecutionPolicy Bypass -File tools\vscode\run_idf_task.ps1 -Action build   -Target t_display_p4_amoled
-powershell -ExecutionPolicy Bypass -File tools\vscode\run_idf_task.ps1 -Action flash   -Target t_display_p4_amoled -Port COM6
-powershell -ExecutionPolicy Bypass -File tools\vscode\run_idf_task.ps1 -Action monitor -Target t_display_p4_amoled -Port COM6
-```
-
-Raw `idf.py` example:
-
-```bash
-idf.py -B build.t_display_p4_amoled -DTRAIL_MATE_IDF_TARGET=t_display_p4_amoled reconfigure build
-idf.py -B build.t_display_p4_amoled -DTRAIL_MATE_IDF_TARGET=t_display_p4_amoled -p COM6 flash
-idf.py -B build.t_display_p4_amoled -DTRAIL_MATE_IDF_TARGET=t_display_p4_amoled monitor
-```
-
-This repo still builds only the P4-side firmware. The external C6 firmware is not bundled here.
diff --git a/apps/esp_idf/targets/t_display_p4_tft/README.md b/apps/esp_idf/targets/t_display_p4_tft/README.md
deleted file mode 100644
index b1f55ac8..00000000
--- a/apps/esp_idf/targets/t_display_p4_tft/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# `apps/esp_idf/targets/t_display_p4_tft`
-
-ESP-IDF target descriptor for the `LILYGO T-Display-P4` TFT variant.
-
-Hardware contract:
-
-- display / touch: `HI8561`
-- resolution: `540x1168`
-- build target: `TRAIL_MATE_IDF_TARGET=t_display_p4_tft`
-- build directory: `build.t_display_p4_tft`
-
-Recommended Windows PowerShell workflow:
-
-```powershell
-powershell -ExecutionPolicy Bypass -File tools\vscode\run_idf_task.ps1 -Action build   -Target t_display_p4_tft
-powershell -ExecutionPolicy Bypass -File tools\vscode\run_idf_task.ps1 -Action flash   -Target t_display_p4_tft -Port COM6
-powershell -ExecutionPolicy Bypass -File tools\vscode\run_idf_task.ps1 -Action monitor -Target t_display_p4_tft -Port COM6
-```
-
-Raw `idf.py` example:
-
-```bash
-idf.py -B build.t_display_p4_tft -DTRAIL_MATE_IDF_TARGET=t_display_p4_tft reconfigure build
-idf.py -B build.t_display_p4_tft -DTRAIL_MATE_IDF_TARGET=t_display_p4_tft -p COM6 flash
-idf.py -B build.t_display_p4_tft -DTRAIL_MATE_IDF_TARGET=t_display_p4_tft monitor
-```
-
-This repo still builds only the P4-side firmware. The external C6 firmware is not bundled here.
diff --git a/apps/esp_idf/targets/tab5/README.md b/apps/esp_idf/targets/tab5/README.md
deleted file mode 100644
index f27270f0..00000000
--- a/apps/esp_idf/targets/tab5/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# `apps/esp_idf/targets/tab5`
-
-ESP-IDF target descriptor for Tab5.
-
-This target now owns:
-
-- Tab5-specific `sdkconfig.defaults`
-- future Tab5-specific partition choices if needed
-- target selection / board binding into `platform/esp/boards/tab5`
-
-It does not own generic IDF startup/runtime composition.
-That shared logic lives in `apps/esp_idf` and `platform/esp/idf_common`.
-
-Current wiring:
-
-- selected by `TRAIL_MATE_IDF_TARGET=tab5`
-- built through the shared `apps/esp_idf` component root
-- board-specific runtime selection is handled through `TRAIL_MATE_ESP_BOARD_TAB5`
diff --git a/apps/esp_pio/README.md b/apps/esp_pio/README.md
deleted file mode 100644
index 9cf37505..00000000
--- a/apps/esp_pio/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# `apps/esp_pio`
-
-PlatformIO application shell for the current Arduino-based ESP targets.
-
-Current responsibilities:
-
-- own the Arduino `setup/loop` implementation plus startup composition for the active PlatformIO shell
-- own the thin PlatformIO/Arduino loop + startup adapters that assemble board/runtime hooks
-- own the current shared app-catalog composition for the Arduino/PlatformIO product shell
-- own only PlatformIO-side startup / loop / runtime composition, not per-page wrapper implementations
-- consume shared `modules/*`
-- consume `platform/esp/*` runtime adapters
-
-Current status:
-
-- now wired into the active PlatformIO build through the thin `src/main.cpp` trampoline, with the real Arduino entry living in `apps/esp_pio/src/arduino_entry.cpp` plus startup and loop runtime
-- now treats the menu shell/profile/runtime, boot overlay, watch face, status shell, and startup/loop skeleton as shared `modules/ui_shared` code
-- now mainly owns PlatformIO-specific composition: board bring-up order, Arduino loop hooks, runtime bootstrap, and app-catalog feature gating
-- no longer keeps per-page wrapper files under `apps/esp_pio`; menu entries resolve into shared `modules/ui_shared` page shells
-- the authoritative PlatformIO build entry remains root `platformio.ini`, but the app-shell/page boundary is now settled
diff --git a/apps/esp_pio/include/apps/esp_pio/arduino_entry.h b/apps/esp_pio/include/apps/esp_pio/arduino_entry.h
deleted file mode 100644
index 221c2b45..00000000
--- a/apps/esp_pio/include/apps/esp_pio/arduino_entry.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-namespace apps::esp_pio::arduino_entry
-{
-
-void setup();
-void loop();
-
-} // namespace apps::esp_pio::arduino_entry
diff --git a/apps/esp_pio/include/apps/esp_pio/loop_runtime.h b/apps/esp_pio/include/apps/esp_pio/loop_runtime.h
deleted file mode 100644
index 4921bf62..00000000
--- a/apps/esp_pio/include/apps/esp_pio/loop_runtime.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-namespace apps::esp_pio::loop_runtime
-{
-
-void tick();
-
-} // namespace apps::esp_pio::loop_runtime
diff --git a/apps/esp_pio/include/apps/esp_pio/startup_runtime.h b/apps/esp_pio/include/apps/esp_pio/startup_runtime.h
deleted file mode 100644
index 194c0172..00000000
--- a/apps/esp_pio/include/apps/esp_pio/startup_runtime.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-namespace apps::esp_pio::startup_runtime
-{
-
-void run();
-
-} // namespace apps::esp_pio::startup_runtime
diff --git a/apps/esp_pio/library.json b/apps/esp_pio/library.json
deleted file mode 100644
index d7860379..00000000
--- a/apps/esp_pio/library.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name":  "apps_esp_pio",
-    "version":  "0.1.0",
-    "frameworks":  [
-                       "arduino"
-                   ],
-    "build":  {
-                  "includeDir":  "include",
-                  "srcDir":  "src",
-                  "flags":  [
-                                "-I../../modules/ui_shared/include",
-                                "-I../../modules/core_sys/include",
-                                "-I../../modules/core_chat/include",
-                                "-I../../modules/core_gps/include",
-                                "-I../../modules/core_hostlink/include",
-                                "-I../../modules/core_team/include",
-                                "-I../../platform/esp/common/include"
-                            ]
-              },
-    "dependencies":  [
-                         {
-                             "name":  "esp_arduino_common"
-                         },
-                         {
-                             "name":  "esp_boards"
-                         },
-                         {
-                             "name":  "Preferences"
-                         }
-                     ]
-}
diff --git a/apps/esp_pio/src/arduino_entry.cpp b/apps/esp_pio/src/arduino_entry.cpp
deleted file mode 100644
index ddd2f2db..00000000
--- a/apps/esp_pio/src/arduino_entry.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @file arduino_entry.cpp
- * @brief Arduino setup/loop implementation for the PlatformIO app shell
- */
-
-#include <Arduino.h>
-
-#include "apps/esp_pio/arduino_entry.h"
-#include "apps/esp_pio/loop_runtime.h"
-#include "apps/esp_pio/startup_runtime.h"
-
-#ifndef HAS_GPS
-#define HAS_GPS 1
-#endif
-#ifndef HAS_SD
-#define HAS_SD 1
-#endif
-#ifndef HAS_PSRAM
-#define HAS_PSRAM 1
-#endif
-
-namespace apps::esp_pio::arduino_entry
-{
-
-void setup()
-{
-    apps::esp_pio::startup_runtime::run();
-}
-
-void loop()
-{
-    apps::esp_pio::loop_runtime::tick();
-}
-
-} // namespace apps::esp_pio::arduino_entry
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/arduino_entry.h b/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/arduino_entry.h
deleted file mode 100644
index d0030dad..00000000
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/arduino_entry.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-namespace apps::gat562_mesh_evb_pro::arduino_entry
-{
-
-void setup();
-void loop();
-
-} // namespace apps::gat562_mesh_evb_pro::arduino_entry
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/loop_runtime.h b/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/loop_runtime.h
deleted file mode 100644
index c87f3650..00000000
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/loop_runtime.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-namespace apps::gat562_mesh_evb_pro::loop_runtime
-{
-
-void tick();
-
-} // namespace apps::gat562_mesh_evb_pro::loop_runtime
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/startup_runtime.h b/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/startup_runtime.h
deleted file mode 100644
index 1e3cc9b2..00000000
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/startup_runtime.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-namespace apps::gat562_mesh_evb_pro::startup_runtime
-{
-
-void run();
-
-} // namespace apps::gat562_mesh_evb_pro::startup_runtime
diff --git a/apps/gat562_mesh_evb_pro/library.json b/apps/gat562_mesh_evb_pro/library.json
deleted file mode 100644
index 5da7dd1f..00000000
--- a/apps/gat562_mesh_evb_pro/library.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "gat562_mesh_evb_pro",
-  "version": "0.1.0",
-  "frameworks": [
-    "arduino"
-  ],
-  "platforms": [
-    "nordicnrf52"
-  ],
-  "build": {
-    "includeDir": "include",
-    "srcDir": "src",
-    "flags": [
-      "-Iinclude",
-      "-I../../boards/gat562_mesh_evb_pro/include",
-      "-I../../platform/shared/include",
-      "-I../../modules/core_sys/include",
-      "-I../../modules/core_chat/include",
-      "-I../../modules/core_chat/generated",
-      "-I../../modules/core_gps/include",
-      "-I../../modules/ui_mono_128x64/include",
-      "-I../../modules/ui_shared/include",
-      "-I../../platform/nrf52/arduino_common/include",
-      "-I../.."
-    ]
-  }
-}
diff --git a/apps/gat562_mesh_evb_pro/src/arduino_entry.cpp b/apps/gat562_mesh_evb_pro/src/arduino_entry.cpp
deleted file mode 100644
index 20403290..00000000
--- a/apps/gat562_mesh_evb_pro/src/arduino_entry.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "apps/gat562_mesh_evb_pro/arduino_entry.h"
-
-#include "apps/gat562_mesh_evb_pro/loop_runtime.h"
-#include "apps/gat562_mesh_evb_pro/startup_runtime.h"
-
-namespace apps::gat562_mesh_evb_pro::arduino_entry
-{
-
-void setup()
-{
-    startup_runtime::run();
-}
-
-void loop()
-{
-    loop_runtime::tick();
-}
-
-} // namespace apps::gat562_mesh_evb_pro::arduino_entry
diff --git a/apps/gat562_mesh_evb_pro/src/loop_runtime.cpp b/apps/gat562_mesh_evb_pro/src/loop_runtime.cpp
deleted file mode 100644
index 85074351..00000000
--- a/apps/gat562_mesh_evb_pro/src/loop_runtime.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "apps/gat562_mesh_evb_pro/loop_runtime.h"
-
-#include <Arduino.h>
-
-#include "apps/gat562_mesh_evb_pro/app_runtime_access.h"
-
-namespace apps::gat562_mesh_evb_pro::loop_runtime
-{
-
-void tick()
-{
-    app_runtime_access::tick();
-    delay(2);
-}
-
-} // namespace apps::gat562_mesh_evb_pro::loop_runtime
diff --git a/apps/linux_rpi/CMakeLists.txt b/apps/linux_rpi/CMakeLists.txt
deleted file mode 100644
index 09b9ee2c..00000000
--- a/apps/linux_rpi/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-cmake_minimum_required(VERSION 3.24)
-
-project(TrailMateCardputerZeroRpi VERSION 0.1.0 LANGUAGES C CXX)
-
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    message(FATAL_ERROR
-        "The Cardputer Zero Pi OS device shell must be configured on Linux.")
-endif()
-
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-find_package(Threads REQUIRED)
-
-# ---------------------------------------------------------------------------
-# Shared Linux sources, paths, and helper functions
-# ---------------------------------------------------------------------------
-
-include("${PROJECT_SOURCE_DIR}/../../cmake/TrailMateLinuxSources.cmake")
-
-# ---------------------------------------------------------------------------
-# Common library
-# ---------------------------------------------------------------------------
-
-trailmate_add_linux_common(trailmate_cardputer_zero_linux_common)
-
-# ---------------------------------------------------------------------------
-# LVGL and UI shell
-# ---------------------------------------------------------------------------
-
-include(FetchContent)
-
-set(LV_BUILD_CONF_PATH
-    "${PROJECT_SOURCE_DIR}/../../platform/linux/common/include/lv_conf.h"
-    CACHE PATH "" FORCE)
-set(CONFIG_LV_BUILD_DEMOS OFF CACHE BOOL "" FORCE)
-set(CONFIG_LV_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-
-FetchContent_Declare(
-    lvgl
-    GIT_REPOSITORY https://github.com/lvgl/lvgl.git
-    GIT_TAG v9.4.0
-    GIT_SHALLOW TRUE
-)
-FetchContent_MakeAvailable(lvgl)
-
-trailmate_add_linux_ui_shell(
-    trailmate_cardputer_zero_ui_shell
-    trailmate_cardputer_zero_linux_common
-)
-
-# ---------------------------------------------------------------------------
-# Device executable – framebuffer target
-# ---------------------------------------------------------------------------
-
-add_executable(trailmate_cardputer_zero_device
-    "${TRAIL_MATE_LINUX_RPI_SRC_ROOT}/platform/device/linux_framebuffer_platform.cpp"
-    "${TRAIL_MATE_LINUX_RPI_SRC_ROOT}/platform/device/evdev_input.cpp"
-    src/targets/device_main.cpp
-)
-target_include_directories(trailmate_cardputer_zero_device
-    PRIVATE
-        "${PROJECT_SOURCE_DIR}/src"
-        "${TRAIL_MATE_LINUX_RPI_SRC_ROOT}"
-)
-target_link_libraries(trailmate_cardputer_zero_device
-    PRIVATE
-        trailmate_cardputer_zero_linux_common
-        trailmate_cardputer_zero_ui_shell
-)
diff --git a/apps/linux_rpi/CMakePresets.json b/apps/linux_rpi/CMakePresets.json
deleted file mode 100644
index 25f6f75b..00000000
--- a/apps/linux_rpi/CMakePresets.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "version": 4,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 24,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "linux-device-debug",
-      "displayName": "Linux Debug Device",
-      "description": "Configure the Pi OS framebuffer device target for Cardputer Zero bring-up.",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/device",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "linux-device-debug-build",
-      "displayName": "Build Linux Device",
-      "configurePreset": "linux-device-debug",
-      "targets": [
-        "trailmate_cardputer_zero_device"
-      ]
-    }
-  ]
-}
diff --git a/apps/linux_rpi/README.md b/apps/linux_rpi/README.md
deleted file mode 100644
index dde56cb8..00000000
--- a/apps/linux_rpi/README.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Trail Mate Cardputer Zero Pi OS Device Shell
-
-`apps/linux_rpi` is the real Pi OS device shell for `Cardputer Zero`.
-
-The authoritative architecture constraint for this line is
-[docs/specification/cardputer-zero-adaptation-spec.md](./docs/specification/cardputer-zero-adaptation-spec.md).
-
-This directory now has two responsibilities that should stay distinct:
-
-- a repo-local thin Linux bring-up shell for neutral experiments
-- an SDK-backed device shell that uses `M5Stack_Linux_Libs` for real Cardputer
-  Zero display and input bring-up
-
-The desktop simulator, Windows tooling, WSL validation, and dev-container
-workflow remain in [`apps/linux_sim`](../linux_sim/README.md).
-
-## Layout
-
-- `CMakeLists.txt`: standalone Pi OS device shell build
-- `CMakePresets.json`: Linux preset for the framebuffer device target
-- `SConstruct`: `M5Stack_Linux_Libs` backed device build entrypoint
-- `config_defaults.mk`: default SDK configuration for LVGL 9.5 + fbdev + evdev
-- `main`: clean SDK project component for the real device shell
-- `docs/specification`: current Cardputer Zero boundaries, migration notes, and
-  feature migration checklist
-- `src/targets`: thin device entrypoint
-- `scripts`: Linux helper scripts for build and run
-
-The shared Linux-safe slice used by both `linux_sim` and `linux_rpi` now lives
-in [`platform/linux/common`](../../platform/linux/common/README.md).
-
-## Reference Rule
-
-- `M5Stack_Linux_Libs` is the device-facing SDK baseline we should actually
-  build on.
-- `M5CardputerZero-UserDemo` is reference material only. It can provide board
-  hints such as `fb_st7789v` detection and likely evdev paths, but it is not
-  the engineering template for this repository.
-- New Cardputer Zero work should prefer the SDK-backed path over extending the
-  custom framebuffer shell when the work is truly device-facing.
-- Feature slices must validate the adaptation specification rather than define
-  the architecture retroactively.
-
-## Quick Start
-
-### Pi OS / Linux device build
-
-```bash
-bash scripts/build-device.sh
-```
-
-### Pi OS / Linux device run
-
-```bash
-TRAIL_MATE_FBDEV=/dev/fb0 bash scripts/run-device.sh
-```
-
-### M5Stack Linux SDK build
-
-Set `TRAIL_MATE_M5STACK_LINUX_LIBS_PATH` to your `M5Stack_Linux_Libs`
-checkout, or keep a local checkout at `.tmp/M5Stack_Linux_Libs`.
-
-```bash
-bash scripts/build-sdk-device.sh
-```
-
-### M5Stack Linux SDK run
-
-```bash
-LV_LINUX_FBDEV_DEVICE=/dev/fb0 bash scripts/run-sdk-device.sh
-```
-
-### CMake preset flow
-
-```bash
-cmake --preset linux-device-debug
-cmake --build --preset linux-device-debug-build
-TRAIL_MATE_FBDEV=/dev/fb0 ./build/device/trailmate_cardputer_zero_device
-```
-
-## Notes
-
-- This shell is intentionally thin. It should own device lifecycle and device
-  adapters, not duplicate the simulator tooling.
-- The thin framebuffer shell now reuses the same shared boot splash, boot log,
-  and menu-shell startup flow as the desktop simulator.
-- The `SConstruct` path is the preferred direction for real `Cardputer Zero`
-  hardware adaptation because it rides on the vendor Linux SDK instead of
-  re-solving LVGL and device-driver plumbing from scratch.
-- For iteration on UI behavior, prefer the simulator in `apps/linux_sim`.
-- For actual hardware bring-up on Pi OS, build and run from here.
diff --git a/apps/linux_rpi/SConstruct b/apps/linux_rpi/SConstruct
deleted file mode 100644
index b7d1635b..00000000
--- a/apps/linux_rpi/SConstruct
+++ /dev/null
@@ -1,30 +0,0 @@
-from pathlib import Path
-import os
-
-
-def resolve_sdk_path(project_root: Path) -> Path:
-    configured = os.environ.get("TRAIL_MATE_M5STACK_LINUX_LIBS_PATH") or os.environ.get("M5STACK_LINUX_LIBS_PATH")
-    if configured:
-        return Path(configured).expanduser().resolve()
-
-    local_tmp = project_root.parent.parent / ".tmp" / "M5Stack_Linux_Libs"
-    if local_tmp.exists():
-        return local_tmp.resolve()
-
-    raise RuntimeError(
-        "M5Stack_Linux_Libs SDK not found. Set TRAIL_MATE_M5STACK_LINUX_LIBS_PATH "
-        "to your SDK checkout before running scons."
-    )
-
-
-project_root = Path(os.getcwd()).resolve()
-sdk_path = resolve_sdk_path(project_root)
-
-os.environ["SDK_PATH"] = str(sdk_path)
-os.environ["EXT_COMPONENTS_PATH"] = str(sdk_path.parent / "ext_components")
-
-env = SConscript(
-    str(sdk_path / "tools" / "scons" / "project.py"),
-    variant_dir=os.getcwd(),
-    duplicate=0,
-)
diff --git a/apps/linux_rpi/config_defaults.mk b/apps/linux_rpi/config_defaults.mk
deleted file mode 100644
index 37139fb6..00000000
--- a/apps/linux_rpi/config_defaults.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_LVGL_COMPONENT_ENABLED=y
-CONFIG_LVGL_9_5_SRC=y
-CONFIG_V9_5_LV_USE_CLIB_MALLOC=y
-CONFIG_V9_5_LV_USE_LINUX_FBDEV=y
-CONFIG_V9_5_LV_USE_EVDEV=y
diff --git a/apps/linux_rpi/docs/specification/cardputer-zero-adaptation-spec.md b/apps/linux_rpi/docs/specification/cardputer-zero-adaptation-spec.md
deleted file mode 100644
index 8d034d77..00000000
--- a/apps/linux_rpi/docs/specification/cardputer-zero-adaptation-spec.md
+++ /dev/null
@@ -1,374 +0,0 @@
-# Cardputer Zero Final-Shape Adaptation Specification
-
-This document defines the target architectural shape for adapting
-`Cardputer Zero` into the main `Trail Mate` repository.
-
-It is not a feature checklist.
-It is not a "first vertical slice" note.
-It is the constraint document that later feature slices must obey.
-
-## 1. Why this specification exists
-
-The Linux work already has useful migration notes, simulator bring-up, and a Pi
-OS device shell baseline.
-
-That is not enough.
-
-Without an explicit final-shape specification, a "first shippable slice" can
-quietly become the place where structure is discovered by accident:
-
-- the shortest feature path starts defining the layering
-- platform glue leaks upward into shared modules
-- temporary compatibility decisions become long-term boundaries
-- a runnable page is mistaken for a valid architecture
-
-This document prevents that.
-
-## 2. What must be distinguished
-
-### Final shape vs verification slice
-
-- The final shape defines what the system is allowed to be.
-- A verification slice is only allowed to test whether that shape is workable.
-- A slice must never define the architecture retroactively.
-
-### Shared core vs shared presentation
-
-- `modules/core_*` are not the same kind of shared code as `modules/ui_shared`.
-- Core modules own domain, protocol, policy, and use-case logic.
-- `ui_shared` owns shared presentation composition and LVGL-based UI behavior.
-
-If those are not distinguished, "shared" becomes meaningless and every layer
-starts learning details it should never know.
-
-### Platform contract vs platform implementation
-
-- A runtime/storage/device capability contract is not the same thing as its
-  Linux, ESP, or simulator implementation.
-- Contracts must remain stable enough that both `linux_sim` and `linux_rpi`
-  can cooperate through them without knowing each other's internals.
-
-### App shell vs platform adapter
-
-- `apps/*` compose startup and choose implementations.
-- `platform/*` implements the contracts.
-
-If those two are mixed, every app shell becomes another place where business
-logic and platform details grow.
-
-### Vendor SDK vs repository architecture
-
-- `M5Stack_Linux_Libs` is a device-facing dependency.
-- It is not the source of Trail Mate's architectural boundaries.
-- The SDK should be used below our platform boundary, not define it.
-
-## 3. Normative target layers
-
-The Cardputer Zero adaptation should converge toward these layers.
-
-### Layer A: Shared Core
-
-Primary ownership:
-
-- `modules/core_sys`
-- `modules/core_chat`
-- `modules/core_gps`
-- `modules/core_team`
-- `modules/core_hostlink`
-
-Responsibilities:
-
-- domain objects
-- protocol models and codecs
-- use cases
-- policy/state logic
-- serialization rules
-- pure utility logic
-
-Forbidden knowledge:
-
-- `Arduino.h`
-- ESP-IDF APIs
-- FreeRTOS APIs
-- LVGL types
-- board pin maps
-- Linux device paths
-- SDL types
-- fbdev / evdev / ioctl details
-- vendor SDK types
-
-Rule:
-
-- A core module must be able to compile in a host-side test harness without any
-  platform SDK or UI framework.
-
-### Layer B: Shared Presentation
-
-Primary ownership:
-
-- `modules/ui_shared`
-
-Responsibilities:
-
-- shared menu shell
-- screen composition
-- shared assets
-- shared formatting and presentation helpers
-- LVGL object graphs and screen behavior that are portable across supported
-  targets
-
-Allowed knowledge:
-
-- LVGL
-- shared core modules
-- platform contracts such as `platform::ui::*`
-
-Forbidden knowledge:
-
-- `platform/esp/...` include roots
-- `Preferences`
-- Arduino-only helpers
-- Linux file paths or desktop simulator geometry
-- board GPIO or driver internals
-- vendor SDK types
-
-Rule:
-
-- `ui_shared` may depend on a UI framework.
-- It may not depend on a platform implementation.
-
-### Layer C: Platform Contracts
-
-Primary ownership:
-
-- `modules/core_sys/include/platform/ui/*`
-
-Responsibilities:
-
-- runtime capability interfaces
-- persistence/storage ports
-- transport/runtime capability ports
-- stable value types needed by shared presentation
-
-Examples:
-
-- `device_runtime`
-- `screen_runtime`
-- `time_runtime`
-- `settings_store`
-- `wifi_runtime`
-- `gps_runtime`
-- `lora_runtime`
-- `hostlink_runtime`
-
-Rule:
-
-- Contracts define collaboration.
-- Contracts do not perform platform work.
-
-### Layer D: Platform Implementations
-
-Primary ownership:
-
-- `platform/esp/*`
-- `platform/linux/common`
-- `platform/linux/rpi`
-
-Responsibilities:
-
-- implementing Layer C contracts
-- OS/runtime integration
-- hardware and SDK binding
-- Linux/ESP storage adapters
-- device-specific power, display, input, bus, and transport glue
-
-Allowed knowledge:
-
-- OS APIs
-- SDKs
-- driver headers
-- Linux paths
-- SDL, fbdev, evdev
-- board-specific details
-
-Forbidden ownership:
-
-- domain rules
-- screen composition policy
-- app navigation
-- long-lived business state that belongs in shared modules
-
-### Layer E: App Shells
-
-Primary ownership:
-
-- `apps/esp_pio`
-- `apps/esp_idf`
-- `apps/linux_sim`
-- `apps/linux_rpi`
-
-Responsibilities:
-
-- process / firmware entrypoints
-- target selection
-- composition root wiring
-- startup sequencing
-- build configuration
-
-Forbidden ownership:
-
-- duplicated business logic
-- duplicated shared screen logic
-- platform adapter internals
-
-### Layer F: External Device Baselines
-
-Primary ownership:
-
-- `M5Stack_Linux_Libs`
-
-Responsibilities:
-
-- vendor-provided Linux device SDK concerns
-
-Rule:
-
-- This layer is beneath Trail Mate's platform boundary.
-- It may be consumed by `platform/linux/rpi` and the Pi shell, but it must not
-  become a shortcut around our contracts.
-
-## 4. Legal dependency direction
-
-The dependency direction must be:
-
-```text
-apps/* -> modules/ui_shared -> modules/core_* -> sys utilities
-       -> platform/* ------> contracts in modules/core_sys/include/platform/ui/*
-
-platform/* -> contracts
-platform/* -> OS / SDK / drivers
-
-modules/ui_shared -> contracts
-modules/ui_shared -> core modules
-
-modules/core_* -> no platform implementation
-```
-
-More explicitly:
-
-- `modules/core_*` must not depend on `modules/ui_shared`, `apps/*`, or
-  `platform/*`.
-- `modules/ui_shared` may depend on core modules and platform contracts, but
-  not on `platform/esp/*`, `platform/linux/*`, or app-shell code.
-- `platform/*` may depend on contracts and platform dependencies, but not on
-  app-shell private code.
-- `apps/linux_sim` and `apps/linux_rpi` must share the same presentation layer
-  through contracts, not by duplicating or forking UI logic.
-
-## 5. Known current violations
-
-These are not abstract concerns; the repository already contains concrete
-violations that this specification treats as real debt.
-
-### RESOLVED (2026-05-07): `ui_shared` ESP Arduino build dependency
-
-Previously `modules/ui_shared/library.json` included
-`../../platform/esp/arduino_common/include` and depended on `Preferences`.
-This has been fixed: `library.json` now only references `platform/shared`,
-`core_sys`, `core_chat`, `core_gps`, `core_hostlink`, and `core_team`.
-The boundary checker (`scripts/check_platform_ui_boundaries.py`) confirms this
-passes.
-
-### RESOLVED (2026-05-07): `core_chat` BLE platform-specific tails
-
-Previously `modules/core_chat/src/ble/*` included `Arduino.h` and
-FreeRTOS-related headers. Those files have been cleaned up and no longer
-contain platform-specific includes. All core module boundary checks pass.
-
-### `BoardBase` is not the Linux seam (OPEN)
-
-`platform/shared/include/board/BoardBase.h` remains useful for MCU board
-families.
-It is not the primary abstraction for the Linux line.
-
-Cardputer Zero must integrate through platform contracts, not by pretending to
-be another MCU board subclass.
-
-## 6. Cardputer Zero consequences
-
-These consequences follow directly from the specification.
-
-### `apps/linux_sim`
-
-Owns only:
-
-- desktop process lifecycle
-- simulator chrome and geometry
-- desktop mouse/keyboard mapping
-- simulator-only validation helpers
-
-It must not become a second shared UI tree.
-
-### `apps/linux_rpi`
-
-Owns only:
-
-- Pi OS device entrypoint
-- real device composition root
-- shell wiring for the device target
-
-It must not absorb simulator concerns or copied demo-app structure.
-
-### `platform/linux/common`
-
-Owns:
-
-- Linux implementations of shared platform contracts
-- Linux-safe shell/session helpers that both Linux shells use
-
-It must not absorb desktop-only geometry or Pi-specific device assumptions.
-
-### `platform/linux/rpi`
-
-Owns:
-
-- Pi OS specific integration
-- Cardputer Zero device-facing adapters
-- `M5Stack_Linux_Libs` consumption points
-
-It should host SDK binding where the Linux common layer would otherwise become
-device-specific.
-
-## 7. Structural program before feature work
-
-Feature work should follow this structural program, not replace it.
-
-1. Complete and normalize the contract inventory in
-   `modules/core_sys/include/platform/ui/*`.
-2. Remove ESP-only build/runtime dependencies from `modules/ui_shared`.
-3. Split platform-specific tails out of core-module locations that currently
-   violate Layer A, starting with `core_chat` BLE-facing code.
-4. Keep Linux shared shell code in `platform/linux/common` and keep both Linux
-   app shells thin.
-5. Only after those boundaries are trustworthy, choose a verification slice
-   such as `Settings`.
-
-The first real page is therefore a proof target, not a source of structure.
-
-## 8. Acceptance checks
-
-This specification is only useful if it can reject bad structure.
-
-The Cardputer Zero adaptation is aligned with this specification only when the
-following statements are becoming true:
-
-- A `core_*` module can compile without Arduino, LVGL, board headers, or the
-  vendor SDK.
-- `ui_shared` can compile without ESP-specific include roots or Arduino-only
-  storage primitives.
-- `linux_sim` and `linux_rpi` run the same shared shell/presentation logic
-  without forking it.
-- Replacing a Linux platform implementation does not require changes to the
-  shared core or shared presentation layer.
-- A new page is validated through the contracts instead of inventing new
-  backdoor dependencies.
diff --git a/apps/linux_rpi/docs/specification/feature-migration-checklist.md b/apps/linux_rpi/docs/specification/feature-migration-checklist.md
deleted file mode 100644
index 258ee1c0..00000000
--- a/apps/linux_rpi/docs/specification/feature-migration-checklist.md
+++ /dev/null
@@ -1,179 +0,0 @@
-# Cardputer Zero Feature Migration Checklist
-
-This checklist turns the current Cardputer Zero assessment into a concrete
-implementation order.
-
-It is subordinate to
-[cardputer-zero-adaptation-spec.md](./cardputer-zero-adaptation-spec.md).
-This checklist must validate that specification, not redefine it.
-
-It is intentionally opinionated:
-
-- build the real device shell on top of `M5Stack_Linux_Libs`
-- reuse shared business logic from `modules/*` where the boundary is already
-  real
-- avoid forcing Linux through MCU board abstractions too early
-- keep unsupported hardware features explicitly stubbed instead of half-ported
-
-## 1. Reuse Buckets
-
-### Reuse Now
-
-These pieces are already good candidates for direct reuse in the Linux line:
-
-- `modules/core_sys`
-  portable clock helpers plus shared `platform::ui::*` runtime contracts
-- `modules/core_hostlink`
-  protocol codecs and session state
-- `modules/core_gps`
-  domain models, motion policy, jitter filter, runtime policy/state
-- `modules/core_team`
-  team domain, protocol, and use-case logic
-- `modules/core_chat`
-  `domain`, `usecase`, and most of `infra`
-- `modules/ui_shared`
-  LVGL contracts, shared components, shared assets, and formatting helpers
-
-### Reuse With Thin Linux Adapters
-
-These pieces are still the right seam, but they need a Linux-side runtime or
-storage implementation first:
-
-- `modules/core_sys/include/platform/ui/device_runtime.h`
-- `modules/core_sys/include/platform/ui/time_runtime.h`
-- `modules/core_sys/include/platform/ui/screen_runtime.h`
-- `modules/core_sys/include/platform/ui/settings_store.h`
-- `modules/core_sys/include/platform/ui/wifi_runtime.h`
-- `modules/core_sys/include/platform/ui/tracker_runtime.h`
-- `modules/core_sys/include/platform/ui/hostlink_runtime.h`
-- `modules/core_sys/include/platform/ui/gps_runtime.h`
-- `modules/core_sys/include/platform/ui/lora_runtime.h`
-
-### Do Not Reuse As Linux Baseline
-
-These pieces should not be treated as the Linux foundation:
-
-- `M5CardputerZero-UserDemo`
-  use only for board hints such as framebuffer naming and likely input-device
-  paths
-- `modules/core_chat/src/ble/*`
-  phone-side BLE shells still include Arduino and FreeRTOS details
-- `modules/ui_shared/library.json`
-  current build metadata still points at ESP Arduino include paths and
-  `Preferences`
-- `platform/shared/include/board/*.h`
-  still useful for MCU board families, but not the primary Linux seam
-
-## 2. Structural Compliance Before First Feature Slice
-
-Before choosing the first true page migration, these structural tasks come
-first:
-
-1. make the `platform::ui::*` contract set explicit and complete — DONE
-2. remove ESP Arduino include roots and `Preferences` dependence from
-   `modules/ui_shared` — DONE (2026-05-07, verified by boundary checker)
-3. relocate or split platform-specific code that still lives under `core_*`
-   module trees — DONE (2026-05-07, BLE files cleaned, boundary checker passes)
-4. keep shared Linux shell/session code in `platform/linux/common` instead of
-   app-shell private directories — DONE (ShellSession/CanvasLvglHost in common)
-5. only then select the first verification slice, likely `Settings`
-
-## 3. First Linux Runtime Slice
-
-Build these Linux implementations first under `platform/linux/common`:
-
-1. `platform::ui::settings_store`
-   file-backed key/value persistence for UI and runtime preferences
-2. `platform::ui::time`
-   timezone offset persistence plus local-time helpers
-3. `platform::ui::screen`
-   settings-backed timeout state and no-op/soft Linux sleep bookkeeping
-4. `platform::ui::device`
-   system identity, delays, memory stats, and capability reporting
-
-This is the minimum slice needed to stop `ui_shared` from depending on ESP-only
-runtime code for basic shell behavior.
-
-## 4. First-Batch UI Targets
-
-### Enable First
-
-These areas should be the first UI targets after the runtime slice exists:
-
-- shell bootstrapping
-  `startup_shell`, `menu_layout`, `menu_runtime`, `app_runtime`
-- localization and resource registry
-  locale selection, font selection, and persisted language preferences
-- settings core
-  time zone, screen timeout, vibration preference, debug toggles,
-  notification volume, and any Linux-safe capability flags
-
-### Delay Until Data Adapters Exist
-
-These UI areas should wait until the corresponding Linux storage/transport
-adapters exist:
-
-- `chat`
-  needs Linux chat store and mesh adapter
-- `contacts`
-  needs chat/contact stores and node metadata pipeline
-- `team`
-  needs team event sinks, track source, and chat app-data path
-- `node_info`
-  should follow once chat/contact metadata is flowing
-
-### Stub or Hide Initially
-
-These should start disabled with explicit `is_supported() == false` behavior:
-
-- `gps`
-- `gnss`
-- `tracker`
-- `energy_sweep`
-- `pc_link`
-- `usb`
-- `sstv`
-- `walkie_talkie`
-- Wi-Fi backed pack download and extensions install flows
-
-The rule is simple: if the hardware or transport does not exist on Cardputer
-Zero yet, do not fake a partial port just to keep a menu item visible.
-
-## 5. Second Slice After Runtime
-
-Once the first runtime slice is in place, build the next layer in this order:
-
-1. Linux chat/contact/node stores
-2. Linux local or loopback `IMeshAdapter`
-3. Linux hostlink runtime if a practical transport exists
-4. Linux tracker/file storage adapters
-5. Linux Wi-Fi runtime
-6. Linux GPS runtime
-7. Linux LoRa runtime
-
-This sequence keeps the shared business code moving before the high-risk
-hardware work starts.
-
-## 6. Cardputer Zero Specific Work
-
-These are inherently target-facing and should be implemented specifically for
-the Cardputer Zero shell:
-
-- fbdev device discovery and LVGL display bring-up
-- evdev keyboard mapping for the built-in keypad
-- battery and power-state detection if the Linux userland exposes it
-- mount-point detection for removable storage
-- audio/haptic behavior only if the device exposes a practical Linux path
-
-`M5Stack_Linux_Libs` should own as much of this generic Linux device plumbing as
-possible.
-
-## 7. Current Start Line
-
-The current repository should proceed from here:
-
-1. land the final-shape specification and make migration docs obey it
-2. finish structural compliance on `ui_shared`, contracts, and misplaced
-   platform tails
-3. keep `apps/linux_rpi` on the `M5Stack_Linux_Libs` device shell path
-4. begin feature verification only after the structural program is credible
diff --git a/apps/linux_rpi/docs/specification/migration-path.md b/apps/linux_rpi/docs/specification/migration-path.md
deleted file mode 100644
index 87c456d7..00000000
--- a/apps/linux_rpi/docs/specification/migration-path.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# Cardputer Zero Migration Path
-
-This note captures the recommended way to adapt `Cardputer Zero` into the
-current `Trail Mate` repository without damaging the existing ESP/PlatformIO
-mainline.
-
-This document is subordinate to
-[cardputer-zero-adaptation-spec.md](./cardputer-zero-adaptation-spec.md).
-It describes migration sequencing, not the architectural source of truth.
-
-## Why not bolt Linux onto the current root build
-
-The current root build is still split between:
-
-- root `CMakeLists.txt` / `src/main.cpp` for ESP-IDF
-- root `platformio.ini` for Arduino/PlatformIO targets
-- `modules/*` that are only partially platform-neutral today
-
-Some modules that should eventually become shared still hard-reference ESP or
-Arduino pieces. For example, [modules/ui_shared/library.json](../../../../modules/ui_shared/library.json)
-still includes `../../platform/esp/arduino_common/include` and depends on
-`Preferences`.
-
-That means treating `Cardputer Zero` as "just another board target" right now
-would create the wrong dependency direction: Linux code would end up tunneling
-through ESP-specific layers.
-
-## Why `M5Stack_Linux_Libs` changes the device plan
-
-For the real Cardputer Zero hardware shell, the most valuable external input is
-`M5Stack_Linux_Libs`, not `M5CardputerZero-UserDemo`.
-
-- `M5Stack_Linux_Libs` gives us the reusable device-facing SDK:
-  LVGL integration, fbdev, evdev, and Linux bus helpers.
-- `M5CardputerZero-UserDemo` is useful only as a source of concrete board
-  hints such as framebuffer naming and likely input-device paths.
-- Therefore the correct move is to build our device shell on top of the SDK,
-  while keeping our app architecture and migration discipline independent from
-  the demo app.
-
-## Best adaptation strategy
-
-The recommended sequence is:
-
-1. Keep `apps/linux_sim` as the simulator and developer-tooling shell.
-2. Keep `apps/linux_rpi` as the real Pi OS device shell, and let its preferred
-   device-facing path use `M5Stack_Linux_Libs`.
-3. Establish and obey the final-shape architectural boundaries before feature
-   migration starts defining them by accident.
-4. Extract shared logic from the current repository into `platform/linux/common`
-   and purified `modules/*` only after the responsible layer is explicit.
-
-## Structural order before feature order
-
-Before choosing the first real feature page, the migration should first do:
-
-1. normalize platform contracts
-2. remove ESP-only dependencies from `ui_shared`
-3. split platform-specific tails out of `core_*` module locations
-4. keep Linux shared shell code in `platform/linux/common`
-
-Only then should feature verification slices begin.
-
-## Feature verification order
-
-Use this order when porting real Trail Mate features into the Linux shell after
-the structural program above:
-
-1. runtime and input contracts
-2. presentation-independent app state
-3. render/layout helpers
-4. storage abstractions and file-backed settings
-5. Linux-safe chat, GPS, and team slices
-6. hardware integrations for Pi OS on the real device
-
-## Working rule
-
-Do not start by compiling the whole current app stack under Linux. Start by
-building two thin Linux shells and one neutral shared slice:
-
-- `apps/linux_sim` owns desktop process lifecycle and simulator presentation
-- `apps/linux_rpi` owns Pi OS device lifecycle and the SDK-backed hardware path
-- `platform/linux/common` owns only the Linux-safe code both shells need
-- Linux file/storage adapters should enter the shared slice only when they are
-  no longer device-specific
-
-Then pull shared logic into it deliberately.
-
-That keeps the Linux adaptation incremental, testable, and reversible.
diff --git a/apps/linux_rpi/docs/specification/project-baseline.md b/apps/linux_rpi/docs/specification/project-baseline.md
deleted file mode 100644
index a7ad4ec3..00000000
--- a/apps/linux_rpi/docs/specification/project-baseline.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Trail Mate Cardputer Zero Linux Baseline
-
-This document describes the Linux baseline and development stance.
-The authoritative final-shape constraint document is
-[cardputer-zero-adaptation-spec.md](./cardputer-zero-adaptation-spec.md).
-
-## 1. Current Confusions
-
-- `Cardputer Zero` is a Linux handheld running Pi OS, so it should not be modeled
-  as another MCU firmware board bring-up.
-- `M5Stack_Linux_Libs` and `M5CardputerZero-UserDemo` do not play the same role:
-  the former is a reusable device SDK, while the latter is only a loose demo.
-- The current Trail Mate repository already has the target directory names for
-  Linux, but the existing shared modules are not yet portable enough to be
-  reused directly.
-- The repository root `CMakeLists.txt` is still owned by the ESP-IDF path, so a
-  Linux baseline should not try to hijack the root build.
-- A simulator is required for fast iteration on Windows and WSL, but the
-  simulator must not become the device runtime.
-- A Linux dev container is useful for workflow parity with Pi-OS-like userland,
-  but it is not a substitute for real framebuffer validation on the device.
-
-## 2. Candidate Distinctions
-
-- `apps/linux_sim`
-  The simulator and developer-tooling shell.
-- `apps/linux_rpi`
-  The real Pi OS hardware shell.
-- `M5Stack_Linux_Libs`
-  The device-facing SDK baseline for Cardputer Zero display, input, LVGL, and
-  low-level Linux bus access.
-- `M5CardputerZero-UserDemo`
-  Reference material only for board-specific hints, not a project template.
-- `platform/linux/common`
-  The Linux-safe shared slice used by both shells.
-- `platform/linux/rpi`
-  Pi OS specific platform adapters that remain valuable only where the vendor
-  SDK does not already provide the right primitive.
-
-## 3. Invalid Distinctions
-
-- Do not force current Arduino or ESP-IDF runtime glue into this shell just to
-  make it compile.
-- Do not treat `UserDemo` as a rigorous Linux engineering baseline just because
-  it runs on the target hardware.
-- Do not treat SDL types, framebuffer ioctls, or Linux device paths as shared
-  app concepts.
-- Do not pretend the current `modules/ui_shared` tree is already Linux-safe when
-  it still depends on ESP/Arduino pieces.
-- Do not use this baseline as an excuse to create a second long-term copy of the
-  full Trail Mate business logic.
-- Do not let `apps/linux_rpi` depend on simulator-only code living inside
-  `apps/linux_sim`.
-
-## 4. Engineer Decisions Already Made
-
-- Language: `C++20`
-- Desktop simulator build system: standalone subproject `CMake`
-- Device-facing SDK build system: `M5Stack_Linux_Libs` `SCons` + `Kconfig`
-- Desktop simulator backend: `SDL3`
-- Device SDK baseline: `M5Stack_Linux_Libs`
-- Device reference only: `M5CardputerZero-UserDemo`
-- Device baseline: Linux framebuffer output through the SDK-backed LVGL path
-- Linux dev container baseline: Debian `Trixie`
-- Root build isolation: the Linux shells stay under `apps/linux_sim` and
-  `apps/linux_rpi` and do not replace the repository-root ESP-IDF build
-- Shared Linux slice: `platform/linux/common`
-
-## 5. Current Baseline (updated 2026-05-08)
-
-- The simulator must build on both Windows and Linux. — TARGET (structural work
-  in progress; build gate needs re-verification after P0-P6 changes)
-- The framebuffer device target must build on Linux and be usable on Pi OS. —
-  NOT YET VALIDATED (CMake restructured, evdev adapter wired, but not yet
-  built/run on real Pi OS)
-- The real device adaptation should prefer the vendor Linux SDK over custom
-  framebuffer code whenever the SDK already owns the problem well.
-- The baseline app must stay tiny and intentionally generic.
-- The Linux-safe shared slice belongs in `platform/linux/common`. — DONE
-- Platform boundary violations in `ui_shared/library.json` and `core_chat/src/ble/` —
-  RESOLVED (2026-05-07, verified by boundary checker)
-- LVGL ownership split (ShellSession / CanvasLvglHost / NativeLvglHost) —
-  PARTIAL (structure in place, need build verification and input callback fix)
-- evdev input adapter — PARTIAL (code written, need rpi CMake wiring and real
-  device key sampling)
-- Runtime path/env/capability centralization — PARTIAL (helpers created,
-  route/tracker/dev/settings migrated, remaining runtimes not yet unified)
-- Demo world extraction — PARTIAL (DemoWorld class created, facade still
-  contains legacy loopback mesh and demo seeding; runtime_mode not yet driving
-  composition)
-- Final Cardputer Zero feature work should migrate reusable logic out of this
-  shell split into the main repository structure instead of letting either shell
-  become a permanent fork.
-- Feature-first execution is not allowed to redefine the architecture; feature
-  slices must validate the final-shape specification instead.
-
-## 6. Minimal Externalization
-
-- Use the simulator shell to prove iteration speed, and use the Pi shell to
-  prove real-device viability.
-- Use `M5Stack_Linux_Libs` for LVGL, fbdev, evdev, and low-level device-facing
-  bring-up instead of promoting those responsibilities into Trail Mate too
-  early.
-- Promote code into `platform/linux/common` only after a responsibility is
-  clearly proven to be shared.
-- Keep device-specific Linux details in `platform/linux/rpi`.
-- Keep simulator geometry and desktop input mapping in `apps/linux_sim`.
-
-## 7. Recommended Next Migration Slices
-
-1. Define Linux-safe input/runtime contracts that can outlive this shell.
-2. Extract presentation-independent view state and formatting helpers.
-3. Extract storage and filesystem abstractions.
-4. Move Linux-safe pieces of chat/GPS/team logic only after their side effects
-   are clearly separated from ESP runtime services.
-5. Grow `apps/linux_rpi` only with real device concerns, not with duplicated
-   desktop tooling or copied demo-app structure.
diff --git a/apps/linux_rpi/main/SConstruct b/apps/linux_rpi/main/SConstruct
deleted file mode 100644
index 9b773d18..00000000
--- a/apps/linux_rpi/main/SConstruct
+++ /dev/null
@@ -1,45 +0,0 @@
-import os
-
-Import("env")
-with open(env["PROJECT_TOOL_S"]) as f:
-    exec(f.read())
-
-
-SRCS = Glob("src/*.c*")
-INCLUDE = [ADir("."), ADir("include")]
-PRIVATE_INCLUDE = []
-REQUIREMENTS = ["lvgl_component", "pthread"]
-STATIC_LIB = []
-DYNAMIC_LIB = []
-DEFINITIONS = []
-DEFINITIONS_PRIVATE = []
-LDFLAGS = []
-LINK_SEARCH_PATH = []
-STATIC_FILES = []
-
-lvgl_component = list(
-    filter(lambda component: component["target"] == "lvgl_component", env["COMPONENTS"])
-)[0]
-if "CONFIG_V9_5_LV_USE_SDL" in os.environ:
-    lvgl_component["REQUIREMENTS"] += ["SDL2"]
-    lvgl_component["INCLUDE"] += ["/usr/include/SDL2"]
-    lvgl_component["DEFINITIONS"] += ["-D_REENTRANT"]
-
-
-env["COMPONENTS"].append(
-    {
-        "target": "trailmate_cardputer_zero_m5sdk",
-        "SRCS": SRCS,
-        "INCLUDE": INCLUDE,
-        "PRIVATE_INCLUDE": PRIVATE_INCLUDE,
-        "REQUIREMENTS": REQUIREMENTS,
-        "STATIC_LIB": STATIC_LIB,
-        "DYNAMIC_LIB": DYNAMIC_LIB,
-        "DEFINITIONS": DEFINITIONS,
-        "DEFINITIONS_PRIVATE": DEFINITIONS_PRIVATE,
-        "LDFLAGS": LDFLAGS,
-        "LINK_SEARCH_PATH": LINK_SEARCH_PATH,
-        "STATIC_FILES": STATIC_FILES,
-        "REGISTER": "project",
-    }
-)
diff --git a/apps/linux_rpi/main/include/main.h b/apps/linux_rpi/main/include/main.h
deleted file mode 100644
index 6f70f09b..00000000
--- a/apps/linux_rpi/main/include/main.h
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once
diff --git a/apps/linux_rpi/main/src/main.cpp b/apps/linux_rpi/main/src/main.cpp
deleted file mode 100644
index 8695b703..00000000
--- a/apps/linux_rpi/main/src/main.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "lvgl/lvgl.h"
-
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <unistd.h>
-
-// Trail Mate shared shell session — available when the SDK project is
-// configured to pull in platform/linux/common and modules/*.
-// #include "ui/shell_ui_runner.h"
-
-namespace
-{
-
-const char* getenvDefault(const char* name, const char* fallback)
-{
-    const char* value = std::getenv(name);
-    return (value != nullptr && value[0] != '\0') ? value : fallback;
-}
-
-int detectSt7789vFramebuffer(char* dev_path, std::size_t buf_size)
-{
-    if (dev_path == nullptr || buf_size == 0U) return -1;
-
-    FILE* fp = std::fopen("/proc/fb", "r");
-    if (fp == nullptr) return -1;
-
-    char line[256];
-    int fb_num = -1;
-    while (std::fgets(line, sizeof(line), fp) != nullptr)
-    {
-        if (std::strstr(line, "fb_st7789v") != nullptr &&
-            std::sscanf(line, "%d", &fb_num) == 1)
-        {
-            break;
-        }
-    }
-    std::fclose(fp);
-    if (fb_num < 0) return -1;
-
-    std::snprintf(dev_path, buf_size, "/dev/fb%d", fb_num);
-    return 0;
-}
-
-void logStartupInfo(const char* fbdev, const char* input_dev,
-                    const char* settings_root)
-{
-    std::printf("=== Trail Mate Cardputer Zero ===\n");
-    std::printf("Display:        %s\n", fbdev ? fbdev : "(none)");
-    std::printf("Input:          %s\n", input_dev ? input_dev : "(none)");
-    std::printf("Settings root:  %s\n",
-                settings_root ? settings_root : "(default)");
-    std::printf("Runtime mode:   %s\n",
-                getenvDefault("TRAIL_MATE_RUNTIME_MODE", "local"));
-}
-
-#if LV_USE_EVDEV
-void initLinuxInput(lv_display_t* display)
-{
-    const char* pointer = std::getenv("LV_LINUX_MOUSE_DEVICE");
-    if (pointer != nullptr && pointer[0] != '\0')
-    {
-        lv_indev_t* dev = lv_evdev_create(LV_INDEV_TYPE_POINTER, pointer);
-        lv_indev_set_display(dev, display);
-    }
-
-    const char* keyboard = getenvDefault(
-        "LV_LINUX_KEYBOARD_DEVICE",
-        "/dev/input/by-path/platform-3f804000.i2c-event");
-    if (keyboard != nullptr && keyboard[0] != '\0')
-    {
-        lv_indev_t* dev = lv_evdev_create(LV_INDEV_TYPE_KEYPAD, keyboard);
-        lv_indev_set_display(dev, display);
-        std::printf("Keyboard: %s\n", keyboard);
-    }
-    else
-    {
-        std::fprintf(stderr,
-                     "[device] No keyboard device found. "
-                     "Set LV_LINUX_KEYBOARD_DEVICE to override.\n");
-    }
-}
-#endif
-
-#if LV_USE_LINUX_FBDEV
-void initLinuxDisplay()
-{
-    char detected_path[64] = {0};
-    const char* device = std::getenv("LV_LINUX_FBDEV_DEVICE");
-    if ((device == nullptr || device[0] == '\0') &&
-        detectSt7789vFramebuffer(detected_path, sizeof(detected_path)) == 0)
-    {
-        device = detected_path;
-    }
-    if (device == nullptr || device[0] == '\0')
-    {
-        device = "/dev/fb0";
-    }
-
-    std::printf("Framebuffer: %s\n", device);
-    lv_display_t* display = lv_linux_fbdev_create();
-    if (display == nullptr)
-    {
-        std::fprintf(stderr, "Failed to create Linux fbdev display\n");
-        std::exit(1);
-    }
-    lv_linux_fbdev_set_file(display, device);
-
-#if LV_USE_EVDEV
-    initLinuxInput(display);
-#endif
-}
-#elif LV_USE_SDL
-void initLinuxDisplay()
-{
-    const int width = std::atoi(getenvDefault("LV_SDL_VIDEO_WIDTH", "320"));
-    const int height = std::atoi(getenvDefault("LV_SDL_VIDEO_HEIGHT", "170"));
-
-    lv_display_t* display = lv_sdl_window_create(width, height);
-    if (display == nullptr)
-    {
-        std::fprintf(stderr, "Failed to create SDL display\n");
-        std::exit(1);
-    }
-    lv_sdl_mouse_create();
-    lv_sdl_keyboard_create();
-}
-#else
-#error Unsupported LVGL backend configuration
-#endif
-
-} // namespace
-
-int main()
-{
-    lv_init();
-    initLinuxDisplay();
-
-    logStartupInfo(
-        std::getenv("LV_LINUX_FBDEV_DEVICE"),
-        std::getenv("LV_LINUX_KEYBOARD_DEVICE"),
-        std::getenv("TRAIL_MATE_SETTINGS_ROOT"));
-
-    // ------------------------------------------------------------------
-    // When the SDK build links against platform/linux/common, replace the
-    // bring-up placeholder below with the shared shell session:
-    //
-    //   #include "ui/shell_ui_runner.h"
-    //
-    //   trailmate::cardputer_zero::linux_ui::ShellSession shell;
-    //   if (!shell.begin()) { std::fprintf(stderr, "Shell session failed\n"); return 1; }
-    //
-    //   trailmate::cardputer_zero::linux_ui::NativeLvglHost host{shell};
-    //   while (true) { host.tick(); lv_timer_handler(); usleep(1000); }
-    //
-    // Until then, keep the bring-up UI as a visual confirmation that LVGL,
-    // fbdev, and evdev are working correctly on the target hardware.
-    // ------------------------------------------------------------------
-
-    // Bring-up UI: confirms display and input plumbing work.
-    lv_obj_t* screen = lv_screen_active();
-    lv_obj_set_style_bg_color(screen, lv_color_hex(0x0F172A), 0);
-    lv_obj_set_style_bg_opa(screen, LV_OPA_COVER, 0);
-
-    lv_obj_t* title = lv_label_create(screen);
-    lv_label_set_text(title, "Trail Mate");
-    lv_obj_set_style_text_color(title, lv_color_hex(0xE2E8F0), 0);
-    lv_obj_set_style_text_font(title, &lv_font_montserrat_24, 0);
-    lv_obj_align(title, LV_ALIGN_TOP_LEFT, 14, 12);
-
-    lv_obj_t* subtitle = lv_label_create(screen);
-    lv_label_set_text(subtitle, "Cardputer Zero — SDK bring-up");
-    lv_obj_set_style_text_color(subtitle, lv_color_hex(0x93C5FD), 0);
-    lv_obj_set_style_text_font(subtitle, &lv_font_montserrat_16, 0);
-    lv_obj_align_to(subtitle, title, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 6);
-
-    lv_obj_t* body = lv_label_create(screen);
-    lv_label_set_long_mode(body, LV_LABEL_LONG_WRAP);
-    lv_obj_set_width(body, 292);
-    lv_label_set_text(body,
-                      "LVGL fbdev + evdev + M5Stack_Linux_Libs plumbing verified.\n\n"
-                      "Next: link platform/linux/common and switch this shell to\n"
-                      "Trail Mate shared ShellSession + NativeLvglHost.");
-    lv_obj_set_style_text_color(body, lv_color_hex(0xCBD5E1), 0);
-    lv_obj_set_style_text_font(body, &lv_font_montserrat_14, 0);
-    lv_obj_align(body, LV_ALIGN_TOP_LEFT, 14, 66);
-
-    while (true)
-    {
-        lv_timer_handler();
-        usleep(1000);
-    }
-
-    return 0;
-}
diff --git a/apps/linux_rpi/scripts/build-device.sh b/apps/linux_rpi/scripts/build-device.sh
deleted file mode 100644
index 4c6e8659..00000000
--- a/apps/linux_rpi/scripts/build-device.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-BUILD_DIR="${1:-$ROOT_DIR/build/device}"
-BUILD_TYPE="${BUILD_TYPE:-Debug}"
-
-GENERATOR_ARGS=()
-if command -v ninja >/dev/null 2>&1; then
-  GENERATOR_ARGS=(-G Ninja)
-fi
-
-cmake -S "$ROOT_DIR" -B "$BUILD_DIR" "${GENERATOR_ARGS[@]}" \
-  -DCMAKE_BUILD_TYPE="$BUILD_TYPE"
-
-cmake --build "$BUILD_DIR" --target trailmate_cardputer_zero_device --config "$BUILD_TYPE"
diff --git a/apps/linux_rpi/scripts/build-sdk-device.sh b/apps/linux_rpi/scripts/build-sdk-device.sh
deleted file mode 100644
index d6590634..00000000
--- a/apps/linux_rpi/scripts/build-sdk-device.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-script_dir="$(cd -- "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-project_dir="$(cd -- "${script_dir}/.." && pwd)"
-repo_root="$(cd -- "${project_dir}/../.." && pwd)"
-lvgl_commit="85aa60d18b3d5e5588d7b247abf90198f07c8a63"
-
-if command -v getent >/dev/null 2>&1 && command -v id >/dev/null 2>&1; then
-    detected_home="$(getent passwd "$(id -un)" | cut -d: -f6 || true)"
-    if [[ -n "${detected_home}" && -d "${detected_home}" ]]; then
-        export HOME="${detected_home}"
-    fi
-fi
-
-if [[ -n "${HOME:-}" && -d "${HOME}/.local/bin" ]]; then
-    export PATH="${HOME}/.local/bin:${PATH}"
-fi
-
-if [[ -z "${TRAIL_MATE_M5STACK_LINUX_LIBS_PATH:-}" && -d "${repo_root}/.tmp/M5Stack_Linux_Libs" ]]; then
-    export TRAIL_MATE_M5STACK_LINUX_LIBS_PATH="${repo_root}/.tmp/M5Stack_Linux_Libs"
-fi
-
-if ! command -v scons >/dev/null 2>&1; then
-    echo "scons not found in PATH. Install it first, for example with pip3 install --user scons." >&2
-    exit 1
-fi
-
-prepare_lvgl_sdk_layout() {
-    if [[ -z "${TRAIL_MATE_M5STACK_LINUX_LIBS_PATH:-}" ]]; then
-        return 0
-    fi
-
-    local sdk_root="${TRAIL_MATE_M5STACK_LINUX_LIBS_PATH}"
-    local repo_cache="${sdk_root}/github_source"
-    local archive_path="${repo_cache}/lvgl-${lvgl_commit}.zip"
-    local extracted_path="${repo_cache}/lvgl-${lvgl_commit}"
-    local sdk_lvgl_root="${repo_cache}/lvgl/lvgl_9_5"
-    local sdk_lvgl_path="${sdk_lvgl_root}/lvgl"
-
-    if [[ -d "${sdk_lvgl_path}" ]]; then
-        return 0
-    fi
-
-    mkdir -p "${sdk_lvgl_root}"
-
-    if [[ ! -d "${extracted_path}" && -f "${archive_path}" ]]; then
-        python3 - <<'PY' "${archive_path}" "${repo_cache}"
-import sys
-import zipfile
-
-archive_path = sys.argv[1]
-destination = sys.argv[2]
-with zipfile.ZipFile(archive_path, "r") as archive:
-    archive.extractall(destination)
-PY
-    fi
-
-    if [[ -d "${extracted_path}" ]]; then
-        mv "${extracted_path}" "${sdk_lvgl_path}"
-        return 0
-    fi
-
-    if [[ -d "${sdk_lvgl_root}" && ! -d "${sdk_lvgl_path}" ]]; then
-        shopt -s nullglob dotglob
-        local existing=("${sdk_lvgl_root}"/*)
-        shopt -u nullglob dotglob
-        if (( ${#existing[@]} > 0 )); then
-            mkdir -p "${sdk_lvgl_path}"
-            for entry in "${existing[@]}"; do
-                if [[ "${entry}" != "${sdk_lvgl_path}" ]]; then
-                    mv "${entry}" "${sdk_lvgl_path}/"
-                fi
-            done
-        fi
-    fi
-}
-
-prepare_lvgl_sdk_layout
-
-cd "${project_dir}"
-scons "$@"
diff --git a/apps/linux_rpi/scripts/run-device.sh b/apps/linux_rpi/scripts/run-device.sh
deleted file mode 100644
index faa24e2a..00000000
--- a/apps/linux_rpi/scripts/run-device.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-BUILD_DIR="${1:-$ROOT_DIR/build/device}"
-BUILD_TYPE="${BUILD_TYPE:-Debug}"
-FBDEV="${TRAIL_MATE_FBDEV:-/dev/fb0}"
-
-bash "$ROOT_DIR/scripts/build-device.sh" "$BUILD_DIR"
-
-DEVICE_BIN="$BUILD_DIR/trailmate_cardputer_zero_device"
-if [[ ! -x "$DEVICE_BIN" ]]; then
-  DEVICE_BIN="$BUILD_DIR/$BUILD_TYPE/trailmate_cardputer_zero_device"
-fi
-
-"$DEVICE_BIN" --fbdev "$FBDEV"
diff --git a/apps/linux_rpi/scripts/run-sdk-device.sh b/apps/linux_rpi/scripts/run-sdk-device.sh
deleted file mode 100644
index 88295707..00000000
--- a/apps/linux_rpi/scripts/run-sdk-device.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-script_dir="$(cd -- "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-project_dir="$(cd -- "${script_dir}/.." && pwd)"
-binary="${project_dir}/dist/trailmate_cardputer_zero_m5sdk"
-
-if [[ ! -x "${binary}" ]]; then
-    echo "SDK device binary not found at ${binary}. Build it first with scripts/build-sdk-device.sh." >&2
-    exit 1
-fi
-
-if [[ -z "${LV_LINUX_FBDEV_DEVICE:-}" ]]; then
-    export LV_LINUX_FBDEV_DEVICE=/dev/fb0
-fi
-
-exec "${binary}" "$@"
diff --git a/apps/linux_rpi/src/targets/device_main.cpp b/apps/linux_rpi/src/targets/device_main.cpp
deleted file mode 100644
index be352e38..00000000
--- a/apps/linux_rpi/src/targets/device_main.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <cstdlib>
-#include <exception>
-#include <iostream>
-#include <string>
-#include <string_view>
-
-#include "platform/device/linux_framebuffer_platform.h"
-#include "ui/shell_ui_runner.h"
-
-namespace
-{
-
-std::string parseFramebufferPath(int argc, char** argv)
-{
-    std::string path = "/dev/fb0";
-
-    if (const char* env = std::getenv("TRAIL_MATE_FBDEV"))
-    {
-        if (*env != '\0')
-        {
-            path = env;
-        }
-    }
-
-    for (int index = 1; index < argc; ++index)
-    {
-        const std::string_view current{argv[index]};
-        if (current == "--fbdev" && (index + 1) < argc)
-        {
-            path = argv[index + 1];
-            ++index;
-        }
-    }
-
-    return path;
-}
-
-} // namespace
-
-int main(int argc, char** argv)
-{
-    try
-    {
-        trailmate::cardputer_zero::platform::device::LinuxFramebufferPlatform device{parseFramebufferPath(argc, argv)};
-        trailmate::cardputer_zero::linux_ui::runShellUi(device);
-        return 0;
-    }
-    catch (const std::exception& ex)
-    {
-        std::cerr << "Device startup failed: " << ex.what() << '\n';
-        return 1;
-    }
-}
diff --git a/apps/linux_sim/.dockerignore b/apps/linux_sim/.dockerignore
deleted file mode 100644
index 20cd66d8..00000000
--- a/apps/linux_sim/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build/
-.git/
diff --git a/apps/linux_sim/CMakeLists.txt b/apps/linux_sim/CMakeLists.txt
deleted file mode 100644
index 8fc167f7..00000000
--- a/apps/linux_sim/CMakeLists.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-cmake_minimum_required(VERSION 3.24)
-
-project(TrailMateCardputerZeroSimulator VERSION 0.1.0 LANGUAGES C CXX)
-
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-include(CTest)
-find_package(Threads REQUIRED)
-
-# ---------------------------------------------------------------------------
-# Shared Linux sources, paths, and helper functions
-# ---------------------------------------------------------------------------
-
-include("${PROJECT_SOURCE_DIR}/../../cmake/TrailMateLinuxSources.cmake")
-
-# ---------------------------------------------------------------------------
-# Common library
-# ---------------------------------------------------------------------------
-
-trailmate_add_linux_common(trailmate_cardputer_zero_linux_common)
-
-# ---------------------------------------------------------------------------
-# SDL3 – simulator-only dependency
-# ---------------------------------------------------------------------------
-
-include(FetchContent)
-
-set(SDL_SHARED OFF CACHE BOOL "" FORCE)
-set(SDL_STATIC ON CACHE BOOL "" FORCE)
-set(SDL_TESTS OFF CACHE BOOL "" FORCE)
-set(SDL_TEST_LIBRARY OFF CACHE BOOL "" FORCE)
-set(SDL_DISABLE_INSTALL ON CACHE BOOL "" FORCE)
-
-FetchContent_Declare(
-    SDL3
-    GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
-    GIT_TAG release-3.4.4
-    GIT_SHALLOW TRUE
-)
-FetchContent_MakeAvailable(SDL3)
-
-add_executable(trailmate_cardputer_zero_simulator
-    src/platform/simulator/sdl_simulator.cpp
-    src/targets/simulator_main.cpp
-)
-target_include_directories(trailmate_cardputer_zero_simulator PRIVATE "${PROJECT_SOURCE_DIR}/src")
-target_link_libraries(trailmate_cardputer_zero_simulator
-    PRIVATE trailmate_cardputer_zero_linux_common SDL3::SDL3
-)
-
-# ---------------------------------------------------------------------------
-# LVGL and UI shell
-# ---------------------------------------------------------------------------
-
-set(LV_BUILD_CONF_PATH
-    "${PROJECT_SOURCE_DIR}/../../platform/linux/common/include/lv_conf.h"
-    CACHE PATH "" FORCE)
-set(CONFIG_LV_BUILD_DEMOS OFF CACHE BOOL "" FORCE)
-set(CONFIG_LV_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-
-FetchContent_Declare(
-    lvgl
-    GIT_REPOSITORY https://github.com/lvgl/lvgl.git
-    GIT_TAG v9.4.0
-    GIT_SHALLOW TRUE
-)
-FetchContent_MakeAvailable(lvgl)
-
-trailmate_add_linux_ui_shell(
-    trailmate_cardputer_zero_ui_shell
-    trailmate_cardputer_zero_linux_common
-)
-# Simulator-specific include path for shell_ui_runner internals
-target_include_directories(trailmate_cardputer_zero_ui_shell
-    PRIVATE "${PROJECT_SOURCE_DIR}/src"
-)
-
-target_link_libraries(trailmate_cardputer_zero_simulator
-    PRIVATE trailmate_cardputer_zero_ui_shell
-)
-
-# ---------------------------------------------------------------------------
-# Smoke tests (simulator-only)
-# ---------------------------------------------------------------------------
-
-if(BUILD_TESTING)
-    add_executable(trailmate_cardputer_zero_smoke tests/demo_app_smoke.cpp)
-    target_link_libraries(trailmate_cardputer_zero_smoke
-        PRIVATE trailmate_cardputer_zero_linux_common)
-    add_test(NAME trailmate_cardputer_zero_smoke
-             COMMAND trailmate_cardputer_zero_smoke)
-
-    add_executable(trailmate_cardputer_zero_runtime_smoke
-                   tests/linux_runtime_smoke.cpp)
-    target_link_libraries(trailmate_cardputer_zero_runtime_smoke
-        PRIVATE trailmate_cardputer_zero_linux_common)
-    add_test(NAME trailmate_cardputer_zero_runtime_smoke
-             COMMAND trailmate_cardputer_zero_runtime_smoke)
-
-    add_executable(trailmate_cardputer_zero_path_safety_smoke
-                   tests/path_safety_smoke.cpp)
-    target_link_libraries(trailmate_cardputer_zero_path_safety_smoke
-        PRIVATE trailmate_cardputer_zero_linux_common)
-    add_test(NAME trailmate_cardputer_zero_path_safety_smoke
-             COMMAND trailmate_cardputer_zero_path_safety_smoke)
-endif()
diff --git a/apps/linux_sim/CMakePresets.json b/apps/linux_sim/CMakePresets.json
deleted file mode 100644
index de1f2fb3..00000000
--- a/apps/linux_sim/CMakePresets.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "version": 4,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 24,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "windows-vs2022-debug",
-      "displayName": "Windows VS2022 Debug Simulator",
-      "description": "Generate a Visual Studio 2022 solution for the Cardputer Zero simulator.",
-      "generator": "Visual Studio 17 2022",
-      "binaryDir": "${sourceDir}/build/simulator",
-      "architecture": {
-        "value": "x64"
-      },
-      "cacheVariables": {
-        "BUILD_TESTING": "ON"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      }
-    },
-    {
-      "name": "windows-vs2022-test-debug",
-      "displayName": "Windows VS2022 Debug Tests",
-      "description": "Generate a Visual Studio 2022 solution for Linux-shell smoke tests.",
-      "generator": "Visual Studio 17 2022",
-      "binaryDir": "${sourceDir}/build/test",
-      "architecture": {
-        "value": "x64"
-      },
-      "cacheVariables": {
-        "BUILD_TESTING": "ON"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      }
-    },
-    {
-      "name": "linux-simulator-debug",
-      "displayName": "Linux Debug Simulator",
-      "description": "Configure the Cardputer Zero desktop simulator on Linux.",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/simulator",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "BUILD_TESTING": "ON"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      }
-    },
-    {
-      "name": "linux-test-debug",
-      "displayName": "Linux Debug Tests",
-      "description": "Configure Linux-shell smoke tests on Linux.",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/test",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "BUILD_TESTING": "ON"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "windows-vs2022-debug-build-simulator",
-      "displayName": "Build Windows Simulator",
-      "configurePreset": "windows-vs2022-debug",
-      "configuration": "Debug",
-      "targets": [
-        "trailmate_cardputer_zero_simulator"
-      ]
-    },
-    {
-      "name": "windows-vs2022-debug-build-tests",
-      "displayName": "Build Windows Tests",
-      "configurePreset": "windows-vs2022-test-debug",
-      "configuration": "Debug",
-      "targets": [
-        "trailmate_cardputer_zero_smoke",
-        "trailmate_cardputer_zero_runtime_smoke",
-        "trailmate_cardputer_zero_path_safety_smoke"
-      ]
-    },
-    {
-      "name": "linux-simulator-debug-build",
-      "displayName": "Build Linux Simulator",
-      "configurePreset": "linux-simulator-debug",
-      "targets": [
-        "trailmate_cardputer_zero_simulator"
-      ]
-    },
-    {
-      "name": "linux-test-debug-build",
-      "displayName": "Build Linux Tests",
-      "configurePreset": "linux-test-debug",
-      "targets": [
-        "trailmate_cardputer_zero_smoke",
-        "trailmate_cardputer_zero_runtime_smoke",
-        "trailmate_cardputer_zero_path_safety_smoke"
-      ]
-    }
-  ],
-  "testPresets": [
-    {
-      "name": "windows-vs2022-debug-test",
-      "displayName": "Run Windows Tests",
-      "configurePreset": "windows-vs2022-test-debug",
-      "configuration": "Debug",
-      "output": {
-        "outputOnFailure": true
-      }
-    },
-    {
-      "name": "linux-debug-test",
-      "displayName": "Run Linux Tests",
-      "configurePreset": "linux-test-debug",
-      "output": {
-        "outputOnFailure": true
-      }
-    }
-  ]
-}
diff --git a/apps/linux_sim/README.md b/apps/linux_sim/README.md
deleted file mode 100644
index f662d379..00000000
--- a/apps/linux_sim/README.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# Trail Mate Cardputer Zero Simulator
-
-`apps/linux_sim` is now the simulator and developer-tooling shell for the future
-`Cardputer Zero` adaptation.
-
-This directory intentionally preserves the `LoFiBox-Zero` workflow model for
-desktop development:
-
-- a self-contained `CMake` workspace
-- a Windows/Linux `SDL3` front-view device simulator that now boots the real shared-ui shell
-- scripted build/run flows for Windows, Linux, WSL, and a Linux GUI dev container
-- smoke tests for the extracted Linux-safe shared slice
-
-The real Pi OS device shell now lives in
-[`apps/linux_rpi`](../linux_rpi/README.md).
-
-## What stays here
-
-- simulator entrypoints and shell rendering
-- Windows build ergonomics
-- Linux desktop build ergonomics
-- WSL validation for the Linux shell
-- Docker-based Linux GUI development
-- smoke tests for the Linux-safe shared slice
-
-## What moved out
-
-- Pi OS framebuffer device target
-- Cardputer Zero device-specific documentation
-- device build instructions and device entrypoint
-
-Those now belong to [`apps/linux_rpi`](../linux_rpi/README.md), while the shared
-Linux-safe code they both use now lives under
-[`platform/linux/common`](../../platform/linux/common/README.md).
-
-## Layout
-
-- `CMakeLists.txt`: standalone simulator shell build
-- `CMakePresets.json`: Windows/Linux presets for simulator and tests
-- `src/platform/simulator`: SDL front-view device simulator
-- `src/targets`: simulator entrypoints
-- `tests`: smoke tests for the Linux-safe shared slice
-- `scripts`: helper scripts for build/run/dev-container flows
-- `docker`: Linux GUI dev-container assets
-
-## Quick Start
-
-### Windows simulator
-
-```powershell
-powershell -ExecutionPolicy Bypass -File .\scripts\build-simulator.ps1
-powershell -ExecutionPolicy Bypass -File .\scripts\run-simulator.ps1
-```
-
-### Windows Visual Studio solution
-
-```powershell
-powershell -ExecutionPolicy Bypass -File .\scripts\generate-windows-solution.ps1
-powershell -ExecutionPolicy Bypass -File .\scripts\open-windows-solution.ps1
-```
-
-### Linux simulator
-
-```bash
-bash scripts/build-simulator.sh
-bash scripts/run-simulator.sh
-```
-
-The main simulator target is now the shared-ui milestone: it keeps the original
-device shell and injects the real `ui_shared` menu shell into the simulated
-screen, shows the shared boot splash and boot log, and still uses placeholder
-pages for individual apps.
-
-Virtual keyboard note:
-- left-click on `Fn` / `Shift` / `Ctrl` / `Alt` arms a one-shot modifier for the next key
-- right-click on those modifier buttons toggles a sticky hold state so combos can be clicked with the mouse
-
-### WSL validation
-
-```bash
-bash scripts/wsl-validate.sh
-```
-
-### Linux GUI dev container
-
-From WSL:
-
-```bash
-bash scripts/run-dev-container.sh
-```
-
-From Windows PowerShell:
-
-```powershell
-powershell -ExecutionPolicy Bypass -File .\scripts\run-dev-container.ps1
-```
-
-## Boundary note
-
-This shell is intentionally simulator-first. It should not become the place
-where real Pi OS hardware concerns accumulate. Device-facing code belongs in
-`apps/linux_rpi` and `platform/linux/rpi`, while only the truly shared Linux-safe
-slice should flow into `platform/linux/common`.
diff --git a/apps/linux_sim/docker/dev-simulator.Dockerfile b/apps/linux_sim/docker/dev-simulator.Dockerfile
deleted file mode 100644
index 16d7eac2..00000000
--- a/apps/linux_sim/docker/dev-simulator.Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM debian:trixie-slim
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-    bash \
-    build-essential \
-    ca-certificates \
-    cmake \
-    git \
-    libasound2-dev \
-    libegl-dev \
-    libgl1-mesa-dev \
-    libwayland-dev \
-    libx11-dev \
-    libxcursor-dev \
-    libxext-dev \
-    libxfixes-dev \
-    libxi-dev \
-    libxkbcommon-dev \
-    libxrandr-dev \
-    libxrender-dev \
-    libxss-dev \
-    libxtst-dev \
-    ninja-build \
-    pkg-config \
- && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /workspace/trail-mate/apps/linux_sim
-
-CMD ["/bin/bash"]
diff --git a/apps/linux_sim/scripts/build-dev-container.sh b/apps/linux_sim/scripts/build-dev-container.sh
deleted file mode 100644
index 07733690..00000000
--- a/apps/linux_sim/scripts/build-dev-container.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-IMAGE_TAG="${DEV_CONTAINER_IMAGE:-trailmate-cardputer-zero/dev-simulator:trixie}"
-DOCKERFILE_PATH="${DEV_CONTAINER_DOCKERFILE:-$ROOT_DIR/docker/dev-simulator.Dockerfile}"
-PLATFORM="${DEV_CONTAINER_PLATFORM:-}"
-
-require_command() {
-  local command_name="$1"
-  if command -v "$command_name" >/dev/null 2>&1; then
-    return 0
-  fi
-
-  printf 'Missing required command: %s\n' "$command_name" >&2
-  if [[ "$command_name" == "docker" ]]; then
-    printf 'Install Docker Desktop and enable Linux containers before rerunning this script.\n' >&2
-  fi
-  exit 1
-}
-
-ensure_docker_available() {
-  if docker version >/dev/null 2>&1; then
-    return 0
-  fi
-
-  printf 'Docker is installed but not usable from the current environment.\n' >&2
-  printf 'On Windows + WSL, enable Docker Desktop WSL integration for your distro first.\n' >&2
-  exit 1
-}
-
-print_step() {
-  local message="$1"
-  printf '\n==> %s\n' "$message"
-}
-
-require_command docker
-ensure_docker_available
-
-BUILD_ARGS=(
-  build
-  -f "$DOCKERFILE_PATH"
-  -t "$IMAGE_TAG"
-)
-
-if [[ -n "$PLATFORM" ]]; then
-  BUILD_ARGS+=(--platform "$PLATFORM")
-fi
-
-BUILD_ARGS+=("$ROOT_DIR")
-
-print_step "Building development container image $IMAGE_TAG"
-docker "${BUILD_ARGS[@]}"
-
-printf '\nContainer image build completed successfully.\n'
-printf '  Image tag: %s\n' "$IMAGE_TAG"
-if [[ -n "$PLATFORM" ]]; then
-  printf '  Requested platform: %s\n' "$PLATFORM"
-fi
diff --git a/apps/linux_sim/scripts/build-simulator.ps1 b/apps/linux_sim/scripts/build-simulator.ps1
deleted file mode 100644
index 76656f1c..00000000
--- a/apps/linux_sim/scripts/build-simulator.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-param(
-    [string]$BuildDir = "build/simulator",
-    [string]$BuildType = "Debug"
-)
-
-$ErrorActionPreference = "Stop"
-$root = Resolve-Path (Join-Path $PSScriptRoot "..")
-$resolvedBuildDir = Join-Path $root $BuildDir
-$generatorArgs = @()
-
-if ($env:OS -eq "Windows_NT") {
-    $generatorArgs = @("-G", "Visual Studio 17 2022", "-A", "x64")
-} elseif (Get-Command ninja -ErrorAction SilentlyContinue) {
-    $generatorArgs = @("-G", "Ninja")
-}
-
-cmake -S $root -B $resolvedBuildDir @generatorArgs `
-    "-DCMAKE_BUILD_TYPE=$BuildType" `
-    "-DBUILD_TESTING=ON"
-
-if ($LASTEXITCODE -ne 0) {
-    exit $LASTEXITCODE
-}
-
-cmake --build $resolvedBuildDir --target trailmate_cardputer_zero_simulator --config $BuildType
-exit $LASTEXITCODE
diff --git a/apps/linux_sim/scripts/build-simulator.sh b/apps/linux_sim/scripts/build-simulator.sh
deleted file mode 100644
index 717c3b65..00000000
--- a/apps/linux_sim/scripts/build-simulator.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-BUILD_DIR="${1:-$ROOT_DIR/build/simulator}"
-BUILD_TYPE="${BUILD_TYPE:-Debug}"
-
-GENERATOR_ARGS=()
-if command -v ninja >/dev/null 2>&1; then
-  GENERATOR_ARGS=(-G Ninja)
-fi
-
-cmake -S "$ROOT_DIR" -B "$BUILD_DIR" "${GENERATOR_ARGS[@]}" \
-  -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-  -DBUILD_TESTING=ON
-
-cmake --build "$BUILD_DIR" --target trailmate_cardputer_zero_simulator --config "$BUILD_TYPE"
diff --git a/apps/linux_sim/scripts/generate-windows-solution.ps1 b/apps/linux_sim/scripts/generate-windows-solution.ps1
deleted file mode 100644
index b85b23c9..00000000
--- a/apps/linux_sim/scripts/generate-windows-solution.ps1
+++ /dev/null
@@ -1,27 +0,0 @@
-param(
-    [string]$Preset = "windows-vs2022-debug"
-)
-
-$ErrorActionPreference = "Stop"
-$root = Resolve-Path (Join-Path $PSScriptRoot "..")
-
-if ($env:OS -ne "Windows_NT") {
-    throw "This script is intended for Windows only."
-}
-
-cmake --preset $Preset
-if ($LASTEXITCODE -ne 0) {
-    exit $LASTEXITCODE
-}
-
-$solutionPath = Join-Path $root "build\\simulator\\TrailMateCardputerZero.sln"
-if ($Preset -eq "windows-vs2022-test-debug") {
-    $solutionPath = Join-Path $root "build\\test\\TrailMateCardputerZero.sln"
-}
-
-if (-not (Test-Path $solutionPath)) {
-    throw "Expected Visual Studio solution was not generated: $solutionPath"
-}
-
-Write-Output "Generated Visual Studio solution:"
-Write-Output $solutionPath
diff --git a/apps/linux_sim/scripts/open-windows-solution.ps1 b/apps/linux_sim/scripts/open-windows-solution.ps1
deleted file mode 100644
index 04b9caa7..00000000
--- a/apps/linux_sim/scripts/open-windows-solution.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-param(
-    [string]$Preset = "windows-vs2022-debug"
-)
-
-$ErrorActionPreference = "Stop"
-$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-& (Join-Path $scriptDir "generate-windows-solution.ps1") -Preset $Preset
-if ($LASTEXITCODE -ne 0) {
-    exit $LASTEXITCODE
-}
-
-$root = Resolve-Path (Join-Path $scriptDir "..")
-$solutionPath = Join-Path $root "build\\simulator\\TrailMateCardputerZero.sln"
-if ($Preset -eq "windows-vs2022-test-debug") {
-    $solutionPath = Join-Path $root "build\\test\\TrailMateCardputerZero.sln"
-}
-
-Start-Process $solutionPath
diff --git a/apps/linux_sim/scripts/run-dev-container.ps1 b/apps/linux_sim/scripts/run-dev-container.ps1
deleted file mode 100644
index d77331e8..00000000
--- a/apps/linux_sim/scripts/run-dev-container.ps1
+++ /dev/null
@@ -1,135 +0,0 @@
-[CmdletBinding()]
-param(
-    [string]$Distro = "Ubuntu-24.04",
-    [ValidateSet("simulator", "shell")]
-    [string]$Mode = "simulator",
-    [string]$BuildType = "Debug",
-    [string]$Platform,
-    [string]$ImageTag,
-    [switch]$SkipImageBuild,
-    [Parameter(ValueFromRemainingArguments = $true)]
-    [string[]]$SimulatorArgs
-)
-
-Set-StrictMode -Version Latest
-$ErrorActionPreference = "Stop"
-
-function Convert-ToWslPath {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$WindowsPath
-    )
-
-    $resolvedPath = (Resolve-Path -LiteralPath $WindowsPath).Path
-    $driveName = $resolvedPath.Substring(0, 1).ToLowerInvariant()
-    $restPath = $resolvedPath.Substring(2).Replace('\', '/')
-    return "/mnt/$driveName$restPath"
-}
-
-function Ensure-WslDriveMounted {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$WindowsPath
-    )
-
-    $resolvedPath = (Resolve-Path -LiteralPath $WindowsPath).Path
-    $driveName = $resolvedPath.Substring(0, 1).ToLowerInvariant()
-    if ($driveName -eq 'c') {
-        return
-    }
-
-    $mountPoint = "/mnt/$driveName"
-    & wsl.exe -d $Distro --cd /mnt/c bash -lc "test -d '$mountPoint'"
-    if ($LASTEXITCODE -eq 0) {
-        return
-    }
-
-    $driveSpec = "$($driveName.ToUpperInvariant()):"
-    & wsl.exe -d $Distro -u root --cd /mnt/c bash -lc "mkdir -p '$mountPoint' && mount -t drvfs '$driveSpec' '$mountPoint'"
-    if ($LASTEXITCODE -ne 0) {
-        throw "Failed to mount Windows drive '$($driveName.ToUpperInvariant()):' into WSL at $mountPoint"
-    }
-}
-
-function Add-EnvIfPresent {
-    param(
-        [Parameter(Mandatory = $true)]
-        [string]$Name,
-        [string]$TargetName = $Name,
-        [switch]$ConvertPath
-    )
-
-    $value = [Environment]::GetEnvironmentVariable($Name)
-    if ([string]::IsNullOrWhiteSpace($value)) {
-        return
-    }
-
-    if ($ConvertPath.IsPresent) {
-        if (Test-Path -LiteralPath $value) {
-            Ensure-WslDriveMounted -WindowsPath $value
-            $value = Convert-ToWslPath -WindowsPath $value
-        } elseif ($value -match '^[A-Za-z]:[\\/]' ) {
-            throw "Environment variable '$Name' points to a Windows path that does not exist: $value"
-        }
-    }
-
-    $script:wslArguments += "$TargetName=$value"
-}
-
-$repositoryRoot = Resolve-Path -LiteralPath (Join-Path $PSScriptRoot "..")
-$repositoryRootWsl = Convert-ToWslPath -WindowsPath $repositoryRoot
-
-$wslArguments = @(
-    "-d", $Distro,
-    "--cd", $repositoryRootWsl,
-    "env",
-    "DEV_CONTAINER_MODE=$Mode",
-    "DEV_CONTAINER_BUILD_TYPE=$BuildType"
-)
-
-if ($Platform) {
-    $wslArguments += "DEV_CONTAINER_PLATFORM=$Platform"
-}
-
-if ($ImageTag) {
-    $wslArguments += "DEV_CONTAINER_IMAGE=$ImageTag"
-}
-
-if ($SkipImageBuild.IsPresent) {
-    $wslArguments += "DEV_CONTAINER_SKIP_BUILD=1"
-}
-
-$gpsScalarEnvNames = @(
-    "TRAIL_MATE_GPS_VALID",
-    "TRAIL_MATE_GPS_ENABLED",
-    "TRAIL_MATE_GPS_POWERED",
-    "TRAIL_MATE_GPS_LAT",
-    "TRAIL_MATE_GPS_LNG",
-    "TRAIL_MATE_GPS_ALT_M",
-    "TRAIL_MATE_GPS_SPEED_MPS",
-    "TRAIL_MATE_GPS_COURSE_DEG",
-    "TRAIL_MATE_GPS_SATS",
-    "TRAIL_MATE_GPS_HDOP",
-    "TRAIL_MATE_GPS_FIX",
-    "TRAIL_MATE_GPS_BAUD",
-    "TRAIL_MATE_GPS_DEVICE"
-)
-
-foreach ($envName in $gpsScalarEnvNames) {
-    Add-EnvIfPresent -Name $envName
-}
-
-Add-EnvIfPresent -Name "TRAIL_MATE_SD_ROOT" -TargetName "DEV_CONTAINER_TRAIL_MATE_SD_ROOT_HOST" -ConvertPath
-Add-EnvIfPresent -Name "TRAIL_MATE_SETTINGS_ROOT" -TargetName "DEV_CONTAINER_TRAIL_MATE_SETTINGS_ROOT_HOST" -ConvertPath
-Add-EnvIfPresent -Name "TRAIL_MATE_GPS_NMEA_FILE" -TargetName "DEV_CONTAINER_TRAIL_MATE_GPS_NMEA_FILE_HOST" -ConvertPath
-
-$wslArguments += "bash"
-$wslArguments += "scripts/run-dev-container.sh"
-
-if ($SimulatorArgs -and $SimulatorArgs.Count -gt 0) {
-    $wslArguments += "--"
-    $wslArguments += $SimulatorArgs
-}
-
-& wsl.exe @wslArguments
-exit $LASTEXITCODE
diff --git a/apps/linux_sim/scripts/run-dev-container.sh b/apps/linux_sim/scripts/run-dev-container.sh
deleted file mode 100644
index 5ed9b2f4..00000000
--- a/apps/linux_sim/scripts/run-dev-container.sh
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-REPO_ROOT="$(cd "$ROOT_DIR/../.." && pwd)"
-IMAGE_TAG="${DEV_CONTAINER_IMAGE:-trailmate-cardputer-zero/dev-simulator:trixie}"
-BUILD_TYPE="${DEV_CONTAINER_BUILD_TYPE:-Debug}"
-BUILD_VOLUME_NAME="${DEV_CONTAINER_BUILD_VOLUME:-trailmate-cardputer-zero-dev-build}"
-CONTAINER_BUILD_ROOT="${DEV_CONTAINER_BUILD_ROOT:-/container-build}"
-CONTAINER_BUILD_DIR="${DEV_CONTAINER_BUILD_DIR:-$CONTAINER_BUILD_ROOT/simulator}"
-MODE="${DEV_CONTAINER_MODE:-simulator}"
-SKIP_IMAGE_BUILD="${DEV_CONTAINER_SKIP_BUILD:-0}"
-PLATFORM="${DEV_CONTAINER_PLATFORM:-}"
-CONTAINER_SD_ROOT="${DEV_CONTAINER_CONTAINER_SD_ROOT:-/trailmate-sdroot}"
-CONTAINER_SETTINGS_ROOT="${DEV_CONTAINER_CONTAINER_SETTINGS_ROOT:-/trailmate-settings-root}"
-CONTAINER_GPS_NMEA_FILE="${DEV_CONTAINER_CONTAINER_GPS_NMEA_FILE:-/trailmate-gps-input.nmea}"
-
-require_command() {
-  local command_name="$1"
-  if command -v "$command_name" >/dev/null 2>&1; then
-    return 0
-  fi
-
-  printf 'Missing required command: %s\n' "$command_name" >&2
-  if [[ "$command_name" == "docker" ]]; then
-    printf 'This workflow expects Docker to be available inside WSL.\n' >&2
-    printf 'Enable Docker Desktop WSL integration for your distro, then rerun the script.\n' >&2
-  fi
-  exit 1
-}
-
-ensure_docker_available() {
-  if docker version >/dev/null 2>&1; then
-    return 0
-  fi
-
-  printf 'Docker is installed but not usable from the current environment.\n' >&2
-  printf 'On Windows + WSL, enable Docker Desktop WSL integration for your distro first.\n' >&2
-  exit 1
-}
-
-print_step() {
-  local message="$1"
-  printf '\n==> %s\n' "$message"
-}
-
-resolve_host_path_env() {
-  local converted_name="$1"
-  local direct_name="$2"
-  local value="${!converted_name:-}"
-  if [[ -n "$value" ]]; then
-    printf '%s' "$value"
-    return 0
-  fi
-
-  value="${!direct_name:-}"
-  if [[ "$value" == /* ]]; then
-    printf '%s' "$value"
-    return 0
-  fi
-
-  return 1
-}
-
-append_env_if_present() {
-  local name="$1"
-  if [[ -n "${!name:-}" ]]; then
-    RUN_ARGS+=(-e "${name}=${!name}")
-  fi
-}
-
-simulator_args=()
-while (( $# > 0 )); do
-  case "$1" in
-    --shell)
-      MODE="shell"
-      shift
-      ;;
-    --skip-image-build)
-      SKIP_IMAGE_BUILD=1
-      shift
-      ;;
-    --)
-      shift
-      simulator_args=("$@")
-      break
-      ;;
-    *)
-      simulator_args+=("$1")
-      shift
-      ;;
-  esac
-done
-
-require_command docker
-ensure_docker_available
-
-if (( ! SKIP_IMAGE_BUILD )); then
-  "$ROOT_DIR/scripts/build-dev-container.sh"
-fi
-
-GUI_ARGS=()
-
-if [[ -d /mnt/wslg ]]; then
-  GUI_ARGS+=(-v /mnt/wslg:/mnt/wslg)
-fi
-
-if [[ -d /tmp/.X11-unix ]]; then
-  GUI_ARGS+=(-v /tmp/.X11-unix:/tmp/.X11-unix)
-fi
-
-for environment_name in DISPLAY WAYLAND_DISPLAY XDG_RUNTIME_DIR PULSE_SERVER SDL_AUDIODRIVER SDL_VIDEODRIVER; do
-  if [[ -n "${!environment_name:-}" ]]; then
-    GUI_ARGS+=(-e "${environment_name}=${!environment_name}")
-  fi
-done
-
-if [[ -d /mnt/wslg && -z "${XDG_RUNTIME_DIR:-}" ]]; then
-  GUI_ARGS+=(-e XDG_RUNTIME_DIR=/mnt/wslg/runtime-dir)
-fi
-
-RUN_ARGS=(
-  run
-  --rm
-  -v "$REPO_ROOT:/workspace/trail-mate"
-  -v "$BUILD_VOLUME_NAME:$CONTAINER_BUILD_ROOT"
-  -w /workspace/trail-mate/apps/linux_sim
-  -e "TRAIL_MATE_CONTAINER_BUILD_TYPE=$BUILD_TYPE"
-  -e "TRAIL_MATE_CONTAINER_BUILD_DIR=$CONTAINER_BUILD_DIR"
-)
-
-for env_name in \
-  TRAIL_MATE_GPS_VALID \
-  TRAIL_MATE_GPS_ENABLED \
-  TRAIL_MATE_GPS_POWERED \
-  TRAIL_MATE_GPS_LAT \
-  TRAIL_MATE_GPS_LNG \
-  TRAIL_MATE_GPS_ALT_M \
-  TRAIL_MATE_GPS_SPEED_MPS \
-  TRAIL_MATE_GPS_COURSE_DEG \
-  TRAIL_MATE_GPS_SATS \
-  TRAIL_MATE_GPS_HDOP \
-  TRAIL_MATE_GPS_FIX \
-  TRAIL_MATE_GPS_BAUD; do
-  append_env_if_present "$env_name"
-done
-
-if host_sd_root="$(resolve_host_path_env DEV_CONTAINER_TRAIL_MATE_SD_ROOT_HOST TRAIL_MATE_SD_ROOT)"; then
-  if [[ ! -d "$host_sd_root" ]]; then
-    printf 'Configured host SD root does not exist: %s\n' "$host_sd_root" >&2
-    exit 1
-  fi
-  RUN_ARGS+=(-v "$host_sd_root:$CONTAINER_SD_ROOT:ro")
-  RUN_ARGS+=(-e "TRAIL_MATE_SD_ROOT=$CONTAINER_SD_ROOT")
-fi
-
-if host_settings_root="$(resolve_host_path_env DEV_CONTAINER_TRAIL_MATE_SETTINGS_ROOT_HOST TRAIL_MATE_SETTINGS_ROOT)"; then
-  mkdir -p "$host_settings_root"
-  RUN_ARGS+=(-v "$host_settings_root:$CONTAINER_SETTINGS_ROOT")
-  RUN_ARGS+=(-e "TRAIL_MATE_SETTINGS_ROOT=$CONTAINER_SETTINGS_ROOT")
-fi
-
-if host_nmea_file="$(resolve_host_path_env DEV_CONTAINER_TRAIL_MATE_GPS_NMEA_FILE_HOST TRAIL_MATE_GPS_NMEA_FILE)"; then
-  if [[ ! -f "$host_nmea_file" ]]; then
-    printf 'Configured host GPS NMEA file does not exist: %s\n' "$host_nmea_file" >&2
-    exit 1
-  fi
-  RUN_ARGS+=(-v "$host_nmea_file:$CONTAINER_GPS_NMEA_FILE:ro")
-  RUN_ARGS+=(-e "TRAIL_MATE_GPS_NMEA_FILE=$CONTAINER_GPS_NMEA_FILE")
-fi
-
-if [[ -n "${TRAIL_MATE_GPS_DEVICE:-}" ]]; then
-  RUN_ARGS+=(-e "TRAIL_MATE_GPS_DEVICE=${TRAIL_MATE_GPS_DEVICE}")
-  if [[ "${TRAIL_MATE_GPS_DEVICE}" == /dev/* && -e "${TRAIL_MATE_GPS_DEVICE}" ]]; then
-    RUN_ARGS+=(--device "${TRAIL_MATE_GPS_DEVICE}:${TRAIL_MATE_GPS_DEVICE}")
-  fi
-fi
-
-if [[ "$MODE" == "shell" ]]; then
-  RUN_ARGS+=(-it)
-elif [[ -t 0 && -t 1 ]]; then
-  RUN_ARGS+=(-it)
-fi
-
-if command -v id >/dev/null 2>&1 && [[ "$REPO_ROOT" != /mnt/* ]]; then
-  RUN_ARGS+=(--user "$(id -u):$(id -g)")
-fi
-
-if [[ -n "$PLATFORM" ]]; then
-  RUN_ARGS+=(--platform "$PLATFORM")
-fi
-
-RUN_ARGS+=("${GUI_ARGS[@]}")
-
-print_step "Launching development container in $MODE mode"
-
-if [[ "$MODE" == "shell" ]]; then
-  docker "${RUN_ARGS[@]}" "$IMAGE_TAG" bash
-  exit 0
-fi
-
-docker "${RUN_ARGS[@]}" "$IMAGE_TAG" bash -lc '
-  set -euo pipefail
-  cmake -S . -B "$TRAIL_MATE_CONTAINER_BUILD_DIR" -G Ninja \
-    -DCMAKE_BUILD_TYPE="$TRAIL_MATE_CONTAINER_BUILD_TYPE" \
-    -DBUILD_TESTING=ON
-  cmake --build "$TRAIL_MATE_CONTAINER_BUILD_DIR" --target trailmate_cardputer_zero_simulator --config "$TRAIL_MATE_CONTAINER_BUILD_TYPE"
-  exec "$TRAIL_MATE_CONTAINER_BUILD_DIR/trailmate_cardputer_zero_simulator" "$@"
-' bash "${simulator_args[@]}"
diff --git a/apps/linux_sim/scripts/run-simulator.ps1 b/apps/linux_sim/scripts/run-simulator.ps1
deleted file mode 100644
index 827c2b2d..00000000
--- a/apps/linux_sim/scripts/run-simulator.ps1
+++ /dev/null
@@ -1,29 +0,0 @@
-param(
-    [string]$BuildDir = "build/simulator",
-    [string]$BuildType = "Debug",
-    [int]$Scale = 1,
-    [int]$AutoExitMs = 0
-)
-
-$ErrorActionPreference = "Stop"
-$root = Resolve-Path (Join-Path $PSScriptRoot "..")
-$resolvedBuildDir = Join-Path $root $BuildDir
-
-& (Join-Path $PSScriptRoot "build-simulator.ps1") -BuildDir $BuildDir -BuildType $BuildType
-if ($LASTEXITCODE -ne 0) {
-    exit $LASTEXITCODE
-}
-
-$candidate = Join-Path $resolvedBuildDir "trailmate_cardputer_zero_simulator.exe"
-if (-not (Test-Path $candidate)) {
-    $candidate = Join-Path $resolvedBuildDir $BuildType
-    $candidate = Join-Path $candidate "trailmate_cardputer_zero_simulator.exe"
-}
-
-$arguments = @("--scale", $Scale)
-if ($AutoExitMs -gt 0) {
-    $arguments += @("--auto-exit-ms", $AutoExitMs)
-}
-
-& $candidate @arguments
-exit $LASTEXITCODE
diff --git a/apps/linux_sim/scripts/run-simulator.sh b/apps/linux_sim/scripts/run-simulator.sh
deleted file mode 100644
index a201125e..00000000
--- a/apps/linux_sim/scripts/run-simulator.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-BUILD_DIR="${1:-$ROOT_DIR/build/simulator}"
-BUILD_TYPE="${BUILD_TYPE:-Debug}"
-SCALE="${SIM_SCALE:-1}"
-AUTO_EXIT_MS="${SIM_AUTO_EXIT_MS:-0}"
-
-bash "$ROOT_DIR/scripts/build-simulator.sh" "$BUILD_DIR"
-
-SIM_BIN="$BUILD_DIR/trailmate_cardputer_zero_simulator"
-if [[ ! -x "$SIM_BIN" ]]; then
-  SIM_BIN="$BUILD_DIR/$BUILD_TYPE/trailmate_cardputer_zero_simulator"
-fi
-
-if [[ "$AUTO_EXIT_MS" -gt 0 ]]; then
-  "$SIM_BIN" --scale "$SCALE" --auto-exit-ms "$AUTO_EXIT_MS"
-else
-  "$SIM_BIN" --scale "$SCALE"
-fi
diff --git a/apps/linux_sim/scripts/wsl-validate.sh b/apps/linux_sim/scripts/wsl-validate.sh
deleted file mode 100644
index 1c95d5e6..00000000
--- a/apps/linux_sim/scripts/wsl-validate.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-REPO_ROOT="$(cd "$ROOT_DIR/../.." && pwd)"
-BUILD_TYPE="${BUILD_TYPE:-Debug}"
-TEST_BUILD_DIR="${WSL_TEST_BUILD_DIR:-$ROOT_DIR/build/wsl/test}"
-SIM_BUILD_DIR="${WSL_SIM_BUILD_DIR:-$ROOT_DIR/build/wsl/simulator}"
-RPI_ROOT_DIR="$(cd "$ROOT_DIR/../linux_rpi" && pwd)"
-DEVICE_BUILD_DIR="${WSL_DEVICE_BUILD_DIR:-$RPI_ROOT_DIR/build/wsl/device}"
-UCONSOLE_ROOT_DIR="$(cd "$ROOT_DIR/../linux_uconsole" && pwd)"
-UCONSOLE_BUILD_DIR="${WSL_UCONSOLE_BUILD_DIR:-$UCONSOLE_ROOT_DIR/build/wsl/uconsole}"
-
-require_command() {
-  local command_name="$1"
-  if command -v "$command_name" >/dev/null 2>&1; then
-    return 0
-  fi
-
-  printf 'Missing required command: %s\n' "$command_name" >&2
-  printf 'Install the Linux build toolchain first, for example:\n' >&2
-  printf '  sudo apt update && sudo apt install -y build-essential cmake ninja-build pkg-config git\n' >&2
-  exit 1
-}
-
-print_step() {
-  local message="$1"
-  printf '\n==> %s\n' "$message"
-}
-
-GENERATOR_ARGS=()
-if command -v ninja >/dev/null 2>&1; then
-  GENERATOR_ARGS=(-G Ninja)
-fi
-
-require_command cmake
-require_command ctest
-require_command git
-require_command python3
-
-if command -v pkg-config >/dev/null 2>&1; then
-  REQUIRED_PKGCONFIG_MODULES=(
-    alsa
-    libcurl
-    sqlite3
-    wayland-client
-    xkbcommon
-    gtk4
-    x11
-    xrandr
-    xrender
-    xi
-    xext
-    xcursor
-    xfixes
-    xscrnsaver
-    xtst
-    egl
-    gl
-  )
-
-  MISSING_MODULES=()
-  for module_name in "${REQUIRED_PKGCONFIG_MODULES[@]}"; do
-    if ! pkg-config --exists "$module_name"; then
-      MISSING_MODULES+=("$module_name")
-    fi
-  done
-
-  if (( ${#MISSING_MODULES[@]} > 0 )); then
-    printf 'Missing required Linux development packages for the SDL simulator.\n' >&2
-    printf 'Missing pkg-config modules: %s\n' "${MISSING_MODULES[*]}" >&2
-    printf 'On Ubuntu/WSL, install the packages documented in README.md before rerunning this script.\n' >&2
-    exit 1
-  fi
-fi
-
-print_step "Verifying shared/platform UI boundaries"
-python3 "$REPO_ROOT/scripts/check_platform_ui_boundaries.py"
-
-print_step "Configuring Linux-shell tests into $TEST_BUILD_DIR"
-cmake -S "$ROOT_DIR" -B "$TEST_BUILD_DIR" "${GENERATOR_ARGS[@]}" \
-  -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-  -DBUILD_TESTING=ON
-
-print_step "Building Linux-shell tests"
-cmake --build "$TEST_BUILD_DIR" --target trailmate_cardputer_zero_smoke --config "$BUILD_TYPE"
-cmake --build "$TEST_BUILD_DIR" --target trailmate_cardputer_zero_runtime_smoke --config "$BUILD_TYPE"
-cmake --build "$TEST_BUILD_DIR" --target trailmate_cardputer_zero_path_safety_smoke --config "$BUILD_TYPE"
-
-print_step "Running Linux-shell tests"
-ctest --test-dir "$TEST_BUILD_DIR" --build-config "$BUILD_TYPE" --output-on-failure
-
-print_step "Configuring Linux simulator into $SIM_BUILD_DIR"
-cmake -S "$ROOT_DIR" -B "$SIM_BUILD_DIR" "${GENERATOR_ARGS[@]}" \
-  -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
-  -DBUILD_TESTING=ON
-
-print_step "Building Linux simulator"
-cmake --build "$SIM_BUILD_DIR" --target trailmate_cardputer_zero_simulator --config "$BUILD_TYPE"
-
-print_step "Configuring Linux framebuffer device shell into $DEVICE_BUILD_DIR"
-cmake -S "$RPI_ROOT_DIR" -B "$DEVICE_BUILD_DIR" "${GENERATOR_ARGS[@]}" \
-  -DCMAKE_BUILD_TYPE="$BUILD_TYPE"
-
-print_step "Building Linux framebuffer device shell"
-cmake --build "$DEVICE_BUILD_DIR" --target trailmate_cardputer_zero_device --config "$BUILD_TYPE"
-
-print_step "Configuring uConsole Linux shell into $UCONSOLE_BUILD_DIR"
-cmake -S "$UCONSOLE_ROOT_DIR" -B "$UCONSOLE_BUILD_DIR" "${GENERATOR_ARGS[@]}" \
-  -DCMAKE_BUILD_TYPE="$BUILD_TYPE"
-
-print_step "Building uConsole Linux shell"
-cmake --build "$UCONSOLE_BUILD_DIR" --target trailmate_uconsole --config "$BUILD_TYPE"
-
-printf '\nWSL validation completed successfully.\n'
-printf '  Tests build dir: %s\n' "$TEST_BUILD_DIR"
-printf '  Simulator build dir: %s\n' "$SIM_BUILD_DIR"
-printf '  Device build dir: %s\n' "$DEVICE_BUILD_DIR"
-printf '  uConsole build dir: %s\n' "$UCONSOLE_BUILD_DIR"
-printf '  To launch the Linux simulator from WSL later:\n'
-printf '    %s\n' "\"$SIM_BUILD_DIR/trailmate_cardputer_zero_simulator\" --scale 1"
diff --git a/apps/linux_sim/src/platform/simulator/sdl_simulator.cpp b/apps/linux_sim/src/platform/simulator/sdl_simulator.cpp
deleted file mode 100644
index bee22d1a..00000000
--- a/apps/linux_sim/src/platform/simulator/sdl_simulator.cpp
+++ /dev/null
@@ -1,1135 +0,0 @@
-#include "platform/simulator/sdl_simulator.h"
-
-#include <algorithm>
-#include <cctype>
-#include <chrono>
-#include <cstdint>
-#include <initializer_list>
-#include <memory>
-#include <optional>
-#include <stdexcept>
-#include <string>
-#include <string_view>
-#include <utility>
-#include <vector>
-
-#include <SDL3/SDL.h>
-
-#include "app/input_event.h"
-#include "core/bitmap_font.h"
-#include "core/canvas.h"
-#include "core/display_profile.h"
-
-namespace trailmate::cardputer_zero::platform::simulator
-{
-namespace
-{
-
-using core::rgba;
-
-constexpr int kDeviceWidth = 800;
-constexpr int kDeviceHeight = 520;
-constexpr int kScreenWidth = core::kDisplayWidth;
-constexpr int kScreenHeight = core::kDisplayHeight;
-constexpr int kScreenFrameRectX = 180;
-constexpr int kScreenFrameRectY = 26;
-constexpr int kScreenFrameRectWidth = 374;
-constexpr int kScreenFrameRectHeight = 202;
-constexpr int kScreenLipInsetX = 9;
-constexpr int kScreenLipInsetY = 11;
-constexpr int kScreenLipInsetBottom = 9;
-constexpr int kScreenLipWidth = kScreenFrameRectWidth - (kScreenLipInsetX * 2);
-constexpr int kScreenLipHeight = kScreenFrameRectHeight - kScreenLipInsetY - kScreenLipInsetBottom;
-constexpr int kScreenOpeningInset = 6;
-constexpr int kScreenOpeningWidth = kScreenWidth + (kScreenOpeningInset * 2);
-constexpr int kScreenOpeningHeight = kScreenHeight + (kScreenOpeningInset * 2);
-constexpr int kScreenOpeningX = kScreenFrameRectX + kScreenLipInsetX + ((kScreenLipWidth - kScreenOpeningWidth) / 2);
-constexpr int kScreenOpeningY = kScreenFrameRectY + kScreenLipInsetY + ((kScreenLipHeight - kScreenOpeningHeight) / 2);
-constexpr int kScreenX = kScreenOpeningX + kScreenOpeningInset;
-constexpr int kScreenY = kScreenOpeningY + kScreenOpeningInset;
-constexpr int kRightPanelX = 592;
-constexpr int kRightPanelY = 24;
-constexpr int kRightPanelWidth = 166;
-constexpr int kRightPanelHeight = 226;
-constexpr int kPowerSwitchWidth = 58;
-constexpr int kPowerSwitchHeight = 34;
-constexpr int kPowerSwitchX = kRightPanelX + ((kRightPanelWidth - kPowerSwitchWidth) / 2);
-constexpr int kPowerSwitchY = 54;
-constexpr int kPanelButtonWidth = 62;
-constexpr int kPanelButtonHeight = 22;
-constexpr int kPanelButtonGap = 8;
-constexpr int kPanelButtonsTotalWidth = (kPanelButtonWidth * 2) + kPanelButtonGap;
-constexpr int kHomeButtonX = kRightPanelX + ((kRightPanelWidth - kPanelButtonsTotalWidth) / 2);
-constexpr int kNextButtonX = kHomeButtonX + kPanelButtonWidth + kPanelButtonGap;
-constexpr int kPanelButtonsY = 185;
-constexpr int kKeyboardDeckX = 18;
-constexpr int kKeyboardDeckY = 240;
-constexpr int kKeyboardDeckWidth = 740;
-constexpr int kKeyboardDeckHeight = 242;
-constexpr int kKeyboardDeckSeparatorInset = 18;
-constexpr int kKeyboardDeckSeparatorX = kKeyboardDeckX + kKeyboardDeckSeparatorInset;
-constexpr int kKeyboardDeckSeparatorWidth = kKeyboardDeckWidth - (kKeyboardDeckSeparatorInset * 2);
-constexpr int kKeyUnitWidth = 54;
-constexpr int kKeyGap = 8;
-constexpr int kKeyAreaHeight = 42;
-constexpr int kKeyboardRowStartX = 36;
-constexpr int kKeyboardRow1Y = 254;
-constexpr int kKeyboardRowGapY = 54;
-constexpr auto kPressFlash = std::chrono::milliseconds(140);
-
-constexpr auto kBackdrop = rgba(6, 34, 58);
-constexpr auto kShellShadow = rgba(80, 88, 96);
-constexpr auto kShell = rgba(223, 225, 227);
-constexpr auto kShellBorder = rgba(188, 191, 194);
-constexpr auto kInset = rgba(210, 212, 214);
-constexpr auto kScreenFrame = rgba(18, 20, 24);
-constexpr auto kScreenLip = rgba(32, 35, 40);
-constexpr auto kLabelDark = rgba(40, 43, 47);
-constexpr auto kKeyBody = rgba(26, 29, 33);
-constexpr auto kKeyPressed = rgba(81, 101, 122);
-constexpr auto kAccentPink = rgba(220, 91, 142);
-constexpr auto kAccentBlue = rgba(74, 155, 240);
-constexpr auto kAccentOrange = rgba(243, 150, 63);
-constexpr auto kAccentYellow = rgba(245, 217, 84);
-constexpr auto kStickerWhite = rgba(248, 248, 248);
-constexpr auto kPowerRed = rgba(221, 69, 63);
-constexpr auto kPowerRedPressed = rgba(245, 96, 88);
-constexpr auto kPanelDark = rgba(70, 74, 79);
-
-enum class ButtonStyle
-{
-    Keyboard,
-    Panel,
-    Switch,
-};
-
-enum class LatchMode
-{
-    None,
-    OneShot,
-    Sticky,
-};
-
-enum class LegendSymbol
-{
-    None,
-    ArrowLeft,
-    ArrowRight,
-    ArrowUp,
-    ArrowDown,
-    BackArrow,
-    SpaceBar,
-};
-
-struct Rect
-{
-    int x{};
-    int y{};
-    int width{};
-    int height{};
-
-    [[nodiscard]] bool contains(int px, int py) const noexcept
-    {
-        return px >= x && py >= y && px < (x + width) && py < (y + height);
-    }
-};
-
-struct KeyboardLegend
-{
-    std::string text{};
-    core::Color color{rgba(40, 43, 47)};
-    LegendSymbol symbol{LegendSymbol::None};
-    bool badge{false};
-    core::Color badge_fill{rgba(0, 0, 0, 0)};
-};
-
-struct VirtualButton
-{
-    Rect bounds{};
-    app::InputEvent event{};
-    KeyboardLegend primary_legend{};
-    KeyboardLegend secondary_legend{};
-    std::vector<std::string> highlight_aliases{};
-    ButtonStyle style{ButtonStyle::Keyboard};
-    std::chrono::steady_clock::time_point pressed_until{};
-    LatchMode latch_mode{LatchMode::None};
-};
-
-[[nodiscard]] std::string upperCopy(std::string_view value)
-{
-    std::string result{};
-    result.reserve(value.size());
-
-    for (const char ch : value)
-    {
-        result.push_back(static_cast<char>(std::toupper(static_cast<unsigned char>(ch))));
-    }
-
-    return result;
-}
-
-void requireSdl(bool condition, std::string_view step)
-{
-    if (!condition)
-    {
-        throw std::runtime_error(std::string(step) + ": " + SDL_GetError());
-    }
-}
-
-template <typename T>
-T* requireSdl(T* pointer, std::string_view step)
-{
-    if (!pointer)
-    {
-        throw std::runtime_error(std::string(step) + ": " + SDL_GetError());
-    }
-
-    return pointer;
-}
-
-} // namespace
-
-struct SdlSimulator::Impl
-{
-    SDL_Window* window{};
-    SDL_Renderer* renderer{};
-    SDL_Texture* texture{};
-    bool running{true};
-    int scale{1};
-    int window_width{};
-    int window_height{};
-    core::Canvas device_canvas{kDeviceWidth, kDeviceHeight};
-    std::vector<std::uint32_t> staging = std::vector<std::uint32_t>(static_cast<std::size_t>(kDeviceWidth * kDeviceHeight));
-    std::vector<app::InputEvent> input_queue{};
-    std::vector<VirtualButton> buttons{};
-};
-
-[[nodiscard]] bool isModifierKey(app::InputKey key) noexcept
-{
-    switch (key)
-    {
-    case app::InputKey::Fn:
-    case app::InputKey::Ctrl:
-    case app::InputKey::Alt:
-    case app::InputKey::Shift:
-        return true;
-    default:
-        return false;
-    }
-}
-
-[[nodiscard]] bool isModifierButton(const VirtualButton& button) noexcept
-{
-    return isModifierKey(button.event.key);
-}
-
-[[nodiscard]] KeyboardLegend textLegend(std::string text, core::Color color = kLabelDark)
-{
-    return KeyboardLegend{std::move(text), color, LegendSymbol::None, false, rgba(0, 0, 0, 0)};
-}
-
-[[nodiscard]] KeyboardLegend badgeLegend(std::string text, core::Color text_color, core::Color badge_fill)
-{
-    return KeyboardLegend{std::move(text), text_color, LegendSymbol::None, true, badge_fill};
-}
-
-[[nodiscard]] KeyboardLegend symbolLegend(LegendSymbol symbol, core::Color color = kLabelDark)
-{
-    return KeyboardLegend{{}, color, symbol, false, rgba(0, 0, 0, 0)};
-}
-
-void addKeyboardButton(
-    std::vector<VirtualButton>& buttons,
-    int x,
-    int y,
-    KeyboardLegend primary_legend,
-    app::InputEvent event,
-    KeyboardLegend secondary_legend = {},
-    std::initializer_list<std::string_view> aliases = {})
-{
-    VirtualButton button{};
-    button.bounds = Rect{x, y, kKeyUnitWidth, kKeyAreaHeight};
-    button.primary_legend = std::move(primary_legend);
-    button.secondary_legend = std::move(secondary_legend);
-    button.style = ButtonStyle::Keyboard;
-    button.event = std::move(event);
-    if (!button.event.label.empty())
-    {
-        button.highlight_aliases.push_back(button.event.label);
-    }
-    for (const auto alias : aliases)
-    {
-        button.highlight_aliases.emplace_back(alias);
-    }
-    buttons.push_back(std::move(button));
-}
-
-void addPanelButton(
-    std::vector<VirtualButton>& buttons,
-    Rect bounds,
-    std::string primary,
-    app::InputEvent event,
-    ButtonStyle style = ButtonStyle::Panel,
-    std::initializer_list<std::string_view> aliases = {})
-{
-    VirtualButton button{};
-    button.bounds = bounds;
-    button.primary_legend = textLegend(std::move(primary), rgba(247, 247, 247));
-    button.style = style;
-    button.event = std::move(event);
-    for (const auto alias : aliases)
-    {
-        button.highlight_aliases.emplace_back(alias);
-    }
-    buttons.push_back(std::move(button));
-}
-
-void buildKeyboardButtons(std::vector<VirtualButton>& buttons)
-{
-    const auto key_x = [](int column) noexcept
-    {
-        return kKeyboardRowStartX + (column * (kKeyUnitWidth + kKeyGap));
-    };
-
-    addKeyboardButton(buttons, key_x(0), kKeyboardRow1Y, textLegend("1"), app::makeCharacterInput('1', "1"), textLegend("!", kAccentBlue), {"!"});
-    addKeyboardButton(buttons, key_x(1), kKeyboardRow1Y, textLegend("2"), app::makeCharacterInput('2', "2"), textLegend("@", kAccentBlue), {"@"});
-    addKeyboardButton(buttons, key_x(2), kKeyboardRow1Y, textLegend("3"), app::makeCharacterInput('3', "3"), textLegend("#", kAccentBlue), {"#"});
-    addKeyboardButton(buttons, key_x(3), kKeyboardRow1Y, textLegend("4"), app::makeCharacterInput('4', "4"), textLegend("$", kAccentBlue), {"$"});
-    addKeyboardButton(buttons, key_x(4), kKeyboardRow1Y, textLegend("5"), app::makeCharacterInput('5', "5"), textLegend("%", kAccentBlue), {"%"});
-    addKeyboardButton(buttons, key_x(5), kKeyboardRow1Y, textLegend("6"), app::makeCharacterInput('6', "6"), textLegend("^", kAccentBlue), {"^"});
-    addKeyboardButton(buttons, key_x(6), kKeyboardRow1Y, textLegend("7"), app::makeCharacterInput('7', "7"), textLegend("&", kAccentBlue), {"&"});
-    addKeyboardButton(buttons, key_x(7), kKeyboardRow1Y, textLegend("8"), app::makeCharacterInput('8', "8"), textLegend("*", kAccentBlue), {"*"});
-    addKeyboardButton(buttons, key_x(8), kKeyboardRow1Y, textLegend("9"), app::makeCharacterInput('9', "9"), textLegend("(", kAccentBlue), {"("});
-    addKeyboardButton(buttons, key_x(9), kKeyboardRow1Y, textLegend("0"), app::makeCharacterInput('0', "0"), textLegend(")", kAccentBlue), {")"});
-    addKeyboardButton(
-        buttons,
-        key_x(10),
-        kKeyboardRow1Y,
-        symbolLegend(LegendSymbol::BackArrow),
-        app::InputEvent{app::InputKey::Backspace, "DEL", '\0'},
-        textLegend("del", kAccentOrange),
-        {"BACKSPACE"});
-
-    const int row2Y = kKeyboardRow1Y + kKeyboardRowGapY;
-    addKeyboardButton(
-        buttons,
-        key_x(0),
-        row2Y,
-        textLegend("tab"),
-        app::InputEvent{app::InputKey::Tab, "TAB", '\0'},
-        textLegend("alt", kAccentOrange),
-        {"ALT"});
-    addKeyboardButton(buttons, key_x(1), row2Y, textLegend("Q"), app::makeCharacterInput('q', "Q"), textLegend("~", kAccentBlue), {"~"});
-    addKeyboardButton(buttons, key_x(2), row2Y, textLegend("W"), app::makeCharacterInput('w', "W"), textLegend("`", kAccentBlue), {"`"});
-    addKeyboardButton(buttons, key_x(3), row2Y, textLegend("E"), app::makeCharacterInput('e', "E"), textLegend("+", kAccentBlue), {"+"});
-    addKeyboardButton(buttons, key_x(4), row2Y, textLegend("R"), app::makeCharacterInput('r', "R"), textLegend("-", kAccentBlue));
-    addKeyboardButton(buttons, key_x(5), row2Y, textLegend("T"), app::makeCharacterInput('t', "T"), textLegend("/", kAccentBlue), {"/"});
-    addKeyboardButton(buttons, key_x(6), row2Y, textLegend("Y"), app::makeCharacterInput('y', "Y"), textLegend("\\", kAccentBlue), {"\\"});
-    addKeyboardButton(buttons, key_x(7), row2Y, textLegend("U"), app::makeCharacterInput('u', "U"), textLegend("{", kAccentBlue), {"{"});
-    addKeyboardButton(buttons, key_x(8), row2Y, textLegend("I"), app::makeCharacterInput('i', "I"), textLegend("}", kAccentBlue), {"}"});
-    addKeyboardButton(buttons, key_x(9), row2Y, textLegend("O"), app::makeCharacterInput('o', "O"), textLegend("[", kAccentBlue), {"["});
-    addKeyboardButton(buttons, key_x(10), row2Y, textLegend("P"), app::makeCharacterInput('p', "P"), textLegend("]", kAccentBlue), {"]"});
-
-    const int row3Y = row2Y + kKeyboardRowGapY;
-    addKeyboardButton(
-        buttons,
-        key_x(0),
-        row3Y,
-        badgeLegend("Aa", rgba(255, 255, 255), kAccentBlue),
-        app::InputEvent{app::InputKey::Shift, "AA", '\0'},
-        {},
-        {"SHIFT"});
-    addKeyboardButton(buttons, key_x(1), row3Y, textLegend("A"), app::makeCharacterInput('a', "A"));
-    addKeyboardButton(buttons, key_x(2), row3Y, textLegend("S"), app::makeCharacterInput('s', "S"));
-    addKeyboardButton(
-        buttons,
-        key_x(3),
-        row3Y,
-        textLegend("D"),
-        app::makeCharacterInput('d', "D"),
-        symbolLegend(LegendSymbol::ArrowUp, kAccentOrange),
-        {"UP"});
-    addKeyboardButton(buttons, key_x(4), row3Y, textLegend("F"), app::makeCharacterInput('f', "F"), textLegend("|", kAccentBlue), {"|"});
-    addKeyboardButton(buttons, key_x(5), row3Y, textLegend("G"), app::makeCharacterInput('g', "G"), textLegend("=", kAccentBlue), {"="});
-    addKeyboardButton(buttons, key_x(6), row3Y, textLegend("H"), app::makeCharacterInput('h', "H"), textLegend(":", kAccentBlue), {":"});
-    addKeyboardButton(buttons, key_x(7), row3Y, textLegend("J"), app::makeCharacterInput('j', "J"), textLegend(";", kAccentBlue), {";"});
-    addKeyboardButton(buttons, key_x(8), row3Y, textLegend("K"), app::makeCharacterInput('k', "K"), textLegend("_", kAccentBlue), {"_"});
-    addKeyboardButton(buttons, key_x(9), row3Y, textLegend("L"), app::makeCharacterInput('l', "L"), textLegend("?", kAccentBlue), {"?"});
-    addKeyboardButton(
-        buttons,
-        key_x(10),
-        row3Y,
-        symbolLegend(LegendSymbol::BackArrow),
-        app::InputEvent{app::InputKey::Enter, "OK", '\0'},
-        textLegend("ok"),
-        {"ENTER"});
-
-    const int row4Y = row3Y + kKeyboardRowGapY;
-    addKeyboardButton(
-        buttons,
-        key_x(0),
-        row4Y,
-        badgeLegend("fn", rgba(255, 255, 255), kAccentOrange),
-        app::InputEvent{app::InputKey::Fn, "FN", '\0'});
-    addKeyboardButton(
-        buttons,
-        key_x(1),
-        row4Y,
-        badgeLegend("ctrl", kLabelDark, kAccentYellow),
-        app::InputEvent{app::InputKey::Ctrl, "CTRL", '\0'});
-    addKeyboardButton(
-        buttons,
-        key_x(2),
-        row4Y,
-        textLegend("Z"),
-        app::makeCharacterInput('z', "Z"),
-        symbolLegend(LegendSymbol::ArrowLeft, kAccentOrange),
-        {"LEFT"});
-    addKeyboardButton(
-        buttons,
-        key_x(3),
-        row4Y,
-        textLegend("X"),
-        app::makeCharacterInput('x', "X"),
-        symbolLegend(LegendSymbol::ArrowDown, kAccentOrange),
-        {"DOWN"});
-    addKeyboardButton(
-        buttons,
-        key_x(4),
-        row4Y,
-        textLegend("C"),
-        app::makeCharacterInput('c', "C"),
-        symbolLegend(LegendSymbol::ArrowRight, kAccentOrange),
-        {"RIGHT"});
-    addKeyboardButton(buttons, key_x(5), row4Y, textLegend("V"), app::makeCharacterInput('v', "V"), textLegend("<", kAccentBlue), {"<"});
-    addKeyboardButton(buttons, key_x(6), row4Y, textLegend("B"), app::makeCharacterInput('b', "B"), textLegend(">", kAccentBlue), {">"});
-    addKeyboardButton(buttons, key_x(7), row4Y, textLegend("N"), app::makeCharacterInput('n', "N"), textLegend("'", kAccentBlue), {"'"});
-    addKeyboardButton(buttons, key_x(8), row4Y, textLegend("M"), app::makeCharacterInput('m', "M"), textLegend("\"", kAccentBlue), {"\""});
-    addKeyboardButton(buttons, key_x(9), row4Y, textLegend(","), app::makeCharacterInput(',', ","), textLegend(".", kAccentBlue), {"."});
-    addKeyboardButton(
-        buttons,
-        key_x(10),
-        row4Y,
-        symbolLegend(LegendSymbol::SpaceBar),
-        app::makeCharacterInput(' ', "SPACE"));
-}
-
-void buildPanelButtons(std::vector<VirtualButton>& buttons)
-{
-    addPanelButton(
-        buttons,
-        Rect{kPowerSwitchX, kPowerSwitchY, kPowerSwitchWidth, kPowerSwitchHeight},
-        "ON",
-        app::InputEvent{app::InputKey::Power, "POWER", '\0'},
-        ButtonStyle::Switch,
-        {"POWER"});
-    addPanelButton(
-        buttons,
-        Rect{kHomeButtonX, kPanelButtonsY, kPanelButtonWidth, kPanelButtonHeight},
-        "HOME",
-        app::InputEvent{app::InputKey::Home, "HOME", '\0'},
-        ButtonStyle::Panel,
-        {"HOME"});
-    addPanelButton(
-        buttons,
-        Rect{kNextButtonX, kPanelButtonsY, kPanelButtonWidth, kPanelButtonHeight},
-        "NEXT",
-        app::InputEvent{app::InputKey::Next, "NEXT", '\0'},
-        ButtonStyle::Panel,
-        {"NEXT"});
-}
-
-[[nodiscard]] std::vector<VirtualButton> buildButtons()
-{
-    std::vector<VirtualButton> buttons{};
-    buttons.reserve(49);
-    buildKeyboardButtons(buttons);
-    buildPanelButtons(buttons);
-    return buttons;
-}
-
-void markPressed(VirtualButton& button)
-{
-    button.pressed_until = std::chrono::steady_clock::now() + kPressFlash;
-}
-
-void clearLatch(VirtualButton& button) noexcept
-{
-    button.latch_mode = LatchMode::None;
-}
-
-void setOneShotLatch(VirtualButton& button) noexcept
-{
-    button.latch_mode = LatchMode::OneShot;
-}
-
-void toggleStickyLatch(VirtualButton& button) noexcept
-{
-    button.latch_mode = button.latch_mode == LatchMode::Sticky ? LatchMode::None : LatchMode::Sticky;
-}
-
-[[nodiscard]] bool isLatched(const VirtualButton& button) noexcept
-{
-    return button.latch_mode != LatchMode::None;
-}
-
-[[nodiscard]] bool isPressed(const VirtualButton& button) noexcept
-{
-    return isLatched(button) || std::chrono::steady_clock::now() < button.pressed_until;
-}
-
-[[nodiscard]] int centeredTextX(std::string_view text, int scale, int left, int width) noexcept
-{
-    return left + ((width - core::bitmap_font::measureText(text, scale)) / 2);
-}
-
-void drawLabelBlock(core::Canvas& canvas, int x, int y, std::string_view text, core::Color color, int scale = 1)
-{
-    core::bitmap_font::drawText(canvas, text, x, y, color, scale);
-}
-
-[[nodiscard]] bool hasLegend(const KeyboardLegend& legend) noexcept
-{
-    return legend.symbol != LegendSymbol::None || !legend.text.empty();
-}
-
-[[nodiscard]] int symbolWidth(LegendSymbol symbol) noexcept
-{
-    switch (symbol)
-    {
-    case LegendSymbol::ArrowLeft:
-    case LegendSymbol::ArrowRight:
-    case LegendSymbol::ArrowUp:
-    case LegendSymbol::ArrowDown:
-        return 11;
-    case LegendSymbol::BackArrow:
-        return 14;
-    case LegendSymbol::SpaceBar:
-        return 16;
-    case LegendSymbol::None:
-        return 0;
-    }
-
-    return 0;
-}
-
-[[nodiscard]] int legendWidth(const KeyboardLegend& legend) noexcept
-{
-    int width = 0;
-    if (!legend.text.empty())
-    {
-        width = core::bitmap_font::measureText(legend.text, 1);
-    }
-    else if (legend.symbol != LegendSymbol::None)
-    {
-        width = symbolWidth(legend.symbol);
-    }
-
-    if (legend.badge)
-    {
-        width += 8;
-    }
-
-    return width;
-}
-
-void drawLegendSymbol(core::Canvas& canvas, int x, int y, LegendSymbol symbol, core::Color color)
-{
-    switch (symbol)
-    {
-    case LegendSymbol::ArrowLeft:
-        canvas.fillRect(x + 3, y + 3, 8, 1, color);
-        canvas.fillRect(x + 2, y + 2, 1, 3, color);
-        canvas.fillRect(x + 1, y + 1, 1, 5, color);
-        canvas.fillRect(x + 0, y + 0, 1, 7, color);
-        break;
-    case LegendSymbol::ArrowRight:
-        canvas.fillRect(x, y + 3, 8, 1, color);
-        canvas.fillRect(x + 8, y + 2, 1, 3, color);
-        canvas.fillRect(x + 9, y + 1, 1, 5, color);
-        canvas.fillRect(x + 10, y + 0, 1, 7, color);
-        break;
-    case LegendSymbol::ArrowUp:
-        canvas.fillRect(x + 5, y, 1, 7, color);
-        canvas.fillRect(x + 4, y + 1, 3, 1, color);
-        canvas.fillRect(x + 3, y + 2, 5, 1, color);
-        canvas.fillRect(x + 2, y + 3, 7, 1, color);
-        break;
-    case LegendSymbol::ArrowDown:
-        canvas.fillRect(x + 5, y, 1, 7, color);
-        canvas.fillRect(x + 2, y + 3, 7, 1, color);
-        canvas.fillRect(x + 3, y + 4, 5, 1, color);
-        canvas.fillRect(x + 4, y + 5, 3, 1, color);
-        break;
-    case LegendSymbol::BackArrow:
-        canvas.fillRect(x + 5, y + 3, 8, 1, color);
-        canvas.fillRect(x + 5, y + 4, 8, 1, color);
-        canvas.fillRect(x + 4, y + 2, 1, 3, color);
-        canvas.fillRect(x + 3, y + 1, 1, 5, color);
-        canvas.fillRect(x + 2, y + 0, 1, 7, color);
-        break;
-    case LegendSymbol::SpaceBar:
-        canvas.fillRect(x + 2, y + 6, 12, 1, color);
-        canvas.fillRect(x + 2, y + 2, 1, 5, color);
-        canvas.fillRect(x + 13, y + 2, 1, 5, color);
-        break;
-    case LegendSymbol::None:
-        break;
-    }
-}
-
-void drawKeyboardLegend(core::Canvas& canvas, int x, int y, const KeyboardLegend& legend)
-{
-    if (!hasLegend(legend))
-    {
-        return;
-    }
-
-    int content_x = x;
-    if (legend.badge)
-    {
-        const int badge_width = legendWidth(legend);
-        canvas.fillRect(x, y - 2, badge_width, 15, legend.badge_fill);
-        content_x += 4;
-    }
-
-    if (legend.symbol != LegendSymbol::None)
-    {
-        drawLegendSymbol(canvas, content_x, y + 1, legend.symbol, legend.color);
-        return;
-    }
-
-    drawLabelBlock(canvas, content_x, y, legend.text, legend.color, 1);
-}
-
-void drawKeyboardButton(core::Canvas& canvas, const VirtualButton& button)
-{
-    const bool pressed = isPressed(button);
-    const auto pill_color = pressed ? kKeyPressed : kKeyBody;
-    const int pill_y = button.bounds.y + 18;
-    const int pill_height = button.bounds.height - 18;
-
-    const bool has_secondary = hasLegend(button.secondary_legend);
-    const int primary_width = legendWidth(button.primary_legend);
-    const int secondary_width = has_secondary ? legendWidth(button.secondary_legend) : 0;
-    const int legend_gap = has_secondary ? 2 : 0;
-    const int legend_total_width = primary_width + secondary_width + legend_gap;
-    int legend_x = button.bounds.x + ((button.bounds.width - legend_total_width) / 2);
-
-    drawKeyboardLegend(canvas, legend_x, button.bounds.y, button.primary_legend);
-    if (has_secondary)
-    {
-        legend_x += primary_width + legend_gap;
-        drawKeyboardLegend(canvas, legend_x, button.bounds.y, button.secondary_legend);
-    }
-
-    canvas.fillRoundedRect(button.bounds.x + 2, pill_y + 2, button.bounds.width - 4, pill_height - 2, 10, rgba(9, 11, 14));
-    canvas.fillRoundedRect(button.bounds.x, pill_y, button.bounds.width - 2, pill_height - 4, 10, pill_color);
-}
-
-void drawPanelButton(core::Canvas& canvas, const VirtualButton& button)
-{
-    const bool pressed = isPressed(button);
-    auto fill = kPanelDark;
-    auto text = rgba(247, 247, 247);
-
-    if (button.style == ButtonStyle::Switch)
-    {
-        fill = pressed ? kPowerRedPressed : kPowerRed;
-        text = rgba(255, 255, 255);
-    }
-    else if (pressed)
-    {
-        fill = rgba(90, 98, 110);
-    }
-
-    canvas.fillRoundedRect(button.bounds.x, button.bounds.y, button.bounds.width, button.bounds.height, 10, fill);
-    drawLabelBlock(
-        canvas,
-        centeredTextX(button.primary_legend.text, 1, button.bounds.x, button.bounds.width),
-        button.bounds.y + ((button.bounds.height - core::bitmap_font::lineHeight(1)) / 2) + 1,
-        button.primary_legend.text,
-        text,
-        1);
-}
-
-void drawButtons(core::Canvas& canvas, const std::vector<VirtualButton>& buttons)
-{
-    for (const auto& button : buttons)
-    {
-        if (button.style == ButtonStyle::Keyboard)
-        {
-            drawKeyboardButton(canvas, button);
-        }
-        else
-        {
-            drawPanelButton(canvas, button);
-        }
-    }
-}
-
-void drawLeftPanel(core::Canvas& canvas)
-{
-    canvas.fillRoundedRect(24, 24, 144, 226, 20, kInset);
-    drawLabelBlock(canvas, 38, 40, "TM", rgba(198, 201, 204), 6);
-
-    canvas.fillRoundedRect(24, 110, 132, 88, 10, kStickerWhite);
-    drawLabelBlock(canvas, 34, 120, "CARDPUTER", rgba(74, 74, 76), 1);
-    drawLabelBlock(canvas, 37, 142, "ZERO", rgba(34, 34, 36), 3);
-    drawLabelBlock(canvas, 34, 174, "PI OS LINUX", rgba(78, 78, 82), 1);
-
-    canvas.fillRoundedRect(40, 202, 38, 16, 8, rgba(38, 40, 43));
-    canvas.fillRoundedRect(106, 202, 16, 16, 8, rgba(202, 204, 206));
-}
-
-void drawRightPanel(core::Canvas& canvas)
-{
-    canvas.fillRoundedRect(kRightPanelX, kRightPanelY, kRightPanelWidth, kRightPanelHeight, 18, kInset);
-    drawLabelBlock(canvas, centeredTextX("POWER", 2, kRightPanelX, kRightPanelWidth), 100, "POWER", kLabelDark, 2);
-    drawLabelBlock(canvas, centeredTextX("SWITCH", 1, kRightPanelX, kRightPanelWidth), 120, "SWITCH", kLabelDark, 1);
-    drawLabelBlock(canvas, centeredTextX("USB-C", 1, kRightPanelX, kRightPanelWidth), 130, "USB-C", kAccentOrange, 1);
-    drawLabelBlock(canvas, centeredTextX("LINUX", 1, kRightPanelX, kRightPanelWidth), 144, "LINUX", kAccentBlue, 1);
-    drawLabelBlock(canvas, centeredTextX("CARDPUTER ZERO", 1, kRightPanelX, kRightPanelWidth), 159, "CARDPUTER ZERO", kAccentPink, 1);
-    drawLabelBlock(canvas, centeredTextX("HOME", 1, kHomeButtonX, kPanelButtonWidth), 214, "HOME", kLabelDark, 1);
-    drawLabelBlock(canvas, centeredTextX("NEXT", 1, kNextButtonX, kPanelButtonWidth), 214, "NEXT", kLabelDark, 1);
-}
-
-void drawScreenFrame(core::Canvas& canvas)
-{
-    canvas.fillRoundedRect(kScreenFrameRectX, kScreenFrameRectY, kScreenFrameRectWidth, kScreenFrameRectHeight, 18, kScreenFrame);
-    canvas.fillRoundedRect(
-        kScreenFrameRectX + kScreenLipInsetX,
-        kScreenFrameRectY + kScreenLipInsetY,
-        kScreenLipWidth,
-        kScreenLipHeight,
-        12,
-        kScreenLip);
-    canvas.fillRect(kScreenOpeningX, kScreenOpeningY, kScreenOpeningWidth, kScreenOpeningHeight, rgba(0, 0, 0));
-}
-
-void drawKeyboardDeck(core::Canvas& canvas)
-{
-    canvas.fillRoundedRect(kKeyboardDeckX, kKeyboardDeckY, kKeyboardDeckWidth, kKeyboardDeckHeight, 18, rgba(230, 232, 234));
-    canvas.fillRect(kKeyboardDeckSeparatorX, 306, kKeyboardDeckSeparatorWidth, 2, rgba(205, 207, 209));
-    canvas.fillRect(kKeyboardDeckSeparatorX, 360, kKeyboardDeckSeparatorWidth, 2, rgba(205, 207, 209));
-    canvas.fillRect(kKeyboardDeckSeparatorX, 414, kKeyboardDeckSeparatorWidth, 2, rgba(205, 207, 209));
-}
-
-void drawShell(core::Canvas& canvas, const core::Canvas& screen_canvas, const std::vector<VirtualButton>& buttons)
-{
-    canvas.clear(kBackdrop);
-    canvas.fillRoundedRect(12, 16, kDeviceWidth - 20, kDeviceHeight - 28, 34, kShellShadow);
-    canvas.fillRoundedRect(0, 0, kDeviceWidth - 20, kDeviceHeight - 28, 34, kShell);
-    canvas.fillRoundedRect(6, 6, kDeviceWidth - 32, 14, 7, rgba(255, 255, 255));
-    canvas.fillRoundedRect(8, 8, kDeviceWidth - 36, kDeviceHeight - 44, 30, kShell);
-    canvas.strokeRect(12, 12, kDeviceWidth - 44, kDeviceHeight - 52, kShellBorder, 1);
-
-    drawLeftPanel(canvas);
-    drawRightPanel(canvas);
-    drawScreenFrame(canvas);
-    drawKeyboardDeck(canvas);
-    drawButtons(canvas, buttons);
-    canvas.blit(screen_canvas, kScreenX, kScreenY);
-}
-
-void highlightByLabel(std::vector<VirtualButton>& buttons, std::string_view label)
-{
-    const auto normalized = upperCopy(label);
-    for (auto& button : buttons)
-    {
-        for (const auto& alias : button.highlight_aliases)
-        {
-            if (upperCopy(alias) == normalized)
-            {
-                markPressed(button);
-                return;
-            }
-        }
-    }
-}
-
-[[nodiscard]] int toDeviceCoordinate(float coordinate, int scale) noexcept
-{
-    if (scale <= 1)
-    {
-        return static_cast<int>(coordinate);
-    }
-
-    return static_cast<int>(coordinate / static_cast<float>(scale));
-}
-
-[[nodiscard]] std::uint32_t packPixel(core::Color color) noexcept
-{
-    return (static_cast<std::uint32_t>(color.a) << 24U) | (static_cast<std::uint32_t>(color.b) << 16U) | (static_cast<std::uint32_t>(color.g) << 8U) | static_cast<std::uint32_t>(color.r);
-}
-
-[[nodiscard]] std::string characterLabel(char ch)
-{
-    if (ch == ' ')
-    {
-        return "SPACE";
-    }
-
-    std::string label{};
-    label.push_back(static_cast<char>(std::toupper(static_cast<unsigned char>(ch))));
-    return label;
-}
-
-[[nodiscard]] std::optional<app::InputEvent> eventFromLegend(const KeyboardLegend& legend)
-{
-    switch (legend.symbol)
-    {
-    case LegendSymbol::ArrowLeft:
-        return app::InputEvent{app::InputKey::Left, "LEFT", '\0'};
-    case LegendSymbol::ArrowRight:
-        return app::InputEvent{app::InputKey::Right, "RIGHT", '\0'};
-    case LegendSymbol::ArrowUp:
-        return app::InputEvent{app::InputKey::Up, "UP", '\0'};
-    case LegendSymbol::ArrowDown:
-        return app::InputEvent{app::InputKey::Down, "DOWN", '\0'};
-    case LegendSymbol::None:
-    case LegendSymbol::BackArrow:
-    case LegendSymbol::SpaceBar:
-        break;
-    }
-
-    if (legend.text.empty())
-    {
-        return std::nullopt;
-    }
-
-    const auto normalized = upperCopy(legend.text);
-    if (normalized == "ALT")
-    {
-        return app::InputEvent{app::InputKey::Alt, "ALT", '\0'};
-    }
-    if (normalized == "DEL")
-    {
-        return app::InputEvent{app::InputKey::Backspace, "DEL", '\0'};
-    }
-    if (normalized == "OK")
-    {
-        return app::InputEvent{app::InputKey::Enter, "OK", '\0'};
-    }
-    if (legend.text.size() == 1U)
-    {
-        return app::makeCharacterInput(legend.text.front(), characterLabel(legend.text.front()));
-    }
-
-    return std::nullopt;
-}
-
-[[nodiscard]] app::InputEvent resolveButtonEvent(const VirtualButton& button, const std::vector<VirtualButton>& buttons)
-{
-    bool shift_active = false;
-    bool fn_active = false;
-
-    for (const auto& candidate : buttons)
-    {
-        if (!isLatched(candidate))
-        {
-            continue;
-        }
-
-        if (candidate.event.key == app::InputKey::Shift)
-        {
-            shift_active = true;
-        }
-        else if (candidate.event.key == app::InputKey::Fn)
-        {
-            fn_active = true;
-        }
-    }
-
-    if (fn_active)
-    {
-        if (const auto alternate = eventFromLegend(button.secondary_legend))
-        {
-            return *alternate;
-        }
-    }
-
-    if (shift_active && button.event.key == app::InputKey::Character && button.event.text != '\0')
-    {
-        const unsigned char value = static_cast<unsigned char>(button.event.text);
-        if (std::isalpha(value))
-        {
-            const char shifted = static_cast<char>(std::toupper(value));
-            return app::makeCharacterInput(shifted, characterLabel(shifted));
-        }
-
-        if (const auto alternate = eventFromLegend(button.secondary_legend))
-        {
-            return *alternate;
-        }
-    }
-
-    return button.event;
-}
-
-void consumeOneShotModifiers(std::vector<VirtualButton>& buttons) noexcept
-{
-    for (auto& button : buttons)
-    {
-        if (button.latch_mode == LatchMode::OneShot)
-        {
-            clearLatch(button);
-        }
-    }
-}
-
-void enqueueSpecial(
-    std::vector<app::InputEvent>& queue,
-    std::vector<VirtualButton>& buttons,
-    app::InputKey key,
-    std::string label)
-{
-    queue.push_back(app::InputEvent{key, label, '\0'});
-    highlightByLabel(buttons, label);
-}
-
-void handleKeyboardEvent(
-    std::vector<app::InputEvent>& queue,
-    std::vector<VirtualButton>& buttons,
-    const SDL_KeyboardEvent& event)
-{
-    if (event.repeat)
-    {
-        return;
-    }
-
-    switch (event.key)
-    {
-    case SDLK_BACKSPACE:
-        enqueueSpecial(queue, buttons, app::InputKey::Backspace, "DEL");
-        break;
-    case SDLK_RETURN:
-        enqueueSpecial(queue, buttons, app::InputKey::Enter, "OK");
-        break;
-    case SDLK_TAB:
-        enqueueSpecial(queue, buttons, app::InputKey::Tab, "TAB");
-        break;
-    case SDLK_HOME:
-        enqueueSpecial(queue, buttons, app::InputKey::Home, "HOME");
-        break;
-    case SDLK_END:
-        enqueueSpecial(queue, buttons, app::InputKey::Next, "NEXT");
-        break;
-    case SDLK_ESCAPE:
-        enqueueSpecial(queue, buttons, app::InputKey::Power, "POWER");
-        break;
-    case SDLK_LSHIFT:
-    case SDLK_RSHIFT:
-        enqueueSpecial(queue, buttons, app::InputKey::Shift, "AA");
-        break;
-    case SDLK_LCTRL:
-    case SDLK_RCTRL:
-        enqueueSpecial(queue, buttons, app::InputKey::Ctrl, "CTRL");
-        break;
-    case SDLK_LALT:
-    case SDLK_RALT:
-        enqueueSpecial(queue, buttons, app::InputKey::Alt, "ALT");
-        break;
-    case SDLK_LEFT:
-        enqueueSpecial(queue, buttons, app::InputKey::Left, "LEFT");
-        break;
-    case SDLK_RIGHT:
-        enqueueSpecial(queue, buttons, app::InputKey::Right, "RIGHT");
-        break;
-    case SDLK_UP:
-        enqueueSpecial(queue, buttons, app::InputKey::Up, "UP");
-        break;
-    case SDLK_DOWN:
-        enqueueSpecial(queue, buttons, app::InputKey::Down, "DOWN");
-        break;
-    default:
-        break;
-    }
-}
-
-void handleTextInput(
-    std::vector<app::InputEvent>& queue,
-    std::vector<VirtualButton>& buttons,
-    const SDL_TextInputEvent& event)
-{
-    if (!event.text)
-    {
-        return;
-    }
-
-    for (const char* current = event.text; *current != '\0'; ++current)
-    {
-        const unsigned char value = static_cast<unsigned char>(*current);
-        if (value > 127U || !std::isprint(value))
-        {
-            continue;
-        }
-
-        const char ch = static_cast<char>(value);
-        std::string label{};
-        if (ch == ' ')
-        {
-            label = "SPACE";
-        }
-        else
-        {
-            label.push_back(static_cast<char>(std::toupper(value)));
-        }
-
-        queue.push_back(app::makeCharacterInput(ch, label));
-        highlightByLabel(buttons, label);
-    }
-}
-
-void handleMouseClick(
-    std::vector<app::InputEvent>& queue,
-    std::vector<VirtualButton>& buttons,
-    const SDL_MouseButtonEvent& event,
-    int scale)
-{
-    if (event.button != SDL_BUTTON_LEFT && event.button != SDL_BUTTON_RIGHT)
-    {
-        return;
-    }
-
-    const int device_x = toDeviceCoordinate(event.x, scale);
-    const int device_y = toDeviceCoordinate(event.y, scale);
-
-    for (auto& button : buttons)
-    {
-        if (!button.bounds.contains(device_x, device_y))
-        {
-            continue;
-        }
-
-        markPressed(button);
-
-        if (isModifierButton(button))
-        {
-            if (event.button == SDL_BUTTON_RIGHT)
-            {
-                toggleStickyLatch(button);
-                if (button.latch_mode == LatchMode::Sticky)
-                {
-                    markPressed(button);
-                }
-            }
-            else
-            {
-                if (button.latch_mode != LatchMode::Sticky)
-                {
-                    setOneShotLatch(button);
-                }
-            }
-            break;
-        }
-
-        queue.push_back(resolveButtonEvent(button, buttons));
-        consumeOneShotModifiers(buttons);
-        break;
-    }
-}
-
-SdlSimulator::SdlSimulator(int scale)
-    : impl_(std::make_unique<Impl>())
-{
-    const int clamped_scale = std::max(scale, 1);
-    impl_->scale = clamped_scale;
-    impl_->window_width = kDeviceWidth * clamped_scale;
-    impl_->window_height = kDeviceHeight * clamped_scale;
-    impl_->buttons = buildButtons();
-
-    requireSdl(SDL_Init(SDL_INIT_VIDEO), "SDL_Init");
-
-    impl_->window = requireSdl(
-        SDL_CreateWindow("Trail Mate Cardputer Zero Front Simulator", impl_->window_width, impl_->window_height, 0),
-        "SDL_CreateWindow");
-    impl_->renderer = requireSdl(SDL_CreateRenderer(impl_->window, nullptr), "SDL_CreateRenderer");
-    impl_->texture = requireSdl(
-        SDL_CreateTexture(impl_->renderer, SDL_PIXELFORMAT_RGBA32, SDL_TEXTUREACCESS_STREAMING, kDeviceWidth, kDeviceHeight),
-        "SDL_CreateTexture");
-
-    requireSdl(SDL_SetTextureScaleMode(impl_->texture, SDL_SCALEMODE_NEAREST), "SDL_SetTextureScaleMode");
-    requireSdl(SDL_StartTextInput(impl_->window), "SDL_StartTextInput");
-}
-
-SdlSimulator::~SdlSimulator()
-{
-    if (impl_->texture)
-    {
-        SDL_DestroyTexture(impl_->texture);
-    }
-    if (impl_->renderer)
-    {
-        SDL_DestroyRenderer(impl_->renderer);
-    }
-    if (impl_->window)
-    {
-        SDL_DestroyWindow(impl_->window);
-    }
-
-    SDL_Quit();
-}
-
-bool SdlSimulator::pump()
-{
-    SDL_Event event{};
-    while (SDL_PollEvent(&event))
-    {
-        if (event.type == SDL_EVENT_QUIT)
-        {
-            impl_->running = false;
-            continue;
-        }
-        if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN)
-        {
-            handleMouseClick(impl_->input_queue, impl_->buttons, event.button, impl_->scale);
-            continue;
-        }
-        if (event.type == SDL_EVENT_KEY_DOWN)
-        {
-            handleKeyboardEvent(impl_->input_queue, impl_->buttons, event.key);
-            continue;
-        }
-        if (event.type == SDL_EVENT_TEXT_INPUT)
-        {
-            handleTextInput(impl_->input_queue, impl_->buttons, event.text);
-        }
-    }
-
-    return impl_->running;
-}
-
-std::vector<app::InputEvent> SdlSimulator::drainInput()
-{
-    auto drained = std::move(impl_->input_queue);
-    impl_->input_queue.clear();
-    return drained;
-}
-
-void SdlSimulator::present(const core::Canvas& canvas)
-{
-    drawShell(impl_->device_canvas, canvas, impl_->buttons);
-
-    const auto& pixels = impl_->device_canvas.pixels();
-    for (std::size_t i = 0; i < pixels.size(); ++i)
-    {
-        impl_->staging[i] = packPixel(pixels[i]);
-    }
-
-    requireSdl(
-        SDL_UpdateTexture(
-            impl_->texture,
-            nullptr,
-            impl_->staging.data(),
-            impl_->device_canvas.width() * static_cast<int>(sizeof(std::uint32_t))),
-        "SDL_UpdateTexture");
-    requireSdl(SDL_SetRenderDrawColor(impl_->renderer, 0, 0, 0, 255), "SDL_SetRenderDrawColor");
-    requireSdl(SDL_RenderClear(impl_->renderer), "SDL_RenderClear");
-
-    const SDL_FRect destination{0.0F, 0.0F, static_cast<float>(impl_->window_width), static_cast<float>(impl_->window_height)};
-    requireSdl(SDL_RenderTexture(impl_->renderer, impl_->texture, nullptr, &destination), "SDL_RenderTexture");
-    requireSdl(SDL_RenderPresent(impl_->renderer), "SDL_RenderPresent");
-}
-
-} // namespace trailmate::cardputer_zero::platform::simulator
diff --git a/apps/linux_sim/src/platform/simulator/sdl_simulator.h b/apps/linux_sim/src/platform/simulator/sdl_simulator.h
deleted file mode 100644
index 24c40fb8..00000000
--- a/apps/linux_sim/src/platform/simulator/sdl_simulator.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include "platform/surface_presenter.h"
-
-namespace trailmate::cardputer_zero::platform::simulator
-{
-
-class SdlSimulator : public SurfacePresenter
-{
-  public:
-    explicit SdlSimulator(int scale = 1);
-    ~SdlSimulator() override;
-
-    [[nodiscard]] bool pump() override;
-    [[nodiscard]] std::vector<app::InputEvent> drainInput() override;
-    void present(const core::Canvas& canvas) override;
-
-  private:
-    struct Impl;
-
-    std::unique_ptr<Impl> impl_{};
-};
-
-} // namespace trailmate::cardputer_zero::platform::simulator
diff --git a/apps/linux_sim/src/targets/simulator_main.cpp b/apps/linux_sim/src/targets/simulator_main.cpp
deleted file mode 100644
index 071083b6..00000000
--- a/apps/linux_sim/src/targets/simulator_main.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <algorithm>
-#include <chrono>
-#include <cstdlib>
-#include <exception>
-#include <iostream>
-#include <string>
-#include <string_view>
-
-#include "platform/simulator/sdl_simulator.h"
-#include "ui/shell_ui_runner.h"
-
-namespace
-{
-
-struct SimulatorOptions
-{
-    int scale{1};
-    int auto_exit_ms{0};
-};
-
-SimulatorOptions parseOptions(int argc, char** argv)
-{
-    SimulatorOptions options{};
-
-    if (const char* env = std::getenv("TRAIL_MATE_SIM_SCALE"))
-    {
-        options.scale = std::max(1, std::atoi(env));
-    }
-    if (const char* env = std::getenv("TRAIL_MATE_SIM_AUTO_EXIT_MS"))
-    {
-        options.auto_exit_ms = std::max(0, std::atoi(env));
-    }
-
-    for (int index = 1; index < argc; ++index)
-    {
-        const std::string_view current{argv[index]};
-        if (current == "--scale" && (index + 1) < argc)
-        {
-            options.scale = std::max(1, std::atoi(argv[index + 1]));
-            ++index;
-            continue;
-        }
-
-        if (current == "--auto-exit-ms" && (index + 1) < argc)
-        {
-            options.auto_exit_ms = std::max(0, std::atoi(argv[index + 1]));
-            ++index;
-        }
-    }
-
-    return options;
-}
-
-} // namespace
-
-int main(int argc, char** argv)
-{
-    try
-    {
-        const auto options = parseOptions(argc, argv);
-
-        // Simulator defaults to demo mode (synthetic peers, loopback mesh).
-        // Only set when the user has not already specified a mode.
-        if (!std::getenv("TRAIL_MATE_RUNTIME_MODE"))
-        {
-#if defined(_WIN32)
-            _putenv_s("TRAIL_MATE_RUNTIME_MODE", "demo");
-#else
-            setenv("TRAIL_MATE_RUNTIME_MODE", "demo", 1);
-#endif
-        }
-
-        trailmate::cardputer_zero::platform::simulator::SdlSimulator simulator{options.scale};
-        trailmate::cardputer_zero::linux_ui::runShellUi(
-            simulator,
-            std::chrono::milliseconds{options.auto_exit_ms});
-        return 0;
-    }
-    catch (const std::exception& ex)
-    {
-        std::cerr << "Simulator startup failed: " << ex.what() << '\n';
-        return 1;
-    }
-}
diff --git a/apps/linux_sim/tests/demo_app_smoke.cpp b/apps/linux_sim/tests/demo_app_smoke.cpp
deleted file mode 100644
index 55c4c4b1..00000000
--- a/apps/linux_sim/tests/demo_app_smoke.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include <cstddef>
-#include <cstdint>
-#include <iostream>
-#include <unordered_set>
-
-#include "app/demo_app.h"
-#include "app/input_event.h"
-#include "core/canvas.h"
-#include "core/color.h"
-#include "core/display_profile.h"
-
-int main()
-{
-    trailmate::cardputer_zero::app::DemoApp app{};
-    trailmate::cardputer_zero::core::Canvas canvas{
-        trailmate::cardputer_zero::core::kDisplayWidth,
-        trailmate::cardputer_zero::core::kDisplayHeight};
-    app.render(canvas);
-    const auto baseline_pixels = canvas.pixels();
-
-    app.handleInput(trailmate::cardputer_zero::app::makeCharacterInput('A', "A"));
-    app.handleInput(trailmate::cardputer_zero::app::InputEvent{
-        trailmate::cardputer_zero::app::InputKey::Next,
-        "NEXT",
-        '\0'});
-    app.render(canvas);
-
-    const auto background = canvas.pixel(0, 0);
-    std::size_t changed_pixels = 0;
-    std::size_t frame_delta = 0;
-    std::unordered_set<std::uint32_t> palette{};
-
-    for (std::size_t index = 0; index < canvas.pixels().size(); ++index)
-    {
-        const auto& pixel = canvas.pixels()[index];
-        if (pixel != background)
-        {
-            ++changed_pixels;
-        }
-        palette.insert(trailmate::cardputer_zero::core::pack_key(pixel));
-        if (pixel != baseline_pixels[index])
-        {
-            ++frame_delta;
-        }
-    }
-
-    if (changed_pixels < 1000)
-    {
-        std::cerr << "Expected the demo screen to render more than a trivial number of pixels.\n";
-        return 1;
-    }
-
-    if (palette.size() < 4)
-    {
-        std::cerr << "Expected multiple colors in the rendered demo screen.\n";
-        return 1;
-    }
-
-    if (canvas.pixel(12, 12) == background)
-    {
-        std::cerr << "Expected the framed application panel to differ from the outer background.\n";
-        return 1;
-    }
-
-    if (frame_delta == 0)
-    {
-        std::cerr << "Expected the rendered frame to change after simulated input.\n";
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/apps/linux_sim/tests/linux_runtime_smoke.cpp b/apps/linux_sim/tests/linux_runtime_smoke.cpp
deleted file mode 100644
index ce9afdcf..00000000
--- a/apps/linux_sim/tests/linux_runtime_smoke.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-#include "app/linux_app_facade.h"
-#include "app/linux_app_services.h"
-#include "chat/usecase/chat_service.h"
-#include "chat/usecase/contact_service.h"
-#include "platform/linux/map_tile_cache.h"
-#include "platform/linux/runtime_paths.h"
-#include "platform/ui/device_runtime.h"
-#include "platform/ui/firmware_update_runtime.h"
-#include "platform/ui/gps_runtime.h"
-#include "platform/ui/hostlink_runtime.h"
-#include "platform/ui/lora_runtime.h"
-#include "platform/ui/orientation_runtime.h"
-#include "platform/ui/route_storage.h"
-#include "platform/ui/screen_runtime.h"
-#include "platform/ui/settings_store.h"
-#include "platform/ui/sstv_runtime.h"
-#include "platform/ui/team_ui_store_runtime.h"
-#include "platform/ui/time_runtime.h"
-#include "platform/ui/tracker_runtime.h"
-#include "platform/ui/usb_support_runtime.h"
-#include "platform/ui/walkie_runtime.h"
-#include "platform/ui/wifi_runtime.h"
-#include "team/protocol/team_track.h"
-#include "team/usecase/team_pairing_service.h"
-
-#include <cassert>
-#include <cmath>
-#include <cstdint>
-#include <cstdio>
-#include <ctime>
-#include <filesystem>
-#include <fstream>
-#include <string>
-#include <thread>
-#include <vector>
-
-namespace
-{
-
-void set_env_var(const char* name, const std::string& value)
-{
-#if defined(_WIN32)
-    _putenv_s(name, value.c_str());
-#else
-    setenv(name, value.c_str(), 1);
-#endif
-}
-
-} // namespace
-
-int main()
-{
-    using namespace platform::ui;
-    namespace ui_gps = platform::ui::gps;
-    namespace ui_hostlink = platform::ui::hostlink;
-    using trailmate::cardputer_zero::linux_ui::MinimalLinuxAppFacade;
-
-    const std::filesystem::path runtime_root =
-        std::filesystem::temp_directory_path() / "trailmate-linux-runtime-smoke";
-    std::error_code ec;
-    std::filesystem::remove_all(runtime_root, ec);
-    std::filesystem::create_directories(runtime_root, ec);
-    assert(!ec);
-
-    set_env_var("TRAIL_MATE_SETTINGS_ROOT", runtime_root.string());
-    set_env_var("TRAIL_MATE_HOSTLINK_PORT", "44192");
-    set_env_var("TRAIL_MATE_GPS_SUPPORTED", "1");
-    set_env_var("TRAIL_MATE_GPS_READY", "1");
-    set_env_var("TRAIL_MATE_LORA_SIMULATED", "1");
-
-    settings_store::clear_namespace("settings");
-    settings_store::clear_namespace("runtime_smoke");
-    settings_store::clear_namespace("linux_contact_nodes");
-    settings_store::clear_namespace("linux_contact_names");
-    settings_store::clear_namespace("linux_app_facade");
-
-    set_env_var("TRAIL_MATE_RUNTIME_MODE", "local");
-    {
-        trailmate::linux_app::LinuxAppServices local_services;
-        assert(local_services.initialize());
-        local_services.dispatchPendingEvents();
-        assert(!local_services.isBleEnabled());
-        local_services.setBleEnabled(true);
-        assert(!local_services.isBleEnabled());
-
-        const auto contacts = local_services.contacts().getContacts();
-        const auto nearby = local_services.contacts().getNearby();
-        const auto ignored = local_services.contacts().getIgnoredNodes();
-        assert(contacts.empty());
-        assert(nearby.empty());
-        assert(ignored.size() <= 1U);
-
-        std::size_t total_conversations = 0;
-        const auto conversations =
-            local_services.chat().getConversations(0, 8, &total_conversations);
-        assert(total_conversations == 0U);
-        assert(conversations.empty());
-        local_services.shutdown();
-    }
-    settings_store::clear_namespace("linux_contact_nodes");
-    settings_store::clear_namespace("linux_contact_names");
-    settings_store::clear_namespace("linux_app_facade");
-
-    settings_store::put_int("runtime_smoke", "answer", 42);
-    settings_store::put_bool("runtime_smoke", "enabled", true);
-    settings_store::put_uint("runtime_smoke", "timeout", 1234U);
-    const std::string greeting = "hello";
-    assert(settings_store::put_string("runtime_smoke", "greeting", greeting.c_str()));
-
-    const std::vector<uint8_t> blob_in = {1U, 2U, 3U, 4U};
-    assert(settings_store::put_blob("runtime_smoke", "blob", blob_in.data(), blob_in.size()));
-
-    std::string greeting_out;
-    std::vector<uint8_t> blob_out;
-    assert(settings_store::get_int("runtime_smoke", "answer", 0) == 42);
-    assert(settings_store::get_bool("runtime_smoke", "enabled", false));
-    assert(settings_store::get_uint("runtime_smoke", "timeout", 0) == 1234U);
-    assert(settings_store::get_string("runtime_smoke", "greeting", greeting_out));
-    assert(greeting_out == greeting);
-    assert(settings_store::get_blob("runtime_smoke", "blob", blob_out));
-    assert(blob_out == blob_in);
-    assert(std::filesystem::exists(platform::linux_runtime::sqlite_database_path()));
-
-    platform::linux_runtime::MapTileCache tile_cache;
-    const auto tile_stats = tile_cache.stats();
-    assert(tile_stats.database == platform::linux_runtime::sqlite_database_path());
-    assert(!tile_stats.root.empty());
-
-    screen::set_timeout_ms(45000U);
-    assert(screen::clamp_timeout_ms(45000U) == 45000U);
-    assert(screen::timeout_ms() == 45000U);
-    assert(screen::timeout_secs() == 45U);
-
-    screen::init({});
-    screen::disable_sleep();
-    assert(screen::is_sleep_disabled());
-    screen::enable_sleep();
-    assert(!screen::is_sleep_disabled());
-
-    time::set_timezone_offset_min(60);
-    const std::time_t shifted = time::apply_timezone_offset(3600);
-    assert(shifted == 7200);
-
-    std::tm local_tm{};
-    (void)time::localtime_now(&local_tm);
-
-    const auto version = device::firmware_version();
-    assert(version != nullptr);
-    assert(version[0] != '\0');
-    assert(device::rtc_ready());
-    assert(device::gps_supported());
-    assert(device::gps_ready());
-    device::delay_ms(1);
-
-    assert(!firmware_update::is_supported());
-    const auto firmware_status = firmware_update::status();
-    assert(!firmware_status.supported);
-    assert(firmware_status.phase == firmware_update::Phase::Unsupported);
-    assert(!firmware_update::start_check());
-    assert(!firmware_update::start_install());
-
-    assert(ui_hostlink::is_supported());
-    ui_hostlink::start();
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
-    assert(ui_hostlink::is_active());
-    const auto hostlink_status = ui_hostlink::get_status();
-    assert(hostlink_status.state == ui_hostlink::LinkState::Waiting ||
-           hostlink_status.state == ui_hostlink::LinkState::Error);
-    ui_hostlink::stop();
-    assert(!ui_hostlink::is_active());
-    assert(ui_hostlink::get_status().state == ui_hostlink::LinkState::Stopped);
-
-    const auto heading = orientation::get_heading();
-    assert(!heading.available);
-    assert(!heading.sensor_ready);
-    orientation::ensure_heading_runtime();
-
-    std::vector<std::string> routes;
-    assert(route_storage::is_supported());
-    assert(route_storage::list_routes(routes));
-    assert(routes.empty());
-    assert(!route_storage::remove_route("/routes/example.kml"));
-    const std::filesystem::path route_dir_path(route_storage::route_dir());
-    assert(!route_dir_path.empty());
-    std::filesystem::create_directories(route_dir_path, ec);
-    assert(std::filesystem::is_directory(route_dir_path));
-
-    assert(sstv::is_supported());
-    assert(sstv::framebuffer() != nullptr);
-    assert(sstv::frame_width() > 0U);
-    assert(sstv::frame_height() > 0U);
-    assert(sstv::start());
-    assert(sstv::is_active());
-    const auto sstv_status = sstv::get_status();
-    assert(sstv_status.state == sstv::State::Waiting || sstv_status.state == sstv::State::Receiving);
-    sstv::stop();
-    assert(!sstv::is_active());
-
-    std::vector<std::string> tracks;
-    std::string current_track;
-    assert(tracker::is_supported());
-    assert(!tracker::is_recording());
-    assert(tracker::start_recording());
-    assert(tracker::is_recording());
-    assert(tracker::current_path(current_track));
-    assert(!current_track.empty());
-    tracker::stop_recording();
-    assert(!tracker::is_recording());
-    assert(tracker::list_tracks(tracks));
-    assert(!tracks.empty());
-    assert(!tracker::remove_track("/tracks/example.gpx"));
-    const std::filesystem::path track_dir_path(tracker::track_dir());
-    assert(!track_dir_path.empty());
-    std::filesystem::create_directories(track_dir_path, ec);
-    assert(std::filesystem::is_directory(track_dir_path));
-    tracker::set_auto_recording(true);
-    tracker::set_interval_seconds(5U);
-    tracker::set_distance_only(true);
-    tracker::set_format(tracker::Format::CSV);
-    tracker::stop_recording();
-
-    assert(!usb_support::is_supported());
-    assert(!usb_support::start());
-    const auto usb_status = usb_support::get_status();
-    assert(!usb_status.active);
-    assert(usb_status.message != nullptr);
-    usb_support::prepare_mass_storage_mode();
-    usb_support::restore_mass_storage_mode();
-    usb_support::stop();
-
-    assert(walkie::is_supported());
-    assert(walkie::start());
-    assert(walkie::is_active());
-    assert(walkie::volume() > 0);
-    const auto walkie_status = walkie::get_status();
-    assert(walkie_status.active);
-    assert(walkie_status.freq_mhz > 0.0f);
-    assert(walkie::last_error() != nullptr);
-    walkie::stop();
-    assert(!walkie::is_active());
-
-    wifi::Config wifi_config{};
-    wifi_config.enabled = true;
-    std::snprintf(wifi_config.ssid, sizeof(wifi_config.ssid), "%s", "TrailMateNet");
-    std::snprintf(wifi_config.password, sizeof(wifi_config.password), "%s", "test-password");
-    assert(wifi::save_config(wifi_config));
-
-    wifi::Config wifi_loaded{};
-    assert(wifi::load_config(wifi_loaded));
-    assert(wifi_loaded.enabled);
-    assert(std::string(wifi_loaded.ssid) == "TrailMateNet");
-    assert(std::string(wifi_loaded.password) == "test-password");
-    assert(!wifi::is_supported());
-    assert(!wifi::apply_enabled(true));
-    assert(wifi::apply_enabled(false));
-    assert(!wifi::connect(&wifi_loaded));
-    wifi::disconnect();
-    std::vector<wifi::ScanResult> wifi_scan_results;
-    assert(!wifi::scan(wifi_scan_results));
-    assert(wifi_scan_results.empty());
-    const auto wifi_status = wifi::status();
-    assert(!wifi_status.supported);
-    assert(!wifi_status.connected);
-    assert(wifi_status.has_credentials);
-    assert(wifi_status.state == wifi::ConnectionState::Unsupported);
-
-    const auto gps_state = ui_gps::get_data();
-    assert(gps_state.valid);
-    assert(gps_state.has_alt);
-    assert(gps_state.has_speed);
-    assert(gps_state.has_course);
-    std::vector<ui_gps::GnssSatInfo> sats(4U);
-    ui_gps::GnssStatus gnss_status{};
-    std::size_t sat_count = sats.size();
-    assert(ui_gps::get_gnss_snapshot(sats.data(), sats.size(), &sat_count, &gnss_status));
-    assert(sat_count == sats.size());
-    assert(gnss_status.fix == ui_gps::GnssFix::FIX3D);
-    assert(gnss_status.sats_in_use > 0U);
-    assert(ui_gps::last_motion_ms() > 0U);
-    assert(ui_gps::is_enabled());
-    assert(ui_gps::is_powered());
-    ui_gps::set_collection_interval(1000U);
-    ui_gps::set_power_strategy(1U);
-    ui_gps::set_gnss_config(1U, 0xFFU);
-    ui_gps::set_external_nmea_config(1U, 0x01U);
-    ui_gps::set_motion_idle_timeout(30000U);
-    ui_gps::set_motion_sensor_id(2U);
-    ui_gps::set_enabled(false);
-    assert(!ui_gps::is_enabled());
-    ui_gps::set_enabled(true);
-    assert(ui_gps::is_enabled());
-    ui_gps::suspend_runtime();
-    assert(!ui_gps::is_enabled());
-    assert(!ui_gps::is_powered());
-    ui_gps::resume_runtime();
-    assert(ui_gps::is_enabled());
-    assert(ui_gps::is_powered());
-    const double map_resolution = ui_gps::calculate_map_resolution(0, 0.0);
-    assert(std::fabs(map_resolution - 156543.03392) < 0.01);
-
-    const std::filesystem::path nmea_file = runtime_root / "gps_feed.nmea";
-    {
-        std::ofstream nmea_stream(nmea_file, std::ios::trunc);
-        nmea_stream << "$GNRMC,123519,A,3113.8240,N,12128.4220,E,1.20,84.4,230394,,,\n";
-        nmea_stream << "$GNGGA,123520,3113.8240,N,12128.4220,E,1,10,0.9,15.2,M,0.0,M,,\n";
-        nmea_stream << "$GNGSA,A,3,03,08,14,22,07,19,31,,,,,0.0,0.9,1.2\n";
-        nmea_stream << "$GPGSV,1,1,4,03,74,018,42,08,58,084,39,14,41,156,35,22,49,286,31\n";
-    }
-    set_env_var("TRAIL_MATE_GPS_NMEA_FILE", nmea_file.string());
-
-    const auto gps_nmea_state = ui_gps::get_data();
-    assert(gps_nmea_state.valid);
-    assert(std::fabs(gps_nmea_state.lat - 31.2304) < 0.0002);
-    assert(std::fabs(gps_nmea_state.lng - 121.4737) < 0.0002);
-    assert(std::fabs(gps_nmea_state.alt_m - 15.2) < 0.01);
-    assert(gps_nmea_state.satellites == 10U);
-
-    std::vector<ui_gps::GnssSatInfo> nmea_sats(8U);
-    ui_gps::GnssStatus nmea_status{};
-    std::size_t nmea_sat_count = nmea_sats.size();
-    assert(ui_gps::get_gnss_snapshot(nmea_sats.data(), nmea_sats.size(), &nmea_sat_count, &nmea_status));
-    assert(nmea_status.fix == ui_gps::GnssFix::FIX3D);
-    assert(nmea_status.sats_in_use >= 7U);
-    assert(nmea_sat_count >= 4U);
-
-    assert(lora::is_supported());
-    assert(lora::acquire());
-    assert(lora::is_online());
-    lora::ReceiveConfig receive_config{};
-    assert(lora::configure_receive(433.92f, receive_config));
-    assert(std::isfinite(lora::read_instant_rssi()));
-    lora::release();
-    assert(!lora::is_online());
-
-    set_env_var("TRAIL_MATE_RUNTIME_MODE", "demo");
-    MinimalLinuxAppFacade facade;
-    assert(facade.initialize());
-    facade.dispatchPendingEvents();
-
-    const auto contacts = facade.getContactService().getContacts();
-    const auto nearby = facade.getContactService().getNearby();
-    const auto ignored = facade.getContactService().getIgnoredNodes();
-    assert(contacts.size() >= 2U);
-    assert(!ignored.empty());
-    assert((contacts.size() + nearby.size() + ignored.size()) >= 4U);
-
-    std::size_t total_conversations = 0;
-    const auto conversations = facade.getChatService().getConversations(0, 8, &total_conversations);
-    assert(total_conversations >= 3U);
-    assert(!conversations.empty());
-
-    auto* pairing = facade.getTeamPairing();
-    assert(pairing != nullptr);
-    assert(pairing->startMember(facade.getSelfNodeId()));
-    for (int i = 0; i < 16; ++i)
-    {
-        facade.tickEventRuntime();
-        facade.dispatchPendingEvents();
-        std::this_thread::sleep_for(std::chrono::milliseconds(40));
-    }
-
-    team::ui::TeamUiSnapshot team_snapshot{};
-    assert(team::ui::team_ui_get_store().load(team_snapshot));
-    assert(team_snapshot.in_team);
-    assert(team_snapshot.has_team_id);
-    assert(team_snapshot.has_team_psk);
-    assert(team_snapshot.members.size() >= 2U);
-
-    team::proto::TeamTrackMessage track{};
-    track.start_ts = static_cast<uint32_t>(std::time(nullptr));
-    track.interval_s = 10;
-    track.valid_mask = 0x3U;
-    track.points.push_back({311234567, 1214567890});
-    track.points.push_back({311235000, 1214568200});
-    assert(team::ui::team_ui_append_member_track(team_snapshot.team_id, 0x435A1001U, track));
-    std::string member_track_path;
-    assert(team::ui::team_ui_get_member_track_path(team_snapshot.team_id, 0x435A1001U, member_track_path));
-    assert(!member_track_path.empty());
-    assert(std::filesystem::exists(member_track_path));
-    facade.shutdown();
-
-    settings_store::clear_namespace("settings");
-    settings_store::clear_namespace("runtime_smoke");
-    std::filesystem::remove_all(runtime_root, ec);
-    return 0;
-}
diff --git a/apps/linux_sim/tests/path_safety_smoke.cpp b/apps/linux_sim/tests/path_safety_smoke.cpp
deleted file mode 100644
index 10cb7740..00000000
--- a/apps/linux_sim/tests/path_safety_smoke.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-#include "platform/linux/capability_status.h"
-#include "platform/linux/runtime_paths.h"
-
-#include <cassert>
-#include <cstdio>
-#include <filesystem>
-#include <fstream>
-#include <string>
-#include <string_view>
-
-namespace
-{
-
-void set_env_var(const char* name, const std::string& value)
-{
-#if defined(_WIN32)
-    _putenv_s(name, value.c_str());
-#else
-    setenv(name, value.c_str(), 1);
-#endif
-}
-
-void test_resolve_paths()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const auto paths = lnx::resolve_paths();
-    assert(!paths.settings_root.empty());
-    assert(!paths.sd_root.empty());
-    assert(!paths.cache_root.empty());
-
-    // sd_root should be a child of or equal to settings_root, or an explicit
-    // override.  We only check that both are non-empty paths.
-    assert(!paths.sd_root.string().empty());
-    assert(!paths.settings_root.string().empty());
-
-    std::printf("[path-safety] resolve_paths OK\n");
-}
-
-void test_settings_file()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const auto path = lnx::settings_file("test_ns");
-    assert(!path.empty());
-    assert(path.extension() == ".kv");
-
-    std::printf("[path-safety] settings_file OK\n");
-}
-
-void test_child_under_root_allow()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const std::filesystem::path temp =
-        std::filesystem::temp_directory_path() / "trailmate_path_test";
-    std::error_code ec;
-    std::filesystem::remove_all(temp, ec);
-    std::filesystem::create_directories(temp / "sub", ec);
-    assert(!ec);
-
-    // Write a marker file so resolution succeeds.
-    {
-        std::ofstream f(temp / "sub" / "ok.txt");
-        f << "ok\n";
-    }
-
-    std::filesystem::path out;
-    assert(lnx::resolve_child_under_root(temp, "sub/ok.txt", out));
-    assert(out.filename() == "ok.txt");
-
-    std::filesystem::remove_all(temp, ec);
-    std::printf("[path-safety] child_under_root_allow OK\n");
-}
-
-void test_child_under_root_reject_absolute()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const auto temp = std::filesystem::temp_directory_path() / "trailmate_path_test2";
-    std::error_code ec;
-    std::filesystem::create_directories(temp, ec);
-
-    std::filesystem::path out;
-    assert(!lnx::resolve_child_under_root(temp, "/etc/passwd", out));
-    assert(out.empty());
-
-    std::filesystem::remove_all(temp, ec);
-    std::printf("[path-safety] child_under_root_reject_absolute OK\n");
-}
-
-void test_child_under_root_reject_dotdot()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const auto temp = std::filesystem::temp_directory_path() / "trailmate_path_test3";
-    std::error_code ec;
-    std::filesystem::remove_all(temp, ec);
-    std::filesystem::create_directories(temp / "a" / "b", ec);
-
-    std::filesystem::path out;
-    assert(!lnx::resolve_child_under_root(temp, "a/../secret", out));
-    assert(out.empty());
-
-    // Also reject ".." as the sole component.
-    assert(!lnx::resolve_child_under_root(temp, "..", out));
-    assert(out.empty());
-
-    std::filesystem::remove_all(temp, ec);
-    std::printf("[path-safety] child_under_root_reject_dotdot OK\n");
-}
-
-void test_child_under_root_reject_empty()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const auto temp = std::filesystem::temp_directory_path();
-    std::filesystem::path out;
-    assert(!lnx::resolve_child_under_root(temp, "", out));
-    assert(out.empty());
-
-    std::printf("[path-safety] child_under_root_reject_empty OK\n");
-}
-
-void test_safe_remove()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const auto temp = std::filesystem::temp_directory_path() / "trailmate_path_test_rm";
-    std::error_code ec;
-    std::filesystem::remove_all(temp, ec);
-    std::filesystem::create_directories(temp / "sub", ec);
-
-    // Create a file.
-    {
-        std::ofstream f(temp / "sub" / "victim.txt");
-        f << "data\n";
-    }
-    assert(std::filesystem::exists(temp / "sub" / "victim.txt"));
-
-    // Safe remove.
-    assert(lnx::safe_remove_under_root(temp, "sub/victim.txt"));
-    assert(!std::filesystem::exists(temp / "sub" / "victim.txt"));
-
-    // Removing a non-existent file should return true (already gone).
-    assert(lnx::safe_remove_under_root(temp, "sub/victim.txt"));
-
-    // Reject dotdot removal.
-    assert(!lnx::safe_remove_under_root(temp, "../secret"));
-
-    std::filesystem::remove_all(temp, ec);
-    std::printf("[path-safety] safe_remove OK\n");
-}
-
-void test_safe_write()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const auto temp = std::filesystem::temp_directory_path() / "trailmate_path_test_write";
-    std::error_code ec;
-    std::filesystem::remove_all(temp, ec);
-
-    assert(lnx::safe_write_under_root(temp, "data/config.txt", "hello world"));
-    assert(std::filesystem::exists(temp / "data" / "config.txt"));
-
-    // Read back.
-    std::ifstream in(temp / "data" / "config.txt");
-    std::string content;
-    std::getline(in, content, '\0');
-    assert(content == "hello world");
-
-    // Reject traversal.
-    assert(!lnx::safe_write_under_root(temp, "../escape.txt", "bad"));
-
-    std::filesystem::remove_all(temp, ec);
-    std::printf("[path-safety] safe_write OK\n");
-}
-
-void test_resolve_paths_with_env_override()
-{
-    namespace lnx = platform::linux_runtime;
-
-    const std::string override_root =
-        (std::filesystem::temp_directory_path() / "trailmate_override_test").string();
-
-    set_env_var("TRAIL_MATE_SETTINGS_ROOT", override_root);
-    set_env_var("TRAIL_MATE_SD_ROOT", override_root + "/my_sd");
-    set_env_var("TRAIL_MATE_CACHE_ROOT", override_root + "/my_cache");
-
-    const auto paths = lnx::resolve_paths();
-    assert(paths.settings_root.string() == override_root);
-    assert(paths.sd_root.string() == override_root + "/my_sd");
-    assert(paths.cache_root.string() == override_root + "/my_cache");
-
-    set_env_var("TRAIL_MATE_SETTINGS_ROOT", "");
-    set_env_var("TRAIL_MATE_SD_ROOT", "");
-    set_env_var("TRAIL_MATE_CACHE_ROOT", "");
-
-    std::printf("[path-safety] resolve_paths_with_env_override OK\n");
-}
-
-void test_capability_state_labels()
-{
-    namespace lnx = platform::linux_runtime;
-
-    // Verify every state has a non-null label.
-    assert(lnx::capability_state_label(lnx::CapabilityState::Unsupported) != nullptr);
-    assert(lnx::capability_state_label(lnx::CapabilityState::Simulated) != nullptr);
-    assert(lnx::capability_state_label(lnx::CapabilityState::Available) != nullptr);
-    assert(lnx::capability_state_label(lnx::CapabilityState::Degraded) != nullptr);
-    assert(lnx::capability_state_label(lnx::CapabilityState::Error) != nullptr);
-
-    std::printf("[path-safety] capability_state_labels OK\n");
-}
-
-} // namespace
-
-int main()
-{
-    test_resolve_paths();
-    test_settings_file();
-    test_child_under_root_allow();
-    test_child_under_root_reject_absolute();
-    test_child_under_root_reject_dotdot();
-    test_child_under_root_reject_empty();
-    test_safe_remove();
-    test_safe_write();
-    test_resolve_paths_with_env_override();
-    test_capability_state_labels();
-
-    std::printf("[path-safety] All tests passed.\n");
-    return 0;
-}
diff --git a/apps/linux_sim_shell/APP_SHELL_MANIFEST.md b/apps/linux_sim_shell/APP_SHELL_MANIFEST.md
new file mode 100644
index 00000000..546b3fd1
--- /dev/null
+++ b/apps/linux_sim_shell/APP_SHELL_MANIFEST.md
@@ -0,0 +1,76 @@
+# App Shell Manifest: linux_sim_shell
+
+## Role
+
+Product app shell / target app shell.
+
+## Target Family
+
+Linux simulator.
+
+## Renderer Family
+
+Simulator, ASCII, or host UI selected by target profile.
+
+## Build Entrypoint
+
+Future authoritative build entrypoint:
+
+- `builds/linux_cmake`
+
+Current transitional path:
+
+- `removed root linux_sim`
+
+## Future Responsibilities
+
+May:
+
+- select Linux simulator target profile
+- select simulator device profile
+- select simulator UX profile
+- invoke product composition
+- hand off to runtime facade
+
+Must not:
+
+- own build host files
+- own CMake project mechanics
+- define board facts
+- implement HAL details
+- implement screen internals
+- assemble Chat/Map/GPS runtime directly in build wrapper
+
+## Thin App Shell Entrypoint Declaration
+
+Future declaration:
+
+```text
+trail_mate_linux_sim_shell_start(target_profile)
+```
+
+## Current Status
+
+Executable app shell baseline.
+
+Phase 8 Correction adds:
+
+- `CMakeLists.txt`
+- `src/linux_sim_app_shell.h`
+- `src/linux_sim_app_shell.cpp`
+- `tests/linux_sim_app_shell_smoke.cpp`
+
+Selected UX Pack:
+
+- `simulator_full`
+
+UX Pack Runtime Binding:
+
+- `LinuxSimAppShell::validate()` resolves `ux_pack_id` through
+  `findUxPackById`.
+
+Transitional implementation root:
+
+- `removed root linux_sim`
+
+No simulator runtime behavior change in Phase 8 Correction.
diff --git a/apps/linux_sim_shell/CMakeLists.txt b/apps/linux_sim_shell/CMakeLists.txt
new file mode 100644
index 00000000..a77b044e
--- /dev/null
+++ b/apps/linux_sim_shell/CMakeLists.txt
@@ -0,0 +1,214 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(TrailMateLinuxSimShell LANGUAGES CXX)
+
+include(CTest)
+
+set(TRAIL_MATE_REPO_ROOT
+    "${CMAKE_CURRENT_LIST_DIR}/../.."
+    CACHE PATH "Trail Mate repository root")
+
+include("${TRAIL_MATE_REPO_ROOT}/cmake/TrailMateUxPacks.cmake")
+trailmate_add_ui_lvgl_ux_packs(trailmate_ui_lvgl_ux_packs)
+
+add_library(trailmate_linux_sim_shell
+    src/linux_sim_app_shell.cpp
+    src/linux_sim_historical_source_descriptor.cpp
+    src/linux_sim_runtime_entry.cpp
+    src/linux_sim_runtime_entry_adoption_probe.cpp
+    src/linux_sim_runtime_renderer.cpp
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/src/target_profile.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/src/target_ux_binding.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_runtime_screen_graph_presenter.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_descriptor_renderer.cpp")
+
+target_include_directories(trailmate_linux_sim_shell
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}/src"
+        "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/include"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/include")
+
+target_link_libraries(trailmate_linux_sim_shell
+    PUBLIC
+        trailmate_ui_lvgl_ux_packs)
+
+target_compile_features(trailmate_linux_sim_shell PUBLIC cxx_std_17)
+
+if(BUILD_TESTING)
+    add_executable(trailmate_linux_sim_app_shell_smoke
+        tests/linux_sim_app_shell_smoke.cpp)
+    target_link_libraries(trailmate_linux_sim_app_shell_smoke
+        PRIVATE trailmate_linux_sim_shell)
+    add_test(NAME trailmate_linux_sim_app_shell_smoke
+             COMMAND trailmate_linux_sim_app_shell_smoke)
+
+    add_executable(trailmate_linux_sim_historical_source_descriptor_smoke
+        tests/linux_sim_historical_source_descriptor_smoke.cpp)
+    target_link_libraries(trailmate_linux_sim_historical_source_descriptor_smoke
+        PRIVATE trailmate_linux_sim_shell)
+    add_test(NAME trailmate_linux_sim_historical_source_descriptor_smoke
+             COMMAND trailmate_linux_sim_historical_source_descriptor_smoke)
+
+    add_executable(trailmate_linux_sim_runtime_entry_adoption_probe_smoke
+        tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp)
+    target_link_libraries(trailmate_linux_sim_runtime_entry_adoption_probe_smoke
+        PRIVATE trailmate_linux_sim_shell)
+    add_test(NAME trailmate_linux_sim_runtime_entry_adoption_probe_smoke
+             COMMAND trailmate_linux_sim_runtime_entry_adoption_probe_smoke)
+
+    add_executable(trailmate_linux_sim_runtime_entry_smoke
+        tests/linux_sim_runtime_entry_smoke.cpp)
+    target_link_libraries(trailmate_linux_sim_runtime_entry_smoke
+        PRIVATE trailmate_linux_sim_shell)
+    add_test(NAME trailmate_linux_sim_runtime_entry_smoke
+             COMMAND trailmate_linux_sim_runtime_entry_smoke)
+
+    add_executable(trailmate_linux_sim_runtime_entry_fallback_smoke
+        tests/linux_sim_runtime_entry_fallback_smoke.cpp)
+    target_link_libraries(trailmate_linux_sim_runtime_entry_fallback_smoke
+        PRIVATE trailmate_linux_sim_shell)
+    add_test(NAME trailmate_linux_sim_runtime_entry_fallback_smoke
+             COMMAND trailmate_linux_sim_runtime_entry_fallback_smoke)
+
+    add_executable(trailmate_linux_sim_runtime_renderer_smoke
+        tests/linux_sim_runtime_renderer_smoke.cpp)
+    target_link_libraries(trailmate_linux_sim_runtime_renderer_smoke
+        PRIVATE trailmate_linux_sim_shell)
+    add_test(NAME trailmate_linux_sim_runtime_renderer_smoke
+             COMMAND trailmate_linux_sim_runtime_renderer_smoke)
+
+    add_executable(trailmate_ascii_runtime_entry_adoption_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/tests/ascii_runtime_entry_adoption_smoke.cpp")
+    target_link_libraries(trailmate_ascii_runtime_entry_adoption_smoke
+        PRIVATE trailmate_linux_sim_shell)
+    add_test(NAME trailmate_ascii_runtime_entry_adoption_smoke
+             COMMAND trailmate_ascii_runtime_entry_adoption_smoke)
+
+    add_executable(trailmate_ascii_descriptor_renderer_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/tests/test_ascii_descriptor_renderer.cpp")
+    target_link_libraries(trailmate_ascii_descriptor_renderer_smoke
+        PRIVATE trailmate_linux_sim_shell)
+    add_test(NAME trailmate_ascii_descriptor_renderer_smoke
+             COMMAND trailmate_ascii_descriptor_renderer_smoke)
+
+    add_executable(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp")
+    target_include_directories(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+        PRIVATE
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_chat_runtime/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/include")
+    target_compile_features(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+        PRIVATE cxx_std_17)
+    add_test(NAME trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+             COMMAND trailmate_legacy_chat_delivery_action_bridge_alias_smoke)
+
+    add_executable(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp")
+    target_include_directories(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+        PRIVATE
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_chat_runtime/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/include")
+    target_compile_features(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+        PRIVATE cxx_std_17)
+    add_test(NAME trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+             COMMAND trailmate_legacy_chat_delivery_event_bridge_alias_smoke)
+
+    add_executable(trailmate_key_verification_runtime_adapters_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/usecase/contact_service.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/core_sys/src/sys/clock.cpp")
+    target_include_directories(trailmate_key_verification_runtime_adapters_smoke
+        PRIVATE
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_key_verification_runtime/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/core_sys/include")
+    target_compile_features(trailmate_key_verification_runtime_adapters_smoke
+        PRIVATE cxx_std_17)
+    add_test(NAME trailmate_key_verification_runtime_adapters_smoke
+             COMMAND trailmate_key_verification_runtime_adapters_smoke)
+
+    add_executable(trailmate_legacy_key_verification_adapters_alias_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp")
+    target_include_directories(trailmate_legacy_key_verification_adapters_alias_smoke
+        PRIVATE
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_key_verification_runtime/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/include")
+    target_compile_features(trailmate_legacy_key_verification_adapters_alias_smoke
+        PRIVATE cxx_std_17)
+    add_test(NAME trailmate_legacy_key_verification_adapters_alias_smoke
+             COMMAND trailmate_legacy_key_verification_adapters_alias_smoke)
+
+    add_executable(trailmate_map_overlay_snapshot_source_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp")
+    target_include_directories(trailmate_map_overlay_snapshot_source_smoke
+        PRIVATE
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/include")
+    target_compile_features(trailmate_map_overlay_snapshot_source_smoke
+        PRIVATE cxx_std_17)
+    add_test(NAME trailmate_map_overlay_snapshot_source_smoke
+             COMMAND trailmate_map_overlay_snapshot_source_smoke)
+
+    add_executable(trailmate_legacy_map_overlay_source_alias_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp")
+    target_include_directories(trailmate_legacy_map_overlay_source_alias_smoke
+        PRIVATE
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/include")
+    target_compile_features(trailmate_legacy_map_overlay_source_alias_smoke
+        PRIVATE cxx_std_17)
+    add_test(NAME trailmate_legacy_map_overlay_source_alias_smoke
+             COMMAND trailmate_legacy_map_overlay_source_alias_smoke)
+
+    add_executable(trailmate_ui_presentation_screen_binding_registry_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/tests/test_screen_binding_registry.cpp")
+    target_link_libraries(trailmate_ui_presentation_screen_binding_registry_smoke
+        PRIVATE trailmate_ui_lvgl_ux_packs)
+    add_test(NAME trailmate_ui_presentation_screen_binding_registry_smoke
+             COMMAND trailmate_ui_presentation_screen_binding_registry_smoke)
+
+    foreach(ux_pack_test IN ITEMS
+        screen_registry
+        input_binding_set
+        ux_screen_menu_adapter
+        ux_menu_provider
+        lvgl_menu_runtime_adapter
+        compatibility_screen_factory
+        lvgl_screen_host_adapter
+        lvgl_screen_graph_bridge
+        lvgl_runtime_screen_graph_presenter
+        lvgl_runtime_entry_adoption
+        lvgl_runtime_adoption_probe
+        lvgl_primary_screen_graph_runtime
+        lvgl_descriptor_menu_model
+        lvgl_descriptor_renderer_probe
+        compatibility_menu_binding
+        compatibility_ux_pack
+        uconsole_desktop_ux_pack
+        tiny_node_status_ux_pack
+        simulator_full_ux_pack
+        ux_pack_registry)
+        add_executable(trailmate_ui_lvgl_ux_packs_${ux_pack_test}_smoke
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/tests/test_${ux_pack_test}.cpp")
+        target_link_libraries(trailmate_ui_lvgl_ux_packs_${ux_pack_test}_smoke
+            PRIVATE trailmate_ui_lvgl_ux_packs)
+        add_test(NAME trailmate_ui_lvgl_ux_packs_${ux_pack_test}_smoke
+                 COMMAND trailmate_ui_lvgl_ux_packs_${ux_pack_test}_smoke)
+    endforeach()
+endif()
diff --git a/apps/linux_sim_shell/README.md b/apps/linux_sim_shell/README.md
new file mode 100644
index 00000000..1f6ff002
--- /dev/null
+++ b/apps/linux_sim_shell/README.md
@@ -0,0 +1,58 @@
+# `apps/linux_sim_shell`
+
+Role = product app shell / target app shell.
+
+`apps/linux_sim_shell` is the Linux simulator app shell baseline.
+
+It is not a CMake build entrypoint directory. Phase 8 Correction adds a minimal
+CMake target and smoke test so the app shell is executable without pulling in
+the transitional simulator implementation root.
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+## Build Entrypoint
+
+Build entrypoint = `builds/linux_cmake`
+
+Historical source identity = `removed root linux_sim`
+
+## Future Responsibilities
+
+May:
+
+- select Linux simulator target profile
+- select simulator device profile
+- select simulator UX profile
+- invoke product composition
+- hand off to runtime facade
+
+Must not:
+
+- own build host files
+- own CMake project mechanics
+- define board facts
+- implement HAL details
+- implement screen internals
+- assemble Chat/Map/GPS runtime directly in build wrapper
+
+## Thin App Shell Entrypoint
+
+Current source:
+
+- `src/linux_sim_app_shell.h`
+- `src/linux_sim_app_shell.cpp`
+- `tests/linux_sim_app_shell_smoke.cpp`
+
+```text
+target_id = linux_sim
+ux_pack_id = simulator_full
+historical_source = removed root linux_sim
+```
+
+No simulator runtime behavior changes in Phase 8 Correction.
diff --git a/apps/linux_sim_shell/src/linux_sim_app_shell.cpp b/apps/linux_sim_shell/src/linux_sim_app_shell.cpp
new file mode 100644
index 00000000..e54a5878
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_app_shell.cpp
@@ -0,0 +1,59 @@
+#include "linux_sim_app_shell.h"
+
+#include "product_composition/target_ux_binding.h"
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+
+#include <cstring>
+
+namespace trailmate
+{
+namespace apps
+{
+namespace linux_sim_shell
+{
+
+LinuxSimAppShell::LinuxSimAppShell(LinuxSimAppShellConfig config)
+    : config_(config)
+{
+}
+
+const LinuxSimAppShellConfig& LinuxSimAppShell::config() const
+{
+    return config_;
+}
+
+const char* LinuxSimAppShell::targetId() const
+{
+    return config_.product_target_id;
+}
+
+const product_composition::TargetProfile* LinuxSimAppShell::targetProfile() const
+{
+    return product_composition::findTargetProfile(targetId());
+}
+
+const char* LinuxSimAppShell::activeUxPackId() const
+{
+    const auto* binding = product_composition::findTargetUxBinding(targetId());
+    return binding != nullptr ? binding->active_ux_pack_id : nullptr;
+}
+
+bool LinuxSimAppShell::validate() const
+{
+    const auto& historical_source = linuxSimHistoricalSourceDescriptor();
+    return config_.target_id != nullptr &&
+           config_.product_target_id != nullptr &&
+           targetProfile() != nullptr &&
+           product_composition::findTargetUxBinding(targetId()) != nullptr &&
+           config_.ux_pack_id != nullptr &&
+           std::strcmp(config_.ux_pack_id, activeUxPackId()) == 0 &&
+           ui_lvgl_ux::findUxPackById(activeUxPackId()) != nullptr &&
+           config_.historical_source != nullptr &&
+           historical_source.historical_root_name != nullptr &&
+           historical_source.historical_role != nullptr &&
+           historical_source.replacement_owner != nullptr;
+}
+
+} // namespace linux_sim_shell
+} // namespace apps
+} // namespace trailmate
diff --git a/apps/linux_sim_shell/src/linux_sim_app_shell.h b/apps/linux_sim_shell/src/linux_sim_app_shell.h
new file mode 100644
index 00000000..2fabc9f8
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_app_shell.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "linux_sim_historical_source_descriptor.h"
+
+#include "product_composition/target_profile.h"
+
+namespace trailmate
+{
+namespace apps
+{
+namespace linux_sim_shell
+{
+
+struct LinuxSimAppShellConfig
+{
+    const char* target_id = "linux_sim";
+    const char* product_target_id = "cardputerzero";
+    const char* ux_pack_id = "simulator_full";
+    const char* historical_source =
+        linuxSimHistoricalSourceDescriptor().historical_root_name;
+};
+
+class LinuxSimAppShell
+{
+  public:
+    LinuxSimAppShell() = default;
+    explicit LinuxSimAppShell(LinuxSimAppShellConfig config);
+
+    const LinuxSimAppShellConfig& config() const;
+    const char* targetId() const;
+    const product_composition::TargetProfile* targetProfile() const;
+    const char* activeUxPackId() const;
+    bool validate() const;
+
+  private:
+    LinuxSimAppShellConfig config_{};
+};
+
+} // namespace linux_sim_shell
+} // namespace apps
+} // namespace trailmate
diff --git a/apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.cpp b/apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.cpp
new file mode 100644
index 00000000..50762d91
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.cpp
@@ -0,0 +1,12 @@
+#include "linux_sim_historical_source_descriptor.h"
+
+namespace trailmate::apps::linux_sim_shell
+{
+
+const LinuxSimHistoricalSourceDescriptor& linuxSimHistoricalSourceDescriptor()
+{
+    static const LinuxSimHistoricalSourceDescriptor descriptor{};
+    return descriptor;
+}
+
+} // namespace trailmate::apps::linux_sim_shell
diff --git a/apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h b/apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h
new file mode 100644
index 00000000..b6505550
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace trailmate::apps::linux_sim_shell
+{
+
+struct LinuxSimHistoricalSourceDescriptor
+{
+    const char* historical_root_name = "removed root linux_sim";
+    const char* historical_role = "pre-refactor Linux simulator implementation root";
+    const char* replacement_owner = "apps/linux_sim_shell + modules/ui_ascii_runtime";
+};
+
+const LinuxSimHistoricalSourceDescriptor& linuxSimHistoricalSourceDescriptor();
+
+} // namespace trailmate::apps::linux_sim_shell
diff --git a/apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp b/apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp
new file mode 100644
index 00000000..659afd37
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp
@@ -0,0 +1,65 @@
+#include "linux_sim_runtime_entry.h"
+
+namespace trailmate::apps::linux_sim_shell
+{
+
+bool LinuxSimRuntimeEntry::start(const LinuxSimAppShell& shell)
+{
+    ready_ = adoption_probe_.load(shell);
+    if (ready_)
+    {
+        runtime_source_ = LinuxSimRuntimeSource::ScreenGraphAdoption;
+        fallback_ = false;
+        return true;
+    }
+
+    runtime_source_ = LinuxSimRuntimeSource::HardcodedFallback;
+    fallback_ = true;
+    return startFallback(shell);
+}
+
+bool LinuxSimRuntimeEntry::startFallback(const LinuxSimAppShell&)
+{
+    // Phase 10 fallback containment: old simulator routing remains available
+    // until the renderer fully consumes AsciiRuntimeEntryAdoption descriptors.
+    return false;
+}
+
+bool LinuxSimRuntimeEntry::ready() const
+{
+    return ready_;
+}
+
+bool LinuxSimRuntimeEntry::usingPrimaryScreenGraph() const noexcept
+{
+    return runtime_source_ == LinuxSimRuntimeSource::ScreenGraphAdoption &&
+           ready_ && !fallback_;
+}
+
+bool LinuxSimRuntimeEntry::fallbackUsed() const
+{
+    return fallback_;
+}
+
+LinuxSimRuntimeSource LinuxSimRuntimeEntry::runtimeSource() const noexcept
+{
+    return runtime_source_;
+}
+
+std::size_t LinuxSimRuntimeEntry::menuCount() const
+{
+    return ready_ ? adoption_probe_.menuCount() : 0;
+}
+
+std::size_t LinuxSimRuntimeEntry::screenCount() const
+{
+    return ready_ ? adoption_probe_.screenCount() : 0;
+}
+
+const trailmate::linux_sim::AsciiRuntimeEntryAdoption&
+LinuxSimRuntimeEntry::adoption() const
+{
+    return adoption_probe_.adoption();
+}
+
+} // namespace trailmate::apps::linux_sim_shell
diff --git a/apps/linux_sim_shell/src/linux_sim_runtime_entry.h b/apps/linux_sim_shell/src/linux_sim_runtime_entry.h
new file mode 100644
index 00000000..437e041f
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_runtime_entry.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "linux_sim_app_shell.h"
+#include "linux_sim_runtime_entry_adoption_probe.h"
+#include "ui_ascii_runtime/ascii_runtime_entry_adoption.h"
+
+#include <cstddef>
+
+namespace trailmate::apps::linux_sim_shell
+{
+
+enum class LinuxSimRuntimeSource
+{
+    ScreenGraphAdoption,
+    HardcodedFallback,
+};
+
+class LinuxSimRuntimeEntry
+{
+  public:
+    bool start(const LinuxSimAppShell& shell);
+
+    bool ready() const;
+    bool usingPrimaryScreenGraph() const noexcept;
+    bool fallbackUsed() const;
+    LinuxSimRuntimeSource runtimeSource() const noexcept;
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const trailmate::linux_sim::AsciiRuntimeEntryAdoption& adoption() const;
+
+  private:
+    bool startFallback(const LinuxSimAppShell& shell);
+
+  private:
+    LinuxSimRuntimeEntryAdoptionProbe adoption_probe_{};
+    LinuxSimRuntimeSource runtime_source_ =
+        LinuxSimRuntimeSource::HardcodedFallback;
+    bool ready_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace trailmate::apps::linux_sim_shell
diff --git a/apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp b/apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp
new file mode 100644
index 00000000..fe18dcd1
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp
@@ -0,0 +1,59 @@
+#include "linux_sim_runtime_entry_adoption_probe.h"
+
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+namespace trailmate::apps::linux_sim_shell
+{
+
+bool LinuxSimRuntimeEntryAdoptionProbe::load(const LinuxSimAppShell& shell)
+{
+    ready_ = false;
+    fallback_ = true;
+    menu_.clear();
+    screen_bindings_.clear();
+    presentation_ = {};
+
+    if (!shell.validate() ||
+        !ui_lvgl_ux::buildMenuForUxPack(shell.activeUxPackId(), menu_))
+    {
+        return false;
+    }
+
+    ui_lvgl_ux::CompatibilityScreenFactory screen_factory;
+    screen_factory.buildBindingsForMenu(menu_, screen_bindings_);
+    presentation_.ux_menu = &menu_;
+    presentation_.screen_bindings = &screen_bindings_;
+
+    ready_ = adoption_.load(presentation_);
+    fallback_ = !ready_;
+    return ready_;
+}
+
+bool LinuxSimRuntimeEntryAdoptionProbe::ready() const
+{
+    return ready_;
+}
+
+bool LinuxSimRuntimeEntryAdoptionProbe::fallbackUsed() const
+{
+    return fallback_;
+}
+
+std::size_t LinuxSimRuntimeEntryAdoptionProbe::menuCount() const
+{
+    return ready_ ? adoption_.menuCount() : 0;
+}
+
+std::size_t LinuxSimRuntimeEntryAdoptionProbe::screenCount() const
+{
+    return ready_ ? adoption_.screenCount() : 0;
+}
+
+const trailmate::linux_sim::AsciiRuntimeEntryAdoption&
+LinuxSimRuntimeEntryAdoptionProbe::adoption() const
+{
+    return adoption_;
+}
+
+} // namespace trailmate::apps::linux_sim_shell
diff --git a/apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h b/apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h
new file mode 100644
index 00000000..1ce62a54
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "linux_sim_app_shell.h"
+#include "product_composition/presentation_bundle.h"
+#include "ui_ascii_runtime/ascii_runtime_entry_adoption.h"
+#include "ui_presentation/menu/menu_model.h"
+#include "ui_presentation/screen/screen_binding_registry.h"
+
+#include <cstddef>
+
+namespace trailmate::apps::linux_sim_shell
+{
+
+class LinuxSimRuntimeEntryAdoptionProbe
+{
+  public:
+    bool load(const LinuxSimAppShell& shell);
+
+    bool ready() const;
+    bool fallbackUsed() const;
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const trailmate::linux_sim::AsciiRuntimeEntryAdoption& adoption() const;
+
+  private:
+    ui::menu::MenuModel menu_{};
+    ui::screen::ScreenBindingRegistry screen_bindings_{};
+    product_composition::PresentationBundle presentation_{};
+    trailmate::linux_sim::AsciiRuntimeEntryAdoption adoption_{};
+    bool ready_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace trailmate::apps::linux_sim_shell
diff --git a/apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp b/apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp
new file mode 100644
index 00000000..474c3336
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp
@@ -0,0 +1,79 @@
+#include "linux_sim_runtime_renderer.h"
+
+namespace trailmate::apps::linux_sim_shell
+{
+
+bool LinuxSimRuntimeRenderer::render(const LinuxSimRuntimeEntry& entry)
+{
+    ready_ = false;
+    primary_ = false;
+    fallback_ = true;
+
+    if (entry.usingPrimaryScreenGraph())
+    {
+        ready_ = descriptor_renderer_.render(entry.adoption());
+        primary_ = ready_;
+        fallback_ = !ready_;
+        return ready_;
+    }
+
+    if (entry.fallbackUsed())
+    {
+        return renderFallback(entry);
+    }
+
+    return false;
+}
+
+bool LinuxSimRuntimeRenderer::renderFallback(const LinuxSimRuntimeEntry&)
+{
+    // Phase 11 fallback: old hardcoded ASCII rendering remains available only
+    // when the runtime entry did not provide primary descriptors.
+    ready_ = false;
+    primary_ = false;
+    fallback_ = true;
+    return false;
+}
+
+bool LinuxSimRuntimeRenderer::ready() const noexcept
+{
+    return ready_;
+}
+
+bool LinuxSimRuntimeRenderer::usingPrimaryScreenGraph() const noexcept
+{
+    return primary_;
+}
+
+bool LinuxSimRuntimeRenderer::usedPrimaryScreenGraph() const noexcept
+{
+    return primary_;
+}
+
+bool LinuxSimRuntimeRenderer::fallbackUsed() const noexcept
+{
+    return fallback_;
+}
+
+bool LinuxSimRuntimeRenderer::usedFallback() const noexcept
+{
+    return fallback_;
+}
+
+std::size_t LinuxSimRuntimeRenderer::lineCount() const noexcept
+{
+    return ready_ ? descriptor_renderer_.lineCount() : 0;
+}
+
+const trailmate::linux_sim::AsciiRenderLine*
+LinuxSimRuntimeRenderer::lines() const noexcept
+{
+    return ready_ ? descriptor_renderer_.lines() : nullptr;
+}
+
+const char* LinuxSimRuntimeRenderer::line(std::size_t index) const noexcept
+{
+    return ready_ ? descriptor_renderer_.line(index) : nullptr;
+}
+
+} // namespace trailmate::apps::linux_sim_shell
diff --git a/apps/linux_sim_shell/src/linux_sim_runtime_renderer.h b/apps/linux_sim_shell/src/linux_sim_runtime_renderer.h
new file mode 100644
index 00000000..ed87168f
--- /dev/null
+++ b/apps/linux_sim_shell/src/linux_sim_runtime_renderer.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "linux_sim_runtime_entry.h"
+#include "ui_ascii_runtime/ascii_descriptor_renderer.h"
+
+#include <cstddef>
+
+namespace trailmate::apps::linux_sim_shell
+{
+
+class LinuxSimRuntimeRenderer
+{
+  public:
+    bool render(const LinuxSimRuntimeEntry& entry);
+
+    bool ready() const noexcept;
+    bool usingPrimaryScreenGraph() const noexcept;
+    bool usedPrimaryScreenGraph() const noexcept;
+    bool fallbackUsed() const noexcept;
+    bool usedFallback() const noexcept;
+    std::size_t lineCount() const noexcept;
+    const trailmate::linux_sim::AsciiRenderLine* lines() const noexcept;
+    const char* line(std::size_t index) const noexcept;
+
+  private:
+    bool renderFallback(const LinuxSimRuntimeEntry& entry);
+
+  private:
+    trailmate::linux_sim::AsciiDescriptorRenderer descriptor_renderer_{};
+    bool ready_ = false;
+    bool primary_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace trailmate::apps::linux_sim_shell
diff --git a/apps/linux_sim_shell/tests/linux_sim_app_shell_smoke.cpp b/apps/linux_sim_shell/tests/linux_sim_app_shell_smoke.cpp
new file mode 100644
index 00000000..48c6e09f
--- /dev/null
+++ b/apps/linux_sim_shell/tests/linux_sim_app_shell_smoke.cpp
@@ -0,0 +1,38 @@
+#include "linux_sim_app_shell.h"
+#include "linux_sim_historical_source_descriptor.h"
+
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    trailmate::apps::linux_sim_shell::LinuxSimAppShell shell;
+    assert(shell.validate());
+
+    const auto& config = shell.config();
+    assert(std::strcmp(config.target_id, "linux_sim") == 0);
+    assert(std::strcmp(config.product_target_id, "cardputerzero") == 0);
+    assert(std::strcmp(shell.targetId(), "cardputerzero") == 0);
+    assert(std::strcmp(config.ux_pack_id, "simulator_full") == 0);
+    assert(std::strcmp(shell.activeUxPackId(), "simulator_full") == 0);
+    assert(shell.targetProfile() != nullptr);
+    assert(std::strcmp(shell.targetProfile()->app_shell, "apps/linux_sim_shell") == 0);
+    const auto& descriptor =
+        trailmate::apps::linux_sim_shell::linuxSimHistoricalSourceDescriptor();
+    assert(std::strcmp(config.historical_source,
+                       descriptor.historical_root_name) == 0);
+    assert(std::strcmp(descriptor.historical_role,
+                       "pre-refactor Linux simulator implementation root") == 0);
+    assert(std::strcmp(descriptor.replacement_owner,
+                       "apps/linux_sim_shell + modules/ui_ascii_runtime") == 0);
+    assert(ui_lvgl_ux::findUxPackById(shell.activeUxPackId()) != nullptr);
+
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack(shell.activeUxPackId(), menu));
+    assert(menu.size() > 0);
+    return 0;
+}
diff --git a/apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp b/apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp
new file mode 100644
index 00000000..8aafe025
--- /dev/null
+++ b/apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp
@@ -0,0 +1,18 @@
+#include "linux_sim_historical_source_descriptor.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    const auto& descriptor =
+        trailmate::apps::linux_sim_shell::linuxSimHistoricalSourceDescriptor();
+
+    assert(std::strcmp(descriptor.historical_root_name,
+                       "removed root linux_sim") == 0);
+    assert(std::strcmp(descriptor.historical_role,
+                       "pre-refactor Linux simulator implementation root") == 0);
+    assert(std::strcmp(descriptor.replacement_owner,
+                       "apps/linux_sim_shell + modules/ui_ascii_runtime") == 0);
+    return 0;
+}
diff --git a/apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp b/apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp
new file mode 100644
index 00000000..cb11b7df
--- /dev/null
+++ b/apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp
@@ -0,0 +1,18 @@
+#include "linux_sim_app_shell.h"
+#include "linux_sim_runtime_entry_adoption_probe.h"
+
+#include <cassert>
+
+int main()
+{
+    trailmate::apps::linux_sim_shell::LinuxSimAppShell shell;
+    trailmate::apps::linux_sim_shell::LinuxSimRuntimeEntryAdoptionProbe probe;
+
+    assert(probe.load(shell));
+    assert(probe.ready());
+    assert(!probe.fallbackUsed());
+    assert(probe.menuCount() > 0);
+    assert(probe.screenCount() > 0);
+    assert(probe.adoption().presenter().menuLines()[0].route.valid);
+    return 0;
+}
diff --git a/apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp b/apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp
new file mode 100644
index 00000000..688c1e7f
--- /dev/null
+++ b/apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp
@@ -0,0 +1,23 @@
+#include "linux_sim_app_shell.h"
+#include "linux_sim_runtime_entry.h"
+
+#include <cassert>
+
+int main()
+{
+    trailmate::apps::linux_sim_shell::LinuxSimAppShellConfig invalid_config;
+    invalid_config.ux_pack_id = "missing_phase10_pack";
+    trailmate::apps::linux_sim_shell::LinuxSimAppShell shell(invalid_config);
+    trailmate::apps::linux_sim_shell::LinuxSimRuntimeEntry runtime_entry;
+
+    assert(!runtime_entry.start(shell));
+    assert(!runtime_entry.ready());
+    assert(!runtime_entry.usingPrimaryScreenGraph());
+    assert(runtime_entry.runtimeSource() ==
+           trailmate::apps::linux_sim_shell::LinuxSimRuntimeSource::
+               HardcodedFallback);
+    assert(runtime_entry.fallbackUsed());
+    assert(runtime_entry.menuCount() == 0);
+    assert(runtime_entry.screenCount() == 0);
+    return 0;
+}
diff --git a/apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp b/apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp
new file mode 100644
index 00000000..1af42a1f
--- /dev/null
+++ b/apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp
@@ -0,0 +1,22 @@
+#include "linux_sim_app_shell.h"
+#include "linux_sim_runtime_entry.h"
+
+#include <cassert>
+
+int main()
+{
+    trailmate::apps::linux_sim_shell::LinuxSimAppShell shell;
+    trailmate::apps::linux_sim_shell::LinuxSimRuntimeEntry runtime_entry;
+
+    assert(runtime_entry.start(shell));
+    assert(runtime_entry.ready());
+    assert(runtime_entry.usingPrimaryScreenGraph());
+    assert(runtime_entry.runtimeSource() ==
+           trailmate::apps::linux_sim_shell::LinuxSimRuntimeSource::
+               ScreenGraphAdoption);
+    assert(!runtime_entry.fallbackUsed());
+    assert(runtime_entry.menuCount() > 0);
+    assert(runtime_entry.screenCount() > 0);
+    assert(runtime_entry.adoption().presenter().menuLines()[0].route.valid);
+    return 0;
+}
diff --git a/apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp b/apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp
new file mode 100644
index 00000000..8cadb0c6
--- /dev/null
+++ b/apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp
@@ -0,0 +1,36 @@
+#include "linux_sim_app_shell.h"
+#include "linux_sim_runtime_entry.h"
+#include "linux_sim_runtime_renderer.h"
+
+#include <cassert>
+
+int main()
+{
+    trailmate::apps::linux_sim_shell::LinuxSimAppShell shell;
+    trailmate::apps::linux_sim_shell::LinuxSimRuntimeEntry entry;
+    assert(entry.start(shell));
+    assert(entry.usingPrimaryScreenGraph());
+
+    trailmate::apps::linux_sim_shell::LinuxSimRuntimeRenderer renderer;
+    assert(renderer.render(entry));
+    assert(renderer.ready());
+    assert(renderer.usingPrimaryScreenGraph());
+    assert(renderer.usedPrimaryScreenGraph());
+    assert(!renderer.fallbackUsed());
+    assert(!renderer.usedFallback());
+    assert(renderer.lineCount() > 0);
+    assert(renderer.lines() != nullptr);
+    assert(renderer.line(0) != nullptr);
+
+    trailmate::apps::linux_sim_shell::LinuxSimAppShellConfig invalid_config;
+    invalid_config.ux_pack_id = "missing_phase11_pack";
+    trailmate::apps::linux_sim_shell::LinuxSimAppShell invalid_shell(
+        invalid_config);
+    trailmate::apps::linux_sim_shell::LinuxSimRuntimeEntry fallback_entry;
+    assert(!fallback_entry.start(invalid_shell));
+    assert(fallback_entry.fallbackUsed());
+    assert(!renderer.render(fallback_entry));
+    assert(renderer.fallbackUsed());
+    assert(renderer.usedFallback());
+    return 0;
+}
diff --git a/apps/linux_uconsole/CMakeLists.txt b/apps/linux_uconsole/CMakeLists.txt
deleted file mode 100644
index 6fa39e1e..00000000
--- a/apps/linux_uconsole/CMakeLists.txt
+++ /dev/null
@@ -1,307 +0,0 @@
-cmake_minimum_required(VERSION 3.24)
-
-project(TrailMateUConsoleLinux VERSION 0.1.0 LANGUAGES C CXX)
-
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    message(FATAL_ERROR
-        "The uConsole Linux shell must be configured on Linux.")
-endif()
-
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-include(CTest)
-set(TRAIL_MATE_UCONSOLE_PACKAGE_VERSION "${PROJECT_VERSION}"
-    CACHE STRING "Debian package version for trailmate-uconsole")
-find_package(Threads REQUIRED)
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK4 REQUIRED IMPORTED_TARGET gtk4)
-include(GNUInstallDirs)
-set(TRAIL_MATE_UCONSOLE_DOCDIR
-    "${CMAKE_INSTALL_DATAROOTDIR}/doc/trailmate-uconsole")
-set(CMAKE_INSTALL_DOCDIR "${TRAIL_MATE_UCONSOLE_DOCDIR}")
-set(CMAKE_INSTALL_DOCDIR "${TRAIL_MATE_UCONSOLE_DOCDIR}"
-    CACHE PATH "Documentation install directory" FORCE)
-option(TRAIL_MATE_UCONSOLE_ENABLE_LEGACY_SURFACE
-    "Build the LVGL framebuffer fallback backend." OFF)
-option(TRAIL_MATE_UCONSOLE_ENABLE_SDL
-    "Build the SDL desktop fallback backend." OFF)
-
-if(TRAIL_MATE_UCONSOLE_ENABLE_SDL)
-    set(TRAIL_MATE_UCONSOLE_ENABLE_LEGACY_SURFACE ON CACHE BOOL
-        "Build the LVGL framebuffer fallback backend." FORCE)
-endif()
-
-# ---------------------------------------------------------------------------
-# Shared Linux services and source roots
-# ---------------------------------------------------------------------------
-
-include("${PROJECT_SOURCE_DIR}/../../cmake/TrailMateLinuxSources.cmake")
-
-trailmate_add_linux_common(trailmate_uconsole_linux_common)
-
-if(TRAIL_MATE_UCONSOLE_ENABLE_LEGACY_SURFACE)
-    include(FetchContent)
-
-    # -----------------------------------------------------------------------
-    # LVGL - only needed for the legacy framebuffer shell.
-    # -----------------------------------------------------------------------
-
-    set(LV_BUILD_CONF_PATH
-        "${PROJECT_SOURCE_DIR}/../../platform/linux/common/include/lv_conf.h"
-        CACHE PATH "" FORCE)
-    set(CONFIG_LV_BUILD_DEMOS OFF CACHE BOOL "" FORCE)
-    set(CONFIG_LV_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-
-    FetchContent_Declare(
-        lvgl
-        GIT_REPOSITORY https://github.com/lvgl/lvgl.git
-        GIT_TAG v9.4.0
-        GIT_SHALLOW TRUE
-    )
-
-    FetchContent_GetProperties(lvgl)
-    if(NOT lvgl_POPULATED)
-        if(POLICY CMP0169)
-            cmake_policy(SET CMP0169 OLD)
-        endif()
-        FetchContent_Populate(lvgl)
-        add_subdirectory("${lvgl_SOURCE_DIR}" "${lvgl_BINARY_DIR}" EXCLUDE_FROM_ALL)
-    endif()
-
-    if(TRAIL_MATE_UCONSOLE_ENABLE_SDL)
-        # -------------------------------------------------------------------
-        # SDL3 - optional LVGL desktop fallback window.
-        # -------------------------------------------------------------------
-
-        set(SDL_SHARED OFF CACHE BOOL "" FORCE)
-        set(SDL_STATIC ON CACHE BOOL "" FORCE)
-        set(SDL_TESTS OFF CACHE BOOL "" FORCE)
-        set(SDL_TEST_LIBRARY OFF CACHE BOOL "" FORCE)
-        set(SDL_DISABLE_INSTALL ON CACHE BOOL "" FORCE)
-
-        FetchContent_Declare(
-            sdl3
-            GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
-            GIT_TAG release-3.4.4
-            GIT_SHALLOW TRUE
-        )
-
-        FetchContent_GetProperties(sdl3)
-        if(NOT sdl3_POPULATED)
-            if(POLICY CMP0169)
-                cmake_policy(SET CMP0169 OLD)
-            endif()
-            FetchContent_Populate(sdl3)
-            add_subdirectory("${sdl3_SOURCE_DIR}" "${sdl3_BINARY_DIR}" EXCLUDE_FROM_ALL)
-        endif()
-    endif()
-endif()
-
-# ---------------------------------------------------------------------------
-# uConsole GTK app support models
-# ---------------------------------------------------------------------------
-
-add_library(trailmate_uconsole_shell
-    "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_chat_workspace_model.cpp"
-    "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_dashboard_model.cpp"
-    "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_hardware_probe.cpp"
-    "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_map_workspace_model.cpp"
-)
-if(TRAIL_MATE_UCONSOLE_ENABLE_LEGACY_SURFACE)
-    target_sources(trailmate_uconsole_shell
-        PRIVATE
-            "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_desktop_shell.cpp"
-    )
-endif()
-target_include_directories(trailmate_uconsole_shell
-    PUBLIC
-        "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/include"
-        "${TRAIL_MATE_LINUX_COMMON_INCLUDE_ROOT}"
-        "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}"
-)
-target_compile_features(trailmate_uconsole_shell PUBLIC cxx_std_20)
-target_compile_definitions(trailmate_uconsole_shell
-    PRIVATE
-        TRAIL_MATE_UCONSOLE_LINUX=1
-)
-target_link_libraries(trailmate_uconsole_shell
-    PUBLIC
-        trailmate_uconsole_linux_common
-)
-if(TRAIL_MATE_UCONSOLE_ENABLE_LEGACY_SURFACE)
-    target_link_libraries(trailmate_uconsole_shell PUBLIC lvgl)
-    target_compile_definitions(trailmate_uconsole_shell
-        PUBLIC TRAIL_MATE_UCONSOLE_HAS_LEGACY_SURFACE=1)
-endif()
-trailmate_apply_linux_common_warnings(trailmate_uconsole_shell)
-
-# ---------------------------------------------------------------------------
-# Smoke tests
-# ---------------------------------------------------------------------------
-
-if(BUILD_TESTING)
-    add_executable(trailmate_uconsole_map_workspace_smoke
-        tests/uconsole_map_workspace_smoke.cpp
-    )
-    target_link_libraries(trailmate_uconsole_map_workspace_smoke
-        PRIVATE trailmate_uconsole_shell
-    )
-    add_test(NAME trailmate_uconsole_map_workspace_smoke
-             COMMAND trailmate_uconsole_map_workspace_smoke)
-
-    add_executable(trailmate_uconsole_chat_dedup_smoke
-        tests/uconsole_chat_dedup_smoke.cpp
-    )
-    target_link_libraries(trailmate_uconsole_chat_dedup_smoke
-        PRIVATE trailmate_uconsole_linux_common
-    )
-    add_test(NAME trailmate_uconsole_chat_dedup_smoke
-             COMMAND trailmate_uconsole_chat_dedup_smoke)
-
-    add_executable(trailmate_uconsole_chat_workspace_smoke
-        tests/uconsole_chat_workspace_smoke.cpp
-    )
-    target_link_libraries(trailmate_uconsole_chat_workspace_smoke
-        PRIVATE trailmate_uconsole_shell
-    )
-    add_test(NAME trailmate_uconsole_chat_workspace_smoke
-             COMMAND trailmate_uconsole_chat_workspace_smoke)
-
-    add_executable(trailmate_uconsole_meshtastic_node_payload_smoke
-        tests/uconsole_meshtastic_node_payload_smoke.cpp
-    )
-    target_link_libraries(trailmate_uconsole_meshtastic_node_payload_smoke
-        PRIVATE trailmate_uconsole_linux_common
-    )
-    add_test(NAME trailmate_uconsole_meshtastic_node_payload_smoke
-             COMMAND trailmate_uconsole_meshtastic_node_payload_smoke)
-
-    add_executable(trailmate_uconsole_chat_sqlite_store_smoke
-        tests/uconsole_chat_sqlite_store_smoke.cpp
-    )
-    target_link_libraries(trailmate_uconsole_chat_sqlite_store_smoke
-        PRIVATE trailmate_uconsole_linux_common
-    )
-    add_test(NAME trailmate_uconsole_chat_sqlite_store_smoke
-             COMMAND trailmate_uconsole_chat_sqlite_store_smoke)
-endif()
-
-# ---------------------------------------------------------------------------
-# Device executable - uConsole desktop window with framebuffer fallback
-# ---------------------------------------------------------------------------
-
-set(TRAIL_MATE_UCONSOLE_APP_SOURCES
-    src/platform/gtk/gtk_uconsole_app.cpp
-    src/platform/gtk/gtk_uconsole_chat_layout.cpp
-    src/platform/gtk/gtk_uconsole_chat_logic.cpp
-    src/platform/gtk/gtk_uconsole_data_layout.cpp
-    src/platform/gtk/gtk_uconsole_data_logic.cpp
-    src/platform/gtk/gtk_uconsole_hardware_layout.cpp
-    src/platform/gtk/gtk_uconsole_hardware_logic.cpp
-    src/platform/gtk/gtk_uconsole_logs_layout.cpp
-    src/platform/gtk/gtk_uconsole_logs_logic.cpp
-    src/platform/gtk/gtk_uconsole_map_layout.cpp
-    src/platform/gtk/gtk_uconsole_map_logic.cpp
-    src/platform/gtk/gtk_uconsole_mqtt_settings.cpp
-    src/platform/gtk/gtk_uconsole_overview_layout.cpp
-    src/platform/gtk/gtk_uconsole_overview_logic.cpp
-    src/platform/gtk/gtk_uconsole_pages.cpp
-    src/platform/gtk/gtk_uconsole_settings_layout.cpp
-    src/platform/gtk/gtk_uconsole_settings_logic.cpp
-    src/platform/gtk/gtk_uconsole_shell.cpp
-    src/platform/gtk/gtk_uconsole_style.cpp
-    src/platform/gtk/gtk_uconsole_widgets.cpp
-    "${TRAIL_MATE_LINUX_RPI_SRC_ROOT}/platform/device/evdev_input.cpp"
-    src/targets/uconsole_main.cpp
-)
-if(TRAIL_MATE_UCONSOLE_ENABLE_LEGACY_SURFACE)
-    list(APPEND TRAIL_MATE_UCONSOLE_APP_SOURCES
-        "${TRAIL_MATE_LINUX_RPI_SRC_ROOT}/platform/device/linux_framebuffer_platform.cpp"
-    )
-endif()
-if(TRAIL_MATE_UCONSOLE_ENABLE_SDL)
-    list(APPEND TRAIL_MATE_UCONSOLE_APP_SOURCES
-        src/platform/desktop/sdl_window_presenter.cpp
-    )
-endif()
-
-add_executable(trailmate_uconsole ${TRAIL_MATE_UCONSOLE_APP_SOURCES})
-target_include_directories(trailmate_uconsole
-    PRIVATE
-        "${PROJECT_SOURCE_DIR}/src"
-        "${TRAIL_MATE_LINUX_RPI_SRC_ROOT}"
-)
-target_link_libraries(trailmate_uconsole
-    PRIVATE
-        PkgConfig::GTK4
-        trailmate_uconsole_shell
-)
-if(TRAIL_MATE_UCONSOLE_ENABLE_LEGACY_SURFACE)
-    target_compile_definitions(trailmate_uconsole
-        PRIVATE TRAIL_MATE_UCONSOLE_HAS_LEGACY_SURFACE=1)
-endif()
-if(TRAIL_MATE_UCONSOLE_ENABLE_SDL)
-    target_compile_definitions(trailmate_uconsole
-        PRIVATE TRAIL_MATE_UCONSOLE_HAS_SDL=1)
-    target_link_libraries(trailmate_uconsole PRIVATE SDL3::SDL3)
-endif()
-set_target_properties(trailmate_uconsole
-    PROPERTIES
-        OUTPUT_NAME "trailmate-uconsole"
-)
-
-add_executable(trailmate_sx1262_probe
-    tools/sx1262_probe.cpp
-)
-target_link_libraries(trailmate_sx1262_probe
-    PRIVATE
-        trailmate_uconsole_linux_common
-)
-set_target_properties(trailmate_sx1262_probe
-    PROPERTIES
-        OUTPUT_NAME "trailmate-sx1262-probe"
-)
-
-# ---------------------------------------------------------------------------
-# Install and Debian package
-# ---------------------------------------------------------------------------
-
-install(TARGETS trailmate_uconsole
-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-)
-install(TARGETS trailmate_sx1262_probe
-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-)
-install(FILES README.md
-    DESTINATION "${CMAKE_INSTALL_DOCDIR}"
-)
-install(FILES packaging/trailmate-uconsole.desktop
-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
-)
-install(FILES packaging/trailmate-uconsole.png
-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps"
-)
-install(FILES packaging/trailmate-uconsole.png
-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps"
-)
-
-set(CPACK_GENERATOR "DEB")
-set(CPACK_PACKAGE_NAME "trailmate-uconsole")
-set(CPACK_PACKAGE_VENDOR "Trail Mate")
-set(CPACK_PACKAGE_CONTACT "Trail Mate Maintainers")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
-    "Trail Mate uConsole Linux desktop shell")
-set(CPACK_PACKAGE_VERSION "${TRAIL_MATE_UCONSOLE_PACKAGE_VERSION}")
-set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
-set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Trail Mate Maintainers")
-set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
-set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS
-    "libc6, libstdc++6, libgcc-s1, libssl3, gdal-bin, unzip, ca-certificates")
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
-    "Trail Mate uConsole GTK desktop shell with raw framebuffer fallback.")
-
-include(CPack)
diff --git a/apps/linux_uconsole/CMakePresets.json b/apps/linux_uconsole/CMakePresets.json
deleted file mode 100644
index 2c92b52b..00000000
--- a/apps/linux_uconsole/CMakePresets.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "version": 4,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 24,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "linux-uconsole-debug",
-      "displayName": "Linux Debug uConsole",
-      "description": "Configure the uConsole/AIO2 Linux desktop shell.",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/uconsole",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      }
-    },
-    {
-      "name": "linux-uconsole-release",
-      "displayName": "Linux Release uConsole",
-      "description": "Configure the uConsole/AIO2 Linux desktop shell for packaging.",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/uconsole-release",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "TRAIL_MATE_UCONSOLE_PACKAGE_VERSION": "0.1.25~alpha"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Linux"
-      }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "linux-uconsole-debug-build",
-      "displayName": "Build uConsole Linux Shell",
-      "configurePreset": "linux-uconsole-debug",
-      "targets": [
-        "trailmate_uconsole"
-      ]
-    },
-    {
-      "name": "linux-uconsole-release-build",
-      "displayName": "Build uConsole Linux Shell Release",
-      "configurePreset": "linux-uconsole-release",
-      "targets": [
-        "trailmate_uconsole"
-      ]
-    },
-    {
-      "name": "linux-uconsole-deb",
-      "displayName": "Build uConsole Debian Package",
-      "configurePreset": "linux-uconsole-release",
-      "targets": [
-        "package"
-      ]
-    }
-  ]
-}
diff --git a/apps/linux_uconsole/README.md b/apps/linux_uconsole/README.md
deleted file mode 100644
index 0ac5511d..00000000
--- a/apps/linux_uconsole/README.md
+++ /dev/null
@@ -1,168 +0,0 @@
-# Trail Mate uConsole Linux
-
-This app shell is the desktop-class Linux handheld target for ClockworkPi
-uConsole-style devices with an AIO2 capability module.
-
-It intentionally does not launch the compact Cardputer Zero app grid. The
-default shell is a GTK desktop window backed by Linux app services and
-UI-independent presentation models. The older LVGL path remains available
-through explicit SDL or raw Linux framebuffer fallbacks, but it is no longer the
-primary uConsole interface.
-
-- compact menu bar for primary workspaces
-- bottom status bar for AIO2/LoRa/GPS/storage state
-- central operational workspace
-- Overview workspace with location/map context, hardware state, message status,
-  team activity timeline, and runtime details
-- Hardware and Data workspaces are clickable runtime inspection surfaces;
-  Settings is a writable GTK control plane for identity, radio, GPS, map,
-  chat policy, network, and privacy configuration
-- SQLite-backed Linux local state
-- online XYZ map tile fetch with local file cache
-
-The uConsole UI consumes Linux app services through `LinuxAppServices` and
-UI-independent presentation models. GTK is the production Linux UI direction;
-LVGL is retained for bring-up/fallback. AIO2 support belongs below
-platform/runtime adapters and must be reported through honest capability state;
-it should not become a UI layout concept. Overview panels must show real stored
-or runtime state only; empty hardware, message, location, and team states should
-remain explicit instead of being filled with demo data. Linux does not expose
-BLE as a product capability.
-
-## Build
-
-Install Linux build dependencies first:
-
-```sh
-sudo apt-get install -y build-essential cmake ninja-build pkg-config \
-  libgtk-4-dev libsqlite3-dev libcurl4-openssl-dev gdal-bin unzip \
-  ca-certificates
-```
-
-```sh
-cmake --preset linux-uconsole-debug
-cmake --build --preset linux-uconsole-debug-build
-```
-
-## Package
-
-Build the standard Debian package with:
-
-```sh
-cmake --preset linux-uconsole-release
-cmake --build --preset linux-uconsole-deb
-```
-
-The release preset stamps the package as `0.1.25~alpha`. Override it for another
-release with:
-
-```sh
-cmake --preset linux-uconsole-release -DTRAIL_MATE_UCONSOLE_PACKAGE_VERSION=0.1.25~alpha
-```
-
-The package installs the app as:
-
-```text
-/usr/bin/trailmate-uconsole
-/usr/share/applications/trailmate-uconsole.desktop
-/usr/share/pixmaps/trailmate-uconsole.png
-/usr/share/icons/hicolor/256x256/apps/trailmate-uconsole.png
-```
-
-## Run
-
-```sh
-trailmate-uconsole
-```
-
-The default GTK desktop window is `1180x600`, leaving room for the window
-decorations and desktop panel on the uConsole `1280x720` landscape session.
-Override it with:
-
-```sh
-TRAIL_MATE_UCONSOLE_WIDTH=960 TRAIL_MATE_UCONSOLE_HEIGHT=540 trailmate-uconsole
-```
-
-Local state is stored in SQLite:
-
-```text
-$TRAIL_MATE_SETTINGS_ROOT/trailmate.sqlite3
-```
-
-If `TRAIL_MATE_SETTINGS_ROOT` is not set, the default root is
-`$HOME/.trailmate_cardputer_zero`.
-
-The GTK map page uses real GPS/NMEA input when available. Configure a serial GPS
-or an NMEA file with:
-
-```sh
-TRAIL_MATE_GPS_DEVICE=/dev/ttyUSB0 trailmate-uconsole
-TRAIL_MATE_GPS_NMEA_FILE=/path/to/feed.nmea trailmate-uconsole
-```
-
-On uConsole, the GTK shell also auto-detects the ClockworkPI uConsole CDC ACM
-serial endpoint under `/dev/serial/by-id/usb-ClockworkPI_uConsole_*` and treats
-it as the default GPS/NMEA candidate. If that endpoint exists but no valid NMEA
-fix has arrived yet, the UI reports the endpoint instead of claiming that GPS is
-missing.
-
-For bench testing without a GPS receiver, provide an explicit map center:
-
-```sh
-TRAIL_MATE_MAP_LAT=31.2304 TRAIL_MATE_MAP_LNG=121.4737 trailmate-uconsole
-```
-
-Downloaded base tiles are cached in the same XYZ layout used by the SD-card map
-runtime. The GTK map renders those tiles as one continuous landscape map surface;
-individual tile cache entries are not exposed as bordered UI cards:
-
-```text
-$TRAIL_MATE_SD_ROOT/maps/base/osm/{z}/{x}/{y}.png
-$TRAIL_MATE_SD_ROOT/maps/base/terrain/{z}/{x}/{y}.png
-$TRAIL_MATE_SD_ROOT/maps/base/satellite/{z}/{x}/{y}.jpg
-```
-
-If `TRAIL_MATE_SD_ROOT` is not set, it defaults to
-`$TRAIL_MATE_SETTINGS_ROOT/sdcard`.
-
-Contour overlays are transparent PNG tiles above the active base map. Enable
-or hide them from the map toolbar or Settings -> Map -> Contour overlay. The
-map toolbar also has **Fill visible**, which fills the current visible viewport
-by querying NASA CMR for `NASADEM_HGT`, downloading missing DEM archives with
-the stored Earthdata token, extracting HGT/TIF files, and generating contour PNG
-tiles through GDAL. Earthdata tokens are stored in the same SQLite settings
-database as Linux local state. Generated contour tiles are written to:
-
-```text
-$TRAIL_MATE_SD_ROOT/maps/contour/{major|minor}-{interval}/{z}/{x}/{y}.png
-```
-
-For compatibility with Trail Mate Center's working cache, the GTK map also
-checks:
-
-```text
-$TRAIL_MATE_SD_ROOT/contours/tiles/{major|minor}-{interval}/{z}/{x}/{y}.png
-```
-
-DEM source files and temporary contour work files are kept under:
-
-```text
-$TRAIL_MATE_SD_ROOT/maps/dem
-$TRAIL_MATE_CACHE_ROOT/contour-work
-```
-
-To run the LVGL/SDL fallback window explicitly:
-
-```sh
-trailmate-uconsole --sdl
-```
-
-For raw framebuffer bring-up without the desktop session:
-
-```sh
-sudo trailmate-uconsole --fbdev /dev/fb0
-```
-
-The raw framebuffer path defaults to the physical `/dev/fb0` geometry currently
-reported as `720x1280`; the desktop session rotates that panel into a `1280x720`
-workspace.
diff --git a/apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md b/apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md
new file mode 100644
index 00000000..b3f51f90
--- /dev/null
+++ b/apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md
@@ -0,0 +1,76 @@
+# App Shell Manifest: linux_uconsole_gtk
+
+## Role
+
+Product app shell / target app shell.
+
+## Target Family
+
+Linux uConsole / AIO2-class handheld.
+
+## Renderer Family
+
+GTK.
+
+## Build Entrypoint
+
+Future authoritative build entrypoint:
+
+- `builds/linux_cmake`
+
+Current transitional path:
+
+- `removed root linux_uconsole`
+
+## Future Responsibilities
+
+May:
+
+- select Linux uConsole target profile
+- select board/device package
+- select GTK or desktop UX profile
+- invoke product composition
+- hand off to runtime facade
+
+Must not:
+
+- own build host files
+- own CMake project mechanics
+- define board facts
+- implement HAL details
+- implement screen internals
+- assemble Chat/Map/GPS runtime directly in build wrapper
+
+## Thin App Shell Entrypoint Declaration
+
+Future declaration:
+
+```text
+trail_mate_linux_uconsole_gtk_start(target_profile)
+```
+
+## Current Status
+
+Executable app shell baseline.
+
+Phase 8 Correction adds:
+
+- `CMakeLists.txt`
+- `src/linux_uconsole_gtk_app_shell.h`
+- `src/linux_uconsole_gtk_app_shell.cpp`
+- `tests/linux_uconsole_gtk_app_shell_smoke.cpp`
+
+Selected UX Pack:
+
+- `uconsole_desktop`
+
+UX Pack Runtime Binding:
+
+- `LinuxUConsoleGtkAppShell::validate()` resolves `ux_pack_id` through
+  `findUxPackById`.
+
+Transitional implementation root:
+
+- `removed root linux_uconsole`
+
+No GTK runtime behavior change in Phase 8 Correction.
diff --git a/apps/linux_uconsole_gtk/CMakeLists.txt b/apps/linux_uconsole_gtk/CMakeLists.txt
new file mode 100644
index 00000000..cb624dfa
--- /dev/null
+++ b/apps/linux_uconsole_gtk/CMakeLists.txt
@@ -0,0 +1,256 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(TrailMateLinuxUConsoleGtkShell LANGUAGES C CXX)
+
+include(CTest)
+
+set(TRAIL_MATE_REPO_ROOT
+    "${CMAKE_CURRENT_LIST_DIR}/../.."
+    CACHE PATH "Trail Mate repository root")
+
+include("${TRAIL_MATE_REPO_ROOT}/cmake/TrailMateUxPacks.cmake")
+trailmate_add_ui_lvgl_ux_packs(trailmate_ui_lvgl_ux_packs)
+
+set(TRAIL_MATE_UCONSOLE_PACKAGE_VERSION "0.1.0"
+    CACHE STRING "Debian package version for trailmate-uconsole")
+option(TRAIL_MATE_UCONSOLE_BUILD_REAL_GTK_UI
+    "Build the restored uConsole GTK executable when Linux GTK4 is available."
+    ON)
+
+set(TRAIL_MATE_UCONSOLE_REAL_GTK_SOURCES
+    src/platform/gtk/gtk_uconsole_app.cpp
+    src/platform/gtk/gtk_uconsole_chat_layout.cpp
+    src/platform/gtk/gtk_uconsole_chat_logic.cpp
+    src/platform/gtk/gtk_uconsole_data_layout.cpp
+    src/platform/gtk/gtk_uconsole_data_logic.cpp
+    src/platform/gtk/gtk_uconsole_hardware_layout.cpp
+    src/platform/gtk/gtk_uconsole_hardware_logic.cpp
+    src/platform/gtk/gtk_uconsole_logs_layout.cpp
+    src/platform/gtk/gtk_uconsole_logs_logic.cpp
+    src/platform/gtk/gtk_uconsole_map_layout.cpp
+    src/platform/gtk/gtk_uconsole_map_logic.cpp
+    src/platform/gtk/gtk_uconsole_mqtt_settings.cpp
+    src/platform/gtk/gtk_uconsole_overview_layout.cpp
+    src/platform/gtk/gtk_uconsole_overview_logic.cpp
+    src/platform/gtk/gtk_uconsole_pages.cpp
+    src/platform/gtk/gtk_uconsole_settings_layout.cpp
+    src/platform/gtk/gtk_uconsole_settings_logic.cpp
+    src/platform/gtk/gtk_uconsole_shell.cpp
+    src/platform/gtk/gtk_uconsole_style.cpp
+    src/platform/gtk/gtk_uconsole_widgets.cpp)
+
+add_library(trailmate_linux_uconsole_gtk_shell
+    src/linux_uconsole_gtk_app_shell.cpp
+    src/linux_uconsole_gtk_historical_source_descriptor.cpp
+    src/linux_uconsole_gtk_page_registry_adoption.cpp
+    src/linux_uconsole_gtk_page_registry_renderer.cpp
+    src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/src/target_profile.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/src/target_ux_binding.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_presenter.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_descriptor_page_registry.cpp")
+
+target_include_directories(trailmate_linux_uconsole_gtk_shell
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}/src"
+        "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/include"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/include")
+
+target_link_libraries(trailmate_linux_uconsole_gtk_shell
+    PUBLIC
+        trailmate_ui_lvgl_ux_packs)
+
+target_compile_features(trailmate_linux_uconsole_gtk_shell PUBLIC cxx_std_17)
+
+if(TRAIL_MATE_UCONSOLE_BUILD_REAL_GTK_UI AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    find_package(PkgConfig QUIET)
+    if(PkgConfig_FOUND)
+        pkg_check_modules(GTK4 QUIET IMPORTED_TARGET gtk4)
+    endif()
+
+    if(GTK4_FOUND)
+        include(GNUInstallDirs)
+        include("${TRAIL_MATE_REPO_ROOT}/cmake/TrailMateLinuxSources.cmake")
+        find_package(Threads REQUIRED)
+
+        trailmate_add_linux_common(trailmate_uconsole_linux_common)
+
+        add_library(trailmate_uconsole_runtime_models
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_shared/src/ui/presentation_sources/legacy_gps_status_source.cpp"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp"
+            "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_chat_workspace_model.cpp"
+            "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_dashboard_model.cpp"
+            "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_hardware_probe.cpp"
+            "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/src/uconsole_map_workspace_model.cpp")
+        target_include_directories(trailmate_uconsole_runtime_models
+            PUBLIC
+                "${TRAIL_MATE_REPO_ROOT}/platform/linux/uconsole/include"
+                "${TRAIL_MATE_LINUX_COMMON_INCLUDE_ROOT}"
+                "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}")
+        target_compile_features(trailmate_uconsole_runtime_models PUBLIC cxx_std_20)
+        target_compile_definitions(trailmate_uconsole_runtime_models
+            PRIVATE TRAIL_MATE_UCONSOLE_LINUX=1)
+        target_link_libraries(trailmate_uconsole_runtime_models
+            PUBLIC trailmate_uconsole_linux_common)
+        trailmate_apply_linux_common_warnings(trailmate_uconsole_runtime_models)
+
+        add_executable(trailmate_uconsole
+            ${TRAIL_MATE_UCONSOLE_REAL_GTK_SOURCES}
+            src/targets/uconsole_main.cpp)
+        target_include_directories(trailmate_uconsole
+            PRIVATE
+                "${CMAKE_CURRENT_LIST_DIR}/src"
+                "${TRAIL_MATE_REPO_ROOT}/platform/linux/rpi/src")
+        target_link_libraries(trailmate_uconsole
+            PRIVATE
+                PkgConfig::GTK4
+                trailmate_uconsole_runtime_models
+                trailmate_linux_uconsole_gtk_shell)
+        target_compile_features(trailmate_uconsole PRIVATE cxx_std_20)
+        set_target_properties(trailmate_uconsole
+            PROPERTIES OUTPUT_NAME "trailmate-uconsole")
+
+        add_executable(trailmate_sx1262_probe
+            tools/sx1262_probe.cpp)
+        target_link_libraries(trailmate_sx1262_probe
+            PRIVATE trailmate_uconsole_linux_common)
+        target_compile_features(trailmate_sx1262_probe PRIVATE cxx_std_20)
+        set_target_properties(trailmate_sx1262_probe
+            PROPERTIES OUTPUT_NAME "trailmate-sx1262-probe")
+
+        if(BUILD_TESTING)
+            add_executable(trailmate_uconsole_map_workspace_smoke
+                tests/uconsole_map_workspace_smoke.cpp)
+            target_link_libraries(trailmate_uconsole_map_workspace_smoke
+                PRIVATE trailmate_uconsole_runtime_models)
+            add_test(NAME trailmate_uconsole_map_workspace_smoke
+                     COMMAND trailmate_uconsole_map_workspace_smoke)
+
+            add_executable(trailmate_uconsole_chat_dedup_smoke
+                tests/uconsole_chat_dedup_smoke.cpp)
+            target_link_libraries(trailmate_uconsole_chat_dedup_smoke
+                PRIVATE trailmate_uconsole_linux_common)
+            add_test(NAME trailmate_uconsole_chat_dedup_smoke
+                     COMMAND trailmate_uconsole_chat_dedup_smoke)
+
+            add_executable(trailmate_uconsole_chat_workspace_smoke
+                tests/uconsole_chat_workspace_smoke.cpp)
+            target_link_libraries(trailmate_uconsole_chat_workspace_smoke
+                PRIVATE trailmate_uconsole_runtime_models)
+            add_test(NAME trailmate_uconsole_chat_workspace_smoke
+                     COMMAND trailmate_uconsole_chat_workspace_smoke)
+
+            add_executable(trailmate_uconsole_meshtastic_node_payload_smoke
+                tests/uconsole_meshtastic_node_payload_smoke.cpp)
+            target_link_libraries(trailmate_uconsole_meshtastic_node_payload_smoke
+                PRIVATE trailmate_uconsole_linux_common)
+            add_test(NAME trailmate_uconsole_meshtastic_node_payload_smoke
+                     COMMAND trailmate_uconsole_meshtastic_node_payload_smoke)
+
+            add_executable(trailmate_uconsole_chat_sqlite_store_smoke
+                tests/uconsole_chat_sqlite_store_smoke.cpp)
+            target_link_libraries(trailmate_uconsole_chat_sqlite_store_smoke
+                PRIVATE trailmate_uconsole_linux_common)
+            add_test(NAME trailmate_uconsole_chat_sqlite_store_smoke
+                     COMMAND trailmate_uconsole_chat_sqlite_store_smoke)
+        endif()
+
+        install(TARGETS trailmate_uconsole trailmate_sx1262_probe
+            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+        install(FILES README.md
+            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/doc/trailmate-uconsole")
+        install(FILES packaging/trailmate-uconsole.desktop
+            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+        install(FILES packaging/trailmate-uconsole.png
+            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps")
+        install(FILES packaging/trailmate-uconsole.png
+            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps")
+
+        set(CPACK_GENERATOR "DEB")
+        set(CPACK_PACKAGE_NAME "trailmate-uconsole")
+        set(CPACK_PACKAGE_VENDOR "Trail Mate")
+        set(CPACK_PACKAGE_CONTACT "Trail Mate Maintainers")
+        set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+            "Trail Mate uConsole Linux desktop shell")
+        set(CPACK_PACKAGE_VERSION "${TRAIL_MATE_UCONSOLE_PACKAGE_VERSION}")
+        set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+        set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+        set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Trail Mate Maintainers")
+        set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
+        set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS
+            "libc6, libstdc++6, libgcc-s1, libssl3, gdal-bin, unzip, ca-certificates")
+        set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+        set(CPACK_DEBIAN_PACKAGE_DESCRIPTION
+            "Trail Mate uConsole GTK desktop shell.")
+        include(CPack)
+    else()
+        message(STATUS "GTK4 was not found; restored uConsole GTK executable is not built on this host.")
+    endif()
+else()
+    message(STATUS "Restored uConsole GTK executable is enabled only on Linux GTK4 hosts.")
+endif()
+
+if(BUILD_TESTING)
+    add_executable(trailmate_linux_uconsole_gtk_app_shell_smoke
+        tests/linux_uconsole_gtk_app_shell_smoke.cpp)
+    target_link_libraries(trailmate_linux_uconsole_gtk_app_shell_smoke
+        PRIVATE trailmate_linux_uconsole_gtk_shell)
+    add_test(NAME trailmate_linux_uconsole_gtk_app_shell_smoke
+             COMMAND trailmate_linux_uconsole_gtk_app_shell_smoke)
+
+    add_executable(trailmate_linux_uconsole_gtk_historical_source_descriptor_smoke
+        tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp)
+    target_link_libraries(trailmate_linux_uconsole_gtk_historical_source_descriptor_smoke
+        PRIVATE trailmate_linux_uconsole_gtk_shell)
+    add_test(NAME trailmate_linux_uconsole_gtk_historical_source_descriptor_smoke
+             COMMAND trailmate_linux_uconsole_gtk_historical_source_descriptor_smoke)
+
+    add_executable(trailmate_linux_uconsole_gtk_runtime_entry_adoption_probe_smoke
+        tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp)
+    target_link_libraries(trailmate_linux_uconsole_gtk_runtime_entry_adoption_probe_smoke
+        PRIVATE trailmate_linux_uconsole_gtk_shell)
+    add_test(NAME trailmate_linux_uconsole_gtk_runtime_entry_adoption_probe_smoke
+             COMMAND trailmate_linux_uconsole_gtk_runtime_entry_adoption_probe_smoke)
+
+    add_executable(trailmate_linux_uconsole_gtk_page_registry_adoption_smoke
+        tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp)
+    target_link_libraries(trailmate_linux_uconsole_gtk_page_registry_adoption_smoke
+        PRIVATE trailmate_linux_uconsole_gtk_shell)
+    add_test(NAME trailmate_linux_uconsole_gtk_page_registry_adoption_smoke
+             COMMAND trailmate_linux_uconsole_gtk_page_registry_adoption_smoke)
+
+    add_executable(trailmate_linux_uconsole_gtk_page_registry_fallback_smoke
+        tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp)
+    target_link_libraries(trailmate_linux_uconsole_gtk_page_registry_fallback_smoke
+        PRIVATE trailmate_linux_uconsole_gtk_shell)
+    add_test(NAME trailmate_linux_uconsole_gtk_page_registry_fallback_smoke
+             COMMAND trailmate_linux_uconsole_gtk_page_registry_fallback_smoke)
+
+    add_executable(trailmate_linux_uconsole_gtk_page_registry_renderer_smoke
+        tests/linux_uconsole_gtk_page_registry_renderer_smoke.cpp)
+    target_link_libraries(trailmate_linux_uconsole_gtk_page_registry_renderer_smoke
+        PRIVATE trailmate_linux_uconsole_gtk_shell)
+    add_test(NAME trailmate_linux_uconsole_gtk_page_registry_renderer_smoke
+             COMMAND trailmate_linux_uconsole_gtk_page_registry_renderer_smoke)
+
+    add_executable(trailmate_gtk_runtime_entry_adoption_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/tests/gtk_runtime_entry_adoption_smoke.cpp")
+    target_link_libraries(trailmate_gtk_runtime_entry_adoption_smoke
+        PRIVATE trailmate_linux_uconsole_gtk_shell)
+    add_test(NAME trailmate_gtk_runtime_entry_adoption_smoke
+             COMMAND trailmate_gtk_runtime_entry_adoption_smoke)
+
+    add_executable(trailmate_gtk_descriptor_page_registry_smoke
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/tests/test_gtk_descriptor_page_registry.cpp")
+    target_link_libraries(trailmate_gtk_descriptor_page_registry_smoke
+        PRIVATE trailmate_linux_uconsole_gtk_shell)
+    add_test(NAME trailmate_gtk_descriptor_page_registry_smoke
+             COMMAND trailmate_gtk_descriptor_page_registry_smoke)
+
+endif()
diff --git a/apps/linux_uconsole_gtk/README.md b/apps/linux_uconsole_gtk/README.md
new file mode 100644
index 00000000..85f5009d
--- /dev/null
+++ b/apps/linux_uconsole_gtk/README.md
@@ -0,0 +1,59 @@
+# `apps/linux_uconsole_gtk`
+
+Role = product app shell / target app shell.
+
+`apps/linux_uconsole_gtk` is the future Linux uConsole/AIO2 GTK product app
+shell baseline.
+
+It is not a CMake build entrypoint directory. Phase 8 Correction adds a minimal
+CMake target and smoke test so the app shell is executable without pulling in
+the transitional GTK implementation root.
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+## Build Entrypoint
+
+Build entrypoint = `builds/linux_cmake`
+
+Historical source identity = `removed root linux_uconsole`
+
+## Future Responsibilities
+
+May:
+
+- select Linux uConsole target profile
+- select board/device package
+- select GTK or desktop UX profile
+- invoke product composition
+- hand off to runtime facade
+
+Must not:
+
+- own build host files
+- own CMake project mechanics
+- define board facts
+- implement HAL details
+- implement screen internals
+- assemble Chat/Map/GPS runtime directly in build wrapper
+
+## Thin App Shell Entrypoint
+
+Current source:
+
+- `src/linux_uconsole_gtk_app_shell.h`
+- `src/linux_uconsole_gtk_app_shell.cpp`
+- `tests/linux_uconsole_gtk_app_shell_smoke.cpp`
+
+```text
+target_id = uconsole
+ux_pack_id = uconsole_desktop
+historical_source = removed root linux_uconsole
+```
+
+No GTK runtime behavior changes in Phase 8 Correction.
diff --git a/apps/linux_uconsole/packaging/trailmate-uconsole.desktop b/apps/linux_uconsole_gtk/packaging/trailmate-uconsole.desktop
similarity index 100%
rename from apps/linux_uconsole/packaging/trailmate-uconsole.desktop
rename to apps/linux_uconsole_gtk/packaging/trailmate-uconsole.desktop
diff --git a/apps/linux_uconsole/packaging/trailmate-uconsole.png b/apps/linux_uconsole_gtk/packaging/trailmate-uconsole.png
similarity index 100%
rename from apps/linux_uconsole/packaging/trailmate-uconsole.png
rename to apps/linux_uconsole_gtk/packaging/trailmate-uconsole.png
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.cpp b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.cpp
new file mode 100644
index 00000000..90806301
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.cpp
@@ -0,0 +1,60 @@
+#include "linux_uconsole_gtk_app_shell.h"
+
+#include "product_composition/target_ux_binding.h"
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+
+#include <cstring>
+
+namespace trailmate
+{
+namespace apps
+{
+namespace linux_uconsole_gtk
+{
+
+LinuxUConsoleGtkAppShell::LinuxUConsoleGtkAppShell(
+    LinuxUConsoleGtkAppShellConfig config)
+    : config_(config)
+{
+}
+
+const LinuxUConsoleGtkAppShellConfig& LinuxUConsoleGtkAppShell::config() const
+{
+    return config_;
+}
+
+const char* LinuxUConsoleGtkAppShell::targetId() const
+{
+    return config_.target_id;
+}
+
+const product_composition::TargetProfile* LinuxUConsoleGtkAppShell::targetProfile() const
+{
+    return product_composition::findTargetProfile(targetId());
+}
+
+const char* LinuxUConsoleGtkAppShell::activeUxPackId() const
+{
+    const auto* binding = product_composition::findTargetUxBinding(targetId());
+    return binding != nullptr ? binding->active_ux_pack_id : nullptr;
+}
+
+bool LinuxUConsoleGtkAppShell::validate() const
+{
+    const auto& historical_source =
+        linuxUConsoleGtkHistoricalSourceDescriptor();
+    return config_.target_id != nullptr &&
+           targetProfile() != nullptr &&
+           product_composition::findTargetUxBinding(targetId()) != nullptr &&
+           config_.ux_pack_id != nullptr &&
+           std::strcmp(config_.ux_pack_id, activeUxPackId()) == 0 &&
+           ui_lvgl_ux::findUxPackById(activeUxPackId()) != nullptr &&
+           config_.historical_source != nullptr &&
+           historical_source.historical_root_name != nullptr &&
+           historical_source.historical_role != nullptr &&
+           historical_source.replacement_owner != nullptr;
+}
+
+} // namespace linux_uconsole_gtk
+} // namespace apps
+} // namespace trailmate
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.h b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.h
new file mode 100644
index 00000000..bfe2c837
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "linux_uconsole_gtk_historical_source_descriptor.h"
+
+#include "product_composition/target_profile.h"
+
+namespace trailmate
+{
+namespace apps
+{
+namespace linux_uconsole_gtk
+{
+
+struct LinuxUConsoleGtkAppShellConfig
+{
+    const char* target_id = "uconsole";
+    const char* ux_pack_id = "uconsole_desktop";
+    const char* historical_source =
+        linuxUConsoleGtkHistoricalSourceDescriptor().historical_root_name;
+};
+
+class LinuxUConsoleGtkAppShell
+{
+  public:
+    LinuxUConsoleGtkAppShell() = default;
+    explicit LinuxUConsoleGtkAppShell(LinuxUConsoleGtkAppShellConfig config);
+
+    const LinuxUConsoleGtkAppShellConfig& config() const;
+    const char* targetId() const;
+    const product_composition::TargetProfile* targetProfile() const;
+    const char* activeUxPackId() const;
+    bool validate() const;
+
+  private:
+    LinuxUConsoleGtkAppShellConfig config_{};
+};
+
+} // namespace linux_uconsole_gtk
+} // namespace apps
+} // namespace trailmate
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.cpp b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.cpp
new file mode 100644
index 00000000..8eeb9e83
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.cpp
@@ -0,0 +1,13 @@
+#include "linux_uconsole_gtk_historical_source_descriptor.h"
+
+namespace trailmate::apps::linux_uconsole_gtk
+{
+
+const LinuxUConsoleGtkHistoricalSourceDescriptor&
+linuxUConsoleGtkHistoricalSourceDescriptor()
+{
+    static const LinuxUConsoleGtkHistoricalSourceDescriptor descriptor{};
+    return descriptor;
+}
+
+} // namespace trailmate::apps::linux_uconsole_gtk
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h
new file mode 100644
index 00000000..b9fe96f3
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace trailmate::apps::linux_uconsole_gtk
+{
+
+struct LinuxUConsoleGtkHistoricalSourceDescriptor
+{
+    const char* historical_root_name = "removed root linux_uconsole";
+    const char* historical_role = "pre-refactor uConsole GTK implementation root";
+    const char* replacement_owner = "apps/linux_uconsole_gtk + modules/ui_gtk_runtime";
+};
+
+const LinuxUConsoleGtkHistoricalSourceDescriptor&
+linuxUConsoleGtkHistoricalSourceDescriptor();
+
+} // namespace trailmate::apps::linux_uconsole_gtk
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp
new file mode 100644
index 00000000..bceb6536
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp
@@ -0,0 +1,83 @@
+#include "linux_uconsole_gtk_page_registry_adoption.h"
+
+namespace trailmate::apps::linux_uconsole_gtk
+{
+
+bool LinuxUConsoleGtkPageRegistryAdoption::load(
+    const LinuxUConsoleGtkAppShell& shell)
+{
+    ready_ = adoption_probe_.load(shell);
+    if (ready_)
+    {
+        registry_source_ =
+            LinuxUConsoleGtkPageRegistrySource::ScreenGraphAdoption;
+        fallback_ = false;
+        return true;
+    }
+
+    registry_source_ = LinuxUConsoleGtkPageRegistrySource::HardcodedFallback;
+    fallback_ = true;
+    return loadFallback(shell);
+}
+
+bool LinuxUConsoleGtkPageRegistryAdoption::loadFallback(
+    const LinuxUConsoleGtkAppShell&)
+{
+    // Phase 10 fallback containment: the legacy hardcoded GTK page registry
+    // remains available until descriptors become the primary page source.
+    return false;
+}
+
+bool LinuxUConsoleGtkPageRegistryAdoption::ready() const
+{
+    return ready_;
+}
+
+bool LinuxUConsoleGtkPageRegistryAdoption::usingPrimaryScreenGraph()
+    const noexcept
+{
+    return registry_source_ ==
+               LinuxUConsoleGtkPageRegistrySource::ScreenGraphAdoption &&
+           ready_ && !fallback_;
+}
+
+bool LinuxUConsoleGtkPageRegistryAdoption::fallbackUsed() const
+{
+    return fallback_;
+}
+
+LinuxUConsoleGtkPageRegistrySource
+LinuxUConsoleGtkPageRegistryAdoption::registrySource() const noexcept
+{
+    return registry_source_;
+}
+
+std::size_t LinuxUConsoleGtkPageRegistryAdoption::menuCount() const
+{
+    return ready_ ? adoption_probe_.menuCount() : 0;
+}
+
+std::size_t LinuxUConsoleGtkPageRegistryAdoption::screenCount() const
+{
+    return ready_ ? adoption_probe_.screenCount() : 0;
+}
+
+const trailmate::uconsole::GtkMenuDescriptor*
+LinuxUConsoleGtkPageRegistryAdoption::menuDescriptors() const
+{
+    return adoption_probe_.adoption().presenter().menuDescriptors();
+}
+
+const trailmate::uconsole::GtkScreenDescriptor*
+LinuxUConsoleGtkPageRegistryAdoption::screenDescriptors() const
+{
+    return adoption_probe_.adoption().presenter().screenDescriptors();
+}
+
+const trailmate::uconsole::gtk::GtkRuntimeEntryAdoption&
+LinuxUConsoleGtkPageRegistryAdoption::adoption() const
+{
+    return adoption_probe_.adoption();
+}
+
+} // namespace trailmate::apps::linux_uconsole_gtk
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h
new file mode 100644
index 00000000..801b3edf
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "linux_uconsole_gtk_app_shell.h"
+#include "linux_uconsole_gtk_runtime_entry_adoption_probe.h"
+#include "ui_gtk_runtime/gtk_runtime_entry_adoption.h"
+
+#include <cstddef>
+
+namespace trailmate::apps::linux_uconsole_gtk
+{
+
+enum class LinuxUConsoleGtkPageRegistrySource
+{
+    ScreenGraphAdoption,
+    HardcodedFallback,
+};
+
+class LinuxUConsoleGtkPageRegistryAdoption
+{
+  public:
+    bool load(const LinuxUConsoleGtkAppShell& shell);
+
+    bool ready() const;
+    bool usingPrimaryScreenGraph() const noexcept;
+    bool fallbackUsed() const;
+    LinuxUConsoleGtkPageRegistrySource registrySource() const noexcept;
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const trailmate::uconsole::GtkMenuDescriptor* menuDescriptors() const;
+    const trailmate::uconsole::GtkScreenDescriptor* screenDescriptors() const;
+    const trailmate::uconsole::gtk::GtkRuntimeEntryAdoption& adoption() const;
+
+  private:
+    bool loadFallback(const LinuxUConsoleGtkAppShell& shell);
+
+  private:
+    LinuxUConsoleGtkRuntimeEntryAdoptionProbe adoption_probe_{};
+    LinuxUConsoleGtkPageRegistrySource registry_source_ =
+        LinuxUConsoleGtkPageRegistrySource::HardcodedFallback;
+    bool ready_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace trailmate::apps::linux_uconsole_gtk
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.cpp b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.cpp
new file mode 100644
index 00000000..609b4a9c
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.cpp
@@ -0,0 +1,78 @@
+#include "linux_uconsole_gtk_page_registry_renderer.h"
+
+namespace trailmate::apps::linux_uconsole_gtk
+{
+
+bool LinuxUConsoleGtkPageRegistryRenderer::render(
+    const LinuxUConsoleGtkPageRegistryAdoption& adoption)
+{
+    ready_ = false;
+    primary_ = false;
+    fallback_ = true;
+
+    if (adoption.usingPrimaryScreenGraph())
+    {
+        ready_ = registry_.load(adoption.adoption());
+        primary_ = ready_;
+        fallback_ = !ready_;
+        return ready_;
+    }
+
+    if (adoption.fallbackUsed())
+    {
+        return renderFallback(adoption);
+    }
+
+    return false;
+}
+
+bool LinuxUConsoleGtkPageRegistryRenderer::renderFallback(
+    const LinuxUConsoleGtkPageRegistryAdoption&)
+{
+    // Phase 11 fallback: hardcoded GTK page registry remains available only
+    // when descriptor registry consumption is unavailable.
+    ready_ = false;
+    primary_ = false;
+    fallback_ = true;
+    return false;
+}
+
+bool LinuxUConsoleGtkPageRegistryRenderer::ready() const noexcept
+{
+    return ready_;
+}
+
+bool LinuxUConsoleGtkPageRegistryRenderer::usingPrimaryScreenGraph()
+    const noexcept
+{
+    return primary_;
+}
+
+bool LinuxUConsoleGtkPageRegistryRenderer::usedPrimaryScreenGraph()
+    const noexcept
+{
+    return primary_;
+}
+
+bool LinuxUConsoleGtkPageRegistryRenderer::fallbackUsed() const noexcept
+{
+    return fallback_;
+}
+
+bool LinuxUConsoleGtkPageRegistryRenderer::usedFallback() const noexcept
+{
+    return fallback_;
+}
+
+std::size_t LinuxUConsoleGtkPageRegistryRenderer::pageCount() const noexcept
+{
+    return ready_ ? registry_.pageCount() : 0;
+}
+
+const trailmate::uconsole::GtkDescriptorPage*
+LinuxUConsoleGtkPageRegistryRenderer::pages() const noexcept
+{
+    return ready_ ? registry_.pages() : nullptr;
+}
+
+} // namespace trailmate::apps::linux_uconsole_gtk
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.h b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.h
new file mode 100644
index 00000000..a0874281
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "linux_uconsole_gtk_page_registry_adoption.h"
+#include "ui_gtk_runtime/gtk_descriptor_page_registry.h"
+
+#include <cstddef>
+
+namespace trailmate::apps::linux_uconsole_gtk
+{
+
+class LinuxUConsoleGtkPageRegistryRenderer
+{
+  public:
+    bool render(const LinuxUConsoleGtkPageRegistryAdoption& adoption);
+
+    bool ready() const noexcept;
+    bool usingPrimaryScreenGraph() const noexcept;
+    bool usedPrimaryScreenGraph() const noexcept;
+    bool fallbackUsed() const noexcept;
+    bool usedFallback() const noexcept;
+    std::size_t pageCount() const noexcept;
+    const trailmate::uconsole::GtkDescriptorPage* pages() const noexcept;
+
+  private:
+    bool renderFallback(const LinuxUConsoleGtkPageRegistryAdoption& adoption);
+
+  private:
+    trailmate::uconsole::GtkDescriptorPageRegistry registry_{};
+    bool ready_ = false;
+    bool primary_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace trailmate::apps::linux_uconsole_gtk
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp
new file mode 100644
index 00000000..62a27ea2
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp
@@ -0,0 +1,60 @@
+#include "linux_uconsole_gtk_runtime_entry_adoption_probe.h"
+
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+namespace trailmate::apps::linux_uconsole_gtk
+{
+
+bool LinuxUConsoleGtkRuntimeEntryAdoptionProbe::load(
+    const LinuxUConsoleGtkAppShell& shell)
+{
+    ready_ = false;
+    fallback_ = true;
+    menu_.clear();
+    screen_bindings_.clear();
+    presentation_ = {};
+
+    if (!shell.validate() ||
+        !ui_lvgl_ux::buildMenuForUxPack(shell.activeUxPackId(), menu_))
+    {
+        return false;
+    }
+
+    ui_lvgl_ux::CompatibilityScreenFactory screen_factory;
+    screen_factory.buildBindingsForMenu(menu_, screen_bindings_);
+    presentation_.ux_menu = &menu_;
+    presentation_.screen_bindings = &screen_bindings_;
+
+    ready_ = adoption_.load(presentation_);
+    fallback_ = !ready_;
+    return ready_;
+}
+
+bool LinuxUConsoleGtkRuntimeEntryAdoptionProbe::ready() const
+{
+    return ready_;
+}
+
+bool LinuxUConsoleGtkRuntimeEntryAdoptionProbe::fallbackUsed() const
+{
+    return fallback_;
+}
+
+std::size_t LinuxUConsoleGtkRuntimeEntryAdoptionProbe::menuCount() const
+{
+    return ready_ ? adoption_.menuCount() : 0;
+}
+
+std::size_t LinuxUConsoleGtkRuntimeEntryAdoptionProbe::screenCount() const
+{
+    return ready_ ? adoption_.screenCount() : 0;
+}
+
+const trailmate::uconsole::gtk::GtkRuntimeEntryAdoption&
+LinuxUConsoleGtkRuntimeEntryAdoptionProbe::adoption() const
+{
+    return adoption_;
+}
+
+} // namespace trailmate::apps::linux_uconsole_gtk
diff --git a/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.h b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.h
new file mode 100644
index 00000000..eff22576
--- /dev/null
+++ b/apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "linux_uconsole_gtk_app_shell.h"
+#include "product_composition/presentation_bundle.h"
+#include "ui_gtk_runtime/gtk_runtime_entry_adoption.h"
+#include "ui_presentation/menu/menu_model.h"
+#include "ui_presentation/screen/screen_binding_registry.h"
+
+#include <cstddef>
+
+namespace trailmate::apps::linux_uconsole_gtk
+{
+
+class LinuxUConsoleGtkRuntimeEntryAdoptionProbe
+{
+  public:
+    bool load(const LinuxUConsoleGtkAppShell& shell);
+
+    bool ready() const;
+    bool fallbackUsed() const;
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const trailmate::uconsole::gtk::GtkRuntimeEntryAdoption& adoption() const;
+
+  private:
+    ui::menu::MenuModel menu_{};
+    ui::screen::ScreenBindingRegistry screen_bindings_{};
+    product_composition::PresentationBundle presentation_{};
+    trailmate::uconsole::gtk::GtkRuntimeEntryAdoption adoption_{};
+    bool ready_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace trailmate::apps::linux_uconsole_gtk
diff --git a/apps/linux_uconsole/src/platform/desktop/sdl_window_presenter.cpp b/apps/linux_uconsole_gtk/src/platform/desktop/sdl_window_presenter.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/desktop/sdl_window_presenter.cpp
rename to apps/linux_uconsole_gtk/src/platform/desktop/sdl_window_presenter.cpp
diff --git a/apps/linux_uconsole/src/platform/desktop/sdl_window_presenter.h b/apps/linux_uconsole_gtk/src/platform/desktop/sdl_window_presenter.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/desktop/sdl_window_presenter.h
rename to apps/linux_uconsole_gtk/src/platform/desktop/sdl_window_presenter.h
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_app.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_app.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_app.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_app.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_app.h b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_app.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_app.h
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_app.h
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_app_state.h b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_app_state.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_app_state.h
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_app_state.h
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_chat_layout.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_chat_layout.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_chat_layout.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_chat_layout.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_chat_logic.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_chat_logic.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_chat_logic.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_chat_logic.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_data_layout.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_data_layout.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_data_layout.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_data_layout.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_data_logic.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_data_logic.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_data_logic.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_data_logic.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_hardware_layout.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_hardware_layout.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_hardware_layout.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_hardware_layout.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_hardware_logic.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_hardware_logic.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_hardware_logic.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_hardware_logic.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_layout_spec.h b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_layout_spec.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_layout_spec.h
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_layout_spec.h
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_logs_layout.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_logs_layout.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_logs_layout.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_logs_layout.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_logs_logic.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_logs_logic.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_logs_logic.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_logs_logic.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_map_layout.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_map_layout.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_map_layout.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_map_layout.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_map_logic.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_map_logic.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_map_logic.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_map_logic.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_mqtt_settings.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_mqtt_settings.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_mqtt_settings.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_mqtt_settings.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_mqtt_settings.h b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_mqtt_settings.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_mqtt_settings.h
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_mqtt_settings.h
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_overview_layout.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_overview_layout.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_overview_layout.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_overview_layout.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_overview_logic.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_overview_logic.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_overview_logic.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_overview_logic.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_pages.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_pages.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_pages.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_pages.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_pages.h b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_pages.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_pages.h
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_pages.h
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_settings_layout.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_settings_layout.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_settings_layout.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_settings_layout.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_settings_logic.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_settings_logic.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_settings_logic.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_settings_logic.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_shell.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_shell.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_shell.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_shell.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_shell.h b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_shell.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_shell.h
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_shell.h
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_style.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_style.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_style.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_style.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_style.h b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_style.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_style.h
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_style.h
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_widgets.cpp b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_widgets.cpp
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_widgets.cpp
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_widgets.cpp
diff --git a/apps/linux_uconsole/src/platform/gtk/gtk_uconsole_widgets.h b/apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_widgets.h
similarity index 100%
rename from apps/linux_uconsole/src/platform/gtk/gtk_uconsole_widgets.h
rename to apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_widgets.h
diff --git a/apps/linux_uconsole/src/targets/uconsole_main.cpp b/apps/linux_uconsole_gtk/src/targets/uconsole_main.cpp
similarity index 100%
rename from apps/linux_uconsole/src/targets/uconsole_main.cpp
rename to apps/linux_uconsole_gtk/src/targets/uconsole_main.cpp
diff --git a/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_app_shell_smoke.cpp b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_app_shell_smoke.cpp
new file mode 100644
index 00000000..a66f03df
--- /dev/null
+++ b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_app_shell_smoke.cpp
@@ -0,0 +1,39 @@
+#include "linux_uconsole_gtk_app_shell.h"
+#include "linux_uconsole_gtk_historical_source_descriptor.h"
+
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkAppShell shell;
+    assert(shell.validate());
+
+    const auto& config = shell.config();
+    assert(std::strcmp(config.target_id, "uconsole") == 0);
+    assert(std::strcmp(shell.targetId(), "uconsole") == 0);
+    assert(std::strcmp(config.ux_pack_id, "uconsole_desktop") == 0);
+    assert(std::strcmp(shell.activeUxPackId(), "uconsole_desktop") == 0);
+    assert(shell.targetProfile() != nullptr);
+    assert(shell.targetProfile()->renderer ==
+           product_composition::TargetRenderer::Gtk);
+    const auto& descriptor =
+        trailmate::apps::linux_uconsole_gtk::
+            linuxUConsoleGtkHistoricalSourceDescriptor();
+    assert(std::strcmp(config.historical_source,
+                       descriptor.historical_root_name) == 0);
+    assert(std::strcmp(descriptor.historical_role,
+                       "pre-refactor uConsole GTK implementation root") == 0);
+    assert(std::strcmp(descriptor.replacement_owner,
+                       "apps/linux_uconsole_gtk + modules/ui_gtk_runtime") == 0);
+    assert(ui_lvgl_ux::findUxPackById(shell.activeUxPackId()) != nullptr);
+
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack(shell.activeUxPackId(), menu));
+    assert(menu.size() > 0);
+    return 0;
+}
diff --git a/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp
new file mode 100644
index 00000000..b28e2ed9
--- /dev/null
+++ b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp
@@ -0,0 +1,19 @@
+#include "linux_uconsole_gtk_historical_source_descriptor.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    const auto& descriptor =
+        trailmate::apps::linux_uconsole_gtk::
+            linuxUConsoleGtkHistoricalSourceDescriptor();
+
+    assert(std::strcmp(descriptor.historical_root_name,
+                       "removed root linux_uconsole") == 0);
+    assert(std::strcmp(descriptor.historical_role,
+                       "pre-refactor uConsole GTK implementation root") == 0);
+    assert(std::strcmp(descriptor.replacement_owner,
+                       "apps/linux_uconsole_gtk + modules/ui_gtk_runtime") == 0);
+    return 0;
+}
diff --git a/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp
new file mode 100644
index 00000000..f5650943
--- /dev/null
+++ b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp
@@ -0,0 +1,24 @@
+#include "linux_uconsole_gtk_app_shell.h"
+#include "linux_uconsole_gtk_page_registry_adoption.h"
+
+#include <cassert>
+
+int main()
+{
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkAppShell shell;
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkPageRegistryAdoption
+        page_registry;
+
+    assert(page_registry.load(shell));
+    assert(page_registry.ready());
+    assert(page_registry.usingPrimaryScreenGraph());
+    assert(page_registry.registrySource() ==
+           trailmate::apps::linux_uconsole_gtk::
+               LinuxUConsoleGtkPageRegistrySource::ScreenGraphAdoption);
+    assert(!page_registry.fallbackUsed());
+    assert(page_registry.menuCount() > 0);
+    assert(page_registry.screenCount() > 0);
+    assert(page_registry.menuDescriptors()[0].route.valid);
+    assert(page_registry.screenDescriptors()[0].binding_id != nullptr);
+    return 0;
+}
diff --git a/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp
new file mode 100644
index 00000000..9a9d544c
--- /dev/null
+++ b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp
@@ -0,0 +1,26 @@
+#include "linux_uconsole_gtk_app_shell.h"
+#include "linux_uconsole_gtk_page_registry_adoption.h"
+
+#include <cassert>
+
+int main()
+{
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkAppShellConfig
+        invalid_config;
+    invalid_config.ux_pack_id = "missing_phase10_pack";
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkAppShell shell(
+        invalid_config);
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkPageRegistryAdoption
+        page_registry;
+
+    assert(!page_registry.load(shell));
+    assert(!page_registry.ready());
+    assert(!page_registry.usingPrimaryScreenGraph());
+    assert(page_registry.registrySource() ==
+           trailmate::apps::linux_uconsole_gtk::
+               LinuxUConsoleGtkPageRegistrySource::HardcodedFallback);
+    assert(page_registry.fallbackUsed());
+    assert(page_registry.menuCount() == 0);
+    assert(page_registry.screenCount() == 0);
+    return 0;
+}
diff --git a/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_renderer_smoke.cpp b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_renderer_smoke.cpp
new file mode 100644
index 00000000..b98d3425
--- /dev/null
+++ b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_renderer_smoke.cpp
@@ -0,0 +1,40 @@
+#include "linux_uconsole_gtk_app_shell.h"
+#include "linux_uconsole_gtk_page_registry_adoption.h"
+#include "linux_uconsole_gtk_page_registry_renderer.h"
+
+#include <cassert>
+
+int main()
+{
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkAppShell shell;
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkPageRegistryAdoption
+        adoption;
+    assert(adoption.load(shell));
+    assert(adoption.usingPrimaryScreenGraph());
+
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkPageRegistryRenderer
+        renderer;
+    assert(renderer.render(adoption));
+    assert(renderer.ready());
+    assert(renderer.usingPrimaryScreenGraph());
+    assert(renderer.usedPrimaryScreenGraph());
+    assert(!renderer.fallbackUsed());
+    assert(!renderer.usedFallback());
+    assert(renderer.pageCount() > 0);
+    assert(renderer.pages() != nullptr);
+    assert(renderer.pages()[0].binding_id != nullptr);
+
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkAppShellConfig
+        invalid_config;
+    invalid_config.ux_pack_id = "missing_phase11_pack";
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkAppShell invalid_shell(
+        invalid_config);
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkPageRegistryAdoption
+        fallback_adoption;
+    assert(!fallback_adoption.load(invalid_shell));
+    assert(fallback_adoption.fallbackUsed());
+    assert(!renderer.render(fallback_adoption));
+    assert(renderer.fallbackUsed());
+    assert(renderer.usedFallback());
+    return 0;
+}
diff --git a/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp
new file mode 100644
index 00000000..96c992e0
--- /dev/null
+++ b/apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp
@@ -0,0 +1,19 @@
+#include "linux_uconsole_gtk_app_shell.h"
+#include "linux_uconsole_gtk_runtime_entry_adoption_probe.h"
+
+#include <cassert>
+
+int main()
+{
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkAppShell shell;
+    trailmate::apps::linux_uconsole_gtk::LinuxUConsoleGtkRuntimeEntryAdoptionProbe
+        probe;
+
+    assert(probe.load(shell));
+    assert(probe.ready());
+    assert(!probe.fallbackUsed());
+    assert(probe.menuCount() > 0);
+    assert(probe.screenCount() > 0);
+    assert(probe.adoption().presenter().menuDescriptors()[0].route.valid);
+    return 0;
+}
diff --git a/apps/linux_uconsole/tests/uconsole_chat_dedup_smoke.cpp b/apps/linux_uconsole_gtk/tests/uconsole_chat_dedup_smoke.cpp
similarity index 100%
rename from apps/linux_uconsole/tests/uconsole_chat_dedup_smoke.cpp
rename to apps/linux_uconsole_gtk/tests/uconsole_chat_dedup_smoke.cpp
diff --git a/apps/linux_uconsole/tests/uconsole_chat_sqlite_store_smoke.cpp b/apps/linux_uconsole_gtk/tests/uconsole_chat_sqlite_store_smoke.cpp
similarity index 100%
rename from apps/linux_uconsole/tests/uconsole_chat_sqlite_store_smoke.cpp
rename to apps/linux_uconsole_gtk/tests/uconsole_chat_sqlite_store_smoke.cpp
diff --git a/apps/linux_uconsole/tests/uconsole_chat_workspace_smoke.cpp b/apps/linux_uconsole_gtk/tests/uconsole_chat_workspace_smoke.cpp
similarity index 100%
rename from apps/linux_uconsole/tests/uconsole_chat_workspace_smoke.cpp
rename to apps/linux_uconsole_gtk/tests/uconsole_chat_workspace_smoke.cpp
diff --git a/apps/linux_uconsole/tests/uconsole_map_workspace_smoke.cpp b/apps/linux_uconsole_gtk/tests/uconsole_map_workspace_smoke.cpp
similarity index 96%
rename from apps/linux_uconsole/tests/uconsole_map_workspace_smoke.cpp
rename to apps/linux_uconsole_gtk/tests/uconsole_map_workspace_smoke.cpp
index 3aa2b20b..89b91e4e 100644
--- a/apps/linux_uconsole/tests/uconsole_map_workspace_smoke.cpp
+++ b/apps/linux_uconsole_gtk/tests/uconsole_map_workspace_smoke.cpp
@@ -49,6 +49,11 @@ int main()
 
     assert(snapshot.has_center);
     assert(!snapshot.has_fix);
+    assert(snapshot.presentation_workspace.header.valid);
+    assert(snapshot.presentation_workspace.viewport.zoom == 2);
+    assert(!snapshot.presentation_workspace.self.valid);
+    assert(snapshot.presentation_workspace.active_tool ==
+           ::ui::map::MapToolKind::Pan);
     assert(snapshot.using_default_center);
     assert(!snapshot.has_configured_center);
     assert(snapshot.zoom == 2);
@@ -104,6 +109,7 @@ int main()
     assert(model.earthdataTokenConfigured());
     const auto contours_missing = model.snapshot();
     assert(contours_missing.contour_enabled);
+    assert(contours_missing.presentation_workspace.layers.contour);
     assert(!contours_missing.contour_ultra_fine_enabled);
     assert(contours_missing.earthdata_token_configured);
     assert(contours_missing.contour_profiles.size() == 2U);
diff --git a/apps/linux_uconsole/tests/uconsole_meshtastic_node_payload_smoke.cpp b/apps/linux_uconsole_gtk/tests/uconsole_meshtastic_node_payload_smoke.cpp
similarity index 100%
rename from apps/linux_uconsole/tests/uconsole_meshtastic_node_payload_smoke.cpp
rename to apps/linux_uconsole_gtk/tests/uconsole_meshtastic_node_payload_smoke.cpp
diff --git a/apps/linux_uconsole/tools/sx1262_probe.cpp b/apps/linux_uconsole_gtk/tools/sx1262_probe.cpp
similarity index 100%
rename from apps/linux_uconsole/tools/sx1262_probe.cpp
rename to apps/linux_uconsole_gtk/tools/sx1262_probe.cpp
diff --git a/apps/linux_unoq/README.md b/apps/linux_unoq/README.md
deleted file mode 100644
index 6b924d6b..00000000
--- a/apps/linux_unoq/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# `apps/linux_unoq`
-
-Planned UNO Q hardware application shell.
-
-This target should be introduced after the Linux simulator and shared core boundaries are stable.
diff --git a/apps/nrf52_node/APP_SHELL_MANIFEST.md b/apps/nrf52_node/APP_SHELL_MANIFEST.md
new file mode 100644
index 00000000..4e5a14b3
--- /dev/null
+++ b/apps/nrf52_node/APP_SHELL_MANIFEST.md
@@ -0,0 +1,73 @@
+# App Shell Manifest: nrf52_node
+
+## Role
+
+Product app shell / target app shell.
+
+## Target Family
+
+nRF52.
+
+## Renderer Family
+
+Node/status UI, mono UI, or target-selected compact embedded renderer.
+
+## Build Entrypoint
+
+Future authoritative build entrypoint:
+
+- `builds/pio_nrf52`
+
+Historical source identities:
+
+- `removed root esp_pio`
+- `removed root gat562_mesh_evb_pro`
+
+## Future Responsibilities
+
+May:
+
+- select nRF52 target profile
+- select board package
+- select node/status UX profile
+- invoke product composition
+- hand off to runtime facade
+
+Must not:
+
+- own build host files
+- own PlatformIO environment definitions
+- define board facts
+- implement HAL details
+- implement screen internals
+- assemble Chat/Map/GPS runtime directly in build wrapper
+
+## Thin App Shell Entrypoint Declaration
+
+Current source-level shell descriptor:
+
+```text
+src/nrf52_node_app_shell.h
+src/nrf52_node_app_shell.cpp
+trailmate-nrf52-node-app-shell
+```
+
+## Current Status
+
+Executable app shell baseline.
+
+Default UX Pack:
+
+- `tiny_node_status`
+
+UX Pack Runtime Binding:
+
+- `Nrf52NodeAppShell::validate()` resolves `default_ux_pack_id` through
+  product-composition target UX binding. The nRF52 shell stays independent of
+  LVGL UX pack runtime code.
+
+Historical source descriptor:
+
+- `nrf52_historical_source_descriptor`
+
+No behavior change in Phase 8 Build/AppShell Executable Convergence.
diff --git a/apps/nrf52_node/README.md b/apps/nrf52_node/README.md
new file mode 100644
index 00000000..88402141
--- /dev/null
+++ b/apps/nrf52_node/README.md
@@ -0,0 +1,64 @@
+# `apps/nrf52_node`
+
+Role = product app shell / target app shell.
+
+`apps/nrf52_node` is the nRF52 node product app shell executable baseline.
+
+It is not a PlatformIO project directory and does not contain build host files
+in Phase 8 Build/AppShell Executable Convergence.
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+## Build Entrypoint
+
+Build entrypoint = `builds/pio_nrf52`
+
+Historical source identity = `removed root esp_pio` and `removed root gat562_mesh_evb_pro`
+
+## Future Responsibilities
+
+May:
+
+- select nRF52 target profile
+- select board package
+- select node/status UX profile
+- invoke product composition
+- hand off to runtime facade
+
+Must not:
+
+- own build host files
+- own PlatformIO environment definitions
+- define board facts
+- implement HAL details
+- implement screen internals
+- assemble Chat/Map/GPS runtime directly in build wrapper
+
+## Thin App Shell Entrypoint Declaration
+
+Current source-level shell descriptor:
+
+```text
+src/nrf52_node_app_shell.h
+src/nrf52_node_app_shell.cpp
+trailmate-nrf52-node-app-shell
+```
+
+Current config:
+
+```text
+target_family = nrf52_node
+default_ux_pack_id = tiny_node_status
+historical_generic_root_name = removed root esp_pio
+historical_board_root_name = removed root gat562_mesh_evb_pro
+historical_role = pre-refactor PlatformIO/nRF52 implementation roots
+replacement_owner = apps/nrf52_node + builds/pio_nrf52 + boards/gat562_mesh_evb_pro
+```
+
+No behavior change in Phase 8 Build/AppShell Executable Convergence.
diff --git a/apps/nrf52_node/library.json b/apps/nrf52_node/library.json
new file mode 100644
index 00000000..a0f40891
--- /dev/null
+++ b/apps/nrf52_node/library.json
@@ -0,0 +1,70 @@
+{
+  "name": "trailmate-nrf52-node-app-shell",
+  "version": "0.0.0",
+  "build": {
+    "includeDir": "src",
+    "srcDir": "src",
+    "srcFilter": [
+      "-<*>",
+      "+<nrf52_historical_source_descriptor.cpp>",
+      "+<nrf52_node_app_facade_runtime.cpp>",
+      "+<nrf52_node_app_runtime_access.cpp>",
+      "+<nrf52_node_app_shell.cpp>",
+      "+<nrf52_node_arduino_entry.cpp>",
+      "+<nrf52_node_loop_runtime.cpp>",
+      "+<nrf52_node_runtime_config.cpp>",
+      "+<nrf52_node_startup_runtime.cpp>",
+      "+<nrf52_node_ui_runtime.cpp>"
+    ],
+    "flags": [
+      "-std=gnu++17",
+      "-I../..",
+      "-I../../modules/product_composition/include",
+      "-I../../modules/ui_presentation/include",
+      "-I../../modules/core_chat/include",
+      "-I../../modules/core_chat/generated",
+      "-I../../modules/core_chat/third_party/nanopb",
+      "-I../../modules/core_gps/include",
+      "-I../../modules/core_sys/include",
+      "-I../../modules/core_mesh/include",
+      "-I../../modules/core_phone/include",
+      "-I../../modules/ui_mono_128x64/include",
+      "-I../../modules/ui_shared/include",
+      "-I../../modules/chat_presentation_adapters/include",
+      "-I../../platform/shared/include",
+      "-I../../platform/nrf52",
+      "-I../../platform/nrf52/arduino_common/include",
+      "-I../../boards/gat562_mesh_evb_pro/include",
+      "-I../../variants/gat562_mesh_evb_pro"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "product_composition"
+    },
+    {
+      "name": "core_chat"
+    },
+    {
+      "name": "core_mesh"
+    },
+    {
+      "name": "core_phone"
+    },
+    {
+      "name": "core_sys"
+    },
+    {
+      "name": "ui_mono_128x64"
+    },
+    {
+      "name": "boards_gat562_mesh_evb_pro"
+    },
+    {
+      "name": "platform_nrf52"
+    },
+    {
+      "name": "platform_nrf52_arduino_common"
+    }
+  ]
+}
diff --git a/apps/nrf52_node/src/nrf52_historical_source_descriptor.cpp b/apps/nrf52_node/src/nrf52_historical_source_descriptor.cpp
new file mode 100644
index 00000000..7bb9bec9
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_historical_source_descriptor.cpp
@@ -0,0 +1,12 @@
+#include "nrf52_historical_source_descriptor.h"
+
+namespace trailmate::apps::nrf52_node
+{
+
+const Nrf52HistoricalSourceDescriptor& nrf52HistoricalSourceDescriptor()
+{
+    static const Nrf52HistoricalSourceDescriptor descriptor{};
+    return descriptor;
+}
+
+} // namespace trailmate::apps::nrf52_node
diff --git a/apps/nrf52_node/src/nrf52_historical_source_descriptor.h b/apps/nrf52_node/src/nrf52_historical_source_descriptor.h
new file mode 100644
index 00000000..0f0f48ca
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_historical_source_descriptor.h
@@ -0,0 +1,17 @@
+#pragma once
+
+namespace trailmate::apps::nrf52_node
+{
+
+struct Nrf52HistoricalSourceDescriptor
+{
+    const char* historical_generic_root_name = "removed root esp_pio";
+    const char* historical_board_root_name = "removed root gat562_mesh_evb_pro";
+    const char* historical_role = "pre-refactor PlatformIO/nRF52 implementation roots";
+    const char* replacement_owner =
+        "apps/nrf52_node + builds/pio_nrf52 + boards/gat562_mesh_evb_pro";
+};
+
+const Nrf52HistoricalSourceDescriptor& nrf52HistoricalSourceDescriptor();
+
+} // namespace trailmate::apps::nrf52_node
diff --git a/apps/gat562_mesh_evb_pro/src/app_facade_runtime.cpp b/apps/nrf52_node/src/nrf52_node_app_facade_runtime.cpp
similarity index 85%
rename from apps/gat562_mesh_evb_pro/src/app_facade_runtime.cpp
rename to apps/nrf52_node/src/nrf52_node_app_facade_runtime.cpp
index 1bf4cacd..2e9f768a 100644
--- a/apps/gat562_mesh_evb_pro/src/app_facade_runtime.cpp
+++ b/apps/nrf52_node/src/nrf52_node_app_facade_runtime.cpp
@@ -1,9 +1,6 @@
-#include "apps/gat562_mesh_evb_pro/app_facade_runtime.h"
+#include "nrf52_node_app_facade_runtime.h"
 
 #include "app/app_facade_access.h"
-#include "apps/gat562_mesh_evb_pro/debug_console.h"
-#include "apps/gat562_mesh_evb_pro/protocol_factory.h"
-#include "apps/gat562_mesh_evb_pro/runtime_apply_service.h"
 #include "boards/gat562_mesh_evb_pro/gat562_board.h"
 #include "boards/gat562_mesh_evb_pro/settings_store.h"
 #include "chat/domain/chat_model.h"
@@ -20,6 +17,9 @@
 #include "platform/nrf52/arduino_common/chat/infra/store/internal_fs_store.h"
 #include "platform/nrf52/arduino_common/device_identity.h"
 #include "platform/nrf52/arduino_common/self_identity_bridge.h"
+#include "platform/nrf52/debug/nrf52_debug_console.h"
+#include "platform/nrf52/protocol/nrf52_protocol_factory.h"
+#include "platform/nrf52/runtime/nrf52_runtime_apply_service.h"
 #include "sys/clock.h"
 
 #include <Arduino.h>
@@ -29,7 +29,7 @@
 #include <cstring>
 #include <vector>
 
-namespace apps::gat562_mesh_evb_pro
+namespace trailmate::apps::nrf52_node
 {
 namespace
 {
@@ -132,7 +132,7 @@ AppFacadeRuntime& AppFacadeRuntime::instance()
 }
 
 AppFacadeRuntime::AppFacadeRuntime()
-    : apply_service_(new RuntimeApplyService())
+    : apply_service_(new platform::nrf52::runtime::RuntimeApplyService())
 {
 }
 
@@ -172,8 +172,8 @@ bool AppFacadeRuntime::initialize()
         ble_manager_->begin();
     }
     initialized_ = true;
-    debug_console::printf("[gat562] app facade ready node=%08lX\n",
-                          static_cast<unsigned long>(effective_identity_.node_id));
+    platform::nrf52::debug_console::printf("[gat562] app facade ready node=%08lX\n",
+                                           static_cast<unsigned long>(effective_identity_.node_id));
     return true;
 }
 
@@ -253,12 +253,12 @@ void AppFacadeRuntime::initializeChatRuntime()
     }
 
     (void)installMeshBackend(chat::MeshProtocol::Meshtastic,
-                             createProtocolAdapter(chat::MeshProtocol::Meshtastic,
-                                                   identityProvider(),
-                                                   static_cast<platform::nrf52::arduino_common::chat::meshtastic::NodeStore*>(node_store_.get()),
-                                                   contact_service_.get()));
+                             platform::nrf52::protocol::createProtocolAdapter(chat::MeshProtocol::Meshtastic,
+                                                                              identityProvider(),
+                                                                              static_cast<platform::nrf52::arduino_common::chat::meshtastic::NodeStore*>(node_store_.get()),
+                                                                              contact_service_.get()));
     (void)installMeshBackend(chat::MeshProtocol::MeshCore,
-                             createProtocolAdapter(chat::MeshProtocol::MeshCore, identityProvider()));
+                             platform::nrf52::protocol::createProtocolAdapter(chat::MeshProtocol::MeshCore, identityProvider()));
 
     applyMeshConfig();
     applyUserInfo();
@@ -308,32 +308,32 @@ void AppFacadeRuntime::saveConfig()
 {
     ScopedGpsSuspend suspend_gps(board_);
     clearPostSaveApplySkips();
-    debug_console::printf("[gat562][cfg] save start proto=%u ok_to_mqtt=%u ignore_mqtt=%u ble=%u\n",
-                          static_cast<unsigned>(config_.mesh_protocol),
-                          config_.meshtastic_config.config_ok_to_mqtt ? 1U : 0U,
-                          config_.meshtastic_config.ignore_mqtt ? 1U : 0U,
-                          config_.ble_enabled ? 1U : 0U);
+    platform::nrf52::debug_console::printf("[gat562][cfg] save start proto=%u ok_to_mqtt=%u ignore_mqtt=%u ble=%u\n",
+                                           static_cast<unsigned>(config_.mesh_protocol),
+                                           config_.meshtastic_config.config_ok_to_mqtt ? 1U : 0U,
+                                           config_.meshtastic_config.ignore_mqtt ? 1U : 0U,
+                                           config_.ble_enabled ? 1U : 0U);
     ::boards::gat562_mesh_evb_pro::settings_store::normalizeConfig(config_);
-    debug_console::printf("[gat562][cfg] save post-normalize ok_to_mqtt=%u ignore_mqtt=%u\n",
-                          config_.meshtastic_config.config_ok_to_mqtt ? 1U : 0U,
-                          config_.meshtastic_config.ignore_mqtt ? 1U : 0U);
+    platform::nrf52::debug_console::printf("[gat562][cfg] save post-normalize ok_to_mqtt=%u ignore_mqtt=%u\n",
+                                           config_.meshtastic_config.config_ok_to_mqtt ? 1U : 0U,
+                                           config_.meshtastic_config.ignore_mqtt ? 1U : 0U);
     refreshEffectiveIdentity();
-    debug_console::printf("[gat562][cfg] save post-identity\n");
+    platform::nrf52::debug_console::printf("[gat562][cfg] save post-identity\n");
     applyMeshConfig();
-    debug_console::printf("[gat562][cfg] save post-applyMesh\n");
+    platform::nrf52::debug_console::printf("[gat562][cfg] save post-applyMesh\n");
     applyUserInfo();
-    debug_console::printf("[gat562][cfg] save post-applyUser\n");
+    platform::nrf52::debug_console::printf("[gat562][cfg] save post-applyUser\n");
     applyPositionConfig();
-    debug_console::printf("[gat562][cfg] save post-applyPos\n");
+    platform::nrf52::debug_console::printf("[gat562][cfg] save post-applyPos\n");
     applyNetworkLimits();
-    debug_console::printf("[gat562][cfg] save post-applyLimits\n");
+    platform::nrf52::debug_console::printf("[gat562][cfg] save post-applyLimits\n");
     applyPrivacyConfig();
-    debug_console::printf("[gat562][cfg] save post-applyPrivacy\n");
+    platform::nrf52::debug_console::printf("[gat562][cfg] save post-applyPrivacy\n");
     applyChatDefaults();
     markPostSaveApplySkips(kSkipApplyMaskAll);
     ::boards::gat562_mesh_evb_pro::settings_store::queueSaveAppConfig(config_);
     config_save_pending_ = true;
-    debug_console::printf("[gat562][cfg] save deferred-store queued\n");
+    platform::nrf52::debug_console::printf("[gat562][cfg] save deferred-store queued\n");
 }
 
 void AppFacadeRuntime::applyMeshConfig()
@@ -454,10 +454,10 @@ bool AppFacadeRuntime::switchMeshProtocol(chat::MeshProtocol protocol, bool pers
 
     ScopedGpsSuspend suspend_gps(board_);
     const bool protocol_changed = (config_.mesh_protocol != protocol);
-    debug_console::printf("[gat562][cfg] switch proto=%u persist=%u changed=%u\n",
-                          static_cast<unsigned>(protocol),
-                          persist ? 1U : 0U,
-                          protocol_changed ? 1U : 0U);
+    platform::nrf52::debug_console::printf("[gat562][cfg] switch proto=%u persist=%u changed=%u\n",
+                                           static_cast<unsigned>(protocol),
+                                           persist ? 1U : 0U,
+                                           protocol_changed ? 1U : 0U);
     config_.mesh_protocol = protocol;
     ::boards::gat562_mesh_evb_pro::settings_store::cacheAppConfig(config_);
 
@@ -467,12 +467,12 @@ bool AppFacadeRuntime::switchMeshProtocol(chat::MeshProtocol protocol, bool pers
         if (::boards::gat562_mesh_evb_pro::settings_store::saveAppConfig(config_))
         {
             config_save_pending_ = ::boards::gat562_mesh_evb_pro::settings_store::hasDeferredSavePending();
-            debug_console::printf("[gat562][cfg] switch persist save=ok deferred=%u\n",
-                                  config_save_pending_ ? 1U : 0U);
+            platform::nrf52::debug_console::printf("[gat562][cfg] switch persist save=ok deferred=%u\n",
+                                                   config_save_pending_ ? 1U : 0U);
             if (protocol_changed)
             {
-                debug_console::printf("[gat562][cfg] switch persist rebooting for proto=%u\n",
-                                      static_cast<unsigned>(protocol));
+                platform::nrf52::debug_console::printf("[gat562][cfg] switch persist rebooting for proto=%u\n",
+                                                       static_cast<unsigned>(protocol));
                 restartDevice();
             }
         }
@@ -480,7 +480,7 @@ bool AppFacadeRuntime::switchMeshProtocol(chat::MeshProtocol protocol, bool pers
         {
             ::boards::gat562_mesh_evb_pro::settings_store::queueSaveAppConfig(config_);
             config_save_pending_ = true;
-            debug_console::printf("[gat562][cfg] switch persist save=deferred\n");
+            platform::nrf52::debug_console::printf("[gat562][cfg] switch persist save=deferred\n");
         }
     }
 
@@ -722,8 +722,8 @@ bool AppFacadeRuntime::consumePostSaveApplySkip(uint8_t bit, const char* label)
     }
 
     post_save_apply_skip_mask_ &= static_cast<uint8_t>(~bit);
-    debug_console::printf("[gat562][cfg] %s skipped: already applied in save\n",
-                          label ? label : "apply");
+    platform::nrf52::debug_console::printf("[gat562][cfg] %s skipped: already applied in save\n",
+                                           label ? label : "apply");
     return true;
 }
 
@@ -779,7 +779,7 @@ void AppFacadeRuntime::tickEventRuntime()
     const bool flushed = ::boards::gat562_mesh_evb_pro::settings_store::tickDeferredSave();
     if (flushed)
     {
-        debug_console::printf("[gat562][cfg] deferred-store flush ok\n");
+        platform::nrf52::debug_console::printf("[gat562][cfg] deferred-store flush ok\n");
     }
     config_save_pending_ = ::boards::gat562_mesh_evb_pro::settings_store::hasDeferredSavePending();
 }
@@ -820,4 +820,4 @@ const chat::runtime::EffectiveSelfIdentity& AppFacadeRuntime::effectiveIdentity(
     return effective_identity_;
 }
 
-} // namespace apps::gat562_mesh_evb_pro
+} // namespace trailmate::apps::nrf52_node
\ No newline at end of file
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/app_facade_runtime.h b/apps/nrf52_node/src/nrf52_node_app_facade_runtime.h
similarity index 95%
rename from apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/app_facade_runtime.h
rename to apps/nrf52_node/src/nrf52_node_app_facade_runtime.h
index e0f26372..a61903e5 100644
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/app_facade_runtime.h
+++ b/apps/nrf52_node/src/nrf52_node_app_facade_runtime.h
@@ -1,10 +1,11 @@
-#pragma once
+#pragma once
 
 #include "app/app_config.h"
 #include "app/app_facades.h"
 #include "ble/ble_manager.h"
 #include "chat/runtime/self_identity_policy.h"
 #include "chat/runtime/self_identity_provider.h"
+#include "platform/nrf52/runtime/nrf52_runtime_apply_service.h"
 
 #include <memory>
 
@@ -32,11 +33,9 @@ namespace boards::gat562_mesh_evb_pro
 class Gat562Board;
 }
 
-namespace apps::gat562_mesh_evb_pro
+namespace trailmate::apps::nrf52_node
 {
 
-class RuntimeApplyService;
-
 class AppFacadeRuntime final : public app::IAppBleFacade,
                                public ble::IBleRuntimeContext
 {
@@ -135,7 +134,7 @@ class AppFacadeRuntime final : public app::IAppBleFacade,
     std::unique_ptr<chat::IMeshAdapter> mesh_router_;
     std::unique_ptr<chat::ChatService> chat_service_;
     std::unique_ptr<ble::BleManager> ble_manager_;
-    std::unique_ptr<RuntimeApplyService> apply_service_;
+    std::unique_ptr<platform::nrf52::runtime::RuntimeApplyService> apply_service_;
     boards::gat562_mesh_evb_pro::Gat562Board* board_ = nullptr;
     chat::ui::IChatUiRuntime* chat_ui_runtime_ = nullptr;
     bool config_save_pending_ = false;
@@ -143,4 +142,4 @@ class AppFacadeRuntime final : public app::IAppBleFacade,
     uint32_t last_chat_store_flush_ms_ = 0;
 };
 
-} // namespace apps::gat562_mesh_evb_pro
+} // namespace trailmate::apps::nrf52_node
diff --git a/apps/gat562_mesh_evb_pro/src/app_runtime_access.cpp b/apps/nrf52_node/src/nrf52_node_app_runtime_access.cpp
similarity index 65%
rename from apps/gat562_mesh_evb_pro/src/app_runtime_access.cpp
rename to apps/nrf52_node/src/nrf52_node_app_runtime_access.cpp
index 9c2f6d38..6553b837 100644
--- a/apps/gat562_mesh_evb_pro/src/app_runtime_access.cpp
+++ b/apps/nrf52_node/src/nrf52_node_app_runtime_access.cpp
@@ -1,17 +1,17 @@
-#include "apps/gat562_mesh_evb_pro/app_runtime_access.h"
+#include "nrf52_node_app_runtime_access.h"
 
 #include <Arduino.h>
 #include <cstdlib>
 
 #include "app/app_facade_access.h"
-#include "apps/gat562_mesh_evb_pro/app_facade_runtime.h"
-#include "apps/gat562_mesh_evb_pro/debug_console.h"
-#include "apps/gat562_mesh_evb_pro/ui_runtime.h"
 #include "boards/gat562_mesh_evb_pro/gat562_board.h"
 #include "chat/ports/i_mesh_adapter.h"
+#include "nrf52_node_app_facade_runtime.h"
+#include "nrf52_node_ui_runtime.h"
 #include "platform/nrf52/arduino_common/chat/infra/radio_packet_io.h"
+#include "platform/nrf52/debug/nrf52_debug_console.h"
 
-namespace apps::gat562_mesh_evb_pro::app_runtime_access
+namespace trailmate::apps::nrf52_node::app_runtime_access
 {
 namespace
 {
@@ -41,7 +41,7 @@ bool initialize()
     s_status.app_facade_bound = runtime.initialize() && app::hasAppFacade();
     if (!s_status.app_facade_bound)
     {
-        debug_console::println("[gat562] app runtime init failed");
+        platform::nrf52::debug_console::println("[gat562] app runtime init failed");
     }
     return s_status.app_facade_bound;
 }
@@ -68,13 +68,13 @@ void tick()
             if (s_rx_packet_count <= 4 || (now_ms - s_last_rx_log_ms) >= 2000U)
             {
                 s_last_rx_log_ms = now_ms;
-                debug_console::printf("[gat562] rx raw #%lu len=%u rssi=%d.%01d snr=%d.%01d\n",
-                                      static_cast<unsigned long>(s_rx_packet_count),
-                                      static_cast<unsigned>(packet.size),
-                                      packet.rx_meta.rssi_dbm_x10 / 10,
-                                      decimalDigit(packet.rx_meta.rssi_dbm_x10 % 10),
-                                      packet.rx_meta.snr_db_x10 / 10,
-                                      decimalDigit(packet.rx_meta.snr_db_x10 % 10));
+                platform::nrf52::debug_console::printf("[gat562] rx raw #%lu len=%u rssi=%d.%01d snr=%d.%01d\n",
+                                                       static_cast<unsigned long>(s_rx_packet_count),
+                                                       static_cast<unsigned>(packet.size),
+                                                       packet.rx_meta.rssi_dbm_x10 / 10,
+                                                       decimalDigit(packet.rx_meta.rssi_dbm_x10 % 10),
+                                                       packet.rx_meta.snr_db_x10 / 10,
+                                                       decimalDigit(packet.rx_meta.snr_db_x10 % 10));
             }
             adapter->handleRawPacket(packet.data, packet.size);
         }
@@ -91,4 +91,4 @@ const Status& status()
     return s_status;
 }
 
-} // namespace apps::gat562_mesh_evb_pro::app_runtime_access
+} // namespace trailmate::apps::nrf52_node::app_runtime_access
\ No newline at end of file
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/app_runtime_access.h b/apps/nrf52_node/src/nrf52_node_app_runtime_access.h
similarity index 51%
rename from apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/app_runtime_access.h
rename to apps/nrf52_node/src/nrf52_node_app_runtime_access.h
index e8159540..c3bf9f73 100644
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/app_runtime_access.h
+++ b/apps/nrf52_node/src/nrf52_node_app_runtime_access.h
@@ -1,6 +1,6 @@
-#pragma once
+#pragma once
 
-namespace apps::gat562_mesh_evb_pro::app_runtime_access
+namespace trailmate::apps::nrf52_node::app_runtime_access
 {
 
 struct Status
@@ -13,4 +13,4 @@ bool initialize();
 void tick();
 const Status& status();
 
-} // namespace apps::gat562_mesh_evb_pro::app_runtime_access
+} // namespace trailmate::apps::nrf52_node::app_runtime_access
\ No newline at end of file
diff --git a/apps/nrf52_node/src/nrf52_node_app_shell.cpp b/apps/nrf52_node/src/nrf52_node_app_shell.cpp
new file mode 100644
index 00000000..c031ebdf
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_app_shell.cpp
@@ -0,0 +1,51 @@
+#include "nrf52_node_app_shell.h"
+
+#include "product_composition/target_ux_binding.h"
+
+#include <cstring>
+
+namespace trailmate
+{
+namespace apps
+{
+namespace nrf52_node
+{
+
+const Nrf52NodeAppShellConfig& Nrf52NodeAppShell::config() const
+{
+    return config_;
+}
+
+const char* Nrf52NodeAppShell::targetId() const
+{
+    return config_.target_id;
+}
+
+const product_composition::TargetProfile* Nrf52NodeAppShell::targetProfile() const
+{
+    return product_composition::findTargetProfile(targetId());
+}
+
+const char* Nrf52NodeAppShell::activeUxPackId() const
+{
+    const auto* binding = product_composition::findTargetUxBinding(targetId());
+    return binding != nullptr ? binding->active_ux_pack_id : nullptr;
+}
+
+bool Nrf52NodeAppShell::validate() const
+{
+    return config_.target_id != nullptr &&
+           targetProfile() != nullptr &&
+           product_composition::findTargetUxBinding(targetId()) != nullptr &&
+           config_.target_family != nullptr &&
+           config_.default_ux_pack_id != nullptr &&
+           std::strcmp(config_.default_ux_pack_id, activeUxPackId()) == 0 &&
+           config_.historical_generic_root_name != nullptr &&
+           config_.historical_board_root_name != nullptr &&
+           config_.historical_role != nullptr &&
+           config_.replacement_owner != nullptr;
+}
+
+} // namespace nrf52_node
+} // namespace apps
+} // namespace trailmate
diff --git a/apps/nrf52_node/src/nrf52_node_app_shell.h b/apps/nrf52_node/src/nrf52_node_app_shell.h
new file mode 100644
index 00000000..07452b55
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_app_shell.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "nrf52_historical_source_descriptor.h"
+
+#include "product_composition/target_profile.h"
+
+namespace trailmate
+{
+namespace apps
+{
+namespace nrf52_node
+{
+
+struct Nrf52NodeAppShellConfig
+{
+    const char* target_id = "gat562_mesh_evb_pro";
+    const char* target_family = "nrf52_node";
+    const char* default_ux_pack_id = "tiny_node_status";
+    const char* historical_generic_root_name =
+        nrf52HistoricalSourceDescriptor().historical_generic_root_name;
+    const char* historical_board_root_name =
+        nrf52HistoricalSourceDescriptor().historical_board_root_name;
+    const char* historical_role =
+        nrf52HistoricalSourceDescriptor().historical_role;
+    const char* replacement_owner =
+        nrf52HistoricalSourceDescriptor().replacement_owner;
+};
+
+class Nrf52NodeAppShell
+{
+  public:
+    const Nrf52NodeAppShellConfig& config() const;
+    const char* targetId() const;
+    const product_composition::TargetProfile* targetProfile() const;
+    const char* activeUxPackId() const;
+    bool validate() const;
+
+  private:
+    Nrf52NodeAppShellConfig config_{};
+};
+
+} // namespace nrf52_node
+} // namespace apps
+} // namespace trailmate
diff --git a/apps/nrf52_node/src/nrf52_node_arduino_entry.cpp b/apps/nrf52_node/src/nrf52_node_arduino_entry.cpp
new file mode 100644
index 00000000..968104ba
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_arduino_entry.cpp
@@ -0,0 +1,19 @@
+#include "nrf52_node_arduino_entry.h"
+
+#include "nrf52_node_loop_runtime.h"
+#include "nrf52_node_startup_runtime.h"
+
+namespace trailmate::apps::nrf52_node::arduino_entry
+{
+
+void setup()
+{
+    startup_runtime::run();
+}
+
+void loop()
+{
+    loop_runtime::tick();
+}
+
+} // namespace trailmate::apps::nrf52_node::arduino_entry
\ No newline at end of file
diff --git a/apps/nrf52_node/src/nrf52_node_arduino_entry.h b/apps/nrf52_node/src/nrf52_node_arduino_entry.h
new file mode 100644
index 00000000..b9a0af69
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_arduino_entry.h
@@ -0,0 +1,9 @@
+#pragma once
+
+namespace trailmate::apps::nrf52_node::arduino_entry
+{
+
+void setup();
+void loop();
+
+} // namespace trailmate::apps::nrf52_node::arduino_entry
\ No newline at end of file
diff --git a/apps/nrf52_node/src/nrf52_node_loop_runtime.cpp b/apps/nrf52_node/src/nrf52_node_loop_runtime.cpp
new file mode 100644
index 00000000..fbfd7e51
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_loop_runtime.cpp
@@ -0,0 +1,16 @@
+#include "nrf52_node_loop_runtime.h"
+
+#include <Arduino.h>
+
+#include "nrf52_node_app_runtime_access.h"
+
+namespace trailmate::apps::nrf52_node::loop_runtime
+{
+
+void tick()
+{
+    app_runtime_access::tick();
+    delay(2);
+}
+
+} // namespace trailmate::apps::nrf52_node::loop_runtime
\ No newline at end of file
diff --git a/apps/nrf52_node/src/nrf52_node_loop_runtime.h b/apps/nrf52_node/src/nrf52_node_loop_runtime.h
new file mode 100644
index 00000000..1e4e3f50
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_loop_runtime.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace trailmate::apps::nrf52_node::loop_runtime
+{
+
+void tick();
+
+} // namespace trailmate::apps::nrf52_node::loop_runtime
\ No newline at end of file
diff --git a/apps/nrf52_node/src/nrf52_node_runtime_config.cpp b/apps/nrf52_node/src/nrf52_node_runtime_config.cpp
new file mode 100644
index 00000000..ba0d4ffc
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_runtime_config.cpp
@@ -0,0 +1,29 @@
+#include "nrf52_node_runtime_config.h"
+
+namespace trailmate::apps::nrf52_node
+{
+namespace
+{
+
+#if defined(TRAIL_MATE_LORA_TX_POWER_MAX_DBM)
+constexpr std::int8_t kTargetLoraTxPowerMaxDbm =
+    TRAIL_MATE_LORA_TX_POWER_MAX_DBM;
+#else
+constexpr std::int8_t kTargetLoraTxPowerMaxDbm = 0;
+#endif
+
+const Nrf52NodeRuntimeConfig kRuntimeConfig{
+    "gat562_mesh_evb_pro",
+    product_composition::findTargetProfile("gat562_mesh_evb_pro"),
+    kTargetLoraTxPowerMaxDbm,
+    true,
+};
+
+} // namespace
+
+const Nrf52NodeRuntimeConfig& runtimeConfig()
+{
+    return kRuntimeConfig;
+}
+
+} // namespace trailmate::apps::nrf52_node
diff --git a/apps/nrf52_node/src/nrf52_node_runtime_config.h b/apps/nrf52_node/src/nrf52_node_runtime_config.h
new file mode 100644
index 00000000..2f53b626
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_runtime_config.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "product_composition/target_profile.h"
+
+#include <cstdint>
+
+namespace trailmate::apps::nrf52_node
+{
+
+struct Nrf52NodeRuntimeConfig
+{
+    const char* target_id = "gat562_mesh_evb_pro";
+    const product_composition::TargetProfile* target_profile = nullptr;
+    std::int8_t lora_tx_power_max_dbm = 0;
+    bool ble_enabled_by_default = true;
+};
+
+const Nrf52NodeRuntimeConfig& runtimeConfig();
+
+} // namespace trailmate::apps::nrf52_node
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/self_identity_provider.h b/apps/nrf52_node/src/nrf52_node_self_identity_provider.h
similarity index 61%
rename from apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/self_identity_provider.h
rename to apps/nrf52_node/src/nrf52_node_self_identity_provider.h
index dc88d858..7edb161f 100644
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/self_identity_provider.h
+++ b/apps/nrf52_node/src/nrf52_node_self_identity_provider.h
@@ -1,10 +1,10 @@
-#pragma once
+#pragma once
 
 #include "platform/nrf52/arduino_common/self_identity_bridge.h"
 
-namespace apps::gat562_mesh_evb_pro
+namespace trailmate::apps::nrf52_node
 {
 
 using SelfIdentityProvider = platform::nrf52::arduino_common::SelfIdentityBridge;
 
-} // namespace apps::gat562_mesh_evb_pro
+} // namespace trailmate::apps::nrf52_node
\ No newline at end of file
diff --git a/apps/gat562_mesh_evb_pro/src/startup_runtime.cpp b/apps/nrf52_node/src/nrf52_node_startup_runtime.cpp
similarity index 65%
rename from apps/gat562_mesh_evb_pro/src/startup_runtime.cpp
rename to apps/nrf52_node/src/nrf52_node_startup_runtime.cpp
index 5c5ea5c4..55a8cd24 100644
--- a/apps/gat562_mesh_evb_pro/src/startup_runtime.cpp
+++ b/apps/nrf52_node/src/nrf52_node_startup_runtime.cpp
@@ -1,22 +1,22 @@
-#include "apps/gat562_mesh_evb_pro/startup_runtime.h"
+#include "nrf52_node_startup_runtime.h"
 
 #include <Arduino.h>
 
-#include "apps/gat562_mesh_evb_pro/app_facade_runtime.h"
-#include "apps/gat562_mesh_evb_pro/app_runtime_access.h"
-#include "apps/gat562_mesh_evb_pro/debug_console.h"
-#include "apps/gat562_mesh_evb_pro/ui_runtime.h"
 #include "boards/gat562_mesh_evb_pro/gat562_board.h"
+#include "nrf52_node_app_facade_runtime.h"
+#include "nrf52_node_app_runtime_access.h"
+#include "nrf52_node_ui_runtime.h"
+#include "platform/nrf52/debug/nrf52_debug_console.h"
 #include "sys/clock.h"
 
-namespace apps::gat562_mesh_evb_pro::startup_runtime
+namespace trailmate::apps::nrf52_node::startup_runtime
 {
 
 void run()
 {
-    debug_console::begin();
-    debug_console::println();
-    debug_console::println("[gat562] startup begin");
+    platform::nrf52::debug_console::begin();
+    platform::nrf52::debug_console::println();
+    platform::nrf52::debug_console::println("[gat562] startup begin");
     auto& board = ::boards::gat562_mesh_evb_pro::Gat562Board::instance();
     (void)board.begin();
     sys::set_millis_provider([]() -> uint32_t
@@ -31,7 +31,7 @@ void run()
 
     (void)board.bindRadioIo();
     const bool lora_ok = board.beginRadioIo();
-    debug_console::println(lora_ok ? "[gat562] startup lora io ok" : "[gat562] startup lora io failed");
+    platform::nrf52::debug_console::println(lora_ok ? "[gat562] startup lora io ok" : "[gat562] startup lora io failed");
     ui_runtime::appendBootLog(lora_ok ? "lora io ok" : "lora io fail");
 
     if (app_runtime_access::initialize())
@@ -39,7 +39,7 @@ void run()
         auto& cfg = AppFacadeRuntime::instance().getConfig();
         ui_runtime::bindChatObservers();
         (void)board.startGpsRuntime(cfg);
-        debug_console::println("[gat562] startup app facade ok");
+        platform::nrf52::debug_console::println("[gat562] startup app facade ok");
         ui_runtime::appendBootLog("app/gps ok");
         char freq_text[20] = {};
         if (board.formatLoraFrequencyMHz(board.activeLoraFrequencyHz(), freq_text, sizeof(freq_text)))
@@ -50,9 +50,9 @@ void run()
     }
     else
     {
-        debug_console::println("[gat562] startup app facade failed");
+        platform::nrf52::debug_console::println("[gat562] startup app facade failed");
         ui_runtime::appendBootLog("app init fail");
     }
 }
 
-} // namespace apps::gat562_mesh_evb_pro::startup_runtime
+} // namespace trailmate::apps::nrf52_node::startup_runtime
\ No newline at end of file
diff --git a/apps/nrf52_node/src/nrf52_node_startup_runtime.h b/apps/nrf52_node/src/nrf52_node_startup_runtime.h
new file mode 100644
index 00000000..1ec6b125
--- /dev/null
+++ b/apps/nrf52_node/src/nrf52_node_startup_runtime.h
@@ -0,0 +1,8 @@
+#pragma once
+
+namespace trailmate::apps::nrf52_node::startup_runtime
+{
+
+void run();
+
+} // namespace trailmate::apps::nrf52_node::startup_runtime
\ No newline at end of file
diff --git a/apps/gat562_mesh_evb_pro/src/ui_runtime.cpp b/apps/nrf52_node/src/nrf52_node_ui_runtime.cpp
similarity index 93%
rename from apps/gat562_mesh_evb_pro/src/ui_runtime.cpp
rename to apps/nrf52_node/src/nrf52_node_ui_runtime.cpp
index 1a6077d0..ffabb626 100644
--- a/apps/gat562_mesh_evb_pro/src/ui_runtime.cpp
+++ b/apps/nrf52_node/src/nrf52_node_ui_runtime.cpp
@@ -1,9 +1,9 @@
-#include "apps/gat562_mesh_evb_pro/ui_runtime.h"
+#include "nrf52_node_ui_runtime.h"
 
-#include "apps/gat562_mesh_evb_pro/app_facade_runtime.h"
-#include "apps/gat562_mesh_evb_pro/debug_console.h"
 #include "boards/gat562_mesh_evb_pro/gat562_board.h"
+#include "nrf52_node_app_facade_runtime.h"
 #include "platform/nrf52/arduino_common/internal_fs_utils.h"
+#include "platform/nrf52/debug/nrf52_debug_console.h"
 #include "platform/ui/device_runtime.h"
 #include "platform/ui/gps_runtime.h"
 #include "platform/ui/time_runtime.h"
@@ -16,7 +16,7 @@
 #include <ctime>
 #include <malloc.h>
 
-namespace apps::gat562_mesh_evb_pro::ui_runtime
+namespace trailmate::apps::nrf52_node::ui_runtime
 {
 namespace
 {
@@ -219,7 +219,7 @@ bool initialize()
                                             callbacks);
     s_runtime = &runtime;
     const bool ok = s_runtime->begin();
-    debug_console::printf("[gat562] ui init display=%s\n", ok ? "ok" : "fail");
+    platform::nrf52::debug_console::printf("[gat562] ui init display=%s\n", ok ? "ok" : "fail");
     return ok;
 }
 
@@ -253,7 +253,7 @@ void showDisplayProbe()
 {
     if (!initialize())
     {
-        debug_console::println("[gat562] display probe skipped: ui init failed");
+        platform::nrf52::debug_console::println("[gat562] display probe skipped: ui init failed");
         return;
     }
     if (s_probe_drawn)
@@ -264,8 +264,8 @@ void showDisplayProbe()
     auto& display = ::boards::gat562_mesh_evb_pro::Gat562Board::instance().monoDisplay();
     drawProbePattern(display, platform::nrf52::ui::fonts::fusion_pixel_8_font());
     s_probe_drawn = true;
-    debug_console::println("[gat562] display probe rendered");
+    platform::nrf52::debug_console::println("[gat562] display probe rendered");
     delay(kProbeHoldMs);
 }
 
-} // namespace apps::gat562_mesh_evb_pro::ui_runtime
+} // namespace trailmate::apps::nrf52_node::ui_runtime
\ No newline at end of file
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/ui_runtime.h b/apps/nrf52_node/src/nrf52_node_ui_runtime.h
similarity index 66%
rename from apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/ui_runtime.h
rename to apps/nrf52_node/src/nrf52_node_ui_runtime.h
index ac06c19c..fd08e120 100644
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/ui_runtime.h
+++ b/apps/nrf52_node/src/nrf52_node_ui_runtime.h
@@ -1,8 +1,8 @@
-#pragma once
+#pragma once
 
 #include "boards/gat562_mesh_evb_pro/gat562_board.h"
 
-namespace apps::gat562_mesh_evb_pro::ui_runtime
+namespace trailmate::apps::nrf52_node::ui_runtime
 {
 bool initialize();
 void bindChatObservers();
@@ -10,4 +10,4 @@ void appendBootLog(const char* line);
 void tick(const boards::gat562_mesh_evb_pro::BoardInputEvent* event);
 void showDisplayProbe();
 
-} // namespace apps::gat562_mesh_evb_pro::ui_runtime
+} // namespace trailmate::apps::nrf52_node::ui_runtime
\ No newline at end of file
diff --git a/apps/nrf52_node/tests/nrf52_historical_source_descriptor_smoke.cpp b/apps/nrf52_node/tests/nrf52_historical_source_descriptor_smoke.cpp
new file mode 100644
index 00000000..b8417f2c
--- /dev/null
+++ b/apps/nrf52_node/tests/nrf52_historical_source_descriptor_smoke.cpp
@@ -0,0 +1,20 @@
+#include "nrf52_historical_source_descriptor.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    const auto& descriptor =
+        trailmate::apps::nrf52_node::nrf52HistoricalSourceDescriptor();
+
+    assert(std::strcmp(descriptor.historical_generic_root_name,
+                       "removed root esp_pio") == 0);
+    assert(std::strcmp(descriptor.historical_board_root_name,
+                       "removed root gat562_mesh_evb_pro") == 0);
+    assert(std::strcmp(descriptor.historical_role,
+                       "pre-refactor PlatformIO/nRF52 implementation roots") == 0);
+    assert(std::strcmp(descriptor.replacement_owner,
+                       "apps/nrf52_node + builds/pio_nrf52 + boards/gat562_mesh_evb_pro") == 0);
+    return 0;
+}
diff --git a/apps/nrf52_node/tests/nrf52_node_app_shell_smoke.cpp b/apps/nrf52_node/tests/nrf52_node_app_shell_smoke.cpp
new file mode 100644
index 00000000..7e0b431f
--- /dev/null
+++ b/apps/nrf52_node/tests/nrf52_node_app_shell_smoke.cpp
@@ -0,0 +1,28 @@
+#include "nrf52_node_app_shell.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    trailmate::apps::nrf52_node::Nrf52NodeAppShell shell;
+    assert(shell.validate());
+
+    const auto& config = shell.config();
+    assert(std::strcmp(config.target_id, "gat562_mesh_evb_pro") == 0);
+    assert(std::strcmp(shell.targetId(), "gat562_mesh_evb_pro") == 0);
+    assert(std::strcmp(config.target_family, "nrf52_node") == 0);
+    assert(std::strcmp(config.default_ux_pack_id, "tiny_node_status") == 0);
+    assert(std::strcmp(shell.activeUxPackId(), "tiny_node_status") == 0);
+    assert(shell.targetProfile() != nullptr);
+    assert(shell.targetProfile()->renderer == product_composition::TargetRenderer::Headless);
+    assert(std::strcmp(config.historical_generic_root_name,
+                       "removed root esp_pio") == 0);
+    assert(std::strcmp(config.historical_board_root_name,
+                       "removed root gat562_mesh_evb_pro") == 0);
+    assert(std::strcmp(config.historical_role,
+                       "pre-refactor PlatformIO/nRF52 implementation roots") == 0);
+    assert(std::strcmp(config.replacement_owner,
+                       "apps/nrf52_node + builds/pio_nrf52 + boards/gat562_mesh_evb_pro") == 0);
+    return 0;
+}
diff --git a/apps/nrf52_node/tests/nrf52_node_runtime_config_smoke.cpp b/apps/nrf52_node/tests/nrf52_node_runtime_config_smoke.cpp
new file mode 100644
index 00000000..96edc8af
--- /dev/null
+++ b/apps/nrf52_node/tests/nrf52_node_runtime_config_smoke.cpp
@@ -0,0 +1,11 @@
+#include "nrf52_node_runtime_config.h"
+
+#include <cassert>
+
+int main()
+{
+    const auto& config = trailmate::apps::nrf52_node::runtimeConfig();
+    assert(config.target_id != nullptr);
+    assert(config.target_profile != nullptr);
+    return 0;
+}
diff --git a/boards/cardputerzero/BOARD.md b/boards/cardputerzero/BOARD.md
new file mode 100644
index 00000000..4646662c
--- /dev/null
+++ b/boards/cardputerzero/BOARD.md
@@ -0,0 +1,23 @@
+# Cardputer Zero Board Facts
+
+Sources:
+
+- `docs/LINUX_ADAPTATION_GUIDE.md`
+- `docs/targets/linux_targets.md`
+- `platform/linux/common/src/core/display_profile.h`
+
+This record describes current repo evidence for the Linux Cardputer Zero route.
+
+## Identity
+
+- board id: `cardputerzero`
+- current build entry evidence: `builds/linux_cmake`
+- current implementation evidence: `removed root linux_rpi`
+- current shared Linux code: `platform/linux/common`
+
+## Confirmed Facts
+
+- logical display size used by current common Linux shell: 320 x 170
+- keyboard input is required but real device key mapping still needs sampling
+- display/input ownership for the real Pi OS path is not yet closed
+- current final shell is not proven as a dedicated app directory in this repo
diff --git a/boards/cardputerzero/board_facts.h b/boards/cardputerzero/board_facts.h
new file mode 100644
index 00000000..5e8f0c3b
--- /dev/null
+++ b/boards/cardputerzero/board_facts.h
@@ -0,0 +1,28 @@
+#pragma once
+
+namespace boards::cardputerzero
+{
+
+struct CardputerZeroBoardFacts
+{
+    const char* board_id = "cardputerzero";
+    const char* platform_family = "linux";
+    const char* current_route_evidence = "docs/targets/linux_targets.md";
+
+    bool display_present = true;
+    int logical_display_width = 320;
+    int logical_display_height = 170;
+    const char* logical_display_source = "platform/linux/common/src/core/display_profile.h";
+    bool keyboard_present = true;
+    const char* keyboard_mapping_state = "needs_real_device_sampling";
+    bool pointer_present = false;
+    bool touch_present = false;
+    bool trackball_present = false;
+    const char* lora_state = "not_established_in_final_owner";
+    const char* gps_state = "not_established_in_final_owner";
+    bool posix_filesystem_present = true;
+};
+
+inline constexpr CardputerZeroBoardFacts kBoardFacts{};
+
+} // namespace boards::cardputerzero
diff --git a/boards/gat562_mesh_evb_pro/BOARD.md b/boards/gat562_mesh_evb_pro/BOARD.md
new file mode 100644
index 00000000..8451e6f2
--- /dev/null
+++ b/boards/gat562_mesh_evb_pro/BOARD.md
@@ -0,0 +1,67 @@
+# GAT562 Mesh EVB Pro Board Facts
+
+This board fact record is derived from:
+
+- `docs/boards/gat562.board.yaml`
+- `boards/gat562_mesh_evb_pro/include/boards/gat562_mesh_evb_pro/board_profile.h`
+
+It records hardware facts only. It does not choose product presentation,
+protocol behavior, debug console behavior, or runtime service.
+
+## Identity
+
+- board package: `boards/gat562_mesh_evb_pro`
+- board id used by existing board YAML: `gat562`
+- product identity strings in `kBoardProfile`: `GAT562`
+- platform family in board YAML: `nrf52`
+
+## Display
+
+- display present: yes
+- display size: 128 x 64
+- display driver: SSD1306
+- display bus: I2C
+- I2C address: `0x3C`
+- I2C SDA pin: `13`
+- I2C SCL pin: `14`
+
+## Input
+
+- touch: no
+- keyboard: no
+- buttons: yes
+- joystick: yes
+- primary button pin: `9`
+- secondary button pin: `12`
+- joystick up/down/left/right/press pins: `28`, `4`, `30`, `31`, `26`
+
+## Radio And GNSS Hardware
+
+- LoRa present: yes
+- LoRa chip recorded by board YAML: `sx1262`
+- LoRa SPI pins SCK/MISO/MOSI/CS: `43`, `45`, `44`, `42`
+- LoRa reset/busy/DIO1/power-enable pins: `38`, `46`, `47`, `37`
+- GNSS present: yes
+- GNSS UART RX/TX/PPS pins: `15`, `16`, `17`
+- GNSS baud rate: `9600`
+
+## Power And Storage
+
+- battery ADC pin: `5`
+- peripheral 3V3 enable pin: `34`
+- internal flash present: yes
+- SD card present: no
+- max flash size recorded by `kBoardProfile`: `815104`
+- max RAM size recorded by `kBoardProfile`: `248832`
+- bootloader settings address recorded by `kBoardProfile`: `0xFF000`
+
+## Non-Facts
+
+These remain outside board facts:
+
+- protocol factory selection
+- runtime apply service behavior
+- debug console behavior
+- presentation page state
+- product presentation package selection
+- draw path selection
diff --git a/boards/gat562_mesh_evb_pro/board_facts.h b/boards/gat562_mesh_evb_pro/board_facts.h
new file mode 100644
index 00000000..145d0e1a
--- /dev/null
+++ b/boards/gat562_mesh_evb_pro/board_facts.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <cstdint>
+
+namespace boards::gat562_mesh_evb_pro
+{
+
+struct Gat562BoardFacts
+{
+    const char* board_package = "boards/gat562_mesh_evb_pro";
+    const char* board_id = "gat562";
+    const char* platform_family = "nrf52";
+    const char* product_name = "GAT562";
+
+    bool display_present = true;
+    int display_width = 128;
+    int display_height = 64;
+    const char* display_driver = "ssd1306";
+    int display_i2c_sda_pin = 13;
+    int display_i2c_scl_pin = 14;
+    std::uint8_t display_i2c_address = 0x3C;
+
+    bool touch_present = false;
+    bool keyboard_present = false;
+    bool buttons_present = true;
+    bool joystick_present = true;
+    int button_primary_pin = 9;
+    int button_secondary_pin = 12;
+    int joystick_up_pin = 28;
+    int joystick_down_pin = 4;
+    int joystick_left_pin = 30;
+    int joystick_right_pin = 31;
+    int joystick_press_pin = 26;
+
+    bool lora_present = true;
+    const char* lora_chip = "sx1262";
+    int lora_sck_pin = 43;
+    int lora_miso_pin = 45;
+    int lora_mosi_pin = 44;
+    int lora_cs_pin = 42;
+    int lora_reset_pin = 38;
+    int lora_busy_pin = 46;
+    int lora_dio1_pin = 47;
+    int lora_power_enable_pin = 37;
+
+    bool gnss_present = true;
+    int gnss_uart_rx_pin = 15;
+    int gnss_uart_tx_pin = 16;
+    int gnss_pps_pin = 17;
+    std::uint32_t gnss_baud_rate = 9600;
+
+    bool sd_card_present = false;
+    bool internal_flash_present = true;
+    int battery_adc_pin = 5;
+    int peripheral_3v3_enable_pin = 34;
+    std::uint32_t max_flash_size = 815104;
+    std::uint32_t max_ram_size = 248832;
+    std::uint32_t bootloader_settings_addr = 0xFF000;
+};
+
+inline constexpr Gat562BoardFacts kBoardFacts{};
+
+} // namespace boards::gat562_mesh_evb_pro
diff --git a/boards/tab5/BOARD.md b/boards/tab5/BOARD.md
new file mode 100644
index 00000000..25017592
--- /dev/null
+++ b/boards/tab5/BOARD.md
@@ -0,0 +1,28 @@
+# Tab5 Board Facts
+
+Sources:
+
+- `boards/tab5/include/boards/tab5/board_profile.h`
+- `boards/tab5/src/tab5_board.cpp`
+
+This record describes hardware facts only.
+
+## Identity
+
+- board package: `boards/tab5`
+- board id: `tab5`
+- platform family: `esp32`
+- product name: `Trail Mate Tab5`
+
+## Confirmed Facts
+
+- display present: yes
+- display dimensions: not recorded in the current board profile
+- touch present: yes
+- keyboard present: no
+- audio present: yes
+- SD card present: yes
+- GPS UART present: yes
+- RS485 UART present: yes
+- LoRa present: yes
+- M5-Bus LoRa module routing present: yes
diff --git a/boards/tab5/board_facts.h b/boards/tab5/board_facts.h
new file mode 100644
index 00000000..426cb49d
--- /dev/null
+++ b/boards/tab5/board_facts.h
@@ -0,0 +1,39 @@
+#pragma once
+
+namespace boards::tab5
+{
+
+struct Tab5BoardFacts
+{
+    const char* board_package = "boards/tab5";
+    const char* board_id = "tab5";
+    const char* platform_family = "esp32";
+    const char* product_name = "Trail Mate Tab5";
+
+    bool display_present = true;
+    int display_width = 0;
+    int display_height = 0;
+    const char* display_size_source = "repo_evidence_pending";
+    bool touch_present = true;
+    bool keyboard_present = false;
+    bool trackball_present = false;
+    bool audio_present = true;
+    bool sd_card_present = true;
+    bool gps_uart_present = true;
+    bool rs485_uart_present = true;
+    bool lora_present = true;
+    bool m5bus_lora_module_routing_present = true;
+
+    int sys_i2c_sda_pin = 31;
+    int sys_i2c_scl_pin = 32;
+    int ext_i2c_sda_pin = 53;
+    int ext_i2c_scl_pin = 54;
+    int gps_uart_tx_pin = 6;
+    int gps_uart_rx_pin = 7;
+    int lcd_backlight_pin = 22;
+    int touch_interrupt_pin = 23;
+};
+
+inline constexpr Tab5BoardFacts kBoardFacts{};
+
+} // namespace boards::tab5
diff --git a/boards/tdeck/BOARD.md b/boards/tdeck/BOARD.md
new file mode 100644
index 00000000..cffff05b
--- /dev/null
+++ b/boards/tdeck/BOARD.md
@@ -0,0 +1,29 @@
+# T-Deck Board Facts
+
+Source:
+
+- `docs/boards/t-deck.board.yaml`
+
+This record describes hardware facts only.
+
+## Identity
+
+- board package: `boards/tdeck`
+- board id: `tdeck`
+- board id in YAML: `t_deck`
+- platform family: `esp32`
+
+## Confirmed Facts
+
+- display present: yes
+- display size: 320 x 240
+- display driver: ST7789
+- keyboard present: yes
+- buttons present: yes
+- touch present: yes
+- trackball present: yes
+- rotary encoder present: no
+- LoRa present: yes
+- GPS present: yes
+- SD card present: yes
+- audio codec present: yes
diff --git a/boards/tdeck/board_facts.h b/boards/tdeck/board_facts.h
new file mode 100644
index 00000000..26f7852a
--- /dev/null
+++ b/boards/tdeck/board_facts.h
@@ -0,0 +1,33 @@
+#pragma once
+
+namespace boards::tdeck
+{
+
+struct TDeckBoardFacts
+{
+    const char* board_package = "boards/tdeck";
+    const char* board_id = "tdeck";
+    const char* documented_board_id = "t_deck";
+    const char* platform_family = "esp32";
+
+    bool display_present = true;
+    int display_width = 320;
+    int display_height = 240;
+    const char* display_driver = "st7789";
+    bool touch_present = true;
+    bool keyboard_present = true;
+    bool buttons_present = true;
+    bool rotary_encoder_present = false;
+    bool trackball_present = true;
+    bool lora_present = true;
+    const char* lora_chip = "sx1262";
+    bool gps_present = true;
+    bool sd_card_present = true;
+    bool audio_codec_present = true;
+    const char* rtc_state = "unknown";
+    const char* motion_sensor_state = "unknown";
+};
+
+inline constexpr TDeckBoardFacts kBoardFacts{};
+
+} // namespace boards::tdeck
diff --git a/boards/tdisplayp4/BOARD.md b/boards/tdisplayp4/BOARD.md
new file mode 100644
index 00000000..db92fead
--- /dev/null
+++ b/boards/tdisplayp4/BOARD.md
@@ -0,0 +1,27 @@
+# T-Display P4 Board Facts
+
+Sources:
+
+- `boards/t_display_p4/include/boards/t_display_p4/board_profile.h`
+- `boards/t_display_p4/src/t_display_p4_board.cpp`
+
+This record describes hardware facts only.
+
+## Identity
+
+- board package: `boards/t_display_p4`
+- final facts directory: `boards/tdisplayp4`
+- board id: `tdisplayp4`
+- platform family: `esp32`
+- product name: `TrailMate P4`
+
+## Confirmed Facts
+
+- HI8561 panel size: 540 x 1168
+- RM69A10 panel size: 568 x 1232
+- touch present: yes
+- audio present: yes
+- SD card present: yes
+- GPS UART present: yes
+- LoRa present: yes
+- keyboard present: no
diff --git a/boards/tdisplayp4/board_facts.h b/boards/tdisplayp4/board_facts.h
new file mode 100644
index 00000000..aebfc697
--- /dev/null
+++ b/boards/tdisplayp4/board_facts.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <cstdint>
+
+namespace boards::tdisplayp4
+{
+
+struct TDisplayP4BoardFacts
+{
+    const char* board_package = "boards/t_display_p4";
+    const char* board_id = "tdisplayp4";
+    const char* platform_family = "esp32";
+    const char* product_name = "TrailMate P4";
+
+    bool display_present = true;
+    int hi8561_width = 540;
+    int hi8561_height = 1168;
+    int rm69a10_width = 568;
+    int rm69a10_height = 1232;
+    bool touch_present = true;
+    bool keyboard_present = false;
+    bool trackball_present = false;
+    bool audio_present = true;
+    bool sd_card_present = true;
+    bool gps_uart_present = true;
+    bool lora_present = true;
+
+    int sys_i2c_sda_pin = 7;
+    int sys_i2c_scl_pin = 8;
+    int ext_i2c_sda_pin = 20;
+    int ext_i2c_scl_pin = 21;
+    int gps_uart_tx_pin = 22;
+    int gps_uart_rx_pin = 23;
+    std::uint16_t hi8561_touch_address = 0x68;
+    std::uint16_t rm69a10_touch_address = 0x5D;
+};
+
+inline constexpr TDisplayP4BoardFacts kBoardFacts{};
+
+} // namespace boards::tdisplayp4
diff --git a/boards/tlora_pager/BOARD.md b/boards/tlora_pager/BOARD.md
new file mode 100644
index 00000000..2902b2a3
--- /dev/null
+++ b/boards/tlora_pager/BOARD.md
@@ -0,0 +1,33 @@
+# T-LoRa Pager Board Facts
+
+Source:
+
+- `docs/boards/t-lora-pager.board.yaml`
+
+This record describes hardware facts only.
+
+## Identity
+
+- board package: `boards/tlora_pager`
+- board id: `tlora_pager`
+- board id in YAML: `t_lora_pager`
+- platform family: `esp32`
+
+## Confirmed Facts
+
+- display present: yes
+- physical display size: 222 x 480
+- current build logical size: 480 x 222
+- display driver: ST7796
+- keyboard present: yes
+- buttons present: yes
+- touch present: no
+- rotary encoder present: yes
+- trackball present: no
+- LoRa present: yes
+- GPS present: yes
+- SD card present: yes
+- audio codec present: yes
+- motion sensor present: yes
+- RTC present: yes
+- NFC present: yes
diff --git a/boards/tlora_pager/board_facts.h b/boards/tlora_pager/board_facts.h
new file mode 100644
index 00000000..e5d3416b
--- /dev/null
+++ b/boards/tlora_pager/board_facts.h
@@ -0,0 +1,36 @@
+#pragma once
+
+namespace boards::tlora_pager
+{
+
+struct TLoRaPagerBoardFacts
+{
+    const char* board_package = "boards/tlora_pager";
+    const char* board_id = "tlora_pager";
+    const char* documented_board_id = "t_lora_pager";
+    const char* platform_family = "esp32";
+
+    bool display_present = true;
+    int display_width = 222;
+    int display_height = 480;
+    int logical_width = 480;
+    int logical_height = 222;
+    const char* display_driver = "st7796";
+    bool touch_present = false;
+    bool keyboard_present = true;
+    bool buttons_present = true;
+    bool rotary_encoder_present = true;
+    bool trackball_present = false;
+    bool lora_present = true;
+    const char* lora_chip = "sx1262";
+    bool gps_present = true;
+    bool sd_card_present = true;
+    bool audio_codec_present = true;
+    bool motion_sensor_present = true;
+    bool rtc_present = true;
+    bool nfc_present = true;
+};
+
+inline constexpr TLoRaPagerBoardFacts kBoardFacts{};
+
+} // namespace boards::tlora_pager
diff --git a/boards/tlora_pager/include/boards/tlora_pager/tlora_pager_board.h b/boards/tlora_pager/include/boards/tlora_pager/tlora_pager_board.h
index 361b074d..a1739945 100644
--- a/boards/tlora_pager/include/boards/tlora_pager/tlora_pager_board.h
+++ b/boards/tlora_pager/include/boards/tlora_pager/tlora_pager_board.h
@@ -471,8 +471,6 @@ class TLoRaPagerBoard : public BoardBase,
 
 #if defined(ARDUINO_LILYGO_LORA_SX1262)
     SX1262Access radio_ = newModule();
-#elif defined(ARDUINO_LILYGO_LORA_SX1280)
-    SX1280 radio_ = newModule();
 #elif defined(ARDUINO_LILYGO_LORA_CC1101)
     CC1101 radio_ = newModule();
 #elif defined(ARDUINO_LILYGO_LORA_LR1121)
diff --git a/boards/twatch/BOARD.md b/boards/twatch/BOARD.md
new file mode 100644
index 00000000..cb5c67eb
--- /dev/null
+++ b/boards/twatch/BOARD.md
@@ -0,0 +1,29 @@
+# T-Watch S3 Board Facts
+
+Sources:
+
+- `boards/lilygo-t-watch-s3.json`
+- `variants/lilygo_twatch_s3/envs/lilygo_twatch_s3.ini`
+- `boards/twatchs3/include/boards/twatchs3/twatchs3_board.h`
+
+This record describes hardware facts only.
+
+## Identity
+
+- board package: `boards/twatchs3`
+- final facts directory: `boards/twatch`
+- board id: `twatch`
+- platform family: `esp32`
+- product name: `LilyGo T-Watch-S3`
+
+## Confirmed Facts
+
+- display present: yes
+- display size: 240 x 240
+- display driver define: `DISPLAY_DRIVER_ST7789V2`
+- touch present: yes
+- keyboard present: no
+- SD card present: no
+- GPS present: no
+- LoRa present: yes
+- PSRAM present: yes
diff --git a/boards/twatch/board_facts.h b/boards/twatch/board_facts.h
new file mode 100644
index 00000000..c0d9acb9
--- /dev/null
+++ b/boards/twatch/board_facts.h
@@ -0,0 +1,28 @@
+#pragma once
+
+namespace boards::twatch
+{
+
+struct TWatchBoardFacts
+{
+    const char* board_package = "boards/twatchs3";
+    const char* board_id = "twatch";
+    const char* platform_family = "esp32";
+    const char* product_name = "LilyGo T-Watch-S3";
+
+    bool display_present = true;
+    int display_width = 240;
+    int display_height = 240;
+    const char* display_driver_define = "DISPLAY_DRIVER_ST7789V2";
+    bool touch_present = true;
+    bool keyboard_present = false;
+    bool trackball_present = false;
+    bool sd_card_present = false;
+    bool gps_present = false;
+    bool lora_present = true;
+    bool psram_present = true;
+};
+
+inline constexpr TWatchBoardFacts kBoardFacts{};
+
+} // namespace boards::twatch
diff --git a/boards/uconsole/BOARD.md b/boards/uconsole/BOARD.md
new file mode 100644
index 00000000..078378ee
--- /dev/null
+++ b/boards/uconsole/BOARD.md
@@ -0,0 +1,25 @@
+# uConsole AIO2 Board Facts
+
+Source:
+
+- `docs/boards/uconsole-aio2.board.yaml`
+
+This record describes Linux-visible hardware and endpoint facts only.
+
+## Identity
+
+- board package: `platform/linux/uconsole`
+- board id: `uconsole`
+- documented board id: `uconsole_aio2`
+- platform family: `linux`
+
+## Confirmed Facts
+
+- display present: yes
+- display size: host window or framebuffer
+- input keyboard present: yes
+- pointer present: yes
+- touch state: host dependent
+- LoRa endpoint state: optional
+- GPS endpoint state: optional
+- filesystem: POSIX
diff --git a/boards/uconsole/board_facts.h b/boards/uconsole/board_facts.h
new file mode 100644
index 00000000..e08877b5
--- /dev/null
+++ b/boards/uconsole/board_facts.h
@@ -0,0 +1,30 @@
+#pragma once
+
+namespace boards::uconsole
+{
+
+struct UConsoleBoardFacts
+{
+    const char* board_package = "platform/linux/uconsole";
+    const char* board_id = "uconsole";
+    const char* documented_board_id = "uconsole_aio2";
+    const char* platform_family = "linux";
+
+    bool display_present = true;
+    int display_width = 0;
+    int display_height = 0;
+    const char* display_geometry_source = "host_window_or_framebuffer";
+    bool keyboard_present = true;
+    bool pointer_present = true;
+    const char* touch_state = "host_dependent";
+    bool trackball_present = false;
+    const char* lora_state = "optional";
+    const char* lora_default_spi = "/dev/spidev1.0";
+    const char* gps_state = "optional";
+    const char* gps_device_source = "/dev/serial/by-id_or_env_override";
+    bool posix_filesystem_present = true;
+};
+
+inline constexpr UConsoleBoardFacts kBoardFacts{};
+
+} // namespace boards::uconsole
diff --git a/builds/README.md b/builds/README.md
new file mode 100644
index 00000000..108d335d
--- /dev/null
+++ b/builds/README.md
@@ -0,0 +1,35 @@
+# Build Entrypoints
+
+`builds/` contains build system entrypoints.
+
+It does not contain product app shells.
+
+Core rule:
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+```
+
+The Phase 8.2 skeleton records authoritative build hosts without moving current
+build files:
+
+```text
+builds/
+  esp_idf/
+  pio_nrf52/
+  linux_cmake/
+```
+
+Build entrypoints are thin wrappers. They may call into app shells and adapt
+build-host conventions, but they must not assemble Chat, Map, Team, or GPS
+runtime object graphs, choose UX packs, define board facts, or implement product
+behavior.
+
+Current transitional paths remain valid until wrapper migration is proven:
+
+- `removed root esp_idf`
+- `removed root esp_pio`
+- Linux app-local CMake paths such as `removed root linux_sim` and `removed root linux_rpi`
+
+This directory is intentionally documentation-only in Phase 8.2.
diff --git a/builds/esp_idf/CMakeLists.txt b/builds/esp_idf/CMakeLists.txt
new file mode 100644
index 00000000..ceb20f83
--- /dev/null
+++ b/builds/esp_idf/CMakeLists.txt
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(TrailMateEspIdfBuildWrapper LANGUAGES CXX)
+
+# Build Entrypoint invokes; App Shell composes.
+set(TRAIL_MATE_REPO_ROOT
+    "${CMAKE_CURRENT_LIST_DIR}/../.."
+    CACHE PATH "Trail Mate repository root")
+
+set(TRAIL_MATE_ESP_APP_SHELL
+    "${TRAIL_MATE_REPO_ROOT}/apps/esp32_lvgl"
+    CACHE PATH "Trail Mate ESP32 LVGL app shell")
+
+include("${CMAKE_CURRENT_LIST_DIR}/ESP_IDF_COMPONENT_SOURCES.cmake")
+
+include(CTest)
+
+# ESP-IDF physical component registration may still run from the historical
+# component root during migration. Component source ownership now lives in
+# ESP_IDF_COMPONENT_SOURCES.cmake and the final app/platform/module owners.
+add_subdirectory(
+    "${TRAIL_MATE_ESP_APP_SHELL}"
+    "${CMAKE_BINARY_DIR}/apps/esp32_lvgl")
diff --git a/builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake b/builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake
new file mode 100644
index 00000000..e400aa94
--- /dev/null
+++ b/builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake
@@ -0,0 +1,26 @@
+# Final ESP-IDF component source ownership for migrated Batch 2 surfaces.
+#
+# The physical ESP-IDF component may temporarily include this file from the
+# legacy component root while component registration is being moved. The source
+# list owner is this build entrypoint plus the final app/platform/module owners.
+
+set(TRAILMATE_ROOT "${CMAKE_CURRENT_LIST_DIR}/../..")
+
+set(TRAILMATE_ESP_IDF_APP_SHELL_SOURCES
+    "${TRAILMATE_ROOT}/apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp"
+    "${TRAILMATE_ROOT}/apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.cpp"
+    "${TRAILMATE_ROOT}/apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp"
+    "${TRAILMATE_ROOT}/apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.cpp"
+    "${TRAILMATE_ROOT}/apps/esp32_lvgl/src/esp32_lvgl_runtime_config.cpp")
+
+set(TRAILMATE_ESP_IDF_PRODUCT_COMPOSITION_SOURCES
+    "${TRAILMATE_ROOT}/modules/product_composition/src/target_profile.cpp"
+    "${TRAILMATE_ROOT}/modules/product_composition/src/target_build_binding.cpp")
+
+set(TRAILMATE_ESP_IDF_PLATFORM_SOURCES
+    "${TRAILMATE_ROOT}/platform/esp/radio/meshtastic_radio_adapter.cpp")
+
+set(TRAILMATE_ESP_IDF_FINAL_INCLUDE_DIRS
+    "${TRAILMATE_ROOT}/apps/esp32_lvgl/src"
+    "${TRAILMATE_ROOT}/modules/product_composition/include"
+    "${TRAILMATE_ROOT}")
diff --git a/builds/esp_idf/README.md b/builds/esp_idf/README.md
new file mode 100644
index 00000000..c5203724
--- /dev/null
+++ b/builds/esp_idf/README.md
@@ -0,0 +1,44 @@
+# ESP-IDF Build Entrypoint
+
+Authoritative ESP build entrypoint.
+
+Build authority:
+
+```text
+ESP / ESP32-P4 -> ESP-IDF
+```
+
+Removed historical component root:
+
+```text
+esp_idf implementation root
+```
+
+Final wrapper direction:
+
+```text
+builds/esp_idf
+  -> invokes apps/esp32_lvgl app shell
+```
+
+This directory now owns the migrated ESP-IDF source list and target defaults
+introduced in Batch 2:
+
+- `ESP_IDF_COMPONENT_SOURCES.cmake`
+- `targets/tab5/sdkconfig.defaults`
+- `targets/tdisplayp4_tft/sdkconfig.defaults`
+- `targets/tdisplayp4_amoled/sdkconfig.defaults`
+
+Root legacy source has been removed. Any future physical ESP-IDF
+`idf_component_register` owner must live under final build/app/platform
+ownership, not under a restored historical source root.
+
+Rules:
+
+- thin wrapper only
+- Build Entrypoint invokes
+- App Shell composes
+- do not assemble Chat/Map/GPS runtime here
+- do not choose UX pack here
+- do not define board facts here
+- do not invent target defaults that are not backed by repository evidence
diff --git a/builds/esp_idf/target_profiles.cmake b/builds/esp_idf/target_profiles.cmake
new file mode 100644
index 00000000..4b551c40
--- /dev/null
+++ b/builds/esp_idf/target_profiles.cmake
@@ -0,0 +1,20 @@
+set(TRAILMATE_ESP_IDF_TARGETS
+    tab5
+    tdisplayp4_tft
+    tdisplayp4_amoled
+    tdeck
+    tlora_pager
+    twatch)
+
+set(TRAILMATE_ESP_IDF_TARGET_DEFAULTS_tab5
+    "${CMAKE_CURRENT_LIST_DIR}/targets/tab5/sdkconfig.defaults")
+set(TRAILMATE_ESP_IDF_TARGET_DEFAULTS_tdisplayp4_tft
+    "${CMAKE_CURRENT_LIST_DIR}/targets/tdisplayp4_tft/sdkconfig.defaults")
+set(TRAILMATE_ESP_IDF_TARGET_DEFAULTS_tdisplayp4_amoled
+    "${CMAKE_CURRENT_LIST_DIR}/targets/tdisplayp4_amoled/sdkconfig.defaults")
+set(TRAILMATE_ESP_IDF_TARGET_DEFAULTS_tdeck
+    "${CMAKE_CURRENT_LIST_DIR}/targets/tdeck/sdkconfig.defaults")
+set(TRAILMATE_ESP_IDF_TARGET_DEFAULTS_tlora_pager
+    "${CMAKE_CURRENT_LIST_DIR}/targets/tlora_pager/sdkconfig.defaults")
+set(TRAILMATE_ESP_IDF_TARGET_DEFAULTS_twatch
+    "${CMAKE_CURRENT_LIST_DIR}/targets/twatch/sdkconfig.defaults")
diff --git a/builds/esp_idf/targets/README.md b/builds/esp_idf/targets/README.md
new file mode 100644
index 00000000..4c6d1ea1
--- /dev/null
+++ b/builds/esp_idf/targets/README.md
@@ -0,0 +1,19 @@
+# ESP-IDF Target Defaults
+
+Final owner for ESP-IDF target `sdkconfig.defaults` files.
+
+Migrated from the historical ESP-IDF component root:
+
+| Final target id | Final location | Historical source |
+| --- | --- | --- |
+| `tab5` | `builds/esp_idf/targets/tab5/sdkconfig.defaults` | `removed root esp_idf/targets/tab5/sdkconfig.defaults` |
+| `tdisplayp4_tft` | `builds/esp_idf/targets/tdisplayp4_tft/sdkconfig.defaults` | `removed root esp_idf/targets/t_display_p4_tft/sdkconfig.defaults` |
+| `tdisplayp4_amoled` | `builds/esp_idf/targets/tdisplayp4_amoled/sdkconfig.defaults` | `removed root esp_idf/targets/t_display_p4_amoled/sdkconfig.defaults` |
+| `tdeck` | `builds/esp_idf/targets/tdeck/sdkconfig.defaults` | minimal compile baseline from `boards/T-Deck.json` |
+| `tlora_pager` | `builds/esp_idf/targets/tlora_pager/sdkconfig.defaults` | minimal compile baseline from `boards/lilygo-t-lora-pager.json` |
+| `twatch` | `builds/esp_idf/targets/twatch/sdkconfig.defaults` | minimal compile baseline from `boards/lilygo-t-watch-s3.json` |
+
+`tdeck`, `tlora_pager`, and `twatch` now have final target-default owners under
+`builds/esp_idf/targets`. Their current defaults are compile baselines derived
+from repository board metadata; hardware-specific PSRAM, display, input, NFC,
+and audio validation remains pending.
diff --git a/apps/esp_idf/targets/tab5/sdkconfig.defaults b/builds/esp_idf/targets/tab5/sdkconfig.defaults
similarity index 99%
rename from apps/esp_idf/targets/tab5/sdkconfig.defaults
rename to builds/esp_idf/targets/tab5/sdkconfig.defaults
index 0adfdd36..aa409c4f 100644
--- a/apps/esp_idf/targets/tab5/sdkconfig.defaults
+++ b/builds/esp_idf/targets/tab5/sdkconfig.defaults
@@ -19,4 +19,3 @@ CONFIG_ESP_TASK_WDT_PANIC=y
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=20
 CONFIG_TASK_WDT_PANIC=y
 CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
-
diff --git a/builds/esp_idf/targets/tdeck/sdkconfig.defaults b/builds/esp_idf/targets/tdeck/sdkconfig.defaults
new file mode 100644
index 00000000..11eee01e
--- /dev/null
+++ b/builds/esp_idf/targets/tdeck/sdkconfig.defaults
@@ -0,0 +1,9 @@
+# Minimal ESP-IDF compile baseline derived from boards/T-Deck.json.
+# Hardware-specific PSRAM/display validation remains pending.
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=20
diff --git a/apps/esp_idf/targets/t_display_p4_amoled/sdkconfig.defaults b/builds/esp_idf/targets/tdisplayp4_amoled/sdkconfig.defaults
similarity index 100%
rename from apps/esp_idf/targets/t_display_p4_amoled/sdkconfig.defaults
rename to builds/esp_idf/targets/tdisplayp4_amoled/sdkconfig.defaults
diff --git a/apps/esp_idf/targets/t_display_p4_tft/sdkconfig.defaults b/builds/esp_idf/targets/tdisplayp4_tft/sdkconfig.defaults
similarity index 100%
rename from apps/esp_idf/targets/t_display_p4_tft/sdkconfig.defaults
rename to builds/esp_idf/targets/tdisplayp4_tft/sdkconfig.defaults
diff --git a/builds/esp_idf/targets/tlora_pager/sdkconfig.defaults b/builds/esp_idf/targets/tlora_pager/sdkconfig.defaults
new file mode 100644
index 00000000..bcdd9f11
--- /dev/null
+++ b/builds/esp_idf/targets/tlora_pager/sdkconfig.defaults
@@ -0,0 +1,9 @@
+# Minimal ESP-IDF compile baseline derived from boards/lilygo-t-lora-pager.json.
+# Hardware-specific PSRAM/display/NFC validation remains pending.
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=20
diff --git a/builds/esp_idf/targets/twatch/sdkconfig.defaults b/builds/esp_idf/targets/twatch/sdkconfig.defaults
new file mode 100644
index 00000000..d8ffa245
--- /dev/null
+++ b/builds/esp_idf/targets/twatch/sdkconfig.defaults
@@ -0,0 +1,9 @@
+# Minimal ESP-IDF compile baseline derived from boards/lilygo-t-watch-s3.json.
+# Hardware-specific PSRAM/display/audio validation remains pending.
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
+CONFIG_ESP_TASK_WDT_TIMEOUT_S=20
diff --git a/builds/linux_cmake/CMakeLists.txt b/builds/linux_cmake/CMakeLists.txt
new file mode 100644
index 00000000..57c0f7b4
--- /dev/null
+++ b/builds/linux_cmake/CMakeLists.txt
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(TrailMateLinuxBuilds LANGUAGES CXX)
+
+# Build Entrypoint invokes; App Shell composes.
+set(TRAIL_MATE_REPO_ROOT
+    "${CMAKE_CURRENT_LIST_DIR}/../.."
+    CACHE PATH "Trail Mate repository root")
+
+option(TRAIL_MATE_BUILD_LINUX_UCONSOLE_GTK
+       "Build Linux uConsole GTK app shell" ON)
+option(TRAIL_MATE_BUILD_LINUX_SIM_SHELL
+       "Build Linux simulator app shell" ON)
+
+include(CTest)
+
+if(TRAIL_MATE_BUILD_LINUX_UCONSOLE_GTK)
+    add_subdirectory(
+        "${TRAIL_MATE_REPO_ROOT}/apps/linux_uconsole_gtk"
+        "${CMAKE_BINARY_DIR}/apps/linux_uconsole_gtk")
+endif()
+
+if(TRAIL_MATE_BUILD_LINUX_SIM_SHELL)
+    add_subdirectory(
+        "${TRAIL_MATE_REPO_ROOT}/apps/linux_sim_shell"
+        "${CMAKE_BINARY_DIR}/apps/linux_sim_shell")
+endif()
diff --git a/builds/linux_cmake/CMakePresets.json b/builds/linux_cmake/CMakePresets.json
new file mode 100644
index 00000000..61b0b6b5
--- /dev/null
+++ b/builds/linux_cmake/CMakePresets.json
@@ -0,0 +1,98 @@
+{
+  "version": 6,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 20,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "linux-debug",
+      "displayName": "Linux app shells debug",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/linux-debug",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "BUILD_TESTING": "ON",
+        "TRAIL_MATE_BUILD_LINUX_SIM_SHELL": "ON",
+        "TRAIL_MATE_BUILD_LINUX_UCONSOLE_GTK": "ON"
+      }
+    },
+    {
+      "name": "linux-simulator-debug",
+      "displayName": "Linux simulator shell debug",
+      "inherits": "linux-debug",
+      "binaryDir": "${sourceDir}/build/linux-simulator-debug",
+      "cacheVariables": {
+        "TRAIL_MATE_BUILD_LINUX_SIM_SHELL": "ON",
+        "TRAIL_MATE_BUILD_LINUX_UCONSOLE_GTK": "OFF"
+      }
+    },
+    {
+      "name": "linux-uconsole-debug",
+      "displayName": "Linux uConsole GTK shell debug",
+      "inherits": "linux-debug",
+      "binaryDir": "${sourceDir}/build/linux-uconsole-debug",
+      "cacheVariables": {
+        "TRAIL_MATE_BUILD_LINUX_SIM_SHELL": "OFF",
+        "TRAIL_MATE_BUILD_LINUX_UCONSOLE_GTK": "ON"
+      }
+    },
+    {
+      "name": "linux-uconsole-release",
+      "displayName": "Linux uConsole GTK package release",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/uconsole-release",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "BUILD_TESTING": "OFF",
+        "TRAIL_MATE_BUILD_LINUX_SIM_SHELL": "OFF",
+        "TRAIL_MATE_BUILD_LINUX_UCONSOLE_GTK": "ON"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "linux-debug-build",
+      "configurePreset": "linux-debug"
+    },
+    {
+      "name": "linux-simulator-debug-build",
+      "configurePreset": "linux-simulator-debug"
+    },
+    {
+      "name": "linux-uconsole-debug-build",
+      "configurePreset": "linux-uconsole-debug"
+    },
+    {
+      "name": "linux-uconsole-deb",
+      "configurePreset": "linux-uconsole-release",
+      "targets": [
+        "package"
+      ]
+    }
+  ],
+  "testPresets": [
+    {
+      "name": "linux-debug-test",
+      "configurePreset": "linux-debug",
+      "output": {
+        "outputOnFailure": true
+      }
+    },
+    {
+      "name": "linux-simulator-debug-test",
+      "configurePreset": "linux-simulator-debug",
+      "output": {
+        "outputOnFailure": true
+      }
+    },
+    {
+      "name": "linux-uconsole-debug-test",
+      "configurePreset": "linux-uconsole-debug",
+      "output": {
+        "outputOnFailure": true
+      }
+    }
+  ]
+}
diff --git a/builds/linux_cmake/README.md b/builds/linux_cmake/README.md
new file mode 100644
index 00000000..1238480e
--- /dev/null
+++ b/builds/linux_cmake/README.md
@@ -0,0 +1,61 @@
+# Linux CMake Build Entrypoint
+
+Authoritative Linux build entrypoint.
+
+Build authority:
+
+```text
+Linux -> CMake
+```
+
+Current executable app shell wrappers:
+
+```text
+apps/linux_uconsole_gtk
+apps/linux_sim_shell
+```
+
+Current CI owners:
+
+```text
+.github/workflows/uconsole-linux.yml
+.github/workflows/linux-simulator.yml
+```
+
+There is intentionally no active `cardputer-zero-linux.yml` workflow. Cardputer
+Zero Linux remains lower-completion device bring-up work until it has a
+dedicated final app shell and hardware-oriented validation gate.
+
+Current transitional implementation roots:
+
+```text
+removed root linux_sim
+removed root linux_uconsole
+removed root linux_rpi
+removed root linux_unoq
+```
+
+Final wrapper direction:
+
+```text
+builds/linux_cmake
+  -> invokes selected Linux app shell
+```
+
+The selected shell may be simulator, uConsole, Raspberry Pi, UNO Q, or a future
+headless Linux target. The wrapper must not absorb product behavior from those
+app shells.
+
+Phase 8 Correction adds a real `CMakeLists.txt` here. It only invokes app shell
+directories with `add_subdirectory`; it does not include
+`TrailMateLinuxSources.cmake` or own Linux runtime composition.
+
+Rules:
+
+- thin wrapper only
+- Build Entrypoint invokes
+- App Shell composes
+- do not assemble Chat/Map/GPS runtime here
+- do not choose UX pack here
+- do not define board facts here
+- keep existing Linux CMake app paths stable until wrapper parity is proven
diff --git a/builds/pio_nrf52/README.md b/builds/pio_nrf52/README.md
new file mode 100644
index 00000000..cec63965
--- /dev/null
+++ b/builds/pio_nrf52/README.md
@@ -0,0 +1,38 @@
+# PlatformIO nRF52 Build Entrypoint
+
+Authoritative nRF52 build entrypoint.
+
+Build authority:
+
+```text
+nRF52 -> PlatformIO
+```
+
+Current transitional path may be:
+
+```text
+removed root esp_pio
+root platformio.ini
+target-specific PlatformIO files
+```
+
+Final wrapper direction:
+
+```text
+builds/pio_nrf52
+  -> invokes apps/nrf52_node app shell
+```
+
+This directory is a Phase 8.2 migration stub. It does not yet contain
+`platformio.ini`, environment definitions, library path rewrites, or generated
+build state.
+
+Rules:
+
+- thin wrapper only
+- Build Entrypoint invokes
+- App Shell composes
+- do not assemble Chat/Map/GPS runtime here
+- do not choose UX pack here
+- do not define board facts here
+- keep current PlatformIO flow stable until wrapper parity is proven
diff --git a/builds/pio_nrf52/platformio.ini b/builds/pio_nrf52/platformio.ini
new file mode 100644
index 00000000..37c2719a
--- /dev/null
+++ b/builds/pio_nrf52/platformio.ini
@@ -0,0 +1,137 @@
+; Build Entrypoint invokes; App Shell composes.
+;
+; Phase 8 convergence baseline.
+; Historical PIO roots, recorded by apps/nrf52_node historical descriptor:
+; - removed root esp_pio
+; - removed root gat562_mesh_evb_pro
+;
+; Final app shell semantic root:
+; - apps/nrf52_node
+;
+; This file establishes the authoritative nRF52 PlatformIO wrapper location.
+; The existing root/platform app environments remain transitional until the
+; wrapper can delegate to them without changing flash/build behavior.
+
+[platformio]
+description = Trail Mate nRF52 build wrapper baseline
+boards_dir = ../../boards
+
+[env]
+extra_scripts =
+    pre:../../scripts/platformio-pre.py
+    post:../../scripts/platformio-post.py
+
+[env:nrf52_node_wrapper_baseline]
+platform = nordicnrf52
+framework = arduino
+board = adafruit_feather_nrf52840
+lib_deps =
+    symlink://../../apps/nrf52_node
+    symlink://../../modules/product_composition
+    symlink://../../modules/ui_presentation
+    symlink://../../modules/ui_lvgl_ux_packs
+build_flags =
+    -DTRAIL_MATE_BUILD_WRAPPER_BASELINE=1
+    -DLV_CONF_SKIP=1
+    -I../../modules/ui_presentation/include
+    -I../../modules/product_composition/include
+    -I../../modules/ui_lvgl_ux_packs/include
+build_src_filter =
+    +<nrf52_node_wrapper_baseline.cpp>
+
+[env:gat562_mesh_evb_pro]
+platform = nordicnrf52
+framework = arduino
+board = gat562_mesh_evb_pro
+board_build.variants_dir = ../../variants
+monitor_speed = 115200
+lib_archive = false
+lib_deps =
+    symlink://../../apps/nrf52_node
+    symlink://../../modules/product_composition
+    symlink://../../modules/ui_presentation
+    symlink://../../modules/ui_lvgl_ux_packs
+    symlink://../../modules/core_chat
+    symlink://../../modules/core_mesh
+    symlink://../../modules/core_phone
+    symlink://../../modules/core_sys
+    symlink://../../modules/core_gps
+    symlink://../../modules/ui_mono_128x64
+    symlink://../../modules/chat_presentation_adapters
+    symlink://../../boards/gat562_mesh_evb_pro
+    symlink://../../platform/nrf52
+    symlink://../../platform/nrf52/arduino_common
+    jgromes/RadioLib @ 7.4.0
+    mikalhart/TinyGPSPlus @ 1.0.3
+    rweather/Crypto @ 0.4.0
+    adafruit/Adafruit GFX Library @ ^1.12.0
+    adafruit/Adafruit SSD1306 @ ^2.5.13
+    adafruit/Adafruit BusIO @ ^1.17.0
+    Adafruit Bluefruit nRF52 Libraries
+    Adafruit nRFCrypto
+build_flags =
+    -std=gnu++17
+    -DTRAILMATE_TARGET_GAT562_MESH_EVB_PRO=1
+    -DTRAILMATE_TARGET_ID=\"gat562_mesh_evb_pro\"
+    -DARDUINO_NRF52840_FEATHER
+    -DNRF52840_XXAA
+    -DS140
+    -DGAT562_MESH_EVB_PRO
+    -DTRAIL_MATE_LORA_TX_POWER_MAX_DBM=30
+    -DGAT562_NO_TEAM=1
+    -DGAT562_NO_HOSTLINK=1
+    -DGAT562_NO_SD=1
+    -DGAT562_NO_CJK=1
+    -DGAT562_NO_PINYIN_IME=1
+    -DTRAIL_MATE_NRF_MONO_FUSION_PIXEL_8_ENABLED=1
+    -DTRAIL_MATE_NRF_MONO_FUSION_PIXEL_10_ENABLED=0
+    -DCONFIG_NFCT_PINS_AS_GPIOS=1
+    -DUI_SHARED_TOUCH_IME_ENABLED=0
+    -DLV_CONF_SKIP=1
+    -DSCREEN_WIDTH=128
+    -DSCREEN_HEIGHT=64
+    -DRADIOLIB_EXCLUDE_RF69
+    -DRADIOLIB_EXCLUDE_SX1231
+    -DRADIOLIB_EXCLUDE_RFM2X
+    -DRADIOLIB_EXCLUDE_CC1101
+    -DRADIOLIB_EXCLUDE_NRF24
+    -DRADIOLIB_EXCLUDE_SI443X
+    -DRADIOLIB_EXCLUDE_LR11X0
+    -DRADIOLIB_EXCLUDE_SX127X
+    -DRADIOLIB_EXCLUDE_SX128X
+    -DRADIOLIB_EXCLUDE_AFSK
+    -DRADIOLIB_EXCLUDE_AX25
+    -DRADIOLIB_EXCLUDE_HELLSCHREIBER
+    -DRADIOLIB_EXCLUDE_MORSE
+    -DRADIOLIB_EXCLUDE_RTTY
+    -DRADIOLIB_EXCLUDE_SSTV
+    -DRADIOLIB_EXCLUDE_DIRECT_RECEIVE
+    -DRADIOLIB_EXCLUDE_APRS
+    -DRADIOLIB_EXCLUDE_BELL
+    -DRADIOLIB_EXCLUDE_LORAWAN
+    -DRADIOLIB_EXCLUDE_FSK4
+    -DRADIOLIB_EXCLUDE_PAGER
+    -I../../apps/nrf52_node/src
+    -I../../modules/product_composition/include
+    -I../../modules/ui_presentation/include
+    -I../../modules/ui_lvgl_ux_packs/include
+    -I../../modules/core_chat/include
+    -I../../modules/core_chat/generated
+    -I../../modules/core_chat/third_party/nanopb
+    -I../../modules/core_gps/include
+    -I../../modules/core_mesh/include
+    -I../../modules/core_phone/include
+    -I../../modules/core_sys/include
+    -I../../modules/ui_mono_128x64/include
+    -I../../modules/ui_shared/include
+    -I../../modules/chat_presentation_adapters/include
+    -I../../platform/shared/include
+    -I../../platform/nrf52
+    -I../../platform/nrf52/arduino_common/include
+    -I../../boards/gat562_mesh_evb_pro/include
+    -I../../variants/gat562_mesh_evb_pro
+build_src_filter =
+    +<gat562_mesh_evb_pro.cpp>
+lib_ignore =
+    core_team
+    core_hostlink
diff --git a/builds/pio_nrf52/src/gat562_mesh_evb_pro.cpp b/builds/pio_nrf52/src/gat562_mesh_evb_pro.cpp
new file mode 100644
index 00000000..699b3a01
--- /dev/null
+++ b/builds/pio_nrf52/src/gat562_mesh_evb_pro.cpp
@@ -0,0 +1,20 @@
+#include "nrf52_node_arduino_entry.h"
+
+// The nRF52 app shell library keeps the wrapper baseline small. The real
+// GAT562 environment consumes these final-owner runtime sources explicitly.
+#include "../../../apps/nrf52_node/src/nrf52_node_app_facade_runtime.cpp"
+#include "../../../apps/nrf52_node/src/nrf52_node_app_runtime_access.cpp"
+#include "../../../apps/nrf52_node/src/nrf52_node_arduino_entry.cpp"
+#include "../../../apps/nrf52_node/src/nrf52_node_loop_runtime.cpp"
+#include "../../../apps/nrf52_node/src/nrf52_node_startup_runtime.cpp"
+#include "../../../apps/nrf52_node/src/nrf52_node_ui_runtime.cpp"
+
+extern "C" void setup()
+{
+    trailmate::apps::nrf52_node::arduino_entry::setup();
+}
+
+extern "C" void loop()
+{
+    trailmate::apps::nrf52_node::arduino_entry::loop();
+}
diff --git a/builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp b/builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp
new file mode 100644
index 00000000..60660c80
--- /dev/null
+++ b/builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp
@@ -0,0 +1,26 @@
+#include "nrf52_historical_source_descriptor.h"
+#include "nrf52_node_app_shell.h"
+
+namespace
+{
+
+bool g_wrapper_valid = false;
+
+} // namespace
+
+extern "C" void setup()
+{
+    trailmate::apps::nrf52_node::Nrf52NodeAppShell shell;
+    const auto& historical_source =
+        trailmate::apps::nrf52_node::nrf52HistoricalSourceDescriptor();
+    g_wrapper_valid = shell.validate() &&
+                      historical_source.historical_generic_root_name != nullptr &&
+                      historical_source.historical_board_root_name != nullptr &&
+                      historical_source.historical_role != nullptr &&
+                      historical_source.replacement_owner != nullptr;
+}
+
+extern "C" void loop()
+{
+    (void)g_wrapper_valid;
+}
diff --git a/cmake/TrailMateLinuxSources.cmake b/cmake/TrailMateLinuxSources.cmake
index 2c0b9a3e..e52c9419 100644
--- a/cmake/TrailMateLinuxSources.cmake
+++ b/cmake/TrailMateLinuxSources.cmake
@@ -1,12 +1,14 @@
 # TrailMateLinuxSources.cmake
 #
 # Shared source lists and helper functions for the Trail Mate Linux line.
-# apps/linux_sim, apps/linux_rpi, and apps/linux_uconsole include this file so
-# that a single source list drives common app services and core-module targets.
+# removed root linux_sim,
+# removed root linux_rpi, and
+# removed root linux_uconsole include this file so that a single
+# source list drives common app services and core-module targets.
 #
 # Usage from an app CMakeLists.txt:
 #
-#   include("${PROJECT_SOURCE_DIR}/../../cmake/TrailMateLinuxSources.cmake")
+#   include("${PROJECT_SOURCE_DIR}/../../../cmake/TrailMateLinuxSources.cmake")
 #
 #   trailmate_add_linux_common(trailmate_cardputer_zero_linux_common)
 #   trailmate_add_linux_ui_shell(trailmate_cardputer_zero_ui_shell
@@ -16,7 +18,7 @@
 # these two targets plus any app-specific dependencies.
 #
 # ---------------------------------------------------------------------------
-# Path roots – derived from this file's location (cmake/), which gives
+# Path roots �?derived from this file's location (cmake/), which gives
 # the repo root via "..".  Independent of the including app's directory.
 # ---------------------------------------------------------------------------
 
@@ -58,12 +60,72 @@ function(_trailmate_set_linux_paths)
     set(TRAIL_MATE_CORE_SYS_INCLUDE_ROOT
         "${TRAIL_MATE_REPO_ROOT}/modules/core_sys/include"
         PARENT_SCOPE)
+    set(TRAIL_MATE_CORE_DEVICE_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/core_device/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_CORE_MESH_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_CORE_PHONE_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/core_phone/include"
+        PARENT_SCOPE)
     set(TRAIL_MATE_UI_SHARED_INCLUDE_ROOT
         "${TRAIL_MATE_REPO_ROOT}/modules/ui_shared/include"
         PARENT_SCOPE)
     set(TRAIL_MATE_UI_SHARED_SRC_ROOT
         "${TRAIL_MATE_REPO_ROOT}/modules/ui_shared/src"
         PARENT_SCOPE)
+    set(TRAIL_MATE_UI_CHAT_RUNTIME_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_chat_runtime/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_CHAT_RUNTIME_SRC_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_chat_runtime/src"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_KEY_VERIFICATION_RUNTIME_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_key_verification_runtime/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_KEY_VERIFICATION_RUNTIME_SRC_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_key_verification_runtime/src"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_MAP_RUNTIME_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/src"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_GPS_RUNTIME_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_gps_runtime/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_GPS_RUNTIME_SRC_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_gps_runtime/src"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_LEGACY_ADAPTERS_SRC_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/src"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_LVGL_CORE_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_core/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_LVGL_UX_PACKS_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_PRESENTATION_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_UI_PRESENTATION_SRC_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_INCLUDE_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/chat_presentation_adapters/include"
+        PARENT_SCOPE)
+    set(TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_SRC_ROOT
+        "${TRAIL_MATE_REPO_ROOT}/modules/chat_presentation_adapters/src"
+        PARENT_SCOPE)
     set(TRAIL_MATE_PLATFORM_SHARED_INCLUDE_ROOT
         "${TRAIL_MATE_REPO_ROOT}/platform/shared/include"
         PARENT_SCOPE)
@@ -94,6 +156,8 @@ set(TRAIL_MATE_LINUX_COMMON_SOURCES
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/platform/linux/map_contour_tile_generator.cpp"
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/platform/linux/map_diagnostics.cpp"
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/platform/linux/map_tile_cache.cpp"
+    "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/mesh/linux_mesh_runtime_shell.cpp"
+    "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/mesh/linux_sqlite_mesh_identity_store.cpp"
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/platform/linux/runtime_packet_log.cpp"
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/platform/linux/sx126x_radio.cpp"
     # platform::ui::* runtime implementations
@@ -116,13 +180,31 @@ set(TRAIL_MATE_LINUX_COMMON_SOURCES
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/platform/ui/wifi_runtime.cpp"
     # modules/core_chat
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/domain/chat_model.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/chat_delivery_action_service.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/chat_delivery_event_port.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/chat_delivery_event_projector.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/chat_delivery_read_model.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/legacy_chat_send_result_mapper.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/contact_store_core.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/mesh_protocol_utils.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/mc_region_presets.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/meshcore_identity_crypto.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/meshcore_payload_helpers.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/meshcore_protocol_helpers.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/crypto/ed25519/fe.c"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/crypto/ed25519/ge.c"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/crypto/ed25519/key_exchange.c"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/crypto/ed25519/keypair.c"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/crypto/ed25519/sc.c"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/crypto/ed25519/sha512.c"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/crypto/ed25519/sign.c"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshcore/crypto/ed25519/verify.c"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshtastic/compression/unishox2.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshtastic/mt_codec_pb.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshtastic/mt_node_payload.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshtastic/mt_packet_wire.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshtastic/mt_pki_crypto.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshtastic/mt_protocol_helpers.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshtastic/mt_radio_config.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/infra/meshtastic/mt_region.cpp"
@@ -157,16 +239,52 @@ set(TRAIL_MATE_LINUX_COMMON_SOURCES
     "${TRAIL_MATE_REPO_ROOT}/modules/core_team/src/usecase/team_service.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_team/src/usecase/team_track_sampler.cpp"
     # modules/core_gps
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/protocol/nmea/nmea_parser.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/protocol/nmea/nmea_sentence.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/usecase/gnss_skyplot_presenter.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/usecase/gps_jitter_filter.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/usecase/gps_runtime_config.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/usecase/gps_runtime_policy.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/usecase/gps_runtime_state.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/usecase/location_service.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/usecase/time_authority.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_gps/src/motion_policy.cpp"
     # modules/core_hostlink
     "${TRAIL_MATE_REPO_ROOT}/modules/core_hostlink/src/hostlink_session.cpp"
     # modules/core_sys
     "${TRAIL_MATE_REPO_ROOT}/modules/core_sys/src/app/app_facade_access.cpp"
     "${TRAIL_MATE_REPO_ROOT}/modules/core_sys/src/sys/clock.cpp"
+    # modules/core_device
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_device/src/device/capability_types.cpp"
+    # modules/core_mesh
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/protocol/meshcore/mc_identity_flow.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/protocol/meshcore/meshcore_protocol_strategy.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/protocol/meshtastic/mt_pki_flow.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/protocol/meshtastic/meshtastic_protocol_strategy.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/usecase/direct_message_service.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/usecase/mesh_dedup_service.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/usecase/mesh_session.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/usecase/peer_identity_service.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_mesh/src/usecase/receive_packet_service.cpp"
+    # modules/core_phone
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_phone/src/meshcore/meshcore_phone_core.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_phone/src/meshtastic/meshtastic_phone_core.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/core_phone/src/meshtastic/meshtastic_phone_session.cpp"
+    # modules/ui_presentation
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/device/device_status_model.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/gps/gps_status_model.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/mesh/mesh_status_model.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/settings/settings_model.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/chat/chat_workspace_model.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/key_verification/key_verification_model.cpp"
+    "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/map/map_workspace_model.cpp"
+    # modules/chat_presentation_adapters
+    "${TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_SRC_ROOT}/chat_conversation_mapper.cpp"
+    "${TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_SRC_ROOT}/chat_message_mapper.cpp"
 )
 
 set(TRAIL_MATE_LINUX_UI_SHELL_SOURCES
-    # platform/linux/common – shared Linux UI layer
+    # platform/linux/common �?shared Linux UI layer
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/ui/localization.cpp"
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/ui/shared_ui_shell.cpp"
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/ui/shell_ui_runner.cpp"
@@ -175,7 +293,7 @@ set(TRAIL_MATE_LINUX_UI_SHELL_SOURCES
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/ui/gps_shared_compat.cpp"
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/ui/mt_protocol_air_compat.cpp"
     "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/ui/widgets/map/map_tiles.cpp"
-    # modules/ui_shared – assets
+    # modules/ui_shared �?assets
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/assets/Chat.c"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/assets/alert.c"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/assets/AreaCleared.c"
@@ -196,14 +314,37 @@ set(TRAIL_MATE_LINUX_UI_SHELL_SOURCES
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/assets/team.c"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/assets/tracker.c"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/assets/walkie_talkie.c"
-    # modules/ui_shared – components
+    # modules/ui_shared �?components
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/components/air_status_footer.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_air_device_status_source.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_gps_status_source.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_mesh_status_source.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_settings_source.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_settings_action_sink.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/chat_presentation_source.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_chat_action_sink.cpp"
+    "${TRAIL_MATE_UI_CHAT_RUNTIME_SRC_ROOT}/chat_delivery_action_port_adapter.cpp"
+    "${TRAIL_MATE_UI_CHAT_RUNTIME_SRC_ROOT}/chat_delivery_event_projection_adapter.cpp"
+    "${TRAIL_MATE_UI_KEY_VERIFICATION_RUNTIME_SRC_ROOT}/key_verification_action_sink.cpp"
+    "${TRAIL_MATE_UI_KEY_VERIFICATION_RUNTIME_SRC_ROOT}/key_verification_presentation_source.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/team_chat_presentation_source.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/team_chat_action_sink.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/team_actions/legacy_team_action_bridge.cpp"
+    "${TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT}/map_overlay_projection_adapter.cpp"
+    "${TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT}/map_overlay_snapshot_source.cpp"
+    "${TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT}/map_overlay/map_overlay_projector.cpp"
+    "${TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT}/map_tiles/filesystem_map_tile_source.cpp"
+    "${TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT}/map_tiles/map_tile_render_queue.cpp"
+    "${TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT}/map_tiles/map_tile_resolver.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/team_presentation/team_rich_payload_projector.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_map_presentation_source.cpp"
+    "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_map_action_sink.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/assets/fonts/font_utils.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/components/info_card.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/components/two_pane_layout.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/components/two_pane_nav.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/components/two_pane_styles.cpp"
-    # modules/ui_shared – shell / menu / page
+    # modules/ui_shared �?shell / menu / page
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/app_runtime.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/formatters.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/menu/menu_layout.cpp"
@@ -225,11 +366,30 @@ set(TRAIL_MATE_LINUX_UI_SHELL_SOURCES
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/chat/chat_message_list_input.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/chat/chat_message_list_layout.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/chat/chat_message_list_styles.cpp"
+    "${TRAIL_MATE_UI_CHAT_RUNTIME_SRC_ROOT}/chat_page_runtime_event_pump.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/chat/chat_page_runtime.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/chat/chat_page_shell.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/chat/chat_protocol_support.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/chat/chat_send_flow.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/chat/chat_ui_controller.cpp"
+    "${TRAIL_MATE_UI_PRESENTATION_SRC_ROOT}/menu/menu_model.cpp"
+    "${TRAIL_MATE_UI_PRESENTATION_SRC_ROOT}/screen/screen_binding_registry.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/ux/screen_registry.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/ux/input_binding_set.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/ux/ux_menu_model.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/ux/ux_screen_menu_adapter.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/ux/ux_menu_provider.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/ux/ux_pack_registry.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/compatibility_screen_factory.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/lvgl_menu_runtime_adapter.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/lvgl_screen_host_adapter.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/lvgl_screen_graph_bridge.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/packs/compatibility_ux_pack.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/packs/uconsole_desktop_ux_pack.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/packs/tiny_node_status_ux_pack.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/packs/simulator_full_ux_pack.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/common/key_verification_modal_renderer.cpp"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/common/team_position_picker_renderer.cpp"
     # contacts
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/contacts/contacts_page_components.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/contacts/contacts_page_input.cpp"
@@ -248,6 +408,7 @@ set(TRAIL_MATE_LINUX_UI_SHELL_SOURCES
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/gnss/gnss_skyplot_page_runtime.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/gnss/gnss_skyplot_page_shell.cpp"
     # gps
+    "${TRAIL_MATE_UI_GPS_RUNTIME_SRC_ROOT}/gps_page_runtime_pump.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/gps/gps_page_runtime.cpp"
     "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/screens/gps/gps_page_shell.cpp"
     # node info
@@ -297,7 +458,7 @@ set(TRAIL_MATE_LINUX_UI_SHELL_SOURCES
 )
 
 # ---------------------------------------------------------------------------
-# Common include directories – reused by every Linux target.
+# Common include directories �?reused by every Linux target.
 # ---------------------------------------------------------------------------
 
 set(TRAIL_MATE_LINUX_COMMON_INCLUDES
@@ -309,8 +470,21 @@ set(TRAIL_MATE_LINUX_COMMON_INCLUDES
     "${TRAIL_MATE_CORE_GPS_INCLUDE_ROOT}"
     "${TRAIL_MATE_CORE_HOSTLINK_INCLUDE_ROOT}"
     "${TRAIL_MATE_CORE_SYS_INCLUDE_ROOT}"
+    "${TRAIL_MATE_CORE_DEVICE_INCLUDE_ROOT}"
+    "${TRAIL_MATE_CORE_MESH_INCLUDE_ROOT}"
+    "${TRAIL_MATE_CORE_PHONE_INCLUDE_ROOT}"
     "${TRAIL_MATE_CORE_TEAM_INCLUDE_ROOT}"
+    "${TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_PRESENTATION_INCLUDE_ROOT}"
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/include"
     "${TRAIL_MATE_UI_SHARED_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_CHAT_RUNTIME_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_KEY_VERIFICATION_RUNTIME_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_MAP_RUNTIME_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_GPS_RUNTIME_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_LVGL_CORE_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_INCLUDE_ROOT}"
 )
 
 set(TRAIL_MATE_LINUX_UI_SHELL_INCLUDES
@@ -321,7 +495,19 @@ set(TRAIL_MATE_LINUX_UI_SHELL_INCLUDES
     "${TRAIL_MATE_CORE_CHAT_NANOPB_ROOT}"
     "${TRAIL_MATE_CORE_TEAM_INCLUDE_ROOT}"
     "${TRAIL_MATE_UI_SHARED_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_CHAT_RUNTIME_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_KEY_VERIFICATION_RUNTIME_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_MAP_RUNTIME_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_GPS_RUNTIME_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_LVGL_CORE_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_LVGL_UX_PACKS_INCLUDE_ROOT}"
     "${TRAIL_MATE_CORE_SYS_INCLUDE_ROOT}"
+    "${TRAIL_MATE_CORE_DEVICE_INCLUDE_ROOT}"
+    "${TRAIL_MATE_CORE_PHONE_INCLUDE_ROOT}"
+    "${TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_INCLUDE_ROOT}"
+    "${TRAIL_MATE_UI_PRESENTATION_INCLUDE_ROOT}"
+    "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/include"
     "${TRAIL_MATE_PLATFORM_SHARED_INCLUDE_ROOT}"
 )
 
diff --git a/cmake/TrailMateUxPacks.cmake b/cmake/TrailMateUxPacks.cmake
new file mode 100644
index 00000000..89428b77
--- /dev/null
+++ b/cmake/TrailMateUxPacks.cmake
@@ -0,0 +1,46 @@
+function(trailmate_add_ui_lvgl_ux_packs target_name)
+    if(TARGET ${target_name})
+        return()
+    endif()
+
+    if(NOT DEFINED TRAIL_MATE_REPO_ROOT)
+        set(TRAIL_MATE_REPO_ROOT
+            "${CMAKE_CURRENT_LIST_DIR}/.."
+            CACHE PATH "Trail Mate repository root")
+    endif()
+
+    add_library(${target_name}
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/menu/menu_model.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/screen/screen_binding_registry.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/target_ui_profile.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/page/page_manifest.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/src/layout/layout_profile.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/ux/screen_registry.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/ux/input_binding_set.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_screen_graph_presenter.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_entry_adoption.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_adoption_probe.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_menu_model.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/packs/uconsole_desktop_ux_pack.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/packs/tiny_node_status_ux_pack.cpp"
+        "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/packs/simulator_full_ux_pack.cpp")
+
+    target_include_directories(${target_name}
+        PUBLIC
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_presentation/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/product_composition/include"
+            "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/include")
+
+    target_compile_features(${target_name} PUBLIC cxx_std_17)
+endfunction()
diff --git a/docs/LINUX_ADAPTATION_GUIDE.md b/docs/LINUX_ADAPTATION_GUIDE.md
index 8ff4beda..1c0ace45 100644
--- a/docs/LINUX_ADAPTATION_GUIDE.md
+++ b/docs/LINUX_ADAPTATION_GUIDE.md
@@ -208,7 +208,7 @@ Linux 适配不能只理解成“让代码能在 Linux 编译”。当前仓库
 | UI 共享 | 中等偏好 | `trailmate_cardputer_zero_ui_shell` 编译大量 `modules/ui_shared` 页面和资产；新增 `ShellSession`/`CanvasLvglHost`/`NativeLvglHost`，输入事件吞掉问题已修，callback 已回到 LVGL 精确类型签名 | SDK native path 尚未接入；仍需完整构建确认 LVGL typedef/前向声明兼容性 |
 | CMake 结构 | 明显改善 | linux_sim 与 linux_rpi 已改为 include 共享 helper，source list 不再主要散在两个 app CMake 里，rpi-only evdev source 已接入，helper 路径注释已校准 | 需要跑 sim/rpi build；target compile definitions 和 runtime mode 默认语义还需收口 |
 | 真机能力 | 早期 | fbdev path、LVGL evdev bring-up、NMEA serial path、hostlink TCP path 已有雏形；hostlink 默认 loopback 更安全 | Cardputer Zero 键位、battery、brightness、Wi-Fi、USB、firmware update、real radio/audio 等未闭环 |
-| CI | 中等偏好 | `.github/workflows/cardputer-zero-linux.yml` 构建 simulator、tests、rpi CMake shell，跑边界检查和 WSL-style script | 不构建 M5 SDK path，不跑真机/虚拟 fbdev，不验证 Docker GUI path |
+| CI | 中等偏好 | `.github/workflows/linux-simulator.yml` 覆盖 simulator build/tests；`.github/workflows/uconsole-linux.yml` 覆盖 uConsole GTK build/tests/package | Cardputer Zero Linux 不再借用这个 workflow 名义；仍不构建 M5 SDK path，不跑真机/虚拟 fbdev，不验证 Docker GUI path |
 | 开发体验 | 较好 | Windows PowerShell、Linux shell、WSL validate、Docker dev container 脚本齐全 | 本地环境变量和 path bridge 还在演进；不同 host 的路径/权限策略需要统一文档化 |
 
 ### 2.3 已经做得比较好的地方
@@ -247,7 +247,7 @@ Linux CMake target 编译大量 `modules/ui_shared/src/ui/*` 页面、组件、
 
 9. CI 已经能挡住基础倒退。
 
-专门的 `Cardputer Zero Linux` workflow 会跑边界检查、Linux simulator build、smoke tests、Pi OS CMake shell build 和 WSL-style validation。
+专门的 `Linux Simulator` workflow 会跑 simulator build 和 smoke tests；`uConsole Linux` workflow 会跑 uConsole GTK build、smoke tests 和 Debian package。Cardputer Zero Linux 需要单独的 device-shell / hardware validation gate，当前不再用 workflow 名称暗示它已经完成。
 
 10. 能力真假开始从 Linux 私有概念上移到公共合约。
 
@@ -1397,40 +1397,34 @@ Linux common 中已经有 hostlink worker thread。后续新增线程时遵守
 ```bash
 python3 scripts/check_platform_ui_boundaries.py
 
-cd apps/linux_sim
+cd builds/linux_cmake
 cmake --preset linux-simulator-debug
 cmake --build --preset linux-simulator-debug-build
-cmake --preset linux-test-debug
-cmake --build --preset linux-test-debug-build
-ctest --preset linux-debug-test
-bash scripts/wsl-validate.sh
+ctest --preset linux-simulator-debug-test
 
-cd ../linux_rpi
-cmake --preset linux-device-debug
-cmake --build --preset linux-device-debug-build
+cmake --preset linux-uconsole-debug
+cmake --build --preset linux-uconsole-debug-build
+ctest --preset linux-uconsole-debug-test
+
+cmake --preset linux-uconsole-release
+cmake --build --preset linux-uconsole-deb
 ```
 
 Windows/WSL simulator:
 
 ```powershell
-powershell -ExecutionPolicy Bypass -File .\apps\linux_sim\scripts\run-dev-container.ps1
+wsl.exe --exec bash -lc 'cd /mnt/c/Users/VicLi/Documents/Projects/trail-mate/builds/linux_cmake && cmake --preset linux-simulator-debug && cmake --build --preset linux-simulator-debug-build && ctest --preset linux-simulator-debug-test'
 ```
 
-Linux dev container:
+Windows/WSL uConsole:
 
-```bash
-cd apps/linux_sim
-bash scripts/run-dev-container.sh
+```powershell
+wsl.exe --exec bash -lc 'cd /mnt/c/Users/VicLi/Documents/Projects/trail-mate/builds/linux_cmake && cmake --preset linux-uconsole-debug && cmake --build --preset linux-uconsole-debug-build && ctest --preset linux-uconsole-debug-test'
 ```
 
 SDK device:
 
-```bash
-cd apps/linux_rpi
-export TRAIL_MATE_M5STACK_LINUX_LIBS_PATH=/path/to/M5Stack_Linux_Libs
-bash scripts/build-sdk-device.sh
-LV_LINUX_FBDEV_DEVICE=/dev/fb0 bash scripts/run-sdk-device.sh
-```
+当前仓库没有活跃的 Cardputer Zero Linux CI 入口。该目标需要补齐独立 device shell、SDK build 入口和硬件验证 gate 后，再作为专门命令列入这里。
 
 ## 9. 代码审查清单
 
diff --git a/docs/REPOSITORY_MIGRATION_PLAN.md b/docs/REPOSITORY_MIGRATION_PLAN.md
index ba91dacf..3c26cffb 100644
--- a/docs/REPOSITORY_MIGRATION_PLAN.md
+++ b/docs/REPOSITORY_MIGRATION_PLAN.md
@@ -19,6 +19,50 @@ Current status snapshot:
 - phases 0 / 1 / 2 / 3 / 5 / 6 in `docs/UI_SHARED_IDF_PHASE_PLAN.md` are now complete
 - phase 4 remains the active workstream for finishing the remaining business-page migrations
 
+## Cross-platform product architecture baseline
+
+Phase 1 of the product architecture work is now defined as:
+
+```text
+Phase 1: Establish the cross-platform product architecture baseline.
+```
+
+This phase does not extract LoRa, GPS, BLE, or UI behavior. It establishes the
+shared language and review surface that later extractions must use:
+
+- `docs/specification/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md`
+- `docs/specification/CAPABILITY_AUTHORITY_GLOSSARY.md`
+- `docs/specification/TARGET_MANIFEST_SPEC.md`
+- `docs/specification/BOARD_PACKAGE_SPEC.md`
+- `docs/specification/RUNTIME_CONCURRENCY_SPEC.md`
+- `docs/specification/UI_PRESENTATION_ARCHITECTURE_SPEC.md`
+- draft target manifests under `docs/targets/`
+- draft board manifests under `docs/boards/`
+- vocabulary-only device types under `modules/core_device/`
+- review checklist under `docs/review/`
+- non-blocking boundary report under `tools/architecture/`
+
+The operating rule for all later migration steps is:
+
+```text
+Target chooses.
+Board describes.
+Platform adapts.
+Runtime schedules.
+Capability provides.
+Protocol interprets.
+UseCase decides.
+AppService coordinates.
+PresentationModel projects.
+Renderer draws.
+CompositionRoot wires.
+```
+
+The new boundary checker is intentionally report-only during Phase 1. Known
+historical drift is recorded in
+`tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md` and must be paid
+down in later phases rather than hidden inside this baseline step.
+
 ## Current authoritative layout
 
 Today, the repository is still primarily organized around a single `src/` tree plus root-level build entrypoints:
diff --git a/docs/archive/REMOVED_LEGACY_ROOTS.md b/docs/archive/REMOVED_LEGACY_ROOTS.md
new file mode 100644
index 00000000..86420d7b
--- /dev/null
+++ b/docs/archive/REMOVED_LEGACY_ROOTS.md
@@ -0,0 +1,214 @@
+# Removed Legacy Roots
+
+This record replaces the removed root source tree with a textual history only.
+No legacy source archive is retained under `docs/archive`.
+
+## legacy/
+
+Historical role:
+- Repository-level container for pre-final implementation roots and governance
+  notes.
+
+Final replacement owner:
+- `apps/*`
+- `builds/*`
+- `boards/*`
+- `modules/*`
+- `platform/*`
+- `docs/archive/REMOVED_LEGACY_ROOTS.md`
+
+Removal reason:
+- Root implementation ownership has moved to final app, build, board, module,
+  and platform owners.
+- Final guardrails now forbid reintroducing the root source tree.
+
+Source disposition:
+- Historical source root removed.
+- No source archive retained under `docs/archive`.
+
+Known follow-up:
+- Continue deleting remaining compatibility aliases and fallback-only paths by
+  their specific ledgers.
+
+## legacy/app_implementations/esp_idf
+
+Historical role:
+- Pre-refactor ESP-IDF app implementation root.
+- Owned component registration, sdkconfig defaults, startup/loop/runtime
+  config, and ESP-specific adapters.
+
+Final replacement owner:
+- `builds/esp_idf`
+- `apps/esp32_lvgl`
+- `platform/esp/radio`
+- `modules/product_composition`
+- `boards/tab5`
+- `boards/tdisplayp4`
+
+Removal reason:
+- ESP-IDF final owner extraction completed for the migrated Batch 2 surfaces.
+- `apps/esp32_lvgl` no longer links the ESP-IDF implementation adapter.
+- Target defaults and source ownership are tracked by final owners.
+
+Source disposition:
+- Historical source root removed.
+- No source archive retained under `docs/archive`.
+
+Known follow-up:
+- Continue migrating deferred ESP GPS/team/map ownership from the existing audit
+  into final modules when those areas are touched.
+
+## legacy/app_implementations/esp_pio
+
+Historical role:
+- Pre-refactor PlatformIO/Arduino implementation root.
+- Held historical runtime access and wrapper assumptions for embedded PIO
+  builds.
+
+Final replacement owner:
+- `builds/pio_nrf52`
+- `apps/nrf52_node`
+- `modules/product_composition`
+- `modules/ui_presentation`
+
+Removal reason:
+- The nRF52 wrapper no longer depends on the historical PIO include/source
+  root.
+- Product target and UX binding are now owned by final product composition and
+  app shell metadata.
+
+Source disposition:
+- Historical source root removed.
+- No source archive retained under `docs/archive`.
+
+Known follow-up:
+- Keep root PlatformIO cleanup separate from this removal if future ESP Arduino
+  routes are retired or migrated.
+
+## legacy/app_implementations/gat562_mesh_evb_pro
+
+Historical role:
+- Pre-refactor GAT562 Mesh EVB Pro app/runtime root.
+- Mixed device startup, protocol/debug behavior, and board-adjacent runtime
+  glue.
+
+Final replacement owner:
+- `apps/nrf52_node`
+- `builds/pio_nrf52`
+- `boards/gat562_mesh_evb_pro`
+- `modules/ui_headless_runtime`
+- `modules/product_composition`
+
+Removal reason:
+- The active nRF52 build wrapper no longer references the historical root.
+- GAT562 hardware facts and headless product routing now have final owners.
+
+Source disposition:
+- Historical source root removed.
+- No source archive retained under `docs/archive`.
+
+Known follow-up:
+- Continue moving any future concrete GAT562 runtime behavior into
+  `apps/nrf52_node`, platform modules, or stable runtime modules as needed.
+
+## legacy/app_implementations/linux_rpi
+
+Historical role:
+- Pre-refactor Raspberry Pi / Cardputer Zero Linux bring-up root.
+- Carried local CMake/SCons/script workflow history for Linux device work.
+
+Final replacement owner:
+- `apps/linux_sim_shell` for the current Cardputer Zero fallback route.
+- `builds/linux_cmake`
+- `platform/linux`
+- `boards/cardputerzero`
+
+Removal reason:
+- Batch 3 recorded Cardputer Zero as an active-with-fallback target through
+  final target metadata instead of a legacy Linux root.
+- Root legacy source is no longer an acceptable final architecture state.
+
+Source disposition:
+- Historical source root removed.
+- No source archive retained under `docs/archive`.
+
+Known follow-up:
+- Decide whether Cardputer Zero receives a dedicated final app shell or remains
+  on the documented Linux simulator-shell fallback route.
+
+## legacy/app_implementations/linux_sim
+
+Historical role:
+- Pre-refactor Linux simulator implementation root.
+- Previously owned simulator composition root, app-local CMake, scripts, and
+  smoke/probe code.
+
+Final replacement owner:
+- `apps/linux_sim_shell`
+- `builds/linux_cmake`
+- `modules/ui_ascii_runtime`
+- `platform/linux`
+- `modules/product_composition`
+
+Removal reason:
+- LinuxSim local root collapse moved validation to the final app shell.
+- The legacy-local root had been reduced to archive-only and is now removed.
+
+Source disposition:
+- Historical source root removed.
+- No source archive retained under `docs/archive`.
+
+Known follow-up:
+- Delete fallback-only simulator runtime paths only when the dedicated fallback
+  deletion ledger says the primary descriptor route no longer needs them.
+
+## legacy/app_implementations/linux_uconsole
+
+Historical role:
+- Pre-refactor Linux uConsole GTK implementation root.
+- Previously owned GTK composition root, old widget/page sources, scripts,
+  packaging history, and local CMake smoke targets.
+
+Final replacement owner:
+- `apps/linux_uconsole_gtk`
+- `builds/linux_cmake`
+- `platform/linux/uconsole`
+- `modules/ui_gtk_runtime`
+- `modules/product_composition`
+
+Removal reason:
+- uConsole final app shell and GTK descriptor page registry now own the active
+  route.
+- The legacy-local root had been reduced to archive-only and is now removed
+  rather than retained as a source archive.
+
+Source disposition:
+- Historical source root removed.
+- No source archive retained under `docs/archive`.
+
+Known follow-up:
+- Continue GTK descriptor-bound page/controller migration without copying old
+  root source wholesale into a new owner.
+- Re-establish final packaging ownership for Debian packaging under final build
+  or app shell ownership when packaging work resumes.
+
+## legacy/app_implementations/linux_unoq
+
+Historical role:
+- Placeholder pre-final Linux UNO Q implementation root.
+
+Final replacement owner:
+- No active app shell owner until a product decision makes UNO Q real.
+- Future ownership must be under `apps/*`, `builds/linux_cmake`, and
+  `platform/linux`, not under a restored source root.
+
+Removal reason:
+- Placeholder legacy roots are not final architecture.
+- No active final target currently depends on this source root.
+
+Source disposition:
+- Historical source root removed.
+- No source archive retained under `docs/archive`.
+
+Known follow-up:
+- Record a final target/app/build owner before adding any future UNO Q source.
diff --git a/docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md b/docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md
new file mode 100644
index 00000000..d025a3b1
--- /dev/null
+++ b/docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md
@@ -0,0 +1,112 @@
+# AppContext Legacy Bridge Audit
+
+## Purpose
+
+Phase 6 establishes product composition and app shell boundaries.
+
+`AppContext` and the global app facade accessors remain historical composition
+surfaces. This audit records them as bounded legacy bridges so new object graph
+construction can move toward explicit target composition roots.
+
+This audit does not remove `AppContext`, rewrite LVGL pages, or change ESP
+startup order.
+
+## Current Role
+
+`AppContext` currently acts as a legacy service locator and compatibility
+composition object for ESP-style targets.
+
+It still owns or exposes:
+
+- board/runtime initialization handles
+- ChatService compatibility
+- ContactService compatibility
+- Team service compatibility
+- mesh adapter compatibility
+- BLE manager compatibility
+- UI runtime facade compatibility
+- event runtime hooks
+- persisted app configuration compatibility
+
+The shared `app::IAppFacade` and `app::appFacade()` accessors provide a similar
+global compatibility surface for legacy UI code and target runtimes.
+
+## Allowed Existing Use
+
+Existing code may continue to use the bridge for bounded compatibility paths:
+
+- ESP app startup and runtime lifecycle
+- existing LVGL renderer/controller lifecycle paths
+- ChatService and ContactService compatibility
+- TeamUiStore and Team service compatibility
+- settings pages that still use the legacy app facade
+- tracker/team/settings legacy pages already documented as UI islands
+- map viewport compatibility while tile/cache cleanup remains deferred
+
+These uses are not Phase 6 blockers because they are historical, documented,
+and guarded by the Phase 5 renderer and presentation checks.
+
+## Forbidden New Use
+
+New code must not add unrelated `AppContext` or `app::appFacade()` lookups for:
+
+- new presentation models
+- new renderer state
+- new map tile/cache logic
+- new protocol services
+- new board/platform factories
+- new target selection policy
+- new source/sink construction from renderer/page code
+- new Chat or Map UI paths that bypass Phase 5 presentation models
+
+If a new feature needs one of these dependencies, it should be wired by a target
+composition root or passed explicitly through a source/sink boundary.
+
+## Boundary
+
+The bridge may adapt old object ownership into Phase 6 bundles:
+
+- `AppServicesBundle`
+- `PresentationBundle`
+- target composition roots
+- explicit source/sink injection
+
+The bridge must not become the default composition API for new code.
+
+## Replacement Direction
+
+The intended replacement path is:
+
+```text
+target composition root
+  -> AppServicesBundle
+  -> source/sink adapters
+  -> PresentationBundle
+  -> TargetAppShell
+```
+
+Legacy UI islands may continue to pass through `AppContext` until their own
+cleanup phase, but each new composition path should prefer explicit ownership
+from the target/app shell.
+
+## Known Bridge Surfaces
+
+| Surface | Current status | Phase 6 policy |
+| --- | --- | --- |
+| `apps/esp_pio/src/app_context.cpp` | legacy composition object | bounded bridge |
+| `apps/esp_pio/src/app_runtime_access.cpp` | ESP startup bridge | bounded bridge |
+| `apps/esp_idf/src/app_facade_runtime.cpp` | ESP-IDF app facade bridge | bounded bridge |
+| `modules/core_sys/src/app/app_facade_access.cpp` | global facade pointer | compatibility only |
+| `modules/ui_shared/src/ui/screens/settings` | legacy UI facade use | baseline |
+| `modules/ui_shared/src/ui/screens/team` | legacy UI facade use | baseline |
+| `modules/ui_shared/src/ui/screens/tracker` | legacy UI facade use | baseline |
+| `modules/ui_shared/src/ui/widgets/map/map_viewport.cpp` | legacy map runtime use | baseline |
+
+## Exit Interpretation
+
+Phase 6 may close with this bridge still present if:
+
+- new composition roots exist for Linux/uConsole pilots
+- ESP composition ownership is documented or bridged
+- new renderer/page code is prevented from expanding global service lookup
+- future cleanup tracks know which legacy islands still depend on the bridge
diff --git a/docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md b/docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md
new file mode 100644
index 00000000..61274aac
--- /dev/null
+++ b/docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md
@@ -0,0 +1,132 @@
+# App Shell Current State Audit
+
+## Purpose
+
+Phase 8.3 names the current app-shell surfaces before any source movement.
+
+This audit separates each current `apps/` directory into app shell role, build
+entrypoint leakage, platform part, board-specific part, future app shell
+direction, and migration risk.
+
+Core rule:
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+## Current App Directory Matrix
+
+| Current path | Current role | App shell part | Build entrypoint part | Platform part | Board-specific part | Future app shell direction | Migration risk |
+| --- | --- | --- | --- | --- | --- | --- | --- |
+| `legacy/app_implementations/esp_idf` | ESP-IDF build entrypoint plus ESP runtime compatibility shell | startup runtime, loop runtime, app facade access, target runtime config | ESP-IDF CMake, component manifest, sdkconfig target descriptors, local build output | ESP-IDF adapter calls and radio/GPS/team runtime glue | target descriptors for Tab5 and T-Display-P4 variants | `apps/esp32_lvgl` invoked by `builds/esp_idf` | ESP-IDF include paths, component registration, generated build dirs, target sdkconfig defaults |
+| `legacy/app_implementations/esp_pio` | PlatformIO/Arduino compatibility entrypoint | Arduino startup, loop runtime, app runtime access | root `platformio.ini`, library layout, PIO environment assumptions | Arduino/PIO startup and compatibility access | legacy target coupling through current PIO environments | `apps/nrf52_node` plus possible legacy ESP PIO compatibility path | PIO environments couple ESP/nRF assumptions; root build must stay stable |
+| `legacy/app_implementations/linux_sim` | Linux simulator and developer-tooling shell | simulator target startup, simulator composition root, smoke/probe tests | app-local CMake, presets, simulator scripts | SDL/desktop platform integration and host tooling | simulator geometry/input assumptions | `apps/linux_sim_shell` invoked by `builds/linux_cmake` | CMake helper and scripts are app-local; simulator remains fast validation path |
+| `legacy/app_implementations/linux_uconsole` | Linux uConsole/AIO2-class handheld shell | uConsole composition root and app model | local GTK/CMake assumptions | GTK/Linux handheld integration | uConsole/AIO2 product assumptions | `apps/linux_uconsole_gtk` invoked by `builds/linux_cmake` | GTK shell and app model are still adjacent; do not destabilize runtime |
+| `legacy/app_implementations/linux_rpi` | Pi OS / Cardputer Zero device shell and bring-up path | Raspberry Pi/Cardputer Zero product startup | CMake framebuffer path and M5 SDK/SCons path | Linux framebuffer, evdev, SDK host integration | Cardputer Zero hardware/device assumptions | future Linux device app shell under `builds/linux_cmake` | hardware validation and dual build path must stay intact |
+| `legacy/app_implementations/linux_unoq` | future UNO Q Linux shell placeholder | target placeholder | not yet authoritative | future Linux device integration | UNO Q product assumptions | future Linux UNO Q app shell under `builds/linux_cmake` | target profile and build path are early |
+| `legacy/app_implementations/gat562_mesh_evb_pro` | nRF/mono device app shell with board-adjacent runtime | device startup, loop runtime, protocol factory, UI runtime | PIO/root build assumptions outside this directory | embedded runtime glue | direct `boards/gat562_mesh_evb_pro` access | `apps/nrf52_node` invoked by `builds/pio_nrf52` | board facts and app runtime are close; separate only after nRF wrapper parity |
+
+## Findings
+
+`legacy/app_implementations/esp_idf` and `legacy/app_implementations/esp_pio` are still historical app-shell illusions
+because their names are build-system names and their responsibilities mix build
+entrypoint, compatibility app shell, and runtime glue.
+
+`legacy/app_implementations/linux_sim`, `legacy/app_implementations/linux_uconsole`, `legacy/app_implementations/linux_rpi`, and
+`legacy/app_implementations/linux_unoq` are closer to app shells, but their build scripts and app
+shell code are not yet normalized behind `builds/linux_cmake`.
+
+`legacy/app_implementations/gat562_mesh_evb_pro` has real product startup meaning, but it is too
+board-specific to be the final generic nRF52 app shell name.
+
+## Phase 8.3 Skeleton Direction
+
+Phase 8.3 adds semantic skeletons:
+
+| Future app shell | Current compatibility source | Build entrypoint | Renderer family | Status |
+| --- | --- | --- | --- | --- |
+| `apps/esp32_lvgl` | `legacy/app_implementations/esp_idf` | `builds/esp_idf` | LVGL | executable app shell baseline |
+| `apps/nrf52_node` | `legacy/app_implementations/esp_pio`, `legacy/app_implementations/gat562_mesh_evb_pro` | `builds/pio_nrf52` | mono/status or future embedded UI | executable app shell baseline |
+| `apps/linux_uconsole_gtk` | `legacy/app_implementations/linux_uconsole` | `builds/linux_cmake` | GTK | executable app shell baseline |
+| `apps/linux_sim_shell` | `legacy/app_implementations/linux_sim` | `builds/linux_cmake` | simulator/ASCII/host UI | executable app shell baseline |
+
+## Phase 8 Correction Executable Layout Baseline
+
+Phase 8 Correction turns the Linux app shell skeletons into executable CMake
+targets without migrating GTK or simulator runtime behavior.
+
+| App shell | CMake target | Config source | Smoke test | Transitional implementation root |
+| --- | --- | --- | --- | --- |
+| `apps/linux_uconsole_gtk` | `trailmate_linux_uconsole_gtk_shell` | `linux_uconsole_gtk_app_shell.cpp` | `linux_uconsole_gtk_app_shell_smoke.cpp` | `legacy/app_implementations/linux_uconsole` |
+| `apps/linux_sim_shell` | `trailmate_linux_sim_shell` | `linux_sim_app_shell.cpp` | `linux_sim_app_shell_smoke.cpp` | `legacy/app_implementations/linux_sim` |
+
+`legacy/app_implementations/linux_uconsole` and `legacy/app_implementations/linux_sim` are now explicitly marked with
+`TRANSITIONAL_IMPLEMENTATION_ROOT.md`.
+
+## Phase 8 Build/AppShell Executable Convergence
+
+Phase 8 Build/AppShell Executable Convergence turns ESP-IDF and PIO/nRF app
+shell placeholders into source-level executable shell descriptors while keeping
+physical build behavior in the transitional roots.
+
+| App shell | Build wrapper | Shell target or library | Config source | Transitional implementation root |
+| --- | --- | --- | --- | --- |
+| `apps/esp32_lvgl` | `builds/esp_idf` | `trailmate_esp32_lvgl_app_shell` | `esp32_lvgl_app_shell.cpp` | `legacy/app_implementations/esp_idf` |
+| `apps/nrf52_node` | `builds/pio_nrf52` | `trailmate-nrf52-node-app-shell` | `nrf52_node_app_shell.cpp` | `legacy/app_implementations/esp_pio`, `legacy/app_implementations/gat562_mesh_evb_pro` |
+| `apps/linux_uconsole_gtk` | `builds/linux_cmake` | `trailmate_linux_uconsole_gtk_shell` | `linux_uconsole_gtk_app_shell.cpp` | `legacy/app_implementations/linux_uconsole` |
+| `apps/linux_sim_shell` | `builds/linux_cmake` | `trailmate_linux_sim_shell` | `linux_sim_app_shell.cpp` | `legacy/app_implementations/linux_sim` |
+
+Compatibility adapter targets and descriptors:
+
+- `linux_uconsole_gtk_historical_source_descriptor`
+- `linux_sim_historical_source_descriptor`
+- `esp32_lvgl_historical_source_descriptor`
+- `ESP_IDF_COMPONENT_SOURCES.cmake`
+- `trailmate_nrf52_pio_legacy_adapter`
+
+This changes the status of `apps/esp32_lvgl` and `apps/nrf52_node` from
+skeleton only to executable app shell baseline. It still does not move ESP-IDF
+CMake, PlatformIO environments, Linux GTK runtime behavior, or simulator
+runtime behavior.
+
+## App Shell Boundary
+
+An app shell may:
+
+- select target profile
+- select board package
+- select platform family
+- select UX profile / UX pack
+- hand off to product composition
+- start runtime facade
+
+An app shell must not:
+
+- own build host files
+- define board facts
+- contain SDK/HAL implementation
+- implement screen internals
+- assemble Chat/Map/GPS details behind hidden globals
+
+## Migration Notes
+
+The skeleton directories weaken the old assumption that `legacy/app_implementations/esp_idf` and
+`legacy/app_implementations/esp_pio` are final app shell names. They do not change builds.
+
+Future phases should migrate one shell at a time only after:
+
+- build wrapper parity exists
+- target profile documents identify the selected app shell
+- UX profile documents identify the selected UX pack
+- legacy compatibility adapters have explicit exit conditions
+- existing build/test gates remain green
+
+## Non-Action
+
+Phase 8.3 does not move source files, change include paths, edit CMake,
+edit PlatformIO, split `ui_shared`, implement UX packs, or create real app
+composition roots.
diff --git a/docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md b/docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md
new file mode 100644
index 00000000..340ad6ae
--- /dev/null
+++ b/docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md
@@ -0,0 +1,203 @@
+# Build Entrypoint Normalization Audit
+
+## Purpose
+
+Phase 8.2 establishes build entrypoint semantics without moving the current
+build systems.
+
+The audit distinguishes:
+
+- build entrypoint
+- transitional build entrypoint
+- product app shell
+- platform adapter
+- board facts
+
+The normalization baseline is:
+
+```text
+ESP / ESP32-P4 authoritative build entrypoint = builds/esp_idf
+nRF52 authoritative build entrypoint = builds/pio_nrf52
+Linux authoritative build entrypoint = builds/linux_cmake
+```
+
+Core rule:
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+```
+
+## Current Build/App Surface
+
+| Current path | Current role | Final role | Migration risk | Blocking reason | Next action |
+| --- | --- | --- | --- | --- | --- |
+| `legacy/app_implementations/esp_idf` | ESP-IDF build entrypoint plus transitional ESP app/runtime shell | `builds/esp_idf` thin wrapper invoking a future ESP LVGL app shell | ESP-IDF CMake include paths, target sdkconfig defaults, generated build dirs, component registration | Existing ESP-IDF targets build through this directory | Create wrapper skeleton first; move build-host files only after equivalent invocation is proven |
+| `legacy/app_implementations/esp_pio` | PlatformIO/Arduino compatibility entrypoint and legacy ESP app glue | split into `builds/pio_nrf52` for nRF52 authority and possible legacy ESP PIO compatibility wrapper | PlatformIO environments and root `platformio.ini` still reference current layout | nRF and legacy ESP build flows are coupled through PIO conventions | Keep transitional; introduce family-specific wrapper docs before moving files |
+| `legacy/app_implementations/linux_sim` | Linux simulator and developer-tooling shell with CMake project files | Linux app shell invoked by `builds/linux_cmake` | CMake source helper and simulator scripts live in current app directory | Simulator remains a fast validation target and should not be disrupted | Document as transitional CMake app shell; wrapper should invoke existing CMake path first |
+| `legacy/app_implementations/linux_uconsole` | uConsole/AIO2-class Linux handheld shell | Linux app shell invoked by `builds/linux_cmake` | GTK/uConsole app model and platform code are adjacent | Device shell is still evolving and tied to app-local structure | Keep app shell; route future canonical build through Linux CMake wrapper |
+| `legacy/app_implementations/linux_rpi` | Pi OS / Cardputer Zero device shell and CMake/SCons bring-up paths | Linux app shell invoked by `builds/linux_cmake` | CMake framebuffer path and M5 SDK/SCons path coexist | Device path still needs build and hardware validation | Keep as transitional Linux app shell; wrapper should not absorb device behavior |
+| `legacy/app_implementations/linux_unoq` | Future UNO Q Linux shell placeholder | Linux app shell invoked by `builds/linux_cmake` | Early target, low source volume | Final product identity and build path not fully proven | Keep as app shell candidate; delay migration until target profile exists |
+| `legacy/app_implementations/gat562_mesh_evb_pro` | nRF/mono device app shell with board-specific runtime access | future nRF52 app shell invoked by `builds/pio_nrf52` | Board app shell and board facts are currently close together | PIO/nRF split is not yet represented by final app shell names | Keep stable; later separate app shell from board facts and PIO wrapper |
+| root `platformio.ini` | current PlatformIO build authority for Arduino/PIO targets | invoked or wrapped by `builds/pio_nrf52` and any legacy PIO compatibility entrypoint | Environment names, library paths, and board configs are sensitive | Current PIO build must remain unbroken | Do not edit in Phase 8.2; document as existing authority |
+| root `CMakeLists.txt` | root CMake/ESP-IDF historical entrypoint surface | clarified by `builds/esp_idf` and `builds/linux_cmake` wrappers | Root CMake has ESP-IDF history and Linux CMake must not hijack it | Multiple CMake host meanings coexist | Do not edit in Phase 8.2; document target authority before moving |
+| `legacy/app_implementations/esp_idf/build.tab5` | generated or local ESP-IDF build output under app tree | build artifact outside final source semantics | Generated files may be large or host-specific | Existing developer workflow produced it there | Do not normalize in Phase 8.2; clean artifact policy separately |
+| root `build/` | generated build output | build artifact | May contain local host output | Unknown local use | Leave untouched |
+| root `build.cardputer` | generated target build output | build artifact | May be referenced by local tooling | Unknown local use | Leave untouched |
+| root `build.tab5` | generated target build output | build artifact | May be referenced by local tooling | Unknown local use | Leave untouched |
+| root `build.t_display_p4` | generated target build output | build artifact | May be referenced by local tooling | Unknown local use | Leave untouched |
+| root `build.t_display_p4_amoled` | generated target build output | build artifact | May be referenced by local tooling | Unknown local use | Leave untouched |
+| root `build.t_display_p4_tft` | generated target build output | build artifact | May be referenced by local tooling | Unknown local use | Leave untouched |
+
+## Findings
+
+`legacy/app_implementations/esp_idf` is not a final product app shell. It is a transitional ESP-IDF
+build entrypoint and compatibility shell.
+
+`legacy/app_implementations/esp_pio` is not a final product app shell. It is a transitional
+PlatformIO/Arduino build entrypoint and compatibility shell.
+
+Linux app directories are closer to app shells, but they still carry local
+CMake or device bring-up mechanics. Phase 8.2 should document that future
+`builds/linux_cmake` wrappers invoke selected Linux app shells rather than
+absorbing their product behavior.
+
+Generated `build*` directories are not architecture directories. They should
+not be treated as app shells, build entrypoint source trees, modules, boards, or
+platform adapters.
+
+## BuildEntrypoint Constraints
+
+A build entrypoint may:
+
+- hold build-system wrapper files
+- call an app shell entrypoint
+- pass build flags, target identity, and generated paths
+- isolate ESP-IDF, PlatformIO, or CMake conventions
+
+A build entrypoint must not:
+
+- assemble Chat runtime
+- assemble Map runtime
+- assemble GPS runtime
+- select UX pack
+- define board facts
+- interpret protocol payloads
+- own renderer widget trees
+
+## Transitional Compatibility Rule
+
+`legacy/app_implementations/esp_idf` and `legacy/app_implementations/esp_pio` are allowed to remain because they are
+recorded transitional historical build entrypoints.
+
+New build-system-named directories under `apps/` should not be added. Future
+build-system identity belongs under `builds/`.
+
+## Phase 8.2 Scope
+
+Phase 8.2 creates only:
+
+- `docs/decisions/ADR_BUILD_ENTRYPOINTS.md`
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md`
+- `docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md`
+- `builds/README.md`
+- `builds/esp_idf/README.md`
+- `builds/pio_nrf52/README.md`
+- `builds/linux_cmake/README.md`
+
+No build behavior changes in this phase.
+
+## Phase 8 Correction: Linux Executable Wrapper Baseline
+
+Phase 8 Correction changes the Linux line from declared-only authority to an
+executable wrapper baseline.
+
+`builds/linux_cmake` now contains a real `CMakeLists.txt`. It is still a thin
+build wrapper: it does not include `TrailMateLinuxSources.cmake`, does not call
+`trailmate_add_linux_common`, and does not assemble Chat/Map/GPS services. Its
+job is to invoke app shells through `add_subdirectory`.
+
+Executable proof chain:
+
+```text
+builds/linux_cmake
+  -> apps/linux_uconsole_gtk
+  -> apps/linux_sim_shell
+```
+
+Linux app shell status:
+
+| App shell | Executable target | Transitional source | Status |
+| --- | --- | --- | --- |
+| `apps/linux_uconsole_gtk` | `trailmate_linux_uconsole_gtk_shell` | `legacy/app_implementations/linux_uconsole` | executable app shell baseline |
+| `apps/linux_sim_shell` | `trailmate_linux_sim_shell` | `legacy/app_implementations/linux_sim` | executable app shell baseline |
+
+The old implementation roots are explicitly marked:
+
+- `legacy/app_implementations/linux_uconsole/TRANSITIONAL_IMPLEMENTATION_ROOT.md`
+- `legacy/app_implementations/linux_sim/TRANSITIONAL_IMPLEMENTATION_ROOT.md`
+
+ESP-IDF and PlatformIO physical migration remains deferred. The Linux line is
+the first proof of the direction:
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+```
+
+## Phase 8 Build/AppShell Executable Convergence
+
+Phase 8 Build/AppShell Executable Convergence extends the executable baseline
+to all three platform families without moving physical build files.
+
+Executable proof chains:
+
+```text
+builds/linux_cmake
+  -> apps/linux_uconsole_gtk
+  -> linux_uconsole_gtk_historical_source_descriptor
+  -> product_composition / modules/ui_gtk_runtime
+
+builds/linux_cmake
+  -> apps/linux_sim_shell
+  -> linux_sim_historical_source_descriptor
+  -> product_composition / modules/ui_ascii_runtime
+
+builds/esp_idf
+  -> apps/esp32_lvgl
+  -> trailmate_esp32_lvgl_app_shell
+  -> builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake
+  -> apps/esp32_lvgl + platform/esp/radio
+
+builds/pio_nrf52
+  -> apps/nrf52_node
+  -> trailmate-nrf52-node-app-shell
+  -> trailmate_nrf52_pio_legacy_adapter
+  -> legacy/app_implementations/esp_pio / legacy/app_implementations/gat562_mesh_evb_pro
+```
+
+The wrapper files are intentionally thin:
+
+- `builds/linux_cmake/CMakeLists.txt` invokes Linux app shells.
+- `builds/esp_idf/CMakeLists.txt` invokes the ESP32 LVGL app shell baseline.
+- `builds/pio_nrf52/platformio.ini` declares the nRF52 PlatformIO wrapper
+  authority and transitional roots.
+
+The following historical roots are explicitly transitional implementation
+roots:
+
+- `legacy/app_implementations/linux_uconsole`
+- `legacy/app_implementations/linux_sim`
+- `legacy/app_implementations/esp_idf`
+- `legacy/app_implementations/esp_pio`
+- `legacy/app_implementations/gat562_mesh_evb_pro`
+
+Physical migration remains deferred for ESP-IDF sdkconfig/component registration
+and current PlatformIO environments. This batch proves the authority direction:
+
+```text
+Build Entrypoint invokes.
+App Shell selects.
+Transitional Adapter delegates.
+Legacy implementation still runs.
+```
diff --git a/docs/audits/CHAT_DELIVERY_ACTION_OWNERSHIP_AUDIT.md b/docs/audits/CHAT_DELIVERY_ACTION_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..9e3110ee
--- /dev/null
+++ b/docs/audits/CHAT_DELIVERY_ACTION_OWNERSHIP_AUDIT.md
@@ -0,0 +1,92 @@
+# Chat Delivery Action Ownership Audit
+
+## Purpose
+
+Phase 7.4 establishes ownership for chat delivery actions:
+
+- retry
+- cancel pending
+- clear failure
+
+These actions are runtime commands. They are not presentation model state and
+not renderer state.
+
+## Current State
+
+| Action | Current owner | Current UI path | Problem |
+| --- | --- | --- | --- |
+| Retry failed message | `ChatService::resendFailed` exists, but no delivery action owner | not consistently exposed | retry ownership is not explicit |
+| Cancel queued/sending | no unified pending owner | no stable UI path | cancelling radio/runtime send is not modeled |
+| Clear failure | `ChatDeliveryReadModel` can clear records, but callers are not owned | tests/manual enrichment only | renderer/controller could be tempted to mutate read model |
+
+## Current Failed Message Retry
+
+`ChatService` can resend failed messages by message id, but this is not the same
+as a delivery action boundary.
+
+Phase 7.4 defines a retry port first:
+
+```text
+ChatDeliveryActionService
+  -> IRetryChatMessagePort
+```
+
+The concrete retry engine remains deferred.
+
+## Current Pending Cancel
+
+There is no unified cancel mechanism for already queued radio/runtime sends.
+
+Phase 7.4 only defines projection ownership:
+
+```text
+CancelPending
+  -> clear queued/sending delivery projection
+```
+
+It does not cancel an already submitted radio packet.
+
+## Current Clear Failure
+
+`ChatDeliveryReadModel::clear(...)` can remove a delivery record. Phase 7.4
+makes `ChatDeliveryActionService` the owner of this command path.
+
+Renderers and controllers must not directly clear delivery records.
+
+## Boundary Rule
+
+Delivery actions belong to:
+
+```text
+ChatDeliveryActionRequest
+  -> IChatDeliveryActionSink
+    -> ChatDeliveryActionService
+```
+
+They do not belong to:
+
+- `ChatWorkspaceModel`
+- renderer widgets
+- `ChatUiController` local state
+- `ui_presentation`
+
+## Phase 7.4 Decision
+
+Phase 7.4 implements:
+
+- `ClearFailure` for failed delivery records
+- `CancelPending` for queued/sending delivery records
+- `Retry` as a port-owned action, returning `Unsupported` when no retry port is
+  wired
+
+Phase 7.4 adds `LegacyChatDeliveryActionBridge` for UI/runtime compatibility.
+The bridge maps `MessageRef` to `ChatDeliveryRef` and calls the delivery action
+sink. It must not render UI, build snapshots, or mutate the read model directly.
+
+## Deferred
+
+- full retry engine
+- durable pending queue
+- radio packet cancellation
+- retry button/menu UX
+- structured retry failure reporting
diff --git a/docs/audits/CHAT_DELIVERY_EVENT_PROJECTION_AUDIT.md b/docs/audits/CHAT_DELIVERY_EVENT_PROJECTION_AUDIT.md
new file mode 100644
index 00000000..b0eeb167
--- /dev/null
+++ b/docs/audits/CHAT_DELIVERY_EVENT_PROJECTION_AUDIT.md
@@ -0,0 +1,87 @@
+# Chat Delivery Event Projection Audit
+
+## Purpose
+
+Phase 7.3 connects runtime send/delivery events to
+`ChatDeliveryEventProjector`.
+
+It does not implement a full ACK/retry system. It projects currently available
+send-result facts into `ChatDeliveryReadModel` and defines hooks for delivery
+events that do not yet have a unified source.
+
+## Current Event Sources
+
+| Event | Current source | Data available | Projection status |
+| --- | --- | --- | --- |
+| `ChatSendResultEvent` | EventBus / radio adapter / app runtime path | `msg_id`, `success`, event timestamp | can project `Sent` / `Failed` |
+| `PeerKeyMissing` | mesh/direct send result | available in `mesh::SendFailure`, not in `ChatSendResultEvent` | mapper/hook defined |
+| `LocalIdentityMissing` | mesh/direct send result | available in `mesh::SendFailure`, not in `ChatSendResultEvent` | mapper/hook defined |
+| `RadioSendFailed` | mesh/direct send result | available in `mesh::SendFailure`, not in `ChatSendResultEvent` | mapper/hook defined |
+| `UnsupportedProtocol` | mesh/direct send result | available in legacy send failure paths, not in `ChatSendResultEvent` | mapper/hook defined |
+| `Rejected` | UI/action sink or runtime coarse failure | coarse only unless adapter passes detail | mapper/hook defined |
+| `AckTimeout` | ACK tracker / send-result timeout path | not unified | adapter hook defined first |
+
+## Current `ChatSendResultEvent`
+
+`ChatSendResultEvent` currently carries:
+
+- `msg_id`
+- `success`
+- event timestamp inherited from `sys::Event`
+
+It does not carry structured failure detail. Phase 7.3 therefore maps
+`success=false` to:
+
+```text
+DeliveryState::Failed + SendFailureKind::Unknown
+```
+
+until a future event can provide a structured failure kind.
+
+## Current ACK Timeout
+
+ACK timeout ownership is not unified. Some paths treat send-result failure as a
+coarse timeout/failure, while lower-level mesh send code can expose
+`AckTimeout`.
+
+Phase 7.3 introduces an adapter hook:
+
+```text
+LegacyChatDeliveryEventBridge::onAckTimeout(...)
+```
+
+This hook projects:
+
+```text
+DeliveryState::Failed + SendFailureKind::AckTimeout
+```
+
+It does not retry, cancel, or change message storage.
+
+## Rule
+
+`ChatUiController` must not update delivery read model.
+
+Event projection must be owned by composition root / runtime bridge. A legacy
+controller may forward an existing event to the bridge while the bridge and
+read model remain owned by runtime/composition code.
+
+## Phase 7.3 Decision
+
+Phase 7.3 introduces:
+
+- `IChatDeliveryEventPort`
+- `ProjectingChatDeliveryEventPort`
+- `LegacyChatSendResultMapper`
+- `LegacyChatDeliveryEventBridge`
+
+`ChatPresentationSource` continues to read `ChatDeliveryReadModel` and
+enrich `MessageRow.delivery` / `MessageRow.failure`.
+
+## Deferred
+
+- `ChatSendResultEventV2` with structured failure kind
+- direct mesh send-result detail plumbing into EventBus
+- ACK tracker unification
+- retry/cancel actions
+- durable delivery state storage
diff --git a/docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md b/docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..b834c9e9
--- /dev/null
+++ b/docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md
@@ -0,0 +1,139 @@
+# Chat Delivery Ownership Audit
+
+## Purpose
+
+Phase 7.1 establishes runtime ownership for chat delivery, pending, and failure
+state.
+
+This audit does not implement a complete reliable messaging system. It records
+where delivery state currently comes from, where failure detail is lost, and
+which runtime/read-model boundary should own UI-readable delivery state.
+
+## Current State
+
+| State | Current source | Current reader | Problem |
+| --- | --- | --- | --- |
+| Queued | `ChatMessage::status` | `ChatPresentationSource` / chat mapper | coarse only |
+| Sent | `ChatMessage::status` | `ChatPresentationSource` / chat mapper | send success is not delivery acknowledgement |
+| Failed | `ChatMessage::status` | `ChatPresentationSource` / chat mapper | failure reason is lost |
+| Received | `ChatMessage::status` | `ChatPresentationSource` / chat mapper | incoming state is readable but not part of a delivery model |
+| PeerKeyMissing | send result / mesh protocol path | not projected consistently | UI sees `Unknown` failure |
+| LocalIdentityMissing | send result / mesh protocol path | not projected consistently | UI sees `Unknown` failure |
+| RadioSendFailed | radio/send path | not projected consistently | UI sees `Unknown` failure |
+| UnsupportedProtocol | action/send path | action result only | not tied to message delivery record |
+| Rejected | action/send path | action result only | not tied to message delivery record |
+| AckTimeout | ACK tracker / retry path | not unified | no stable owner |
+
+## Current Send Result
+
+Current send result is split across:
+
+- `ChatService::sendText(...)`, which creates a `ChatMessage` with coarse
+  `MessageStatus::Queued` or `MessageStatus::Failed`
+- mesh adapter send return values
+- protocol-specific direct send paths that may know peer key or identity
+  failures
+- UI action sinks that expose only coarse `UiActionResult`
+
+The presentation layer can tell that a message failed, but cannot reliably tell
+why.
+
+## Current ChatMessage Status
+
+`ChatMessage::status` can express:
+
+- `Incoming`
+- `Queued`
+- `Sent`
+- `Failed`
+
+It cannot express:
+
+- sending
+- delivered/ACKed
+- peer key missing
+- local identity missing
+- radio send failure
+- ACK timeout
+- unsupported protocol
+- rejected by runtime policy
+
+## Current ACK Timeout
+
+ACK timeout and retry state are currently adapter/runtime concerns. They are not
+projected into a stable UI-readable chat delivery model.
+
+Phase 7.1 should not move ACK behavior itself. It should create a place where
+ACK timeout events can be projected.
+
+## Current Failure Visibility
+
+The UI currently learns failure through coarse message status or action result.
+
+Renderer code must not infer failure type from:
+
+- labels
+- colors
+- button state
+- spinner state
+- transient controller flags
+- ChatUiController local widget state
+
+## Transient vs Persistent State
+
+| State | Phase 7.1 interpretation |
+| --- | --- |
+| queued | UI-readable runtime projection |
+| sending | transient runtime projection |
+| sent | runtime/store projection |
+| delivered | future ACK projection |
+| failed | runtime projection with structured reason |
+| key missing | structured failure reason |
+| radio failed | structured failure reason |
+| ACK timeout | structured failure reason from future ACK owner |
+
+Phase 7.1 does not require every delivery record to become durable storage.
+It does require a stable owner for the UI-readable projection.
+
+## Boundary Rule
+
+`ChatWorkspaceModel` must not own pending/failure.
+
+Renderer must not infer delivery/failure from labels, colors, or button state.
+
+`ChatPresentationSource` may read a delivery read model and enrich
+`MessageRow`, but it must not maintain pending queues or receive send events.
+
+## Target Ownership
+
+Delivery runtime state is owned by:
+
+```text
+ChatDeliveryReadModel / ChatDeliveryStateStore
+```
+
+or by `ChatService` only if `ChatService` later explicitly stores structured
+delivery state.
+
+## Phase 7.1 Decision
+
+Phase 7.1 introduces a dedicated delivery read model first.
+
+Later phases may merge or persist this state through `ChatService` if that
+becomes the right runtime owner. Until then, delivery state remains outside:
+
+- `ChatWorkspaceModel`
+- renderer widgets
+- ChatUiController visual state
+- `ui_presentation`
+
+## Non-Blockers
+
+The following remain future work:
+
+- full retry engine
+- durable ACK state
+- radio adapter cleanup
+- key verification flow cleanup
+- ChatUiController split
+- Team rich payload delivery state
diff --git a/docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md b/docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md
new file mode 100644
index 00000000..82d2daae
--- /dev/null
+++ b/docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md
@@ -0,0 +1,84 @@
+# Chat Legacy Delivery Burn-down Audit
+
+## Scope
+
+Phase 9.4 burns down the UI-level Chat delivery legacy bridge pair:
+
+- `LegacyChatDeliveryActionBridge`
+- `LegacyChatDeliveryEventBridge`
+
+This audit does not burn down the core chat compatibility mapper
+`chat/delivery/legacy_chat_delivery_bridge.*`. That core surface still maps
+historical `ChatMessage` state into delivery records and remains governed by a
+separate delivery projection exit condition.
+
+## Distinction
+
+| Surface | Meaning | Phase 9.4 decision |
+| --- | --- | --- |
+| Chat delivery action port | Runtime/UI command port for retry, cancel, and clear-failure actions | formalized as `ui_chat_runtime::IChatDeliveryActionPort` |
+| Chat delivery event port | Runtime/UI event sink for projected delivery events | formalized as `ui_chat_runtime::IChatDeliveryEventPort` |
+| Chat delivery action adapter | Compatibility mapping from UI `MessageRef` to delivery action request | owned by `ui_chat_runtime::ChatDeliveryActionPortAdapter` |
+| Chat delivery event projection adapter | Compatibility mapping from send-result/ACK events to delivery projection | owned by `ui_chat_runtime::ChatDeliveryEventProjectionAdapter` |
+| Legacy UI bridge headers | Downstream source compatibility only | deprecated forwarding aliases; no implementation ownership |
+
+## LegacyChatDeliveryActionBridge
+
+| Field | Value |
+| --- | --- |
+| Current compatibility header | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h` |
+| Former implementation source | `modules/ui_legacy_adapters/src/legacy_chat_delivery_action_bridge.cpp` |
+| Current source status | removed; no real implementation remains under `ui_legacy_adapters/src` |
+| Current callers | no main runtime callers; only legacy alias compatibility tests and documentation references |
+| Replacement | `modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h` and `modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp` |
+| Port | `modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h` |
+| Migration decision | main runtime code includes `ui_chat_runtime/chat_delivery_action_port_adapter.h`; the old header is a deprecated alias only |
+
+Caller classification:
+
+| Caller class | Status |
+| --- | --- |
+| Main runtime caller | migrated to `ChatDeliveryActionPortAdapter` |
+| Test caller | `test_chat_delivery_action_port_adapter.cpp` tests the real adapter; `test_legacy_chat_delivery_action_bridge_legacy_alias.cpp` tests compatibility alias only |
+| Forwarding header | old `ui_legacy_adapters` and `ui_shared` compatibility headers alias the stable adapter |
+| Audit/doc reference | allowed for burn-down history and removal planning |
+
+## LegacyChatDeliveryEventBridge
+
+| Field | Value |
+| --- | --- |
+| Current compatibility header | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h` |
+| Former implementation source | `modules/ui_legacy_adapters/src/legacy_chat_delivery_event_bridge.cpp` |
+| Current source status | removed; no real implementation remains under `ui_legacy_adapters/src` |
+| Current callers | no main runtime callers; only legacy alias compatibility tests and documentation references |
+| Replacement | `modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h` and `modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp` |
+| Port | `modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h` |
+| Migration decision | main runtime code includes `ui_chat_runtime/chat_delivery_event_projection_adapter.h`; the old header is a deprecated alias only |
+
+Caller classification:
+
+| Caller class | Status |
+| --- | --- |
+| Main runtime caller | migrated to `ChatDeliveryEventProjectionAdapter` |
+| Test caller | `test_chat_delivery_event_projection_adapter.cpp` tests the real adapter; `test_legacy_chat_delivery_event_bridge_legacy_alias.cpp` tests compatibility alias only |
+| Forwarding header | old `ui_legacy_adapters` and `ui_shared` compatibility headers alias the stable adapter |
+| Audit/doc reference | allowed for burn-down history and removal planning |
+
+## Main Runtime Include Audit
+
+The main runtime path now uses stable headers:
+
+- `ui_chat_runtime/chat_delivery_action_port_adapter.h`
+- `ui_chat_runtime/chat_delivery_event_projection_adapter.h`
+
+The following direct includes are forbidden outside compatibility alias tests
+and forwarding headers:
+
+- `ui_legacy_adapters/legacy_chat_delivery_action_bridge.h`
+- `ui_legacy_adapters/legacy_chat_delivery_event_bridge.h`
+
+## Removal Condition
+
+The remaining legacy headers may be deleted after downstream consumers no
+longer include either compatibility path. Until then, they must stay
+forwarding-only aliases and must not regain implementation logic.
diff --git a/docs/audits/CHAT_PENDING_FAILURE_AUDIT.md b/docs/audits/CHAT_PENDING_FAILURE_AUDIT.md
new file mode 100644
index 00000000..e5b20dac
--- /dev/null
+++ b/docs/audits/CHAT_PENDING_FAILURE_AUDIT.md
@@ -0,0 +1,112 @@
+# Chat Pending Failure Audit
+
+Phase 5.6-e exposes the first chat delivery projection, but the current
+business model does not yet preserve structured send failure reasons all the
+way to `ChatWorkspaceSnapshot`.
+
+## Boundary
+
+`ChatWorkspaceModel` does not own pending messages, retry state, ACK tracking,
+or failure inference. It only forwards UI actions and asks the presentation
+source for an immutable snapshot.
+
+Renderer code must not infer pending or failure state from colors, labels,
+last send result events, or local widget state. Delivery and failure state must
+come from:
+
+```text
+ChatService / MeshSession / ACK tracker / pending store
+    -> ChatPresentationSource
+        -> ui::chat::MessageRow.delivery
+        -> ui::chat::MessageRow.failure
+```
+
+## Current Projection
+
+The current `chat_presentation_adapters::mapMessageStatus` mapping is:
+
+| Source state | UI delivery state | UI failure kind | Status |
+| --- | --- | --- | --- |
+| `chat::MessageStatus::Incoming` | `Received` | `None` | Supported |
+| `chat::MessageStatus::Queued` | `Queued` | `None` | Supported |
+| `chat::MessageStatus::Sent` | `Sent` | `None` | Supported |
+| `chat::MessageStatus::Failed` | `Failed` | `Unknown` | Supported as coarse fallback |
+
+`chat::ChatMessage` currently carries only coarse `MessageStatus`. It does not
+carry the reason a send failed.
+
+## Structured Failure Sources
+
+| Failure | Known current source | Persisted in `ChatMessage` | UI projection today | Gap |
+| --- | --- | --- | --- | --- |
+| `PeerKeyMissing` | `mesh::SendFailure::PeerKeyMissing` / mesh event | No | `Unknown` after coarse failure | Failure reason is not stored with chat message |
+| `LocalIdentityMissing` | `mesh::SendFailure::LocalIdentityMissing` | No | `Unknown` after coarse failure | Failure reason is not stored with chat message |
+| `RadioSendFailed` | `mesh::SendFailure::RadioSendFailed` | No | `Unknown` after coarse failure | Failure reason is not stored with chat message |
+| `AckTimeout` | `mesh::SendFailure::AckTimeout` or legacy ACK timeout | No | `Unknown` after coarse failure | ACK ownership is split across adapters |
+| `UnsupportedProtocol` | `mesh::SendFailure::ProtocolUnsupported` or UI sink unsupported route | No | `Unsupported` action result or `Unknown` message failure | Action failure and stored message failure are separate |
+| `Rejected` | `ChatService::sendText` returning no message id or failed stored message | No structured detail | `Rejected` action result, `Unknown` message failure | Synchronous action result is not persisted as message failure detail |
+
+## Ownership Decision
+
+Until a stable owner is chosen, Phase 5.6-e must not add a pending queue to
+`ChatWorkspaceModel` and must not make renderer code remember send failures.
+
+The next viable owner should be one of:
+
+- `ChatService`, if message delivery state is persisted as part of chat history.
+- A chat pending/failure read model, if ACK and retry state remains separate
+  from stored history.
+- A Mesh-to-chat event projection, if structured `mesh::SendResult` events are
+  normalized before reaching chat presentation.
+
+Whichever owner is chosen must expose enough state for
+`IChatPresentationSource` to fill:
+
+```text
+MessageRow.delivery
+MessageRow.failure
+MessageRef.local_id or MessageRef.nonce_or_seq
+```
+
+## Current Constraint
+
+The chat read projection may continue projecting:
+
+```text
+Failed -> MessageDeliveryState::Failed
+Failed -> MessageFailureKind::Unknown
+```
+
+That fallback is acceptable only while structured failure ownership is missing.
+It must not be interpreted as completion of detailed pending/failure UI.
+
+## Phase 5.6 Closeout Decision
+
+Phase 5.6-closeout does not introduce a new pending queue.
+
+Structured failure remains deferred until one of the following is chosen:
+
+1. `ChatService` stores structured failure on `ChatMessage`.
+2. A ChatPendingReadModel aggregates `MeshSession` / ACK tracker / send result
+   events.
+3. A Mesh-to-chat event projector normalizes `SendResult` into chat delivery
+   updates.
+
+Until then:
+
+```text
+Failed -> MessageDeliveryState::Failed
+Failed -> MessageFailureKind::Unknown
+```
+
+is the only supported compatibility projection.
+
+## Prohibited Workaround
+
+Do not:
+
+- keep last send failure in `ChatWorkspaceModel`
+- let LVGL widgets remember failure state
+- infer failure from text color
+- infer pending from a button state
+- create a renderer-side pending message list
diff --git a/docs/audits/CHAT_RUNTIME_EVENT_PUMP_AUDIT.md b/docs/audits/CHAT_RUNTIME_EVENT_PUMP_AUDIT.md
new file mode 100644
index 00000000..041725aa
--- /dev/null
+++ b/docs/audits/CHAT_RUNTIME_EVENT_PUMP_AUDIT.md
@@ -0,0 +1,52 @@
+# Chat Runtime Event Pump Audit
+
+## Purpose
+
+Phase 7.7 moves Chat runtime scheduling and event projection out of `ChatUiController`.
+
+The controller may refresh UI, open modals, and navigate screens. It must not own runtime event projection or ChatService scheduling.
+
+## Current State Before Phase 7.7
+
+| Runtime concern | Current owner before 7.7 | Problem | Target owner |
+| --- | --- | --- | --- |
+| EventBus chat event entry | `IChatUiRuntime::onChatEvent(...)` registered to `ChatUiController` | controller receives runtime events directly | `ChatPageRuntimeFacade` / `ChatPageRuntimeEventPump` |
+| `ChatSendResultEvent` delivery projection | `ChatUiController::onChatEvent(...)` calls `LegacyChatDeliveryEventBridge` | UI controller updates delivery runtime projection | `ChatPageRuntimeEventPump` |
+| Key verification source/session update | `ChatUiController::onChatEvent(...)` calls `LegacyKeyVerificationSource` | UI controller updates runtime/presentation session | `ChatPageRuntimeEventPump` |
+| `ChatService::processIncoming()` | `ChatUiController::update()` | UI tick schedules runtime work | `ChatPageRuntimeEventPump::update()` |
+| `ChatService::flushStore()` | `ChatUiController::update()` | UI tick owns store flush cadence | `ChatPageRuntimeEventPump::update()` |
+| UI refresh after new message | `ChatUiController::onChatEvent(...)` | valid UI refresh mixed with runtime projection | `IChatUiRefreshSink::onRuntimeMessageArrived(...)` |
+| UI refresh after send result | `ChatUiController::onChatEvent(...)` | valid UI refresh mixed with delivery projection | `IChatUiRefreshSink::onRuntimeSendResult(...)` |
+| Key verification modal display | `ChatUiController::onChatEvent(...)` | valid modal display mixed with source/session update | `IChatUiRefreshSink::showKeyVerification(...)` |
+
+## Phase 7.7 Split
+
+`ChatUiController::onChatEvent(...)` currently performs both:
+
+- runtime projection
+- UI refresh
+
+`ChatUiController::update()` currently performs both:
+
+- `ChatService::processIncoming()` / `ChatService::flushStore()`
+- UI refresh dirty-check
+
+Phase 7.7 splits these responsibilities:
+
+| Responsibility | Owner |
+| --- | --- |
+| Runtime event routing | `ChatPageRuntimeEventPump` |
+| Delivery projection | `LegacyChatDeliveryEventBridge` called by event pump |
+| Key verification source/session update | `LegacyKeyVerificationSource` called by event pump |
+| Chat incoming/store cadence | `ChatPageRuntimeEventPump::update()` |
+| UI list/conversation refresh | `IChatUiRefreshSink` implemented by `ChatUiController` |
+| Runtime facade registration | `chat_page_runtime.cpp` registers `ChatPageRuntimeFacade`, not the controller |
+
+## Remaining Legacy
+
+| Legacy surface | Why it remains | Exit condition |
+| --- | --- | --- |
+| `ChatPageRuntimeEventPump` calls `ChatService` directly | It is the Phase 7.7 runtime pump owner | Later app shell scheduler can own cadence across all pages |
+| `ChatUiController` still reads `ChatService` for UI refresh | Conversation cache and legacy screen components still use core `ChatMessage` | Chat presentation workspace fully drives conversation UI |
+| Key verification events still use legacy source/session | Protocol-specific key verification adapters remain legacy | Split or rename protocol adapters |
+| Team rich payload formatting remains in controller | Not part of event-pump ownership | Team rich payload presentation adapter exists |
diff --git a/docs/audits/CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md b/docs/audits/CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md
new file mode 100644
index 00000000..467046ab
--- /dev/null
+++ b/docs/audits/CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md
@@ -0,0 +1,57 @@
+# Chat UI Controller Burn-down Audit
+
+## Purpose
+
+Phase 7.6 records what `ChatUiController` is still allowed to do, what runtime ownership has already moved out, and what legacy responsibilities remain.
+
+This audit prevents new Chat / Team / key verification ownership from being added back to the legacy controller.
+
+## A. Temporary UI Responsibilities
+
+| Responsibility | Why it may remain | Boundary |
+| --- | --- | --- |
+| LVGL screen lifecycle | Current chat screen is still an LVGL controller/shell | May create and destroy screen widgets only |
+| Modal open / close coordination | Existing key verification and Team position picker are modal UI flows | Must render from snapshots or submit action DTOs |
+| Textarea input parsing | Compose and verification number inputs are widget concerns | Must not encode runtime payloads or access protocol APIs |
+| Button callback dispatch | LVGL callbacks still enter the controller | Callback must submit to model/action sink, not own runtime state |
+| Conversation screen navigation | Existing chat UI state machine remains controller-local | Must not define delivery/key/team ownership |
+| Team position picker workflow coordination | Controller starts picker workflow and handles selected/cancel results | Widget lifecycle belongs to `TeamPositionPickerRenderer`; send path submits `TeamActionRequest` |
+| IME attach / detach | Existing LVGL input integration remains widget lifecycle | Does not affect Chat/Team runtime state |
+
+## B. Migrated Runtime Responsibilities
+
+| Migrated responsibility | New owner | Controller rule |
+| --- | --- | --- |
+| Delivery read state | `ChatDeliveryReadModel` owned by runtime/composition | Controller must not own or clear the read model |
+| Delivery event projection | `ChatDeliveryEventProjector` behind `IChatDeliveryEventPort` | Controller may only forward legacy events while event pump is legacy |
+| Delivery actions | `ChatDeliveryActionService` / `IChatDeliveryActionSink` | Controller must not directly retry/cancel/clear delivery records |
+| Team location/command payload encoding | `LegacyTeamActionBridge` / Team action runtime adapter | Controller submits `TeamActionRequest` only |
+| Team rich payload display projection | `TeamRichPayloadProjector` / `TeamChatPresentationSource` | Controller consumes `team_chat_model_.snapshot()` rows only |
+| Key verification state/session | `KeyVerificationModel` plus `LegacyKeyVerificationSource` | Controller selects peer and renders snapshot only |
+| Key verification submit/trust runtime calls | `LegacyKeyVerificationActionSink` | Controller calls `KeyVerificationModel` actions only |
+| Key verification modal rendering | `KeyVerificationModalRenderer` helper | Controller owns open/close and callback forwarding only |
+| Team position picker widget lifecycle | `TeamPositionPickerRenderer` | Controller owns selected/cancel workflow only |
+
+## C. Remaining Legacy Responsibilities
+
+| Remaining responsibility | Current caller | Exit condition | Status |
+| --- | --- | --- | --- |
+| Conversation cache | `cached_conversations_` and list refresh helpers | Presentation workspace provides all conversation list projection needed by controller | remaining legacy |
+| `ChatService::processIncoming` | `ChatPageRuntimeEventPump::update()` | App-wide runtime scheduler owns cadence outside page runtime | burned down from controller |
+| `ChatService::flushStore` | `ChatPageRuntimeEventPump::update()` | App-wide runtime scheduler owns cadence outside page runtime | burned down from controller |
+| EventBus forwarding | `ChatPageRuntimeFacade` / `ChatPageRuntimeEventPump` | App-wide runtime scheduler owns EventBus routing outside page runtime | burned down from controller |
+| Team position picker selection workflow | `onTeamPositionIconSelected(...)` / `onTeamPositionCancel(...)` | Future workflow coordinator or UX pack-specific picker flow owns selection routing | contained |
+| Legacy Team log formatting outside Chat UI | Contacts/GPS/team-page legacy paths | Shared Team presentation projection is reused by those screens | remaining legacy |
+| Protocol mismatch UX | Reply guard notifications | Protocol support model exposes UI-ready disabled reason | remaining legacy |
+
+## Forbidden Additions
+
+`ChatUiController` must not add new code that:
+
+- encodes Team location or command payloads
+- calls key verification runtime APIs directly
+- owns `ChatDeliveryReadModel`, `ChatDeliveryEventProjector`, or `ChatDeliveryActionService`
+- adds key verification fields to `ChatWorkspaceModel` or `MessageRow`
+- maps Team to DirectPeer or Channel conversation semantics
+- decodes or formats Team location/command payloads for chat display
+- creates or stores Team position picker overlay, panel, hint label, group, or icon event contexts
diff --git a/docs/audits/CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md b/docs/audits/CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..c899b6cf
--- /dev/null
+++ b/docs/audits/CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md
@@ -0,0 +1,102 @@
+# Chat UI Controller Legacy Ownership Audit
+
+## Current Role
+
+`ChatUiController` is still a legacy application controller.
+
+It owns more than rendering:
+
+- LVGL screen state machine
+- chat event handling
+- `ChatService` processIncoming / flushStore calls
+- Team location/command legacy path
+- key verification modal
+- team position picker
+- conversation cache
+- compose / IME lifecycle
+
+## Migrated in Phase 5.6
+
+The non-team direct/channel path has started moving to `ChatWorkspaceModel`.
+Team text projection/send has started migrating to
+`TeamChatPresentationSource` / `TeamChatActionSink`.
+
+Migrated surfaces:
+
+- selecting non-team conversation calls `ChatWorkspaceModel::selectConversation`
+- non-team conversation message view can be populated from `ChatWorkspaceSnapshot`
+- non-team send action calls `ChatWorkspaceModel::sendMessage`
+- mark read can call `ChatWorkspaceModel::markRead`
+- Team text projection calls the dedicated Team `ChatWorkspaceModel`
+- Team text send calls `TeamChatActionSink` through the dedicated Team
+  `ChatWorkspaceModel`
+
+## Remaining Legacy Ownership
+
+The following remain legacy-owned:
+
+- Team location/command send
+- richer Team location/command payload UI
+- Team structured pending/failure delivery
+- key verification modal
+- direct event bus handling
+- conversation list cache
+- contact title fallback logic
+- `ChatService` processIncoming / flushStore lifecycle
+- unread refresh logic
+- team position picker
+- platform GPS/team location helper usage
+
+## Constraint
+
+New non-team chat rendering must prefer `ChatWorkspaceModel`.
+
+New direct calls from renderer/controller to `ChatService` must be justified as
+legacy ownership or moved behind source/sink.
+
+## Renderer Hardening in Phase 5.9
+
+Phase 5.9 locks the migrated Chat paths without claiming
+`ChatUiController` is clean.
+
+Regression guard:
+
+- non-team selection must continue using `chat_model_.selectConversation`
+- non-team message rendering must continue using `chat_model_.buildSnapshot`
+  into controller-owned snapshot buffers
+- non-team send must continue using `chat_model_.sendMessage`
+- non-team read clearing must continue using `chat_model_.markRead`
+- Team text projection/send must continue using `team_chat_model_`
+
+Allowed legacy ownership remains:
+
+- `ChatService` lifecycle and compatibility refresh calls
+- key verification modal
+- event bus handling
+- conversation cache
+- Team location/command picker and send path
+- platform GPS/team helper usage
+
+Do not add new renderer send/read logic that bypasses `ChatWorkspaceModel`.
+
+Do not reintroduce `chat_model_.snapshot()` or `team_chat_model_.snapshot()`
+inside `ChatUiController`; `ChatWorkspaceSnapshot` is large enough to overflow
+ESP `loopTask` when copied on the stack during page entry.
+
+## Non-Goal
+
+Phase 5.6-closeout does not remove `ChatService&` from `ChatUiController`.
+
+That requires a later split between:
+
+- ChatApplicationController
+- ChatRenderer
+- TeamChatPresentation
+- KeyVerificationPresentation
+
+## Pattern
+
+This is a legacy island / strangler boundary. The controller is not clean yet;
+the important closeout outcome is that its ownership is explicit and new
+generic chat presentation work has a preferred path through
+`ChatWorkspaceModel`.
diff --git a/docs/audits/ESP_IDF_FINAL_OWNER_MIGRATION_PLAN.md b/docs/audits/ESP_IDF_FINAL_OWNER_MIGRATION_PLAN.md
new file mode 100644
index 00000000..4b9b263a
--- /dev/null
+++ b/docs/audits/ESP_IDF_FINAL_OWNER_MIGRATION_PLAN.md
@@ -0,0 +1,57 @@
+# ESP-IDF Final Owner Migration Plan
+
+This plan is a landing-zone audit only. It does not move the ESP-IDF root in
+this batch, because `legacy/app_implementations/esp_idf` still carries active
+component registration and target configuration.
+
+Evidence source:
+
+- `legacy/app_implementations/esp_idf/CMakeLists.txt`
+- `legacy/app_implementations/esp_idf/idf_component.yml`
+- `legacy/app_implementations/esp_idf/include/apps/esp_idf/*`
+- `legacy/app_implementations/esp_idf/src/*`
+- `legacy/app_implementations/esp_idf/targets/*`
+- `apps/esp32_lvgl/*`
+- `builds/esp_idf/*`
+- current platform/module paths referenced by the ESP-IDF CMake file
+
+## Current Active Constraint
+
+`apps/esp32_lvgl` no longer links `trailmate_esp_idf_legacy_adapter`.
+`legacy/app_implementations/esp_idf/src/esp_idf_legacy_implementation_adapter.*`
+may remain until the historical root is deleted, but final app shells and build
+entrypoints must not compile or include it.
+
+## Responsibility To Final Owner Map
+
+| Current surface | Current evidence | Final owner | Migration condition |
+| --- | --- | --- | --- |
+| `idf_component.yml` | `legacy/app_implementations/esp_idf/idf_component.yml` | `builds/esp_idf` or `apps/esp32_lvgl` component packaging | component registration can be invoked without using the legacy root as a semantic app root |
+| `CMakeLists.txt` | `legacy/app_implementations/esp_idf/CMakeLists.txt` contains `idf_component_register` and `target_sources` | `builds/esp_idf` | `builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake` owns migrated source lists while registration remains temporarily physical in the historical root |
+| `targets/*/sdkconfig.defaults` | `legacy/app_implementations/esp_idf/targets/tab5`, `t_display_p4_tft`, `t_display_p4_amoled` | `builds/esp_idf/targets` | migrated defaults exist under `builds/esp_idf/targets` |
+| `src/startup_runtime.cpp` and `include/apps/esp_idf/startup_runtime.h` | startup runtime calls loop runtime | `apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.*` | migrated source owner; legacy header is compatibility forwarding only |
+| `src/loop_runtime.cpp` and `include/apps/esp_idf/loop_runtime.h` | loop runtime starts the IDF app loop task | `apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.*` | migrated source owner; legacy header is compatibility forwarding only |
+| `src/runtime_config.cpp` and `include/apps/esp_idf/runtime_config.h` | runtime config reads `sdkconfig.h` and exposes target config | `apps/esp32_lvgl/src/esp32_lvgl_runtime_config.*` plus `modules/product_composition` | migrated source owner; legacy header is compatibility forwarding only |
+| `src/meshtastic_radio_adapter.cpp` and `include/apps/esp_idf/meshtastic_radio_adapter.h` | ESP radio adapter source under legacy app root | `platform/esp/radio/meshtastic_radio_adapter.*` | active app facade includes the platform owner |
+| `src/gps_service_api.cpp` | includes `platform/esp/arduino_common/gps/gps_service_api.h` | GPS runtime / platform ESP GPS adapter | GPS service API is owned by GPS/platform runtime, not legacy app root |
+| `src/gps_tracker_overlay.cpp` | includes `ui/screens/gps/gps_tracker_overlay.h`; CMake excludes the local copy and uses platform ESP GPS overlay | map/GPS presentation/runtime module or platform ESP UI adapter | overlay ownership is no longer duplicated in the legacy root |
+| `src/team_ui_store.cpp` | includes `platform/ui/team_ui_store_runtime.h` | team presentation/runtime module or platform UI runtime | team UI store builds through stable runtime owner |
+| `src/idf_entry.cpp` | defines `extern "C" void app_main(void)` | `builds/esp_idf` plus `apps/esp32_lvgl` entry hook | build entrypoint and app shell wiring are separated |
+| `src/app_runtime_access.cpp` and `include/apps/esp_idf/app_runtime_access.h` | stores runtime config and app context handles | `apps/esp32_lvgl` or a stable runtime access port | app runtime access does not depend on legacy namespace |
+| `src/app_facade_runtime.cpp` and `include/apps/esp_idf/app_facade_runtime.h` | large ESP app facade implementation | final app/runtime modules by responsibility | facade responsibilities are split by concrete runtime owner before deletion |
+| `src/esp_idf_legacy_implementation_adapter.*` | historical adapter source still present in legacy root | delete after the historical root is ready to delete | no final app shell or CMake target compiles this adapter |
+
+## Delete Condition For `esp_idf_legacy_implementation_adapter`
+
+- no new calls are added;
+- `apps/esp32_lvgl` uses `esp32_lvgl_historical_source_descriptor` for
+  historical identity;
+- build/component/source ownership no longer requires compiling
+  `esp_idf_legacy_implementation_adapter.cpp`;
+- active checker forbids new ESP-IDF legacy adapter callers.
+
+## Not Done In Batch 2
+
+- no ESP-IDF component files are moved;
+- no ESP radio/GPS/team runtime behavior is rewritten;
+- no ESP-IDF legacy root is deleted.
diff --git a/docs/audits/ESP_IDF_RUNTIME_SOURCE_OWNER_EXTRACTION_AUDIT.md b/docs/audits/ESP_IDF_RUNTIME_SOURCE_OWNER_EXTRACTION_AUDIT.md
new file mode 100644
index 00000000..b7ecf2bf
--- /dev/null
+++ b/docs/audits/ESP_IDF_RUNTIME_SOURCE_OWNER_EXTRACTION_AUDIT.md
@@ -0,0 +1,24 @@
+# ESP-IDF Runtime Source Owner Extraction Audit
+
+This audit separates source ownership from physical historical-root cleanup.
+The goal for Batch 2 is to move or assign final owners without rewriting radio,
+GPS, team, or map behavior.
+
+| Source | Current source | Final owner | Migrated now? | Deferred? | Delete condition |
+| --- | --- | --- | --- | --- | --- |
+| startup runtime | `legacy/app_implementations/esp_idf/src/startup_runtime.cpp` | `apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp` | yes | no | IDF component source list uses app-shell owner and no final app shell includes legacy startup headers |
+| loop runtime | `legacy/app_implementations/esp_idf/src/loop_runtime.cpp` | `apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.cpp` | yes | no | IDF component source list uses app-shell owner and no final app shell includes legacy loop headers |
+| runtime config | `legacy/app_implementations/esp_idf/src/runtime_config.cpp` | `apps/esp32_lvgl/src/esp32_lvgl_runtime_config.cpp` plus `modules/product_composition` target metadata | yes | no | SDK config mapping and target profile lookup are owned outside the legacy root |
+| Meshtastic radio adapter | `legacy/app_implementations/esp_idf/src/meshtastic_radio_adapter.cpp` | `platform/esp/radio/meshtastic_radio_adapter.cpp` | yes | no | active IDF component source list uses platform owner and app facade includes `platform/esp/radio/meshtastic_radio_adapter.h` |
+| GPS service API | `legacy/app_implementations/esp_idf/src/gps_service_api.cpp` | `platform/esp/gps` or existing ESP GPS runtime owner | no | yes | stable ESP GPS owner exposes the API without legacy root source |
+| GPS tracker overlay | `legacy/app_implementations/esp_idf/src/gps_tracker_overlay.cpp` | map/GPS presentation/runtime owner; current active source already comes from `platform/esp/arduino_common/src/ui/screens/gps/gps_tracker_overlay.cpp` | no | yes | duplicated legacy source is deleted after ownership report and build source list no longer references it |
+| Team UI store | `legacy/app_implementations/esp_idf/src/team_ui_store.cpp` | team presentation/runtime or platform UI runtime owner; current shared header is `modules/core_sys/include/platform/ui/team_ui_store_runtime.h` | no | yes | stable team runtime source owns UI store behavior outside the historical root |
+| app runtime access | `legacy/app_implementations/esp_idf/src/app_runtime_access.cpp` | `apps/esp32_lvgl` or stable runtime access port | no | yes | app runtime access no longer depends on `apps::esp_idf` namespace |
+| app facade runtime | `legacy/app_implementations/esp_idf/src/app_facade_runtime.cpp` | final app/runtime modules by concrete responsibility | partially | yes | facade responsibilities are split by runtime owner before historical root deletion |
+
+Batch 2 extraction result:
+
+- active radio adapter owner is `platform/esp/radio`;
+- active startup, loop, and runtime config owners are `apps/esp32_lvgl`;
+- target identity metadata starts in `modules/product_composition`;
+- remaining GPS/team/map/app-facade surfaces are deferred with explicit owners.
diff --git a/docs/audits/ESP_IDF_TARGET_DEFAULTS_MIGRATION_AUDIT.md b/docs/audits/ESP_IDF_TARGET_DEFAULTS_MIGRATION_AUDIT.md
new file mode 100644
index 00000000..7041fe36
--- /dev/null
+++ b/docs/audits/ESP_IDF_TARGET_DEFAULTS_MIGRATION_AUDIT.md
@@ -0,0 +1,25 @@
+# ESP-IDF Target Defaults Migration Audit
+
+This audit records migrated ESP-IDF target defaults and the current final owner
+for targets where no historical ESP-IDF defaults existed. Compile baselines are
+derived from repository board metadata and must not be treated as hardware
+validation.
+
+| Target | Current location | Final location | Status | Delete condition |
+| --- | --- | --- | --- | --- |
+| `tab5` | `legacy/app_implementations/esp_idf/targets/tab5/sdkconfig.defaults` | `builds/esp_idf/targets/tab5/sdkconfig.defaults` | migrated | historical root no longer owns ESP-IDF component registration |
+| `tdisplayp4_tft` | `legacy/app_implementations/esp_idf/targets/t_display_p4_tft/sdkconfig.defaults` | `builds/esp_idf/targets/tdisplayp4_tft/sdkconfig.defaults` | migrated | historical root no longer owns ESP-IDF component registration |
+| `tdisplayp4_amoled` | `legacy/app_implementations/esp_idf/targets/t_display_p4_amoled/sdkconfig.defaults` | `builds/esp_idf/targets/tdisplayp4_amoled/sdkconfig.defaults` | migrated | historical root no longer owns ESP-IDF component registration |
+| `tdeck` | none found in `legacy/app_implementations/esp_idf/targets` | `builds/esp_idf/targets/tdeck/sdkconfig.defaults` | compile baseline from `boards/T-Deck.json`; hardware validation pending | replace baseline with validated ESP-IDF hardware defaults when target is exercised |
+| `tlora_pager` | none found in `legacy/app_implementations/esp_idf/targets` | `builds/esp_idf/targets/tlora_pager/sdkconfig.defaults` | compile baseline from `boards/lilygo-t-lora-pager.json`; hardware validation pending | replace baseline with validated ESP-IDF hardware defaults when target is exercised |
+| `twatch` | none found in `legacy/app_implementations/esp_idf/targets` | `builds/esp_idf/targets/twatch/sdkconfig.defaults` | compile baseline from `boards/lilygo-t-watch-s3.json`; hardware validation pending | replace baseline with validated ESP-IDF hardware defaults when target is exercised |
+
+Current owner:
+
+- `builds/esp_idf/targets`
+
+Historical root status:
+
+- `legacy/app_implementations/esp_idf/targets` may remain until the historical
+  component root is deleted, but it is no longer the only owner for migrated
+  target defaults.
diff --git a/docs/audits/ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md b/docs/audits/ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md
new file mode 100644
index 00000000..f36cdbdd
--- /dev/null
+++ b/docs/audits/ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md
@@ -0,0 +1,98 @@
+# ESP LVGL Composition Bridge Audit
+
+## Purpose
+
+Phase 6 moves object graph ownership toward target composition roots.
+
+ESP LVGL startup is sensitive because it combines board power sequencing, radio
+and GPS initialization, FreeRTOS task startup, LVGL display/input setup, storage
+initialization, BLE setup, and existing `AppContext` binding.
+
+This audit records the ESP LVGL composition bridge for Phase 6 without changing
+startup order.
+
+## Current Composition Surface
+
+| Surface | Current owner | Objects or facts involved | Phase 6 policy |
+| --- | --- | --- | --- |
+| `apps/esp_pio/src/startup_runtime.cpp` | ESP Arduino startup | boot sequencing and runtime status | bridge, do not reorder |
+| `apps/esp_pio/src/app_runtime_access.cpp` | ESP Arduino runtime access | `AppContext` bootstrap handles | bridge |
+| `apps/esp_pio/src/app_context.cpp` | legacy AppContext | services, adapters, facades, config | bounded legacy bridge |
+| `apps/esp_idf/src/startup_runtime.cpp` | ESP-IDF startup | boot sequencing and app facade status | bridge, do not reorder |
+| `apps/esp_idf/src/app_runtime_access.cpp` | ESP-IDF runtime access | app facade runtime initialization | bridge |
+| `apps/esp_idf/src/app_facade_runtime.cpp` | ESP-IDF facade runtime | minimal app facade and service wiring | bounded legacy bridge |
+| `platform/esp/boards/src/board_runtime.cpp` | board runtime | board hardware handles | board descriptor / handle bridge |
+
+## Boundary Decision
+
+Phase 6 does not split the ESP boot chain yet.
+
+Instead, ESP targets are treated as using a `LegacyAppContextBridge` shape:
+
+```text
+ESP startup
+  -> board/runtime handle resolution
+  -> legacy AppContext or app facade runtime
+  -> existing services/source/sink/page bridges
+  -> LVGL shell
+```
+
+This bridge is allowed only because ESP startup has target-specific lifetime and
+task-ordering constraints.
+
+## What Belongs In The Future ESP Composition Root
+
+A future `EspLvglCompositionRoot` should own or bind:
+
+- target identity
+- board package facts
+- platform adapter factories
+- runtime context and task hooks
+- app services
+- presentation sources/sinks
+- presentation models
+- `PresentationWorkspace`
+- LVGL shell startup/shutdown hooks
+
+It should not interpret protocol payloads, read tile/cache content, parse GPS
+sentences, or render LVGL widgets directly.
+
+## What Stays Legacy In Phase 6
+
+The following remain legacy-owned in this audit:
+
+- `AppContext` service construction
+- ESP app facade runtime construction
+- LVGL page/controller wiring
+- GPSPageState and map viewport runtime
+- ChatUiController lifecycle
+- board handle bootstrap ordering
+- radio/GPS/BLE task startup order
+- NVS/Preferences initialization order
+
+These are not Phase 6 blockers because the ownership is now explicit and future
+cleanup can move one slice at a time.
+
+## New Code Policy
+
+New ESP code must not:
+
+- create app services from LVGL renderer/page code
+- construct presentation source/sink/model objects inside `ui_presentation`
+- bypass `ChatWorkspaceModel` for new chat UI paths
+- bypass `MapWorkspaceModel` for new map workspace status/action paths
+- add new global `AppContext` lookup patterns without an audit update
+- put board or target product selection into renderer code
+
+New ESP composition work should be added behind a named composition root or
+behind an explicitly documented bridge.
+
+## Phase 6 Acceptance
+
+For Phase 6, ESP is considered composition-aware when:
+
+- its current bridge is documented here
+- `AppContext` expansion is constrained by
+  `APPCONTEXT_LEGACY_BRIDGE_AUDIT.md`
+- Phase 6 checkers allow the existing bridge but block new composition drift in
+  pure presentation and renderer surfaces
diff --git a/docs/audits/GPS_CONSUMER_BOUNDARY_AUDIT.md b/docs/audits/GPS_CONSUMER_BOUNDARY_AUDIT.md
new file mode 100644
index 00000000..fdf59e68
--- /dev/null
+++ b/docs/audits/GPS_CONSUMER_BOUNDARY_AUDIT.md
@@ -0,0 +1,38 @@
+# GPS Consumer Boundary Audit
+
+Phase 4.5 records the current GPS consumer boundary so Phase 5 can replace UI
+surfaces with presentation models without rediscovering legacy ownership. This
+audit is descriptive: it does not introduce a new GPS architecture.
+
+## Boundary Rule
+
+Non-UI consumers should read GPS facts through `gps::ILocationSource`,
+`gps::ITimeAuthority`, or a device/status snapshot. UI consumers may continue to
+use the legacy `platform/ui/gps_runtime.h` compatibility facade until the
+presentation-model phase replaces those reads, but new UI work should not add new
+direct `gps_runtime` dependencies.
+
+## Consumer Inventory
+
+| Consumer | Current source | Target source | Status | Phase owner |
+| --- | --- | --- | --- | --- |
+| ESP BLE PhoneCore facade | `platform/esp/arduino_common/src/ble/app_phone_facade.cpp` uses `gps::gps_location_source()` for location; epoch sync still has legacy system-time bridge code. | `gps::ILocationSource` and `gps::ITimeAuthority` via the phone facade snapshot surface. | Partial | Phase 4.5 PhoneCore facade narrowing |
+| Shared Meshtastic phone runtime bridge | `platform/shared/include/platform/shared/ble/meshtastic_phone_runtime_bridge.h` converts `gps::ILocationSource` into Meshtastic GPS fix data. | Same source behind `IPhoneAppFacade` snapshot methods. | Done, but facade wiring still needs cleanup | Phase 4.5 |
+| ESP Team track sampler | `platform/esp/arduino_common/src/team/runtime/team_track_source_gps.cpp` consumes `gps::ILocationSource`. | Same, with team code isolated from GPS runtime details. | Done, verify in readiness checks | Phase 4.5 |
+| HostLink config/status time | `platform/esp/arduino_common/src/hostlink/hostlink_config_service.cpp` still calls `settimeofday`; status paths may compose time from legacy/system helpers. | `gps::ITimeAuthority` and `DeviceStatusSnapshot`. | Legacy | Phase 4.5/Phase 5 |
+| LVGL GPS/status screens | `modules/ui_shared` screens and dashboard widgets include `platform/ui/gps_runtime.h`. The global menu/status GPS icon now reads `GpsStatusModel` through `LegacyGpsStatusSource`; dashboard GPS widgets still read the legacy runtime directly. | `GpsStatusModel` / `DeviceStatusModel` backed by `ILocationSource`, `ITimeAuthority`, and snapshots. | Partial: status icon migrated, richer GPS widgets remain legacy UI compatibility surface | Phase 5 |
+| LVGL settings GPS controls | `modules/ui_shared/src/ui/screens/settings/settings_page_components.cpp` still calls legacy GPS runtime setters for receiver, GNSS, interval, power strategy, and external NMEA settings. The `gps_enabled` toggle now submits a `SettingsModel` patch through `LegacySettingsActionSink`. | `SettingsModel` command sink backed by config patches and platform GPS runtime shell. | Partial: GPS enabled migrated, remaining GPS controls are legacy UI compatibility surface | Phase 5 / later Config Core |
+| Mono 128x64 UI runtime | `modules/ui_mono_128x64/include/ui/mono_128x64/runtime.h` includes `platform/ui/gps_runtime.h`. | Device/GPS presentation snapshots. | Legacy UI compatibility surface | Phase 5 |
+| GTK/uConsole dashboard, chat, map models | `platform/linux/uconsole/src/*_model.cpp` and GTK overview logic include `platform/ui/gps_runtime.h` or platform probes. | `GpsStatusModel`, `DeviceStatusModel`, and app snapshots. | Legacy UI compatibility surface | Phase 5 |
+| nRF52 Meshtastic radio adapter position payload | `platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp` includes `platform/ui/gps_runtime.h` while building position payloads near radio/protocol behavior. | `gps::ILocationSource` supplied through mesh/app projection, not direct UI runtime. | Legacy non-UI consumer | Phase 4.5 mesh cleanup |
+| ESP Meshtastic adapter position payload | `platform/esp/arduino_common/src/chat/infra/meshtastic/mt_adapter.cpp` still keeps position-payload logic near legacy adapter state. | `gps::ILocationSource` supplied to core mesh or a mesh event/projection bridge. | Legacy non-UI consumer | Phase 4.5 mesh cleanup |
+| ESP Arduino GPS service API | `platform/esp/arduino_common/src/gps/gps_service_api.cpp` exposes `gps_location_source()` and `gps_time_authority()` adapters over the legacy `GpsService`. | Platform GPS shell backed by `core_gps::LocationService` and `TimeAuthority`. | Compatibility shell | Later GPS shell cleanup |
+| ESP-IDF GPS service API/runtime | `apps/esp_idf/src/gps_service_api.cpp` and `platform/esp/idf_common/src/gps_runtime.cpp` expose legacy runtime data and commands. | Platform GPS shell backed by `core_gps::LocationService` and `TimeAuthority`. | Compatibility shell | Later GPS shell cleanup |
+| Linux simulator smoke/runtime tests | `apps/linux_sim/tests/linux_runtime_smoke.cpp` includes `platform/ui/gps_runtime.h`. | Test fixture over `ILocationSource`/presentation snapshots. | Legacy test surface | Phase 5 |
+
+## Phase 5 Entry Constraint
+
+Before Phase 5 creates UI presentation models, non-UI GPS reads should be either
+moved to `ILocationSource`/`ITimeAuthority` or explicitly listed above as a
+remaining compatibility exception. UI reads through `platform/ui/gps_runtime.h`
+are accepted only as temporary inputs to the Phase 5 replacement plan.
diff --git a/docs/audits/GPS_RUNTIME_SCHEDULING_OWNERSHIP_AUDIT.md b/docs/audits/GPS_RUNTIME_SCHEDULING_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..5cc102b1
--- /dev/null
+++ b/docs/audits/GPS_RUNTIME_SCHEDULING_OWNERSHIP_AUDIT.md
@@ -0,0 +1,50 @@
+# GPS Runtime Scheduling Ownership Audit
+
+## Purpose
+
+Phase 7.13 assigns GPS page refresh cadence to a runtime pump instead of page
+widget code or renderer code.
+
+## Current State
+
+| Question | Before 7.13 | 7.13 owner |
+| --- | --- | --- |
+| GPS page update cadence | LVGL timer callbacks directly called refresh logic | `GpsPageRuntimePump` |
+| GPS page active/inactive | Page enter/exit implicitly created/deleted timers | Page runtime calls `GpsPageRuntimePump::setActive(...)` |
+| GPS UI refresh notification | Timer callbacks directly refreshed UI | `IGpsUiRefreshSink` |
+| GPS status refresh model | Page-specific functions and legacy presentation sources | `IGpsStatusRefreshModel` port |
+| LVGL timer role | Cadence owner | Tick hook only |
+
+## ESP Branch
+
+The ESP GPS page still contains the large legacy map/GPS workflow. 7.13 does not
+rewrite it. The previous timer callback body is now represented by a local
+`IGpsStatusRefreshModel` adapter, and the LVGL timer calls:
+
+`gps_runtime_pump().update(sys::millis_now())`
+
+The pump owns the interval and active/inactive state. The existing page logic
+remains contained behind the model adapter.
+
+## Linux Branch
+
+The Linux compact map page now uses a `GpsPageRuntimePump` with a refresh sink
+that calls `refresh_view()`. Its LVGL timer is a tick hook, not the owner of
+refresh cadence.
+
+## Not Renderer Responsibility
+
+GPS renderers and map widgets must not own:
+
+- GPS poll interval policy
+- active/inactive scheduling
+- hardware source access
+- page timer semantics
+
+## Still Contained
+
+- ESP tile loader timer cadence remains tile-rendering runtime legacy from
+  Phase 7.11, not GPS refresh cadence.
+- ESP title timer remains a UI title refresh timer and can be moved in a later
+  UI runtime pass.
+- GNSS skyplot has its own page runtime and is not included in 7.13.
diff --git a/docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md b/docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md
new file mode 100644
index 00000000..20917275
--- /dev/null
+++ b/docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md
@@ -0,0 +1,106 @@
+# Key Verification / Map Overlay Legacy Burn-down Audit
+
+## Purpose
+
+Phase 9.5 burns down the remaining key verification and map overlay legacy
+presentation adapters from main runtime ownership. The goal is not to move these
+surfaces under `legacy/`; the goal is to make stable runtime modules the real
+owners and leave old `Legacy*` headers as deprecated compatibility aliases only.
+
+Audit fields intentionally include current callers, main runtime callers, test callers,
+docs references, replacement, and migration decision for each legacy surface.
+
+## LegacyKeyVerificationSession
+
+| Field | Value |
+| --- | --- |
+| Current compatibility header | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h` |
+| Former compatibility header | `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h` |
+| Current implementation source | none; deprecated alias only |
+| Former implementation source | session state was embedded in the legacy key verification adapter implementation |
+| Current callers | deprecated alias headers and `test_legacy_key_verification_adapters_legacy_alias.cpp` only |
+| Main runtime callers | none |
+| Test callers | legacy alias smoke only |
+| Docs references | historical Phase 7/8 audits and this burn-down audit |
+| Replacement | `ui_key_verification_runtime::KeyVerificationSessionAdapter` |
+| Migration decision | main runtime owns the stable session adapter name directly; old headers forward to it with `[[deprecated]]` |
+
+## LegacyKeyVerificationSource
+
+| Field | Value |
+| --- | --- |
+| Current compatibility header | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h` |
+| Former compatibility header | `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h` |
+| Current implementation source | `modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp` |
+| Former implementation source | `modules/ui_legacy_adapters/src/legacy_key_verification_source.cpp` |
+| Current callers | main runtime includes `ui_key_verification_runtime/key_verification_presentation_source.h`; legacy alias headers/tests only use the old name |
+| Main runtime callers | `modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp` and `modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp` use `KeyVerificationPresentationSource` |
+| Test callers | `modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp`; legacy alias smoke remains for compatibility |
+| Docs references | historical Phase 7/8 audits and this burn-down audit |
+| Replacement | `ui_key_verification_runtime::KeyVerificationPresentationSource` implementing `IKeyVerificationPresentationSource` |
+| Migration decision | event pump and chat runtime consume the stable presentation source; old header is a deprecated alias |
+
+## LegacyKeyVerificationActionSink
+
+| Field | Value |
+| --- | --- |
+| Current compatibility header | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h` |
+| Former compatibility header | `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h` |
+| Current implementation source | `modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp` |
+| Former implementation source | `modules/ui_legacy_adapters/src/legacy_key_verification_action_sink.cpp` |
+| Current callers | main runtime includes `ui_key_verification_runtime/key_verification_action_sink.h`; legacy alias headers/tests only use the old name |
+| Main runtime callers | `modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp` uses `KeyVerificationActionSink` |
+| Test callers | `modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp`; legacy alias smoke remains for compatibility |
+| Docs references | historical Phase 7/8 audits and this burn-down audit |
+| Replacement | `ui_key_verification_runtime::KeyVerificationActionSink` implementing `IKeyVerificationActionSink` |
+| Migration decision | key verification actions go through the stable command sink; old header is a deprecated alias |
+
+## LegacyMapOverlaySource
+
+| Field | Value |
+| --- | --- |
+| Current compatibility header | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h` |
+| Former compatibility header | `modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h` |
+| Current implementation source | `modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp` |
+| Former implementation source | `modules/ui_legacy_adapters/src/legacy_map_overlay_source.cpp` |
+| Current callers | main runtime includes `ui_map_runtime/map_overlay_snapshot_source.h`; legacy alias headers/tests only use the old name |
+| Main runtime callers | `modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp` uses `MapOverlaySnapshotSource` |
+| Test callers | `modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp`; legacy alias smoke remains for compatibility |
+| Docs references | historical Phase 7/8 audits and this burn-down audit |
+| Replacement | `ui::map_overlay::MapOverlaySnapshotSource` and `ui::map_overlay::MapOverlayProjectionAdapter` |
+| Migration decision | GPS/map runtime consumes the stable snapshot source; old header is a deprecated alias |
+
+## Caller Classification
+
+Main runtime callers were migrated to stable owners:
+
+- `chat_page_runtime.cpp` uses `KeyVerificationSessionAdapter`, `KeyVerificationPresentationSource`, and `KeyVerificationActionSink`.
+- `chat_page_runtime_event_pump.*` uses `KeyVerificationPresentationSource`.
+- `gps_page_runtime.cpp` uses `MapOverlaySnapshotSource`.
+
+Compatibility callers are intentionally limited:
+
+- `test_legacy_key_verification_adapters_legacy_alias.cpp`
+- `test_legacy_map_overlay_source_legacy_alias.cpp`
+- deprecated alias headers under `modules/ui_legacy_adapters/include`
+- deprecated alias headers under `modules/ui_shared/include/ui/presentation_sources`
+
+## Burn-down Decision
+
+The old `LegacyKeyVerification*` and `LegacyMapOverlaySource` names are no
+longer runtime owners. They remain only as compatibility aliases so downstream
+includes fail softly while the main runtime graph uses stable module names.
+
+## Checker Decision
+
+`check_phase9_legacy_burndown_ready.py` must reject:
+
+- main-code includes of the old key verification and map overlay legacy headers
+- old key verification or map overlay legacy implementation sources in build lists
+- legacy headers that contain real implementation logic
+
+It may allow:
+
+- deprecated forwarding aliases
+- legacy alias smoke tests
+- historical docs references
diff --git a/docs/audits/KEY_VERIFICATION_OWNERSHIP_AUDIT.md b/docs/audits/KEY_VERIFICATION_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..f79693f8
--- /dev/null
+++ b/docs/audits/KEY_VERIFICATION_OWNERSHIP_AUDIT.md
@@ -0,0 +1,122 @@
+# Key Verification Ownership Audit
+
+## Purpose
+
+Phase 7.5 establishes ownership for key verification workflow state and
+actions.
+
+Key verification is a standalone runtime/presentation workflow. It is not
+chat message delivery state, it is not `ChatWorkspaceModel` state, and it is
+not renderer-local modal state.
+
+## Current State
+
+| Concern | Current owner | Current UI path | Problem |
+| --- | --- | --- | --- |
+| Verification modal lifecycle | `ChatUiController` | LVGL chat modal helpers | acceptable as legacy shell/widget ownership |
+| Verification peer/nonce state | `ChatUiController` local fields | key verification modal | runtime workflow state is stored in renderer/controller |
+| Verification code display | `ChatUiController` local formatting | final modal | code projection is mixed with widget construction |
+| Verification number submission | `ChatUiController` | submit button | controller calls `IMeshAdapter::submitKeyVerificationNumber(...)` directly |
+| Trust/accept action | `ChatUiController` | Trust Key button | controller calls `ContactService::setNodeKeyManuallyVerified(...)` directly |
+| Peer label lookup | `ChatUiController` helper | modal text | controller reads contact service for projection data |
+| Protocol differences | platform mesh adapters | EventBus events | MeshCore/Meshtastic details are not isolated behind a presentation adapter |
+
+## Current Event Sources
+
+Existing platform/runtime adapters publish these EventBus events:
+
+- `KeyVerificationNumberRequestEvent`
+- `KeyVerificationNumberInformEvent`
+- `KeyVerificationFinalEvent`
+
+The events carry peer id, nonce, number/code data, and final sender role. They
+do not carry a portable presentation snapshot and they do not define UI
+ownership.
+
+## Current Actions
+
+Number submission currently calls:
+
+```text
+IMeshAdapter::submitKeyVerificationNumber(peer_id, nonce, number)
+```
+
+Trust/accept currently calls:
+
+```text
+ContactService::setNodeKeyManuallyVerified(peer_id, true)
+```
+
+Both actions are legitimate runtime operations, but they must be invoked behind
+an action sink rather than directly by `ChatUiController`.
+
+## Boundary Rule
+
+Key verification must not be owned by:
+
+- `ChatWorkspaceModel`
+- `MessageRow`
+- renderer widgets
+- `ChatUiController` local workflow state
+- chat delivery read model
+
+Key verification is owned by:
+
+```text
+KeyVerification runtime/session state
+  -> IKeyVerificationPresentationSource
+    -> KeyVerificationModel
+      -> KeyVerificationSnapshot
+```
+
+Actions are owned by:
+
+```text
+KeyVerificationModel
+  -> IKeyVerificationActionSink
+    -> LegacyKeyVerificationActionSink / runtime adapter
+```
+
+## Target Ownership
+
+Phase 7.5 introduces:
+
+- `KeyVerificationSnapshot`
+- `IKeyVerificationPresentationSource`
+- `IKeyVerificationActionSink`
+- `KeyVerificationModel`
+- `LegacyKeyVerificationSession`
+- `LegacyKeyVerificationSource`
+- `LegacyKeyVerificationActionSink`
+
+The legacy source/sink pair is an anti-corruption bridge around the existing
+MeshCore/Meshtastic adapter surface and contact trust API.
+
+## Phase 7.5 Decision
+
+Phase 7.5 establishes the key verification runtime/presentation boundary first.
+
+It does not:
+
+- rewrite protocol key exchange
+- rewrite key storage
+- implement full trust management
+- add key verification fields to `MessageRow`
+- add key verification state to `ChatWorkspaceModel`
+- make renderer modal state authoritative
+
+## Remaining Legacy
+
+The LVGL modal widgets may remain in `ChatUiController` during Phase 7.5.
+
+That controller may open/close the modal, parse numeric user input from a
+textarea, render a `KeyVerificationSnapshot`, and forward actions through
+`KeyVerificationModel`.
+
+It must not:
+
+- compute verification codes
+- store nonce/peer verification workflow state
+- look up raw keys
+- call mesh key verification APIs directly
+- call contact trust APIs directly
diff --git a/docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md b/docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md
new file mode 100644
index 00000000..18aa9263
--- /dev/null
+++ b/docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md
@@ -0,0 +1,259 @@
+# Legacy App Implementation Root Burn-Down Audit
+
+This audit starts the legacy root burn-down. It does not authorize deleting
+the full `legacy/` tree. It separates historical implementation roots from the
+post-refactor runtime, descriptor, and renderer ownership that now lives in
+`apps/`, `modules/`, `platform/`, and `builds/`.
+
+Burn-down rule: a legacy app implementation root may remain only as a
+historical or transitional implementation root. It must not regain ownership
+of `RuntimeEntryAdoption`, `DescriptorRenderer`, or `ScreenGraphPresenter`
+logic.
+
+## Required Root Coverage
+
+- `legacy/app_implementations/esp_idf`
+- `legacy/app_implementations/esp_pio`
+- `legacy/app_implementations/gat562_mesh_evb_pro`
+- `legacy/app_implementations/linux_rpi`
+- `legacy/app_implementations/linux_sim`
+- `legacy/app_implementations/linux_uconsole`
+- `legacy/app_implementations/linux_unoq`
+
+`linux_unoq` is included because it is present in the repository and already
+appears in `legacy/app_implementations/LEGACY_IMPLEMENTATION_INDEX.md`.
+
+## CMake And PlatformIO References Listed For Checker
+
+Known build references that still touch legacy roots:
+
+- `CMakeLists.txt` references `legacy/app_implementations/esp_idf`
+- `builds/esp_idf/CMakeLists.txt` documents `legacy/app_implementations/esp_idf`
+- `builds/pio_nrf52/platformio.ini` records `legacy/app_implementations/esp_pio`
+  as historical source identity only.
+- `builds/pio_nrf52/platformio.ini` records
+  `legacy/app_implementations/gat562_mesh_evb_pro` as historical source
+  identity only.
+- `cmake/TrailMateLinuxSources.cmake` documents shared Linux source ownership
+  for `legacy/app_implementations/linux_sim`,
+  `legacy/app_implementations/linux_rpi`, and
+  `legacy/app_implementations/linux_uconsole`
+- `apps/esp32_lvgl/CMakeLists.txt` references `legacy/app_implementations/esp_idf`
+- `legacy/app_implementations/esp_idf/CMakeLists.txt` is the ESP-IDF historical component root
+- `legacy/app_implementations/linux_sim/CMakeLists.txt` is the simulator historical CMake root
+- `legacy/app_implementations/linux_uconsole/CMakeLists.txt` is the uConsole historical CMake root
+
+## Root: `legacy/app_implementations/esp_idf`
+
+- Current purpose: ESP-IDF historical component and target configuration root.
+  It still owns ESP-IDF component registration, target descriptors, sdkconfig
+  defaults, and compatibility adapter source for the `apps/esp32_lvgl` shell.
+- Current build callers: root `CMakeLists.txt`, `builds/esp_idf/CMakeLists.txt`,
+  ESP-IDF component registration under this root, and `apps/esp32_lvgl/CMakeLists.txt`.
+- Current app shell callers: `apps/esp32_lvgl` uses the transitional source
+  string and legacy implementation adapter.
+- Current CMake / PlatformIO callers: root `CMakeLists.txt`,
+  `builds/esp_idf/CMakeLists.txt`, and `apps/esp32_lvgl/CMakeLists.txt`.
+- Current include callers: `apps/esp32_lvgl/CMakeLists.txt` adds the legacy
+  adapter include directory for `esp_idf_legacy_implementation_adapter.h`.
+- Runtime ownership status: transitional embedded build root; reusable runtime
+  and presentation ownership must stay in modules or final app shells.
+- Safe to delete now? no.
+- First deletion blocker: ESP-IDF component registration and target sdkconfig
+  defaults still physically live under this root.
+- Target replacement owner: `apps/esp32_lvgl`, `builds/esp_idf`,
+  `modules/ui_lvgl_ux_packs`, `modules/product_composition`, and ESP platform
+  adapters.
+- Burn-down step: transfer ESP-IDF build ownership into the authoritative build
+  wrapper and final app shell only after target component registration can be
+  invoked without this directory as a semantic app root.
+- Deletion blocker: ESP-IDF component registration and target sdkconfig defaults
+  still live in the historical root.
+- Replacement owner: `apps/esp32_lvgl` plus `builds/esp_idf`.
+
+## Root: `legacy/app_implementations/esp_pio`
+
+- Current purpose: PlatformIO / Arduino compatibility root for nRF-oriented
+  embedded builds and legacy PIO source layout.
+- Current build callers: `builds/pio_nrf52/platformio.ini` records this root as
+  historical source identity only; it no longer adds this root as an include or
+  source dependency.
+- Current app shell callers: `apps/nrf52_node` exposes the historical source
+  string `legacy/app_implementations/esp_pio`.
+- Current CMake / PlatformIO callers: `builds/pio_nrf52/platformio.ini`.
+- Current include callers: none from `builds/pio_nrf52`.
+- Runtime ownership status: transitional PIO compatibility root; concrete device
+  validation should use `gat562_mesh_evb_pro` as the board-specific target.
+- Safe to delete now? no.
+- First deletion blocker: PIO runtime source ownership still physically lives
+  under the historical root even though the wrapper no longer includes it.
+- Target replacement owner: `apps/nrf52_node`, `builds/pio_nrf52`,
+  `boards/gat562_mesh_evb_pro`, platform adapters, and embedded runtime modules.
+- Burn-down step: split PIO compatibility glue from concrete device ownership,
+  then make the PIO root forwarding-only or remove it after the wrapper owns
+  all source and include paths.
+- Deletion blocker: historical PIO runtime source files still need ownership
+  decisions before root deletion.
+- Replacement owner: `apps/nrf52_node` plus `builds/pio_nrf52`.
+
+## Root: `legacy/app_implementations/gat562_mesh_evb_pro`
+
+- Current purpose: concrete GAT562 Mesh EVB Pro historical device root with
+  board-adjacent runtime glue.
+- Current build callers: `builds/pio_nrf52/platformio.ini` records this root as
+  historical source identity only.
+- Current app shell callers: `apps/nrf52_node` exposes
+  `legacy/app_implementations/gat562_mesh_evb_pro` as historical board root
+  identity.
+- Current CMake / PlatformIO callers: `builds/pio_nrf52/platformio.ini`.
+- Current include callers: no direct main-code header include is required by
+  final app shells; remaining references are transitional source strings and
+  build wrapper documentation.
+- Runtime ownership status: concrete board historical root; board facts must
+  remain in `boards/gat562_mesh_evb_pro` and app semantics in `apps/nrf52_node`.
+- Safe to delete now? no.
+- First deletion blocker: board-specific nRF/PIO runtime glue still physically
+  lives under this root even though active wrapper validation uses final owners.
+- Target replacement owner: `apps/nrf52_node`, `builds/pio_nrf52`,
+  `boards/gat562_mesh_evb_pro`, and platform/embedded modules.
+- Burn-down step: prove concrete GAT562 validation through the final nRF app
+  shell and build wrapper, then remove this root as an app semantic boundary.
+- Deletion blocker: concrete device runtime glue still needs migration or
+  deletion decisions before the root can be removed.
+- Replacement owner: `apps/nrf52_node` plus `boards/gat562_mesh_evb_pro`.
+
+## Root: `legacy/app_implementations/linux_rpi`
+
+- Current purpose: historical Pi OS / Cardputer Zero Linux device bring-up root.
+- Current build callers: `builds/linux_cmake/README.md` lists it as an
+  app-local Linux path; no final app shell has taken this root over yet.
+- Current app shell callers: no final Linux RPI app shell exists yet.
+- Current CMake / PlatformIO callers: historical Linux CMake path and local root
+  files under `legacy/app_implementations/linux_rpi`.
+- Current include callers: no final app-shell direct include path is recorded in
+  current primary app CMake.
+- Runtime ownership status: historical Linux device bring-up root; not a
+  post-refactor runtime adoption owner.
+- Safe to delete now? no.
+- First deletion blocker: Pi OS / Cardputer Zero app-shell replacement has not
+  been created or validated.
+- Target replacement owner: future Linux device app shell, `builds/linux_cmake`,
+  `platform/linux`, and board/hardware boundaries.
+- Burn-down step: create or select the final Linux device app shell, move build
+  ownership there, and leave hardware facts behind platform/board boundaries.
+- Deletion blocker: no final Linux RPI app shell owns this product path.
+- Replacement owner: future Linux device app shell plus `platform/linux`.
+
+## Root: `legacy/app_implementations/linux_sim`
+
+- Current purpose: archive-only historical simulator implementation root.
+- Current build callers: no active build callers. The local
+  `legacy/app_implementations/linux_sim/CMakeLists.txt` is an archive marker
+  only, and Linux build wrapper documentation in `builds/linux_cmake/README.md`
+  records the historical path.
+- Current app shell callers: none for the legacy adapter. `apps/linux_sim_shell`
+  owns `LinuxSimHistoricalSourceDescriptor` and keeps only historical source
+  identity.
+- Current CMake / PlatformIO callers: none with active targets. The local
+  CMake file is archive-only.
+- Current include callers: none from active source. Historical adapter source
+  was deleted from archive after descriptor smoke coverage moved to the final
+  app shell.
+- Runtime ownership status: archive-only root. Phase 9-11 runtime entry
+  adoption, ASCII descriptor rendering, and screen graph presentation are owned
+  by `apps/linux_sim_shell`, `modules/ui_ascii_runtime`, and
+  `modules/product_composition`.
+- Safe to delete now? no.
+- First deletion blocker: archived simulator code is retained for reference and
+  possible targeted deletion.
+- Target replacement owner: `apps/linux_sim_shell`,
+  `modules/ui_ascii_runtime`, `modules/product_composition`, and platform
+  simulator support.
+- Burn-down step: local CMake root collapsed to archive-only; next blocker is
+  deleting archived simulator code after final app shell covers all simulator
+  workflows.
+- Deletion blocker: archived simulator code retained for reference and possible
+  targeted deletion.
+- Replacement owner: `apps/linux_sim_shell` plus `modules/ui_ascii_runtime`.
+
+## Root: `legacy/app_implementations/linux_uconsole`
+
+- Current purpose: archive-only historical uConsole GTK implementation root.
+- Current build callers: no active build callers. The local
+  `legacy/app_implementations/linux_uconsole/CMakeLists.txt` is an archive
+  marker only, and Linux build wrapper documentation in
+  `builds/linux_cmake/README.md` records the historical path.
+- Current app shell callers: none for the legacy adapter.
+  `apps/linux_uconsole_gtk` owns `LinuxUConsoleGtkHistoricalSourceDescriptor`
+  and keeps only historical source identity.
+- Current CMake / PlatformIO callers: none with active targets. The local
+  CMake file is archive-only.
+- Current include callers: none from active source. Historical adapter source
+  was deleted from archive after descriptor smoke coverage moved to the final
+  app shell.
+- Runtime ownership status: archive-only GTK root. Phase 9-11 page
+  registry adoption, GTK descriptor registry, and screen graph presentation are
+  owned by `apps/linux_uconsole_gtk` and `modules/ui_gtk_runtime`.
+- Safe to delete now? no.
+- First deletion blocker: archived GTK widget/page implementation retained until
+  GTK widget renderer consumes descriptor pages.
+- Target replacement owner: `apps/linux_uconsole_gtk`, `modules/ui_gtk_runtime`,
+  `modules/product_composition`, and `platform/linux`.
+- Burn-down step: local CMake root collapsed to archive-only; next blocker is
+  deleting archived GTK widget/page code after descriptor-backed GTK renderer
+  replaces it.
+- Deletion blocker: archived GTK widget/page implementation retained until GTK
+  widget renderer consumes descriptor pages.
+- Replacement owner: `apps/linux_uconsole_gtk` plus `modules/ui_gtk_runtime`.
+
+## Root: `legacy/app_implementations/linux_unoq`
+
+- Current purpose: historical placeholder for a future UNO Q Linux shell.
+- Current build callers: `builds/linux_cmake/README.md` lists it as a Linux
+  app-local path; no final app shell currently owns it.
+- Current app shell callers: none.
+- Current CMake / PlatformIO callers: local transitional root files and Linux
+  build wrapper documentation.
+- Current include callers: none recorded in final app-shell source.
+- Runtime ownership status: placeholder historical root; it must not own
+  post-refactor runtime adoption or renderer descriptor logic.
+- Safe to delete now? maybe, but not in this batch.
+- First deletion blocker: product decision is still open: create a final UNO Q
+  app shell or delete the placeholder as unused.
+- Target replacement owner: future Linux UNO Q app shell or no replacement if
+  the target is retired.
+- Burn-down step: decide whether UNO Q is a real product target; then create the
+  final app shell or delete the placeholder root.
+- Deletion blocker: target ownership decision is not yet made.
+- Replacement owner: future Linux UNO Q app shell or explicit retirement.
+
+## Linux Root Burn-Down Baseline
+
+### `legacy/app_implementations/linux_sim`
+
+- Must remain for now: archived historical simulator implementation, archived
+  simulator target, archived scripts, and archive marker.
+- Must not return here: runtime entry adoption, descriptor renderer, app shell,
+  or screen graph presenter ownership.
+- Candidate next move: delete archived simulator code after
+  `apps/linux_sim_shell` covers all simulator workflows.
+- Baseline status: no `RuntimeEntryAdoption`, `DescriptorRenderer`, or
+  `ScreenGraphPresenter` ownership remains under the root.
+
+### `legacy/app_implementations/linux_uconsole`
+
+- Must remain for now: archived old GTK widget/page implementation, archived
+  composition root, and archive marker.
+- Must not return here: page registry adoption, runtime descriptor presenter,
+  screen graph bridge, or stable GTK descriptor registry ownership.
+- Candidate next move: delete archived GTK widget/page code after
+  descriptor-backed GTK renderer replaces it.
+- Baseline status: no `RuntimeEntryAdoption`, `DescriptorRenderer`, or
+  `ScreenGraphPresenter` ownership remains under the root.
+
+## Burn-Down Guardrail
+
+The first burn-down checker should not require root deletion. It should require
+this audit, replacement owners, deletion blockers, listed build references, and
+no post-refactor runtime adoption or renderer descriptor tokens under
+`legacy/app_implementations` source files.
diff --git a/docs/audits/LEGACY_BURNDOWN_REGISTER.md b/docs/audits/LEGACY_BURNDOWN_REGISTER.md
new file mode 100644
index 00000000..4c7de4ca
--- /dev/null
+++ b/docs/audits/LEGACY_BURNDOWN_REGISTER.md
@@ -0,0 +1,87 @@
+# Legacy Burn-down Register
+
+## Purpose
+
+This register tracks legacy surfaces that are now contained by Phase 7 runtime ownership boundaries.
+
+A legacy surface may remain temporarily only if it has:
+
+- a new owner
+- remaining caller list
+- deletion or rename condition
+- target removal phase
+- checker status
+
+## Chat / Team Legacy Surfaces
+
+| Legacy surface | New owner | Remaining callers | Removal condition | Target phase | Status |
+| --- | --- | --- | --- | --- | --- |
+| `LegacyChatDeliveryEventBridge` | `ChatDeliveryEventProjectionAdapter` / `IChatDeliveryEventPort` / `ChatDeliveryEventProjector` | no main runtime callers; deprecated alias headers and legacy alias tests only | remove alias headers after downstream includes of `LegacyChatDeliveryEventBridge` are gone | 9.4 | burned-down to deprecated alias |
+| `LegacyChatDeliveryActionBridge` | `ChatDeliveryActionPortAdapter` / `IChatDeliveryActionPort` | no main runtime callers; deprecated alias headers and legacy alias tests only | remove alias headers after downstream includes of `LegacyChatDeliveryActionBridge` are gone | 9.4 | burned-down to deprecated alias |
+| `LegacyTeamActionBridge` | `TeamActionRequest` / `ITeamActionSink` / Team runtime command port | `ChatUiController::sendTeamLocationWithIcon(...)` submits `LocationMarker` intent; `chat_page_runtime.cpp` owns bridge lifetime | `TeamActionService` replaces the legacy bridge and renderers/controllers only submit `TeamActionRequest` | 7.x | contained |
+| `LegacyKeyVerificationSource` | `KeyVerificationPresentationSource` / `IKeyVerificationPresentationSource` in `modules/ui_key_verification_runtime` | no main runtime callers; deprecated alias headers and legacy alias tests only | remove alias headers after downstream includes of `LegacyKeyVerificationSource` are gone | 9.5 | burned-down to deprecated alias |
+| `LegacyKeyVerificationActionSink` | `KeyVerificationActionSink` / `IKeyVerificationActionSink` in `modules/ui_key_verification_runtime` | no main runtime callers; deprecated alias headers and legacy alias tests only | remove alias headers after downstream includes of `LegacyKeyVerificationActionSink` are gone | 9.5 | burned-down to deprecated alias |
+| `ChatUiController` key verification modal rendering | `KeyVerificationModalRenderer` helper consumes `KeyVerificationSnapshot` | `ChatUiController` opens/closes modal and forwards submit/trust callbacks | Full modal view object owns widget lifecycle and controller keeps only workflow routing | 7.x | burned-down |
+| `ChatUiController` Team payload encoding | `LegacyTeamActionBridge` | None expected for send path; controller submits `TeamActionRequest` only | Checker forbids `encodeTeamChatLocation` / `encodeTeamChatCommand` / raw `TeamChatMessage` send encoding in controller | 7.6 | burned-down |
+| `ChatUiController` delivery mutation | `ChatDeliveryReadModel` / `ChatDeliveryActionService` | None expected; event pump forwards send-result events to delivery bridge | Checker forbids direct `ChatDeliveryReadModel`, `ChatDeliveryEventProjector`, `ChatDeliveryActionService`, and `LegacyChatDeliveryEventBridge` ownership in controller | 7.6 / 7.7 | burned-down |
+| `ChatUiController` runtime event pump | `ChatPageRuntimeEventPump` / `ChatPageRuntimeFacade` | None expected; app facade registers runtime facade instead of controller | Checker forbids `ChatUiController::onChatEvent(...)`, `processIncoming()`, `flushStore()`, and key verification source projection calls in controller | 7.7 | burned-down |
+| `ChatUiController` Team rich payload formatting | `TeamRichPayloadProjector` / `TeamChatPresentationSource` | None in `ChatUiController`; Team chat rows consume projected summaries from `team_chat_model_.snapshot()` | Checker forbids `format_team_chat_entry(...)`, `decodeTeamChatLocation(...)`, `decodeTeamChatCommand(...)`, `TeamChatLocation`, and `TeamChatCommand` in controller | 7.8 | burned-down |
+| `ChatUiController` Team position picker renderer | `TeamPositionPickerRenderer` | `ChatUiController` calls open/close/updateHint and handles selected/cancel workflow only | UX pack-specific picker replaces shared LVGL renderer or renderer is renamed as official chat picker view | 7.9 | burned-down |
+| `MessageRow` Team rich display limitations | `TeamRichPayloadDisplay` / Team row renderer | `TeamChatPresentationSource` projects rich payloads to summary text for current renderer compatibility | Rich Team row/card renderer consumes structured display fields directly | 7.x | contained |
+| `Map tile path/cache legacy runtime` | `MapTileResolver` / `LegacyFilesystemMapTileSource` / map tile cache owner | Platform LVGL map tile runtimes call source/resolver; ESP decoded cache, Linux downloader cache, and uConsole path fields remain contained | Renderer consumes tile refs/source without direct path/cache ownership, and decoded/downloader caches are moved behind stable runtime adapters | 7.10 / 7.x | contained |
+| `Map tile visible plan in platform renderer` | `MapTileRenderQueue` | Platform map tile runtimes still populate queue from legacy `MapTile` records | Dedicated map runtime computes visible queue and renderer consumes queue rows without mutating plan state | 7.11 / 7.x | contained |
+| `ESP decoded LVGL tile cache` | `LvglDecodedTileCache` / `IMapTileDecoderCache` | ESP map tile runtime still asks the LVGL cache adapter for decoded handles | Runtime-owned decoder cache is injected into a dedicated map tile renderer | 7.11 / 7.x | contained |
+| `Map overlay current/team marker projection` | `MapOverlaySnapshotSource` / `MapOverlayProjectionAdapter` / `MapOverlayProjector` in `modules/ui_map_runtime` | no main runtime callers of `LegacyMapOverlaySource`; deprecated alias headers and legacy alias tests only | remove alias headers after downstream includes of `LegacyMapOverlaySource` are gone, and map renderers consume `MapOverlaySnapshotSource` only | 9.5 | burned-down to deprecated alias |
+| `Map route/tracker overlay projection` | deferred route/tracker presentation source | ESP route/tracker draw callbacks still own route/tracker widget drawing | Route/tracker stores expose presentation sources and renderer consumes overlay snapshot rows | 7.12 / 7.x | contained |
+| `GPS page refresh cadence` | `GpsPageRuntimePump` / `IGpsUiRefreshSink` | ESP and Linux GPS page timers tick `GpsPageRuntimePump`; page-local adapters preserve legacy refresh behavior | Page-local adapters are replaced by GPS presentation refresh models and renderers consume snapshots only | 7.13 / 7.x | contained |
+
+## Phase 9 Runtime Adoption Burn-down
+
+| Legacy surface | New owner | Remaining callers | Removal condition | Target phase | Status |
+| --- | --- | --- | --- | --- | --- |
+| `legacy/app_implementations/linux_sim` ASCII descriptor adapters | `modules/ui_ascii_runtime` | moved out of legacy; legacy LinuxSim CMake links module-owned sources for compatibility smoke coverage | real simulator entry consumes `AsciiRuntimeScreenGraphPresenter` and old hardcoded routing is fallback-only | 9.2 | burned-down |
+| `legacy/app_implementations/linux_uconsole` GTK descriptor adapters | `modules/ui_gtk_runtime` | moved out of legacy; legacy uConsole CMake links module-owned sources for compatibility smoke coverage | real GTK page switch path consumes `GtkUConsoleScreenGraphPresenter` and old hardcoded routing is fallback-only | 9.2 | burned-down |
+| Runtime entry adoption helpers under `legacy/app_implementations` | `modules/ui_ascii_runtime`, `modules/ui_gtk_runtime`, `modules/ui_lvgl_ux_packs`, final app-shell probes | none; Phase 9.2 keeps entry adoption helpers out of legacy | checker forbids `*RuntimeEntryAdoption` files and tokens under `legacy/app_implementations` | 9.2 | burned-down |
+| Runtime entry bridges under `legacy/app_implementations` | final app-shell runtime entry/page-registry adoption and `modules/ui_lvgl_ux_packs` | none; Phase 9.3 keeps real entry adoption out of legacy | checker forbids Phase 9 runtime adoption bridge files under `legacy/app_implementations` | 9.3 | burned-down |
+| Chat delivery legacy bridge pair | `modules/ui_chat_runtime` formal ports and adapters | no main runtime callers; `ui_legacy_adapters` and `ui_shared` headers are deprecated aliases only | remove alias headers after downstream compatibility includes are gone | 9.4 | burned-down to deprecated alias |
+| Key verification legacy source/sink/session | `modules/ui_key_verification_runtime` stable `KeyVerificationPresentationSource`, `KeyVerificationActionSink`, and `KeyVerificationSessionAdapter` | no main runtime callers; `ui_legacy_adapters` and `ui_shared` headers are deprecated aliases only | remove alias headers after downstream compatibility includes are gone | 9.5 | burned-down to deprecated alias |
+| Map overlay legacy source | `modules/ui_map_runtime` stable snapshot source and projection adapter | no main runtime callers; `ui_legacy_adapters` and `ui_shared` headers are deprecated aliases only | remove alias headers after downstream compatibility includes are gone | 9.5 | burned-down to deprecated alias |
+
+## Checker Status
+
+| Surface | Checker rule |
+| --- | --- |
+| Team send payload encoding in controller | forbidden |
+| Direct key verification runtime API in controller | forbidden |
+| Direct delivery read/action ownership in controller | forbidden |
+| Key verification modal helper | required |
+| Runtime event pump in controller | forbidden |
+| Team rich payload formatting in controller | forbidden |
+| Team position picker widget refs in controller | forbidden |
+| Map tile path policy in viewport/renderer | forbidden |
+| Map tile render queue boundary | required |
+| ESP decoded tile cache owner | required |
+| Map overlay source boundary | required |
+| GPS runtime scheduling pump | required |
+| Legacy bridges without removal condition | forbidden by register token check |
+| Key verification stable adapter names | required by Phase 9.5 checker |
+| Map overlay stable adapter names | required by Phase 9.5 checker |
+
+## Phase 9.6 Final Readiness Alignment
+
+Phase 9.6 does not add new legacy surfaces. It aligns the register with the
+Phase 9 final readiness report:
+
+- Chat delivery legacy bridge pair: main runtime callers removed; deprecated
+  aliases only; stable owner is `ChatDeliveryActionPortAdapter` and
+  `ChatDeliveryEventProjectionAdapter`.
+- Key verification legacy source/sink/session: main runtime callers removed;
+  deprecated aliases only; stable owner is `KeyVerificationPresentationSource`,
+  `KeyVerificationActionSink`, and `KeyVerificationSessionAdapter`.
+- Map overlay legacy source: main runtime callers removed; deprecated aliases
+  only; stable owner is `MapOverlaySnapshotSource` and
+  `MapOverlayProjectionAdapter`.
+
+The remaining Phase 10-facing UI fallbacks are not legacy adapter burn-down items.
+They are tracked in `docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md` as
+contained fallback with owner and exit condition.
diff --git a/docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md b/docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md
new file mode 100644
index 00000000..42bc32cf
--- /dev/null
+++ b/docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md
@@ -0,0 +1,1486 @@
+# Legacy / Compatibility / Temporary Surface Inventory
+
+## Purpose
+
+This inventory maps every non-final architecture surface that is still visible
+in the repository. It does not authorize deletion or migration by itself. It
+exists to prevent another cutover from guessing which legacy, compatibility,
+transitional, fallback, archive, adapter, bridge, probe, smoke, or checker
+surface is still carrying real responsibility.
+
+Scanner input lives in `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md`.
+The scan is discovery only; this inventory is the disposition ledger.
+
+## Categories Covered
+
+- root legacy source roots
+- compatibility shims
+- deprecated aliases
+- transitional descriptors
+- fallback-only paths
+- archive-only roots
+- legacy build entries
+- old build entrypoints
+- legacy app shells
+- adapter / bridge / facade layers
+- probe / smoke-only runtime
+- historical debt docs
+- legacy-governing checkers
+- legacy/transitional/compatibility/shim/fallback names
+
+## Disposition Values
+
+- Must Delete
+- Must Rename
+- Must Migrate
+- Deleted
+- Keep as Final Adapter
+- Keep as Deprecated Alias Temporarily
+- Test-only / Smoke-only
+
+## Surface: root legacy/
+
+Category:
+- root legacy source roots
+
+Current location:
+- `legacy/`
+- `legacy/README.md`
+- `legacy/LEGACY_GOVERNANCE.md`
+
+Current callers:
+- docs and checkers reference the root as a governance boundary.
+- `tools/architecture/check_post_refactor_final_ready.py` and
+  `tools/architecture/check_legacy_app_roots_burndown_ready.py` still accept
+  `legacy/app_implementations` as present.
+
+Current responsibility:
+- contains historical implementation roots and governance notes.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- docs/archive for historical records, plus concrete final owners per root.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- deleting before build and runtime ownership transfer would break ESP-IDF,
+  PIO, Linux simulator, uConsole, RPI/Cardputer, and GAT562 workflows.
+
+## Surface: legacy/app_implementations/esp_idf
+
+Category:
+- root legacy source roots
+
+Current location:
+- `legacy/app_implementations/esp_idf`
+- `legacy/app_implementations/esp_idf/CMakeLists.txt`
+- `legacy/app_implementations/esp_idf/idf_component.yml`
+- `legacy/app_implementations/esp_idf/library.json`
+- `legacy/app_implementations/esp_idf/targets/*`
+
+Current callers:
+- root `CMakeLists.txt`
+- `builds/esp_idf/CMakeLists.txt`
+- `apps/esp32_lvgl/CMakeLists.txt`
+- ESP-IDF component registration under the root
+
+Current responsibility:
+- transitional ESP-IDF build/component root, target sdkconfig defaults, and
+  ESP runtime entry glue.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `builds/esp_idf`, `apps/esp32_lvgl`, `platform/esp`, `boards/*`, and
+  stable runtime modules.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; this root is still an active build dependency.
+
+## Surface: legacy/app_implementations/esp_pio
+
+Category:
+- root legacy source roots
+
+Current location:
+- `legacy/app_implementations/esp_pio`
+- `legacy/app_implementations/esp_pio/library.json`
+- `legacy/app_implementations/esp_pio/src/*`
+- `legacy/app_implementations/esp_pio/include/*`
+
+Current callers:
+- `builds/pio_nrf52/platformio.ini`
+- `builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp`
+- `apps/nrf52_node` transitional source strings
+
+Current responsibility:
+- PlatformIO/Arduino compatibility source layout and app runtime glue.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `builds/pio_nrf52`, `apps/nrf52_node`, `platform/nrf52`, `boards/*`, and
+  stable modules.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; PIO include flags and wrapper baseline still reference it.
+
+## Surface: legacy/app_implementations/gat562_mesh_evb_pro
+
+Category:
+- root legacy source roots
+
+Current location:
+- `legacy/app_implementations/gat562_mesh_evb_pro`
+- `legacy/app_implementations/gat562_mesh_evb_pro/library.json`
+- `legacy/app_implementations/gat562_mesh_evb_pro/src/*`
+- `legacy/app_implementations/gat562_mesh_evb_pro/include/*`
+
+Current callers:
+- `builds/pio_nrf52/platformio.ini`
+- `apps/nrf52_node` board-specific transitional source strings
+
+Current responsibility:
+- concrete GAT562 Mesh EVB Pro historical app/runtime glue.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/nrf52_node`, `builds/pio_nrf52`, `boards/gat562_mesh_evb_pro`, and
+  `platform/nrf52`.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; it is a concrete device path, not just documentation.
+
+## Surface: legacy/app_implementations/linux_rpi
+
+Category:
+- root legacy source roots
+
+Current location:
+- `legacy/app_implementations/linux_rpi`
+- `legacy/app_implementations/linux_rpi/CMakeLists.txt`
+- `legacy/app_implementations/linux_rpi/SConstruct`
+- `legacy/app_implementations/linux_rpi/main/*`
+- `legacy/app_implementations/linux_rpi/scripts/*`
+
+Current callers:
+- `builds/linux_cmake/README.md` records it as a current transitional Linux
+  app-local path.
+- local root CMake/SCons/scripts may still be used by device workflows.
+
+Current responsibility:
+- historical Pi OS / Cardputer Zero Linux device bring-up.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- future Linux device app shell, `builds/linux_cmake`, and `platform/linux`.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- medium-high; no final RPI/Cardputer app shell currently replaces it.
+
+## Surface: legacy/app_implementations/linux_sim
+
+Category:
+- root legacy source roots
+
+Current location:
+- `legacy/app_implementations/linux_sim`
+- `legacy/app_implementations/linux_sim/CMakeLists.txt`
+- `legacy/app_implementations/linux_sim/ARCHIVE.md`
+- `legacy/app_implementations/linux_sim/archive/*`
+
+Current callers:
+- docs and checkers recognize it as archive-only.
+- final app shell records it through
+  `apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.*`.
+
+Current responsibility:
+- archive-only historical simulator source and scripts.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/linux_sim_shell`, `modules/ui_ascii_runtime`, `platform/linux`, and
+  docs/archive for history.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- medium; source is archive-only but still referenced by descriptors and docs.
+
+## Surface: legacy/app_implementations/linux_uconsole
+
+Category:
+- root legacy source roots
+
+Current location:
+- `legacy/app_implementations/linux_uconsole`
+- `legacy/app_implementations/linux_uconsole/CMakeLists.txt`
+- `legacy/app_implementations/linux_uconsole/ARCHIVE.md`
+- `legacy/app_implementations/linux_uconsole/archive/*`
+
+Current callers:
+- docs and checkers recognize it as archive-only.
+- final app shell records it through
+  `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.*`.
+
+Current responsibility:
+- archive-only historical uConsole GTK source, packaging files, scripts, and
+  old widget/page code.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/linux_uconsole_gtk`, `builds/linux_cmake`, `platform/linux/uconsole`,
+  `modules/ui_gtk_runtime`, and docs/archive for history.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; this archive still contains real business/page/packaging history that
+  must be migrated or deliberately replaced before deletion.
+
+## Surface: legacy/app_implementations/linux_unoq
+
+Category:
+- root legacy source roots
+
+Current location:
+- `legacy/app_implementations/linux_unoq`
+- `legacy/app_implementations/linux_unoq/README.md`
+- `legacy/app_implementations/linux_unoq/TRANSITIONAL_IMPLEMENTATION_ROOT.md`
+
+Current callers:
+- `builds/linux_cmake/README.md` records it as a current transitional Linux
+  path.
+- `legacy/app_implementations/LEGACY_IMPLEMENTATION_INDEX.md`
+
+Current responsibility:
+- placeholder historical Linux UNO Q root.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- future Linux UNO Q app shell or delete with no replacement if target is
+  retired.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- low-medium; deleting without product decision may lose target intent.
+
+## Surface: esp_idf_legacy_implementation_adapter
+
+Category:
+- adapter / bridge / facade layers
+
+Current location:
+- `legacy/app_implementations/esp_idf/src/esp_idf_legacy_implementation_adapter.*`
+
+Current callers:
+- docs and inventory only after Batch 2.
+- `apps/esp32_lvgl` uses `esp32_lvgl_historical_source_descriptor.*`.
+- `builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake` owns migrated ESP-IDF
+  source lists.
+
+Current responsibility:
+- historical adapter source retained under the ESP-IDF historical root.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/esp32_lvgl` for app shell metadata and `builds/esp_idf` for build
+  entrypoint wiring.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- medium; source is retained but no final app shell or build entrypoint should
+  compile it.
+
+## Surface: nrf52_pio_legacy_implementation_adapter
+
+Category:
+- adapter / bridge / facade layers
+
+Current location:
+- `legacy/app_implementations/esp_pio/src/nrf52_pio_legacy_implementation_adapter.h`
+
+Current callers:
+- docs and inventory only after Batch 1.
+- `builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp` now uses
+  `apps/nrf52_node/src/nrf52_historical_source_descriptor.*`.
+- `builds/pio_nrf52/platformio.ini` no longer adds the legacy root include path.
+
+Current responsibility:
+- describes transitional PIO and board-specific roots for the nRF52 wrapper.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/nrf52_node`, `builds/pio_nrf52`, and `boards/gat562_mesh_evb_pro`.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; active PlatformIO wrapper includes it.
+
+## Surface: linux_sim_legacy_implementation_adapter
+
+Category:
+- adapter / bridge / facade layers
+
+Current location:
+- deleted from `legacy/app_implementations/linux_sim/archive/adapters` in
+  Batch 1.
+
+Current callers:
+- docs and checkers only; old adapter smoke source and archived adapter source
+  are deleted.
+
+Current responsibility:
+- historical record only after final shell moved to its own historical source
+  descriptor.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- docs/archive or delete.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- low; it is archive-only but still enforced by legacy root checker.
+
+## Surface: uconsole_legacy_implementation_adapter
+
+Category:
+- adapter / bridge / facade layers
+
+Current location:
+- deleted from `legacy/app_implementations/linux_uconsole/archive/adapters` in
+  Batch 1.
+
+Current callers:
+- docs and checkers only; old adapter smoke source and archived adapter source
+  are deleted.
+
+Current responsibility:
+- historical record only after final shell moved to its own historical source
+  descriptor.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- docs/archive or delete after uConsole final ownership is complete.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- low-medium; uConsole root still contains other real source that needs
+  separate handling.
+
+## Surface: linux_sim_historical_source_descriptor (formerly linux_sim_legacy_source_descriptor)
+
+Category:
+- transitional descriptors
+
+Current location:
+- `apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.*`
+- `apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp`
+
+Current callers:
+- `apps/linux_sim_shell/src/linux_sim_app_shell.*`
+- `apps/linux_sim_shell/CMakeLists.txt`
+- `tools/architecture/check_legacy_app_roots_burndown_ready.py`
+- `tools/architecture/check_phase8_layout_ready.py`
+
+Current responsibility:
+- records `historical_root_name`, `historical_role`, and replacement owner
+  metadata for the final LinuxSim app shell.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/linux_sim_shell` as historical source metadata, not runtime-reachable
+  legacy root path.
+
+Disposition:
+- Must Rename.
+
+Delete condition:
+- rename to historical source descriptor or delete once docs/archive records
+  the legacy root history; remove the concrete `legacy/...` root_path field.
+  Batch 1 completed the rename and removed the `root_path` field.
+
+Risk:
+- medium; app shell validation currently reads this descriptor.
+
+## Surface: linux_uconsole_gtk_historical_source_descriptor (formerly linux_uconsole_gtk_legacy_source_descriptor)
+
+Category:
+- transitional descriptors
+
+Current location:
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.*`
+- `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp`
+
+Current callers:
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.*`
+- `apps/linux_uconsole_gtk/CMakeLists.txt`
+- `tools/architecture/check_legacy_app_roots_burndown_ready.py`
+- `tools/architecture/check_phase8_layout_ready.py`
+
+Current responsibility:
+- records `historical_root_name`, `historical_role`, and replacement owner
+  metadata for the final uConsole GTK app shell.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/linux_uconsole_gtk` as historical source metadata, plus
+  `builds/linux_cmake` for package/build metadata.
+
+Disposition:
+- Must Rename.
+
+Delete condition:
+- rename to historical source descriptor or delete once docs/archive records
+  the legacy root history; remove the concrete `legacy/...` root_path field.
+  Batch 1 completed the rename and removed the `root_path` field.
+
+Risk:
+- high; it currently hides the fact that uConsole archive still contains
+  page and packaging material that may need migration.
+
+## Surface: nrf52_historical_source_descriptor
+
+Category:
+- transitional descriptors
+
+Current location:
+- `apps/nrf52_node/src/nrf52_historical_source_descriptor.*`
+- `apps/nrf52_node/tests/nrf52_historical_source_descriptor_smoke.cpp`
+
+Current callers:
+- `apps/nrf52_node/src/nrf52_node_app_shell.*`
+- `builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp`
+
+Current responsibility:
+- records historical PIO and GAT562 root identity after active wrapper stopped
+  including `nrf52_pio_legacy_implementation_adapter.h`.
+
+Is this final architecture?
+- No as a permanent source descriptor; yes as a short-lived historical record
+  during root deletion preparation.
+
+Final owner:
+- `apps/nrf52_node`, `builds/pio_nrf52`, and `boards/gat562_mesh_evb_pro`.
+
+Disposition:
+- Must Rename.
+
+Delete condition:
+- delete once `docs/archive` records removed root history and PIO/GAT562 source
+  ownership no longer requires historical source identity in app/runtime code.
+
+Risk:
+- medium; it is intentionally metadata-only and does not expose a root path
+  field, but it still names historical roots.
+
+## Surface: esp32_lvgl_historical_source_descriptor
+
+Category:
+- transitional descriptors
+
+Current location:
+- `apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.*`
+- `apps/esp32_lvgl/tests/esp32_lvgl_historical_source_descriptor_smoke.cpp`
+
+Current callers:
+- `apps/esp32_lvgl/src/esp32_lvgl_app_shell.*`
+
+Current responsibility:
+- records historical ESP-IDF root identity while the ESP-IDF final owner
+  migration plan is established.
+
+Is this final architecture?
+- No as a permanent source descriptor; it is a migration landing record only.
+
+Final owner:
+- `apps/esp32_lvgl` and `builds/esp_idf`.
+
+Disposition:
+- Must Rename.
+
+Delete condition:
+- delete once ESP-IDF component/source ownership has moved out of
+  `legacy/app_implementations/esp_idf` and historical root removal is recorded.
+
+Risk:
+- medium-high; ESP-IDF is still an active build dependency.
+
+## Surface: ui_headless_runtime descriptor consumer
+
+Category:
+- adapter / bridge / facade layers
+
+Current location:
+- `modules/ui_headless_runtime/include/ui_headless_runtime/headless_descriptor_consumer.h`
+- `modules/ui_headless_runtime/src/headless_descriptor_consumer.cpp`
+- `modules/ui_headless_runtime/tests/test_headless_descriptor_consumer.cpp`
+
+Current callers:
+- tests and architecture checker only in Batch 1.
+
+Current responsibility:
+- final renderer-safe descriptor consumer for targets that need a non-widget
+  descriptor path.
+
+Is this final architecture?
+- Yes as a final adapter.
+
+Final owner:
+- `modules/ui_headless_runtime`.
+
+Disposition:
+- Keep as Final Adapter.
+
+Delete condition:
+- none for the final adapter; delete only if a later final architecture chooses
+  a different headless descriptor consumer and updates the checker.
+
+Risk:
+- low; it consumes DTO-style descriptors and does not choose UX, board, or
+  build behavior.
+
+## Surface: ui_shared compatibility shims
+
+Category:
+- compatibility shims
+
+Current location:
+- `modules/ui_shared/include/ui/presentation_sources/legacy_*`
+- `modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h`
+- `modules/ui_shared/include/ui/team_actions/legacy_team_action_bridge.h`
+- `docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md`
+
+Current callers:
+- `cmake/TrailMateLinuxSources.cmake`
+- compatibility tests and historical include paths
+- docs and checker policy
+
+Current responsibility:
+- preserves old include paths while stable runtime modules own replacements.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- stable modules such as `ui_chat_runtime`, `ui_key_verification_runtime`,
+  `ui_map_runtime`, `ui_presentation`, and `ui_legacy_adapters` only where
+  compatibility aliasing is explicitly allowed.
+
+Disposition:
+- Keep as Deprecated Alias Temporarily.
+
+Delete condition:
+- no production or downstream include path uses the old `ui_shared` forwarding
+  headers and compatibility tests can be removed or relocated.
+
+Risk:
+- medium; deleting early breaks downstream includes.
+
+## Surface: LegacyChatDeliveryActionBridge
+
+Category:
+- deprecated aliases
+
+Current location:
+- `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h`
+- `modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h`
+
+Current callers:
+- `modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp`
+- docs and checker policy
+
+Current responsibility:
+- deprecated alias to `ui_chat_runtime::ChatDeliveryActionPortAdapter`.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `modules/ui_chat_runtime`.
+
+Disposition:
+- Keep as Deprecated Alias Temporarily.
+
+Delete condition:
+- no downstream includes of either alias header remain.
+
+Risk:
+- low-medium; alias may be used by external or untracked downstream code.
+
+## Surface: LegacyChatDeliveryEventBridge
+
+Category:
+- deprecated aliases
+
+Current location:
+- `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h`
+- `modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h`
+
+Current callers:
+- `modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp`
+- docs and checker policy
+
+Current responsibility:
+- deprecated alias to `ui_chat_runtime::ChatDeliveryEventProjectionAdapter`.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `modules/ui_chat_runtime`.
+
+Disposition:
+- Keep as Deprecated Alias Temporarily.
+
+Delete condition:
+- no downstream includes of either alias header remain.
+
+Risk:
+- low-medium; alias may be used by external or untracked downstream code.
+
+## Surface: LegacyKeyVerificationSource
+
+Category:
+- deprecated aliases
+
+Current location:
+- `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h`
+- `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h`
+
+Current callers:
+- `modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp`
+- docs and checker policy
+
+Current responsibility:
+- deprecated alias to
+  `ui_key_verification_runtime::KeyVerificationPresentationSource`.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `modules/ui_key_verification_runtime`.
+
+Disposition:
+- Keep as Deprecated Alias Temporarily.
+
+Delete condition:
+- no downstream includes of either alias header remain.
+
+Risk:
+- low-medium; alias may be used by external or untracked downstream code.
+
+## Surface: LegacyKeyVerificationActionSink
+
+Category:
+- deprecated aliases
+
+Current location:
+- `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h`
+- `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h`
+
+Current callers:
+- `modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp`
+- docs and checker policy
+
+Current responsibility:
+- deprecated alias to `ui_key_verification_runtime::KeyVerificationActionSink`.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `modules/ui_key_verification_runtime`.
+
+Disposition:
+- Keep as Deprecated Alias Temporarily.
+
+Delete condition:
+- no downstream includes of either alias header remain.
+
+Risk:
+- low-medium; alias may be used by external or untracked downstream code.
+
+## Surface: LegacyKeyVerificationSession
+
+Category:
+- deprecated aliases
+
+Current location:
+- `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h`
+- `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h`
+
+Current callers:
+- `modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp`
+- docs and checker policy
+
+Current responsibility:
+- deprecated alias to
+  `ui_key_verification_runtime::KeyVerificationSessionAdapter`.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `modules/ui_key_verification_runtime`.
+
+Disposition:
+- Keep as Deprecated Alias Temporarily.
+
+Delete condition:
+- no downstream includes of either alias header remain.
+
+Risk:
+- low-medium; alias may be used by external or untracked downstream code.
+
+## Surface: LegacyMapOverlaySource
+
+Category:
+- deprecated aliases
+
+Current location:
+- `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h`
+- `modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h`
+
+Current callers:
+- `modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp`
+- docs and checker policy
+
+Current responsibility:
+- deprecated alias to `ui::map_overlay::MapOverlaySnapshotSource`.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `modules/ui_map_runtime` and map presentation/runtime modules.
+
+Disposition:
+- Keep as Deprecated Alias Temporarily.
+
+Delete condition:
+- no downstream includes remain and map renderers consume stable snapshots only.
+
+Risk:
+- low-medium; alias may be used by external or untracked downstream code.
+
+## Surface: LinuxSim hardcoded runtime routing
+
+Category:
+- fallback-only paths
+
+Current location:
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.*`
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.*`
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp`
+
+Current callers:
+- LinuxSim runtime entry and renderer tests.
+- Phase 10/11 checkers.
+
+Current responsibility:
+- fallback-only route when screen graph adoption fails.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/linux_sim_shell` and `modules/ui_ascii_runtime`.
+
+Disposition:
+- Must Delete.
+
+Delete condition:
+- real simulator workflows no longer need hardcoded route fallback and fallback
+  smoke can be removed or converted to error-path validation.
+
+Risk:
+- medium; removing early hides failed-adoption behavior.
+
+## Surface: GTK hardcoded page registry
+
+Category:
+- fallback-only paths
+
+Current location:
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.*`
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.*`
+- `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp`
+- archived old page registry under `legacy/app_implementations/linux_uconsole/archive/gtk/gtk/gtk_uconsole_pages.*`
+
+Current callers:
+- uConsole GTK page registry tests.
+- Phase 10/11 checkers.
+
+Current responsibility:
+- fallback-only registry when descriptor adoption fails.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/linux_uconsole_gtk` and `modules/ui_gtk_runtime`.
+
+Disposition:
+- Must Delete.
+
+Delete condition:
+- real GTK widget/page creation consumes `GtkDescriptorPage` as the primary page
+  source and fallback smoke is no longer required.
+
+Risk:
+- high; current GTK widget code has not been fully migrated out of archive.
+
+## Surface: LVGL hardcoded menu/page creation
+
+Category:
+- fallback-only paths
+
+Current location:
+- `modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp`
+- `modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp`
+- `modules/ui_lvgl_ux_packs/tests/test_lvgl_primary_screen_graph_runtime.cpp`
+- `modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_renderer_probe.cpp`
+
+Current callers:
+- LVGL runtime/probe tests.
+- Phase 10/11 checkers.
+
+Current responsibility:
+- fallback-only descriptor fallback while real LVGL menu/page renderers still
+  have compatibility paths.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `modules/ui_lvgl_ux_packs` real renderer path.
+
+Disposition:
+- Must Delete.
+
+Delete condition:
+- at least one real LVGL target consumes `LvglDescriptorMenuModel` before
+  menu/page object creation.
+
+Risk:
+- medium-high; premature deletion may break LVGL compatibility behavior.
+
+## Surface: legacy/app_implementations/linux_sim/archive
+
+Category:
+- archive-only roots
+
+Current location:
+- `legacy/app_implementations/linux_sim/archive/*`
+
+Current callers:
+- docs and `tools/architecture/check_legacy_app_roots_burndown_ready.py`
+  require selected archive paths.
+
+Current responsibility:
+- retains historical simulator composition, adapters, scripts, and smoke/probe
+  source.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- delete source after docs/archive summary, with active workflows in
+  `apps/linux_sim_shell` and `platform/linux`.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- medium; archive still contains useful workflow history.
+
+## Surface: legacy/app_implementations/linux_uconsole/archive
+
+Category:
+- archive-only roots
+
+Current location:
+- `legacy/app_implementations/linux_uconsole/archive/*`
+
+Current callers:
+- docs and `tools/architecture/check_legacy_app_roots_burndown_ready.py`
+  require selected archive paths.
+
+Current responsibility:
+- retains historical uConsole composition, adapters, GTK pages, scripts,
+  packaging metadata, and old smoke tests.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/linux_uconsole_gtk`, `builds/linux_cmake`, `platform/linux/uconsole`,
+  `modules/ui_gtk_runtime`, and docs/archive for historical notes.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; deleting this archive without migration loses real GTK and packaging
+  material.
+
+## Surface: legacy build CMake and library manifests
+
+Category:
+- legacy build entries
+
+Current location:
+- `legacy/app_implementations/esp_idf/CMakeLists.txt`
+- `legacy/app_implementations/esp_idf/library.json`
+- `legacy/app_implementations/esp_pio/library.json`
+- `legacy/app_implementations/gat562_mesh_evb_pro/library.json`
+- `legacy/app_implementations/linux_rpi/CMakeLists.txt`
+- `legacy/app_implementations/linux_rpi/SConstruct`
+- `legacy/app_implementations/linux_sim/CMakeLists.txt`
+- `legacy/app_implementations/linux_uconsole/CMakeLists.txt`
+
+Current callers:
+- `builds/*` wrappers, root CMake, PlatformIO, docs, and checkers.
+
+Current responsibility:
+- keeps old build ownership alive or documents archive-only local roots.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `builds/esp_idf`, `builds/pio_nrf52`, `builds/linux_cmake`, final app
+  shells, and platform modules.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; build files are sensitive and may be active.
+
+## Surface: old build entrypoints
+
+Category:
+- old build entrypoints
+
+Current location:
+- root `CMakeLists.txt`
+- root `platformio.ini`
+- `legacy/app_implementations/*/CMakeLists.txt`
+- `legacy/app_implementations/*/library.json`
+- `docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md`
+
+Current callers:
+- current developer workflows and phase checkers.
+
+Current responsibility:
+- records and preserves historical build entrypoint behavior while
+  `builds/*` wrappers mature.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `builds/esp_idf`, `builds/pio_nrf52`, and `builds/linux_cmake`.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; this can break all build families if moved without proof.
+
+## Surface: legacy app shell roots
+
+Category:
+- legacy app shells
+
+Current location:
+- `legacy/app_implementations/linux_sim`
+- `legacy/app_implementations/linux_uconsole`
+- `legacy/app_implementations/linux_rpi`
+- `legacy/app_implementations/linux_unoq`
+- `legacy/app_implementations/gat562_mesh_evb_pro`
+- `legacy/app_implementations/esp_idf`
+- `legacy/app_implementations/esp_pio`
+
+Current callers:
+- app shell docs, build docs, legacy root checker, and transitional wrappers.
+
+Current responsibility:
+- historical app shell / implementation root identity.
+
+Is this final architecture?
+- No.
+
+Final owner:
+- `apps/*` final app shells, `builds/*`, `boards/*`, `platform/*`, and stable
+  modules.
+
+Disposition:
+- Deleted.
+
+Final status:
+- Removed in Root Legacy Elimination.
+
+Historical record:
+- docs/archive/REMOVED_LEGACY_ROOTS.md
+
+Delete condition:
+- Satisfied by Batch 4 Root Legacy Elimination.
+
+Risk:
+- high; these roots mix build, app, target, runtime, scripts, and archive
+  responsibilities.
+
+## Surface: adapter / bridge / facade naming surface
+
+Category:
+- adapter / bridge / facade layers
+
+Current location:
+- `modules/ui_ascii_runtime/*adapter*`
+- `modules/ui_gtk_runtime/*adapter*`
+- `modules/ui_lvgl_ux_packs/*adapter*`
+- `modules/ui_chat_runtime/*adapter*`
+- `modules/ui_map_runtime/*adapter*`
+- `platform/*/*bridge*`
+- `legacy/app_implementations/*/*facade*`
+
+Current callers:
+- runtime modules, platform modules, CMake source lists, tests, and docs.
+
+Current responsibility:
+- mixed: some are final runtime boundary adapters; others are historical
+  anti-corruption or legacy facade surfaces.
+
+Is this final architecture?
+- Mixed.
+
+Final owner:
+- stable adapter modules for real runtime boundaries; delete or migrate legacy
+  bridge/facade layers by concrete surface.
+
+Disposition:
+- Keep as Final Adapter.
+
+Delete condition:
+- final adapter names stay only where they adapt real runtime/rendering
+  boundaries; legacy migration wrappers are separately deleted or renamed.
+
+Risk:
+- medium; treating all adapters as debt would incorrectly delete final
+  architecture adapters.
+
+## Surface: probe and smoke runtime surface
+
+Category:
+- probe / smoke-only runtime
+
+Current location:
+- `apps/*/tests/*smoke.cpp`
+- `apps/*/src/*adoption_probe.*`
+- `modules/*/tests/*smoke.cpp`
+- `modules/ui_lvgl_ux_packs/src/runtime/*probe.*`
+- `modules/ui_presentation/src/workspace/presentation_workspace_probe.cpp`
+- `legacy/app_implementations/*/archive/tests/*`
+
+Current callers:
+- test targets, architecture checkers, and CMake test sections.
+
+Current responsibility:
+- validates migration paths, fallback paths, descriptor consumers, and
+  presentation snapshots.
+
+Is this final architecture?
+- No for product runtime; yes only as tests or diagnostic probes.
+
+Final owner:
+- tests, architecture tooling, or final diagnostic modules when explicitly
+  retained.
+
+Disposition:
+- Test-only / Smoke-only.
+
+Delete condition:
+- remove or relocate when covered by stable integration tests; no app runtime
+  path should depend on smoke-only code.
+
+Risk:
+- medium; probes are useful guardrails but can become accidental product paths.
+
+## Surface: historical debt docs
+
+Category:
+- historical debt docs
+
+Current location:
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md`
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md`
+- `docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md`
+- `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md`
+- `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md`
+- `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md`
+- `docs/audits/POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md`
+- `docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md`
+
+Current callers:
+- checkers and human review.
+
+Current responsibility:
+- records why non-final surfaces remain and what conditions delete them.
+
+Is this final architecture?
+- No; they are debt ledgers.
+
+Final owner:
+- docs/archive once the debts are resolved; active specs/checkers only for
+  current guardrails.
+
+Disposition:
+- Must Migrate.
+
+Delete condition:
+- historical reports move to docs/archive or are superseded by final guardrail
+  specs that no longer accept the legacy surface.
+
+Risk:
+- low-medium; deleting docs early loses deletion rationale.
+
+## Surface: legacy-governing checker surface
+
+Category:
+- legacy-governing checkers
+
+Current location:
+- `tools/architecture/check_legacy_app_roots_burndown_ready.py`
+- `tools/architecture/check_phase8_layout_ready.py`
+- `tools/architecture/check_phase9_legacy_burndown_ready.py`
+- `tools/architecture/check_post_refactor_final_ready.py`
+- phase 5/6 legacy baseline JSON and historical checkers
+
+Current callers:
+- `tools/architecture/check_post_refactor_final_ready.py`
+- direct developer/CI invocations
+
+Current responsibility:
+- proves legacy is contained, not absent.
+
+Is this final architecture?
+- No, except as historical checkers.
+
+Final owner:
+- active final guardrail checker that forbids legacy root reintroduction, plus
+  archived historical checkers if still useful.
+
+Disposition:
+- Must Migrate.
+
+Delete condition:
+- final no-root-legacy checker exists and active final checker no longer
+  requires `legacy/app_implementations` to exist.
+
+Risk:
+- medium; retiring too soon removes guardrails before final cutover.
+
+## Surface: legacy/transitional/compatibility/shim/fallback names
+
+Category:
+- legacy/transitional/compatibility/shim/fallback names
+
+Current location:
+- filenames and APIs containing `legacy`, `transitional`, `compatibility`,
+  `compat`, `shim`, `fallback`, `adapter`, `bridge`, `probe`, or `smoke` across
+  apps, modules, platform, legacy, docs, and tools.
+
+Current callers:
+- discovered by `tools/architecture/scan_legacy_compat_temp_surfaces.py`.
+
+Current responsibility:
+- mixed: some names describe real final adapters, some describe temporary debt,
+  and some are tests/docs only.
+
+Is this final architecture?
+- Mixed.
+
+Final owner:
+- name-specific final owner; inventory and scan report must be used before
+  renaming or deleting.
+
+Disposition:
+- Must Rename.
+
+Delete condition:
+- each name is either proven final and allowed, renamed to accurate final
+  language, moved to tests/docs, or deleted.
+
+Risk:
+- medium; blanket keyword deletion would remove valid final adapters.
+
+## Surface: compatibility UX pack and compatibility screen factory
+
+Category:
+- compatibility shims
+
+Current location:
+- `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/compatibility_ux_pack.h`
+- `modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp`
+- `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h`
+- `modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp`
+
+Current callers:
+- `cmake/TrailMateUxPacks.cmake`
+- `cmake/TrailMateLinuxSources.cmake`
+- LVGL UX pack registry and tests
+
+Current responsibility:
+- compatibility LVGL UX and screen descriptor factory.
+
+Is this final architecture?
+- Not as a product UX; may remain only as contained compatibility runtime.
+
+Final owner:
+- `modules/ui_lvgl_ux_packs`.
+
+Disposition:
+- Must Migrate.
+
+Delete condition:
+- concrete target UX packs and renderer descriptor consumers replace the
+  compatibility pack for supported product paths.
+
+Risk:
+- medium; many tests and compatibility paths still depend on it.
+
+## Surface: ui_legacy_adapters module
+
+Category:
+- compatibility shims
+
+Current location:
+- `modules/ui_legacy_adapters`
+- `modules/ui_legacy_adapters/library.json`
+- `modules/ui_legacy_adapters/include/ui_legacy_adapters/*`
+- `modules/ui_legacy_adapters/tests/*`
+
+Current callers:
+- `cmake/TrailMateLinuxSources.cmake`
+- deprecated alias tests
+- docs and checkers
+
+Current responsibility:
+- bounded compatibility adapter and alias module split out from `ui_shared`.
+
+Is this final architecture?
+- No as a long-term module name; yes only as temporary compatibility
+  containment.
+
+Final owner:
+- stable runtime modules or deletion after downstream include burn-down.
+
+Disposition:
+- Keep as Deprecated Alias Temporarily.
+
+Delete condition:
+- all aliases either deleted or renamed to final non-legacy adapter APIs.
+
+Risk:
+- medium; deleting early breaks compatibility alias tests and possible
+  downstream callers.
diff --git a/docs/audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md b/docs/audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md
new file mode 100644
index 00000000..91d191b0
--- /dev/null
+++ b/docs/audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md
@@ -0,0 +1,1476 @@
+# Legacy / Compatibility / Temporary Surface Scan
+
+Generated by `tools/architecture/scan_legacy_compat_temp_surfaces.py`.
+
+This scan is discovery input only. It is not a disposition decision and
+must be interpreted through `LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md`.
+
+## Keyword Counts
+
+| Keyword | Matches | Paths |
+| --- | ---: | ---: |
+| `legacy` | 2948 | 247 |
+| `compat` | 675 | 194 |
+| `compatibility` | 527 | 158 |
+| `transitional` | 153 | 40 |
+| `temporary` | 41 | 18 |
+| `fallback` | 785 | 162 |
+| `shim` | 43 | 14 |
+| `deprecated` | 160 | 40 |
+| `archive-only` | 36 | 8 |
+| `adapter` | 2738 | 311 |
+| `bridge` | 903 | 151 |
+| `probe` | 549 | 100 |
+| `smoke` | 424 | 77 |
+
+## Matched Paths
+
+| Path | Keywords |
+| --- | --- |
+| `.github/PULL_REQUEST_TEMPLATE.md` | `adapter` |
+| `.github/workflows/cardputer-zero-linux.yml` | `smoke` |
+| `CMakeLists.txt` | `legacy` |
+| `NOTICE.md` | `compat` |
+| `README.md` | `adapter`, `compat`, `compatibility` |
+| `apps/README.md` | `adapter`, `compat`, `compatibility`, `transitional` |
+| `apps/esp32_lvgl/APP_SHELL_MANIFEST.md` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `apps/esp32_lvgl/CMakeLists.txt` | `smoke` |
+| `apps/esp32_lvgl/README.md` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `apps/esp32_lvgl/src/esp32_lvgl_app_shell.h` | `compat`, `compatibility` |
+| `apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp` | `probe` |
+| `apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp` | `compat`, `compatibility`, `smoke` |
+| `apps/esp32_lvgl/tests/esp32_lvgl_historical_source_descriptor_smoke.cpp` | `smoke` |
+| `apps/esp32_lvgl/tests/esp32_lvgl_loop_runtime_smoke.cpp` | `smoke` |
+| `apps/esp32_lvgl/tests/esp32_lvgl_runtime_config_smoke.cpp` | `smoke` |
+| `apps/esp32_lvgl/tests/esp32_lvgl_startup_runtime_smoke.cpp` | `smoke` |
+| `apps/linux_sim_shell/APP_SHELL_MANIFEST.md` | `smoke`, `transitional` |
+| `apps/linux_sim_shell/CMakeLists.txt` | `adapter`, `bridge`, `compat`, `compatibility`, `fallback`, `legacy`, `probe`, `smoke` |
+| `apps/linux_sim_shell/README.md` | `smoke`, `transitional` |
+| `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp` | `fallback`, `probe` |
+| `apps/linux_sim_shell/src/linux_sim_runtime_entry.h` | `fallback`, `probe` |
+| `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp` | `compat`, `compatibility`, `fallback`, `probe` |
+| `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h` | `fallback`, `probe` |
+| `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp` | `fallback` |
+| `apps/linux_sim_shell/src/linux_sim_runtime_renderer.h` | `fallback` |
+| `apps/linux_sim_shell/tests/linux_sim_app_shell_smoke.cpp` | `smoke` |
+| `apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp` | `smoke` |
+| `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp` | `fallback`, `probe`, `smoke` |
+| `apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp` | `fallback`, `smoke` |
+| `apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp` | `fallback`, `smoke` |
+| `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp` | `fallback`, `smoke` |
+| `apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md` | `smoke`, `transitional` |
+| `apps/linux_uconsole_gtk/CMakeLists.txt` | `adapter`, `bridge`, `fallback`, `probe`, `smoke` |
+| `apps/linux_uconsole_gtk/README.md` | `smoke`, `transitional` |
+| `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp` | `fallback`, `legacy`, `probe` |
+| `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h` | `fallback`, `probe` |
+| `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.cpp` | `fallback` |
+| `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.h` | `fallback` |
+| `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp` | `compat`, `compatibility`, `fallback`, `probe` |
+| `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.h` | `fallback`, `probe` |
+| `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_app_shell_smoke.cpp` | `smoke` |
+| `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp` | `smoke` |
+| `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp` | `fallback`, `smoke` |
+| `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp` | `fallback`, `smoke` |
+| `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_renderer_smoke.cpp` | `fallback`, `smoke` |
+| `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp` | `fallback`, `probe`, `smoke` |
+| `apps/nrf52_node/tests/nrf52_historical_source_descriptor_smoke.cpp` | `smoke` |
+| `apps/nrf52_node/tests/nrf52_node_app_shell_smoke.cpp` | `smoke` |
+| `boards/t_display_p4/README.md` | `fallback` |
+| `boards/t_display_p4/src/t_display_p4_board.cpp` | `probe` |
+| `boards/tab5/README.md` | `adapter` |
+| `boards/tab5/include/boards/tab5/codec_compat.h` | `compat` |
+| `boards/tab5/src/codec_compat.cpp` | `compat` |
+| `boards/tdeck/README.md` | `adapter` |
+| `boards/tdeck/include/boards/tdeck/tdeck_board.h` | `probe` |
+| `boards/tdeck/src/tdeck_board.cpp` | `compat`, `compatibility`, `fallback`, `legacy`, `probe` |
+| `boards/tdeck_pro/src/tdeck_pro_board.cpp` | `probe` |
+| `boards/tlora_pager/README.md` | `adapter` |
+| `boards/tlora_pager/include/boards/tlora_pager/tlora_pager_board.h` | `probe` |
+| `boards/tlora_pager/src/tlora_pager_board.cpp` | `probe` |
+| `boards/twatchs3/README.md` | `adapter` |
+| `boards/twatchs3/include/boards/twatchs3/twatchs3_board.h` | `probe` |
+| `boards/twatchs3/src/twatchs3_board.cpp` | `probe` |
+| `builds/README.md` | `transitional` |
+| `builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake` | `adapter`, `legacy` |
+| `builds/esp_idf/README.md` | `legacy` |
+| `builds/linux_cmake/README.md` | `transitional` |
+| `builds/pio_nrf52/README.md` | `transitional` |
+| `builds/pio_nrf52/platformio.ini` | `transitional` |
+| `cmake/TrailMateLinuxSources.cmake` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy` |
+| `cmake/TrailMateUxPacks.cmake` | `adapter`, `bridge`, `compat`, `compatibility`, `probe` |
+| `docs/ARCHITECTURE.md` | `adapter`, `compat`, `compatibility`, `temporary` |
+| `docs/Best Practices/GAT562_IMPLEMENTATION_MAP.md` | `adapter`, `bridge` |
+| `docs/Best Practices/GAT562_STATUS_SNAPSHOT.md` | `adapter`, `compat`, `compatibility` |
+| `docs/Best Practices/NRF52_MESHTASTIC_ALIGNMENT_PLAN.md` | `adapter` |
+| `docs/Best Practices/new_hardware_adaptation_prompt.md` | `adapter`, `bridge`, `fallback` |
+| `docs/LINUX_ADAPTATION_GUIDE.md` | `adapter`, `bridge`, `fallback`, `smoke` |
+| `docs/MESHTASTIC_PHONE_PROTOCOL_REFERENCE.md` | `adapter` |
+| `docs/MESHTASTIC_PROTOBUF_USAGE.md` | `adapter` |
+| `docs/MULTI_PROTOCOL_SUPPORT.md` | `adapter` |
+| `docs/REPOSITORY_MIGRATION_PLAN.md` | `adapter`, `bridge`, `compat`, `compatibility`, `fallback`, `legacy`, `probe`, `shim`, `temporary`, `transitional` |
+| `docs/RETICULUM_LXMF_DEVICE_MODE.md` | `adapter`, `bridge`, `compat` |
+| `docs/RETICULUM_LXMF_RUNTIME_ALIGNMENT_PLAN.md` | `adapter`, `bridge`, `compat` |
+| `docs/UI_SHARED_IDF_PHASE_PLAN.md` | `adapter`, `fallback` |
+| `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy` |
+| `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md` | `adapter`, `compat`, `compatibility`, `legacy`, `probe`, `smoke`, `transitional` |
+| `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md` | `adapter`, `compat`, `compatibility`, `legacy`, `transitional` |
+| `docs/audits/CHAT_DELIVERY_ACTION_OWNERSHIP_AUDIT.md` | `bridge`, `compat`, `compatibility`, `legacy` |
+| `docs/audits/CHAT_DELIVERY_EVENT_PROJECTION_AUDIT.md` | `adapter`, `bridge`, `legacy` |
+| `docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md` | `adapter` |
+| `docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `legacy` |
+| `docs/audits/CHAT_PENDING_FAILURE_AUDIT.md` | `adapter`, `compat`, `compatibility`, `fallback`, `legacy` |
+| `docs/audits/CHAT_RUNTIME_EVENT_PUMP_AUDIT.md` | `adapter`, `bridge`, `legacy` |
+| `docs/audits/CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md` | `adapter`, `bridge`, `legacy`, `temporary` |
+| `docs/audits/CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md` | `compat`, `compatibility`, `fallback`, `legacy` |
+| `docs/audits/ESP_IDF_FINAL_OWNER_MIGRATION_PLAN.md` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `docs/audits/ESP_IDF_RUNTIME_SOURCE_OWNER_EXTRACTION_AUDIT.md` | `adapter`, `legacy` |
+| `docs/audits/ESP_IDF_TARGET_DEFAULTS_MIGRATION_AUDIT.md` | `legacy` |
+| `docs/audits/ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md` | `adapter`, `bridge`, `legacy` |
+| `docs/audits/GPS_CONSUMER_BOUNDARY_AUDIT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `probe`, `smoke`, `temporary` |
+| `docs/audits/GPS_RUNTIME_SCHEDULING_OWNERSHIP_AUDIT.md` | `adapter`, `legacy` |
+| `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md` | `adapter`, `compat`, `compatibility`, `deprecated`, `legacy`, `smoke` |
+| `docs/audits/KEY_VERIFICATION_OWNERSHIP_AUDIT.md` | `adapter`, `bridge`, `legacy` |
+| `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md` | `adapter`, `archive-only`, `bridge`, `compat`, `compatibility`, `legacy`, `smoke`, `transitional` |
+| `docs/audits/LEGACY_BURNDOWN_REGISTER.md` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe`, `smoke` |
+| `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md` | `adapter`, `archive-only`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe`, `shim`, `smoke`, `temporary`, `transitional` |
+| `docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md` | `adapter`, `archive-only`, `compat`, `compatibility`, `legacy`, `smoke` |
+| `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md` | `adapter`, `archive-only`, `compat`, `compatibility`, `fallback`, `legacy`, `smoke` |
+| `docs/audits/MAP_OVERLAY_ROUTE_TRACKER_OWNERSHIP_AUDIT.md` | `compat`, `compatibility`, `legacy` |
+| `docs/audits/MAP_PRESENTATION_BOUNDARY_AUDIT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `fallback`, `legacy`, `probe`, `smoke` |
+| `docs/audits/MAP_TILE_RENDER_QUEUE_CACHE_AUDIT.md` | `adapter` |
+| `docs/audits/MAP_TILE_SOURCE_CACHE_OWNERSHIP_AUDIT.md` | `adapter`, `legacy`, `smoke` |
+| `docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md` | `legacy`, `probe` |
+| `docs/audits/PHASE10_FINAL_PRIMARY_PATH_REPORT.md` | `fallback`, `probe` |
+| `docs/audits/PHASE10_PRIMARY_PATH_MIGRATION_REPORT.md` | `compat`, `compatibility`, `fallback`, `probe` |
+| `docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md` | `fallback`, `legacy`, `probe` |
+| `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `legacy`, `shim` |
+| `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe`, `shim`, `smoke`, `transitional` |
+| `docs/audits/PHASE5_FINAL_READINESS_REPORT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `probe` |
+| `docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md` | `adapter`, `bridge`, `compat`, `compatibility`, `fallback`, `legacy`, `probe` |
+| `docs/audits/PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md` | `adapter`, `compat`, `compatibility`, `legacy`, `probe`, `smoke` |
+| `docs/audits/PHASE5_PRESENTATION_CONFORMANCE_MATRIX.md` | `adapter`, `legacy`, `probe`, `smoke` |
+| `docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md` | `bridge`, `compat`, `compatibility`, `legacy`, `probe`, `smoke` |
+| `docs/audits/PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md` | `bridge`, `legacy` |
+| `docs/audits/PHASE6_COMPOSITION_READINESS_REPORT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `smoke` |
+| `docs/audits/PHASE6_INPUT_PLAN.md` | `adapter`, `compat`, `compatibility`, `legacy`, `probe` |
+| `docs/audits/PHASE7_10_MAP_TILE_SOURCE_CACHE_BURNDOWN_REPORT.md` | `adapter`, `legacy`, `smoke` |
+| `docs/audits/PHASE7_11_MAP_TILE_RENDER_QUEUE_CACHE_REPORT.md` | `adapter`, `smoke` |
+| `docs/audits/PHASE7_12_MAP_OVERLAY_ROUTE_TRACKER_REPORT.md` | `adapter`, `legacy` |
+| `docs/audits/PHASE7_13_GPS_RUNTIME_SCHEDULING_REPORT.md` | `adapter` |
+| `docs/audits/PHASE7_6_LEGACY_BURNDOWN_REPORT.md` | `adapter`, `bridge`, `legacy` |
+| `docs/audits/PHASE7_7_EVENT_PUMP_BURNDOWN_REPORT.md` | `adapter`, `bridge`, `legacy` |
+| `docs/audits/PHASE7_8_TEAM_RICH_PAYLOAD_BURNDOWN_REPORT.md` | `adapter`, `bridge`, `compat`, `legacy`, `smoke` |
+| `docs/audits/PHASE7_9_TEAM_POSITION_PICKER_BURNDOWN_REPORT.md` | `adapter`, `bridge`, `legacy` |
+| `docs/audits/PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy` |
+| `docs/audits/PHASE7_FINAL_RUNTIME_OWNERSHIP_READINESS_REPORT.md` | `adapter`, `legacy` |
+| `docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md` | `adapter`, `bridge`, `compat`, `legacy` |
+| `docs/audits/PHASE8_RUNTIME_UI_ADOPTION_REPORT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `fallback`, `smoke` |
+| `docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe` |
+| `docs/audits/PHASE9_FINAL_READINESS_REPORT.md` | `adapter`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe` |
+| `docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe` |
+| `docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md` | `adapter`, `compat`, `compatibility`, `fallback`, `legacy`, `probe`, `smoke` |
+| `docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md` | `bridge`, `compat`, `compatibility`, `fallback`, `legacy`, `probe`, `smoke`, `temporary`, `transitional` |
+| `docs/audits/POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe`, `transitional` |
+| `docs/audits/PRODUCT_COMPOSITION_BOUNDARY_AUDIT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `probe`, `smoke` |
+| `docs/audits/RENDERER_BOUNDARY_AUDIT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `probe`, `smoke` |
+| `docs/audits/RENDERER_HARDENING_BASELINE.md` | `bridge`, `compat`, `compatibility`, `legacy`, `probe` |
+| `docs/audits/REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `temporary`, `transitional` |
+| `docs/audits/TARGET_UI_FINAL_OWNERSHIP_REPORT.md` | `adapter`, `fallback`, `legacy`, `transitional` |
+| `docs/audits/TARGET_UX_PACK_GAP_REPORT.md` | `compat`, `compatibility`, `fallback`, `smoke` |
+| `docs/audits/TEAM_ACTION_OWNERSHIP_AUDIT.md` | `adapter`, `bridge`, `legacy` |
+| `docs/audits/TEAM_CHAT_PRESENTATION_AUDIT.md` | `adapter`, `legacy` |
+| `docs/audits/TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md` | `compat`, `compatibility`, `legacy`, `temporary` |
+| `docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md` | `compat`, `compatibility`, `legacy`, `transitional` |
+| `docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md` | `adapter`, `compat`, `compatibility`, `deprecated`, `legacy`, `shim`, `transitional` |
+| `docs/audits/UI_SHARED_SPLIT_AUDIT.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `shim`, `temporary`, `transitional` |
+| `docs/boards/uconsole-aio2.board.yaml` | `probe` |
+| `docs/decisions/ADR_BUILD_ENTRYPOINTS.md` | `adapter`, `compat`, `compatibility`, `legacy`, `transitional` |
+| `docs/devices/gps-settings-guide.md` | `compat`, `compatibility`, `legacy`, `probe` |
+| `docs/devices/lilygo-t-lora-pager.md` | `adapter`, `probe` |
+| `docs/devices/lilygo-tdeck-gps-uart-lora-noise.md` | `temporary` |
+| `docs/issue-21-tdeck-meshtastic-fix-checklist.md` | `adapter` |
+| `docs/meshcore/discovery_ui_flow.md` | `adapter` |
+| `docs/meshcore/payloads.md` | `deprecated` |
+| `docs/meshtastic_ble_timing.md` | `legacy` |
+| `docs/review/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_REVIEW_CHECKLIST.md` | `adapter`, `fallback` |
+| `docs/specification/APP_SHELL_ARCHITECTURE_SPEC.md` | `adapter`, `compat`, `compatibility`, `temporary`, `transitional` |
+| `docs/specification/BOARD_PACKAGE_SPEC.md` | `adapter` |
+| `docs/specification/CAPABILITY_AUTHORITY_GLOSSARY.md` | `adapter` |
+| `docs/specification/CHAT_DELIVERY_ACTION_RUNTIME_SPEC.md` | `bridge`, `compat`, `compatibility`, `legacy` |
+| `docs/specification/CHAT_DELIVERY_RUNTIME_SPEC.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy` |
+| `docs/specification/CHAT_PRESENTATION_IDENTITY_SPEC.md` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `docs/specification/CHAT_RUNTIME_EVENT_PUMP_SPEC.md` | `bridge`, `legacy` |
+| `docs/specification/CHAT_WORKSPACE_MODEL_SPEC.md` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `docs/specification/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md` | `adapter`, `compat`, `compatibility` |
+| `docs/specification/DEVICE_UX_PACK_ARCHITECTURE_SPEC.md` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `docs/specification/GPS_RUNTIME_SCHEDULING_SPEC.md` | `adapter`, `legacy` |
+| `docs/specification/KEY_VERIFICATION_RUNTIME_SPEC.md` | `adapter`, `bridge`, `legacy` |
+| `docs/specification/MAP_OVERLAY_ROUTE_TRACKER_RUNTIME_SPEC.md` | `adapter`, `legacy` |
+| `docs/specification/MAP_TILE_RENDER_QUEUE_CACHE_SPEC.md` | `adapter`, `compat` |
+| `docs/specification/MAP_TILE_SOURCE_CACHE_RUNTIME_SPEC.md` | `adapter`, `legacy` |
+| `docs/specification/MAP_WORKSPACE_MODEL_SPEC.md` | `adapter`, `compat`, `compatibility`, `legacy`, `probe` |
+| `docs/specification/POST_REFACTOR_ARCHITECTURE_FREEZE.md` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe`, `transitional` |
+| `docs/specification/PRESENTATION_WORKSPACE_SPEC.md` | `adapter`, `probe` |
+| `docs/specification/PRODUCT_COMPOSITION_ARCHITECTURE_SPEC.md` | `adapter`, `bridge`, `legacy` |
+| `docs/specification/REPOSITORY_LAYOUT_ARCHITECTURE_SPEC.md` | `adapter`, `compat`, `compatibility`, `legacy`, `transitional` |
+| `docs/specification/TEAM_ACTION_RUNTIME_SPEC.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy` |
+| `docs/specification/TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `temporary` |
+| `docs/specification/UI_PRESENTATION_ARCHITECTURE_SPEC.md` | `adapter` |
+| `docs/specs/Cross_Platform_Product_Architecture_Specification.md` | `adapter` |
+| `docs/specs/LOCALE_PACKS.md` | `fallback` |
+| `docs/specs/LOCALIZATION_SPEC.md` | `compat`, `compatibility`, `fallback` |
+| `docs/specs/gps.md` | `compat`, `compatibility`, `legacy`, `probe` |
+| `docs/specs/meshtastic-node-payload-parsing.md` | `adapter`, `fallback`, `legacy` |
+| `docs/specs/uconsole-aio2-linux.md` | `adapter`, `compat`, `compatibility`, `fallback`, `legacy`, `smoke` |
+| `docs/targets/TARGET_MANIFEST_TEMPLATE.yaml` | `legacy` |
+| `docs/targets/TARGET_MATRIX.md` | `compat`, `compatibility`, `fallback` |
+| `docs/targets/esp-t-deck-lvgl.capabilities.yaml` | `legacy` |
+| `docs/targets/esp-t-lora-pager-lvgl.capabilities.yaml` | `legacy` |
+| `docs/targets/esp32_lvgl_targets.md` | `legacy`, `transitional` |
+| `docs/targets/linux-headless.capabilities.yaml` | `legacy` |
+| `docs/targets/linux-uconsole-ascii.capabilities.yaml` | `legacy` |
+| `docs/targets/linux-uconsole-gtk.capabilities.yaml` | `legacy` |
+| `docs/targets/linux_targets.md` | `adapter`, `legacy`, `transitional` |
+| `docs/targets/nrf52-gat562-node.capabilities.yaml` | `legacy` |
+| `docs/targets/nrf52_node_targets.md` | `legacy`, `transitional` |
+| `docs/ux_profiles/uconsole_desktop.md` | `adapter`, `compat`, `compatibility`, `fallback`, `legacy` |
+| `modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_conversation_mapper.h` | `adapter` |
+| `modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_message_mapper.h` | `adapter` |
+| `modules/chat_presentation_adapters/library.json` | `adapter` |
+| `modules/chat_presentation_adapters/src/chat_conversation_mapper.cpp` | `adapter` |
+| `modules/chat_presentation_adapters/src/chat_message_mapper.cpp` | `adapter` |
+| `modules/chat_presentation_adapters/tests/test_chat_conversation_mapper.cpp` | `adapter` |
+| `modules/chat_presentation_adapters/tests/test_chat_message_mapper.cpp` | `adapter` |
+| `modules/core_chat/generated/meshtastic/admin.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/apponly.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/atak.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/cannedmessages.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/channel.pb.h` | `compat`, `compatibility`, `deprecated` |
+| `modules/core_chat/generated/meshtastic/clientonly.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/config.pb.h` | `bridge`, `compat`, `compatibility`, `deprecated`, `legacy` |
+| `modules/core_chat/generated/meshtastic/connection_status.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/device_ui.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/deviceonly.pb.h` | `compat`, `compatibility`, `deprecated` |
+| `modules/core_chat/generated/meshtastic/interdevice.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/localonly.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/mesh.pb.h` | `bridge`, `compat`, `compatibility`, `deprecated`, `probe` |
+| `modules/core_chat/generated/meshtastic/module_config.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/mqtt.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/paxcount.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/portnums.pb.h` | `compat`, `deprecated`, `legacy` |
+| `modules/core_chat/generated/meshtastic/powermon.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/remote_hardware.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/rtttl.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/storeforward.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/telemetry.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/generated/meshtastic/xmodem.pb.h` | `compat`, `compatibility` |
+| `modules/core_chat/include/chat/ble/meshtastic_phone_config_bridge.h` | `bridge` |
+| `modules/core_chat/include/chat/delivery/legacy_chat_delivery_bridge.h` | `bridge`, `legacy` |
+| `modules/core_chat/include/chat/delivery/legacy_chat_send_result_mapper.h` | `legacy` |
+| `modules/core_chat/include/chat/domain/chat_types.h` | `compat` |
+| `modules/core_chat/include/chat/infra/mesh_adapter_router_core.h` | `adapter` |
+| `modules/core_chat/include/chat/infra/mesh_protocol_utils.h` | `fallback` |
+| `modules/core_chat/include/chat/infra/meshcore/meshcore_payload_helpers.h` | `fallback` |
+| `modules/core_chat/include/chat/infra/meshtastic/mt_node_payload.h` | `fallback` |
+| `modules/core_chat/include/chat/infra/meshtastic/mt_packet_wire.h` | `compat` |
+| `modules/core_chat/include/chat/infra/node_store_core.h` | `legacy` |
+| `modules/core_chat/include/chat/ports/i_mesh_adapter.h` | `adapter` |
+| `modules/core_chat/include/chat/runtime/self_identity_provider.h` | `fallback` |
+| `modules/core_chat/include/chat/usecase/chat_service.h` | `adapter` |
+| `modules/core_chat/include/chat/usecase/contact_service.h` | `adapter` |
+| `modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp` | `bridge`, `legacy` |
+| `modules/core_chat/src/delivery/legacy_chat_send_result_mapper.cpp` | `legacy` |
+| `modules/core_chat/src/infra/lxmf/lxmf_wire.cpp` | `adapter` |
+| `modules/core_chat/src/infra/mesh_adapter_router_core.cpp` | `adapter` |
+| `modules/core_chat/src/infra/mesh_protocol_utils.cpp` | `fallback` |
+| `modules/core_chat/src/infra/meshcore/crypto/ed25519/fixedint.h` | `compat` |
+| `modules/core_chat/src/infra/meshcore/meshcore_payload_helpers.cpp` | `fallback` |
+| `modules/core_chat/src/infra/meshcore/meshcore_protocol_helpers.cpp` | `fallback` |
+| `modules/core_chat/src/infra/meshtastic/mt_codec_pb.cpp` | `adapter`, `compat`, `compatibility` |
+| `modules/core_chat/src/infra/meshtastic/mt_node_payload.cpp` | `fallback` |
+| `modules/core_chat/src/infra/node_store_blob_format.cpp` | `legacy` |
+| `modules/core_chat/src/infra/node_store_core.cpp` | `legacy` |
+| `modules/core_chat/src/runtime/self_identity_policy.cpp` | `fallback` |
+| `modules/core_chat/src/usecase/chat_service.cpp` | `adapter` |
+| `modules/core_chat/tests/test_legacy_chat_delivery_bridge.cpp` | `bridge`, `legacy` |
+| `modules/core_chat/tests/test_legacy_chat_send_result_mapper.cpp` | `legacy` |
+| `modules/core_chat/third_party/nanopb/pb.h` | `compat`, `compatibility`, `legacy` |
+| `modules/core_chat/third_party/nanopb/pb_common.c` | `compat` |
+| `modules/core_chat/third_party/nanopb/pb_decode.h` | `compat`, `compatibility` |
+| `modules/core_chat/third_party/nanopb/pb_encode.h` | `compat`, `compatibility` |
+| `modules/core_gps/README.md` | `adapter`, `legacy`, `shim`, `transitional` |
+| `modules/core_gps/include/gps/usecase/gps_runtime_config.h` | `probe` |
+| `modules/core_gps/include/gps/usecase/time_authority.h` | `fallback` |
+| `modules/core_gps/src/protocol/nmea/nmea_parser.cpp` | `fallback` |
+| `modules/core_gps/src/usecase/time_authority.cpp` | `fallback` |
+| `modules/core_hostlink/hostlink_protocol.md` | `adapter`, `compat`, `compatibility` |
+| `modules/core_hostlink/src/hostlink_service_codec.cpp` | `legacy` |
+| `modules/core_phone/include/phone/meshtastic/meshtastic_defaults.h` | `compat` |
+| `modules/core_phone/include/phone/meshtastic/meshtastic_phone_config_bridge.h` | `bridge`, `legacy` |
+| `modules/core_phone/src/meshcore/meshcore_phone_core.cpp` | `compat` |
+| `modules/core_phone/src/meshtastic/meshtastic_phone_core.cpp` | `bridge`, `compat`, `legacy` |
+| `modules/core_phone/tests/test_phone_core_smoke.cpp` | `smoke` |
+| `modules/core_sys/README.md` | `fallback`, `transitional` |
+| `modules/core_sys/include/app/app_config.h` | `probe` |
+| `modules/core_sys/include/app/app_context_platform_bindings.h` | `adapter` |
+| `modules/core_sys/include/app/app_facades.h` | `adapter` |
+| `modules/core_sys/include/platform/ui/pack_repository_runtime.h` | `compat` |
+| `modules/core_sys/include/platform/ui/team_ui_store_runtime.h` | `fallback` |
+| `modules/core_sys/src/sys/clock.cpp` | `fallback` |
+| `modules/core_team/README.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy`, `shim`, `transitional` |
+| `modules/core_team/include/team/usecase/team_service.h` | `adapter` |
+| `modules/core_team/src/usecase/team_service.cpp` | `adapter` |
+| `modules/product_composition/include/product_composition/target_profile.h` | `fallback` |
+| `modules/product_composition/include/product_composition/target_ux_binding.h` | `fallback` |
+| `modules/product_composition/src/target_build_binding.cpp` | `fallback` |
+| `modules/product_composition/src/target_profile.cpp` | `fallback` |
+| `modules/product_composition/src/target_ux_binding.cpp` | `compat`, `compatibility` |
+| `modules/product_composition/tests/test_target_profile.cpp` | `fallback` |
+| `modules/product_composition/tests/test_target_ux_binding.cpp` | `compat`, `compatibility`, `fallback` |
+| `modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_menu_runtime_adapter.h` | `adapter` |
+| `modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h` | `bridge` |
+| `modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h` | `adapter`, `bridge` |
+| `modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_host_adapter.h` | `adapter` |
+| `modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp` | `adapter` |
+| `modules/ui_ascii_runtime/src/ascii_runtime_screen_graph_presenter.cpp` | `bridge` |
+| `modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp` | `adapter`, `bridge` |
+| `modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp` | `adapter`, `compat`, `compatibility` |
+| `modules/ui_ascii_runtime/tests/ascii_menu_runtime_adapter_smoke.cpp` | `adapter`, `smoke` |
+| `modules/ui_ascii_runtime/tests/ascii_runtime_entry_adoption_smoke.cpp` | `compat`, `compatibility`, `smoke` |
+| `modules/ui_ascii_runtime/tests/ascii_runtime_screen_graph_presenter_smoke.cpp` | `smoke` |
+| `modules/ui_ascii_runtime/tests/ascii_screen_graph_bridge_smoke.cpp` | `bridge`, `smoke` |
+| `modules/ui_ascii_runtime/tests/ascii_screen_host_adapter_smoke.cpp` | `adapter`, `smoke` |
+| `modules/ui_ascii_runtime/tests/test_ascii_descriptor_renderer.cpp` | `compat`, `compatibility` |
+| `modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h` | `adapter` |
+| `modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h` | `adapter`, `legacy` |
+| `modules/ui_chat_runtime/include/ui_chat_runtime/chat_page_runtime_event_pump.h` | `adapter` |
+| `modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp` | `adapter` |
+| `modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp` | `adapter`, `bridge`, `legacy` |
+| `modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp` | `adapter` |
+| `modules/ui_chat_runtime/tests/test_chat_delivery_action_port_adapter.cpp` | `adapter` |
+| `modules/ui_chat_runtime/tests/test_chat_delivery_event_projection_adapter.cpp` | `adapter` |
+| `modules/ui_gps_runtime/README.md` | `adapter` |
+| `modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_menu_runtime_adapter.h` | `adapter` |
+| `modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_screen_host_adapter.h` | `adapter` |
+| `modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h` | `adapter`, `bridge` |
+| `modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h` | `bridge` |
+| `modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp` | `adapter` |
+| `modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp` | `adapter`, `compat`, `compatibility` |
+| `modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp` | `adapter`, `bridge` |
+| `modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_presenter.cpp` | `bridge` |
+| `modules/ui_gtk_runtime/tests/gtk_menu_runtime_adapter_smoke.cpp` | `adapter`, `smoke` |
+| `modules/ui_gtk_runtime/tests/gtk_runtime_entry_adoption_smoke.cpp` | `compat`, `compatibility`, `smoke` |
+| `modules/ui_gtk_runtime/tests/gtk_screen_host_adapter_smoke.cpp` | `adapter`, `smoke` |
+| `modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_bridge_smoke.cpp` | `bridge`, `smoke` |
+| `modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_presenter_smoke.cpp` | `smoke` |
+| `modules/ui_gtk_runtime/tests/test_gtk_descriptor_page_registry.cpp` | `compat`, `compatibility` |
+| `modules/ui_key_verification_runtime/README.md` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h` | `adapter` |
+| `modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h` | `adapter` |
+| `modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h` | `adapter` |
+| `modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp` | `adapter` |
+| `modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp` | `adapter`, `fallback` |
+| `modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp` | `adapter` |
+| `modules/ui_legacy_adapters/README.md` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy` |
+| `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h` | `adapter`, `bridge`, `deprecated`, `legacy` |
+| `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h` | `adapter`, `bridge`, `deprecated`, `legacy` |
+| `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h` | `adapter`, `deprecated`, `legacy` |
+| `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h` | `adapter`, `deprecated`, `legacy` |
+| `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h` | `adapter`, `deprecated`, `legacy` |
+| `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h` | `adapter`, `deprecated`, `legacy` |
+| `modules/ui_legacy_adapters/library.json` | `adapter`, `legacy` |
+| `modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp` | `adapter`, `bridge`, `legacy` |
+| `modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp` | `adapter`, `bridge`, `legacy` |
+| `modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp` | `adapter`, `legacy` |
+| `modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp` | `adapter`, `legacy` |
+| `modules/ui_lvgl_core/README.md` | `transitional` |
+| `modules/ui_lvgl_core/include/ui_lvgl_core/lvgl_focus_group.h` | `bridge`, `transitional` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/compatibility_ux_pack.h` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_renderer_probe.h` | `fallback`, `probe` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h` | `adapter` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h` | `fallback` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_adoption_probe.h` | `fallback`, `probe` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h` | `bridge` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h` | `adapter`, `bridge` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h` | `adapter` |
+| `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h` | `adapter` |
+| `modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp` | `fallback`, `probe` |
+| `modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp` | `adapter` |
+| `modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp` | `fallback` |
+| `modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_adoption_probe.cpp` | `compat`, `compatibility`, `fallback`, `probe` |
+| `modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_screen_graph_presenter.cpp` | `bridge` |
+| `modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp` | `adapter`, `bridge` |
+| `modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp` | `adapter`, `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp` | `adapter` |
+| `modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp` | `adapter` |
+| `modules/ui_lvgl_ux_packs/tests/test_compatibility_menu_binding.cpp` | `adapter`, `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_compatibility_screen_factory.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_compatibility_ux_pack.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_menu_model.cpp` | `compat`, `compatibility`, `fallback` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_renderer_probe.cpp` | `compat`, `compatibility`, `fallback`, `probe` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_menu_runtime_adapter.cpp` | `adapter`, `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_primary_screen_graph_runtime.cpp` | `compat`, `compatibility`, `fallback` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_adoption_probe.cpp` | `compat`, `compatibility`, `fallback`, `probe` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_entry_adoption.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_screen_graph_presenter.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_graph_bridge.cpp` | `bridge`, `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_host_adapter.cpp` | `adapter` |
+| `modules/ui_lvgl_ux_packs/tests/test_ux_menu_provider.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_ux_pack_registry.cpp` | `compat`, `compatibility` |
+| `modules/ui_lvgl_ux_packs/tests/test_ux_screen_menu_adapter.cpp` | `adapter` |
+| `modules/ui_map_runtime/README.md` | `adapter` |
+| `modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h` | `adapter` |
+| `modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h` | `adapter` |
+| `modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h` | `deprecated`, `legacy` |
+| `modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp` | `fallback` |
+| `modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp` | `adapter` |
+| `modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp` | `adapter` |
+| `modules/ui_mono_128x64/include/ui/mono_128x64/font/mono_font.h` | `fallback`, `legacy` |
+| `modules/ui_mono_128x64/src/runtime.cpp` | `adapter`, `fallback` |
+| `modules/ui_mono_128x64/src/text_renderer.cpp` | `fallback`, `legacy` |
+| `modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_probe.h` | `probe` |
+| `modules/ui_presentation/src/workspace/presentation_workspace_probe.cpp` | `probe` |
+| `modules/ui_presentation/tests/test_chat_workspace_model.cpp` | `probe` |
+| `modules/ui_presentation/tests/test_presentation_workspace_probe.cpp` | `probe` |
+| `modules/ui_shared/README.md` | `legacy` |
+| `modules/ui_shared/include/ui/assets/fonts/font_utils.h` | `fallback` |
+| `modules/ui_shared/include/ui/assets/fonts/fonts.h` | `compat`, `compatibility`, `legacy` |
+| `modules/ui_shared/include/ui/components/two_pane_nav.h` | `adapter` |
+| `modules/ui_shared/include/ui/localization.h` | `fallback` |
+| `modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h` | `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h` | `adapter` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_air_device_status_source.h` | `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_chat_action_sink.h` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h` | `adapter`, `bridge`, `deprecated`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h` | `adapter`, `bridge`, `deprecated`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_gps_status_source.h` | `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h` | `deprecated`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h` | `adapter`, `deprecated`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h` | `deprecated`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h` | `deprecated`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_state.h` | `adapter`, `compat`, `compatibility`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_mesh_status_source.h` | `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_settings_action_sink.h` | `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/legacy_settings_source.h` | `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h` | `adapter`, `legacy` |
+| `modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h` | `adapter` |
+| `modules/ui_shared/include/ui/screens/chat/chat_conversation_components.h` | `compat`, `compatibility` |
+| `modules/ui_shared/include/ui/screens/chat/chat_protocol_support.h` | `adapter` |
+| `modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h` | `compat`, `compatibility`, `legacy` |
+| `modules/ui_shared/include/ui/screens/common/page_shell_fallback.h` | `fallback` |
+| `modules/ui_shared/include/ui/screens/settings/settings_state.h` | `probe` |
+| `modules/ui_shared/include/ui/team_actions/legacy_team_action_bridge.h` | `adapter`, `bridge`, `legacy` |
+| `modules/ui_shared/library.json` | `adapter`, `legacy` |
+| `modules/ui_shared/src/ui/components/air_status_footer.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/components/two_pane_nav.cpp` | `adapter` |
+| `modules/ui_shared/src/ui/i18n/resource_pack_registry.cpp` | `fallback`, `legacy`, `shim` |
+| `modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/menu/dashboard/dashboard_mesh_widget.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/page/page_profile.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp` | `adapter`, `bridge`, `legacy` |
+| `modules/ui_shared/src/ui/presentation_sources/legacy_air_device_status_source.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/presentation_sources/legacy_chat_action_sink.cpp` | `adapter`, `legacy` |
+| `modules/ui_shared/src/ui/presentation_sources/legacy_gps_status_source.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/presentation_sources/legacy_mesh_status_source.cpp` | `bridge`, `legacy` |
+| `modules/ui_shared/src/ui/presentation_sources/legacy_settings_action_sink.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/presentation_sources/legacy_settings_source.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/screens/chat/chat_message_list_input.cpp` | `adapter` |
+| `modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp` | `adapter`, `bridge`, `legacy` |
+| `modules/ui_shared/src/ui/screens/chat/chat_protocol_support.cpp` | `adapter` |
+| `modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp` | `adapter`, `legacy` |
+| `modules/ui_shared/src/ui/screens/contacts/contacts_page_components.cpp` | `adapter`, `bridge`, `fallback` |
+| `modules/ui_shared/src/ui/screens/contacts/contacts_page_input.cpp` | `adapter` |
+| `modules/ui_shared/src/ui/screens/energy_sweep/energy_sweep_page_shell.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/extensions/extensions_page_runtime.cpp` | `compat`, `compatibility` |
+| `modules/ui_shared/src/ui/screens/gnss/gnss_skyplot_page_runtime.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/gnss/gnss_skyplot_page_shell.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp` | `legacy` |
+| `modules/ui_shared/src/ui/screens/gps/gps_page_shell.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/pc_link/pc_link_page_runtime.cpp` | `bridge` |
+| `modules/ui_shared/src/ui/screens/pc_link/pc_link_page_shell.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/settings/settings_page_components.cpp` | `bridge`, `legacy`, `probe` |
+| `modules/ui_shared/src/ui/screens/settings/settings_page_input.cpp` | `adapter` |
+| `modules/ui_shared/src/ui/screens/sstv/sstv_page_shell.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/team/team_page_components.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/tracker/tracker_page_input.cpp` | `adapter` |
+| `modules/ui_shared/src/ui/screens/tracker/tracker_page_shell.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/usb/usb_page_shell.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/screens/walkie_talkie/walkie_talkie_page_shell.cpp` | `fallback` |
+| `modules/ui_shared/src/ui/team_actions/legacy_team_action_bridge.cpp` | `bridge`, `legacy` |
+| `modules/ui_shared/src/ui/ui_status.cpp` | `legacy` |
+| `modules/ui_shared/tests/test_chat_presentation_source.cpp` | `adapter`, `bridge`, `legacy` |
+| `modules/ui_shared/tests/test_legacy_map_presentation_adapters.cpp` | `adapter`, `legacy` |
+| `modules/ui_shared/tests/test_legacy_team_action_bridge.cpp` | `bridge`, `legacy` |
+| `platform/README.md` | `adapter` |
+| `platform/esp/arduino_audio_codec/README.md` | `legacy` |
+| `platform/esp/arduino_audio_codec/audio/codec/esp_codec.cpp` | `legacy` |
+| `platform/esp/arduino_audio_codec/audio/codec/platform/audio_codec_data_i2s.c` | `compat` |
+| `platform/esp/arduino_common/README.md` | `adapter` |
+| `platform/esp/arduino_common/include/ble/app_phone_facade.h` | `bridge` |
+| `platform/esp/arduino_common/include/ble/meshcore_ble.h` | `adapter` |
+| `platform/esp/arduino_common/include/ble/meshtastic_ble.h` | `bridge` |
+| `platform/esp/arduino_common/include/ble/meshtastic_ble_observer_bridge.h` | `bridge` |
+| `platform/esp/arduino_common/include/lv_conf.h` | `legacy` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/app_runtime_support.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/app_tasks.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/chat_event_bus_bridge.h` | `bridge` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/lxmf/lxmf_adapter.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/mesh_adapter_router.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/meshcore/meshcore_adapter.h` | `adapter`, `legacy` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/meshtastic/mt_adapter.h` | `adapter`, `bridge` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/protocol_factory.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/rnode/rnode_adapter.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/gps/gps_service.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/gps/infra/hal_gps_adapter.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/gps/infra/hal_motion_adapter.h` | `adapter` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/hostlink/hostlink_bridge_radio.h` | `bridge` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_meshtastic_adapter_bridge.h` | `adapter`, `bridge` |
+| `platform/esp/arduino_common/include/platform/esp/arduino_common/team/event/team_app_data_event_bus_bridge.h` | `bridge` |
+| `platform/esp/arduino_common/include/sstv/sstv_config.h` | `fallback` |
+| `platform/esp/arduino_common/library.json` | `adapter`, `legacy` |
+| `platform/esp/arduino_common/src/LV_Helper_v9.cpp` | `fallback` |
+| `platform/esp/arduino_common/src/app_config_store.cpp` | `compat`, `legacy`, `probe` |
+| `platform/esp/arduino_common/src/app_context_platform_bindings.cpp` | `adapter`, `bridge`, `probe` |
+| `platform/esp/arduino_common/src/app_event_runtime_support.cpp` | `bridge`, `fallback` |
+| `platform/esp/arduino_common/src/app_runtime_bootstrap_support.cpp` | `adapter` |
+| `platform/esp/arduino_common/src/app_runtime_support.cpp` | `adapter`, `fallback` |
+| `platform/esp/arduino_common/src/app_tasks.cpp` | `adapter` |
+| `platform/esp/arduino_common/src/ble/app_phone_facade.cpp` | `adapter`, `bridge` |
+| `platform/esp/arduino_common/src/ble/meshcore_ble.cpp` | `adapter`, `compat` |
+| `platform/esp/arduino_common/src/ble/meshcore_ble_owner_hooks.cpp` | `adapter` |
+| `platform/esp/arduino_common/src/ble/meshtastic_ble.cpp` | `adapter`, `bridge`, `legacy` |
+| `platform/esp/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp` | `bridge` |
+| `platform/esp/arduino_common/src/ble/meshtastic_ble_owner_hooks.cpp` | `adapter`, `bridge` |
+| `platform/esp/arduino_common/src/chat/infra/chat_event_bus_bridge.cpp` | `bridge` |
+| `platform/esp/arduino_common/src/chat/infra/lxmf/lxmf_adapter.cpp` | `adapter`, `probe` |
+| `platform/esp/arduino_common/src/chat/infra/mesh_adapter_router.cpp` | `adapter` |
+| `platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp` | `adapter`, `fallback`, `legacy` |
+| `platform/esp/arduino_common/src/chat/infra/meshtastic/mt_adapter.cpp` | `adapter`, `bridge`, `compat`, `fallback`, `legacy` |
+| `platform/esp/arduino_common/src/chat/infra/protocol_factory.cpp` | `adapter` |
+| `platform/esp/arduino_common/src/chat/infra/rnode/rnode_adapter.cpp` | `adapter`, `compat` |
+| `platform/esp/arduino_common/src/chat/internal/blob_store_io.cpp` | `legacy` |
+| `platform/esp/arduino_common/src/chat/internal/blob_store_io.h` | `legacy` |
+| `platform/esp/arduino_common/src/gps/GPS.cpp` | `legacy` |
+| `platform/esp/arduino_common/src/gps/gps_service.cpp` | `adapter`, `legacy` |
+| `platform/esp/arduino_common/src/gps/infra/hal_gps_adapter.cpp` | `adapter` |
+| `platform/esp/arduino_common/src/gps/infra/hal_motion_adapter.cpp` | `adapter` |
+| `platform/esp/arduino_common/src/hostlink/hostlink_bridge_radio.cpp` | `bridge` |
+| `platform/esp/arduino_common/src/hostlink/hostlink_config_service.cpp` | `bridge` |
+| `platform/esp/arduino_common/src/hostlink/hostlink_service.cpp` | `adapter`, `bridge` |
+| `platform/esp/arduino_common/src/mesh/esp_meshtastic_adapter_bridge.cpp` | `adapter`, `bridge` |
+| `platform/esp/arduino_common/src/mesh/esp_preferences_mesh_identity_store.cpp` | `legacy` |
+| `platform/esp/arduino_common/src/platform_ui_firmware_update_runtime.cpp` | `fallback` |
+| `platform/esp/arduino_common/src/platform_ui_hostlink_runtime.cpp` | `bridge` |
+| `platform/esp/arduino_common/src/rnode_kiss/rnode_kiss_service.cpp` | `adapter` |
+| `platform/esp/arduino_common/src/sstv/sstv_service.cpp` | `compat` |
+| `platform/esp/arduino_common/src/team/event/team_app_data_event_bus_bridge.cpp` | `bridge` |
+| `platform/esp/arduino_common/src/ui/assets/fonts/lv_font_noto_cjk_16_2bpp.c` | `fallback` |
+| `platform/esp/arduino_common/src/ui/runtime/pack_repository.cpp` | `compat`, `legacy` |
+| `platform/esp/arduino_common/src/ui/screens/gps/gps_page_map.cpp` | `fallback` |
+| `platform/esp/arduino_common/src/ui/widgets/map/map_tiles.cpp` | `fallback` |
+| `platform/esp/arduino_common/src/walkie/walkie_service.cpp` | `fallback` |
+| `platform/esp/arduino_common/src/walkie_runtime.cpp` | `probe` |
+| `platform/esp/common/include/platform/esp/common/settings_store_impl.h` | `legacy` |
+| `platform/esp/common/include/platform/esp/common/shared_spi_lock.h` | `compat`, `compatibility`, `legacy` |
+| `platform/esp/idf_common/include/platform/esp/idf_common/gps_runtime.h` | `probe` |
+| `platform/esp/idf_common/include/platform/esp/idf_common/radio_owner.h` | `adapter`, `probe` |
+| `platform/esp/idf_common/include/platform/esp/idf_common/sx126x_radio.h` | `probe` |
+| `platform/esp/idf_common/include/platform/esp/idf_common/tab5_codec_compat.h` | `compat` |
+| `platform/esp/idf_common/include/platform/esp/idf_common/ui_dispatcher.h` | `compat` |
+| `platform/esp/idf_common/src/gps_runtime.cpp` | `probe` |
+| `platform/esp/idf_common/src/screen_sleep.cpp` | `bridge`, `legacy` |
+| `platform/esp/idf_common/src/sx126x_radio.cpp` | `fallback`, `probe` |
+| `platform/esp/idf_common/src/walkie_runtime.cpp` | `compat` |
+| `platform/esp/idf_components/m5stack_tab5/CMakeLists.txt` | `deprecated` |
+| `platform/esp/idf_components/m5stack_tab5/m5stack_tab5.c` | `legacy`, `probe` |
+| `platform/esp/idf_components/m5stack_tab5/trail_mate_tab5_runtime.cpp` | `legacy` |
+| `platform/esp/idf_components/sensor_bmi270/CMakeLists.txt` | `legacy` |
+| `platform/esp/idf_components/sensor_bmi270/include/bmi2.h` | `compat` |
+| `platform/esp/idf_components/sensor_bmi270/include/bmi270_legacy.h` | `legacy` |
+| `platform/esp/idf_components/sensor_bmi270/include/bmi2_defs.h` | `compat` |
+| `platform/esp/idf_components/sensor_bmi270/src/accel_gyro_bmi270.c` | `fallback` |
+| `platform/esp/idf_components/sensor_bmi270/src/bmi2.c` | `temporary` |
+| `platform/esp/idf_components/sensor_bmi270/src/bmi270_legacy.c` | `legacy` |
+| `platform/esp/idf_components/sensor_bmi270/src/bmi2_ois.c` | `temporary` |
+| `platform/esp/idf_components/t_display_p4/trail_mate_t_display_p4_runtime.cpp` | `probe` |
+| `platform/esp/radio/README.md` | `adapter`, `legacy` |
+| `platform/esp/radio/meshtastic_radio_adapter.cpp` | `adapter`, `fallback` |
+| `platform/esp/radio/meshtastic_radio_adapter.h` | `adapter` |
+| `platform/linux/README.md` | `adapter` |
+| `platform/linux/common/include/app/linux_app_facade.h` | `adapter` |
+| `platform/linux/common/include/app/linux_app_services.h` | `adapter`, `legacy` |
+| `platform/linux/common/include/app/linux_demo_world.h` | `adapter` |
+| `platform/linux/common/include/chat/linux_noop_mesh_adapter.h` | `adapter` |
+| `platform/linux/common/include/chat/linux_raw_lora_mesh_adapter.h` | `adapter` |
+| `platform/linux/common/include/platform/linux/env_config.h` | `fallback` |
+| `platform/linux/common/include/platform/linux/runtime_paths.h` | `fallback` |
+| `platform/linux/common/include/platform/linux/sx126x_radio.h` | `probe` |
+| `platform/linux/common/include/ui/shell_ui_runner.h` | `compat` |
+| `platform/linux/common/src/app/linux_app_facade.cpp` | `adapter` |
+| `platform/linux/common/src/app/linux_app_services.cpp` | `adapter`, `bridge`, `fallback` |
+| `platform/linux/common/src/app/linux_demo_world.cpp` | `adapter` |
+| `platform/linux/common/src/chat/linux_noop_mesh_adapter.cpp` | `adapter` |
+| `platform/linux/common/src/chat/linux_raw_lora_mesh_adapter.cpp` | `adapter`, `fallback`, `legacy` |
+| `platform/linux/common/src/core/canvas.cpp` | `fallback` |
+| `platform/linux/common/src/platform/linux/env_config.cpp` | `fallback` |
+| `platform/linux/common/src/platform/linux/map_tile_cache.cpp` | `legacy` |
+| `platform/linux/common/src/platform/linux/sx126x_radio.cpp` | `fallback`, `probe` |
+| `platform/linux/common/src/platform/ui/gps_runtime.cpp` | `fallback`, `probe` |
+| `platform/linux/common/src/platform/ui/hostlink_runtime.cpp` | `fallback` |
+| `platform/linux/common/src/platform/ui/lora_runtime.cpp` | `fallback` |
+| `platform/linux/common/src/platform/ui/pack_repository_runtime.cpp` | `compat` |
+| `platform/linux/common/src/platform/ui/sstv_runtime.cpp` | `fallback` |
+| `platform/linux/common/src/platform/ui/time_runtime.cpp` | `fallback` |
+| `platform/linux/common/src/platform/ui/walkie_runtime.cpp` | `fallback` |
+| `platform/linux/common/src/ui/gps_shared_compat.cpp` | `compat` |
+| `platform/linux/common/src/ui/localization.cpp` | `fallback` |
+| `platform/linux/common/src/ui/mt_protocol_air_compat.cpp` | `compat`, `compatibility` |
+| `platform/linux/common/src/ui/shared_ui_shell.cpp` | `adapter` |
+| `platform/linux/common/src/ui/shell_ui_runner.cpp` | `compat` |
+| `platform/linux/rpi/README.md` | `adapter` |
+| `platform/linux/rpi/src/platform/device/evdev_input.cpp` | `fallback` |
+| `platform/linux/rpi/src/platform/device/evdev_input.h` | `adapter`, `probe` |
+| `platform/linux/uconsole/include/uconsole/uconsole_hardware_probe.h` | `probe` |
+| `platform/linux/uconsole/include/uconsole/uconsole_map_workspace_model.h` | `legacy` |
+| `platform/linux/uconsole/src/uconsole_chat_workspace_model.cpp` | `adapter`, `fallback` |
+| `platform/linux/uconsole/src/uconsole_dashboard_model.cpp` | `adapter`, `probe` |
+| `platform/linux/uconsole/src/uconsole_hardware_probe.cpp` | `probe` |
+| `platform/linux/uconsole/src/uconsole_map_workspace_model.cpp` | `legacy`, `probe` |
+| `platform/linux/unoq/README.md` | `adapter` |
+| `platform/nrf52/arduino_common/include/ble/app_phone_facade.h` | `bridge` |
+| `platform/nrf52/arduino_common/include/ble/meshtastic_ble.h` | `bridge` |
+| `platform/nrf52/arduino_common/include/ble/meshtastic_ble_observer_bridge.h` | `bridge` |
+| `platform/nrf52/arduino_common/include/ble/meshtastic_ble_persistence_bridge.h` | `bridge` |
+| `platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/chat/infra/meshcore/meshcore_radio_adapter.h` | `adapter` |
+| `platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/chat/infra/meshtastic/meshtastic_radio_adapter.h` | `adapter`, `fallback` |
+| `platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/chat/infra/store/internal_fs_store.h` | `legacy` |
+| `platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/self_identity_bridge.h` | `bridge`, `fallback` |
+| `platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp` | `adapter`, `bridge` |
+| `platform/nrf52/arduino_common/src/ble/meshcore_ble.cpp` | `compat` |
+| `platform/nrf52/arduino_common/src/ble/meshtastic_ble.cpp` | `adapter`, `bridge`, `fallback` |
+| `platform/nrf52/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp` | `bridge` |
+| `platform/nrf52/arduino_common/src/ble/meshtastic_ble_persistence_bridge.cpp` | `bridge`, `fallback`, `legacy` |
+| `platform/nrf52/arduino_common/src/chat/infra/blob_file_store.cpp` | `legacy` |
+| `platform/nrf52/arduino_common/src/chat/infra/meshcore/meshcore_radio_adapter.cpp` | `adapter`, `fallback` |
+| `platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp` | `adapter`, `fallback`, `probe` |
+| `platform/nrf52/arduino_common/src/chat/infra/store/internal_fs_store.cpp` | `legacy` |
+| `platform/nrf52/arduino_common/src/device_identity.cpp` | `fallback` |
+| `platform/nrf52/arduino_common/src/self_identity_bridge.cpp` | `bridge`, `fallback` |
+| `platform/nrf52/arduino_common/tools/gen_fusion_pixel_font.py` | `fallback` |
+| `platform/nrf52/arduino_common/tools/gen_scaled_fusion_pixel_font.py` | `fallback` |
+| `platform/shared/include/platform/shared/ble/app_config_phone_snapshot_bridge.h` | `bridge` |
+| `platform/shared/include/platform/shared/ble/meshtastic_phone_runtime_bridge.h` | `bridge` |
+| `platform/shared/include/platform/shared/ble/phone_ble_runtime.h` | `bridge` |
+| `platformio.ini` | `adapter`, `legacy` |
+| `scripts/check_platform_ui_boundaries.py` | `legacy`, `shim` |
+| `src/CMakeLists.txt` | `legacy` |
+| `tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md` | `adapter`, `bridge`, `compat`, `compatibility`, `fallback`, `legacy`, `probe` |
+| `tools/architecture/check_all_target_architecture_ready.py` | `adapter`, `legacy`, `transitional` |
+| `tools/architecture/check_esp_idf_final_owner_extraction_ready.py` | `adapter`, `legacy`, `smoke` |
+| `tools/architecture/check_legacy_app_roots_burndown_ready.py` | `adapter`, `archive-only`, `compat`, `compatibility`, `legacy`, `smoke`, `transitional` |
+| `tools/architecture/check_legacy_compat_temp_inventory_ready.py` | `adapter`, `archive-only`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe`, `shim`, `smoke`, `transitional` |
+| `tools/architecture/check_legacy_disposition_execution_ready.py` | `adapter`, `compat`, `legacy`, `smoke` |
+| `tools/architecture/check_no_intermediate_ui_layer_ready.py` | `adapter`, `deprecated`, `legacy`, `temporary`, `transitional` |
+| `tools/architecture/check_no_root_legacy_preflight_ready.py` | `compat`, `legacy` |
+| `tools/architecture/check_phase10_primary_path_ready.py` | `fallback`, `smoke` |
+| `tools/architecture/check_phase11_renderer_consumption_ready.py` | `fallback`, `probe`, `smoke` |
+| `tools/architecture/check_phase45_ready.py` | `adapter`, `bridge`, `legacy`, `smoke` |
+| `tools/architecture/check_phase5_final_ready.py` | `legacy`, `probe` |
+| `tools/architecture/check_phase5_ready.py` | `adapter`, `bridge`, `fallback`, `legacy`, `probe` |
+| `tools/architecture/check_phase5_renderer_ready.py` | `adapter`, `bridge`, `legacy`, `probe`, `smoke` |
+| `tools/architecture/check_phase5_workspace_ready.py` | `legacy`, `probe`, `smoke` |
+| `tools/architecture/check_phase6_composition_ready.py` | `bridge`, `compat`, `compatibility`, `legacy`, `smoke` |
+| `tools/architecture/check_phase7_runtime_ownership_ready.py` | `adapter`, `bridge`, `deprecated`, `legacy`, `temporary` |
+| `tools/architecture/check_phase8_layout_ready.py` | `adapter`, `archive-only`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `shim`, `smoke`, `transitional` |
+| `tools/architecture/check_phase9_final_ready.py` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy` |
+| `tools/architecture/check_phase9_legacy_burndown_ready.py` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy` |
+| `tools/architecture/check_phase9_runtime_adoption_ready.py` | `adapter`, `bridge`, `compat`, `compatibility`, `fallback`, `legacy`, `probe`, `smoke` |
+| `tools/architecture/check_post_refactor_final_ready.py` | `adapter`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe`, `shim` |
+| `tools/architecture/check_product_architecture_boundaries.py` | `adapter`, `legacy` |
+| `tools/architecture/check_target_architecture_foundation_ready.py` | `fallback` |
+| `tools/architecture/phase5_renderer_legacy_baseline.json` | `bridge`, `compat`, `compatibility`, `legacy` |
+| `tools/architecture/phase6_composition_legacy_baseline.json` | `adapter`, `bridge`, `compat`, `compatibility`, `legacy` |
+| `tools/architecture/scan_legacy_compat_temp_surfaces.py` | `adapter`, `archive-only`, `bridge`, `compat`, `compatibility`, `deprecated`, `fallback`, `legacy`, `probe`, `shim`, `smoke`, `temporary`, `transitional` |
+| `tools/generate_binfont_with_lv_font_conv.py` | `fallback`, `temporary` |
+| `tools/validate_locale_packs.py` | `bridge`, `fallback` |
+| `variants/gat562_mesh_evb_pro/envs/gat562_mesh_evb_pro.ini` | `legacy` |
+
+## Sample Matches By Keyword
+
+### `legacy`
+
+- `CMakeLists.txt:21`: # `builds/esp_idf` owns ESP-IDF target defaults after root legacy removal.
+- `apps/esp32_lvgl/APP_SHELL_MANIFEST.md:79`: - `esp_idf_legacy_implementation_adapter.cpp`
+- `apps/esp32_lvgl/README.md:76`: `esp_idf_legacy_implementation_adapter.cpp`.
+- `apps/linux_sim_shell/CMakeLists.txt:98`: add_executable(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:99`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:100`: target_include_directories(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:102`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `apps/linux_sim_shell/CMakeLists.txt:106`: target_compile_features(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:108`: add_test(NAME trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:109`: COMMAND trailmate_legacy_chat_delivery_action_bridge_alias_smoke)
+- `apps/linux_sim_shell/CMakeLists.txt:111`: add_executable(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:112`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:113`: target_include_directories(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:115`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `apps/linux_sim_shell/CMakeLists.txt:118`: target_compile_features(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:120`: add_test(NAME trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:121`: COMMAND trailmate_legacy_chat_delivery_event_bridge_alias_smoke)
+- `apps/linux_sim_shell/CMakeLists.txt:140`: add_executable(trailmate_legacy_key_verification_adapters_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:141`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:142`: target_include_directories(trailmate_legacy_key_verification_adapters_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:144`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `apps/linux_sim_shell/CMakeLists.txt:148`: target_compile_features(trailmate_legacy_key_verification_adapters_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:150`: add_test(NAME trailmate_legacy_key_verification_adapters_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:151`: COMMAND trailmate_legacy_key_verification_adapters_alias_smoke)
+- `apps/linux_sim_shell/CMakeLists.txt:167`: add_executable(trailmate_legacy_map_overlay_source_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:168`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:169`: target_include_directories(trailmate_legacy_map_overlay_source_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:171`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `apps/linux_sim_shell/CMakeLists.txt:174`: target_compile_features(trailmate_legacy_map_overlay_source_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:176`: add_test(NAME trailmate_legacy_map_overlay_source_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:177`: COMMAND trailmate_legacy_map_overlay_source_alias_smoke)
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:26`: // Phase 10 fallback containment: the legacy hardcoded GTK page registry
+- `boards/tdeck/src/tdeck_board.cpp:36`: constexpr uint8_t kGpsProfileUbxLegacy = 2;
+- `boards/tdeck/src/tdeck_board.cpp:253`: const bool explicit_ubx_profile = gps_init_config_.profile == kGpsProfileUbxLegacy ||
+- `boards/tdeck/src/tdeck_board.cpp:256`: const char* selected_source = "legacy_default";
+- `boards/tdeck/src/tdeck_board.cpp:283`: else if (gps_init_config_.profile == kGpsProfileUbxLegacy ||
+- `boards/tdeck/src/tdeck_board.cpp:288`: selected_source = gps_init_config_.profile == kGpsProfileUbxLegacy ? "ubx_legacy" : "ubx_modern";
+- `builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake:4`: # legacy component root while component registration is being moved. The source
+- `builds/esp_idf/README.md:32`: Root legacy source has been removed. Any future physical ESP-IDF
+- `cmake/TrailMateLinuxSources.cmake:102`: set(TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT
+- `cmake/TrailMateLinuxSources.cmake:103`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `cmake/TrailMateLinuxSources.cmake:105`: set(TRAIL_MATE_UI_LEGACY_ADAPTERS_SRC_ROOT
+- `cmake/TrailMateLinuxSources.cmake:106`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/src"
+- `cmake/TrailMateLinuxSources.cmake:187`: "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp"
+- `cmake/TrailMateLinuxSources.cmake:188`: "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/legacy_chat_send_result_mapper.cpp"
+- `cmake/TrailMateLinuxSources.cmake:319`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_air_device_status_source.cpp"
+- `cmake/TrailMateLinuxSources.cmake:320`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_gps_status_source.cpp"
+- `cmake/TrailMateLinuxSources.cmake:321`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_mesh_status_source.cpp"
+- `cmake/TrailMateLinuxSources.cmake:322`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_settings_source.cpp"
+- `cmake/TrailMateLinuxSources.cmake:323`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_settings_action_sink.cpp"
+- `cmake/TrailMateLinuxSources.cmake:325`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_chat_action_sink.cpp"
+- `cmake/TrailMateLinuxSources.cmake:332`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/team_actions/legacy_team_action_bridge.cpp"
+- `cmake/TrailMateLinuxSources.cmake:340`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_map_presentation_source.cpp"
+- `cmake/TrailMateLinuxSources.cmake:341`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/presentation_sources/legacy_map_action_sink.cpp"
+- `cmake/TrailMateLinuxSources.cmake:485`: "${TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT}"
+- `cmake/TrailMateLinuxSources.cmake:502`: "${TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT}"
+- `docs/REPOSITORY_MIGRATION_PLAN.md:161`: - `event_bus` stays in the legacy tree until its chat/team coupling is split apart
+- `docs/REPOSITORY_MIGRATION_PLAN.md:170`: - selected legacy use-case headers now include module paths directly
+- `docs/REPOSITORY_MIGRATION_PLAN.md:171`: - legacy headers under `src/chat/domain` and `src/chat/ports` remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:183`: - `chat_service.cpp` remains in the legacy tree for now because it still publishes through legacy `event_bus`
+- ... 2888 additional matches omitted
+
+### `compat`
+
+- `NOTICE.md:5`: **Trail-mate** is an offline-first field communication and situational-awareness system built around low-power radio devices (LoRa and compatible sub-GHz radios).
+- `README.md:93`: ### 📡 LoRa Chat (Meshtastic + MeshCore Compatible)
+- `README.md:103`: * Compatible with the **Meshtastic public mesh** (LongFast/PSK)
+- `README.md:104`: * Compatible with **MeshCore networks** (native MeshCore packet path)
+- `README.md:488`: ### 📝 LoRa Messaging (Meshtastic + MeshCore Compatible)
+- `README.md:491`: - Meshtastic public mesh compatibility (LongFast/PSK)
+- `README.md:492`: - MeshCore network compatibility (native MeshCore packet path)
+- `README.md:554`: - The relay edition already covers Meshtastic-compatible LoRa RX/TX, Text / NodeInfo / Position handling, and the corresponding persistence paths
+- `README.md:562`: ### 🔗 Enhanced Meshtastic Compatibility
+- `README.md:568`: * [x] **Meshcore network compatibility** (selectable adapter)
+- `README.md:620`: **Trail-mate** is an offline-first field communication and situational-awareness system built around low-power radio devices (LoRa and compatible sub-GHz radios).
+- `apps/README.md:21`: that may be reached only through declared compatibility adapters.
+- `apps/esp32_lvgl/APP_SHELL_MANIFEST.md:60`: - `compatibility`
+- `apps/esp32_lvgl/README.md:59`: default_ux_pack_id = compatibility
+- `apps/esp32_lvgl/src/esp32_lvgl_app_shell.h:18`: const char* default_ux_pack_id = "compatibility";
+- `apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp:19`: assert(std::strcmp(config.default_ux_pack_id, "compatibility") == 0);
+- `apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp:20`: assert(std::strcmp(shell.activeUxPackId(), "compatibility") == 0);
+- `apps/linux_sim_shell/CMakeLists.txt:192`: compatibility_screen_factory
+- `apps/linux_sim_shell/CMakeLists.txt:201`: compatibility_menu_binding
+- `apps/linux_sim_shell/CMakeLists.txt:202`: compatibility_ux_pack
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:3`: #include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:23`: ui_lvgl_ux::CompatibilityScreenFactory screen_factory;
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:3`: #include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:24`: ui_lvgl_ux::CompatibilityScreenFactory screen_factory;
+- `boards/tab5/include/boards/tab5/codec_compat.h`: path match
+- `boards/tab5/include/boards/tab5/codec_compat.h:9`: class CodecCompat
+- `boards/tab5/include/boards/tab5/codec_compat.h:12`: CodecCompat() = default;
+- `boards/tab5/include/boards/tab5/codec_compat.h:13`: ~CodecCompat();
+- `boards/tab5/src/codec_compat.cpp`: path match
+- `boards/tab5/src/codec_compat.cpp:1`: #include "boards/tab5/codec_compat.h"
+- `boards/tab5/src/codec_compat.cpp:60`: CodecCompat::~CodecCompat()
+- `boards/tab5/src/codec_compat.cpp:70`: bool CodecCompat::ensure_ready()
+- `boards/tab5/src/codec_compat.cpp:92`: bool CodecCompat::ensure_scratch(size_t size)
+- `boards/tab5/src/codec_compat.cpp:110`: int CodecCompat::open(uint8_t bits_per_sample, uint8_t channel, uint32_t sample_rate)
+- `boards/tab5/src/codec_compat.cpp:154`: void CodecCompat::close()
+- `boards/tab5/src/codec_compat.cpp:159`: int CodecCompat::write(uint8_t* buffer, size_t size)
+- `boards/tab5/src/codec_compat.cpp:182`: int CodecCompat::read(uint8_t* buffer, size_t size)
+- `boards/tab5/src/codec_compat.cpp:249`: void CodecCompat::setMute(bool enable)
+- `boards/tab5/src/codec_compat.cpp:266`: bool CodecCompat::getMute() const
+- `boards/tab5/src/codec_compat.cpp:271`: void CodecCompat::setOutMute(bool enable)
+- `boards/tab5/src/codec_compat.cpp:288`: bool CodecCompat::getOutMute() const
+- `boards/tab5/src/codec_compat.cpp:293`: void CodecCompat::setVolume(uint8_t level)
+- `boards/tab5/src/codec_compat.cpp:310`: int CodecCompat::getVolume() const
+- `boards/tab5/src/codec_compat.cpp:319`: void CodecCompat::setGain(float db_value)
+- `boards/tab5/src/codec_compat.cpp:336`: float CodecCompat::getGain() const
+- `boards/tab5/src/codec_compat.cpp:341`: bool CodecCompat::ready() const
+- `boards/tdeck/src/tdeck_board.cpp:660`: // Prefer a practical default speed; fallback ladder inside sd_utils preserves compatibility.
+- `cmake/TrailMateLinuxSources.cmake:293`: "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/ui/gps_shared_compat.cpp"
+- `cmake/TrailMateLinuxSources.cmake:294`: "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/ui/mt_protocol_air_compat.cpp"
+- `cmake/TrailMateLinuxSources.cmake:383`: "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/compatibility_screen_factory.cpp"
+- `cmake/TrailMateLinuxSources.cmake:387`: "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/packs/compatibility_ux_pack.cpp"
+- `cmake/TrailMateUxPacks.cmake:24`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp"
+- `cmake/TrailMateUxPacks.cmake:34`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp"
+- `docs/ARCHITECTURE.md:463`: Temporary wrappers, forwarding headers, and compatibility glue are acceptable if they reduce migration risk.
+- `docs/Best Practices/GAT562_STATUS_SNAPSHOT.md:30`: - GAT562 app facade still implements Team-related interface slots only as compatibility stubs returning `nullptr`, so Team capability stays structurally excluded instead of half-en
+- `docs/REPOSITORY_MIGRATION_PLAN.md:7`: For the current UI/shared-page migration and ESP-IDF compatibility work,
+- `docs/REPOSITORY_MIGRATION_PLAN.md:171`: - legacy headers under `src/chat/domain` and `src/chat/ports` remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:202`: - legacy include path `src/chat/infra/store/ram_store.h` remains as a compatibility shim
+- `docs/REPOSITORY_MIGRATION_PLAN.md:214`: - legacy headers remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:271`: - legacy headers under `src/team/domain`, `src/team/ports`, and `src/team/protocol` remain as compatibility shims
+- ... 615 additional matches omitted
+
+### `compatibility`
+
+- `README.md:491`: - Meshtastic public mesh compatibility (LongFast/PSK)
+- `README.md:492`: - MeshCore network compatibility (native MeshCore packet path)
+- `README.md:562`: ### 🔗 Enhanced Meshtastic Compatibility
+- `README.md:568`: * [x] **Meshcore network compatibility** (selectable adapter)
+- `apps/README.md:21`: that may be reached only through declared compatibility adapters.
+- `apps/esp32_lvgl/APP_SHELL_MANIFEST.md:60`: - `compatibility`
+- `apps/esp32_lvgl/README.md:59`: default_ux_pack_id = compatibility
+- `apps/esp32_lvgl/src/esp32_lvgl_app_shell.h:18`: const char* default_ux_pack_id = "compatibility";
+- `apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp:19`: assert(std::strcmp(config.default_ux_pack_id, "compatibility") == 0);
+- `apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp:20`: assert(std::strcmp(shell.activeUxPackId(), "compatibility") == 0);
+- `apps/linux_sim_shell/CMakeLists.txt:192`: compatibility_screen_factory
+- `apps/linux_sim_shell/CMakeLists.txt:201`: compatibility_menu_binding
+- `apps/linux_sim_shell/CMakeLists.txt:202`: compatibility_ux_pack
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:3`: #include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:23`: ui_lvgl_ux::CompatibilityScreenFactory screen_factory;
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:3`: #include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:24`: ui_lvgl_ux::CompatibilityScreenFactory screen_factory;
+- `boards/tdeck/src/tdeck_board.cpp:660`: // Prefer a practical default speed; fallback ladder inside sd_utils preserves compatibility.
+- `cmake/TrailMateLinuxSources.cmake:383`: "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/compatibility_screen_factory.cpp"
+- `cmake/TrailMateLinuxSources.cmake:387`: "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/packs/compatibility_ux_pack.cpp"
+- `cmake/TrailMateUxPacks.cmake:24`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp"
+- `cmake/TrailMateUxPacks.cmake:34`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp"
+- `docs/ARCHITECTURE.md:463`: Temporary wrappers, forwarding headers, and compatibility glue are acceptable if they reduce migration risk.
+- `docs/Best Practices/GAT562_STATUS_SNAPSHOT.md:30`: - GAT562 app facade still implements Team-related interface slots only as compatibility stubs returning `nullptr`, so Team capability stays structurally excluded instead of half-en
+- `docs/REPOSITORY_MIGRATION_PLAN.md:7`: For the current UI/shared-page migration and ESP-IDF compatibility work,
+- `docs/REPOSITORY_MIGRATION_PLAN.md:171`: - legacy headers under `src/chat/domain` and `src/chat/ports` remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:202`: - legacy include path `src/chat/infra/store/ram_store.h` remains as a compatibility shim
+- `docs/REPOSITORY_MIGRATION_PLAN.md:214`: - legacy headers remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:271`: - legacy headers under `src/team/domain`, `src/team/ports`, and `src/team/protocol` remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:283`: - `src/chat` compatibility shims and stub sources have been removed
+- `docs/REPOSITORY_MIGRATION_PLAN.md:316`: - legacy include paths under `src/hostlink` remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:420`: Legacy headers under `src/chat/infra/meshtastic` remain as compatibility shims, while runtime radio/protobuf
+- `docs/REPOSITORY_MIGRATION_PLAN.md:457`: Legacy headers under `src/chat/infra/meshtastic` remain as compatibility shims, while the runtime Meshtastic adapter still
+- `docs/REPOSITORY_MIGRATION_PLAN.md:529`: - temporary compatibility headers under `modules/core_team/include/chat/*` are removed
+- `docs/REPOSITORY_MIGRATION_PLAN.md:920`: - the legacy compatibility header `src/app/app_event_runtime.h` has been removed as well
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1173`: - The temporary `src/sys/clock.h` and `src/sys/ringbuf.h` compatibility shims have been removed, so `sys/clock.h` and `sys/ringbuf.h` now resolve directly from `modules/core_sys`.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1283`: - Dropped the now-unused `apps/esp_pio/include/apps/esp_pio/*` compatibility headers for those menu-shell internals, keeping `apps/esp_pio` focused on entry/runtime composition and
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:16`: `AppContext` currently acts as a legacy service locator and compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:22`: - ChatService compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:23`: - ContactService compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:24`: - Team service compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:25`: - mesh adapter compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:26`: - BLE manager compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:27`: - UI runtime facade compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:29`: - persisted app configuration compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:32`: global compatibility surface for legacy UI code and target runtimes.
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:36`: Existing code may continue to use the bridge for bounded compatibility paths:
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:40`: - ChatService and ContactService compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:41`: - TeamUiStore and Team service compatibility
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:44`: - map viewport compatibility while tile/cache cleanup remains deferred
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md:99`: | `modules/core_sys/src/app/app_facade_access.cpp` | global facade pointer | compatibility only |
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:25`: | `legacy/app_implementations/esp_idf` | ESP-IDF build entrypoint plus ESP runtime compatibility shell | startup runtime, loop runtime, app facade access, target runtime config | E
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:26`: | `legacy/app_implementations/esp_pio` | PlatformIO/Arduino compatibility entrypoint | Arduino startup, loop runtime, app runtime access | root `platformio.ini`, library layout, PI
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:37`: entrypoint, compatibility app shell, and runtime glue.
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:50`: | Future app shell | Current compatibility source | Build entrypoint | Renderer family | Status |
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:83`: Compatibility adapter targets and descriptors:
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:125`: - legacy compatibility adapters have explicit exit conditions
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:36`: | `legacy/app_implementations/esp_pio` | PlatformIO/Arduino compatibility entrypoint and legacy ESP app glue | split into `builds/pio_nrf52` for nRF52 authority and possible legacy
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:42`: | root `platformio.ini` | current PlatformIO build authority for Arduino/PIO targets | invoked or wrapped by `builds/pio_nrf52` and any legacy PIO compatibility entrypoint | Enviro
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:55`: build entrypoint and compatibility shell.
+- ... 467 additional matches omitted
+
+### `transitional`
+
+- `apps/README.md:20`: `removed root linux_uconsole` are transitional historical roots
+- `apps/linux_sim_shell/APP_SHELL_MANIFEST.md:21`: Current transitional path:
+- `apps/linux_sim_shell/APP_SHELL_MANIFEST.md:72`: Transitional implementation root:
+- `apps/linux_sim_shell/README.md:9`: the transitional simulator implementation root.
+- `apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md:21`: Current transitional path:
+- `apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md:72`: Transitional implementation root:
+- `apps/linux_uconsole_gtk/README.md:10`: the transitional GTK implementation root.
+- `builds/README.md:29`: Current transitional paths remain valid until wrapper migration is proven:
+- `builds/linux_cmake/README.md:18`: Current transitional implementation roots:
+- `builds/pio_nrf52/README.md:11`: Current transitional path may be:
+- `builds/pio_nrf52/platformio.ini:12`: ; The existing root/platform app environments remain transitional until the
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1245`: - this means `apps/esp_idf_tab5` should be treated as a transitional shell, not the final IDF app-layer shape
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1264`: - introduced `apps/esp_idf_t_display_p4` as a second transitional IDF target shell so the repository no longer assumes Tab5 is the only IDF board
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:62`: | App shell | CMake target | Config source | Smoke test | Transitional implementation root |
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:68`: `TRANSITIONAL_IMPLEMENTATION_ROOT.md`.
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:74`: physical build behavior in the transitional roots.
+- `docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md:76`: | App shell | Build wrapper | Shell target or library | Config source | Transitional implementation root |
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:11`: - transitional build entrypoint
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:35`: | `legacy/app_implementations/esp_idf` | ESP-IDF build entrypoint plus transitional ESP app/runtime shell | `builds/esp_idf` thin wrapper invoking a future ESP LVGL app shell | ESP
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:36`: | `legacy/app_implementations/esp_pio` | PlatformIO/Arduino compatibility entrypoint and legacy ESP app glue | split into `builds/pio_nrf52` for nRF52 authority and possible legacy
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:37`: | `legacy/app_implementations/linux_sim` | Linux simulator and developer-tooling shell with CMake project files | Linux app shell invoked by `builds/linux_cmake` | CMake source hel
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:39`: | `legacy/app_implementations/linux_rpi` | Pi OS / Cardputer Zero device shell and CMake/SCons bring-up paths | Linux app shell invoked by `builds/linux_cmake` | CMake framebuffer
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:54`: `legacy/app_implementations/esp_idf` is not a final product app shell. It is a transitional ESP-IDF
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:57`: `legacy/app_implementations/esp_pio` is not a final product app shell. It is a transitional
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:88`: ## Transitional Compatibility Rule
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:91`: recorded transitional historical build entrypoints.
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:102`: - `docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md`
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:130`: | App shell | Executable target | Transitional source | Status |
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:137`: - `legacy/app_implementations/linux_uconsole/TRANSITIONAL_IMPLEMENTATION_ROOT.md`
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:138`: - `legacy/app_implementations/linux_sim/TRANSITIONAL_IMPLEMENTATION_ROOT.md`
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:184`: authority and transitional roots.
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:186`: The following historical roots are explicitly transitional implementation
+- `docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md:201`: Transitional Adapter delegates.
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:9`: historical or transitional implementation root. It must not regain ownership
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:53`: - Current app shell callers: `apps/esp32_lvgl` uses the transitional source
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:59`: - Runtime ownership status: transitional embedded build root; reusable runtime
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:85`: - Runtime ownership status: transitional PIO compatibility root; concrete device
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:110`: final app shells; remaining references are transitional source strings and
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:215`: - Current CMake / PlatformIO callers: local transitional root files and Linux
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:8`: transitional, fallback, archive, adapter, bridge, probe, smoke, or checker
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:19`: - transitional descriptors
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:29`: - legacy/transitional/compatibility/shim/fallback names
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:101`: - transitional ESP-IDF build/component root, target sdkconfig defaults, and
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:140`: - `apps/nrf52_node` transitional source strings
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:180`: - `apps/nrf52_node` board-specific transitional source strings
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:220`: - `builds/linux_cmake/README.md` records it as a current transitional Linux
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:340`: - `legacy/app_implementations/linux_unoq/TRANSITIONAL_IMPLEMENTATION_ROOT.md`
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:343`: - `builds/linux_cmake/README.md` records it as a current transitional Linux
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:427`: - describes transitional PIO and board-specific roots for the nRF52 wrapper.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:530`: - transitional descriptors
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:567`: - transitional descriptors
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:605`: - transitional descriptors
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:640`: - transitional descriptors
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1160`: - `docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md`
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1205`: - app shell docs, build docs, legacy root checker, and transitional wrappers.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1322`: - `docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md`
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1383`: ## Surface: legacy/transitional/compatibility/shim/fallback names
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1386`: - legacy/transitional/compatibility/shim/fallback names
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1389`: - filenames and APIs containing `legacy`, `transitional`, `compatibility`,
+- `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md:20`: | `legacy/app_implementations` roots | historical implementation roots only | final app shells plus stable modules | No | roots still provide transitional build/runtime compatibili
+- ... 93 additional matches omitted
+
+### `temporary`
+
+- `docs/ARCHITECTURE.md:463`: Temporary wrappers, forwarding headers, and compatibility glue are acceptable if they reduce migration risk.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:526`: The next cross-module cleanup removes temporary `core_team -> core_chat` shadow headers:
+- `docs/REPOSITORY_MIGRATION_PLAN.md:529`: - temporary compatibility headers under `modules/core_team/include/chat/*` are removed
+- `docs/REPOSITORY_MIGRATION_PLAN.md:738`: - `src/platform_bridge/esp_arduino_legacy_bridge.*` is reduced to the remaining temporary `AppContext` / menu-layout accessors
+- `docs/REPOSITORY_MIGRATION_PLAN.md:758`: - the temporary `src/platform_bridge` layer can now be retired from the active PlatformIO shell path
+- `docs/REPOSITORY_MIGRATION_PLAN.md:869`: This is intentionally temporary, but directionally correct: protocol implementations that still assume Arduino crypto/runtime facilities should not leak into the new IDF shell by d
+- `docs/REPOSITORY_MIGRATION_PLAN.md:919`: - the temporary `apps/include/apps/app_event_runtime.h` copy has been removed
+- `docs/REPOSITORY_MIGRATION_PLAN.md:921`: - the temporary `apps/include` include-path wiring has been dropped from both the PlatformIO and ESP-IDF shells because it is no longer needed for this contract
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1081`: - `src/hostlink` no longer depends on the temporary local `hostlink_codec.h` / `hostlink_types.h` wrapper headers.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1114`: - The temporary `src/gps` shim headers have been removed, which eliminates another legacy include surface from the repository.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1121`: - The temporary `src/team` shim headers have been removed, eliminating another legacy include surface from the repository.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1173`: - The temporary `src/sys/clock.h` and `src/sys/ringbuf.h` compatibility shims have been removed, so `sys/clock.h` and `sys/ringbuf.h` now resolve directly from `modules/core_sys`.
+- `docs/audits/CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md:9`: ## A. Temporary UI Responsibilities
+- `docs/audits/GPS_CONSUMER_BOUNDARY_AUDIT.md:38`: are accepted only as temporary inputs to the Phase 5 replacement plan.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1`: # Legacy / Compatibility / Temporary Surface Inventory
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1397`: - mixed: some names describe real final adapters, some describe temporary debt,
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1472`: - No as a long-term module name; yes only as temporary compatibility
+- `docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md:89`: app-shell probes may adapt the selected UX pack into a temporary
+- `docs/audits/REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md:206`: - temporary bridge to burn down
+- `docs/audits/TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md:62`: ## Temporary Text Projection
+- `docs/audits/UI_SHARED_SPLIT_AUDIT.md:163`: | Temporary bridge | exists only to strangle old caller/source | keep `Legacy*` until removal path is active |
+- `docs/devices/lilygo-tdeck-gps-uart-lora-noise.md:398`: A temporary `4.7k` to `10k` pull-up to `3V3` is a useful diagnostic. If LoRa
+- `docs/specification/APP_SHELL_ARCHITECTURE_SPEC.md:124`: `AppShellCompatibilityAdapter` is a temporary adapter from current historical
+- `docs/specification/TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md:73`: The projector may read legacy payload strings after decode, but it must not allocate temporary strings while projecting display rows.
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:63`: /*! @name Structure to store temporary accelerometer/gyroscope values */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:1904`: /* Variable to define temporary buffer */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:5301`: /* Store the data in a temporary structure */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:5512`: /* Variable to define temporary read/write length */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:5544`: /* Update length in a temporary variable */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:5556`: /* Restore the user set length back from the temporary variable */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:9373`: /* Store the data in a temporary structure */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:9561`: /* Variable to store temporary value */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2.c:11369`: /* Structure to store temporary accelerometer values */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2_ois.c:105`: /* Variable to define temporary length */
+- `platform/esp/idf_components/sensor_bmi270/src/bmi2_ois.c:108`: /* Variable to define temporary buffer */
+- `tools/architecture/check_no_intermediate_ui_layer_ready.py:14`: "temporary_ui_profile",
+- `tools/architecture/check_no_intermediate_ui_layer_ready.py:24`: "temporary_ui_profile",
+- `tools/architecture/check_phase7_runtime_ownership_ready.py:499`: "Temporary UI Responsibilities",
+- `tools/architecture/scan_legacy_compat_temp_surfaces.py:18`: "temporary",
+- `tools/architecture/scan_legacy_compat_temp_surfaces.py:140`: "# Legacy / Compatibility / Temporary Surface Scan",
+- `tools/generate_binfont_with_lv_font_conv.py:119`: with tempfile.TemporaryDirectory(prefix="lv-font-conv-") as temp_dir_name:
+
+### `fallback`
+
+- `apps/linux_sim_shell/CMakeLists.txt:70`: add_executable(trailmate_linux_sim_runtime_entry_fallback_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:71`: tests/linux_sim_runtime_entry_fallback_smoke.cpp)
+- `apps/linux_sim_shell/CMakeLists.txt:72`: target_link_libraries(trailmate_linux_sim_runtime_entry_fallback_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:74`: add_test(NAME trailmate_linux_sim_runtime_entry_fallback_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:75`: COMMAND trailmate_linux_sim_runtime_entry_fallback_smoke)
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:12`: fallback_ = false;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:16`: runtime_source_ = LinuxSimRuntimeSource::HardcodedFallback;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:17`: fallback_ = true;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:18`: return startFallback(shell);
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:21`: bool LinuxSimRuntimeEntry::startFallback(const LinuxSimAppShell&)
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:23`: // Phase 10 fallback containment: old simulator routing remains available
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:36`: ready_ && !fallback_;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:39`: bool LinuxSimRuntimeEntry::fallbackUsed() const
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:41`: return fallback_;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.h:15`: HardcodedFallback,
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.h:25`: bool fallbackUsed() const;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.h:33`: bool startFallback(const LinuxSimAppShell& shell);
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.h:38`: LinuxSimRuntimeSource::HardcodedFallback;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.h:40`: bool fallback_ = true;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:12`: fallback_ = true;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:29`: fallback_ = !ready_;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:38`: bool LinuxSimRuntimeEntryAdoptionProbe::fallbackUsed() const
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:40`: return fallback_;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h:20`: bool fallbackUsed() const;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h:32`: bool fallback_ = true;
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:10`: fallback_ = true;
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:16`: fallback_ = !ready_;
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:20`: if (entry.fallbackUsed())
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:22`: return renderFallback(entry);
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:28`: bool LinuxSimRuntimeRenderer::renderFallback(const LinuxSimRuntimeEntry&)
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:30`: // Phase 11 fallback: old hardcoded ASCII rendering remains available only
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:34`: fallback_ = true;
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:53`: bool LinuxSimRuntimeRenderer::fallbackUsed() const noexcept
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:55`: return fallback_;
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:58`: bool LinuxSimRuntimeRenderer::usedFallback() const noexcept
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp:60`: return fallback_;
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.h:19`: bool fallbackUsed() const noexcept;
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.h:20`: bool usedFallback() const noexcept;
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.h:26`: bool renderFallback(const LinuxSimRuntimeEntry& entry);
+- `apps/linux_sim_shell/src/linux_sim_runtime_renderer.h:32`: bool fallback_ = true;
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:13`: assert(!probe.fallbackUsed());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp`: path match
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp:18`: HardcodedFallback);
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp:19`: assert(runtime_entry.fallbackUsed());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp:17`: assert(!runtime_entry.fallbackUsed());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp:19`: assert(!renderer.fallbackUsed());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp:20`: assert(!renderer.usedFallback());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp:29`: trailmate::apps::linux_sim_shell::LinuxSimRuntimeEntry fallback_entry;
+- `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp:30`: assert(!fallback_entry.start(invalid_shell));
+- `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp:31`: assert(fallback_entry.fallbackUsed());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp:32`: assert(!renderer.render(fallback_entry));
+- `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp:33`: assert(renderer.fallbackUsed());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp:34`: assert(renderer.usedFallback());
+- `apps/linux_uconsole_gtk/CMakeLists.txt:70`: add_executable(trailmate_linux_uconsole_gtk_page_registry_fallback_smoke
+- `apps/linux_uconsole_gtk/CMakeLists.txt:71`: tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp)
+- `apps/linux_uconsole_gtk/CMakeLists.txt:72`: target_link_libraries(trailmate_linux_uconsole_gtk_page_registry_fallback_smoke
+- `apps/linux_uconsole_gtk/CMakeLists.txt:74`: add_test(NAME trailmate_linux_uconsole_gtk_page_registry_fallback_smoke
+- `apps/linux_uconsole_gtk/CMakeLists.txt:75`: COMMAND trailmate_linux_uconsole_gtk_page_registry_fallback_smoke)
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:14`: fallback_ = false;
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:18`: registry_source_ = LinuxUConsoleGtkPageRegistrySource::HardcodedFallback;
+- ... 725 additional matches omitted
+
+### `shim`
+
+- `docs/REPOSITORY_MIGRATION_PLAN.md:171`: - legacy headers under `src/chat/domain` and `src/chat/ports` remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:202`: - legacy include path `src/chat/infra/store/ram_store.h` remains as a compatibility shim
+- `docs/REPOSITORY_MIGRATION_PLAN.md:214`: - legacy headers remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:271`: - legacy headers under `src/team/domain`, `src/team/ports`, and `src/team/protocol` remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:283`: - `src/chat` compatibility shims and stub sources have been removed
+- `docs/REPOSITORY_MIGRATION_PLAN.md:316`: - legacy include paths under `src/hostlink` remain as compatibility shims
+- `docs/REPOSITORY_MIGRATION_PLAN.md:420`: Legacy headers under `src/chat/infra/meshtastic` remain as compatibility shims, while runtime radio/protobuf
+- `docs/REPOSITORY_MIGRATION_PLAN.md:457`: Legacy headers under `src/chat/infra/meshtastic` remain as compatibility shims, while the runtime Meshtastic adapter still
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1114`: - The temporary `src/gps` shim headers have been removed, which eliminates another legacy include surface from the repository.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1121`: - The temporary `src/team` shim headers have been removed, eliminating another legacy include surface from the repository.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1173`: - The temporary `src/sys/clock.h` and `src/sys/ringbuf.h` compatibility shims have been removed, so `sys/clock.h` and `sys/ringbuf.h` now resolve directly from `modules/core_sys`.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:17`: - compatibility shims
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:29`: - legacy/transitional/compatibility/shim/fallback names
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:703`: ## Surface: ui_shared compatibility shims
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:706`: - compatibility shims
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:712`: - `docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md`
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1383`: ## Surface: legacy/transitional/compatibility/shim/fallback names
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1386`: - legacy/transitional/compatibility/shim/fallback names
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1390`: `compat`, `shim`, `fallback`, `adapter`, `bridge`, `probe`, or `smoke` across
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1420`: - compatibility shims
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1455`: - compatibility shims
+- `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md:31`: compatibility shims with checker coverage.
+- `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md:19`: | `ui_shared` forwarding shims | deprecated forwarding shims only | stable runtime module headers | No | they protect old include paths while downstream references burn down | no p
+- `docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md`: path match
+- `docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md:1`: # UI Shared Compatibility Shim Policy
+- `docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md:16`: they are compatibility shims only.
+- `docs/audits/UI_SHARED_SPLIT_AUDIT.md:238`: `docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md`.
+- `docs/audits/UI_SHARED_SPLIT_AUDIT.md:241`: compatibility shims. Main code must include the authoritative new module paths:
+- `modules/core_gps/README.md:49`: - legacy shim headers under `src/gps/*` have been removed
+- `modules/core_team/README.md:50`: - legacy shim headers under `src/team/*` have been removed
+- `modules/ui_shared/src/ui/i18n/resource_pack_registry.cpp:46`: constexpr const char* kFlashImePackRoot = "/fs/trailmate/packs/ime";
+- `modules/ui_shared/src/ui/i18n/resource_pack_registry.cpp:1774`: kFlashPackRoot, kFlashFontPackRoot, kFlashImePackRoot, kFlashLocalePackRoot);
+- `scripts/check_platform_ui_boundaries.py:51`: name="legacy-platform-ui-shim-include",
+- `tools/architecture/check_legacy_compat_temp_inventory_ready.py:14`: "compatibility shims",
+- `tools/architecture/check_legacy_compat_temp_inventory_ready.py:26`: "legacy/transitional/compatibility/shim/fallback names",
+- `tools/architecture/check_legacy_compat_temp_inventory_ready.py:44`: "ui_shared compatibility shims",
+- `tools/architecture/check_phase8_layout_ready.py:50`: "docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md",
+- `tools/architecture/check_phase8_layout_ready.py:404`: "UI_SHARED_COMPATIBILITY_SHIM_POLICY.md",
+- `tools/architecture/check_phase8_layout_ready.py:413`: "docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md",
+- `tools/architecture/check_phase8_layout_ready.py:416`: "compatibility shims only",
+- `tools/architecture/check_phase8_layout_ready.py:437`: "ui_shared compatibility shim policy",
+- `tools/architecture/check_post_refactor_final_ready.py:188`: "`ui_shared` forwarding shims",
+- `tools/architecture/scan_legacy_compat_temp_surfaces.py:20`: "shim",
+
+### `deprecated`
+
+- `docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md:23`: | Legacy UI bridge headers | Downstream source compatibility only | deprecated forwarding aliases; no implementation ownership |
+- `docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md:35`: | Migration decision | main runtime code includes `ui_chat_runtime/chat_delivery_action_port_adapter.h`; the old header is a deprecated alias only |
+- `docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md:56`: | Migration decision | main runtime code includes `ui_chat_runtime/chat_delivery_event_projection_adapter.h`; the old header is a deprecated alias only |
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:8`: owners and leave old `Legacy*` headers as deprecated compatibility aliases only.
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:19`: | Current implementation source | none; deprecated alias only |
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:21`: | Current callers | deprecated alias headers and `test_legacy_key_verification_adapters_legacy_alias.cpp` only |
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:26`: | Migration decision | main runtime owns the stable session adapter name directly; old headers forward to it with `[[deprecated]]` |
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:41`: | Migration decision | event pump and chat runtime consume the stable presentation source; old header is a deprecated alias |
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:56`: | Migration decision | key verification actions go through the stable command sink; old header is a deprecated alias |
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:71`: | Migration decision | GPS/map runtime consumes the stable snapshot source; old header is a deprecated alias |
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:85`: - deprecated alias headers under `modules/ui_legacy_adapters/include`
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:86`: - deprecated alias headers under `modules/ui_shared/include/ui/presentation_sources`
+- `docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md:104`: - deprecated forwarding aliases
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:19`: | `LegacyChatDeliveryEventBridge` | `ChatDeliveryEventProjectionAdapter` / `IChatDeliveryEventPort` / `ChatDeliveryEventProjector` | no main runtime callers; deprecated alias heade
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:20`: | `LegacyChatDeliveryActionBridge` | `ChatDeliveryActionPortAdapter` / `IChatDeliveryActionPort` | no main runtime callers; deprecated alias headers and legacy alias tests only | r
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:22`: | `LegacyKeyVerificationSource` | `KeyVerificationPresentationSource` / `IKeyVerificationPresentationSource` in `modules/ui_key_verification_runtime` | no main runtime callers; dep
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:23`: | `LegacyKeyVerificationActionSink` | `KeyVerificationActionSink` / `IKeyVerificationActionSink` in `modules/ui_key_verification_runtime` | no main runtime callers; deprecated alia
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:34`: | `Map overlay current/team marker projection` | `MapOverlaySnapshotSource` / `MapOverlayProjectionAdapter` / `MapOverlayProjector` in `modules/ui_map_runtime` | no main runtime ca
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:46`: | Chat delivery legacy bridge pair | `modules/ui_chat_runtime` formal ports and adapters | no main runtime callers; `ui_legacy_adapters` and `ui_shared` headers are deprecated alia
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:47`: | Key verification legacy source/sink/session | `modules/ui_key_verification_runtime` stable `KeyVerificationPresentationSource`, `KeyVerificationActionSink`, and `KeyVerificationS
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:48`: | Map overlay legacy source | `modules/ui_map_runtime` stable snapshot source and projection adapter | no main runtime callers; `ui_legacy_adapters` and `ui_shared` headers are dep
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:75`: - Chat delivery legacy bridge pair: main runtime callers removed; deprecated
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:79`: deprecated aliases only; stable owner is `KeyVerificationPresentationSource`,
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md:81`: - Map overlay legacy source: main runtime callers removed; deprecated aliases
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:18`: - deprecated aliases
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:38`: - Keep as Deprecated Alias Temporarily
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:731`: - Keep as Deprecated Alias Temporarily.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:743`: - deprecated aliases
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:754`: - deprecated alias to `ui_chat_runtime::ChatDeliveryActionPortAdapter`.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:763`: - Keep as Deprecated Alias Temporarily.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:774`: - deprecated aliases
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:785`: - deprecated alias to `ui_chat_runtime::ChatDeliveryEventProjectionAdapter`.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:794`: - Keep as Deprecated Alias Temporarily.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:805`: - deprecated aliases
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:816`: - deprecated alias to
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:826`: - Keep as Deprecated Alias Temporarily.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:837`: - deprecated aliases
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:848`: - deprecated alias to `ui_key_verification_runtime::KeyVerificationActionSink`.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:857`: - Keep as Deprecated Alias Temporarily.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:868`: - deprecated aliases
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:879`: - deprecated alias to
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:889`: - Keep as Deprecated Alias Temporarily.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:900`: - deprecated aliases
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:911`: - deprecated alias to `ui::map_overlay::MapOverlaySnapshotSource`.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:920`: - Keep as Deprecated Alias Temporarily.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1320`: - `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md`
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1465`: - deprecated alias tests
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1479`: - Keep as Deprecated Alias Temporarily.
+- `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md`: path match
+- `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md:1`: # Phase 12 Deprecated Alias Cleanup Plan
+- `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md:5`: Phase 9 burned selected `Legacy*` surfaces down to deprecated aliases. Phase 12
+- `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md:21`: - Main code must not include deprecated alias headers.
+- `docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md:22`: - Compatibility tests may include deprecated alias headers.
+- `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md:16`: | Chat legacy alias headers | deprecated alias only | `ChatDeliveryActionPortAdapter`, `ChatDeliveryEventProjectionAdapter` | No | compatibility alias tests and possible downstream
+- `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md:17`: | KeyVerification legacy alias headers | deprecated alias only | `KeyVerificationPresentationSource`, `KeyVerificationActionSink`, `KeyVerificationSessionAdapter` | No | compatibil
+- `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md:18`: | MapOverlay legacy alias header | deprecated alias only | `MapOverlaySnapshotSource`, `MapOverlayProjectionAdapter` | No | compatibility alias tests and possible downstream includ
+- `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md:19`: | `ui_shared` forwarding shims | deprecated forwarding shims only | stable runtime module headers | No | they protect old include paths while downstream references burn down | no p
+- `docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md:35`: No fallback or deprecated alias is deleted in Phase 12. Phase 12 records
+- `docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md:13`: | Chat LegacyDelivery bridges | deprecated alias headers in `modules/ui_legacy_adapters` and `modules/ui_shared` | downstream compatibility include paths may still exist outside ma
+- `docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md:14`: | KeyVerification legacy source/sink | deprecated alias headers in `modules/ui_legacy_adapters` and `modules/ui_shared` | downstream compatibility include paths may still exist out
+- ... 100 additional matches omitted
+
+### `archive-only`
+
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:149`: - Current purpose: archive-only historical simulator implementation root.
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:158`: CMake file is archive-only.
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:162`: - Runtime ownership status: archive-only root. Phase 9-11 runtime entry
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:172`: - Burn-down step: local CMake root collapsed to archive-only; next blocker is
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:181`: - Current purpose: archive-only historical uConsole GTK implementation root.
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:190`: CMake file is archive-only.
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:194`: - Runtime ownership status: archive-only GTK root. Phase 9-11 page
+- `docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md:202`: - Burn-down step: local CMake root collapsed to archive-only; next blocker is
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:21`: - archive-only roots
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:260`: - docs and checkers recognize it as archive-only.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:265`: - archive-only historical simulator source and scripts.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:287`: - medium; source is archive-only but still referenced by descriptors and docs.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:301`: - docs and checkers recognize it as archive-only.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:306`: - archive-only historical uConsole GTK source, packaging files, scripts, and
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:486`: - low; it is archive-only but still enforced by legacy root checker.
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1033`: - archive-only roots
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1071`: - archive-only roots
+- `docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md:1126`: - keeps old build ownership alive or documents archive-only local roots.
+- `docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md:19`: none. `legacy/app_implementations/linux_sim/CMakeLists.txt` is archive-only.
+- `docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md:47`: archive-only. `apps/linux_uconsole_gtk/CMakeLists.txt` no longer compiles this
+- `docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md:66`: legacy-local compatibility only; archive-only.
+- `docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md:75`: - Old adapter headers and sources were deleted from archive-only historical
+- `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md:4`: archive-only directories. It does not affect ESP-IDF, PlatformIO, or GAT562
+- `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md:11`: archive-only marker and must not define `add_library`, `add_executable`, or
+- `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md:39`: `linux_sim` local CMake root should become archive-only; final build
+- `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md:46`: archive-only marker and must not define `add_library`, `add_executable`, or
+- `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md:75`: `linux_uconsole` local CMake root should become archive-only; final build
+- `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md:80`: - LinuxSim: local CMake root should become archive-only; final build validation
+- `docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md:82`: - uConsole: local CMake root should become archive-only; final build validation
+- `tools/architecture/check_legacy_app_roots_burndown_ready.py:260`: "local CMake root should become archive-only",
+- `tools/architecture/check_legacy_app_roots_burndown_ready.py:275`: "archive-only",
+- `tools/architecture/check_legacy_app_roots_burndown_ready.py:296`: "archive-only",
+- `tools/architecture/check_legacy_compat_temp_inventory_ready.py:18`: "archive-only roots",
+- `tools/architecture/check_phase8_layout_ready.py:1621`: "archive-only",
+- `tools/architecture/check_phase8_layout_ready.py:1630`: "archive-only",
+- `tools/architecture/scan_legacy_compat_temp_surfaces.py:22`: "archive-only",
+
+### `adapter`
+
+- `.github/PULL_REQUEST_TEMPLATE.md:23`: - [ ] Radio adapters do not own direct message, PKI, peer key, or contact policy.
+- `README.md:568`: * [x] **Meshcore network compatibility** (selectable adapter)
+- `apps/README.md:9`: - selecting platform adapters
+- `apps/README.md:21`: that may be reached only through declared compatibility adapters.
+- `apps/esp32_lvgl/APP_SHELL_MANIFEST.md:79`: - `esp_idf_legacy_implementation_adapter.cpp`
+- `apps/esp32_lvgl/README.md:76`: `esp_idf_legacy_implementation_adapter.cpp`.
+- `apps/linux_sim_shell/CMakeLists.txt:22`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp"
+- `apps/linux_sim_shell/CMakeLists.txt:23`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp"
+- `apps/linux_sim_shell/CMakeLists.txt:99`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:102`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `apps/linux_sim_shell/CMakeLists.txt:112`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:115`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `apps/linux_sim_shell/CMakeLists.txt:123`: add_executable(trailmate_key_verification_runtime_adapters_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:124`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp"
+- `apps/linux_sim_shell/CMakeLists.txt:129`: target_include_directories(trailmate_key_verification_runtime_adapters_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:135`: target_compile_features(trailmate_key_verification_runtime_adapters_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:137`: add_test(NAME trailmate_key_verification_runtime_adapters_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:138`: COMMAND trailmate_key_verification_runtime_adapters_smoke)
+- `apps/linux_sim_shell/CMakeLists.txt:140`: add_executable(trailmate_legacy_key_verification_adapters_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:141`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:142`: target_include_directories(trailmate_legacy_key_verification_adapters_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:144`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `apps/linux_sim_shell/CMakeLists.txt:148`: target_compile_features(trailmate_legacy_key_verification_adapters_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:150`: add_test(NAME trailmate_legacy_key_verification_adapters_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:151`: COMMAND trailmate_legacy_key_verification_adapters_alias_smoke)
+- `apps/linux_sim_shell/CMakeLists.txt:156`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp"
+- `apps/linux_sim_shell/CMakeLists.txt:168`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:171`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `apps/linux_sim_shell/CMakeLists.txt:189`: ux_screen_menu_adapter
+- `apps/linux_sim_shell/CMakeLists.txt:191`: lvgl_menu_runtime_adapter
+- `apps/linux_sim_shell/CMakeLists.txt:193`: lvgl_screen_host_adapter
+- `apps/linux_uconsole_gtk/CMakeLists.txt:22`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp"
+- `apps/linux_uconsole_gtk/CMakeLists.txt:23`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp"
+- `boards/tab5/README.md:3`: Board-owned home for Tab5 support and board-specific ESP adapters.
+- `boards/tdeck/README.md:8`: - own T-Deck-specific ESP adapter glue under `boards/tdeck/platform_esp_board_runtime.h`
+- `boards/tlora_pager/README.md:8`: - own T-LoRa Pager-specific ESP adapter glue under `boards/tlora_pager/platform_esp_board_runtime.h`
+- `boards/twatchs3/README.md:8`: - own T-Watch S3-specific ESP adapter glue under `boards/twatchs3/platform_esp_board_runtime.h`
+- `builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake:21`: "${TRAILMATE_ROOT}/platform/esp/radio/meshtastic_radio_adapter.cpp")
+- `cmake/TrailMateLinuxSources.cmake:102`: set(TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT
+- `cmake/TrailMateLinuxSources.cmake:103`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/include"
+- `cmake/TrailMateLinuxSources.cmake:105`: set(TRAIL_MATE_UI_LEGACY_ADAPTERS_SRC_ROOT
+- `cmake/TrailMateLinuxSources.cmake:106`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/src"
+- `cmake/TrailMateLinuxSources.cmake:123`: set(TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_INCLUDE_ROOT
+- `cmake/TrailMateLinuxSources.cmake:124`: "${TRAIL_MATE_REPO_ROOT}/modules/chat_presentation_adapters/include"
+- `cmake/TrailMateLinuxSources.cmake:126`: set(TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_SRC_ROOT
+- `cmake/TrailMateLinuxSources.cmake:127`: "${TRAIL_MATE_REPO_ROOT}/modules/chat_presentation_adapters/src"
+- `cmake/TrailMateLinuxSources.cmake:145`: "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/chat/linux_noop_mesh_adapter.cpp"
+- `cmake/TrailMateLinuxSources.cmake:146`: "${TRAIL_MATE_LINUX_COMMON_SRC_ROOT}/chat/linux_raw_lora_mesh_adapter.cpp"
+- `cmake/TrailMateLinuxSources.cmake:281`: # modules/chat_presentation_adapters
+- `cmake/TrailMateLinuxSources.cmake:282`: "${TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_SRC_ROOT}/chat_conversation_mapper.cpp"
+- `cmake/TrailMateLinuxSources.cmake:283`: "${TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_SRC_ROOT}/chat_message_mapper.cpp"
+- `cmake/TrailMateLinuxSources.cmake:326`: "${TRAIL_MATE_UI_CHAT_RUNTIME_SRC_ROOT}/chat_delivery_action_port_adapter.cpp"
+- `cmake/TrailMateLinuxSources.cmake:327`: "${TRAIL_MATE_UI_CHAT_RUNTIME_SRC_ROOT}/chat_delivery_event_projection_adapter.cpp"
+- `cmake/TrailMateLinuxSources.cmake:333`: "${TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT}/map_overlay_projection_adapter.cpp"
+- `cmake/TrailMateLinuxSources.cmake:380`: "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/ux/ux_screen_menu_adapter.cpp"
+- `cmake/TrailMateLinuxSources.cmake:384`: "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/lvgl_menu_runtime_adapter.cpp"
+- `cmake/TrailMateLinuxSources.cmake:385`: "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/lvgl_screen_host_adapter.cpp"
+- `cmake/TrailMateLinuxSources.cmake:477`: "${TRAIL_MATE_CHAT_PRESENTATION_ADAPTERS_INCLUDE_ROOT}"
+- `cmake/TrailMateLinuxSources.cmake:485`: "${TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT}"
+- `cmake/TrailMateLinuxSources.cmake:502`: "${TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT}"
+- ... 2678 additional matches omitted
+
+### `bridge`
+
+- `apps/linux_sim_shell/CMakeLists.txt:24`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp"
+- `apps/linux_sim_shell/CMakeLists.txt:98`: add_executable(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:99`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:100`: target_include_directories(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:106`: target_compile_features(trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:108`: add_test(NAME trailmate_legacy_chat_delivery_action_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:109`: COMMAND trailmate_legacy_chat_delivery_action_bridge_alias_smoke)
+- `apps/linux_sim_shell/CMakeLists.txt:111`: add_executable(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:112`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp")
+- `apps/linux_sim_shell/CMakeLists.txt:113`: target_include_directories(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:118`: target_compile_features(trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:120`: add_test(NAME trailmate_legacy_chat_delivery_event_bridge_alias_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:121`: COMMAND trailmate_legacy_chat_delivery_event_bridge_alias_smoke)
+- `apps/linux_sim_shell/CMakeLists.txt:194`: lvgl_screen_graph_bridge
+- `apps/linux_uconsole_gtk/CMakeLists.txt:24`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp"
+- `cmake/TrailMateLinuxSources.cmake:187`: "${TRAIL_MATE_REPO_ROOT}/modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp"
+- `cmake/TrailMateLinuxSources.cmake:332`: "${TRAIL_MATE_UI_SHARED_SRC_ROOT}/ui/team_actions/legacy_team_action_bridge.cpp"
+- `cmake/TrailMateLinuxSources.cmake:386`: "${TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT}/runtime/lvgl_screen_graph_bridge.cpp"
+- `cmake/TrailMateUxPacks.cmake:27`: "${TRAIL_MATE_REPO_ROOT}/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp"
+- `docs/Best Practices/GAT562_IMPLEMENTATION_MAP.md:91`: - `platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/self_identity_bridge.h`
+- `docs/Best Practices/GAT562_IMPLEMENTATION_MAP.md:92`: - `platform/nrf52/arduino_common/src/self_identity_bridge.cpp`
+- `docs/Best Practices/GAT562_IMPLEMENTATION_MAP.md:254`: - identity bridge
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:30`: - 能通过新增 `board` / `env` / `bridge` / `provider` 解决的，不要去污染现有业务核心。
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:112`: - platform-specific identity bridge；
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:136`: - 某块板子的设备 runtime bridge
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:250`: ## 3.3 Bridge 模式
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:259`: - `platform/nrf52/self_identity_bridge`
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:309`: - `platform/nrf52/self_identity_bridge`
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:321`: - platform 只能提供 bridge 和 runtime 适配。
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:407`: ## Step 4：优先接 platform bridge，再接 app
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:411`: - 先做 bridge
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:519`: - 统一经由 bridge / provider 暴露。
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:568`: - 哪些逻辑从 settings/runtime 收敛到了 bridge/provider
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:577`: - [ ] 平台读取真值统一走 bridge/provider
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:592`: - `platform/`：平台 runtime 与 bridge
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:622`: - `platform` 层可以保留 runtime / bridge / adapter，但不能长期把同一板级真值分散在多个 runtime 里各自维护
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:649`: - `platform/<chip>/` ɸõƽ̨ջ繲 `BleManager` BLE service radio transport ӿڡƽ̨ bridge
+- `docs/Best Practices/new_hardware_adaptation_prompt.md:652`: - `settings` ֵֻһ owner runtime Ҫȡʱͨ bridge/provider  BLE / radio / UI / host config á
+- `docs/LINUX_ADAPTATION_GUIDE.md:212`: | 开发体验 | 较好 | Windows PowerShell、Linux shell、WSL validate、Docker dev container 脚本齐全 | 本地环境变量和 path bridge 还在演进；不同 host 的路径/权限策略需要统一文档化 |
+- `docs/LINUX_ADAPTATION_GUIDE.md:773`: - event bus bridge
+- `docs/REPOSITORY_MIGRATION_PLAN.md:193`: - a legacy bridge under `src/chat/infra` translates that hook back into `sys::EventBus` events for the current app shell
+- `docs/REPOSITORY_MIGRATION_PLAN.md:293`: - legacy event-bus publishing for unknown app-data now lives in a bridge under `src/team/infra/event`
+- `docs/REPOSITORY_MIGRATION_PLAN.md:393`: The legacy `hostlink_bridge_radio.cpp` still owns event-bus observation, runtime team-state tracking,
+- `docs/REPOSITORY_MIGRATION_PLAN.md:398`: The next `core_hostlink` slice extracts more bridge-side pure payload encoding:
+- `docs/REPOSITORY_MIGRATION_PLAN.md:406`: The legacy `hostlink_bridge_radio.cpp` still owns event-bus subscription, runtime team-state tracking,
+- `docs/REPOSITORY_MIGRATION_PLAN.md:734`: The Arduino ESP board bootstrap is no longer routed through one catch-all legacy bridge:
+- `docs/REPOSITORY_MIGRATION_PLAN.md:738`: - `src/platform_bridge/esp_arduino_legacy_bridge.*` is reduced to the remaining temporary `AppContext` / menu-layout accessors
+- `docs/REPOSITORY_MIGRATION_PLAN.md:740`: This shrinks the old bridge layer and moves board-instance ownership closer to the platform board shells where it belongs.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:748`: - the legacy Arduino `src/main.cpp` and Arduino-only legacy bridge are now excluded from the IDF component source list
+- `docs/REPOSITORY_MIGRATION_PLAN.md:754`: The remaining Arduino PlatformIO `AppContext` bridge logic is no longer parked under `src/platform_bridge`:
+- `docs/REPOSITORY_MIGRATION_PLAN.md:758`: - the temporary `src/platform_bridge` layer can now be retired from the active PlatformIO shell path
+- `docs/REPOSITORY_MIGRATION_PLAN.md:820`: - `hostlink::bridge::on_event(...)` moved out of `AppContext` and into target-specific event runtime hooks
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1016`: - `AppContext` no longer directly constructs the Arduino mesh runtime router or the event-bus chat observer bridge; both now arrive through `AppContextPlatformBindings` factories.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1018`: - `platform/esp/arduino_common` remains the place that creates `MeshAdapterRouter` and `ChatEventBusBridge`, while `apps/esp_pio` injects that platform bundle during startup.
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1030`: - `AppContext` no longer directly constructs `team::infra::TeamCrypto`, `TeamEventBusSink`, `TeamAppDataEventBusBridge`, or `TeamPairingEventBusSink`; those now come through `AppCo
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1105`: - The remaining ESP/Arduino hostlink runtime shell (`hostlink_service`, `hostlink_bridge_radio`, and `hostlink_config_service`) has moved out of `src/hostlink` and into `platform/e
+- `docs/REPOSITORY_MIGRATION_PLAN.md:1119`: - The remaining ESP/Arduino team runtime adapters (`team_crypto`, event-bus bridges/sinks, ESP-NOW pairing transport/service shell, Arduino runtime adapter, and GPS-backed team tra
+- `docs/RETICULUM_LXMF_DEVICE_MODE.md:17`: - a USB CDC RNode KISS bridge so a real Reticulum host can use the device as a modem
+- `docs/RETICULUM_LXMF_DEVICE_MODE.md:35`: - `RNode Bridge`: host-controlled modem mode for an external Reticulum/LXMF stack
+- `docs/RETICULUM_LXMF_DEVICE_MODE.md:40`: - `RNode Bridge` is a modem/bridge mode
+- ... 843 additional matches omitted
+
+### `probe`
+
+- `apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp:57`: "GNSS runtime config applied: enabled=%d interval_ms=%lu mode=%u sat_mask=0x%02X strategy=%u external_nmea=%u/%u motion_idle_ms=%lu sensor=%u startup_probe=deferred",
+- `apps/linux_sim_shell/CMakeLists.txt:18`: src/linux_sim_runtime_entry_adoption_probe.cpp
+- `apps/linux_sim_shell/CMakeLists.txt:56`: add_executable(trailmate_linux_sim_runtime_entry_adoption_probe_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:57`: tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp)
+- `apps/linux_sim_shell/CMakeLists.txt:58`: target_link_libraries(trailmate_linux_sim_runtime_entry_adoption_probe_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:60`: add_test(NAME trailmate_linux_sim_runtime_entry_adoption_probe_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:61`: COMMAND trailmate_linux_sim_runtime_entry_adoption_probe_smoke)
+- `apps/linux_sim_shell/CMakeLists.txt:197`: lvgl_runtime_adoption_probe
+- `apps/linux_sim_shell/CMakeLists.txt:200`: lvgl_descriptor_renderer_probe
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:8`: ready_ = adoption_probe_.load(shell);
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:51`: return ready_ ? adoption_probe_.menuCount() : 0;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:56`: return ready_ ? adoption_probe_.screenCount() : 0;
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp:62`: return adoption_probe_.adoption();
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.h:4`: #include "linux_sim_runtime_entry_adoption_probe.h"
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry.h:36`: LinuxSimRuntimeEntryAdoptionProbe adoption_probe_{};
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp`: path match
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:1`: #include "linux_sim_runtime_entry_adoption_probe.h"
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:9`: bool LinuxSimRuntimeEntryAdoptionProbe::load(const LinuxSimAppShell& shell)
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:33`: bool LinuxSimRuntimeEntryAdoptionProbe::ready() const
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:38`: bool LinuxSimRuntimeEntryAdoptionProbe::fallbackUsed() const
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:43`: std::size_t LinuxSimRuntimeEntryAdoptionProbe::menuCount() const
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:48`: std::size_t LinuxSimRuntimeEntryAdoptionProbe::screenCount() const
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp:54`: LinuxSimRuntimeEntryAdoptionProbe::adoption() const
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h`: path match
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h:14`: class LinuxSimRuntimeEntryAdoptionProbe
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp`: path match
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:2`: #include "linux_sim_runtime_entry_adoption_probe.h"
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:9`: trailmate::apps::linux_sim_shell::LinuxSimRuntimeEntryAdoptionProbe probe;
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:11`: assert(probe.load(shell));
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:12`: assert(probe.ready());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:13`: assert(!probe.fallbackUsed());
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:14`: assert(probe.menuCount() > 0);
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:15`: assert(probe.screenCount() > 0);
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp:16`: assert(probe.adoption().presenter().menuLines()[0].route.valid);
+- `apps/linux_uconsole_gtk/CMakeLists.txt:19`: src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp
+- `apps/linux_uconsole_gtk/CMakeLists.txt:56`: add_executable(trailmate_linux_uconsole_gtk_runtime_entry_adoption_probe_smoke
+- `apps/linux_uconsole_gtk/CMakeLists.txt:57`: tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp)
+- `apps/linux_uconsole_gtk/CMakeLists.txt:58`: target_link_libraries(trailmate_linux_uconsole_gtk_runtime_entry_adoption_probe_smoke
+- `apps/linux_uconsole_gtk/CMakeLists.txt:60`: add_test(NAME trailmate_linux_uconsole_gtk_runtime_entry_adoption_probe_smoke
+- `apps/linux_uconsole_gtk/CMakeLists.txt:61`: COMMAND trailmate_linux_uconsole_gtk_runtime_entry_adoption_probe_smoke)
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:9`: ready_ = adoption_probe_.load(shell);
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:57`: return ready_ ? adoption_probe_.menuCount() : 0;
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:62`: return ready_ ? adoption_probe_.screenCount() : 0;
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:68`: return adoption_probe_.adoption().presenter().menuDescriptors();
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:74`: return adoption_probe_.adoption().presenter().screenDescriptors();
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp:80`: return adoption_probe_.adoption();
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h:4`: #include "linux_uconsole_gtk_runtime_entry_adoption_probe.h"
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h:38`: LinuxUConsoleGtkRuntimeEntryAdoptionProbe adoption_probe_{};
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp`: path match
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:1`: #include "linux_uconsole_gtk_runtime_entry_adoption_probe.h"
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:9`: bool LinuxUConsoleGtkRuntimeEntryAdoptionProbe::load(
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:34`: bool LinuxUConsoleGtkRuntimeEntryAdoptionProbe::ready() const
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:39`: bool LinuxUConsoleGtkRuntimeEntryAdoptionProbe::fallbackUsed() const
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:44`: std::size_t LinuxUConsoleGtkRuntimeEntryAdoptionProbe::menuCount() const
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:49`: std::size_t LinuxUConsoleGtkRuntimeEntryAdoptionProbe::screenCount() const
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp:55`: LinuxUConsoleGtkRuntimeEntryAdoptionProbe::adoption() const
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.h`: path match
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.h:14`: class LinuxUConsoleGtkRuntimeEntryAdoptionProbe
+- `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp`: path match
+- `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp:2`: #include "linux_uconsole_gtk_runtime_entry_adoption_probe.h"
+- ... 489 additional matches omitted
+
+### `smoke`
+
+- `.github/workflows/cardputer-zero-linux.yml:43`: - name: Configure smoke tests
+- `.github/workflows/cardputer-zero-linux.yml:47`: - name: Build smoke tests
+- `.github/workflows/cardputer-zero-linux.yml:51`: - name: Run smoke tests
+- `apps/esp32_lvgl/CMakeLists.txt:35`: add_executable(trailmate_esp32_lvgl_app_shell_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:36`: tests/esp32_lvgl_app_shell_smoke.cpp)
+- `apps/esp32_lvgl/CMakeLists.txt:37`: target_link_libraries(trailmate_esp32_lvgl_app_shell_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:39`: add_test(NAME trailmate_esp32_lvgl_app_shell_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:40`: COMMAND trailmate_esp32_lvgl_app_shell_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:42`: add_executable(trailmate_esp32_lvgl_historical_source_descriptor_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:43`: tests/esp32_lvgl_historical_source_descriptor_smoke.cpp)
+- `apps/esp32_lvgl/CMakeLists.txt:44`: target_link_libraries(trailmate_esp32_lvgl_historical_source_descriptor_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:46`: add_test(NAME trailmate_esp32_lvgl_historical_source_descriptor_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:47`: COMMAND trailmate_esp32_lvgl_historical_source_descriptor_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:49`: add_executable(trailmate_esp32_lvgl_startup_runtime_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:50`: tests/esp32_lvgl_startup_runtime_smoke.cpp)
+- `apps/esp32_lvgl/CMakeLists.txt:51`: target_link_libraries(trailmate_esp32_lvgl_startup_runtime_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:53`: add_test(NAME trailmate_esp32_lvgl_startup_runtime_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:54`: COMMAND trailmate_esp32_lvgl_startup_runtime_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:56`: add_executable(trailmate_esp32_lvgl_loop_runtime_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:57`: tests/esp32_lvgl_loop_runtime_smoke.cpp)
+- `apps/esp32_lvgl/CMakeLists.txt:58`: target_link_libraries(trailmate_esp32_lvgl_loop_runtime_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:60`: add_test(NAME trailmate_esp32_lvgl_loop_runtime_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:61`: COMMAND trailmate_esp32_lvgl_loop_runtime_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:63`: add_executable(trailmate_esp32_lvgl_runtime_config_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:64`: tests/esp32_lvgl_runtime_config_smoke.cpp)
+- `apps/esp32_lvgl/CMakeLists.txt:65`: target_link_libraries(trailmate_esp32_lvgl_runtime_config_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:67`: add_test(NAME trailmate_esp32_lvgl_runtime_config_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:68`: COMMAND trailmate_esp32_lvgl_runtime_config_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:70`: add_executable(trailmate_product_target_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:72`: target_link_libraries(trailmate_product_target_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:74`: add_test(NAME trailmate_product_target_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:75`: COMMAND trailmate_product_target_profile_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:77`: add_executable(trailmate_product_target_build_binding_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:79`: target_link_libraries(trailmate_product_target_build_binding_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:81`: add_test(NAME trailmate_product_target_build_binding_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:82`: COMMAND trailmate_product_target_build_binding_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:84`: add_executable(trailmate_product_target_ux_binding_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:86`: target_link_libraries(trailmate_product_target_ux_binding_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:88`: add_test(NAME trailmate_product_target_ux_binding_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:89`: COMMAND trailmate_product_target_ux_binding_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:91`: add_executable(trailmate_ui_presentation_target_ui_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:93`: target_link_libraries(trailmate_ui_presentation_target_ui_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:95`: add_test(NAME trailmate_ui_presentation_target_ui_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:96`: COMMAND trailmate_ui_presentation_target_ui_profile_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:98`: add_executable(trailmate_ui_presentation_page_manifest_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:100`: target_link_libraries(trailmate_ui_presentation_page_manifest_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:102`: add_test(NAME trailmate_ui_presentation_page_manifest_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:103`: COMMAND trailmate_ui_presentation_page_manifest_smoke)
+- `apps/esp32_lvgl/CMakeLists.txt:105`: add_executable(trailmate_ui_presentation_layout_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:107`: target_link_libraries(trailmate_ui_presentation_layout_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:109`: add_test(NAME trailmate_ui_presentation_layout_profile_smoke
+- `apps/esp32_lvgl/CMakeLists.txt:110`: COMMAND trailmate_ui_presentation_layout_profile_smoke)
+- `apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp`: path match
+- `apps/esp32_lvgl/tests/esp32_lvgl_historical_source_descriptor_smoke.cpp`: path match
+- `apps/esp32_lvgl/tests/esp32_lvgl_loop_runtime_smoke.cpp`: path match
+- `apps/esp32_lvgl/tests/esp32_lvgl_runtime_config_smoke.cpp`: path match
+- `apps/esp32_lvgl/tests/esp32_lvgl_startup_runtime_smoke.cpp`: path match
+- `apps/linux_sim_shell/APP_SHELL_MANIFEST.md:61`: - `tests/linux_sim_app_shell_smoke.cpp`
+- `apps/linux_sim_shell/CMakeLists.txt:42`: add_executable(trailmate_linux_sim_app_shell_smoke
+- `apps/linux_sim_shell/CMakeLists.txt:43`: tests/linux_sim_app_shell_smoke.cpp)
+- ... 364 additional matches omitted
diff --git a/docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md b/docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md
new file mode 100644
index 00000000..867387d3
--- /dev/null
+++ b/docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md
@@ -0,0 +1,76 @@
+# Legacy Linux App Adapter Burn-Down Audit
+
+This audit covers the first Linux-side dependency shrink after legacy root
+burn-down started. It does not delete `legacy/app_implementations/linux_sim`
+or `legacy/app_implementations/linux_uconsole`. It removes the final app shell
+dependency on the legacy implementation adapters.
+
+## `linux_sim_legacy_implementation_adapter`
+
+- Current header:
+  deleted from `legacy/app_implementations/linux_sim/archive/adapters`.
+- Current source:
+  deleted from `legacy/app_implementations/linux_sim/archive/adapters`.
+- Current callers:
+  none in active source. The old adapter smoke was deleted after
+  `apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp`
+  took over the compatibility assertion.
+- Current CMake include/source usage:
+  none. `legacy/app_implementations/linux_sim/CMakeLists.txt` is archive-only.
+  `apps/linux_sim_shell/CMakeLists.txt` no longer compiles this source and no
+  longer adds any LinuxSim legacy root include path.
+- What it exposes to final app shell:
+  historically it exposed only `implementation_root`, `app_shell`, and
+  `target_id` strings plus a null-checking `validate()` method.
+- Which part is still needed:
+  final app shell still needs a historical source descriptor to document the
+  historical root, but it does not need a legacy-root-owned adapter.
+- Replacement owner:
+  `apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h` and
+  `apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.cpp`.
+- Migration decision:
+  final app shell now owns `LinuxSimHistoricalSourceDescriptor`; the old adapter
+  source has been deleted.
+
+## `uconsole_legacy_implementation_adapter`
+
+- Current header:
+  deleted from `legacy/app_implementations/linux_uconsole/archive/adapters`.
+- Current source:
+  deleted from `legacy/app_implementations/linux_uconsole/archive/adapters`.
+- Current callers:
+  none in active source. The old adapter smoke was deleted after
+  `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp`
+  took over the compatibility assertion.
+- Current CMake include/source usage:
+  none. `legacy/app_implementations/linux_uconsole/CMakeLists.txt` is
+  archive-only. `apps/linux_uconsole_gtk/CMakeLists.txt` no longer compiles this
+  source and no longer adds any uConsole legacy root include path.
+- What it exposes to final app shell:
+  historically it exposed only `implementation_root`, `app_shell`, and
+  `target_id` strings plus a null-checking `validate()` method.
+- Which part is still needed:
+  final app shell still needs a historical source descriptor to document the
+  historical root, but it does not need a legacy-root-owned adapter.
+- Replacement owner:
+  `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h`
+  and
+  `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.cpp`.
+- Migration decision:
+  final app shell now owns `LinuxUConsoleGtkHistoricalSourceDescriptor`; the old
+  adapter source has been deleted.
+
+## Boundary Result
+
+- Required audit tokens: replacement owner; migration decision;
+  legacy-local compatibility only; archive-only.
+- `apps/linux_sim_shell` does not include
+  `linux_sim_legacy_implementation_adapter`.
+- `apps/linux_sim_shell/CMakeLists.txt` does not compile
+  `linux_sim_legacy_implementation_adapter.cpp`.
+- `apps/linux_uconsole_gtk` does not include
+  `uconsole_legacy_implementation_adapter`.
+- `apps/linux_uconsole_gtk/CMakeLists.txt` does not compile
+  `uconsole_legacy_implementation_adapter.cpp`.
+- Old adapter headers and sources were deleted from archive-only historical
+  source after descriptor smoke coverage moved to final app shells.
diff --git a/docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md b/docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md
new file mode 100644
index 00000000..3fe9f300
--- /dev/null
+++ b/docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md
@@ -0,0 +1,86 @@
+# Legacy Linux Local Root Collapse Audit
+
+This audit records the collapse of the Linux legacy implementation roots into
+archive-only directories. It does not affect ESP-IDF, PlatformIO, or GAT562
+roots.
+
+## `legacy/app_implementations/linux_sim`
+
+- Current local CMake targets:
+  none. `legacy/app_implementations/linux_sim/CMakeLists.txt` is an
+  archive-only marker and must not define `add_library`, `add_executable`, or
+  `add_test`.
+- Current smoke targets:
+  none under this root. Active validation lives in `apps/linux_sim_shell`,
+  including `linux_sim_historical_source_descriptor_smoke`.
+- Current composition root files:
+  archived at
+  `legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.h`
+  and
+  `legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.cpp`.
+- Current old runtime/widget files:
+  old SDL simulator and target entrypoint sources are archived under
+  `legacy/app_implementations/linux_sim/archive/simulator/`.
+- Which targets are still referenced by final app shells:
+  none from this legacy root. `apps/linux_sim_shell` uses final-shell-owned
+  descriptors and `modules/ui_ascii_runtime`.
+- Which targets can be removed from normal build:
+  all former local CMake targets, including the old simulator executable,
+  composition root library, and legacy adapter smoke.
+- Which files must remain as archive:
+  historical simulator, composition, script, Docker, preset, and smoke
+  sources retained under `archive/` until targeted deletion.
+- Which files can move to tests/compatibility:
+  the adapter-smoke meaning has already moved to
+  `apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp`.
+  The old adapter smoke source and archived composition smoke source were
+  deleted.
+- Collapse decision:
+  `linux_sim` local CMake root should become archive-only; final build
+  validation lives in `apps/linux_sim_shell`.
+
+## `legacy/app_implementations/linux_uconsole`
+
+- Current local CMake targets:
+  none. `legacy/app_implementations/linux_uconsole/CMakeLists.txt` is an
+  archive-only marker and must not define `add_library`, `add_executable`, or
+  `add_test`.
+- Current smoke targets:
+  none under this root. Active validation lives in `apps/linux_uconsole_gtk`,
+  including `linux_uconsole_gtk_historical_source_descriptor_smoke`.
+- Current composition root files:
+  archived at
+  `legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.h`
+  and
+  `legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.cpp`.
+- Current old runtime/widget files:
+  old GTK widget/page implementation, desktop fallback presenter, and target
+  entrypoint sources are archived under
+  `legacy/app_implementations/linux_uconsole/archive/gtk/`.
+- Which targets are still referenced by final app shells:
+  none from this legacy root. `apps/linux_uconsole_gtk` uses final-shell-owned
+  descriptors and `modules/ui_gtk_runtime`.
+- Which targets can be removed from normal build:
+  all former local CMake targets, including the GTK app target, composition root
+  library, old smoke targets, and legacy adapter smoke.
+- Which files must remain as archive:
+  historical GTK, desktop fallback, composition, packaging, tool, preset,
+  and smoke sources retained under `archive/` until targeted deletion.
+- Which files can move to tests/compatibility:
+  the adapter-smoke meaning has already moved to
+  `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp`.
+  The old adapter smoke source and archived composition smoke source were
+  deleted.
+- Collapse decision:
+  `linux_uconsole` local CMake root should become archive-only; final build
+  validation lives in `apps/linux_uconsole_gtk`.
+
+## Boundary Decision
+
+- LinuxSim: local CMake root should become archive-only; final build validation
+  lives in `apps/linux_sim_shell`.
+- uConsole: local CMake root should become archive-only; final build validation
+  lives in `apps/linux_uconsole_gtk`.
+- Final app shells must not reference
+  `legacy/app_implementations/linux_sim/archive` or
+  `legacy/app_implementations/linux_uconsole/archive`.
diff --git a/docs/audits/MAP_OVERLAY_ROUTE_TRACKER_OWNERSHIP_AUDIT.md b/docs/audits/MAP_OVERLAY_ROUTE_TRACKER_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..a51a7583
--- /dev/null
+++ b/docs/audits/MAP_OVERLAY_ROUTE_TRACKER_OWNERSHIP_AUDIT.md
@@ -0,0 +1,79 @@
+# Map Overlay / Route / Tracker Ownership Audit
+
+## Purpose
+
+Phase 7.12 separates map overlay semantic state from tile source/cache and
+from renderer widget lifecycle.
+
+The ownership boundary is:
+
+runtime source -> presentation source / projector -> overlay snapshot -> renderer -> LVGL / GTK / ASCII
+
+Renderer code must not pull GPS runtime, Team store, route store, tracker store,
+tile source, or filesystem state directly.
+
+## Current State
+
+| Question | Current owner before 7.12 | 7.12 owner |
+| --- | --- | --- |
+| Current GPS marker facts | ESP GPS page/map runtime reads `platform::ui::gps::get_data()`; Linux map workspace reads `LegacyGpsStatusSource` | `LegacyMapOverlaySource` via `IMapOverlayGpsSource` |
+| Team member marker facts | ESP GPS page/map runtime reads Team posring/chatlog directly; Linux map workspace had only summary counts | `LegacyMapOverlaySource` via `IMapOverlayTeamSource` |
+| Route / tracker / breadcrumb facts | ESP route/tracker overlay code still owns platform-specific drawing state | Explicitly deferred with exit condition |
+| Measurement state | `LegacyMapPresentationState` / `MapWorkspaceSnapshot::measurement` | Deferred overlay projection until measurement tool runtime is split |
+| Renderer access to GPS/team | `map_viewport` does not read GPS/team; ESP GPS map page still has contained legacy marker paths | Shared map renderer remains forbidden from reading GPS/team; ESP marker legacy remains contained |
+
+## GPS Current Position Marker
+
+Current GPS overlay is now expressible as `MapOverlayKind::CurrentPosition` in
+`MapOverlaySnapshot`. `MapOverlayProjector::projectCurrentPosition(...)`
+validates coordinate range and appends an own-position item with stable id.
+
+The projector does not know about:
+
+- `platform::ui::gps::get_data()`
+- LVGL objects
+- map tiles
+- route/tracker stores
+
+## Team Member Marker
+
+Team member overlay is now expressible as `MapOverlayKind::TeamMember`.
+`MapOverlayProjector::projectTeamMember(...)` accepts already-read runtime facts:
+
+- node id
+- label
+- lat/lon
+- validity
+
+The Linux GPS page runtime wires a legacy team source that reads latest posring
+samples at the composition/runtime boundary, then projects them through
+`LegacyMapOverlaySource`.
+
+## Route / Tracker / Breadcrumb
+
+Route/tracker overlay is not rewritten in 7.12. It remains contained because the
+current ESP page has LVGL draw callbacks and platform-specific route/tracker
+state. The removal condition is:
+
+`IMapOverlayPresentationSource` or a route/tracker-specific presentation source
+can provide route and track items as `MapOverlaySnapshot` rows, and renderers
+consume those rows without reading route/tracker stores.
+
+## UI Tool Local State
+
+Measurement and selected-object state can become overlay items, but 7.12 does
+not move the measurement tool. Until that split, `MapWorkspaceSnapshot` remains
+the compatibility read DTO for active tool and measurement summary.
+
+## Burned Down
+
+- Overlay semantic DTO exists outside renderer code.
+- Current GPS overlay projection exists outside renderer code.
+- Team member overlay projection exists outside renderer code.
+- Shared map renderer is guarded against direct GPS/team store reads.
+
+## Still Contained
+
+- ESP route/tracker draw callbacks remain platform-specific contained legacy.
+- ESP GPS page marker widgets still draw existing marker objects.
+- Measurement overlay projection is deferred with an explicit exit condition.
diff --git a/docs/audits/MAP_PRESENTATION_BOUNDARY_AUDIT.md b/docs/audits/MAP_PRESENTATION_BOUNDARY_AUDIT.md
new file mode 100644
index 00000000..71bca713
--- /dev/null
+++ b/docs/audits/MAP_PRESENTATION_BOUNDARY_AUDIT.md
@@ -0,0 +1,174 @@
+# Map Presentation Boundary Audit
+
+## Purpose
+
+Phase 5.7 establishes a UI presentation boundary for map workspace state.
+
+Phase 5.7 is `MapWorkspaceModel minimal`, not a map engine rewrite.
+
+It does not rewrite tile loading, tile cache, route planning, POI, contour
+generation, Team marker rendering, or rich map rendering.
+
+The first goal is to separate portable workspace state from legacy runtime
+mechanics:
+
+- self location
+- viewport
+- layer state
+- center-on-self action
+- selected map tool
+- measuring mode state
+- basic Team overlay summary
+
+## Boundary Rule
+
+Renderer must not directly read:
+
+- `platform/ui/gps_runtime.h`
+- GPS drivers
+- tile cache
+- SD card map store
+- `TeamUiStore` raw state
+- platform map probes
+- contour tile generators
+- route/track storage
+
+Renderer should consume:
+
+- `MapWorkspaceModel::snapshot()`
+- `MapWorkspaceModel` actions
+- MapWorkspaceModel actions
+
+Legacy GPS/map/runtime reads are allowed only inside compatibility
+presentation-source adapters.
+
+## Migrated in Phase 5.7
+
+- `ui_presentation/map` now contains the portable map workspace snapshot,
+  source port, action sink port, and ViewModel.
+- `LegacyMapPresentationSource` and `LegacyMapActionSink` now bound legacy
+  GPS/map/team compatibility state behind read/write adapters.
+- The compact LVGL map runtime consumes `MapWorkspaceModel` for self-location
+  rendering and center-on-self action flow.
+- `UConsoleMapWorkspaceModel` now exposes a portable
+  `presentation_workspace` and consumes `LegacyGpsStatusSource` instead of
+  including `platform/ui/gps_runtime.h` directly in its map center path.
+- The ASCII/headless probe renders `MapWorkspaceSnapshot` without LVGL, GTK,
+  GPS runtime, tile cache, or raw Team store dependencies.
+
+## Current Consumers
+
+| Consumer | Current source | Target source | Phase owner |
+| --- | --- | --- | --- |
+| LVGL GPS/map page | `GPSPageState`, `platform/ui/gps_runtime.h`, `ui/widgets/map/map_tiles.h`, `TeamUiStore`, route/tracker overlays | `MapWorkspaceModel` for workspace state; legacy renderer/tile engine unchanged | 5.7-c partial |
+| Shared LVGL map viewport widget | `ui/widgets/map/map_viewport.*` reads app config, device runtime, and platform map tiles while owning LVGL tile/gesture runtime | renderer consumes `MapWorkspaceSnapshot`; widget remains tile renderer/runtime until later | Later renderer cleanup |
+| LVGL GPS title/status overlay | `gps_page_map.cpp` reads `gps_runtime`, device runtime, config, and map tile state | `MapWorkspaceSnapshot.self`, `layers`, and `status_line` | 5.7-c partial |
+| LVGL Team map overlay | `TeamUiStore`, `TeamUiSnapshot`, Team position ring, Team chat log location markers, contact service, LVGL marker objects | `MapWorkspaceSnapshot.team` summary only in 5.7; rich markers remain legacy | 5.7-c summary / later rich overlay |
+| LVGL tracker/route overlays | page-local route/tracker state and `route_storage` helpers | unchanged | Later |
+| GTK/uConsole map model | `UConsoleMapWorkspaceModel` reads `gps_runtime`, settings store, Linux tile cache, contour store/generator, contacts, map env vars | `MapWorkspaceModel` for portable workspace state; uConsole tile model remains legacy renderer adapter | 5.7-d partial |
+| GTK/uConsole map renderer | GTK logic/layout consume `UConsoleMapWorkspaceModel` snapshots with tile paths, contour tiles, node projections, cache stats | consume portable snapshot for status/actions; keep tile rendering path legacy | 5.7-d partial |
+| ASCII/headless map probe | `uconsole_map_workspace_smoke` directly exercises `UConsoleMapWorkspaceModel` | portable `MapWorkspaceSnapshot` smoke output | 5.7-e |
+| Tile renderer/cache | ESP/Linux `map_tiles`, Linux `MapTileCache`, SD/cache paths | unchanged | Later |
+| Contour generation | Linux `MapContourTileStore` / `MapContourTileGenerator`, Earthdata token settings | unchanged | Later |
+| Measurement tools | no portable model; pan/zoom/edit state is page/model local | `MapWorkspaceModel` tool state only | 5.7-a/c partial |
+
+## Current State Locations
+
+| State | Current owner | Notes |
+| --- | --- | --- |
+| self location | `platform/ui/gps_runtime.h`; uConsole env fallbacks; ESP GPS runtime | full GPS state belongs to GPS presentation, not Map; Map needs only overlay facts |
+| viewport center | LVGL `GPSPageState.lat/lng/pan_x/pan_y/follow_position`; uConsole `manual_center_*` and `zoom_` | 5.7 may let `MapWorkspaceModel` own presentation-local viewport |
+| zoom | LVGL `GPSPageState.zoom_level`; uConsole `zoom_` persisted in settings | portable model should expose zoom, not tile coordinates |
+| layer state | app config map source / contour; uConsole settings for contour ultra-fine and MQTT nodes | 5.7 layer state means UI-enabled state, not tile availability |
+| tile loading | `ui/widgets/map/map_tiles.*`, Linux `MapTileCache`, platform SD/cache paths | explicitly outside 5.7 |
+| offline map directory | map source directory helpers and SD card paths | explicitly outside 5.7 |
+| Team overlay | LVGL Team position ring/chat log markers; uConsole contact/node projections | 5.7 exposes summary only |
+| measurement/tool state | LVGL `GpsEditMode`; uConsole pan/zoom helpers; no portable measurement owner | 5.7 only freezes active tool / simple measurement state |
+| touch/keyboard/encoder input | LVGL event handlers and GTK logic | renderer/input layer sends actions to model, gesture engine unchanged |
+
+## Phase 5.7 Scope
+
+Phase 5.7 owns:
+
+- `ui_presentation/map` snapshot/source/sink/model
+- self location overlay in `MapWorkspaceSnapshot`
+- presentation-local viewport state
+- layer enabled state
+- center-on-self action boundary
+- selected tool state
+- measurement state placeholder
+- basic Team overlay summary
+- at least one LVGL/GTK/ASCII consumer of `MapWorkspaceModel`
+
+Phase 5.7 does not own:
+
+- tile image loading
+- tile cache layout or eviction
+- SD card map package scanning
+- offline map directory repair
+- route planning
+- POI database
+- contour tile generation
+- rich Team marker rendering
+- touch gesture engine
+- advanced measure/area/track tools
+
+## Legacy Island Notes
+
+### LVGL GPS/map page
+
+`GPSPageState` is a legacy page state object. It currently mixes:
+
+- LVGL widgets
+- GPS/self location
+- tile context and map anchors
+- pan/zoom/follow state
+- route/tracker overlays
+- Team member markers
+- Team signal markers
+- input/edit mode
+- timers and lifetime state
+
+It must not be treated as a portable snapshot source. Phase 5.7 should wrap the
+parts needed for workspace status/actions and leave tile rendering and rich
+overlays as legacy-owned.
+
+### uConsole map model
+
+`UConsoleMapWorkspaceModel` is a platform-specific application model, not the
+new portable `ui_presentation` model. It currently owns:
+
+- GPS runtime fallback logic
+- configured/manual center rules
+- tile id and path enumeration
+- tile cache stats
+- contour store/generator access
+- settings persistence
+- MQTT/contact node projection
+- click-to-coordinate math
+- pan and zoom commands
+
+Phase 5.7 can bridge from it, but must not copy its tile/cache-heavy snapshot
+shape into `ui_presentation/map`.
+
+## Explicit Non-goals
+
+- no tile engine rewrite
+- no map cache rewrite
+- no SD card scanning rewrite
+- no route planning
+- no rich Team marker payload
+- no advanced measurement tools
+- no GTK/LVGL renderer rewrite
+- no GPS runtime rewrite
+- no `UConsoleMapWorkspaceModel` deletion
+
+## Acceptance
+
+1. Current map/GPS/team/tile consumers are listed.
+2. Phase 5.7 scope is limited to workspace presentation state/actions.
+3. Tile/cache/renderer/route/rich overlay ownership remains explicitly
+   deferred.
+4. Legacy map/GPS reads are allowed only behind presentation-source adapters.
+5. Portable `ui_presentation/map` must not derive from LVGL `GPSPageState` or
+   uConsole tile/cache snapshots.
diff --git a/docs/audits/MAP_TILE_RENDER_QUEUE_CACHE_AUDIT.md b/docs/audits/MAP_TILE_RENDER_QUEUE_CACHE_AUDIT.md
new file mode 100644
index 00000000..5b1c575c
--- /dev/null
+++ b/docs/audits/MAP_TILE_RENDER_QUEUE_CACHE_AUDIT.md
@@ -0,0 +1,54 @@
+# Map Tile Render Queue / Decoded Cache Audit
+
+## Purpose
+
+Phase 7.11 establishes explicit ownership boundaries for map tile visible render planning and decoded tile cache lifetime.
+
+This phase builds on Phase 7.10 tile source/path ownership. It does not introduce map overlay, route/tracker ownership, online download, or a complete LRU rewrite.
+
+## Current Ownership Before 7.11
+
+| Question | Current answer before 7.11 | 7.11 owner / boundary |
+| --- | --- | --- |
+| Where are visible tiles calculated? | Platform `calculate_required_tiles(...)` writes directly into `std::vector<MapTile>` | `MapTileRenderQueue` is the explicit visible tile plan projection |
+| Where are tile widgets created/destroyed? | Platform LVGL map tile runtime | Still contained in platform renderer |
+| Where is ESP decoded image cache owned? | File-scope globals in ESP `map_tiles.cpp` | `LvglDecodedTileCache` object wrapping existing LVGL cache slots |
+| Where is tile loading cadence owned? | Platform `tile_loader_step(...)` timer path | Still contained in platform map tile runtime |
+| Does renderer decide tile filesystem paths? | No after 7.10 | Must remain behind `IMapTileSource` / `MapTileResolver` |
+| How are missing/loading/ready states represented? | Implicit fields on `MapTile` | `MapTileRenderState` in `MapTileRenderRef` |
+
+## Visible Tile Plan
+
+`MapTileRenderQueue` is a small fixed-capacity read model for the current viewport.
+
+It contains `MapTileRenderRef` rows:
+
+- tile identity via `MapTileRef`
+- screen rectangle via `MapTileScreenRect`
+- render state via `MapTileRenderState`
+
+It does not create LVGL objects, decode images, read files, or build tile paths.
+
+## Decoded Cache Boundary
+
+`IMapTileDecoderCache` is the portable cache port. It exposes only:
+
+- `clear()`
+- `hasDecoded(ref)`
+
+It intentionally does not expose `lv_image_dsc_t*`.
+
+`LvglDecodedTileCache` is the ESP LVGL-specific adapter. It wraps the existing decoded tile slots and keeps LVGL types inside the platform map tile runtime.
+
+## Still Contained
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| LVGL tile widget records | Phase 7.11 does not rewrite widget lifecycle | Dedicated `MapTileRenderer` owns widget records and consumes only `MapTileRenderQueue` |
+| Platform tile loader cadence | Timer behavior is still coupled to platform renderer | Map runtime owns loader cadence and render queue updates |
+| Linux downloader/cache | This phase does not rewrite Linux runtime downloader | Linux cache is adapted behind source/cache ports |
+| Route/tracker overlays | Explicit non-goal | Later map overlay phase defines overlay runtime ownership |
+
+## Decision
+
+Phase 7.11 makes the tile render plan and decoded cache owner explicit without changing map projection math or adding overlay features.
diff --git a/docs/audits/MAP_TILE_SOURCE_CACHE_OWNERSHIP_AUDIT.md b/docs/audits/MAP_TILE_SOURCE_CACHE_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..c165edd3
--- /dev/null
+++ b/docs/audits/MAP_TILE_SOURCE_CACHE_OWNERSHIP_AUDIT.md
@@ -0,0 +1,66 @@
+# Map Tile Source / Cache Ownership Audit
+
+## Purpose
+
+Phase 7.10 establishes ownership for map tile source, path resolution, and tile availability lookup.
+
+The first burn-down slice moves Trail Mate offline tile directory mapping behind map tile source / resolver objects. It does not rewrite LVGL tile drawing or decoded image cache behavior.
+
+## Current Event / Data Sources
+
+| Question | Current answer before 7.10 | 7.10 owner |
+| --- | --- | --- |
+| Where is base tile path built? | `platform/*/ui/widgets/map/map_tiles.cpp` | `MapTileResolver` / `LegacyFilesystemMapTileSource` |
+| Where is contour tile path built? | `platform/*/ui/widgets/map/map_tiles.cpp` | `MapTileResolver` / `LegacyFilesystemMapTileSource` |
+| Who checks base tile availability? | Platform map tile runtime | `IMapTileSource::lookup(...)` |
+| Who checks layer directories? | Platform map tile runtime | `LegacyFilesystemMapTileSource` |
+| Who draws tile widgets? | LVGL map tile runtime | Still LVGL map tile runtime |
+| Who owns decoded LVGL image cache? | ESP `map_tiles.cpp` global decode cache | Still contained legacy |
+| Who owns Linux downloaded tile cache? | `platform::linux_runtime::MapTileCache` | Still contained legacy |
+| Does `MapWorkspaceSnapshot` carry bitmap/cache objects? | No | Must remain no |
+
+## Trail Mate Offline Directory Mapping
+
+| Layer | Path |
+| --- | --- |
+| OSM | `/maps/base/osm/{z}/{x}/{y}.png` |
+| Terrain | `/maps/base/terrain/{z}/{x}/{y}.png` |
+| Satellite | `/maps/base/satellite/{z}/{x}/{y}.jpg` |
+| Contour major 500 | `/maps/contour/major-500/{z}/{x}/{y}.png` |
+| Contour major 200 | `/maps/contour/major-200/{z}/{x}/{y}.png` |
+| Contour major 100 | `/maps/contour/major-100/{z}/{x}/{y}.png` |
+| Contour major 50 | `/maps/contour/major-50/{z}/{x}/{y}.png` |
+| Contour major 25 | `/maps/contour/major-25/{z}/{x}/{y}.png` |
+
+## Boundary
+
+`MapTileRef` identifies a tile by layer, zoom, x, and y. It does not contain a filesystem path.
+
+`MapTileResolver` owns Trail Mate tile path mapping.
+
+`LegacyFilesystemMapTileSource` owns filesystem-backed lookup and optional reads through `IMapTileFileSystem`.
+
+Platform LVGL tile runtimes may continue to:
+
+- calculate visible tiles
+- create LVGL image objects
+- draw placeholder cards
+- run loader ticks
+- keep current decoded image cache until a later cache hardening phase
+
+Platform LVGL tile runtimes must not own Trail Mate directory mapping directly.
+
+## Current Remaining Legacy
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| ESP decoded LVGL tile cache | Phase 7.10 first slice does not rewrite decoded image lifetime | Introduce a formal decoded tile cache owner or renderer-owned image lifecycle spec |
+| Linux `MapTileCache` downloader | It is a Linux runtime cache/downloader, not just a filesystem source | Adapt it behind a stable `IMapTileSource` or rename as runtime tile cache adapter |
+| LVGL tile object records | Renderer still owns widget records and loading cadence | Future map renderer/runtime split defines a tile render queue |
+| uConsole workspace tile path fields | Linux workspace smoke still exposes paths for GTK map view | Future uConsole adapter consumes `MapTileRef` plus source lookup |
+
+## Decision
+
+Phase 7.10 moves tile path and availability ownership out of renderer-local path construction and into map tile resolver/source adapters.
+
+It does not move bitmap data into `MapWorkspaceSnapshot`, and it does not introduce online download behavior.
diff --git a/docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md b/docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..aa1b38a4
--- /dev/null
+++ b/docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md
@@ -0,0 +1,98 @@
+# Map UI Legacy Ownership Audit
+
+## Current Role
+
+Map UI is still a legacy island.
+
+Phase 5.7 introduced a portable presentation boundary, but existing map
+renderers and platform models still own substantial runtime behavior.
+
+## Migrated in Phase 5.7
+
+The following surfaces now have a `MapWorkspaceModel` boundary:
+
+- `ui_presentation/map` defines `MapWorkspaceSnapshot`,
+  `IMapPresentationSource`, `IMapActionSink`, and `MapWorkspaceModel`.
+- `LegacyMapPresentationSource` projects GPS self-location, layer state,
+  measurement placeholder state, and Team overlay summary.
+- `LegacyMapActionSink` handles center-on-self, viewport, layer, active tool,
+  and clear-measurement actions.
+- The compact LVGL map runtime consumes `MapWorkspaceModel::snapshot()` for
+  self-location focus and routes center-on-self through
+  `MapWorkspaceModel::centerOnSelf()`.
+- `UConsoleMapWorkspaceModel` exposes a portable
+  `presentation_workspace` snapshot while preserving its legacy tile/cache
+  snapshot.
+- `UConsoleMapWorkspaceModel` no longer includes `platform/ui/gps_runtime.h`
+  directly for its map center fix path; it consumes `LegacyGpsStatusSource`.
+- `trailmate_map_workspace_ascii_probe` renders a headless
+  `MapWorkspaceSnapshot` without LVGL, GTK, GPS runtime, tile cache, or Team
+  raw store dependencies.
+
+## Remaining Legacy Ownership
+
+The following remain legacy-owned:
+
+- ESP/LVGL `GPSPageState` still owns LVGL widgets, tile context, map anchors,
+  pan/zoom/follow state, route/tracker overlays, Team marker widgets, timers,
+  and input/edit mode.
+- The shared LVGL `ui/widgets/map/map_viewport.*` runtime still owns tile
+  rendering, tile loader timers, gesture runtime, map source config reads, and
+  tile availability checks.
+- ESP/Linux map tile loaders still own tile image loading, SD/cache paths,
+  contour tile rendering, and missing tile notices.
+- GTK/uConsole still owns tile path enumeration, cache stats, contour store and
+  generator access, MQTT/contact node projection, click-to-coordinate math,
+  and pan/zoom persistence.
+- Rich Team map markers remain legacy-owned through Team position ring and
+  Team chat location marker paths.
+- Route/tracker overlays remain legacy-owned.
+- Advanced measurement tools remain legacy-owned or unimplemented.
+- Offline map package scanning and repair remain legacy-owned.
+- Tile download retry state remains legacy-owned.
+
+## Constraint
+
+New map workspace status and actions should prefer `MapWorkspaceModel`.
+
+New direct renderer reads of GPS runtime, tile cache, SD map store, raw Team
+store, or platform map probes must either be moved behind a presentation source
+or explicitly documented as legacy ownership.
+
+## Renderer Hardening in Phase 5.9
+
+Phase 5.9 locks the migrated Map paths without rewriting the tile renderer.
+
+Regression guard:
+
+- compact LVGL map status must continue using
+  `map_workspace_model().snapshot()`
+- compact LVGL center-on-self must continue using
+  `map_workspace_model().centerOnSelf()`
+- uConsole map status/center summary must continue exposing
+  `presentation_workspace`
+- uConsole map center fix path must not reintroduce a direct
+  `platform/ui/gps_runtime.h` include
+
+Allowed legacy ownership remains:
+
+- LVGL `GPSPageState`
+- `ui/widgets/map/map_viewport`
+- tile/cache/contour loading and rendering
+- route/tracker overlays
+- rich Team map markers
+- uConsole tile/cache/contour platform model
+
+## Non-goal
+
+Phase 5.7 does not remove:
+
+- `GPSPageState`
+- `ui/widgets/map/map_viewport`
+- `UConsoleMapWorkspaceModel`
+- tile cache/runtime objects
+- route/tracker overlay code
+- Team rich marker code
+
+Those require later slices with separate rendering, tile engine, and overlay
+presentation decisions.
diff --git a/docs/audits/PHASE10_FINAL_PRIMARY_PATH_REPORT.md b/docs/audits/PHASE10_FINAL_PRIMARY_PATH_REPORT.md
new file mode 100644
index 00000000..6c19dfe7
--- /dev/null
+++ b/docs/audits/PHASE10_FINAL_PRIMARY_PATH_REPORT.md
@@ -0,0 +1,46 @@
+# Phase 10 Final Primary Path Report
+
+## Primary Path Status
+
+| Runtime | Primary path | Source enum | Status |
+| --- | --- | --- | --- |
+| LinuxSim | `LinuxSimRuntimeEntry -> LinuxSimRuntimeEntryAdoptionProbe -> AsciiRuntimeEntryAdoption` | `LinuxSimRuntimeSource::ScreenGraphAdoption` | primary screen graph adoption |
+| GTK | `LinuxUConsoleGtkPageRegistryAdoption -> GtkRuntimeEntryAdoption` | `LinuxUConsoleGtkPageRegistrySource::ScreenGraphAdoption` | primary page registry descriptors |
+| LVGL | `LvglPrimaryScreenGraphRuntime -> LvglRuntimeEntryAdoption` | `LvglScreenGraphRuntimeSource::ScreenGraphAdoption` | primary descriptor runtime |
+
+## Fallback Status
+
+| Runtime | Fallback source | Status |
+| --- | --- | --- |
+| LinuxSim | `LinuxSimRuntimeSource::HardcodedFallback` | fallback-only |
+| GTK | `LinuxUConsoleGtkPageRegistrySource::HardcodedFallback` | fallback-only |
+| LVGL | `LvglScreenGraphRuntimeSource::HardcodedFallback` | fallback-only descriptor fallback |
+
+Fallback remains testable through `fallbackUsed()` and source enum checks.
+
+## Not Done
+
+Phase 10 intentionally does not complete these migrations:
+
+- real GTK widget rewrite
+- real LVGL widget/menu rewrite
+- fallback deletion
+- full navigation stack replacement
+- complete screen/page migration
+
+## Guardrail
+
+Runtime primary paths must not call `findUxPackById`, `UxPackRegistry`, or
+`buildMenuForUxPack`. UX selection and `PresentationBundle` construction stay
+in app-shell/probe/composition code. Runtime primary paths consume the
+descriptor graph only.
+
+LVGL primary descriptor runtime must not include `lvgl.h`, create `lv_obj_t`,
+or branch on `BOARD_`.
+
+## Phase 11 Recommendation
+
+Phase 11 should be Real Renderer Descriptor Consumption. The first target
+should stay on LinuxSim / ASCII because it proves renderer behavior with the
+lowest device and widget-lifecycle risk. GTK and LVGL should follow only after
+the ASCII renderer consumes descriptors as its concrete route source.
diff --git a/docs/audits/PHASE10_PRIMARY_PATH_MIGRATION_REPORT.md b/docs/audits/PHASE10_PRIMARY_PATH_MIGRATION_REPORT.md
new file mode 100644
index 00000000..acb36646
--- /dev/null
+++ b/docs/audits/PHASE10_PRIMARY_PATH_MIGRATION_REPORT.md
@@ -0,0 +1,122 @@
+# Phase 10 Primary Path Migration Report
+
+## Scope
+
+Phase 10 changes the default path. It does not delete fallback, rewrite GTK
+widgets, rewrite LVGL menu/page renderers, add UX packs, or let runtime entries
+choose UX packs.
+
+The migration rule is:
+
+adoption descriptor path is primary; hardcoded path is fallback-only
+
+## LinuxSim Primary Path
+
+Previous status:
+
+- LinuxSim hardcoded runtime routing was a contained fallback.
+- `LinuxSimRuntimeEntry` consumed `LinuxSimRuntimeEntryAdoptionProbe`, but the
+  primary/fallback source was not explicit.
+
+Current primary path:
+
+`LinuxSimRuntimeEntry -> LinuxSimRuntimeEntryAdoptionProbe -> AsciiRuntimeEntryAdoption -> AsciiRuntimeScreenGraphPresenter`
+
+Current status:
+
+- `LinuxSimRuntimeSource::ScreenGraphAdoption` is the default source when
+  adoption loads.
+- `LinuxSimRuntimeSource::HardcodedFallback` is used only when adoption fails.
+- `usingPrimaryScreenGraph()` and `fallbackUsed()` expose the active path.
+
+Fallback status:
+
+fallback-only after Phase 10.1
+
+Deletion condition:
+
+simulator renderer no longer needs hardcoded routing.
+
+## GTK Primary Path
+
+Previous status:
+
+- GTK hardcoded page registry was a contained fallback.
+- `LinuxUConsoleGtkPageRegistryAdoption` exposed descriptors, but the
+  primary/fallback source was not explicit.
+
+Current primary path:
+
+`LinuxUConsoleGtkPageRegistryAdoption -> GtkRuntimeEntryAdoption -> GtkUConsoleScreenGraphPresenter`
+
+Current status:
+
+- `LinuxUConsoleGtkPageRegistrySource::ScreenGraphAdoption` is the default
+  source when adoption loads.
+- `LinuxUConsoleGtkPageRegistrySource::HardcodedFallback` is used only when
+  adoption fails.
+- `usingPrimaryScreenGraph()` and `fallbackUsed()` expose the active path.
+
+Fallback status:
+
+fallback-only after Phase 10.2
+
+Deletion condition:
+
+GTK page registry consumes descriptors as its only page source.
+
+## LVGL Primary Descriptor Path
+
+Previous status:
+
+- LVGL hardcoded menu/page creation was a contained fallback.
+- `LvglRuntimeAdoptionProbe` proved compatibility runtime descriptor
+  consumption, but the descriptor runtime was not the explicit primary source.
+
+Current primary descriptor path:
+
+`LvglPrimaryScreenGraphRuntime -> LvglRuntimeEntryAdoption -> LvglRuntimeScreenGraphPresenter`
+
+Current status:
+
+- `LvglScreenGraphRuntimeSource::ScreenGraphAdoption` is the default source
+  when adoption loads.
+- `LvglScreenGraphRuntimeSource::HardcodedFallback` is used only when adoption
+  fails.
+- `usingPrimaryScreenGraph()` and `fallbackUsed()` expose the active path.
+
+Fallback status:
+
+fallback-only after Phase 10.3
+
+Real widget migration:
+
+deferred
+
+Deletion condition:
+
+LVGL renderers consume descriptor runtime before creating menu/page objects.
+
+## Not Done
+
+- real GTK widget hierarchy rewrite
+- real LVGL widget/menu rewrite
+- fallback deletion
+- full navigation stack replacement
+- all screen/page migration
+
+## Checker Status
+
+`tools/architecture/check_phase10_primary_path_ready.py` verifies that the
+three primary paths expose source enums, primary/fallback probes, reports, and
+forbidden-token guardrails.
+
+## Phase 11 Recommendation
+
+Phase 11 should target real renderer descriptor consumption:
+
+- first consume ASCII descriptors as renderer input without hardcoded route
+  lookup
+- then let GTK page registry consume descriptors as the concrete page list
+- then migrate LVGL device renderers from descriptor-primary runtime into real
+  widget/menu construction
diff --git a/docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md b/docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md
new file mode 100644
index 00000000..b58f13a2
--- /dev/null
+++ b/docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md
@@ -0,0 +1,144 @@
+# Phase 11 Renderer Descriptor Consumption Report
+
+## Scope
+
+Phase 11 moves primary descriptors into renderer-facing consumption surfaces.
+It does not delete fallback, rewrite GTK widgets, rewrite LVGL menu/page
+renderers, implement a full navigation stack, add UX packs, or let renderers
+choose UX packs.
+
+The Phase 11 distinction is:
+
+- Phase 10 made descriptor/adoption paths primary.
+- Phase 11 makes renderer-facing surfaces consume those primary descriptors.
+
+## LinuxSim
+
+renderer descriptor path:
+
+`LinuxSimRuntimeEntry -> LinuxSimRuntimeRenderer -> AsciiDescriptorRenderer -> AsciiRuntimeEntryAdoption`
+
+descriptor source:
+
+`AsciiRuntimeEntryAdoption -> AsciiRuntimeScreenGraphPresenter -> AsciiMenuLine / AsciiScreenDescriptor`
+
+Status:
+
+- `AsciiDescriptorRenderer` consumes `AsciiRuntimeEntryAdoption` descriptors.
+- `LinuxSimRuntimeRenderer` consumes `LinuxSimRuntimeEntry`.
+- When `LinuxSimRuntimeEntry::usingPrimaryScreenGraph()` is true, the renderer
+  renders from `entry.adoption()`.
+
+Fallback path:
+
+- `LinuxSimRuntimeRenderer::renderFallback(...)` is reached only when
+  `entry.fallbackUsed()` is true.
+- fallback remains available but is not the default renderer data source.
+
+fallback status:
+
+fallback-only
+
+Not done:
+
+- hardcoded ASCII renderer deletion
+- full navigation stack replacement
+
+## GTK
+
+Page registry descriptor path:
+
+`LinuxUConsoleGtkPageRegistryAdoption -> LinuxUConsoleGtkPageRegistryRenderer -> GtkDescriptorPageRegistry -> GtkRuntimeEntryAdoption`
+
+descriptor source:
+
+`GtkRuntimeEntryAdoption -> GtkUConsoleScreenGraphPresenter -> GtkMenuDescriptor / GtkScreenDescriptor`
+
+Status:
+
+- `GtkDescriptorPageRegistry` consumes `GtkRuntimeEntryAdoption` descriptors
+  and produces `GtkDescriptorPage` rows.
+- `LinuxUConsoleGtkPageRegistryRenderer` consumes
+  `LinuxUConsoleGtkPageRegistryAdoption`.
+- When `LinuxUConsoleGtkPageRegistryAdoption::usingPrimaryScreenGraph()` is
+  true, the renderer consumes descriptor pages.
+
+Fallback path:
+
+- `LinuxUConsoleGtkPageRegistryRenderer::renderFallback(...)` is reached only
+  when `adoption.fallbackUsed()` is true.
+- hardcoded GTK page registry remains fallback-only.
+
+fallback status:
+
+fallback-only
+
+Not done:
+
+- GTK widget tree rewrite
+- full page switching replacement
+
+## LVGL
+
+Descriptor renderer path:
+
+`LvglPrimaryScreenGraphRuntime -> LvglDescriptorRendererProbe -> LvglDescriptorMenuModel -> LvglRuntimeEntryAdoption`
+
+descriptor source:
+
+`LvglPrimaryScreenGraphRuntime -> LvglRuntimeEntryAdoption -> LvglRuntimeScreenGraphPresenter -> LvglMenuEntry / LvglScreenHostEntry`
+
+Status:
+
+- `LvglDescriptorMenuModel` consumes `LvglPrimaryScreenGraphRuntime`.
+- `LvglDescriptorRendererProbe` consumes `LvglPrimaryScreenGraphRuntime` and
+  exposes renderer-safe `LvglDescriptorMenuItem` rows.
+- The path does not include `lvgl.h`, does not create `lv_obj_t`, and does not
+  branch on `BOARD_`.
+
+Fallback path:
+
+- `LvglDescriptorRendererProbe::loadFallback(...)` is reached only when
+  `runtime.fallbackUsed()` is true.
+- hardcoded LVGL menu/page creation remains fallback-only.
+
+fallback status:
+
+fallback-only
+
+Not done:
+
+- real LVGL widget/menu rewrite
+- device-specific renderer migration
+- fallback deletion
+
+## Guardrails
+
+Renderer consumption paths must not call:
+
+- `UxPackRegistry`
+- `findUxPackById`
+- `buildMenuForUxPack`
+
+Renderer consumption paths must not create:
+
+- `GtkWidget`
+- `lv_obj_t`
+
+Renderer consumption paths must not construct `MenuModel` or select UX packs.
+UX selection and `PresentationBundle` construction remain upstream.
+
+## Explicit Non-goals
+
+Phase 11 does not rewrite real GTK widgets.
+Phase 11 does not create LVGL widgets.
+Phase 11 does not delete fallback.
+
+## Phase 12 Recommendation
+
+Phase 12 should focus on fallback deletion readiness and architecture freeze:
+
+- list which fallback branches are now provably unused by default
+- decide which alias/fallback surfaces can be deleted safely
+- freeze the directory and checker rules that prevent app shell, renderer, and
+  legacy implementation concerns from drifting back together
diff --git a/docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md b/docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md
new file mode 100644
index 00000000..b8a79b9e
--- /dev/null
+++ b/docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md
@@ -0,0 +1,31 @@
+# Phase 12 Deprecated Alias Cleanup Plan
+
+## Purpose
+
+Phase 9 burned selected `Legacy*` surfaces down to deprecated aliases. Phase 12
+does not remove those aliases immediately; it defines the deletion window.
+
+## Alias Ledger
+
+| Alias | Alias header path | Replacement header | Remaining includes | Delete now? | Deletion condition |
+| --- | --- | --- | --- | --- | --- |
+| `LegacyChatDeliveryActionBridge` | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h` and `modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h` | `ui_chat_runtime/chat_delivery_action_port_adapter.h` | compatibility alias tests; docs references | No | no downstream includes of either alias header remain |
+| `LegacyChatDeliveryEventBridge` | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h` and `modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h` | `ui_chat_runtime/chat_delivery_event_projection_adapter.h` | compatibility alias tests; docs references | No | no downstream includes of either alias header remain |
+| `LegacyKeyVerificationSource` | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h` and `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h` | `ui_key_verification_runtime/key_verification_presentation_source.h` | compatibility alias tests; docs references | No | no downstream includes of either alias header remain |
+| `LegacyKeyVerificationActionSink` | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h` and `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h` | `ui_key_verification_runtime/key_verification_action_sink.h` | compatibility alias tests; docs references | No | no downstream includes of either alias header remain |
+| `LegacyKeyVerificationSession` | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h` and `modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h` | `ui_key_verification_runtime/key_verification_session_adapter.h` | compatibility alias tests; docs references | No | no downstream includes of either alias header remain |
+| `LegacyMapOverlaySource` | `modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h` and `modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h` | `ui_map_runtime/map_overlay_snapshot_source.h` | compatibility alias tests; docs references | No | no downstream includes of either alias header remain and map renderers consume stable snapshots only |
+
+## Rules
+
+- Main code must not include deprecated alias headers.
+- Compatibility tests may include deprecated alias headers.
+- Docs may mention historical alias names.
+- Alias headers must remain forwarding-only while they exist.
+- New `Legacy*` bridge names are forbidden for new runtime work.
+
+## Cleanup Window
+
+Alias deletion is safe only after a repo-wide and downstream include search
+shows no remaining production include paths. Until then, the aliases remain
+compatibility shims with checker coverage.
diff --git a/docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md b/docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md
new file mode 100644
index 00000000..be3aede6
--- /dev/null
+++ b/docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md
@@ -0,0 +1,37 @@
+# Phase 12 Fallback Deletion Readiness
+
+## Purpose
+
+Phase 12 does not delete fallback by default. It records which fallback
+surfaces are now fallback-only, which alias surfaces are compatibility-only,
+and what must be true before deletion.
+
+## Readiness Ledger
+
+| Surface | Current status | Primary path replacement | Safe to delete now? | Why / why not | Deletion condition | Owner | Checker status |
+| --- | --- | --- | --- | --- | --- | --- | --- |
+| LinuxSim hardcoded runtime routing | fallback-only | `LinuxSimRuntimeRenderer -> AsciiDescriptorRenderer -> AsciiRuntimeEntryAdoption` | No | fallback smoke still proves failed-adoption behavior and the real simulator renderer has not removed every hardcoded route dependency | fallback smoke no longer needed and real simulator entry has no direct hardcoded route dependency | `apps/linux_sim_shell` | `check_phase10_primary_path_ready.py`, `check_phase11_renderer_consumption_ready.py` |
+| GTK hardcoded page registry | fallback-only | `LinuxUConsoleGtkPageRegistryRenderer -> GtkDescriptorPageRegistry -> GtkRuntimeEntryAdoption` | No | real GTK widget/page creation still needs a compatibility page registry path | real `GtkWidget` page creation consumes `GtkDescriptorPage` as the primary page source | `apps/linux_uconsole_gtk` | `check_phase10_primary_path_ready.py`, `check_phase11_renderer_consumption_ready.py` |
+| LVGL hardcoded menu/page creation | fallback-only descriptor fallback | `LvglDescriptorRendererProbe -> LvglDescriptorMenuModel -> LvglPrimaryScreenGraphRuntime` | No | real LVGL menu/page renderers have not consumed `LvglDescriptorMenuModel` on a concrete target | one real LVGL target consumes `LvglDescriptorMenuModel` before menu/page object creation | `modules/ui_lvgl_ux_packs` | `check_phase10_primary_path_ready.py`, `check_phase11_renderer_consumption_ready.py` |
+| Chat legacy alias headers | deprecated alias only | `ChatDeliveryActionPortAdapter`, `ChatDeliveryEventProjectionAdapter` | No | compatibility alias tests and possible downstream includes still define the deletion window | no downstream includes of `LegacyChatDeliveryActionBridge` or `LegacyChatDeliveryEventBridge` remain | `modules/ui_chat_runtime` | `check_phase9_legacy_burndown_ready.py` |
+| KeyVerification legacy alias headers | deprecated alias only | `KeyVerificationPresentationSource`, `KeyVerificationActionSink`, `KeyVerificationSessionAdapter` | No | compatibility alias tests and possible downstream includes still define the deletion window | no downstream includes of `LegacyKeyVerificationSource`, `LegacyKeyVerificationActionSink`, or `LegacyKeyVerificationSession` remain | `modules/ui_key_verification_runtime` | `check_phase9_legacy_burndown_ready.py` |
+| MapOverlay legacy alias header | deprecated alias only | `MapOverlaySnapshotSource`, `MapOverlayProjectionAdapter` | No | compatibility alias tests and possible downstream includes still define the deletion window | no downstream includes of `LegacyMapOverlaySource` remain and map renderers consume stable snapshots only | `modules/ui_map_runtime` | `check_phase9_legacy_burndown_ready.py` |
+| `ui_shared` forwarding shims | deprecated forwarding shims only | stable runtime module headers | No | they protect old include paths while downstream references burn down | no production or downstream include path uses `ui/presentation_sources/legacy_*` | `modules/ui_shared` | `check_phase9_legacy_burndown_ready.py` |
+| `legacy/app_implementations` roots | historical implementation roots only | final app shells plus stable modules | No | roots still provide transitional build/runtime compatibility | final app shells and stable modules own all runtime behavior and builds no longer need historical roots | `legacy/app_implementations` | `check_phase8_layout_ready.py`, `check_post_refactor_final_ready.py` |
+
+## Deletion Rule
+
+Fallback deletion must be a targeted debt task, not a new architecture phase.
+Every deletion needs:
+
+- primary path evidence
+- fallback smoke update or removal
+- downstream include search
+- checker update
+- concrete owner
+
+## Current Decision
+
+No fallback or deprecated alias is deleted in Phase 12. Phase 12 records
+deletion readiness and freezes the guardrails that prevent fallback from
+becoming a primary path again.
diff --git a/docs/audits/PHASE5_FINAL_READINESS_REPORT.md b/docs/audits/PHASE5_FINAL_READINESS_REPORT.md
new file mode 100644
index 00000000..8da962b2
--- /dev/null
+++ b/docs/audits/PHASE5_FINAL_READINESS_REPORT.md
@@ -0,0 +1,133 @@
+# Phase 5 Final Readiness Report
+
+## Decision
+
+Phase 5 is ready to close.
+
+The project has established a sustainable UI Presentation boundary that Phase 6
+can build on.
+
+This decision does not mean the UI is fully clean. It means the remaining
+legacy areas are bounded, documented, and guarded against uncontrolled
+expansion.
+
+## What Phase 5 Established
+
+Phase 5 established the UI presentation boundary:
+
+```text
+App Service
+  -> Presentation Source/Sink
+    -> Presentation Model
+      -> Renderer / Shell
+```
+
+Renderers should consume snapshots and send actions.
+
+Presentation models should own UI-local state and action forwarding, not
+business runtime state.
+
+Legacy adapters should isolate compatibility reads/writes.
+
+## Completed Boundaries
+
+Phase 5 established:
+
+- `DeviceStatusModel`
+- `GpsStatusModel`
+- `MeshStatusModel`
+- `SettingsModel`
+- `ChatWorkspaceModel`
+- Team `ChatWorkspaceModel`
+- `MapWorkspaceModel`
+- `PresentationWorkspace`
+
+It also established:
+
+- chat presentation identity and mappers
+- Team chat bounded presentation context
+- map workspace minimal boundary
+- workspace composition/probe boundary
+- renderer hardening and migrated path locks
+- legacy renderer baseline
+
+## Renderer Hardening
+
+Phase 5.9 introduced renderer hardening:
+
+- strict rules for `ui_presentation`
+- strict rules for ASCII/headless probes
+- migrated path locks for Chat, Team Chat, and Map
+- LVGL dashboard GPS status snapshot rendering
+- uConsole presentation bridge locks
+- baseline for legacy renderer islands
+
+## Remaining Legacy Islands
+
+See:
+
+- `PHASE5_LEGACY_ISLAND_REGISTER.md`
+- `PHASE5_RENDERER_HARDENING_SUMMARY.md`
+- `KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md`
+
+Major remaining legacy islands:
+
+- `ChatUiController`
+- `GPSPageState`
+- `ui/widgets/map/map_viewport`
+- uConsole tile/cache/contour model
+- Team location/command picker
+- key verification modal
+- route/tracker overlays
+- structured pending/failure ownership
+
+## Phase 5 Exit Criteria
+
+| Criterion | Status |
+| --- | --- |
+| Portable presentation models exist | pass |
+| Source/Sink boundaries exist | pass |
+| Chat/Team/Map have bounded adapters | pass |
+| Workspace composition exists | pass |
+| ASCII/headless probes exist | pass |
+| Renderer hardening exists | pass |
+| Legacy islands documented | pass |
+| Legacy renderer baseline exists | pass |
+| Final checker exists | pass |
+
+## Non-goals
+
+Phase 5 did not fully clean:
+
+- `ChatUiController`
+- `GPSPageState`
+- `map_viewport` tile renderer
+- uConsole tile/cache/contour model
+- Team rich payload UI
+- structured pending/failure
+- route planning
+- settings full migration
+
+These are future bounded cleanup phases.
+
+## Fitness Functions
+
+Phase 5 readiness is guarded by:
+
+```text
+python tools/architecture/check_phase5_ready.py
+python tools/architecture/check_phase5_workspace_ready.py
+python tools/architecture/check_phase5_renderer_ready.py
+python tools/architecture/check_phase5_final_ready.py
+```
+
+## Phase 6 Readiness
+
+Phase 6 may start because UI presentation boundaries are now explicit.
+
+Phase 6 must not bypass Phase 5 boundaries. New UI work should use
+presentation models, source/sink adapters, and renderer snapshot/action paths.
+
+If Phase 6 needs to touch a legacy island, it should either preserve the current
+bounded legacy contract or migrate that island behind a stricter presentation
+boundary.
diff --git a/docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md b/docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md
new file mode 100644
index 00000000..d76d6357
--- /dev/null
+++ b/docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md
@@ -0,0 +1,224 @@
+# Phase 5 Legacy Island Register
+
+## Purpose
+
+Phase 5 establishes presentation boundaries.
+
+This register records UI legacy islands that remain after Phase 5.
+
+These are not Phase 5 blockers because each is bounded, documented, and
+protected from further uncontrolled expansion by audits, baselines, and
+architecture checkers.
+
+## Legacy Islands
+
+### ChatUiController
+
+Status: bounded legacy application controller.
+
+Remaining ownership:
+
+- LVGL state machine
+- `ChatService` `processIncoming` / `flushStore`
+- event bus handling
+- key verification modal
+- conversation cache
+- contact fallback/title logic
+- some Team compatibility flows
+
+Boundary established:
+
+- generic chat uses `ChatWorkspaceModel`
+- non-team send/read/selection paths are guarded by renderer hardening checks
+- Team text uses `TeamChatPresentationSource` / `TeamChatActionSink`
+
+Future cleanup:
+
+- `ChatApplicationController` split
+- `ChatRenderer` split
+- `KeyVerificationPresentation`
+- structured pending/failure projection
+
+### GPSPageState
+
+Status: bounded legacy LVGL GPS/map page state.
+
+Remaining ownership:
+
+- some `gps_runtime` compatibility access
+- page-local map state
+- legacy display refresh
+- LVGL widgets and timers
+- map anchors and follow state
+
+Boundary established:
+
+- `GpsStatusModel`
+- `MapWorkspaceModel`
+- `LegacyMapPresentationSource`
+- `LegacyMapActionSink`
+- renderer hardening locks the migrated `map_workspace_model()` path
+
+Future cleanup:
+
+- GPS renderer split
+- map page state split
+- richer GNSS skyplot presentation source
+
+### LVGL Dashboard GPS Widget
+
+Status: partially hardened renderer.
+
+Remaining ownership:
+
+- per-satellite radar still reads legacy GNSS satellite snapshot
+
+Boundary established:
+
+- fix chip, fix label, and satellite count summary consume `GpsStatusModel`
+
+Future cleanup:
+
+- move per-satellite radar behind a GNSS skyplot presentation model
+
+### Map Viewport / Tile Runtime
+
+Status: bounded legacy renderer/runtime.
+
+Remaining ownership:
+
+- tile loading
+- tile cache
+- SD card tile lookup
+- route/tracker overlay
+- rich Team markers
+- contour rendering
+- gesture runtime and tile loader timers
+
+Boundary established:
+
+- `MapWorkspaceModel` handles workspace-level state only
+- `MapWorkspaceSnapshot` intentionally does not contain tile/cache payloads
+
+Future cleanup:
+
+- `MapRenderEngine` boundary
+- `TileSource` abstraction
+- `OverlayPresentationSource`
+
+### uConsole Map/Tile Model
+
+Status: platform-specific legacy model.
+
+Remaining ownership:
+
+- tile/cache/contour enumeration
+- platform-specific filesystem behavior
+- pan/zoom persistence
+- MQTT/contact node projection for map overlays
+
+Boundary established:
+
+- `presentation_workspace` bridge
+- `MapWorkspaceModel` status path
+- direct `platform/ui/gps_runtime.h` is not reintroduced into the uConsole map
+  center/status path
+
+Future cleanup:
+
+- `UConsoleMapRenderer` split
+- `TileCacheAdapter`
+- `ContourPresentationSource`
+
+### uConsole Chat/Dashboard/Overview Models
+
+Status: platform-specific legacy application models.
+
+Remaining ownership:
+
+- `ChatService` / `ContactService` compatibility reads
+- GPS compatibility reads in GTK overview/dashboard paths
+- platform probe and cache details
+
+Boundary established:
+
+- uConsole can hold `PresentationWorkspace`
+- uConsole chat/map presentation bridges are guarded by checker locks
+
+Future cleanup:
+
+- uConsole app model split
+- overview/dashboard presentation models
+- GTK renderer strictness expansion
+
+### Team Location/Command Picker
+
+Status: bounded Team legacy interaction.
+
+Remaining ownership:
+
+- location picker UI
+- location marker send path
+- command send UI
+- rich payload rendering
+
+Boundary established:
+
+- Team text projection/send via Team source/sink
+- Team rows use `ConversationKind::Team`
+- Team is not mapped to DirectPeer or Channel
+
+Future cleanup:
+
+- `TeamRichPayloadPresentation`
+- `TeamCommandActionSink`
+- `TeamLocationActionSink`
+
+### Structured Pending/Failure
+
+Status: unresolved ownership.
+
+Remaining ownership:
+
+- failure detail is not preserved on `ChatMessage`
+- ACK tracker is not projected into the chat read model
+- pending queue ownership is not defined
+
+Boundary established:
+
+- coarse `Failed -> MessageFailureKind::Unknown` compatibility projection
+- renderer/model are forbidden from inferring failure state
+
+Future cleanup:
+
+- `ChatPendingReadModel`
+- Mesh-to-chat delivery projector
+- structured delivery updates in `ChatService`
+
+### Route / Tracker Overlays
+
+Status: deferred renderer cleanup.
+
+Remaining ownership:
+
+- route storage reads
+- route list rendering
+- tracker overlay composition
+
+Boundary established:
+
+- route/tracker overlay code is recorded in renderer legacy baseline
+- Map workspace state does not absorb route payloads
+
+Future cleanup:
+
+- Route presentation source
+- tracker overlay presentation boundary
+
+## Exit Interpretation
+
+These islands do not block Phase 5 exit.
+
+They are no longer uncontrolled violations. They are bounded legacy ownership
+areas with explicit future cleanup paths. Phase 6 may build on the presentation
+boundary while preserving these constraints.
diff --git a/docs/audits/PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md b/docs/audits/PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md
new file mode 100644
index 00000000..1d6fdb15
--- /dev/null
+++ b/docs/audits/PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md
@@ -0,0 +1,73 @@
+# Phase 5 Presentation Boundary Summary
+
+## Purpose
+
+Phase 5 establishes presentation boundaries across the product UI.
+
+It does not fully clean every legacy UI island. A domain is Phase 5-ready when
+portable presentation snapshots/models exist, legacy reads/writes are behind
+source/sink adapters, at least one renderer or probe consumes the model, and
+remaining legacy ownership is documented.
+
+## Summary
+
+| Domain | Boundary established | Adapter | Remaining legacy |
+| --- | --- | --- | --- |
+| Device | `DeviceStatusModel` | `LegacyAirDeviceStatusSource` | board/runtime status details |
+| GPS | `GpsStatusModel` | `LegacyGpsStatusSource` | `gps_runtime` compatibility surface |
+| Mesh | `MeshStatusModel` | `LegacyMeshStatusSource` | adapter-specific counters and runtime details |
+| Settings | `SettingsModel` | `LegacySettingsSource` / `LegacySettingsActionSink` | full configuration migration |
+| Chat | `ChatWorkspaceModel` | `ChatPresentationSource` / `LegacyChatActionSink` | `ChatUiController`, key verification, structured pending/failure |
+| Team Chat | `ChatWorkspaceModel` with Team source/sink | `TeamChatPresentationSource` / `TeamChatActionSink` | location/command picker, rich payload UI, structured pending/failure |
+| Map | `MapWorkspaceModel` | `LegacyMapPresentationSource` / `LegacyMapActionSink` | tile/cache/renderer/rich overlay cleanup |
+| Workspace | `PresentationWorkspace` | target-owned composition | target construction order and legacy UI islands |
+
+## Interpretation
+
+Phase 5 means:
+
+- renderers can consume portable presentation snapshots
+- UI actions can flow through source/sink boundaries
+- legacy ownership is named instead of hidden
+- headless probes can validate the presentation graph
+
+Phase 5 does not mean:
+
+- Chat is fully clean
+- Map is fully clean
+- GPS compatibility reads are gone
+- tile loading has moved
+- all LVGL/uConsole surfaces have been rewritten
+- Team rich payload rendering is finished
+
+## Phase 5.8 Composition
+
+Phase 5.8 adds:
+
+- `PresentationWorkspace`
+- `PresentationWorkspaceSnapshot`
+- `PresentationWorkspaceProbe`
+- linux_sim ASCII workspace probe
+- uConsole presentation workspace smoke
+
+These additions prove that Device, GPS, Mesh, Settings, Chat, Team Chat, and Map
+can be represented as one typed presentation graph.
+
+The workspace layer is intentionally not a factory, service locator, app service
+registry, renderer, telemetry model, or snapshot cache.
+
+## Phase 5.9 Renderer Hardening
+
+Phase 5.9 starts locking renderer behavior:
+
+- strict surfaces cannot include platform/toolkit/business runtime dependencies
+- migrated Chat and Team text paths must continue using `ChatWorkspaceModel`
+- migrated Map status/action paths must continue using `MapWorkspaceModel`
+- LVGL dashboard GPS status labels now consume `GpsStatusModel`
+- uConsole map status/center summary must continue exposing
+  `presentation_workspace`
+- ASCII/headless probes remain strict renderers that consume only
+  `ui_presentation` models and fake source/sink implementations
+
+uConsole tile/cache/contour enumeration, GTK overview GPS compatibility logic,
+and dashboard/chat app model runtime reads remain bounded legacy ownership.
diff --git a/docs/audits/PHASE5_PRESENTATION_CONFORMANCE_MATRIX.md b/docs/audits/PHASE5_PRESENTATION_CONFORMANCE_MATRIX.md
new file mode 100644
index 00000000..7befc03b
--- /dev/null
+++ b/docs/audits/PHASE5_PRESENTATION_CONFORMANCE_MATRIX.md
@@ -0,0 +1,70 @@
+# Phase 5 Presentation Conformance Matrix
+
+## Purpose
+
+This matrix records the Phase 5 presentation boundary status.
+
+A domain is Phase 5-ready when it has:
+
+- portable snapshot/model
+- source/sink boundary where actions exist
+- tests
+- at least one renderer/probe consumer
+- documented legacy ownership
+- checker coverage
+
+Phase 5-ready does not mean fully clean.
+
+## Matrix
+
+| Domain | Model | Snapshot | Source | Sink | Tests | Consumer | Legacy audit | Status |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| Device | `DeviceStatusModel` | `DeviceStatusSnapshot` | `IDeviceStatusSource` / `LegacyAirDeviceStatusSource` | read-only | `test_device_status_model.cpp` | status/probe consumers | known violations | ready |
+| GPS | `GpsStatusModel` | `GpsStatusSnapshot` | `IGpsStatusSource` / `LegacyGpsStatusSource` | read-only | `test_gps_status_model.cpp` | dashboard status, map source, probes | `GPS_CONSUMER_BOUNDARY_AUDIT.md` | ready-with-legacy |
+| Mesh | `MeshStatusModel` | `MeshStatusSnapshot` | `IMeshStatusSource` / `LegacyMeshStatusSource` | read-only | `test_mesh_status_model.cpp` | status/probe consumers | known violations | ready-with-legacy |
+| Settings | `SettingsModel` | `SettingsSnapshot` | `ISettingsSource` / `LegacySettingsSource` | `ISettingsActionSink` / `LegacySettingsActionSink` | `test_settings_model.cpp` | settings surface | known violations | ready-with-legacy |
+| Chat | `ChatWorkspaceModel` | `ChatWorkspaceSnapshot` | `ChatPresentationSource` | `LegacyChatActionSink` | chat workspace and source/sink tests | `ChatUiController` migrated path | `CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md` | ready-with-legacy |
+| Team Chat | Team `ChatWorkspaceModel` | `ChatWorkspaceSnapshot` | `TeamChatPresentationSource` | `TeamChatActionSink` | Team chat source/sink tests | `ChatUiController` Team text path | `TEAM_CHAT_PRESENTATION_AUDIT.md` | ready-with-legacy |
+| Map | `MapWorkspaceModel` | `MapWorkspaceSnapshot` | `LegacyMapPresentationSource` | `LegacyMapActionSink` | map workspace and legacy adapter tests | LVGL, uConsole, ASCII probe | `MAP_UI_LEGACY_OWNERSHIP_AUDIT.md` | ready-with-legacy |
+| Workspace | `PresentationWorkspace` | `PresentationWorkspaceSnapshot` | n/a | n/a | workspace/probe tests | ASCII workspace probe, uConsole smoke | `PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md` | ready |
+| Renderer | n/a | presentation snapshots | n/a | presentation actions | renderer checker/probe tests | LVGL, GTK/uConsole, ASCII/headless | `PHASE5_RENDERER_HARDENING_SUMMARY.md` | ready-with-legacy |
+
+## Status Definitions
+
+### ready
+
+The presentation boundary is established and legacy ownership is minimal or not
+relevant to the domain.
+
+### ready-with-legacy
+
+The presentation boundary is established, but legacy islands remain documented,
+bounded, and covered by regression checks or baseline records.
+
+### blocked
+
+The presentation boundary is missing or unsafe.
+
+## Checker Coverage
+
+Phase 5 readiness is covered by:
+
+- `tools/architecture/check_phase5_ready.py`
+- `tools/architecture/check_phase5_workspace_ready.py`
+- `tools/architecture/check_phase5_renderer_ready.py`
+
+The final readiness gate aggregates these checks in
+`tools/architecture/check_phase5_final_ready.py`.
+
+## Phase 5 Exit Interpretation
+
+Phase 5 exits successfully if all domains are either:
+
+- ready
+- ready-with-legacy
+
+No domain may remain blocked.
+
+Chat, Team Chat, Map, Renderer, GPS, Mesh, and Settings are not declared clean.
+They are declared bounded enough for Phase 6 to build on the presentation
+boundary without reintroducing uncontrolled renderer/runtime coupling.
diff --git a/docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md b/docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md
new file mode 100644
index 00000000..561a6903
--- /dev/null
+++ b/docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md
@@ -0,0 +1,88 @@
+# Phase 5 Renderer Hardening Summary
+
+## Purpose
+
+Phase 5.9 hardens renderer boundaries.
+
+It prevents new renderer couplings and locks migrated surfaces behind
+PresentationModel boundaries.
+
+This phase does not clean every legacy UI island.
+
+## Strict Surfaces
+
+| Surface | Rule |
+| --- | --- |
+| `ui_presentation/*` | no platform/toolkit/app service/runtime dependencies |
+| ASCII/headless probes | no runtime/toolkit/store/service dependencies |
+| Chat presentation source/sink | no renderer/toolkit/radio direct send dependencies |
+| Team Chat presentation source/sink | no generic core chat conversion or legacy chat sink |
+| Map presentation source/sink | no tile/cache/route/renderer dependencies |
+| migrated Chat path | must use `ChatWorkspaceModel` |
+| migrated Team text path | must use dedicated Team `ChatWorkspaceModel` |
+| migrated Map status/action path | must use `MapWorkspaceModel` |
+| LVGL dashboard GPS status | must use `GpsStatusModel` for status labels |
+| uConsole presentation bridge | must expose `presentation_workspace` and workspace smoke |
+
+## Legacy Islands
+
+| Island | Status |
+| --- | --- |
+| `ChatUiController` | legacy application controller |
+| `GPSPageState` | legacy LVGL map/GPS page state |
+| `ui/widgets/map/map_viewport` | legacy tile renderer/runtime |
+| LVGL dashboard satellite radar | legacy GNSS satellite detail renderer |
+| uConsole tile/cache/contour | legacy platform model |
+| uConsole chat/dashboard app models | legacy compatibility models |
+| uConsole GTK overview GPS logic | legacy compatibility renderer |
+| key verification modal | legacy |
+| Team location/command picker | legacy |
+| route/tracker overlays | legacy |
+
+## Thin Slices Migrated or Locked
+
+Phase 5.9 locks these migrated paths:
+
+- non-team Chat selection, rendering, send, and read clearing through
+  `chat_model_`
+- Team text projection/send through `team_chat_model_`
+- compact LVGL Map status/action path through `map_workspace_model()`
+- uConsole Map presentation bridge through `presentation_workspace`
+- ASCII map and workspace probes as strict headless renderers
+
+Phase 5.9 also thins one LVGL status surface:
+
+- LVGL dashboard GPS fix chip, fix label, and satellite count summary now use
+  `GpsStatusModel`
+
+The dashboard satellite radar remains legacy-owned because current portable GPS
+status snapshots do not carry per-satellite skyplot details.
+
+## Baseline
+
+Known renderer legacy islands are recorded in:
+
+```text
+tools/architecture/phase5_renderer_legacy_baseline.json
+```
+
+The baseline exists to prevent noisy historical violations from hiding new
+regressions.
+
+## Policy
+
+New renderer code must prefer presentation models.
+
+New direct runtime reads must either:
+
+1. move behind a source/sink boundary, or
+2. be added to the renderer legacy baseline with an explicit reason and future
+   cleanup owner.
+
+Do not use Phase 5.9 as a reason to:
+
+- rewrite `ChatUiController`
+- rewrite `GPSPageState`
+- move tile/cache state into `MapWorkspaceSnapshot`
+- force rich Team payloads into generic rows
+- remove all legacy platform application models at once
diff --git a/docs/audits/PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md b/docs/audits/PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md
new file mode 100644
index 00000000..704c4099
--- /dev/null
+++ b/docs/audits/PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md
@@ -0,0 +1,60 @@
+# Phase 6 Composition Conformance Matrix
+
+## Purpose
+
+This matrix records the Phase 6 product composition and app shell boundary
+status.
+
+A target or boundary is Phase 6-ready when:
+
+- object graph ownership is explicit
+- presentation models are assembled outside `ui_presentation`
+- app services are not created by renderers
+- legacy composition surfaces are documented
+- checker coverage prevents new drift
+
+Phase 6-ready does not mean all global state or legacy startup code has been
+removed.
+
+## Matrix
+
+| Area | Composition contract | Root or bridge | Presentation binding | Legacy registered | Checker coverage | Status |
+| --- | --- | --- | --- | --- | --- | --- |
+| Product composition spec | yes | n/a | n/a | n/a | yes | ready |
+| `product_composition` contracts | yes | n/a | `PresentationBundle` | n/a | yes | ready |
+| Linux simulator | yes | `LinuxSimCompositionRoot` | full `PresentationWorkspace` with fakes | no | yes | ready |
+| uConsole GTK/Linux | yes | `UConsoleCompositionRoot` pilot | Chat/Map presentation binding | GTK app state still legacy | yes | ready-with-legacy |
+| ESP LVGL | bridge documented | ESP LVGL composition bridge audit | future bridge/root | `AppContext` and app facade runtime | yes | ready-with-legacy |
+| AppContext / app facade | bridge documented | `LegacyAppContextBridge` audit | future explicit bundle binding | yes | yes | ready-with-legacy |
+| LVGL Chat page runtime | partial | legacy page bridge | Chat/Team presentation models | yes | baseline | ready-with-legacy |
+| LVGL GPS/map page runtime | partial | legacy page bridge | Map presentation model | yes | baseline | ready-with-legacy |
+| uConsole tile/cache/contour | no pure root yet | legacy app model | Map workspace status only | yes | baseline | ready-with-legacy |
+
+## Status Definitions
+
+### ready
+
+The composition boundary is explicit and has no major unresolved legacy
+ownership in the Phase 6 scope.
+
+### ready-with-legacy
+
+The boundary is explicit, but older construction or global lookup remains
+documented and guarded by baseline/checker coverage.
+
+### blocked
+
+The boundary is missing or unsafe for Phase 6 exit.
+
+## Phase 6 Exit Interpretation
+
+Phase 6 exits successfully if all areas are either:
+
+- ready
+- ready-with-legacy
+
+No area may remain blocked.
+
+The key Phase 6 result is not the removal of all legacy object construction.
+The result is that target/app shell composition ownership is now named,
+bounded, and automatically checked.
diff --git a/docs/audits/PHASE6_COMPOSITION_READINESS_REPORT.md b/docs/audits/PHASE6_COMPOSITION_READINESS_REPORT.md
new file mode 100644
index 00000000..0fd887d9
--- /dev/null
+++ b/docs/audits/PHASE6_COMPOSITION_READINESS_REPORT.md
@@ -0,0 +1,122 @@
+# Phase 6 Composition Readiness Report
+
+## Decision
+
+Phase 6 is ready to close as a product composition and app shell boundary
+baseline.
+
+This decision does not mean every target startup path is fully clean. It means
+object graph ownership is now explicit enough for future phases to build on
+without expanding global composition drift.
+
+## What Phase 6 Established
+
+Phase 6 established the composition boundary above the Phase 5 presentation
+layer:
+
+```text
+Target chooses.
+Board describes.
+Platform adapts.
+Runtime schedules.
+Capability provides.
+Protocol interprets.
+UseCase decides.
+AppService coordinates.
+PresentationModel projects.
+Renderer draws.
+CompositionRoot wires.
+```
+
+The new contracts are:
+
+- `AppServicesBundle`
+- `PresentationBundle`
+- `ITargetAppShell`
+- `CompositionStatus`
+
+These contracts are intentionally small. They are explicit dependency bundles
+and shell lifecycle contracts, not a replacement service locator.
+
+## Composition Roots And Bridges
+
+| Target or surface | Phase 6 result |
+| --- | --- |
+| Linux simulator | `LinuxSimCompositionRoot` owns fake source/sink/model graph and exports `PresentationBundle` |
+| uConsole | `UConsoleCompositionRoot` owns Linux app services, uConsole app models, Chat presentation model, and Map presentation binding |
+| ESP LVGL | documented bridge; startup order is not changed in Phase 6 |
+| AppContext | documented as `LegacyAppContextBridge`; new expansion is forbidden |
+
+## Boundary Rules Now Guarded
+
+Phase 6 checker coverage confirms:
+
+- `product_composition` contracts do not include platform/toolkit/AppContext
+  runtime headers
+- `ui_presentation` does not import product composition
+- `AppServicesBundle` remains explicit and has no dynamic `get<T>()`
+- `PresentationBundle` does not construct source/sink/model objects
+- Linux simulator and uConsole composition roots exist
+- ESP/AppContext bridge audits exist
+- known legacy composition surfaces are baseline-recorded
+
+## Remaining Legacy Composition Surfaces
+
+The following remain intentionally bounded:
+
+- ESP Arduino `AppContext`
+- ESP-IDF app facade runtime
+- global `app::appFacade()` compatibility pointer
+- LVGL Chat page runtime construction of Chat presentation adapters
+- LVGL GPS/map page runtime construction of Map presentation adapters
+- dashboard GPS widget local presentation bridge
+- GTK uConsole app state ownership of legacy app models
+- uConsole legacy framebuffer shell service ownership
+
+These are not Phase 6 blockers because they are documented in:
+
+- `APPCONTEXT_LEGACY_BRIDGE_AUDIT.md`
+- `ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md`
+- `phase6_composition_legacy_baseline.json`
+- `PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md`
+
+## Non-Goals Confirmed
+
+Phase 6 did not:
+
+- remove `AppContext`
+- rewrite ESP startup
+- rewrite LVGL pages
+- rewrite ChatUiController
+- rewrite GPSPageState
+- rewrite map tile/cache/contour ownership
+- convert target manifests into runtime configuration
+- add a new service locator
+
+## Phase 6 Exit Criteria
+
+| Criterion | Status |
+| --- | --- |
+| Product composition architecture spec exists | pass |
+| Product composition boundary audit exists | pass |
+| `product_composition` contracts exist | pass |
+| Linux simulator composition root smoke exists | pass |
+| uConsole composition root smoke exists | pass |
+| ESP LVGL composition bridge/audit exists | pass |
+| AppContext bridge audit exists | pass |
+| Phase 6 composition checker exists and passes | pass |
+| PresentationWorkspace construction remains outside `ui_presentation` | pass |
+| Legacy composition surfaces are baseline-recorded | pass |
+
+## Phase 7 Input
+
+Future phases may assume:
+
+- Phase 5 presentation boundaries are stable
+- target composition roots are the preferred place to create source/sink/model
+  graphs
+- renderer/page code should not create new app services
+- `AppContext` is compatibility-only, not the default architecture
+
+Future phases should reduce the baseline one surface at a time, starting with
+the targets that have clear composition roots: Linux simulator and uConsole.
diff --git a/docs/audits/PHASE6_INPUT_PLAN.md b/docs/audits/PHASE6_INPUT_PLAN.md
new file mode 100644
index 00000000..5212f9d9
--- /dev/null
+++ b/docs/audits/PHASE6_INPUT_PLAN.md
@@ -0,0 +1,97 @@
+# Phase 6 Input Plan
+
+## Purpose
+
+This document records what Phase 6 receives from Phase 5.
+
+Phase 5 established UI presentation boundaries. Phase 6 may build on those
+boundaries, but must not bypass them.
+
+## Phase 6 May Assume
+
+Phase 6 may assume:
+
+- presentation models exist for Device, GPS, Mesh, Settings, Chat, Team Chat,
+  and Map
+- renderers should consume snapshot/action boundaries
+- `ui_presentation` is platform/toolkit independent
+- legacy adapters isolate compatibility surfaces
+- `PresentationWorkspace` can compose target presentation capabilities
+- ASCII/headless probes can validate the presentation graph
+- renderer hardening checkers prevent major regressions
+- legacy islands are registered and bounded
+
+## Phase 6 Must Not
+
+Phase 6 must not:
+
+- call GPS/runtime/store/radio directly from new renderer paths
+- bypass `ChatWorkspaceModel` for new chat UI paths
+- bypass Team `ChatWorkspaceModel` / Team source/sink for new Team text UI paths
+- bypass `MapWorkspaceModel` for new map workspace state
+- map Team to DirectPeer or Channel
+- put tile/cache into `MapWorkspaceSnapshot`
+- put pending/failure queues into `ChatWorkspaceModel`
+- make `PresentationWorkspace` construct source/sink objects
+- treat legacy baseline entries as permission for unrelated new coupling
+
+## Recommended Phase 6 Tracks
+
+### Track A: Product Composition / App Shell
+
+- move object graph construction into composition roots
+- reduce `AppContext` leakage
+- centralize board/target wiring
+- compose `PresentationWorkspace` per target
+- keep source/sink construction outside `ui_presentation`
+
+### Track B: Legacy UI Island Cleanup
+
+- split `ChatUiController`
+- split `GPSPageState`
+- split map viewport/tile renderer
+- introduce `KeyVerificationPresentation`
+- introduce Team rich payload UI
+- reduce route/tracker overlay coupling
+
+### Track C: Renderer Strictness
+
+- gradually move baseline violations into strict rules
+- harden LVGL renderer paths
+- harden GTK/uConsole renderer paths
+- keep ASCII/headless probes as strict examples
+- avoid adding direct runtime reads to renderer code
+
+### Track D: Runtime Ownership Cleanup
+
+- structured pending/failure projection
+- tile source/cache abstraction
+- Team location action sink
+- Team command action sink
+- map overlay presentation sources
+
+## Phase 6 Entry Checks
+
+Before Phase 6 changes land, run:
+
+```text
+python tools/architecture/check_phase5_final_ready.py
+```
+
+When changing a specific Phase 5 boundary, also run the focused checker:
+
+```text
+python tools/architecture/check_phase5_ready.py
+python tools/architecture/check_phase5_workspace_ready.py
+python tools/architecture/check_phase5_renderer_ready.py
+```
+
+## Migration Rule
+
+If Phase 6 touches a legacy island, it should choose one of two paths:
+
+1. preserve the existing bounded legacy contract and avoid expanding it
+2. migrate the island behind a stricter presentation model/source/sink boundary
+
+It should not create a third path where renderer, platform runtime, store, and
+business service state are mixed again.
diff --git a/docs/audits/PHASE7_10_MAP_TILE_SOURCE_CACHE_BURNDOWN_REPORT.md b/docs/audits/PHASE7_10_MAP_TILE_SOURCE_CACHE_BURNDOWN_REPORT.md
new file mode 100644
index 00000000..d37429a0
--- /dev/null
+++ b/docs/audits/PHASE7_10_MAP_TILE_SOURCE_CACHE_BURNDOWN_REPORT.md
@@ -0,0 +1,44 @@
+# Phase 7.10 Map Tile Source / Cache Burn-down Report
+
+## Decision
+
+Phase 7.10 moved Trail Mate map tile path mapping and filesystem-backed availability lookup into explicit map tile source/resolver objects.
+
+This was a tile source/cache ownership slice. It did not rewrite LVGL tile rendering or decoded image cache behavior.
+
+## Burned Down
+
+| Surface | Result |
+| --- | --- |
+| Base tile directory mapping in platform map renderer code | routed through `MapTileResolver` |
+| Contour tile directory mapping in platform map renderer code | routed through `MapTileResolver` |
+| Base tile availability check as direct path policy | routed through `LegacyFilesystemMapTileSource::lookup(...)` |
+| Layer directory availability checks as direct path policy | routed through `LegacyFilesystemMapTileSource` |
+| Map tile identity containing path assumptions | replaced by `MapTileRef` value object |
+
+## Still Contained
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| ESP decoded LVGL tile cache | First slice avoids rewriting decode/image lifetime | Introduce formal decoded tile cache owner or renderer queue |
+| LVGL tile object records | Renderer still owns tile widgets | Separate tile render queue from tile source/cache |
+| Linux `platform::linux_runtime::MapTileCache` downloader | Linux runtime has downloader/database responsibilities | Wrap or rename as stable runtime tile cache adapter |
+| uConsole workspace path fields | GTK/uConsole map view still consumes filesystem paths | Consume tile refs and source lookup instead of direct path fields |
+
+## Checker Changes
+
+- Required map tile audit/spec/report.
+- Required map tile types/source/cache/resolver headers.
+- Required `LegacyFilesystemMapTileSource`.
+- Required resolver/source smoke tests.
+- Required platform map tile runtimes to call `LegacyFilesystemMapTileSource`.
+- Forbid tile bitmap/cache objects in `MapWorkspaceSnapshot`.
+
+## Remaining Work
+
+| Work | Direction |
+| --- | --- |
+| Decoded tile cache ownership | Move ESP decoded tile cache behind a formal cache/renderer boundary |
+| Linux downloader/cache adapter | Align `platform::linux_runtime::MapTileCache` with `IMapTileSource` / cache ports |
+| uConsole path projection | Remove tile path fields from uConsole map workspace snapshots |
+| Renderer tile queue | Make renderer consume source/cache through runtime-owned tile queue |
diff --git a/docs/audits/PHASE7_11_MAP_TILE_RENDER_QUEUE_CACHE_REPORT.md b/docs/audits/PHASE7_11_MAP_TILE_RENDER_QUEUE_CACHE_REPORT.md
new file mode 100644
index 00000000..e0a6e3fc
--- /dev/null
+++ b/docs/audits/PHASE7_11_MAP_TILE_RENDER_QUEUE_CACHE_REPORT.md
@@ -0,0 +1,42 @@
+# Phase 7.11 Map Tile Render Queue / Decoded Cache Report
+
+## Decision
+
+Phase 7.11 made the current map tile render plan and ESP decoded tile cache ownership explicit.
+
+This was a burn-down slice, not a renderer rewrite.
+
+## Burned Down
+
+| Surface | Result |
+| --- | --- |
+| Implicit visible tile plan only in platform `MapTile` records | projected into `MapTileRenderQueue` |
+| Missing/loading/ready tile state only as renderer-local flags | represented by `MapTileRenderState` |
+| ESP decoded tile cache as loose file-scope slot array | wrapped by `LvglDecodedTileCache` |
+| Portable decoded cache boundary missing | introduced `IMapTileDecoderCache` |
+
+## Still Contained
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| LVGL tile object records | Existing renderer still creates and evicts widgets | `MapTileRenderer` consumes `MapTileRenderQueue` and owns only widget lifecycle |
+| Platform tile loading cadence | Existing timer path still calls `tile_loader_step(...)` | Map runtime owns loader cadence and queue refresh |
+| Linux downloader/cache | Not part of 7.11 scope | Adapt behind source/cache ports |
+| Route/tracker overlays | Explicit non-goal | Future overlay runtime ownership phase |
+
+## Checker Changes
+
+- Required map tile render queue audit/spec/report.
+- Required `map_tile_render_queue.h/.cpp` and smoke test.
+- Required `map_tile_decoder_cache.h`.
+- Required platform tile runtimes to project `MapTileRenderQueue`.
+- Required ESP decoded cache wrapper token `LvglDecodedTileCache`.
+
+## Remaining Work
+
+| Work | Direction |
+| --- | --- |
+| Dedicated `MapTileRenderer` | Move LVGL widget records behind a renderer object that consumes queue rows |
+| Loader cadence ownership | Move timer/source/cache/queue update cadence into map runtime |
+| Linux downloader/cache adapter | Wrap Linux downloader behind formal source/cache ports |
+| Overlay ownership | Add route/tracker/team overlays only after tile renderer boundary is cleaner |
diff --git a/docs/audits/PHASE7_12_MAP_OVERLAY_ROUTE_TRACKER_REPORT.md b/docs/audits/PHASE7_12_MAP_OVERLAY_ROUTE_TRACKER_REPORT.md
new file mode 100644
index 00000000..a25c987e
--- /dev/null
+++ b/docs/audits/PHASE7_12_MAP_OVERLAY_ROUTE_TRACKER_REPORT.md
@@ -0,0 +1,32 @@
+# Phase 7.12 Map Overlay / Route / Tracker Report
+
+## Burned Down
+
+| Surface | Outcome |
+| --- | --- |
+| Current GPS overlay semantic state | Added `MapOverlaySnapshot` / `MapOverlayItem` and `MapOverlayProjector::projectCurrentPosition(...)` |
+| Team member overlay semantic state | Added `MapOverlayProjector::projectTeamMember(...)` |
+| Renderer-driven runtime reads | Shared map viewport remains free of GPS/team store reads; checker guards the boundary |
+| Legacy overlay fact gathering | Added `LegacyMapOverlaySource` with `IMapOverlayGpsSource` and `IMapOverlayTeamSource` ports |
+
+## Runtime Wiring
+
+The Linux GPS page runtime now builds a `MapOverlaySnapshot` through
+`LegacyMapOverlaySource` at the runtime/composition boundary. This keeps shared
+map rendering on the passive side of the boundary while preserving current
+visual behavior.
+
+## Still Contained
+
+| Surface | Removal condition |
+| --- | --- |
+| ESP route/tracker draw callbacks | Route/tracker stores expose presentation sources and renderer consumes overlay snapshot rows |
+| ESP GPS marker widget records | Dedicated map overlay renderer consumes `MapOverlaySnapshot` and owns marker widget lifecycle |
+| Measurement overlay | Measurement tool state is projected as `MeasurementPoint` items |
+| Team signal markers from chatlog | Team signal source becomes an overlay presentation source or is folded into Team location projection |
+
+## Checker Result
+
+Phase 7 checker now requires the 7.12 docs, overlay DTO/source, projector, legacy
+adapter, and projector tests. Shared map renderer code is guarded against direct
+GPS/team source reads.
diff --git a/docs/audits/PHASE7_13_GPS_RUNTIME_SCHEDULING_REPORT.md b/docs/audits/PHASE7_13_GPS_RUNTIME_SCHEDULING_REPORT.md
new file mode 100644
index 00000000..606214c6
--- /dev/null
+++ b/docs/audits/PHASE7_13_GPS_RUNTIME_SCHEDULING_REPORT.md
@@ -0,0 +1,33 @@
+# Phase 7.13 GPS Runtime Scheduling Report
+
+## Burned Down
+
+| Surface | Outcome |
+| --- | --- |
+| GPS page refresh cadence | Added `GpsPageRuntimePump` with active/inactive interval ownership |
+| Direct timer-to-refresh ownership | GPS page timer callbacks now tick the runtime pump |
+| UI refresh port | Added `IGpsUiRefreshSink` |
+| Refresh model port | Added `IGpsStatusRefreshModel` |
+
+## Runtime Wiring
+
+ESP GPS page runtime uses a local refresh-model adapter to keep the existing
+workflow stable while moving cadence ownership into `GpsPageRuntimePump`.
+
+Linux GPS page runtime uses a sink that refreshes the compact map view after the
+pump accepts a cadence tick.
+
+## Still Contained
+
+| Surface | Removal condition |
+| --- | --- |
+| ESP tile loader timer | Dedicated map tile runtime owns loader cadence independent of GPS page lifecycle |
+| ESP title timer | Title/status refresh moves behind a UI runtime pump |
+| ESP route/tracker page callbacks | Route/tracker presentation sources replace direct draw callback state |
+| GNSS skyplot timer | GNSS skyplot receives its own runtime scheduling pass |
+
+## Checker Result
+
+Phase 7 checker now requires `GpsPageRuntimePump`, `IGpsUiRefreshSink`, pump
+tests, and 7.13 documentation. It also checks that GPS page runtime uses the
+pump in timer callbacks and active/inactive lifecycle.
diff --git a/docs/audits/PHASE7_6_LEGACY_BURNDOWN_REPORT.md b/docs/audits/PHASE7_6_LEGACY_BURNDOWN_REPORT.md
new file mode 100644
index 00000000..c6eb2670
--- /dev/null
+++ b/docs/audits/PHASE7_6_LEGACY_BURNDOWN_REPORT.md
@@ -0,0 +1,46 @@
+# Phase 7.6 Legacy Burn-down Report
+
+## Decision
+
+Phase 7.6 reduced Chat / Team / key-verification legacy ownership surfaces without introducing new runtime models.
+
+The pass burned down legacy paths already covered by Phase 7 owners and documented exit conditions for bridges that must remain temporarily.
+
+## Burned Down
+
+| Surface | Result |
+| --- | --- |
+| `ChatUiController` direct Team payload encoding | forbidden; controller submits `TeamActionRequest` for location marker sends |
+| `ChatUiController` direct key verification runtime calls | forbidden; controller calls `KeyVerificationModel` only |
+| `ChatUiController` direct delivery ownership | forbidden; controller does not own read model, projector, or action service |
+| Key verification modal rendering | extracted to `KeyVerificationModalRenderer` helper consuming `KeyVerificationSnapshot` |
+| Legacy key verification API token in controller | controller UI method renamed to avoid `submitKeyVerificationNumber` ownership token |
+
+## Still Contained
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| `LegacyChatDeliveryEventBridge` | EventBus still reaches `ChatUiController` first for chat send result refresh | Runtime event pump forwards `ChatSendResultEvent` directly |
+| `LegacyChatDeliveryActionBridge` | No visible retry/cancel/clear-failure message menu exists yet | UI submits `ChatDeliveryActionRequest` directly or bridge is renamed as a formal adapter |
+| `LegacyTeamActionBridge` | Team runtime command port still wraps legacy helper APIs | Introduce a non-legacy `TeamActionService` / command port |
+| `LegacyKeyVerificationSource` / `LegacyKeyVerificationActionSink` | MeshCore / Meshtastic verification APIs still differ behind adapter | Split or rename protocol-specific adapters |
+| `ChatUiController` | Still coordinates legacy LVGL screen, event forwarding, conversation cache, and Team rich text formatting | Future controller thinning moves event pump and rich payload projection out |
+
+## Checker Changes
+
+- Added `LEGACY_BURNDOWN_REGISTER.md`, `CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md`, and this closeout report as required Phase 7 files.
+- Added burn-down register token checks for remaining callers, removal condition, target phase, and status.
+- Required key verification modal renderer helper files.
+- Forbid direct Team send payload encoding tokens in `ChatUiController`.
+- Forbid direct key verification runtime API tokens in `ChatUiController`.
+- Forbid direct delivery read model / projector / action service ownership in `ChatUiController`.
+- Narrowed legacy API token survival to legacy adapter/runtime paths.
+
+## Remaining Work
+
+| Work | Owner direction |
+| --- | --- |
+| Event pump extraction | `chat_page_runtime.cpp` or app shell should forward runtime events before controller refresh |
+| Team rich payload rendering | Team presentation adapter should project location/command display fields |
+| Key verification modal full view split | A fuller LVGL view object can own modal lifecycle beyond helper functions |
+| ChatUiController thinning | Conversation cache and store flush should move to runtime/app shell owners |
diff --git a/docs/audits/PHASE7_7_EVENT_PUMP_BURNDOWN_REPORT.md b/docs/audits/PHASE7_7_EVENT_PUMP_BURNDOWN_REPORT.md
new file mode 100644
index 00000000..697072fa
--- /dev/null
+++ b/docs/audits/PHASE7_7_EVENT_PUMP_BURNDOWN_REPORT.md
@@ -0,0 +1,45 @@
+# Phase 7.7 Event Pump Burn-down Report
+
+## Decision
+
+Phase 7.7 moved Chat runtime event projection and ChatService scheduling out of `ChatUiController`.
+
+`chat_page_runtime.cpp` now registers a runtime facade that owns event-pump ordering. `ChatUiController` remains a UI refresh sink and legacy view coordinator.
+
+## Burned Down
+
+| Surface | Result |
+| --- | --- |
+| `ChatUiController::update()` calling `ChatService::processIncoming()` | moved to `ChatPageRuntimeEventPump::update()` |
+| `ChatUiController::update()` calling `ChatService::flushStore()` | moved to `ChatPageRuntimeEventPump::update()` |
+| `ChatUiController::onChatEvent(...)` delivery projection | moved to `ChatPageRuntimeEventPump::handleChatSendResult(...)` |
+| `ChatUiController::onChatEvent(...)` key verification source/session update | moved to `ChatPageRuntimeEventPump` key verification handlers |
+| App facade registering controller as `IChatUiRuntime` | replaced with `ChatPageRuntimeFacade` |
+
+## Still Contained
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| `ChatPageRuntimeEventPump` directly calls `ChatService` | It is the Phase 7.7 runtime owner | App shell/runtime scheduler owns cadence outside page runtime |
+| `ChatUiController` reads `ChatService` for UI refresh | Existing legacy screens still use `ChatMessage` and conversation cache | Chat presentation workspace fully drives LVGL conversation UI |
+| Team rich payload formatting | Not part of event pump ownership | Team rich payload presentation adapter exists |
+| Team position picker renderer | Still an LVGL widget flow | Extract picker renderer/helper in a later burn-down |
+| Protocol mismatch UX | Still controller notification logic | Protocol support presentation model exposes UI-ready disabled reasons |
+
+## Checker Changes
+
+- Added `CHAT_RUNTIME_EVENT_PUMP_AUDIT.md` and `CHAT_RUNTIME_EVENT_PUMP_SPEC.md` requirements.
+- Added `chat_ui_refresh_sink.h` and `chat_page_runtime_event_pump.h/.cpp` requirements.
+- Forbid `processIncoming()` / `flushStore()` in `ChatUiController`.
+- Forbid `delivery_event_bridge_` and key verification source projection calls in `ChatUiController`.
+- Require `chat_page_runtime.cpp` to register `ChatPageRuntimeFacade`, not `s_ui_controller`.
+- Updated legacy burn-down register remaining callers for delivery and key verification bridges.
+
+## Remaining Work
+
+| Work | Direction |
+| --- | --- |
+| Conversation cache burn-down | Move remaining conversation list state to presentation workspace |
+| Team rich payload rendering | Add Team rich payload projection outside controller |
+| Team position picker renderer | Extract picker LVGL helper after action ownership is stable |
+| App-wide scheduling | Move page event pump cadence into a broader runtime scheduler when product shell is ready |
diff --git a/docs/audits/PHASE7_8_TEAM_RICH_PAYLOAD_BURNDOWN_REPORT.md b/docs/audits/PHASE7_8_TEAM_RICH_PAYLOAD_BURNDOWN_REPORT.md
new file mode 100644
index 00000000..07a04368
--- /dev/null
+++ b/docs/audits/PHASE7_8_TEAM_RICH_PAYLOAD_BURNDOWN_REPORT.md
@@ -0,0 +1,53 @@
+# Phase 7.8 Team Rich Payload Burn-down Report
+
+## Decision
+
+Phase 7.8 moved Team location/command display decoding out of `ChatUiController` and into Team presentation projection.
+
+The first-phase display remains text-compatible with existing `MessageRow` rendering, but the owner is now explicit:
+
+```text
+TeamChatLogEntry -> TeamRichPayloadProjector -> TeamChatPresentationSource -> MessageRow text
+```
+
+## Burned Down
+
+| Surface | Result |
+| --- | --- |
+| `ChatUiController` direct Team rich payload formatter | removed |
+| `format_team_chat_entry(...)` in chat controller | forbidden |
+| `decodeTeamChatLocation(...)` in chat controller | forbidden |
+| `decodeTeamChatCommand(...)` in chat controller | forbidden |
+| `TeamChatLocation` / `TeamChatCommand` display structs in chat controller | forbidden |
+| Team chat subtitle/message rich display summary | projected by `TeamRichPayloadProjector` through `TeamChatPresentationSource` |
+| `TeamRichPayloadProjector` heap formatting temporaries | removed; summary construction uses fixed buffers and bounded copies |
+
+## Still Contained
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| `LegacyTeamActionBridge` | Send-side Team action runtime bridge remains legacy | Introduce or rename a stable Team action service/adapter |
+| Team position picker renderer | Picker widget lifecycle is separate from display projection | Resolved by Phase 7.9 with `TeamPositionPickerRenderer` |
+| `MessageRow` rich display limitations | Existing renderer only consumes text rows | Future Team row model or renderer supports rich payload display fields |
+| Other Team rich decode surfaces | Contacts/GPS/team screens have separate legacy display paths | Later phases migrate those screens to shared Team projection |
+| `TeamChatPresentationSource` vector boundary | Legacy Team store API returns recent logs through `std::vector` | Add a fixed-capacity visitor / bounded iterator API to `TeamUiStore` |
+
+## Checker Changes
+
+- Added Team rich payload presentation audit/spec requirements.
+- Required `TeamRichPayloadDisplay` and `TeamRichPayloadProjector`.
+- Required projector smoke test.
+- Required `TeamChatPresentationSource` to consume `TeamRichPayloadProjector`.
+- Forbid Team rich payload decode/format tokens in `ChatUiController`.
+- Forbid send/action/runtime tokens in `TeamRichPayloadProjector`.
+- Forbid `std::string`, `std::vector`, `iostream`, `sstream`, and `<format>` in `TeamRichPayloadProjector`.
+
+## Remaining Work
+
+| Work | Direction |
+| --- | --- |
+| Rich Team card UI | Add renderer support for structured `TeamRichPayloadDisplay` fields |
+| Team position picker renderer | Resolved by Phase 7.9 without changing Team send ownership |
+| Contacts/GPS Team payload formatting | Move those legacy display paths to shared Team presentation projection |
+| Team action bridge burn-down | Replace or rename `LegacyTeamActionBridge` when runtime service boundary is stable |
+| Team store recent-log API | Replace vector-return API with fixed-capacity visitor / bounded iterator for embedded targets |
diff --git a/docs/audits/PHASE7_9_TEAM_POSITION_PICKER_BURNDOWN_REPORT.md b/docs/audits/PHASE7_9_TEAM_POSITION_PICKER_BURNDOWN_REPORT.md
new file mode 100644
index 00000000..72e4cd7a
--- /dev/null
+++ b/docs/audits/PHASE7_9_TEAM_POSITION_PICKER_BURNDOWN_REPORT.md
@@ -0,0 +1,47 @@
+# Phase 7.9 Team Position Picker Burn-down Report
+
+## Decision
+
+Phase 7.9 moved Team position picker LVGL widget lifecycle out of `ChatUiController` and into `TeamPositionPickerRenderer`.
+
+This was a renderer / widget lifecycle burn-down. It did not change Team action send ownership.
+
+## Burned Down
+
+| Surface | Result |
+| --- | --- |
+| `team_position_picker_overlay_` in controller | removed |
+| `team_position_picker_panel_` in controller | removed |
+| `team_position_picker_desc_` in controller | removed |
+| `team_position_picker_group_` in controller | removed |
+| `team_position_prev_group_` in controller | removed |
+| `team_position_icon_ctxs_` in controller | removed |
+| `TeamPositionIconEventCtx` in controller | removed |
+| `team_position_icon_event_cb(...)` in controller | removed |
+| `team_position_cancel_event_cb(...)` in controller | removed |
+| Team position picker LVGL widget construction in controller | moved to `TeamPositionPickerRenderer` |
+
+## Still Contained
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| `sendTeamLocationWithIcon(...)` | Controller still coordinates selected marker workflow | Future Team workflow coordinator or UX pack-specific flow submits `TeamActionRequest` directly |
+| `LegacyTeamActionBridge` | Team action send runtime adapter is still legacy | Replace or rename as a stable Team action service/adapter |
+| `TeamPositionPickerRenderer` LVGL specificity | Shared chat UI still uses LVGL widgets | Future UX pack-specific picker replaces the shared LVGL renderer |
+
+## Checker Changes
+
+- Required Team position picker audit/spec/report files.
+- Required `TeamPositionPickerRenderer` header and source.
+- Forbid picker LVGL refs and icon event contexts in `ChatUiController`.
+- Forbid picker LVGL event callbacks in `ChatUiController`.
+- Forbid direct `lv_obj_create(parent_)` picker construction in `ChatUiController`.
+- Forbid Team action, GPS, Team store, Chat service, and payload encoding tokens in `TeamPositionPickerRenderer`.
+
+## Remaining Work
+
+| Work | Direction |
+| --- | --- |
+| Team workflow coordination | Move selection workflow out of `ChatUiController` only if a broader workflow coordinator becomes worthwhile |
+| Team action bridge burn-down | Replace or rename `LegacyTeamActionBridge` after Team runtime action service boundary is stable |
+| UX Pack picker variant | Allow a target-specific picker renderer to replace the shared LVGL renderer |
diff --git a/docs/audits/PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md b/docs/audits/PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md
new file mode 100644
index 00000000..6b56de3c
--- /dev/null
+++ b/docs/audits/PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md
@@ -0,0 +1,23 @@
+# Phase 7 Final Legacy Surface Matrix
+
+| Surface | Current owner | New owner | Status | Removal condition | Blocking reason | Future phase |
+| --- | --- | --- | --- | --- | --- | --- |
+| Chat delivery send-result bridge | `LegacyChatDeliveryEventBridge` | `ChatDeliveryEventProjector` / `IChatDeliveryEventPort` | contained | EventBus publishes structured delivery events directly | EventBus schema still carries coarse send-result fields | Phase 8 delivery event schema |
+| Chat delivery action bridge | `LegacyChatDeliveryActionBridge` | `ChatDeliveryActionService` | contained | UI submits `ChatDeliveryActionRequest` to official action sink | Visible message-menu action surface is still compatibility-driven | Phase 8 chat action surface |
+| Team action bridge | `LegacyTeamActionBridge` | `TeamActionRequest` / `ITeamActionSink` | contained | `TeamActionService` replaces legacy bridge | Team command runtime port is not yet first-class | Phase 8 Team runtime service |
+| Key verification source | `LegacyKeyVerificationSource` | `KeyVerificationModel` / presentation source | contained | Protocol-specific key verification sources are renamed or split | MeshCore/Meshtastic adapters still share compatibility session | Phase 8 key verification adapters |
+| Key verification sink | `LegacyKeyVerificationActionSink` | `KeyVerificationModel` / action sink | contained | Protocol-specific action sinks replace legacy naming | Existing adapter still hides protocol-specific mesh APIs | Phase 8 key verification adapters |
+| Chat key verification modal helper | `KeyVerificationModalRenderer` | Dedicated modal view object | burned-down | Full modal object owns widget lifecycle | Controller still coordinates modal workflow | UX Pack / modal runtime pass |
+| Team rich message row limitation | `MessageRow` summary text | `TeamRichPayloadDisplay` | contained | Rich Team row/card renderer consumes structured fields | Current message list renderer accepts summary text only | UX Pack Team rows |
+| Team position picker LVGL renderer | `TeamPositionPickerRenderer` | Shared picker renderer | burned-down | UX pack-specific picker replaces or formalizes renderer | Current renderer is LVGL-specific | UX Pack picker |
+| Map tile source/path lookup | Platform tile runtime | `MapTileResolver` / `LegacyFilesystemMapTileSource` | contained | Dedicated map tile runtime injects source into renderers | Platform tile code still owns loading cadence | Phase 8 map tile runtime |
+| Map visible tile plan | Platform tile runtime | `MapTileRenderQueue` | contained | Dedicated map runtime computes queue without legacy `MapTile` records | LVGL tile record compatibility still exists | Phase 8 map tile renderer |
+| ESP decoded LVGL tile cache | `LvglDecodedTileCache` wrapper | `IMapTileDecoderCache` boundary | contained | Decoder cache is injected into a dedicated map tile renderer | LVGL image lifetime is platform-specific | Phase 8 map decoder cache |
+| Map overlay current position | Legacy GPS source adapter | `LegacyMapOverlaySource` / `MapOverlayProjector` | contained | Renderer consumes `MapOverlaySnapshot` directly for markers | Existing ESP marker widgets are still page-local | Phase 8 map overlay renderer |
+| Map overlay team positions | Legacy Team source adapter | `LegacyMapOverlaySource` / `MapOverlayProjector` | contained | Team location source exposes fixed-capacity visitor and renderer consumes overlay rows | Team posring API returns vectors at legacy boundary | Phase 8 Team location source |
+| Map route/tracker overlay | ESP route/tracker draw callbacks | Deferred overlay presentation source | explicitly deferred | Route/tracker stores expose presentation sources and renderer consumes overlay snapshot rows | Route/tracker stores are still platform/page-specific | Phase 8 route/tracker overlay |
+| Measurement overlay | `LegacyMapPresentationState` | Deferred overlay projection | explicitly deferred | Measurement state projects as `MeasurementPoint` overlay rows | Measurement tool runtime boundary is not split | Phase 8 measurement tool |
+| GPS page refresh cadence | `GpsPageRuntimePump` | Runtime scheduler / UI refresh sink | contained | Page-local refresh adapters are replaced by GPS presentation refresh model | ESP GPS page workflow remains large compatibility surface | Phase 8 GPS page runtime |
+| GNSS skyplot timer | GNSS page runtime | Deferred GNSS runtime pump | explicitly deferred | GNSS page cadence uses a runtime pump and skyplot renderer consumes snapshots | GNSS skyplot was outside Phase 7 map/GPS final scope | Phase 8 GNSS scheduling |
+| ACK timeout projection | Adapter hook | Delivery event source | explicitly deferred | Unified ACK source emits structured timeout event | Radio/EventBus source remains protocol-specific | Phase 8 delivery telemetry |
+| Key missing/radio failure projection | Delivery mapper | Delivery event source | explicitly deferred | EventBus carries structured failure kind | Current EventBus send-result schema is coarse | Phase 8 delivery telemetry |
diff --git a/docs/audits/PHASE7_FINAL_RUNTIME_OWNERSHIP_READINESS_REPORT.md b/docs/audits/PHASE7_FINAL_RUNTIME_OWNERSHIP_READINESS_REPORT.md
new file mode 100644
index 00000000..819c5545
--- /dev/null
+++ b/docs/audits/PHASE7_FINAL_RUNTIME_OWNERSHIP_READINESS_REPORT.md
@@ -0,0 +1,44 @@
+# Phase 7 Final Runtime Ownership Readiness Report
+
+## Readiness Summary
+
+Phase 7 runtime ownership is ready to close with remaining legacy surfaces either
+contained, burned down, or explicitly deferred with removal conditions.
+
+## Covered Runtime Lines
+
+| Area | Status | Owner boundary |
+| --- | --- | --- |
+| Chat delivery | contained | `ChatDeliveryReadModel`, event projector, action service |
+| Chat event pump | contained | `ChatPageRuntimeEventPump` / runtime facade |
+| Chat retry/cancel/clear | contained | `ChatDeliveryActionService` |
+| Team action sends | contained | `TeamActionRequest` / `ITeamActionSink` |
+| Team rich payload display | contained | `TeamRichPayloadProjector` / `TeamChatPresentationSource` |
+| Team position picker | burned-down | `TeamPositionPickerRenderer` |
+| Key verification | contained | `KeyVerificationModel` and source/sink adapters |
+| Map tile source/cache | contained | `MapTileResolver`, `LegacyFilesystemMapTileSource`, cache ports |
+| Map render queue/cache | contained | `MapTileRenderQueue`, `IMapTileDecoderCache`, LVGL cache wrapper |
+| Map overlay/route/tracker | contained/deferred | `MapOverlaySnapshot`, `LegacyMapOverlaySource`, route/tracker exit conditions |
+| GPS runtime scheduling | contained | `GpsPageRuntimePump`, `IGpsUiRefreshSink` |
+
+## Final Ownership Rule
+
+The final Phase 7 rule is:
+
+runtime source -> presentation source / projector -> snapshot / queue / read DTO -> renderer -> LVGL / GTK / ASCII
+
+The checker guards against ownership flowing back from renderers to runtime
+sources, stores, tile paths, cache policy, or GPS cadence policy.
+
+## Known Legacy With Exit Conditions
+
+See `PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md`. Every remaining surface has a
+removal condition and a blocking reason.
+
+## Checker Result
+
+`check_phase7_runtime_ownership_ready.py` is the regression guard for Phase 7
+readiness. It requires all Phase 7 reports, final matrix/report, overlay
+boundary files, GPS pump files, and the register cleanup.
+
+Phase 6 and Phase 5 readiness checks remain required after this closeout.
diff --git a/docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md b/docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md
new file mode 100644
index 00000000..8e7ec937
--- /dev/null
+++ b/docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md
@@ -0,0 +1,304 @@
+# Phase 7 Runtime Ownership Register
+
+## Purpose
+
+Phase 7 records runtime ownership questions that must not be solved inside
+presentation models or renderers.
+
+This register starts with Chat delivery/pending/failure because that ownership
+has direct user-visible consequences and a bounded migration path.
+
+## Runtime Ownership Items
+
+| Runtime item | Owner status | Phase | Notes |
+| --- | --- | --- | --- |
+| Chat delivery / pending / failure | contained | 7.1 / 7.6 | owned by `ChatDeliveryReadModel` and projector path; controller direct ownership is forbidden |
+| Chat send-result projection | contained | 7.3 / 7.7 | `ChatSendResultEvent` projects through `LegacyChatDeliveryEventBridge`; `ChatPageRuntimeEventPump` owns forwarding |
+| ACK timeout projection | explicitly deferred | 7.3 / final matrix | adapter hook projects `AckTimeout`; unified ACK source has exit condition in `PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md` |
+| key missing projection | explicitly deferred | 7.3 / final matrix | mapper supports structured failure; EventBus schema exit condition in `PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md` |
+| radio send failure projection | explicitly deferred | 7.3 / final matrix | mapper supports structured failure; EventBus schema exit condition in `PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md` |
+| Chat runtime event pump / store flush ownership | contained | 7.7 | owned by `ChatPageRuntimeEventPump` / `ChatPageRuntimeFacade`; controller is UI refresh sink |
+| Chat retry/cancel/clear failure actions | contained | 7.4 / 7.6 | owned by `ChatDeliveryActionRequest` / `ChatDeliveryActionService`; controller direct action ownership is forbidden |
+| Map tile/cache ownership | contained | 7.10 | tile path mapping and filesystem availability are owned by `MapTileResolver` / `LegacyFilesystemMapTileSource`; decoded image cache remains contained legacy |
+| Map tile render queue / decoded cache ownership | contained | 7.11 | visible tile plan is projected into `MapTileRenderQueue`; ESP decoded image cache is wrapped by `LvglDecodedTileCache`; LVGL widget records remain contained legacy |
+| Map overlay/route/tracker ownership | contained / explicitly deferred | 7.12 | current GPS and Team overlays project through `MapOverlaySnapshot` / `LegacyMapOverlaySource`; route/tracker overlay sources have exit conditions in final matrix |
+| GPS page timers/tasks | contained | 7.13 | refresh cadence is owned by `GpsPageRuntimePump`; LVGL timers are tick hooks only |
+| Team location/command action ownership | contained | 7.2 / 7.6 | owned by `TeamActionRequest` / `LegacyTeamActionBridge`; controller send payload encoding is forbidden |
+| Team rich payload display ownership | contained | 7.8 | owned by `TeamRichPayloadProjector` / `TeamChatPresentationSource`; controller display decode/format is forbidden |
+| Team position picker widget lifecycle | burned-down UI surface | 7.9 | owned by `TeamPositionPickerRenderer`; controller only handles selected/cancel workflow |
+| key verification workflow | contained | 7.5 / 7.6 | owned by `KeyVerificationModel` plus legacy source/sink adapters; modal rendering is helper-bounded |
+
+## Phase 7.1 Decision
+
+Chat delivery state is runtime state.
+
+It is not owned by:
+
+- `ChatWorkspaceModel`
+- renderer widgets
+- `ChatUiController` local visual state
+- `ui_presentation`
+
+Phase 7.1 introduces:
+
+- `ChatDeliveryReadModel`
+- `ChatDeliveryEventProjector`
+- `LegacyChatDeliveryBridge`
+- optional delivery enrichment in `ChatPresentationSource`
+- composition-root ownership in Linux simulator and uConsole pilots
+
+## Remaining Legacy
+
+Phase 7.1 does not fully clean:
+
+- adapter ACK trackers
+- radio send failure plumbing
+- key verification modal
+- ChatUiController event/state machine
+- durable delivery storage
+- retry/cancel commands
+
+These are not blockers because the delivery ownership boundary is now explicit.
+
+## Phase 7.3 Decision
+
+Chat delivery events are runtime projection events.
+
+They are not owned by:
+
+- `ChatUiController`
+- renderer widgets
+- `ChatWorkspaceModel`
+- `ui_presentation`
+
+Phase 7.3 introduces:
+
+- `IChatDeliveryEventPort`
+- `ProjectingChatDeliveryEventPort`
+- `LegacyChatSendResultMapper`
+- `LegacyChatDeliveryEventBridge`
+
+Existing `ChatSendResultEvent` projects coarse success/failure into
+`ChatDeliveryReadModel`. Structured failure kinds are supported by mapper and
+hook APIs, but the current EventBus schema does not yet carry those details.
+
+## Phase 7.2 Decision
+
+Team location and command sends are action/runtime ownership.
+
+They are not owned by:
+
+- `ChatWorkspaceModel`
+- renderer widgets
+- `ChatUiController` payload encoding
+- `ui_presentation`
+
+Phase 7.2 introduces:
+
+- `TeamActionRequest`
+- `ITeamActionSink`
+- `ITeamLocationSource`
+- `LegacyTeamActionBridge`
+- Chat UI submission of location marker intent through the Team action sink
+
+Team text remains on the existing `TeamChatActionSink` /
+`team_chat_model_.sendMessage(...)` path. Rich Team payload rendering remains
+deferred with an exit condition in the burn-down register.
+
+## Phase 7.4 Decision
+
+Chat delivery retry, cancel pending, and clear failure are runtime actions.
+
+They are not owned by:
+
+- `ChatWorkspaceModel`
+- renderer widgets
+- `ChatUiController` local state
+- `ui_presentation`
+
+Phase 7.4 introduces:
+
+- `ChatDeliveryActionRequest`
+- `IChatDeliveryActionSink`
+- `IRetryChatMessagePort`
+- `ChatDeliveryActionService`
+- `LegacyChatDeliveryActionBridge`
+
+`ClearFailure` removes failed records from `ChatDeliveryReadModel`.
+`CancelPending` removes queued or sending projections only. `Retry` is a port
+owned action and returns `Unsupported` until a retry port is wired.
+
+## Phase 7.5 Decision
+
+Key verification is an independent runtime/presentation workflow.
+
+It is not owned by:
+
+- `ChatWorkspaceModel`
+- `MessageRow`
+- renderer modal local state
+- chat delivery read model
+- `ChatUiController` workflow fields
+
+Phase 7.5 introduces:
+
+- `KeyVerificationSnapshot`
+- `IKeyVerificationPresentationSource`
+- `IKeyVerificationActionSink`
+- `KeyVerificationModel`
+- `LegacyKeyVerificationSource`
+- `LegacyKeyVerificationActionSink`
+
+The LVGL modal may remain in `ChatUiController`, but it must render snapshots
+and submit actions through the model. MeshCore/Meshtastic differences remain
+behind legacy key verification adapters.
+
+## Phase 7.6 Decision
+
+Phase 7.6 is a burn-down pass, not a new model phase.
+
+Legacy surfaces covered by Phase 7 owners are tracked in
+`LEGACY_BURNDOWN_REGISTER.md`. `ChatUiController` responsibilities are
+classified in `CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md`.
+
+Phase 7.6 burned down:
+
+- direct Team location/command send payload ownership in `ChatUiController`
+- direct key verification runtime API ownership in `ChatUiController`
+- direct delivery read/action ownership in `ChatUiController`
+- key verification modal rendering inside the controller body
+
+Remaining legacy surfaces now require removal conditions. Subsequent burn-down phases
+may move those surfaces from contained to burned-down:
+
+- `LegacyChatDeliveryEventBridge`
+- `LegacyChatDeliveryActionBridge`
+- `LegacyTeamActionBridge`
+- `LegacyKeyVerificationSource`
+- `LegacyKeyVerificationActionSink`
+- controller-owned `ChatService::processIncoming` / `flushStore` was removed in Phase 7.7
+
+## Phase 7.7 Decision
+
+Chat runtime event projection and ChatService scheduling are runtime pump
+responsibilities.
+
+They are not owned by:
+
+- `ChatUiController`
+- renderer widgets
+- `ChatWorkspaceModel`
+- `ui_presentation`
+
+Phase 7.7 introduces:
+
+- `IChatUiRefreshSink`
+- `ChatPageRuntimeEventPump`
+- `ChatPageRuntimeFacade`
+
+`ChatPageRuntimeFacade` remains compatible with the existing
+`IChatUiRuntime` app facade hook. It calls the event pump first and then lets
+`ChatUiController` refresh UI state.
+
+`ChatUiController` no longer:
+
+- calls `ChatService::processIncoming()`
+- calls `ChatService::flushStore()`
+- receives EventBus events directly
+- calls `LegacyChatDeliveryEventBridge`
+- updates `LegacyKeyVerificationSource`
+
+## Phase 7.8 Decision
+
+Team location and command display are presentation projection concerns.
+
+They are not owned by:
+
+- `ChatUiController`
+- renderer local state
+- `ChatWorkspaceModel`
+- Team action send sinks
+
+Phase 7.8 introduces:
+
+- `TeamRichPayloadDisplay`
+- `TeamRichPayloadProjector`
+- `TeamChatPresentationSource` consumption of projected rich payload summaries
+
+`ChatUiController` no longer:
+
+- defines `format_team_chat_entry(...)`
+- calls `decodeTeamChatLocation(...)`
+- calls `decodeTeamChatCommand(...)`
+- constructs `TeamChatLocation` / `TeamChatCommand` for display formatting
+
+The current renderer still consumes summary text through `MessageRow`. Rich Team
+cards and additional Map overlay visuals are deferred with exit conditions.
+
+## Phase 7.9 Decision
+
+Team position picker lifecycle is a widget renderer concern.
+
+It is not owned by:
+
+- Team action send sinks
+- Team protocol payload encoders
+- GPS runtime
+- `ChatWorkspaceModel`
+- `ChatUiController` LVGL member refs
+
+Phase 7.9 introduces:
+
+- `TeamPositionPickerRenderer`
+- `TeamPositionPickerRenderer::Callbacks`
+
+`ChatUiController` no longer stores picker overlay, panel, description label,
+LVGL group, previous group, or icon event contexts. It no longer defines picker
+LVGL event callbacks or directly creates the picker widget tree.
+
+The controller keeps the selection workflow. `sendTeamLocationWithIcon(...)`
+remains only because it submits `TeamActionRequest` through `ITeamActionSink`;
+it must not encode Team payloads directly.
+
+## Phase 7.12 Decision
+
+Map overlay semantic state is presentation projection state.
+
+It is not owned by:
+
+- tile source/cache
+- renderer widgets
+- GPS runtime source
+- Team store
+- route/tracker stores
+
+Phase 7.12 introduces:
+
+- `MapOverlaySnapshot`
+- `IMapOverlayPresentationSource`
+- `MapOverlayProjector`
+- `LegacyMapOverlaySource`
+
+Current GPS and Team latest location overlays are projected through the overlay
+source boundary. Route/tracker and measurement overlays are explicitly deferred
+with removal conditions in `PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md`.
+
+## Phase 7.13 Decision
+
+GPS page refresh cadence is runtime scheduling state.
+
+It is not owned by:
+
+- GPS renderers
+- map widgets
+- page widget local state
+- GPS status snapshots
+
+Phase 7.13 introduces:
+
+- `IGpsUiRefreshSink`
+- `IGpsStatusRefreshModel`
+- `GpsPageRuntimePump`
+
+LVGL timers may remain as platform tick hooks during migration, but the refresh
+interval and active/inactive lifecycle belong to `GpsPageRuntimePump`.
diff --git a/docs/audits/PHASE8_RUNTIME_UI_ADOPTION_REPORT.md b/docs/audits/PHASE8_RUNTIME_UI_ADOPTION_REPORT.md
new file mode 100644
index 00000000..b73f1656
--- /dev/null
+++ b/docs/audits/PHASE8_RUNTIME_UI_ADOPTION_REPORT.md
@@ -0,0 +1,48 @@
+# Phase 8 Runtime UI Adoption Report
+
+## Completed
+
+Phase 8 now has descriptor-level runtime adoption bridges for the presentation
+graph:
+
+- GTK descriptor bridge:
+  `modules/ui_gtk_runtime/*/gtk_uconsole_screen_graph_bridge.*`
+- ASCII descriptor bridge:
+  `modules/ui_ascii_runtime/*/ascii_screen_graph_bridge.*`
+- LVGL descriptor bridge:
+  `modules/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.*`
+
+Each bridge consumes:
+
+- `product_composition::PresentationBundle`
+- `hasUxMenu(...)`
+- `hasScreenBindings(...)`
+- the UI-specific `MenuRuntimeAdapter`
+- the UI-specific `ScreenHostAdapter`
+
+The bridge output is a descriptor graph only. It does not create GTK widgets,
+LVGL objects, simulator windows, services, app shells, or UX packs.
+
+## Still Fallback
+
+The following runtime surfaces still use compatibility or hardcoded paths:
+
+- real LVGL menu renderer
+- real GTK page switch logic
+- real simulator main UI selection
+- hardcoded screen creation
+
+These fallbacks remain compatibility fallbacks. Their existence means runtime
+adapter smoke is proven, but real renderer adoption is not finished.
+
+## Exit Conditions
+
+Phase 8 runtime UI adoption is complete only when each real renderer consumes a
+screen graph bridge:
+
+- LVGL menu/page renderer consumes `LvglScreenGraphBridge`
+- GTK uConsole page navigation consumes `GtkUConsoleScreenGraphBridge`
+- simulator UI selection consumes `AsciiScreenGraphBridge`
+
+Until then, the descriptor bridges are the adoption baseline and the hardcoded
+renderers remain compatibility fallbacks.
diff --git a/docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md b/docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md
new file mode 100644
index 00000000..352bc96e
--- /dev/null
+++ b/docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md
@@ -0,0 +1,34 @@
+# Phase 9 Fallback Containment Ledger
+
+Phase 9.3 keeps hardcoded routing alive as contained fallback while real
+runtime entries begin consuming the presentation graph. Fallback presence is
+acceptable only when the current owner, new path, exit condition, and checker
+status are explicit.
+
+| Fallback | Current owner | Why fallback remains | New path | Exit condition | Checker status |
+| --- | --- | --- | --- | --- | --- |
+| LinuxSim hardcoded runtime routing | final `apps/linux_sim_shell` runtime entry plus historical simulator runtime | the simulator renderer still has old routing available for failed adoption | `LinuxSimRuntimeEntry -> LinuxSimRuntimeEntryAdoptionProbe -> AsciiRuntimeEntryAdoption` | simulator renderer no longer needs hardcoded routing | fallback-only after Phase 10.1 |
+| GTK hardcoded page registry | final `apps/linux_uconsole_gtk` page registry adoption plus historical GTK page registry | GTK page switching still owns existing widget creation and page list behavior | `LinuxUConsoleGtkPageRegistryAdoption -> GtkRuntimeEntryAdoption -> GtkUConsoleScreenGraphPresenter` | GTK page registry consumes descriptors as primary page source | fallback-only after Phase 10.2 |
+| LVGL hardcoded menu/page creation | `modules/ui_lvgl_ux_packs` compatibility runtime | device-specific LVGL renderers still own menu and screen creation | `LvglPrimaryScreenGraphRuntime -> LvglRuntimeEntryAdoption -> LvglRuntimeScreenGraphPresenter` | LVGL renderers consume descriptor runtime before creating menu/page objects | fallback-only after Phase 10.3 |
+| Chat LegacyDelivery bridges | deprecated alias headers in `modules/ui_legacy_adapters` and `modules/ui_shared` | downstream compatibility include paths may still exist outside main runtime | `ChatDeliveryActionPortAdapter` and `ChatDeliveryEventProjectionAdapter` in `modules/ui_chat_runtime` | remove alias headers after downstream compatibility includes are gone | burned down to deprecated alias |
+| KeyVerification legacy source/sink | deprecated alias headers in `modules/ui_legacy_adapters` and `modules/ui_shared` | downstream compatibility include paths may still exist outside main runtime | `KeyVerificationPresentationSource`, `KeyVerificationActionSink`, and `KeyVerificationSessionAdapter` in `modules/ui_key_verification_runtime` | remove alias headers after downstream compatibility includes are gone | burned down to deprecated alias |
+| MapOverlay legacy source | deprecated alias headers in `modules/ui_legacy_adapters` and `modules/ui_shared` | downstream compatibility include paths may still exist outside main runtime | `MapOverlaySnapshotSource` and `MapOverlayProjectionAdapter` in `modules/ui_map_runtime` | remove alias headers after downstream compatibility includes are gone and map renderers consume stable snapshots only | burned down to deprecated alias |
+
+## Phase 9.6 Final Readiness Alignment
+
+The runtime fallbacks that carry into Phase 10 are:
+
+- LinuxSim hardcoded runtime routing: contained fallback with owner and exit
+  condition; Phase 10 first cut makes `AsciiRuntimeEntryAdoption as primary source`.
+- GTK hardcoded page registry: contained fallback with owner and exit condition.
+- LVGL hardcoded menu/page creation: contained fallback with owner and exit
+  condition.
+
+The legacy adapter rows are not primary UI fallback rows anymore:
+
+- Chat LegacyDelivery bridges: main runtime callers removed; deprecated aliases
+  only.
+- KeyVerification legacy source/sink: main runtime callers removed; deprecated
+  aliases only.
+- MapOverlay legacy source: main runtime callers removed; deprecated aliases
+  only.
diff --git a/docs/audits/PHASE9_FINAL_READINESS_REPORT.md b/docs/audits/PHASE9_FINAL_READINESS_REPORT.md
new file mode 100644
index 00000000..586598ba
--- /dev/null
+++ b/docs/audits/PHASE9_FINAL_READINESS_REPORT.md
@@ -0,0 +1,103 @@
+# Phase 9 Final Readiness Report
+
+## Scope
+
+Phase 9.6 closes the Phase 9 architecture work. It does not add new presenter,
+entry adoption, UX pack, renderer, or legacy compatibility layers.
+
+The Phase 9 closeout distinction is:
+
+- Phase 9 proves runtime adoption paths and burns down selected legacy
+  adapters from main runtime ownership.
+- Phase 10 makes one adopted path the primary runtime path.
+
+## Runtime Adoption
+
+| Runtime | Presenter status | Entry adoption status | Real entry status | Remaining fallback |
+| --- | --- | --- | --- | --- |
+| ASCII / LinuxSim | `AsciiRuntimeScreenGraphPresenter` done in `modules/ui_ascii_runtime` | `AsciiRuntimeEntryAdoption` done | `LinuxSimRuntimeEntry` consumes the adoption probe, but descriptors are not yet the primary runtime route source | LinuxSim hardcoded runtime routing |
+| GTK / uConsole | `GtkUConsoleScreenGraphPresenter` done in `modules/ui_gtk_runtime` | `GtkRuntimeEntryAdoption` done | `LinuxUConsoleGtkPageRegistryAdoption` exposes descriptor data, but the page registry is not yet descriptor-primary | GTK hardcoded page registry |
+| LVGL | `LvglRuntimeScreenGraphPresenter` done in `modules/ui_lvgl_ux_packs` | `LvglRuntimeEntryAdoption` done | `LvglRuntimeAdoptionProbe` proves compatibility runtime consumption, but real renderers are not yet descriptor-primary | LVGL hardcoded menu/page creation |
+
+The runtime adoption path is real enough to test:
+
+`PresentationBundle -> RuntimeEntryAdoption -> RuntimeScreenGraphPresenter`
+
+It is not yet the primary renderer path. That is the Phase 10 boundary.
+
+Readiness summary:
+
+- ASCII presenter: done; entry adoption done; primary route migration remains.
+- GTK presenter: done; entry adoption done; primary page registry migration remains.
+- LVGL presenter: done; probe adoption done; primary menu/page renderer migration remains.
+
+## Legacy Burn-down
+
+| Surface | Phase 9 status | Stable owner | Remaining compatibility |
+| --- | --- | --- | --- |
+| ChatDelivery | main runtime callers removed; burned down to formal adapters | `ChatDeliveryActionPortAdapter`, `ChatDeliveryEventProjectionAdapter`, `IChatDeliveryActionPort`, `IChatDeliveryEventPort` in `modules/ui_chat_runtime` | deprecated alias headers and legacy alias tests only |
+| KeyVerification | main runtime callers removed; burned down to formal source/sink/session adapter | `KeyVerificationPresentationSource`, `KeyVerificationActionSink`, `KeyVerificationSessionAdapter` in `modules/ui_key_verification_runtime` | deprecated alias headers and legacy alias tests only |
+| MapOverlay | main runtime callers removed; burned down to stable snapshot/projection adapters | `MapOverlaySnapshotSource`, `MapOverlayProjectionAdapter` in `modules/ui_map_runtime` | deprecated alias headers and legacy alias tests only |
+
+Legacy headers are not primary runtime APIs. Their deletion window opens after
+downstream compatibility includes are gone.
+
+## Remaining Fallback
+
+These fallbacks remain intentionally contained:
+
+| Fallback | Owner | New path | Exit condition |
+| --- | --- | --- | --- |
+| LinuxSim hardcoded runtime routing | final LinuxSim app shell and historical simulator runtime | `LinuxSimRuntimeEntry -> LinuxSimRuntimeEntryAdoptionProbe -> AsciiRuntimeEntryAdoption` | `AsciiRuntimeEntryAdoption as primary source` for simulator routing |
+| GTK hardcoded page registry | final GTK app shell page-registry adoption and historical GTK page registry | `LinuxUConsoleGtkPageRegistryAdoption -> GtkRuntimeEntryAdoption -> GtkUConsoleScreenGraphPresenter` | GTK page registry consumes descriptors as primary page source |
+| LVGL hardcoded menu/page creation | `modules/ui_lvgl_ux_packs` compatibility runtime plus device renderers | `LvglRuntimeAdoptionProbe -> LvglRuntimeEntryAdoption -> LvglRuntimeScreenGraphPresenter` | LVGL compatibility runtime consumes descriptors before creating menu/page objects |
+
+The fallback ledger remains the authoritative itemized tracker for fallback
+owner, reason, new path, exit condition, and checker status.
+
+## Consistency Baseline
+
+Phase 9 final readiness requires the following documents to agree:
+
+- `docs/audits/LEGACY_BURNDOWN_REGISTER.md`
+- `docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md`
+- `docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md`
+
+The shared status for ChatDelivery, KeyVerification, and MapOverlay is:
+
+main runtime callers removed; deprecated aliases only
+
+The shared status for LinuxSim, GTK, and LVGL hardcoded UI paths is:
+
+contained fallback with owner and exit condition
+
+## Phase 10 Entry Recommendation
+
+First target:
+
+LinuxSim / ASCII primary path
+
+Proposed Phase 10 first cut:
+
+LinuxSim hardcoded runtime routing -> `AsciiRuntimeEntryAdoption as primary source`
+
+Why this is the right first cut:
+
+- It avoids real device memory, input, and LVGL layout risk.
+- It does not require GTK widget or page-registry replacement.
+- It proves the ScreenGraphPresenter path can become primary before touching
+  device renderers.
+- Failure cost is low because the existing simulator fallback can remain
+  visible and testable.
+
+Expected risk:
+
+Low to medium. The risk is output parity and fallback detection, not device
+memory pressure, platform widget lifecycle, or board-specific layout behavior.
+
+## Phase 9.6 Guardrail
+
+No new Phase 9 work should add runtime ownership under `legacy/`, introduce a
+new presenter/adoption layer, or rename remaining fallback as completed primary
+path migration. Phase 10 starts only when one real runtime path makes the
+adoption path primary.
diff --git a/docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md b/docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md
new file mode 100644
index 00000000..86908887
--- /dev/null
+++ b/docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md
@@ -0,0 +1,108 @@
+# Phase 9 Legacy Burn-down Report
+
+## Burned Down In Phase 9.1
+
+The Phase 8 ASCII and GTK descriptor adapters were initially located under
+`legacy/app_implementations`. Phase 9 moves them to module-owned runtime
+surfaces:
+
+| Surface | Previous owner | New owner | Status |
+| --- | --- | --- | --- |
+| ASCII menu runtime adapter | `legacy/app_implementations/linux_sim` | `modules/ui_ascii_runtime` | moved out of legacy |
+| ASCII screen host adapter | `legacy/app_implementations/linux_sim` | `modules/ui_ascii_runtime` | moved out of legacy |
+| ASCII screen graph bridge | `legacy/app_implementations/linux_sim` | `modules/ui_ascii_runtime` | moved out of legacy |
+| GTK menu runtime adapter | `legacy/app_implementations/linux_uconsole` | `modules/ui_gtk_runtime` | moved out of legacy |
+| GTK screen host adapter | `legacy/app_implementations/linux_uconsole` | `modules/ui_gtk_runtime` | moved out of legacy |
+| GTK screen graph bridge | `legacy/app_implementations/linux_uconsole` | `modules/ui_gtk_runtime` | moved out of legacy |
+
+## Burned Down In Phase 9.4
+
+Phase 9.4 burns down the Chat delivery bridge pair from real implementation
+ownership into stable `ui_chat_runtime` ports and adapters.
+
+| Surface | Previous owner | New owner | Status |
+| --- | --- | --- | --- |
+| `LegacyChatDeliveryActionBridge` | `modules/ui_legacy_adapters` real bridge implementation | `ChatDeliveryActionPortAdapter` and `IChatDeliveryActionPort` in `modules/ui_chat_runtime` | main runtime callers removed; old headers are deprecated aliases |
+| `LegacyChatDeliveryEventBridge` | `modules/ui_legacy_adapters` real bridge implementation | `ChatDeliveryEventProjectionAdapter` and `IChatDeliveryEventPort` in `modules/ui_chat_runtime` | main runtime callers removed; old headers are deprecated aliases |
+
+The former `modules/ui_legacy_adapters/src/legacy_chat_delivery_*_bridge.cpp`
+implementation files are removed from the build. Compatibility headers remain
+only as forwarding aliases for downstream includes.
+
+## Burned Down In Phase 9.5
+
+Phase 9.5 burns down the KeyVerification and MapOverlay legacy presentation
+adapters from main runtime ownership into stable runtime modules.
+
+| Surface | Previous owner | New owner | Status |
+| --- | --- | --- | --- |
+| `LegacyKeyVerificationSession` | `modules/ui_legacy_adapters` compatibility session state | `KeyVerificationSessionAdapter` in `modules/ui_key_verification_runtime` | main runtime callers removed; old headers are deprecated aliases |
+| `LegacyKeyVerificationSource` | `modules/ui_legacy_adapters` real presentation source implementation | `KeyVerificationPresentationSource` in `modules/ui_key_verification_runtime` | main runtime callers removed; old headers are deprecated aliases |
+| `LegacyKeyVerificationActionSink` | `modules/ui_legacy_adapters` real action sink implementation | `KeyVerificationActionSink` in `modules/ui_key_verification_runtime` | main runtime callers removed; old headers are deprecated aliases |
+| `LegacyMapOverlaySource` | `modules/ui_legacy_adapters` real map overlay source implementation | `MapOverlaySnapshotSource` and `MapOverlayProjectionAdapter` in `modules/ui_map_runtime` | main runtime callers removed; old headers are deprecated aliases |
+
+The former `modules/ui_legacy_adapters/src/legacy_key_verification_*` and
+`modules/ui_legacy_adapters/src/legacy_map_overlay_source.cpp` implementation
+files are removed from the build. Compatibility headers remain only as
+forwarding aliases for downstream includes.
+
+## Still Contained
+
+These code-level legacy adapters remain governed by
+`docs/audits/LEGACY_BURNDOWN_REGISTER.md`:
+
+- `LegacyTeamActionBridge`
+- map tile compatibility surfaces
+- route/tracker overlay fallback surfaces
+
+## Next Burn-down Target
+
+The next Phase 9 legacy burn-down target should be selected from the remaining
+non-Chat, non-KeyVerification, non-MapOverlay compatibility surfaces in the
+register. Chat delivery, KeyVerification, and MapOverlay are no longer main
+runtime fallbacks; their remaining work is compatibility alias deletion.
+
+## Rule
+
+Phase 9 does not add new runtime ownership under `legacy/`. Compilation
+failures in a legacy root should be treated as a signal to move the runtime
+surface into a stable module or to replace the legacy adapter.
+
+## Phase 9.2 Correction
+
+Runtime entry adoption helpers are not maintained under
+`legacy/app_implementations`. The Phase 9.2 entry adoption surfaces live in
+`modules/ui_ascii_runtime`, `modules/ui_gtk_runtime`, and
+`modules/ui_lvgl_ux_packs`; final app-shell probes live under
+`apps/linux_sim_shell` and `apps/linux_uconsole_gtk`.
+
+If a future Phase 9 task needs behavior that currently sits in
+`legacy/app_implementations`, the task should burn down that behavior into a
+stable owner instead of adding another compatibility helper inside the legacy
+tree.
+
+## Phase 9.3 Correction
+
+Real runtime entry adoption also stays out of `legacy/app_implementations`.
+The LinuxSim runtime entry and GTK page-registry adoption live under final
+app-shell directories, while the LVGL compatibility runtime adoption probe
+lives under `modules/ui_lvgl_ux_packs`.
+
+Legacy implementation roots may continue to exist as historical fallback, but
+new Phase 9 adoption code must either live in a stable module or in the final
+app-shell surface that owns product startup semantics.
+
+## Phase 9.6 Final Readiness Alignment
+
+Phase 9.6 keeps the legacy burn-down status aligned with
+`docs/audits/PHASE9_FINAL_READINESS_REPORT.md`:
+
+| Surface | Final Phase 9 status | Stable owner | Deletion window |
+| --- | --- | --- | --- |
+| ChatDelivery legacy bridges | main runtime callers removed; deprecated aliases only | `ChatDeliveryActionPortAdapter` and `ChatDeliveryEventProjectionAdapter` | remove alias headers after downstream compatibility includes are gone |
+| KeyVerification legacy source/sink/session | main runtime callers removed; deprecated aliases only | `KeyVerificationPresentationSource`, `KeyVerificationActionSink`, and `KeyVerificationSessionAdapter` | remove alias headers after downstream compatibility includes are gone |
+| MapOverlay legacy source | main runtime callers removed; deprecated aliases only | `MapOverlaySnapshotSource` and `MapOverlayProjectionAdapter` | remove alias headers after downstream compatibility includes are gone and map renderers consume stable snapshots only |
+
+The remaining LinuxSim, GTK, and LVGL hardcoded runtime paths are not reported as burned down.
+They remain contained fallback until Phase 10 makes one adopted runtime path
+primary.
diff --git a/docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md b/docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md
new file mode 100644
index 00000000..18736297
--- /dev/null
+++ b/docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md
@@ -0,0 +1,111 @@
+# Phase 9 Runtime Adoption Report
+
+## Current Scope
+
+Phase 9 starts from the Phase 8 presentation graph and moves runtime consumers
+onto stable module-owned presenters.
+
+The Phase 9.1 baseline is now:
+
+- Linux simulator descriptors live under `modules/ui_ascii_runtime`.
+- uConsole GTK descriptors live under `modules/ui_gtk_runtime`.
+- LVGL descriptors remain under `modules/ui_lvgl_ux_packs/runtime`.
+- `legacy/app_implementations` no longer owns the ASCII/GTK runtime descriptor
+  adapters introduced during Phase 8.
+
+## Runtime Presenters
+
+LinuxSim:
+
+- Presenter: `AsciiRuntimeScreenGraphPresenter`
+- Path: `modules/ui_ascii_runtime`
+- Input: `product_composition::PresentationBundle`
+- Output: `AsciiMenuLine` and `AsciiScreenDescriptor`
+- Validation: `trailmate_ascii_runtime_screen_graph_presenter_smoke`
+
+uConsole GTK:
+
+- Presenter: `GtkUConsoleScreenGraphPresenter`
+- Path: `modules/ui_gtk_runtime`
+- Input: `product_composition::PresentationBundle`
+- Output: `GtkMenuDescriptor` and `GtkScreenDescriptor`
+- Validation: `trailmate_gtk_uconsole_screen_graph_presenter_smoke`
+
+LVGL:
+
+- Presenter: `LvglRuntimeScreenGraphPresenter`
+- Path: `modules/ui_lvgl_ux_packs/runtime`
+- Input: `product_composition::PresentationBundle`
+- Output: `LvglMenuEntry` and `LvglScreenHostEntry`
+- Validation: `trailmate_ui_lvgl_ux_packs_lvgl_runtime_screen_graph_presenter_smoke`
+
+## Adoption Status
+
+The presenters only consume `PresentationBundle`; they do not select UX packs,
+create platform widgets, read app shells, or instantiate runtime services.
+
+The legacy Linux simulator and uConsole roots now link the module-owned
+descriptor runtimes instead of owning those adapters locally. This is a
+burn-down move, not a legacy maintenance expansion.
+
+## Remaining Fallback
+
+The following paths still need Phase 9.2 real entry adoption:
+
+- real Linux simulator UI selection
+- real GTK uConsole page switching
+- real LVGL menu/page renderer
+- hardcoded screen creation fallback
+
+Fallback remains contained until each real runtime entry consumes its presenter
+and treats hardcoded routing as a compatibility fallback only.
+
+## Phase 9.2 Entry Adoption
+
+Phase 9.2 adds thin entry adoption helpers on top of the presenters:
+
+- `AsciiRuntimeEntryAdoption`
+- `GtkRuntimeEntryAdoption`
+- `LvglRuntimeEntryAdoption`
+
+The LinuxSim and GTK helpers live in stable runtime modules:
+
+- `modules/ui_ascii_runtime`
+- `modules/ui_gtk_runtime`
+
+The final app-shell probes live under:
+
+- `apps/linux_sim_shell`
+- `apps/linux_uconsole_gtk`
+
+They are probe glue for shell-selected UX packs. They must not become new
+composition roots, and they must not be added to `legacy/`. The LVGL helper
+remains under `modules/ui_lvgl_ux_packs/runtime`.
+
+The detailed fallback map is tracked in
+`docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md`.
+
+## Phase 9.3 Real Entry Adoption
+
+Phase 9.3 moves beyond app-shell probe smoke coverage by adding real
+entry-facing consumers that still avoid `legacy/app_implementations`:
+
+- `LinuxSimRuntimeEntry` consumes `AsciiRuntimeEntryAdoption` through the
+  final LinuxSim app-shell adoption probe.
+- `LinuxUConsoleGtkPageRegistryAdoption` consumes `GtkRuntimeEntryAdoption`
+  and exposes descriptor data that a GTK page registry can adopt.
+- `LvglRuntimeAdoptionProbe` consumes `LvglRuntimeEntryAdoption` as the LVGL
+  compatibility runtime landing point.
+
+These paths do not create widgets, do not choose UX packs, and do not replace
+the existing hardcoded UI behavior. They mark the hardcoded paths as contained
+fallback until descriptors become the primary route/page/menu source.
+
+The fallback inventory is tracked in
+`docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md`.
+
+## Phase 9 Rule
+
+New runtime/presentation work must not be added to `legacy/`. If a legacy root
+fails to compile because it owns runtime adoption logic, the fix is to move or
+replace that logic under `modules/` and shrink the legacy root.
diff --git a/docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md b/docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md
new file mode 100644
index 00000000..f533a2ec
--- /dev/null
+++ b/docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md
@@ -0,0 +1,111 @@
+# Phase 9 Runtime Entry Adoption Report
+
+## Rule Correction
+
+Phase 9.2 does not add new runtime ownership under
+`legacy/app_implementations`. That tree is a burn-down target. If a runtime
+entry adoption change would require editing a legacy implementation root, the
+correct move is to move or replace that responsibility in a stable module or a
+final app-shell probe.
+
+`legacy/app_implementations remains burn-down`; it is not the home for
+`AsciiRuntimeEntryAdoption`, `GtkRuntimeEntryAdoption`, or future entry
+adoption helpers.
+
+## LinuxSim
+
+Adopted entry/probe path:
+
+- `modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp`
+- `modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_entry_adoption.h`
+- `apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.*`
+- `apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp`
+
+The module helper consumes `PresentationBundle` through
+`AsciiRuntimeScreenGraphPresenter`. The app-shell probe supplies the
+transitional shell-selected UX pack, builds the compatibility presentation
+graph, and loads `AsciiRuntimeEntryAdoption` without touching
+`legacy/app_implementations`.
+
+Fallback path:
+
+- `LinuxSimRuntimeEntryAdoptionProbe::fallbackUsed()` records whether adoption
+  failed and the existing hardcoded simulator UI path should continue.
+- The real simulator UI selection and old page/menu routing are unchanged.
+
+Exit condition:
+
+- the real simulator entry consumes `AsciiRuntimeEntryAdoption` descriptors
+  directly, and old hardcoded routing is only compatibility fallback.
+
+## uConsole GTK
+
+Adopted entry/probe path:
+
+- `modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp`
+- `modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_runtime_entry_adoption.h`
+- `apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.*`
+- `apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp`
+
+The module helper consumes `PresentationBundle` through
+`GtkUConsoleScreenGraphPresenter`. The final GTK app-shell probe loads
+`GtkRuntimeEntryAdoption` from a compatibility presentation graph and keeps the
+historical GTK page registry untouched.
+
+Fallback path:
+
+- `LinuxUConsoleGtkRuntimeEntryAdoptionProbe::fallbackUsed()` records whether
+  adoption failed and the existing hardcoded GTK page list should continue.
+- GTK widget creation and page switching are unchanged.
+
+Exit condition:
+
+- GTK page switching consumes `GtkRuntimeEntryAdoption` descriptors directly,
+  and the hardcoded page registry remains fallback only.
+
+## LVGL
+
+Adopted probe path:
+
+- `modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_entry_adoption.cpp`
+- `modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h`
+- `modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_entry_adoption.cpp`
+
+Fallback path:
+
+- real LVGL menu rendering and screen creation remain unchanged.
+- device-specific LVGL UI keeps its existing compatibility path.
+
+Exit condition:
+
+- a real LVGL runtime entry consumes `LvglRuntimeEntryAdoption` descriptors
+  before falling back to compatibility menu/screen creation.
+
+## Guardrail
+
+Phase 9.2 proves real/probe runtime entry adoption, not full navigation
+migration. Entry adoption helpers do not select UX packs, construct
+`MenuModel`, create GTK/LVGL widgets, or instantiate app services. Final
+app-shell probes may adapt the selected UX pack into a temporary
+`PresentationBundle`, but that is transitional probe glue, not new product
+composition ownership.
+
+## Phase 9.3 Real Entry Adoption
+
+Phase 9.3 adds entry-facing consumers above the Phase 9.2 probes:
+
+- `LinuxSimRuntimeEntry` consumes `AsciiRuntimeEntryAdoption` through
+  `LinuxSimRuntimeEntryAdoptionProbe`.
+- `LinuxUConsoleGtkPageRegistryAdoption` consumes `GtkRuntimeEntryAdoption`
+  and exposes GTK menu/screen descriptors for page-registry adoption.
+- `LvglRuntimeAdoptionProbe` consumes `LvglRuntimeEntryAdoption` as the LVGL
+  compatibility runtime path.
+
+These are real/probe runtime entry paths rather than plain app-shell smoke
+tests. The hardcoded simulator routing, GTK page registry, and LVGL menu/page
+creation remain fallback only and are tracked in
+`docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md`.
+
+`legacy/app_implementations remains burn-down`: Phase 9.3 does not add
+`LinuxSimRuntimeAdoptionBridge`, `GtkRuntimeEntryAdoption`, or screen graph
+bridge files under legacy implementation roots.
diff --git a/docs/audits/POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md b/docs/audits/POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md
new file mode 100644
index 00000000..9e531d12
--- /dev/null
+++ b/docs/audits/POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md
@@ -0,0 +1,67 @@
+# Post-Refactor Final Closeout Report
+
+## Conclusion
+
+This architecture refactor is complete.
+
+Next work is not architecture refactor.
+
+The remaining work is not a continuation of the refactor. It is feature work,
+targeted fallback deletion, targeted deprecated alias deletion, or normal
+platform/build maintenance.
+
+## Completed
+
+| Area | Result |
+| --- | --- |
+| Phase 5-7 runtime ownership | Runtime ownership boundaries and legacy burn-down register established. |
+| Phase 8 directory/app shell/UX/menu/screen graph | `apps/` semantics converged, final app shells established, UX menu/screen graph became portable. |
+| Phase 9 runtime adoption and legacy burn-down | Runtime presenters and entry adoption paths established; ChatDelivery, KeyVerification, and MapOverlay legacy adapters burned down to deprecated aliases. |
+| Phase 10 primary path migration | LinuxSim, GTK page registry, and LVGL compatibility descriptor paths became primary; hardcoded paths became fallback-only. |
+| Phase 11 renderer descriptor consumption | LinuxSim renderer, GTK page registry renderer, and LVGL descriptor renderer probe consume primary descriptors. |
+| Phase 12 closeout | fallback deletion readiness, deprecated alias cleanup plan, architecture freeze, and final guardrail checker established. |
+| Batch 4 root legacy elimination | root `legacy/` removed; historical source roots are recorded only in `docs/archive/REMOVED_LEGACY_ROOTS.md`. |
+
+## Remaining Contained Debt
+
+| Debt | Status | Next action type |
+| --- | --- | --- |
+| GTK real widget rewrite | contained; descriptor page registry exists | targeted renderer migration |
+| LVGL real widget/menu rewrite | contained; descriptor menu model exists | targeted device renderer migration |
+| fallback deletion | readiness ledger exists | targeted fallback deletion |
+| removed legacy source roots | deleted; history recorded in docs/archive | no source archive retained |
+| compatibility alias headers | deprecated aliases only | targeted alias deletion after downstream includes disappear |
+| map tile/route/tracker remaining legacy surfaces | registered contained debt | targeted debt deletion |
+
+## Post-Refactor Rule
+
+New features must enter through:
+
+`app shell / UX pack / presentation graph / descriptor path / renderer-safe consumption`
+
+New features must not introduce:
+
+- new `Legacy*` bridges
+- new hardcoded page registry as primary source
+- renderer-level UX pack selection
+- module dependencies on app shells
+- root `legacy/`
+- `legacy/app_implementations/`
+- active checker requiring legacy roots
+- source archive under `docs/archive`
+- new `legacy_source_descriptor`
+- new transitional UI layer
+
+## Final Guardrail
+
+`tools/architecture/check_post_refactor_final_ready.py` is the final post-refactor
+gate. It runs or verifies the Phase 8-11 gates, checks Phase 12 closeout
+documents, enforces final app shell directory semantics, runs the no-root
+legacy checker, and blocks regression to burned-down legacy headers or
+renderer-level UX selection.
+
+## Final Statement
+
+This round of architecture refactor is closed. Future work should be planned as
+feature delivery or narrowly scoped debt deletion, not as another broad
+structure-building phase.
diff --git a/docs/audits/PRODUCT_COMPOSITION_BOUNDARY_AUDIT.md b/docs/audits/PRODUCT_COMPOSITION_BOUNDARY_AUDIT.md
new file mode 100644
index 00000000..ea163381
--- /dev/null
+++ b/docs/audits/PRODUCT_COMPOSITION_BOUNDARY_AUDIT.md
@@ -0,0 +1,124 @@
+# Product Composition Boundary Audit
+
+## Purpose
+
+Phase 6 establishes product composition and app shell boundaries.
+
+It does not rewrite all legacy UI or runtime code. It identifies where object
+graph construction currently lives and moves target-specific wiring toward
+composition roots.
+
+## Composition Rule
+
+Composition roots wire object graphs.
+
+They do not own business behavior, protocol interpretation, renderer widget
+logic, GPS parsing, radio packet parsing, tile cache behavior, or message
+policy.
+
+## Current Composition Surfaces
+
+| Surface | Current owner | Objects created | Problem | Target owner |
+| --- | --- | --- | --- | --- |
+| ESP Arduino app init | `apps/esp_pio` startup/runtime files | AppContext, LVGL runtime, GPS, mesh, BLE, UI entry points | target wiring mixed with runtime lifecycle and global AppContext | ESP LVGL composition root / legacy bridge |
+| ESP-IDF app init | `apps/esp_idf` startup/runtime files | app facade runtime, GPS/radio/team adapters, loop runtime | target wiring mixed with platform boot and runtime scheduling | ESP-IDF composition root / legacy bridge |
+| Linux simulator | `apps/linux_sim` CMake/tests/main | simulator shell, probes, fake presentation sources/sinks | mostly test composition, but not named as target composition | linux-sim composition root |
+| uConsole GTK | `apps/linux_uconsole` / `platform/linux/uconsole` | GTK app state, uConsole chat/map/dashboard models | platform model, presentation graph, and renderer state are adjacent | linux-uconsole composition root |
+| AppContext / facade access | shared app runtime and `app::messagingFacade()` | ChatService, ContactService, self node id, compatibility facades | implicit service locator | `LegacyAppContextBridge` |
+| Chat page runtime | `modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp` | chat presentation sources/sinks and `ChatWorkspaceModel` objects | page runtime still owns part of presentation object graph | app shell composition root |
+| ChatUiController | `modules/ui_shared/src/ui/screens/chat/chat_ui_controller.*` | consumes ChatService, chat models, event bus, LVGL state | controller is still composition-like legacy island | app shell / controller split |
+| GPS page runtime | `modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp` | map presentation source/sink/model, map page runtime | renderer/runtime mixed with object graph bridge | app shell / map page bridge |
+| Dashboard GPS widget | `modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp` | local `GpsStatusModel` bridge | hardened slice, but still local construction | app shell / dashboard presentation binding |
+
+## Object Graph Inventory
+
+### App Services
+
+- `ChatService`
+- `ContactService`
+- Team services / `TeamUiStore`
+- Settings/config services
+- mesh/radio services
+- GPS services and compatibility runtime
+- phone/BLE facades
+
+### Presentation Sources/Sinks
+
+- `LegacyAirDeviceStatusSource`
+- `LegacyGpsStatusSource`
+- `LegacyMeshStatusSource`
+- `LegacySettingsSource`
+- `LegacySettingsActionSink`
+- `ChatPresentationSource`
+- `LegacyChatActionSink`
+- `TeamChatPresentationSource`
+- `TeamChatActionSink`
+- `LegacyMapPresentationSource`
+- `LegacyMapActionSink`
+
+### Presentation Models
+
+- `DeviceStatusModel`
+- `GpsStatusModel`
+- `MeshStatusModel`
+- `SettingsModel`
+- `ChatWorkspaceModel`
+- Team `ChatWorkspaceModel`
+- `MapWorkspaceModel`
+- `PresentationWorkspace`
+
+### Renderers / Shells
+
+- LVGL shell and page runtimes
+- GTK/uConsole shell and app models
+- ASCII/headless probes
+- Linux simulator SDL shell
+
+## Current Target-Specific Shape
+
+### Linux Sim
+
+Linux simulator already has small smoke/probe composition in tests. Phase 6
+should name this as a `LinuxSimCompositionRoot` pilot so target object graph
+ownership is explicit.
+
+### Linux uConsole
+
+uConsole already owns a GTK app state and platform-specific app models. Phase 6
+should introduce a `UConsoleCompositionRoot` pilot that exposes
+`PresentationBundle` without moving tile/cache/contour behavior into
+presentation snapshots.
+
+### ESP LVGL
+
+ESP startup has sensitive static lifetime, task ordering, LVGL initialization,
+GPS/radio/BLE initialization, and storage ordering constraints. Phase 6 should
+introduce an ESP LVGL composition root bridge first, not reorder startup.
+
+## Phase 6 Scope
+
+Phase 6 will:
+
+- introduce composition root contracts
+- pilot Linux simulator composition
+- pilot uConsole composition
+- introduce an ESP LVGL composition bridge/audit
+- contain AppContext behind explicit legacy bridge documentation
+- add checker coverage for object graph construction boundaries
+
+Phase 6 will not:
+
+- remove all AppContext usage
+- rewrite all renderers
+- rewrite protocol/core services
+- turn target manifests into runtime configuration
+- fully reorder ESP startup
+- move tile/cache into `MapWorkspaceSnapshot`
+
+## Boundary Decision
+
+Object graph construction should move toward target/app shell composition roots.
+
+Existing page/controller/runtime construction is allowed only as bounded legacy
+ownership. New presentation model/source/sink construction should prefer target
+composition code or documented bridge objects.
diff --git a/docs/audits/RENDERER_BOUNDARY_AUDIT.md b/docs/audits/RENDERER_BOUNDARY_AUDIT.md
new file mode 100644
index 00000000..1fa77aa9
--- /dev/null
+++ b/docs/audits/RENDERER_BOUNDARY_AUDIT.md
@@ -0,0 +1,134 @@
+# Renderer Boundary Audit
+
+## Purpose
+
+Phase 5.9 hardens renderer boundaries.
+
+It does not clean every legacy UI island. It prevents new renderer couplings
+and locks migrated surfaces behind PresentationModel boundaries.
+
+## Renderer Rule
+
+Renderers may:
+
+- consume presentation snapshots
+- send presentation actions
+- own widget/tree/layout/input state
+- format pixels/text/layout
+
+Renderers must not directly read:
+
+- GPS runtime
+- radio / mesh adapter
+- `ChatService` / `ContactService`
+- `TeamUiStore` raw state
+- tile cache / SD map store
+- Settings store
+- board/device runtime
+- protocol internals
+
+## Renderer Categories
+
+| Category | Examples | Phase 5.9 policy |
+| --- | --- | --- |
+| Clean renderer | ASCII probes, new snapshot renderers | strict |
+| Migrated renderer surface | Chat non-team path, Team text path, Map workspace status | strict for migrated path |
+| Legacy island | `ChatUiController`, `GPSPageState`, map viewport tile runtime | baseline |
+| Platform application model | `UConsoleMapWorkspaceModel` | bounded legacy, not pure renderer |
+| GTK/uConsole renderer | GTK app logic and widgets | strict only where a presentation bridge exists |
+
+## Known Legacy Islands
+
+- `ChatUiController`
+- `GPSPageState`
+- `ui/widgets/map/map_viewport`
+- LVGL GPS/status page legacy sections
+- LVGL dashboard GPS/compass/recent widgets
+- uConsole tile/cache/contour model
+- uConsole chat/dashboard app models
+- uConsole GTK overview GPS compatibility logic
+- key verification modal
+- Team location/command picker
+- route/tracker overlays
+- rich Team map markers
+
+## Strict Surfaces
+
+These should not regress:
+
+- `ui_presentation/*`
+- `apps/linux_sim/tests/*ascii_probe*.cpp`
+- `ChatPresentationSource` / `LegacyChatActionSink`
+- `TeamChatPresentationSource` / `TeamChatActionSink`
+- `LegacyMapPresentationSource` / `LegacyMapActionSink`
+- `ChatWorkspaceModel`-backed non-team message rendering
+- `TeamChatPresentationSource`-backed Team text rendering
+- `MapWorkspaceModel`-backed map workspace status/action path
+- LVGL dashboard GPS status labels backed by `GpsStatusModel`
+- uConsole `presentation_workspace` bridge
+- uConsole presentation workspace smoke
+
+## Migrated Path Locks
+
+Chat migrated path:
+
+- non-team selection/read/send must continue flowing through `chat_model_`
+- Team text projection/send must continue flowing through `team_chat_model_`
+- key verification, event handling, conversation cache, and Team
+  location/command picker remain legacy-owned
+
+Map migrated path:
+
+- compact LVGL map status/action path must continue using
+  `map_workspace_model().snapshot()`
+- compact LVGL center-on-self action must continue using
+  `map_workspace_model().centerOnSelf()`
+- uConsole map status/center summary must continue exposing
+  `presentation_workspace`
+- tile/cache/contour rendering remains legacy-owned
+
+ASCII/headless migrated path:
+
+- ASCII probes must consume `ui_presentation` models and fake source/sink
+  implementations only
+- ASCII probes must not directly include toolkit, runtime, store, or service
+  headers
+- `trailmate_map_workspace_ascii_probe` must render map workspace state from
+  `MapWorkspaceModel`
+- `trailmate_presentation_workspace_ascii_probe` must render Device/GPS/Mesh,
+  Settings/Chat/TeamChat capability flags, and Map summary from
+  `PresentationWorkspaceProbe`
+
+LVGL dashboard migrated path:
+
+- GPS status label, fix chip, and satellite count summary should continue using
+  `dashboard_gps_status_model().snapshot()`
+- the satellite radar remains a baseline legacy section until a richer GNSS
+  skyplot presentation source exists
+
+GTK/uConsole migrated path:
+
+- `UConsoleMapWorkspaceModel` must keep exposing `presentation_workspace`
+- `UConsoleMapWorkspaceModel` must keep map status/center projection behind
+  `LegacyMapPresentationSource`, `LegacyMapActionSink`, and
+  `MapWorkspaceModel`
+- GTK overview GPS compatibility logic remains a baseline legacy island until a
+  dedicated overview presentation model exists
+
+## Deferred
+
+- full `ChatUiController` cleanup
+- full `GPSPageState` cleanup
+- full map viewport tile/cache renderer cleanup
+- full uConsole app model cleanup
+- rich map overlay cleanup
+- structured pending/failure
+- rich Team payload rendering
+
+## Interpretation
+
+Phase 5.9 is a regression guard and incremental renderer hardening step.
+
+Historical renderer couplings are recorded as a baseline. New renderer code must
+prefer presentation models. New direct runtime reads must either move behind a
+source/sink boundary or be added to the legacy baseline with an explicit reason.
diff --git a/docs/audits/RENDERER_HARDENING_BASELINE.md b/docs/audits/RENDERER_HARDENING_BASELINE.md
new file mode 100644
index 00000000..226b4c2a
--- /dev/null
+++ b/docs/audits/RENDERER_HARDENING_BASELINE.md
@@ -0,0 +1,66 @@
+# Renderer Hardening Baseline
+
+## Purpose
+
+Phase 5.9 introduces renderer hardening without pretending the legacy renderer
+is already clean.
+
+This baseline records known renderer legacy islands that are allowed to remain
+while strict surfaces are locked.
+
+## Policy
+
+Default renderer hardening checks must:
+
+- fail on strict surface violations
+- fail when migrated paths lose their presentation model locks
+- report baseline legacy islands without failing
+
+Strict surfaces include:
+
+- `ui_presentation/*`
+- ASCII/headless probes
+- Chat/Team/Map presentation sources and sinks
+- migrated Chat/Team/Map paths
+- uConsole `presentation_workspace` bridge
+
+Baseline islands are not a free pass for new work. New renderer code must prefer
+presentation models. New direct runtime reads must either move behind a
+source/sink boundary or be added to the baseline with an explicit reason.
+
+## Baseline File
+
+The machine-readable baseline lives at:
+
+```text
+tools/architecture/phase5_renderer_legacy_baseline.json
+```
+
+It records:
+
+- legacy island id
+- path
+- allowed tokens
+- reason
+- expected future cleanup phase
+
+## Known Legacy Island Summary
+
+| Island | Status |
+| --- | --- |
+| `ChatUiController` | legacy application controller |
+| `GPSPageState` | legacy LVGL map/GPS page state |
+| `ui/widgets/map/map_viewport` | legacy tile renderer/runtime |
+| LVGL dashboard widgets | incremental snapshot migration target |
+| uConsole map model | bounded platform application model |
+| uConsole chat/dashboard models | bounded platform application models |
+| uConsole GTK overview logic | legacy GPS compatibility renderer |
+| tracker route overlays | deferred renderer cleanup |
+
+## Interpretation
+
+The baseline should shrink over time.
+
+Adding a new baseline entry is an architecture decision, not a workaround. It
+must explain why the coupling remains outside the current phase and which future
+cleanup should own it.
diff --git a/docs/audits/REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md b/docs/audits/REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md
new file mode 100644
index 00000000..d0d8e990
--- /dev/null
+++ b/docs/audits/REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md
@@ -0,0 +1,236 @@
+# Repository Layout Current State Audit
+
+## Purpose
+
+Phase 8 starts by naming the current repository layout accurately.
+
+This audit records where current folder names already match architecture
+semantics and where they are historical build, platform, or UI migration
+artifacts. It does not require immediate movement.
+
+## Current Top-Level Shape
+
+Observed top-level architecture directories:
+
+```text
+apps/
+boards/
+docs/
+modules/
+platform/
+tools/
+```
+
+Observed historical/build artifacts also exist at the top level:
+
+```text
+build/
+build.cardputer/
+build.tab5/
+build.t_display_p4/
+build.t_display_p4_amoled/
+build.t_display_p4_tft/
+cmake/
+managed_components/
+packs/
+src/
+third_party/
+variants/
+```
+
+These may remain for current build compatibility. Phase 8 should not treat
+their current placement as final architecture semantics without a migration
+decision.
+
+## Current `apps/`
+
+Observed app/build shell directories:
+
+```text
+apps/
+  esp_idf/
+  esp_pio/
+  gat562_mesh_evb_pro/
+  linux_rpi/
+  linux_sim/
+  linux_uconsole/
+  linux_unoq/
+```
+
+Audit finding:
+
+`legacy/app_implementations/esp_idf` and
+`legacy/app_implementations/esp_pio` are build entrypoints, not final app shells.
+
+They are named after build systems and currently carry build-host concerns.
+Phase 8 should classify them as transitional build entrypoints until a
+`builds/esp_idf` and nRF/PIO entrypoint plan exists.
+
+`legacy/app_implementations/linux_sim` and
+`legacy/app_implementations/linux_uconsole` are historical implementation
+roots. Their old names mixed shell, target, platform, and device identity; they
+are no longer current `apps/` entries.
+
+## Current `modules/`
+
+Observed reusable modules include:
+
+```text
+modules/chat_presentation_adapters/
+modules/core_chat/
+modules/core_device/
+modules/core_gps/
+modules/core_hostlink/
+modules/core_mesh/
+modules/core_phone/
+modules/core_sys/
+modules/core_team/
+modules/product_composition/
+modules/ui_mono_128x64/
+modules/ui_presentation/
+modules/ui_shared/
+```
+
+Audit finding:
+
+`modules/` is the right place for reusable code, but module names do not yet
+separate all UI responsibilities. `ui_shared` currently mixes LVGL core,
+widgets, screens, runtime bridges, presentation sources, action bridges, map
+tile helpers, and screen-specific renderers.
+
+## Current `platform/`
+
+Observed platform directories:
+
+```text
+platform/
+  esp/
+  linux/
+  nrf52/
+  shared/
+```
+
+Audit finding:
+
+The high-level platform split is recognizable. The remaining risk is platform
+code carrying product behavior or app graph decisions while Phase 8 transitions
+build entrypoints and app shells.
+
+Platform code should provide SDK/HAL/runtime adapters. It should not decide UX
+pack, page set, Chat/Map/GPS runtime ownership, or product feature depth.
+
+## Current `boards/`
+
+Observed board directories and manifests include:
+
+```text
+boards/
+  gat562_mesh_evb_pro/
+  tab5/
+  tdeck/
+  tdeck_pro/
+  tlora_pager/
+  twatchs3/
+  t_display_p4/
+  *.json
+```
+
+Audit finding:
+
+Board facts are present and should remain descriptive. A board may describe
+display size, touch support, keys, buses, GPS, radio, battery, and storage. It
+must not decide whether the product exposes a full map, compact map, full chat,
+quick chat, or status-only UX.
+
+## Current UI Split Problem
+
+`ui_shared` mixes LVGL core/widgets/screens/runtime bridges/adapters.
+
+Current examples include:
+
+- LVGL components and widgets under `include/ui/components`, `include/ui/widgets`
+- screen implementations under `include/ui/screens` and `src/ui/screens`
+- page/menu runtime helpers under `include/ui/page`, `include/ui/menu`, and
+  `src/ui/menu`
+- legacy presentation sources under `include/ui/presentation_sources`
+- legacy action bridges under `include/ui/team_actions` and presentation source
+  paths
+- map tile helpers under `include/ui/map_tiles` and `src/ui/map_tiles`
+- map overlay helpers under `include/ui/map_overlay` and `src/ui/map_overlay`
+- chat screen runtime helpers under `include/ui/screens/chat`
+- GPS page runtime pump under `include/ui/screens/gps`
+
+This does not mean all code is wrongly placed. It means the current module name
+no longer expresses the distinct responsibilities Phase 7 created.
+
+## Device UX Modeling Gap
+
+Device-specific UX differences are not yet modeled as UX packs.
+
+In checker terms, current device-specific UX is still implicit rather than
+declared by `DeviceUxProfile` and `UxPack` documents.
+
+ESP/nRF UI appears in modules while uConsole is in apps. That means device
+differences are currently represented partly by source placement, partly by app
+shell, partly by build entrypoint, and partly by renderer implementation.
+
+The missing architecture object is the UX pack:
+
+```text
+target product choice
+  -> device UX profile
+    -> UX pack
+      -> screen set + input binding set + layout profile + renderer variants
+```
+
+Without UX packs, device behavior can drift into pages, board manifests,
+platform adapters, or build-system directories.
+
+## Legacy Adapter State
+
+Legacy* adapters remain bounded but not renamed/deleted.
+
+Examples recorded by Phase 7 include:
+
+- `LegacyChatDeliveryEventBridge`
+- `LegacyChatDeliveryActionBridge`
+- `LegacyTeamActionBridge`
+- `LegacyKeyVerificationSource`
+- `LegacyKeyVerificationActionSink`
+- `LegacyFilesystemMapTileSource`
+- `LegacyMapOverlaySource`
+
+Phase 7 contained these surfaces behind ports and reports. Phase 8 should sort
+them into:
+
+- temporary bridge to burn down
+- stable official adapter to rename
+- dead historical code to remove
+
+## Main Current-State Findings
+
+| Surface | Current state | Phase 8 interpretation |
+| --- | --- | --- |
+| `apps/esp_idf` | build-system named app directory | transitional build entrypoint |
+| `apps/esp_pio` | build-system named app directory | transitional build entrypoint |
+| Linux app dirs | app shell and target identity mixed | transitional product app shells |
+| `modules/ui_shared` | mixed LVGL, screens, runtime helpers, adapters | split planning target |
+| `platform/` | platform families visible | keep SDK/HAL/runtime adapter meaning strict |
+| `boards/` | board facts visible | keep descriptive, not product deciding |
+| Device UX | implicit in pages/apps/builds | introduce UX pack architecture |
+| `Legacy*` adapters | contained, not normalized | rename/delete planning target |
+
+## Explicit Non-Action For 8.1
+
+Phase 8.1 should not:
+
+- move `apps/esp_idf`
+- move `apps/esp_pio`
+- create the final `builds/` tree
+- split `ui_shared`
+- rename `Legacy*` classes
+- rewrite CMake, PlatformIO, or ESP-IDF entrypoints
+- change target startup behavior
+
+The immediate action is to add repository layout and UX pack specifications plus
+a gentle checker so later physical movement has a stable boundary to obey.
diff --git a/docs/audits/TARGET_UI_FINAL_OWNERSHIP_REPORT.md b/docs/audits/TARGET_UI_FINAL_OWNERSHIP_REPORT.md
new file mode 100644
index 00000000..45790176
--- /dev/null
+++ b/docs/audits/TARGET_UI_FINAL_OWNERSHIP_REPORT.md
@@ -0,0 +1,97 @@
+# Target UI Final Ownership Report
+
+Batch 3 completed final ownership metadata for all currently requested target
+IDs without moving old UI files into a new wrapper layer.
+
+Batch 4 removed root `legacy/`. Historical legacy source roots are recorded
+only in `docs/archive/REMOVED_LEGACY_ROOTS.md`; no source archive is retained.
+
+## Coverage
+
+Covered target IDs:
+
+- `tab5`
+- `tdisplayp4_tft`
+- `tdisplayp4_amoled`
+- `tlora_pager`
+- `tdeck`
+- `twatch`
+- `uconsole`
+- `cardputerzero`
+- `gat562_mesh_evb_pro`
+
+## Final Ownership Map
+
+| responsibility | final owner | Batch 3 artifact |
+| --- | --- | --- |
+| target detection and product route | `modules/product_composition` | `TargetProfile` |
+| build route binding | `modules/product_composition` | `TargetBuildBinding` |
+| desired/current UX binding | `modules/product_composition` | `TargetUxBinding` |
+| display and input facts | `boards/*` plus UI profile metadata | `BOARD.md`, `board_facts.h`, `TargetUiProfile` |
+| page set | `modules/ui_presentation` | `PageManifest` |
+| layout decision | `modules/ui_presentation` | `LayoutProfile` |
+| LVGL consumption | `modules/ui_lvgl_ux_packs` | existing descriptor/pack runtime |
+| GTK consumption | `modules/ui_gtk_runtime` | existing descriptor page registry path |
+| ASCII consumption | `modules/ui_ascii_runtime` | existing descriptor renderer path |
+| headless consumption | `modules/ui_headless_runtime` | existing headless descriptor consumer from Batch 1 |
+| app wiring | `apps/*` | app shell `targetProfile()`, `targetId()`, `activeUxPackId()` |
+| build wiring | `builds/*` | `builds/esp_idf`, `builds/linux_cmake`, `builds/pio_nrf52` |
+
+## UI Profile Decisions
+
+| target family | UI profile | evidence boundary |
+| --- | --- | --- |
+| `tab5` | `tab5_touch_ui` | board profile proves touch/display/audio/SD/GPS/LoRa; dimensions remain repo-evidence pending |
+| `tdisplayp4` | `tdisplayp4_touch_ui` | board profile proves touch plus HI8561/RM69A10 panel facts |
+| `tlora_pager` | `pager_compact_ui` | board YAML and variant env prove compact landscape build size and keyboard/rotary input |
+| `tdeck` | `deck_wide_ui` | board YAML proves keyboard/touch/trackball and 320 x 240 display |
+| `twatch` | `watch_compact_ui` | board code and variant env prove 240 x 240 touch watch route |
+| `uconsole` | `uconsole_desktop_ui` | Linux uConsole capability doc proves GTK desktop keyboard/pointer route |
+| `cardputerzero` | `cardputer_compact_ui` | Linux docs and common display profile prove current 320 x 170 Linux shell route |
+| `gat562_mesh_evb_pro` | `node_headless_ui` | nRF52 capability doc says product UI host is none; board facts still retain the physical 128 x 64 display |
+
+## Page Set Ownership
+
+Page membership now lives in `modules/ui_presentation/page/page_manifest.*`.
+The manifests use page IDs already present in the repository's existing shared
+screen and UX documentation. The headless node manifest contains only
+node-status and diagnostics surfaces and does not receive the full GUI page
+set.
+
+## Layout Ownership
+
+Layout shape now lives in `modules/ui_presentation/layout/layout_profile.*`.
+Profiles for large touch, compact pager, deck, watch, desktop, Cardputer, and
+headless node are separate final DTOs. They are not widget implementations and
+do not create LVGL or GTK objects.
+
+## App Shell Wiring
+
+App shells now expose:
+
+- `targetId()`
+- `targetProfile()`
+- `activeUxPackId()`
+
+`activeUxPackId()` resolves through `TargetUxBinding`, so fallback selection is
+not hidden inside the shell.
+
+## Explicit Non-Introductions
+
+- No intermediate UI layer introduced.
+- No transitional UI adapter introduced.
+- No legacy UI extraction layer introduced.
+- No old UI file was copied wholesale into a new module.
+- No renderer is allowed to choose a target or UX pack.
+- No board fact file is allowed to choose product presentation.
+- No active architecture layer may be named `legacy/`.
+
+## Remaining Gaps
+
+The following gaps are real and intentionally recorded instead of guessed:
+
+- final executable UX packs for `tab5_touch`, `tdisplayp4_touch`,
+  `pager_compact`, `deck_full`, `watch_compact`, `cardputer_compact`, and
+  `node_headless`;
+- ESP-IDF target defaults for `tlora_pager`, `tdeck`, and `twatch`;
+- dedicated Cardputer Zero app shell decision.
diff --git a/docs/audits/TARGET_UX_PACK_GAP_REPORT.md b/docs/audits/TARGET_UX_PACK_GAP_REPORT.md
new file mode 100644
index 00000000..d7dfbcbf
--- /dev/null
+++ b/docs/audits/TARGET_UX_PACK_GAP_REPORT.md
@@ -0,0 +1,30 @@
+# Target UX Pack Gap Report
+
+Batch 3 records final desired UX pack IDs for every target, but this repository
+currently has only these executable pack IDs:
+
+- `compatibility`
+- `uconsole_desktop`
+- `tiny_node_status`
+- `simulator_full`
+
+The table below prevents missing final packs from being mistaken for completed
+runtime implementations.
+
+| target | desired ux_pack | current actual fallback | exit condition | owner |
+| --- | --- | --- | --- | --- |
+| `tab5` | `tab5_touch` | `compatibility` | executable `tab5_touch` pack registered and covered by app shell smoke | `modules/ui_lvgl_ux_packs + apps/esp32_lvgl` |
+| `tdisplayp4_tft` | `tdisplayp4_touch` | `compatibility` | executable `tdisplayp4_touch` pack registered for TFT panel route | `modules/ui_lvgl_ux_packs + apps/esp32_lvgl` |
+| `tdisplayp4_amoled` | `tdisplayp4_touch` | `compatibility` | executable `tdisplayp4_touch` pack registered for AMOLED panel route | `modules/ui_lvgl_ux_packs + apps/esp32_lvgl` |
+| `tlora_pager` | `pager_compact` | `compatibility` | executable `pager_compact` pack registered after IDF route evidence is closed | `modules/ui_lvgl_ux_packs + apps/esp32_lvgl` |
+| `tdeck` | `deck_full` | `compatibility` | executable `deck_full` pack registered after IDF route evidence is closed | `modules/ui_lvgl_ux_packs + apps/esp32_lvgl` |
+| `twatch` | `watch_compact` | `compatibility` | executable `watch_compact` pack registered after IDF route evidence is closed | `modules/ui_lvgl_ux_packs + apps/esp32_lvgl` |
+| `uconsole` | `uconsole_desktop` | `uconsole_desktop` | none; current pack already resolves | `apps/linux_uconsole_gtk + modules/ui_gtk_runtime` |
+| `cardputerzero` | `cardputer_compact` | `simulator_full` | final Cardputer Zero Linux device app shell or accepted simulator-shell route consumes `cardputer_compact` | `apps/linux_sim_shell + platform/linux/common` |
+| `gat562_mesh_evb_pro` | `node_headless` | `tiny_node_status` | headless descriptor consumer becomes the active nRF52 node path | `apps/nrf52_node + modules/ui_headless_runtime` |
+
+## Rule
+
+`TargetProfile.ux_pack_id` is final intent. `TargetUxBinding.active_ux_pack_id`
+is the currently resolvable runtime pack. App shells must use the binding rather
+than choose a fallback locally.
diff --git a/docs/audits/TEAM_ACTION_OWNERSHIP_AUDIT.md b/docs/audits/TEAM_ACTION_OWNERSHIP_AUDIT.md
new file mode 100644
index 00000000..3d7b4ac7
--- /dev/null
+++ b/docs/audits/TEAM_ACTION_OWNERSHIP_AUDIT.md
@@ -0,0 +1,111 @@
+# Team Action Ownership Audit
+
+## Purpose
+
+Phase 7.2 establishes runtime/action ownership for Team text, location, and
+command actions.
+
+Team actions are command ownership, not renderer ownership and not
+`ChatWorkspaceModel` ownership.
+
+## Current State
+
+| Action | Current owner | Current UI path | Problem |
+| --- | --- | --- | --- |
+| Team text | `TeamChatActionSink` | Team chat compose path | mostly migrated |
+| Team location marker | `ChatUiController::sendTeamLocationWithIcon` | Team position picker | GPS read, key setup, payload encoding, send, and log append are mixed with UI |
+| Team command | no active send path in Chat UI; read formatting exists | command payload display path | command encoding ownership is not explicit |
+| Team log append | `TeamUiStore` runtime helpers | mixed Team/chat handlers | outgoing projection is not uniformly owned by Team action runtime |
+
+## Current Team Text Send
+
+Team text send flows through:
+
+```text
+ChatUiController
+  -> team_chat_model_.sendMessage(...)
+    -> TeamChatActionSink
+      -> ITeamChatCommandPort
+      -> TeamController::onChat(...)
+```
+
+This is the desired Phase 7.2 baseline for text.
+
+## Current Location Marker Send
+
+Team location marker send currently lives in the chat UI controller:
+
+```text
+ChatUiController::sendTeamLocationWithIcon(...)
+  -> platform GPS runtime read
+  -> TeamUiStore snapshot
+  -> TeamController key setup
+  -> TeamChatLocation payload encoding
+  -> TeamController::onChat(...)
+  -> TeamUiStore chat log append
+```
+
+This is too much runtime behavior inside a renderer/controller surface.
+
+## Current Command Send
+
+The chat UI currently formats incoming or logged Team command payloads, but no
+active command send entry point is wired in the Chat UI.
+
+Phase 7.2 should still define command action ownership so future command UI
+does not add payload encoding back to `ChatUiController`.
+
+## Boundary Rule
+
+Renderer/controller code may collect user input but must not:
+
+- encode Team payloads
+- directly send Team runtime packets
+- set Team protocol keys
+- append outgoing Team location/command logs
+- map Team to DirectPeer or Channel
+
+## Target Ownership
+
+Team actions are owned by:
+
+```text
+TeamActionSink / LegacyTeamActionBridge
+```
+
+Team payload encoding is owned by:
+
+```text
+TeamPayloadEncoder / protocol adapter
+```
+
+Team read projection remains:
+
+```text
+TeamChatPresentationSource
+```
+
+## Phase 7.2 Decision
+
+Phase 7.2 migrates Team location send behind an explicit Team action sink and
+bridge.
+
+The chat UI submits `TeamActionRequest` with marker intent. Current location
+resolution, Team key setup, payload encoding, Team runtime send, and outgoing
+Team log append move behind `LegacyTeamActionBridge` and its runtime ports.
+
+Phase 7.2 defines Team command action types and bridge behavior, but the
+current Chat UI command send path remains unsupported until a real command UI
+surface exists.
+
+Phase 7.2 does not implement rich Team payload rendering.
+
+## Remaining Legacy
+
+The following remain bounded legacy:
+
+- Team position picker widgets
+- Team rich payload rendering
+- command UI creation
+- Team key verification modal
+- Team payload display formatting in existing chat/team views
diff --git a/docs/audits/TEAM_CHAT_PRESENTATION_AUDIT.md b/docs/audits/TEAM_CHAT_PRESENTATION_AUDIT.md
new file mode 100644
index 00000000..75518237
--- /dev/null
+++ b/docs/audits/TEAM_CHAT_PRESENTATION_AUDIT.md
@@ -0,0 +1,138 @@
+# Team Chat Presentation Audit
+
+## Purpose
+
+Team chat is not a DirectPeer or Channel conversation.
+
+It is a team-scoped collaboration projection and must not be forced into
+`chat::ConversationId`.
+
+## Current Sources
+
+Current Team chat UI reads from:
+
+- TeamUiStore
+- TeamUiSnapshot
+- TeamChatLogEntry
+- TeamChatType::Text
+- TeamChatType::Location
+- TeamChatType::Command
+- Team location marker helpers
+- Team command/location encoding and decoding helpers
+
+## Current Owner
+
+Current owner:
+
+```text
+Team bounded presentation context, with remaining ChatUiController legacy flows
+```
+
+## Migrated in Phase 5.6-f
+
+The following Team chat presentation surfaces have been migrated:
+
+- Team text projection migrated to `TeamChatPresentationSource`
+- Team text send migrated to `TeamChatActionSink`
+- Team location entries are projected as textual `MessageRow` summaries by
+  `TeamChatPresentationSource`
+- Team command entries are projected as textual `MessageRow` summaries by
+  `TeamChatPresentationSource`
+- Team read/unread clear can be handled by `TeamChatActionSink::markRead`
+
+## Remaining Legacy Ownership
+
+The following remain legacy-owned:
+
+- Team location picker UI
+- Team location marker send flow
+- Team command send flow
+- Rich Team payload rendering beyond textual `MessageRow` summaries
+- Team pending/failure structured delivery
+- Team position picker LVGL overlay
+
+## Target Presentation Identity
+
+Team rows must use:
+
+```text
+ui::chat::ConversationKind::Team
+ui::chat::ChatProtocolKind::TrailMate or Mixed
+```
+
+Team conversation must not be converted through `toCoreConversationId`.
+
+## Target Read Side
+
+Phase 5.6-f introduced:
+
+```text
+TeamChatPresentationSource
+```
+
+It projects:
+
+- team text entries
+- team location entries
+- team command entries
+- team unread state
+- team title
+- team sender labels
+- team delivery state where available
+
+## Target Write Side
+
+Phase 5.6-f introduced:
+
+```text
+TeamChatActionSink
+```
+
+It handles:
+
+- send team text
+
+It does not yet handle:
+
+- send team location marker
+- send team command
+
+Those remain bounded legacy/future work until their action contract and richer
+payload UI are defined.
+
+## Non-Goals Before 5.6-f
+
+Do not:
+
+- map Team to DirectPeer
+- map Team to Channel
+- send Team text through `LegacyChatActionSink`
+- store Team messages as generic `ChatMessage` unless a separate design says so
+- force Team location/command payload into generic `MessageRow` payload fields
+
+## Open Questions
+
+- Should team text be stored in ChatService history or remain TeamUiStore-owned?
+- Should team location/command be rendered as MessageRow text only or get a
+  richer row type later?
+- Should Team failure state use MessageFailureKind or a team-specific failure
+  enum?
+- Does Team chat need its own pending queue?
+
+## Pattern
+
+This is a bounded presentation context.
+
+```text
+Team chat and Direct/Channel chat can share UI appearance,
+but they do not share business identity or send semantics.
+```
+
+## Phase 5.6-f Status
+
+The generic chat path remains DirectPeer/Channel focused. Team text now has its
+own read adapter, command sink, and `ChatWorkspaceModel` instance.
+
+Location and command entries are read-side textual projections only. Their
+picker/send actions remain legacy-owned and must not be routed through
+`LegacyChatActionSink`, `toCoreConversationId`, or direct/channel send paths.
diff --git a/docs/audits/TEAM_POSITION_PICKER_RENDERER_AUDIT.md b/docs/audits/TEAM_POSITION_PICKER_RENDERER_AUDIT.md
new file mode 100644
index 00000000..432ab95d
--- /dev/null
+++ b/docs/audits/TEAM_POSITION_PICKER_RENDERER_AUDIT.md
@@ -0,0 +1,59 @@
+# Team Position Picker Renderer Audit
+
+## Purpose
+
+Phase 7.9 burns down Team position picker widget lifecycle from `ChatUiController`.
+
+This is a renderer / widget lifecycle boundary. It is not Team action ownership, Team protocol ownership, GPS source ownership, or map overlay ownership.
+
+## Current Ownership Before 7.9
+
+| Surface | Previous owner | Problem | Target owner |
+| --- | --- | --- | --- |
+| Picker overlay widget | `ChatUiController` | Controller stored LVGL modal widget refs | `TeamPositionPickerRenderer` |
+| Picker panel widget | `ChatUiController` | Controller created and destroyed picker widget tree | `TeamPositionPickerRenderer` |
+| Picker description label | `ChatUiController` | Controller owned hint label state | `TeamPositionPickerRenderer` |
+| Picker focus group | `ChatUiController` | Controller owned LVGL group switching | `TeamPositionPickerRenderer` |
+| Previous focus group | `ChatUiController` | Controller owned restore target | `TeamPositionPickerRenderer` |
+| icon event contexts | `ChatUiController` | Controller stored per-button LVGL callback context | `TeamPositionPickerRenderer` |
+| Icon selected callback | `ChatUiController` static LVGL callback | Controller handled widget event routing directly | `TeamPositionPickerRenderer` callback port |
+| Cancel callback | `ChatUiController` static LVGL callback | Controller handled widget event routing directly | `TeamPositionPickerRenderer` callback port |
+
+## Boundary
+
+`TeamPositionPickerRenderer` owns:
+
+- opening the picker overlay
+- closing and destroying the picker overlay
+- creating icon buttons
+- creating the cancel button
+- updating hint text
+- LVGL focus group setup and restore
+- icon event context storage
+- LVGL event callback routing
+
+`ChatUiController` owns only:
+
+- deciding when the Team position picker workflow should open
+- receiving `icon selected` / `cancelled` results
+- submitting the selected marker through the existing Team action workflow
+- refreshing the current conversation after the workflow
+
+## Non-Ownership
+
+`TeamPositionPickerRenderer` must not:
+
+- send Team actions
+- construct `TeamActionRequest`
+- access `ITeamActionSink`
+- access `ChatService`
+- access `TeamUiStore`
+- access GPS runtime
+- encode or decode Team payloads
+- update `ChatWorkspaceModel`
+
+## Decision
+
+Phase 7.9 moves Team position picker LVGL widget lifecycle to `TeamPositionPickerRenderer`.
+
+`ChatUiController` no longer stores picker LVGL refs or icon callback contexts. It keeps only workflow methods such as `openTeamPositionPicker(...)`, `closeTeamPositionPicker(...)`, `onTeamPositionIconSelected(...)`, and `onTeamPositionCancel(...)`.
diff --git a/docs/audits/TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md b/docs/audits/TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md
new file mode 100644
index 00000000..5a0bf527
--- /dev/null
+++ b/docs/audits/TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md
@@ -0,0 +1,98 @@
+# Team Rich Payload Presentation Audit
+
+## Purpose
+
+Phase 7.8 establishes presentation ownership for Team rich payload display.
+
+Team location and command sending were already moved behind Team action ownership in Phase 7.2. This audit covers the read/display side only:
+
+```text
+TeamChatLogEntry / Team payload -> UI-ready Team display row
+```
+
+## Current State
+
+| Question | Answer | Problem |
+| --- | --- | --- |
+| Current `format_team_chat_entry(...)` location | Removed from `ChatUiController`; previous duplicate legacy formatter decoded Team log entries in the controller | Controller formatting mixed UI coordination with Team payload decoding |
+| Current Team chat presentation formatter | `TeamChatPresentationSource` builds `MessageRow` summaries | Correct owner boundary, but decode/format needed a named projector |
+| Current location decode | `TeamRichPayloadProjector` calls `decodeTeamChatLocation(...)` | Decode is now contained in a presentation projector, not the controller |
+| Current command decode | `TeamRichPayloadProjector` calls `decodeTeamChatCommand(...)` | Decode is now contained in a presentation projector, not the controller |
+| Current display text construction | `TeamRichPayloadProjector` fills `TeamRichPayloadDisplay::summary` | UI consumes formatted projection instead of raw payload |
+| Current controller behavior | `ChatUiController` consumes `team_chat_model_.snapshot()` rows | Controller does not decode Team location/command display payloads |
+| Current projector allocation policy | Fixed buffers, bounded copies, and `std::snprintf` | Avoids projector-local `std::string` / `std::vector` heap churn in shared embedded UI code |
+
+## Boundary Rule
+
+Team rich payload display is presentation projection.
+
+It is not owned by:
+
+- `ChatUiController`
+- renderer local state
+- `ChatWorkspaceModel`
+- Team action send sinks
+
+## Target Owner
+
+Team rich payload display is owned by:
+
+```text
+TeamRichPayloadProjector
+TeamChatPresentationSource
+```
+
+`TeamRichPayloadProjector` translates legacy Team log entries and payloads into `TeamRichPayloadDisplay`.
+
+`TeamChatPresentationSource` consumes that display DTO and fills UI-ready rows.
+
+## Structured Display Fields
+
+Phase 7.8 introduces structured display fields without requiring a rich card UI:
+
+| Field | Status | Notes |
+| --- | --- | --- |
+| `kind` | active | identifies text, location, command, or unsupported payload |
+| `title` | active | short label for future richer rows |
+| `summary` | active | first-phase text shown in `MessageRow::text` |
+| `badge` | active | lightweight display label |
+| `location` | active | parsed lat/lon/altitude/icon details |
+| `command` | active | parsed command kind, coordinate, radius, and priority |
+
+## Temporary Text Projection
+
+Phase 7.8 still renders Team location and command payloads as summary text inside existing `MessageRow` rows.
+
+That is a compatibility projection, not a new Team domain model.
+
+## Embedded Hardening
+
+Phase 7.8.1 hardens `TeamRichPayloadProjector` for shared embedded targets:
+
+- no projector-local `std::string` formatting temporaries
+- no projector-local `std::vector`
+- no `iostream`, `sstream`, or `<format>`
+- summary text is built with fixed stack buffers and bounded copies
+
+This is a shared-code baseline decision, not a claim that ESP-IDF itself is limited to C++11.
+
+Target-local code may use a higher standard when its toolchain and binary budget allow it.
+
+## Remaining Legacy
+
+| Surface | Reason | Exit condition |
+| --- | --- | --- |
+| Rich Team cards | Existing `MessageRow` does not carry a dedicated rich Team card payload | A future Team row/view model exposes rich card fields directly |
+| Team position picker renderer | Send-side picker widget is unrelated to display projection | Picker rendering is extracted from `ChatUiController` |
+| Other legacy Team decode surfaces | Contacts/GPS/team-page code still has separate legacy display paths | Later phases migrate those screens to shared Team presentation projection |
+| `TeamChatPresentationSource` recent log allocation | Legacy `TeamUiStore` returns `std::vector<TeamChatLogEntry>` | `TeamUiStore` exposes a fixed-capacity recent-log visitor / bounded iterator |
+
+## Phase 7.8 Decision
+
+Phase 7.8 burns down Team rich payload display decoding from `ChatUiController`.
+
+It does not claim every Team payload decode in the repository has been removed. The narrowed guarantee is:
+
+```text
+The chat controller no longer formats or decodes Team location/command display payloads.
+```
diff --git a/docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md b/docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md
new file mode 100644
index 00000000..b4d3cd7c
--- /dev/null
+++ b/docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md
@@ -0,0 +1,78 @@
+# Transitional Build Entrypoints
+
+## Purpose
+
+This file marks historical build-system-named `apps/` directories that are
+allowed during Phase 8 migration but must not be treated as final app shell
+semantics.
+
+Core rule:
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+```
+
+## Transitional Paths
+
+| Path | Transitional role | Final direction | Rule |
+| --- | --- | --- | --- |
+| `legacy/app_implementations/esp_idf` | transitional legacy build entrypoint for ESP-IDF and ESP app/runtime compatibility | `builds/esp_idf` thin wrapper invokes a future ESP LVGL app shell | New code must not treat this as final app shell semantics |
+| `legacy/app_implementations/esp_pio` | transitional legacy build entrypoint for PlatformIO/Arduino compatibility | `builds/pio_nrf52` thin wrapper invokes a future nRF52 node app shell; legacy ESP PIO compatibility may be split later | New code must not treat this as final app shell semantics |
+| `legacy/app_implementations/linux_sim` | transitional Linux simulator implementation root | `apps/linux_sim_shell` remains the final app shell descriptor | New code must not re-add simulator implementation files under `apps/` |
+| `legacy/app_implementations/linux_uconsole` | transitional Linux uConsole implementation root | `apps/linux_uconsole_gtk` remains the final app shell descriptor | New code must not re-add uConsole implementation files under `apps/` |
+| `legacy/app_implementations/gat562_mesh_evb_pro` | transitional board-specific nRF52 implementation root | `apps/nrf52_node` remains the final nRF52 app shell descriptor | New code must not treat board-specific runtime as a final app shell |
+
+## Required Marker Language
+
+`legacy/app_implementations/esp_idf and legacy/app_implementations/esp_pio are transitional historical build entrypoints.`
+
+`legacy/app_implementations/linux_sim`,
+`legacy/app_implementations/linux_uconsole`, and
+`legacy/app_implementations/gat562_mesh_evb_pro` are transitional historical
+implementation roots.
+
+They are not final product app shells.
+
+## Allowed During Transition
+
+The transitional directories may continue to:
+
+- satisfy existing ESP-IDF and PlatformIO build references
+- host compatibility startup glue needed by current build hosts
+- provide source paths used by existing CI or developer workflows
+- contain migration notes and target descriptors
+
+## Forbidden During Transition
+
+New code must not:
+
+- introduce another build-system-named app shell under `apps/`
+- use `legacy/app_implementations/esp_idf` as the model for final app shell naming
+- use `legacy/app_implementations/esp_pio` as the model for final app shell naming
+- move build authority deeper into product app code
+- assemble Chat/Map/GPS runtime inside `builds/`
+- select UX pack inside `builds/`
+- define board facts inside `builds/`
+
+## Exit Conditions
+
+`legacy/app_implementations/esp_idf` can stop being transitional when:
+
+- `builds/esp_idf` contains the authoritative ESP-IDF wrapper
+- the wrapper invokes a product app shell
+- existing ESP-IDF target builds are proven through the wrapper
+- target descriptors and sdkconfig defaults have a stable final location
+
+`legacy/app_implementations/esp_pio` can stop being transitional when:
+
+- `builds/pio_nrf52` contains the authoritative nRF52 PlatformIO wrapper
+- legacy ESP PIO compatibility has a documented final path or removal plan
+- existing PIO environments are proven through the wrapper
+- nRF app shell and board facts are separated enough to rename safely
+
+## Phase 8.2 Non-Action
+
+This marker does not move files or change build behavior. It only prevents
+historical compatibility directories from being mistaken for target architecture
+truth.
diff --git a/docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md b/docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md
new file mode 100644
index 00000000..bbe00cb5
--- /dev/null
+++ b/docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md
@@ -0,0 +1,86 @@
+# UI Shared Compatibility Shim Policy
+
+## Status
+
+Phase 8 Structural Consolidation policy.
+
+`modules/ui_shared` is now a transitional umbrella for code that has not yet
+been split into target modules. It is not the authority for newly extracted
+runtime helpers, map helpers, legacy adapters, or LVGL UX pack renderers.
+
+## Core Rule
+
+Authoritative include paths live in the owning module.
+
+Forwarding headers under `modules/ui_shared/include` may remain temporarily, but
+they are compatibility shims only.
+
+## Forwarding Header Pattern
+
+A forwarding header may contain only:
+
+- `#pragma once`
+- one `#include` of the authoritative new module path
+
+It must not contain:
+
+- class or struct definitions
+- namespace definitions
+- inline implementation
+- new typedefs or aliases
+- ownership policy
+
+Forwarding headers exist only so older target builds can migrate incrementally.
+Main code must include the new owning module path.
+
+## Owning Modules
+
+| Surface | Authoritative module |
+| --- | --- |
+| Chat event pump / UI refresh sink | `modules/ui_chat_runtime` |
+| Map tile source/cache/queue/resolver and overlay projector | `modules/ui_map_runtime` |
+| GPS page runtime pump / UI refresh sink | `modules/ui_gps_runtime` |
+| Bounded legacy adapters moved in Phase 8 | `modules/ui_legacy_adapters` |
+| LVGL modal/picker/common UX renderers | `modules/ui_lvgl_ux_packs` |
+| LVGL technical primitives | `modules/ui_lvgl_core` |
+
+## ui_shared May Still Contain
+
+- LVGL screens that have not been moved
+- widgets that have not been split into `ui_lvgl_core`
+- old presentation sources not yet classified for a target module
+- existing compatibility surfaces
+- forwarding headers for moved files
+
+## ui_shared Must Not Receive
+
+- new runtime helpers
+- new legacy adapters
+- new map tile helpers
+- new GPS runtime helpers
+- new chat runtime helpers
+- new LVGL UX pack renderers
+
+## Deprecated Alias Policy
+
+`LegacyFilesystemMapTileSource` is a deprecated compatibility alias for
+`FilesystemMapTileSource`.
+
+New code must use:
+
+```cpp
+#include "ui_map_runtime/map_tiles/filesystem_map_tile_source.h"
+ui::map_tiles::FilesystemMapTileSource
+```
+
+The old alias may appear only in the compatibility alias declaration, docs, and
+explicit compatibility tests.
+
+## Exit Conditions
+
+Forwarding headers may be deleted after:
+
+1. no production code includes their old `ui_shared` paths;
+2. no tests use old paths except compatibility tests;
+3. build manifests reference the owning modules explicitly;
+4. `check_phase8_layout_ready.py` enforces the include path authority rule.
diff --git a/docs/audits/UI_SHARED_SPLIT_AUDIT.md b/docs/audits/UI_SHARED_SPLIT_AUDIT.md
new file mode 100644
index 00000000..60c157aa
--- /dev/null
+++ b/docs/audits/UI_SHARED_SPLIT_AUDIT.md
@@ -0,0 +1,252 @@
+# UI Shared Split Audit
+
+## Purpose
+
+Phase 8 will eventually split `modules/ui_shared` into clearer UI, runtime, and
+adapter modules. This audit classifies the current contents and assigns target
+placement without moving files in Phase 8.1.
+
+The classification is intentionally architectural. It does not claim every file
+can move independently, and it does not require an immediate module split.
+
+## Current Module Role
+
+`modules/ui_shared` currently acts as a compatibility umbrella for embedded LVGL
+UI code, page renderers, screen runtimes, presentation adapters, action bridges,
+map helpers, assets, widgets, and tests.
+
+This was useful while Phase 5-7 extracted presentation and runtime ownership.
+It is now too broad to express the boundaries Phase 8 needs.
+
+## Target Buckets
+
+Expected target placements:
+
+```text
+ui_lvgl_core
+  LVGL technical primitives
+
+ui_lvgl_ux_packs
+  device-specific pages, renderer variants, modals, pickers, input bindings
+
+ui_legacy_adapters
+  bounded compatibility adapters and bridges
+
+ui_map_runtime
+  map tile, overlay, render queue, and map runtime helpers
+
+ui_chat_runtime
+  chat page event pump, chat-specific runtime helpers
+
+ui_gps_runtime
+  GPS page runtime pump and GPS scheduling helpers
+```
+
+These names are target responsibilities for Phase 8 planning. They do not need
+to be created in Phase 8.1.
+
+## Classification Table
+
+| Current content | Examples | Target placement | Notes |
+| --- | --- | --- | --- |
+| LVGL core widgets | `components/*`, `widgets/*`, `page/page_host.h`, `ui_theme.h`, top bar, busy overlay, toast | `ui_lvgl_core` | Technical UI primitives shared by UX packs |
+| LVGL screens | `screens/chat`, `screens/gps`, `screens/team`, `screens/tracker`, `screens/settings`, `screens/node_info`, `screens/walkie_talkie` | `ui_lvgl_ux_packs` | Screen membership and feature depth should become UX pack choices |
+| LVGL menu/navigation surfaces | `menu/*`, `app_catalog*`, `app_runtime`, `loop_shell`, `startup_ui_shell` | split between `ui_lvgl_core` and `ui_lvgl_ux_packs` | Primitive navigation host belongs to core; product menu membership belongs to UX pack |
+| assets and fonts | `assets/*`, image/icon C files, font files | `ui_lvgl_core` or UX pack asset bundle | Common primitives can stay core; pack-specific icons should follow UX pack |
+| legacy presentation sources | `presentation_sources/legacy_*_source.*`, `legacy_map_presentation_source`, `legacy_gps_status_source` | `ui_legacy_adapters` | Phase 7 bounded these; Phase 8 decides rename/delete/stable adapter |
+| legacy action bridges | `legacy_chat_action_sink`, `legacy_chat_delivery_action_bridge`, `legacy_team_action_bridge`, `legacy_key_verification_action_sink` | `ui_legacy_adapters` | Adapter names should be normalized only after ownership replacement is clear |
+| chat screen runtime helpers | `chat_page_runtime_event_pump`, `chat_ui_refresh_sink`, chat runtime proxy, chat UI runtime helpers | `ui_chat_runtime` | Runtime scheduling helpers should stay outside renderer/widget ownership |
+| chat LVGL renderers/controllers | chat screen widgets, chat controller, key verification modal renderer | `ui_lvgl_ux_packs` with possible `ui_chat_runtime` split | UX pack chooses full/compact chat and modal implementation |
+| team picker renderer | `team_position_picker_renderer.*` | `ui_lvgl_ux_packs` | It is LVGL-specific picker lifecycle, not Team action ownership |
+| key verification modal renderer | `key_verification_modal_renderer.*` | `ui_lvgl_ux_packs` | Modal renderer belongs to UX pack/modal layer; model/source stay portable |
+| team rich payload projection | `team_presentation/team_rich_payload_*` | portable presentation or `ui_chat_runtime` boundary | Projector is not LVGL; future placement should avoid renderer coupling |
+| map tile helpers | `map_tiles/map_tile_types`, resolver, source, cache, render queue | `ui_map_runtime` | Tile source/cache/queue are map runtime helpers, not LVGL widgets |
+| map overlay helpers | `map_overlay/map_overlay_projector` | `ui_map_runtime` or portable map presentation support | Keep overlay DTOs in `ui_presentation`; projector may live in runtime/adapters |
+| map widgets | `widgets/map/*` | `ui_lvgl_core` if primitive, `ui_lvgl_ux_packs` if product workflow | Split technical tile drawing from device UX map workflows |
+| GPS page runtime pump | `gps_page_runtime_pump.*`, `gps_ui_refresh_sink.h` | `ui_gps_runtime` | Runtime cadence owner; renderer remains passive |
+| GPS/GNSS screens | `screens/gps`, `screens/gnss` | `ui_lvgl_ux_packs` plus `ui_gps_runtime` helpers | Full GPS pages may differ by UX pack |
+| runtime memory/profile helpers | `runtime/memory_profile.*` | `ui_lvgl_core` or runtime support module | Placement depends on whether it is UI technical support or target runtime fact |
+| support filesystem helpers | `support/lvgl_fs_utils.h` | LVGL/platform adapter boundary | Must not leak into `ui_presentation`; filesystem belongs adapter side |
+
+## Required Categories
+
+Phase 8 migration planning must keep these categories distinct:
+
+- LVGL core widgets
+- LVGL screens
+- legacy presentation sources
+- legacy action bridges
+- chat screen runtime helpers
+- map tile helpers
+- team picker renderer
+- key verification modal renderer
+- GPS page runtime pump
+
+They currently coexist in `ui_shared`; later movement should not collapse them
+into a different single bucket.
+
+## Split Rules
+
+`ui_lvgl_core` may contain:
+
+- LVGL themes
+- primitive widgets
+- technical navigation host
+- input host primitives
+- screen host primitives
+- reusable visual components
+
+`ui_lvgl_core` must not contain:
+
+- target UX feature decisions
+- Team action policy
+- Chat service access
+- map tile path/source ownership
+- GPS runtime polling
+
+`ui_lvgl_ux_packs` may contain:
+
+- page sets
+- renderer variants
+- modal variants
+- picker variants
+- input binding sets
+- layout profiles
+- feature-depth decisions
+
+`ui_lvgl_ux_packs` must not contain:
+
+- board pin facts
+- SDK/HAL calls
+- build-system entrypoints
+- protocol interpretation
+- direct filesystem tile paths
+
+`ui_legacy_adapters` may contain:
+
+- compatibility bridges with explicit ports
+- legacy source/sink adapters
+- bounded anti-corruption objects
+
+`ui_legacy_adapters` must not become:
+
+- a dumping ground for new behavior
+- an alternative app composition root
+- a place where renderers pull runtime sources
+
+`ui_map_runtime` may contain:
+
+- map tile source/cache ports
+- tile resolver
+- render queue
+- overlay source adapters
+- map runtime helpers
+
+`ui_chat_runtime` may contain:
+
+- chat page event pump
+- chat UI refresh sink
+- chat runtime scheduling helpers
+
+`ui_gps_runtime` may contain:
+
+- GPS page runtime pump
+- GPS UI refresh sink
+- GPS runtime scheduling adapters
+
+## Legacy Naming Pass
+
+Phase 8 should classify each `Legacy*` object before renaming:
+
+| Classification | Meaning | Action |
+| --- | --- | --- |
+| Temporary bridge | exists only to strangle old caller/source | keep `Legacy*` until removal path is active |
+| Stable adapter | official adapter to a concrete source | rename to non-legacy adapter |
+| Dead legacy | no longer used by target paths | delete after checker confirms no callers |
+
+Examples to classify:
+
+- `LegacyFilesystemMapTileSource`
+- `LegacyMapOverlaySource`
+- `LegacyTeamActionBridge`
+- `LegacyChatDeliveryEventBridge`
+- `LegacyKeyVerificationSource`
+
+## Non-Goals
+
+Phase 8.1 does not:
+
+- create any target module directories
+- move files out of `modules/ui_shared`
+- change include paths
+- rename classes
+- alter build manifests
+- change UI behavior
+
+## Exit Condition For This Audit
+
+This audit is satisfied when later Phase 8 work can point each `ui_shared`
+change to one of the target buckets above and explain whether it is moving a
+technical primitive, UX pack decision, runtime helper, map runtime helper, chat
+runtime helper, GPS runtime helper, or legacy adapter.
+
+## Phase 8 Structural Migration Batch
+
+The first structural migration batch moves the Phase 7 extracted, lowest-risk
+helpers out of `ui_shared` while keeping forwarding headers at the old include
+paths.
+
+Moved to `ui_chat_runtime`:
+
+- `ChatPageRuntimeEventPump`
+- `IChatUiRefreshSink`
+
+Moved to `ui_gps_runtime`:
+
+- `GpsPageRuntimePump`
+- `IGpsUiRefreshSink`
+
+Moved to `ui_map_runtime`:
+
+- map tile types/source/cache/decoder-cache ports
+- `MapTileResolver`
+- `MapTileRenderQueue`
+- `FilesystemMapTileSource`
+- `MapOverlayProjector`
+
+Moved to `ui_legacy_adapters`:
+
+- `LegacyChatDeliveryEventBridge`
+- `LegacyChatDeliveryActionBridge`
+- `LegacyKeyVerificationSource`
+- `LegacyKeyVerificationActionSink`
+- `LegacyMapOverlaySource`
+
+Moved to `ui_lvgl_ux_packs`:
+
+- `TeamPositionPickerRenderer`
+- key verification modal renderer
+
+`LegacyFilesystemMapTileSource` is now a compatibility alias for
+`FilesystemMapTileSource`. New code should include
+`ui_map_runtime/map_tiles/filesystem_map_tile_source.h`.
+
+## Phase 8 Structural Consolidation Policy
+
+`ui_shared` is a transitional umbrella after the structural migration batch. The
+compatibility rules are defined in
+`docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md`.
+
+Forwarding headers under `modules/ui_shared/include` are allowed only as
+compatibility shims. Main code must include the authoritative new module paths:
+
+- `ui_chat_runtime/...`
+- `ui_map_runtime/...`
+- `ui_gps_runtime/...`
+- `ui_legacy_adapters/...`
+- `ui_lvgl_core/...`
+- `ui_lvgl_ux_packs/...`
+
+New runtime helpers, legacy adapters, map tile helpers, GPS runtime helpers,
+chat runtime helpers, and LVGL UX pack renderers must not be added to
+`modules/ui_shared`.
diff --git a/docs/boards/BOARD_MANIFEST_TEMPLATE.yaml b/docs/boards/BOARD_MANIFEST_TEMPLATE.yaml
new file mode 100644
index 00000000..c8477967
--- /dev/null
+++ b/docs/boards/BOARD_MANIFEST_TEMPLATE.yaml
@@ -0,0 +1,47 @@
+board: "t_lora_pager"
+platform: "esp32"
+status: "draft"
+
+facts:
+  display:
+    present: true
+    width: 222
+    height: 480
+    rotation: 90
+    driver: "st7796"
+
+  input:
+    keyboard: false
+    buttons: true
+    touch: false
+    encoder: false
+    trackball: false
+
+  lora:
+    present: true
+    chip: "sx1262"
+    spi_bus: "spi2"
+    reset_pin: 8
+    busy_pin: 7
+    dio1_pin: 33
+    power_enable_pin: null
+    dio2_as_rf_switch: true
+    dio3_tcxo_voltage: 1.8
+
+  gps:
+    present: true
+    uart: "uart1"
+    tx_pin: null
+    rx_pin: null
+    power_enable_pin: 21
+    pps_pin: null
+
+  storage:
+    sd: true
+    internal_flash: true
+
+  power:
+    battery: true
+    charger: true
+    deep_sleep: true
+
diff --git a/docs/boards/gat562.board.yaml b/docs/boards/gat562.board.yaml
new file mode 100644
index 00000000..c1b40cbd
--- /dev/null
+++ b/docs/boards/gat562.board.yaml
@@ -0,0 +1,88 @@
+board: "gat562"
+platform: "nrf52"
+status: "draft"
+
+source:
+  package: "boards/gat562_mesh_evb_pro"
+  variant: "variants/gat562_mesh_evb_pro"
+  board_json: "boards/gat562_mesh_evb_pro.json"
+
+facts:
+  display:
+    present: true
+    width: 128
+    height: 64
+    rotation: 0
+    driver: "ssd1306"
+    i2c_bus: "i2c0"
+    i2c_address: 0x3C
+    sda_pin: 13
+    scl_pin: 14
+
+  input:
+    keyboard: false
+    buttons: true
+    touch: false
+    encoder: false
+    trackball: false
+    joystick: true
+    button_primary_pin: 9
+    button_secondary_pin: 12
+    joystick_up_pin: 28
+    joystick_down_pin: 4
+    joystick_left_pin: 30
+    joystick_right_pin: 31
+    joystick_press_pin: 26
+
+  lora:
+    present: true
+    chip: "sx1262"
+    spi_bus: "spi0"
+    sck_pin: 43
+    miso_pin: 45
+    mosi_pin: 44
+    cs_pin: 42
+    reset_pin: 38
+    busy_pin: 46
+    dio1_pin: 47
+    power_enable_pin: 37
+    dio2_as_rf_switch: true
+    dio3_tcxo_voltage: 1.8
+
+  gps:
+    present: true
+    uart: "uart0"
+    tx_pin: 16
+    rx_pin: 15
+    aux_pin: null
+    pps_pin: 17
+    baud_rate: 9600
+
+  storage:
+    sd: false
+    internal_flash: true
+    max_flash_size: 815104
+    max_ram_size: 248832
+
+  power:
+    battery: true
+    charger: "unknown"
+    deep_sleep: true
+    battery_adc_pin: 5
+    peripheral_3v3_enable_pin: 34
+
+  peripherals:
+    buzzer: true
+    buzzer_pin: 21
+    status_led_pin: 35
+    notification_led_pin: 36
+    jlink_cdc_uart:
+      rx_pin: 8
+      tx_pin: 6
+
+forbidden_content:
+  - "business behavior"
+  - "direct message policy"
+  - "Meshtastic or MeshCore phone protocol"
+  - "UI page state"
+
diff --git a/docs/boards/t-deck.board.yaml b/docs/boards/t-deck.board.yaml
new file mode 100644
index 00000000..f9405906
--- /dev/null
+++ b/docs/boards/t-deck.board.yaml
@@ -0,0 +1,85 @@
+board: "t_deck"
+platform: "esp32"
+status: "draft"
+
+source:
+  package: "boards/tdeck"
+  variant: "variants/tdeck"
+  board_json: "boards/T-Deck.json"
+
+facts:
+  display:
+    present: true
+    width: 320
+    height: 240
+    logical_width: 320
+    logical_height: 240
+    rotation: 0
+    driver: "st7789"
+    spi_bus: "shared_spi"
+    cs_pin: 12
+    dc_pin: 11
+    backlight_pin: 42
+
+  input:
+    keyboard: true
+    buttons: true
+    touch: true
+    encoder: false
+    trackball: true
+    touch_interrupt_pin: 16
+    trackball_up_pin: 3
+    trackball_down_pin: 15
+    trackball_left_pin: 1
+    trackball_right_pin: 2
+    trackball_click_pin: 0
+
+  lora:
+    present: true
+    chip: "sx1262"
+    spi_bus: "shared_spi"
+    sck_pin: 40
+    miso_pin: 38
+    mosi_pin: 41
+    cs_pin: 9
+    reset_pin: 17
+    busy_pin: 13
+    dio1_pin: 45
+    power_enable_pin: null
+    dio2_as_rf_switch: true
+    dio3_tcxo_voltage: 1.8
+
+  gps:
+    present: true
+    uart: "uart1"
+    tx_pin: 43
+    rx_pin: 44
+    power_enable_pin: null
+    pps_pin: null
+
+  storage:
+    sd: true
+    sd_cs_pin: 39
+    internal_flash: true
+
+  power:
+    battery: true
+    charger: true
+    deep_sleep: true
+    board_power_enable_pin: 10
+    battery_adc_pin: 4
+
+  peripherals:
+    audio_codec: true
+    rtc: "unknown"
+    motion_sensor: "unknown"
+
+draft_notes:
+  - "SD socket and charger facts should be confirmed against the exact T-Deck hardware revision."
+
+forbidden_content:
+  - "business behavior"
+  - "direct message policy"
+  - "Meshtastic or MeshCore phone protocol"
+  - "UI page state"
+
diff --git a/docs/boards/t-lora-pager.board.yaml b/docs/boards/t-lora-pager.board.yaml
new file mode 100644
index 00000000..f4004088
--- /dev/null
+++ b/docs/boards/t-lora-pager.board.yaml
@@ -0,0 +1,81 @@
+board: "t_lora_pager"
+platform: "esp32"
+status: "draft"
+
+source:
+  package: "boards/tlora_pager"
+  variant: "variants/lilygo_tlora_pager"
+  board_json: "boards/lilygo-t-lora-pager.json"
+
+facts:
+  display:
+    present: true
+    width: 222
+    height: 480
+    logical_width: 480
+    logical_height: 222
+    rotation: 90
+    driver: "st7796"
+    spi_bus: "shared_spi"
+    cs_pin: 38
+    dc_pin: 37
+    backlight_pin: 42
+
+  input:
+    keyboard: true
+    buttons: true
+    touch: false
+    encoder: true
+    trackball: false
+    keyboard_interrupt_pin: 6
+    rotary_a_pin: 40
+    rotary_b_pin: 41
+    rotary_click_pin: 7
+
+  lora:
+    present: true
+    chip: "sx1262"
+    spi_bus: "shared_spi"
+    sck_pin: 35
+    miso_pin: 33
+    mosi_pin: 34
+    cs_pin: 36
+    reset_pin: 47
+    busy_pin: 48
+    dio1_pin: 14
+    power_enable_pin: "xl9555:3"
+    dio2_as_rf_switch: true
+    dio3_tcxo_voltage: 1.8
+
+  gps:
+    present: true
+    uart: "uart1"
+    tx_pin: 12
+    rx_pin: 4
+    power_enable_pin: "xl9555:4"
+    reset_pin: "xl9555:7"
+    pps_pin: 13
+
+  storage:
+    sd: true
+    sd_cs_pin: 21
+    internal_flash: true
+
+  power:
+    battery: true
+    charger: true
+    deep_sleep: true
+    power_key_pin: 0
+
+  peripherals:
+    nfc: true
+    audio_codec: true
+    motion_sensor: true
+    rtc: true
+    gpio_expander: true
+
+forbidden_content:
+  - "business behavior"
+  - "direct message policy"
+  - "Meshtastic or MeshCore phone protocol"
+  - "UI page state"
diff --git a/docs/boards/uconsole-aio2.board.yaml b/docs/boards/uconsole-aio2.board.yaml
new file mode 100644
index 00000000..f610e073
--- /dev/null
+++ b/docs/boards/uconsole-aio2.board.yaml
@@ -0,0 +1,66 @@
+board: "uconsole_aio2"
+platform: "linux"
+status: "draft"
+
+source:
+  package: "platform/linux/uconsole"
+  hardware_probe: "platform/linux/uconsole/src/uconsole_hardware_probe.cpp"
+
+facts:
+  display:
+    present: true
+    width: "host_window_or_framebuffer"
+    height: "host_window_or_framebuffer"
+    rotation: "host_configured"
+    driver: "gtk_or_linux_framebuffer"
+
+  input:
+    keyboard: true
+    buttons: false
+    touch: "host_dependent"
+    encoder: false
+    trackball: false
+    pointer: true
+
+  lora:
+    present: "optional"
+    chip: "sx1262"
+    spi_bus: "/dev/spidev1.0"
+    reset_pin: "aio2_control_plane"
+    busy_pin: "aio2_control_plane"
+    dio1_pin: "aio2_control_plane"
+    power_enable_pin: "aio2_control_plane"
+    dio2_as_rf_switch: true
+    dio3_tcxo_voltage: 1.8
+
+  gps:
+    present: "optional"
+    uart: "/dev/serial/by-id/*ClockworkPI*uConsole* or configured path"
+    power_enable_pin: "aio2_control_plane_or_none"
+    pps_pin: null
+
+  storage:
+    sd: "host_dependent"
+    internal_flash: false
+    posix_filesystem: true
+
+  power:
+    battery: "os_reported_or_unknown"
+    charger: "os_reported_or_unknown"
+    deep_sleep: false
+
+  linux_devices:
+    serial_auto_detect: "/dev/serial/by-id"
+    spi_default: "/dev/spidev1.0"
+    gps_env_override: "TRAIL_MATE_GPS_DEVICE"
+    lora_env_override: "TRAIL_MATE_LORA_SPI"
+
+draft_notes:
+  - "This manifest records Linux-visible AIO2 endpoints, not low-level HAT schematic truth."
+
+forbidden_content:
+  - "business behavior"
+  - "direct message policy"
+  - "Meshtastic or MeshCore phone protocol"
+  - "GTK page state"
+
diff --git a/docs/decisions/ADR_BUILD_ENTRYPOINTS.md b/docs/decisions/ADR_BUILD_ENTRYPOINTS.md
new file mode 100644
index 00000000..14dfeb58
--- /dev/null
+++ b/docs/decisions/ADR_BUILD_ENTRYPOINTS.md
@@ -0,0 +1,149 @@
+# ADR: Build Entrypoint Authority
+
+## Status
+
+Accepted for Phase 8 baseline.
+
+## Context
+
+Trail Mate supports embedded ESP targets, nRF52 targets, and Linux targets.
+Their build hosts are not interchangeable:
+
+- ESP / ESP32-P4 targets need the ESP-IDF route.
+- nRF52 targets still rely on PlatformIO for the current stable build flow.
+- Linux targets use CMake for simulator and device shells.
+
+Historically, some build-host identity leaked into `apps/` names. That made
+`apps/esp_idf` and `apps/esp_pio` look like product app shells even though they
+were build entrypoint and compatibility directories. Their current containment
+paths are `legacy/app_implementations/esp_idf` and
+`legacy/app_implementations/esp_pio`.
+
+Phase 8 separates these concepts:
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+```
+
+## Decision
+
+The authoritative build entrypoint families are:
+
+| Target family | Authoritative build entrypoint | Build host |
+| --- | --- | --- |
+| ESP / ESP32-P4 | `builds/esp_idf` | ESP-IDF |
+| nRF52 | `builds/pio_nrf52` | PlatformIO |
+| Linux | `builds/linux_cmake` | CMake |
+
+`legacy/app_implementations/esp_idf and legacy/app_implementations/esp_pio are transitional historical build entrypoints.`
+They are not final product app shells.
+
+The final shape should move build-host wrappers toward `builds/` while product
+startup and target composition live under app-shell directories such as:
+
+```text
+apps/esp32_lvgl/
+apps/nrf52_node/
+apps/linux_uconsole_gtk/
+apps/linux_sim/
+apps/linux_headless/
+```
+
+These final app shell names are examples of semantics, not a Phase 8.2
+implementation requirement.
+
+## Rationale
+
+ESP / ESP32-P4 -> ESP-IDF because ESP32-P4 support and modern ESP targets are
+best represented by ESP-IDF as the authoritative SDK and build host.
+
+nRF52 -> PlatformIO because the current nRF-compatible build and board flow is
+anchored in PlatformIO and should not be destabilized by Phase 8 directory
+normalization.
+
+Linux -> CMake because Linux simulator, uConsole, Raspberry Pi, UNO Q, and
+headless shells already use CMake-oriented host builds and tooling.
+
+Separating build entrypoints from app shells keeps build-system mechanics from
+being mistaken for product architecture.
+
+## Build Entrypoint Contract
+
+A build entrypoint is a thin wrapper.
+
+It may:
+
+- provide build-host project files
+- invoke the selected app shell
+- pass target manifest or build flags to app composition
+- adapt build-system conventions to repository paths
+
+It must not:
+
+- assemble Chat, Map, Team, or GPS runtime object graphs
+- choose UX pack
+- define board facts
+- implement product behavior
+- become a service locator
+
+## App Shell Contract
+
+An app shell is a composition root consumer.
+
+It may:
+
+- select target profile
+- select board package
+- select platform adapters
+- select UX pack
+- start app runtime
+- hand off to renderer shell
+
+It must not:
+
+- carry ESP-IDF, PlatformIO, or CMake project mechanics as its identity
+- own reusable modules
+- define board facts
+- hide build-host glue inside product logic
+
+## BuildEntrypointManifest
+
+Future build entrypoints may include a small `BuildEntrypointManifest` to
+declare:
+
+- build authority
+- target family
+- transitional source path
+- final app shell it invokes
+- migration status
+
+The manifest is an architecture manifest. It does not decide UX, board facts,
+Chat/Map/GPS runtime policy, or product feature depth.
+
+## Transitional Paths
+
+Current transitional paths:
+
+- `apps/esp_idf`
+- `apps/esp_pio`
+
+These paths remain valid for compatibility until wrappers under `builds/` can
+invoke final product app shells without breaking existing build flows.
+
+## Consequences
+
+Phase 8.2 creates `builds/` skeleton directories and documentation only.
+
+It does not:
+
+- move `apps/esp_idf`
+- move `apps/esp_pio`
+- modify ESP-IDF CMake files
+- modify `platformio.ini`
+- modify Linux CMake files
+- create final app shell directories
+- change runtime behavior
+
+Later Phase 8 work may migrate one build family at a time once wrappers can be
+validated against existing build gates.
diff --git a/docs/devices/lilygo-t-lora-pager.md b/docs/devices/lilygo-t-lora-pager.md
index e309e887..fd609b1e 100644
--- a/docs/devices/lilygo-t-lora-pager.md
+++ b/docs/devices/lilygo-t-lora-pager.md
@@ -15,7 +15,7 @@ It exists to prevent drift between:
 - Flash / PSRAM: `16MB QSPI flash + 8MB QSPI PSRAM`
 - Display: `ST7796` SPI TFT
 - UI resolution used by this repo: `480x222`
-- Radio: `SX1262` or `SX1280` depending on build environment
+- Radio: `SX1262`
 - GNSS: `u-blox MIA-M10Q`
 - Input: `rotary encoder + center key + I2C keyboard`
 - Power / battery: `BQ25896 + BQ27220`
@@ -74,7 +74,7 @@ Rules:
 
 - pin truth belongs in `variants/lilygo_tlora_pager/pins_arduino.h`
 - board bring-up behavior belongs in `boards/tlora_pager/src/tlora_pager_board.cpp`
-- environment-specific radio and display choices belong in `variants/lilygo_tlora_pager/envs/tlora_pager.ini`
+- radio and display build choices belong in `variants/lilygo_tlora_pager/envs/tlora_pager.ini`
 - device docs should reflect what this repository actually builds, not just vendor marketing material
 
 ## Important Boundary
@@ -97,14 +97,11 @@ Defined in [tlora_pager.ini](../../variants/lilygo_tlora_pager/envs/tlora_pager.
 
 - `tlora_pager_sx1262`
 - `tlora_pager_sx1262_debug`
-- `tlora_pager_sx1280`
-- `tlora_pager_sx1280_debug`
 
 Current build-time facts:
 
 - all Pager environments define `ARDUINO_T_LORA_PAGER`
 - `SX1262` builds define `ARDUINO_LILYGO_LORA_SX1262`
-- `SX1280` builds define `ARDUINO_LILYGO_LORA_SX1280`
 - the display driver is built as `ST7796`
 - this repo currently builds the Pager UI with `SCREEN_WIDTH=480` and `SCREEN_HEIGHT=222`
 
diff --git a/docs/review/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_REVIEW_CHECKLIST.md b/docs/review/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_REVIEW_CHECKLIST.md
new file mode 100644
index 00000000..3f673671
--- /dev/null
+++ b/docs/review/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_REVIEW_CHECKLIST.md
@@ -0,0 +1,147 @@
+# Cross-Platform Product Architecture Review Checklist
+
+Every PR that touches LoRa, GPS, BLE, UI, protocol, runtime, board support,
+storage, app services, or target composition must answer these questions.
+
+## Layer Identification
+
+Which layer is changed?
+
+```text
+Target
+Board
+Platform
+Runtime
+Capability
+Protocol
+UseCase
+AppService
+PresentationModel
+Renderer
+CompositionRoot
+```
+
+If the answer is unclear, stop and update the specification or manifest before
+continuing implementation.
+
+## Boundary Questions
+
+Does this PR introduce a new board-specific branch?
+
+Does this PR let board code know business behavior?
+
+Does this PR let a platform driver interpret protocol semantics?
+
+Does this PR let a BLE host interpret Meshtastic or MeshCore phone protocol?
+
+Does this PR add direct GPS, board, time, config, chat, contact, or mesh-adapter
+reads to a BLE host instead of routing them through `modules/core_phone` and a
+phone facade?
+
+Does this PR put Meshtastic `ToRadio`/`FromRadio`, admin/config response,
+queue/status encoding, or MeshCore command/contact/status/device-info semantics
+back into `platform/*/ble`?
+
+Does this PR let a radio adapter own direct message, PKI, peer key, contact, or
+phone-core policy?
+
+If this PR touches LoRa/Mesh, did it identify whether the change is Board Radio
+Facts, Platform Radio Driver, Packet Radio Port, Mesh Protocol Core, Mesh
+UseCase, Mesh Runtime Shell, or App Service/Chat integration?
+
+Does this PR put direct-send, receive/decrypt/route, peer-key trust,
+local-identity generation, ACK/retry/dedup, or PKI/identity flow into
+`platform/*/chat/infra/*adapter*` instead of `modules/core_mesh`?
+
+Does this PR make `platform/*/mesh` or `platform/*/radio` depend on AES,
+Curve25519, Ed25519, protobuf business decisions, peer trust policy,
+`DirectMessageService` internals, or protocol-specific direct-message flow?
+
+If this PR adds or changes a store adapter, does the adapter only load, save,
+remove, clear, and expose stored facts without deciding peer trust, key
+exchange, direct-message eligibility, PKI fallback, or identity verification?
+
+Does this PR keep `modules/core_mesh` free of Arduino, RadioLib, Preferences,
+SQLite, FreeRTOS, Zephyr, ESP/nRF SDK, BLE, board, and UI headers?
+
+Does this PR report direct-send failures as structured `SendResult`-style
+causes (`PeerKeyMissing`, `LocalIdentityMissing`, `PacketBuildFailed`,
+`RadioSendFailed`) instead of collapsing everything to `bool` in new core code?
+
+Does this PR let a GPS driver directly serve UI, BLE, Mesh, or storage policy?
+
+If this PR touches GPS or time, did it identify whether the change is Board
+Facts, Platform GNSS Driver, GNSS Parser, LocationService, TimeAuthority, or a
+consumer?
+
+Does this PR make BLE, UI, Mesh, Team, or HostLink read `GpsService`, GPS UART,
+board GPS, or NMEA parser directly instead of `ILocationSource`,
+`ITimeAuthority`, or a device/status snapshot?
+
+Does this PR let a platform GPS runtime shell own UI, chat, BLE phone protocol,
+direct message, or contact-service behavior?
+
+Does this PR let a UI renderer own business logic?
+
+Does this PR let an app service know LVGL, GTK, ASCII, CLI, board pins, or
+platform SDK objects?
+
+Does this PR let shared core include platform, board, SDK, or UI headers?
+
+Does this PR add cross-thread direct calls instead of event queues, command
+queues, snapshots, or declared store locks?
+
+Does this PR violate UI-thread-only rules?
+
+Does this PR add blocking storage writes on a UI owner thread?
+
+## Manifest Questions
+
+Does this PR change product composition?
+
+Does this PR change a capability state, endpoint host, binding, or proxy mode?
+
+Does this PR change authority ownership?
+
+Does this PR change runtime/task/thread ownership?
+
+Does this PR change UI shell, renderer, layout profile, or input model?
+
+Does this PR require updating a target manifest?
+
+Does this PR require updating a board manifest?
+
+## Required Statement
+
+Each PR description should include:
+
+```text
+Architecture layer changed:
+Target manifest updated: yes/no/not applicable
+Board manifest updated: yes/no/not applicable
+Runtime/concurrency impact:
+Known boundary exceptions:
+```
+
+## Phase 4.5 Exit Gate
+
+Before starting Phase 5 PresentationModel/UI shell work, run:
+
+```text
+python tools/architecture/check_phase45_ready.py
+```
+
+This gate is narrower than the non-blocking global boundary report. It must
+pass before Phase 5 because it checks that:
+
+- target manifests name `core_phone` and `core_mesh`;
+- `core_phone` no longer exposes `ChatService`, `ContactService`,
+  `IMeshAdapter`, or `INodeStore` as phone-core dependencies;
+- `core_mesh` has no platform SDK, board, BLE, or UI includes;
+- Phase 4.5 core mesh/phone/GPS test files exist;
+- at least one actual ESP Meshtastic send path enters `MeshSession` and
+  `DirectMessageService`;
+- at least one actual ESP Meshtastic receive path enters
+  `ReceivePacketService`;
+- remaining Mesh/GPS/BLE exceptions are explicit burn-down items in
+  `tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md`.
diff --git a/docs/specification/APP_SHELL_ARCHITECTURE_SPEC.md b/docs/specification/APP_SHELL_ARCHITECTURE_SPEC.md
new file mode 100644
index 00000000..4e52fb35
--- /dev/null
+++ b/docs/specification/APP_SHELL_ARCHITECTURE_SPEC.md
@@ -0,0 +1,216 @@
+# App Shell Architecture Specification
+
+## Purpose
+
+Phase 8.3 establishes real app shell semantics before moving build files or
+rewiring runtime startup.
+
+An app shell is a product-facing startup and composition boundary. It is not a
+build system project, board package, platform adapter, renderer implementation,
+or runtime service container.
+
+No behavior change in Phase 8.3.
+
+Phase 8.3 adds skeletons and manifests only. It must not change ESP-IDF,
+PlatformIO, Linux CMake, runtime behavior, UI screen behavior, or composition
+root implementation.
+
+## Core Rule
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+Renderer draws.
+```
+
+## AppShell
+
+`AppShell` is a composition root consumer for a product target family.
+
+An app shell may:
+
+- select target profile
+- select board package
+- select platform family
+- select UX profile / UX pack
+- hand off to product composition
+- start runtime facade
+- own product startup/lifecycle handoff
+- bind renderer family to presentation workspace
+
+An app shell must not:
+
+- own build host files
+- define board facts
+- contain SDK/HAL implementation
+- implement screen internals
+- assemble Chat/Map/GPS details behind hidden globals
+- replace `builds/` as the build-system entrypoint
+- become a service locator
+
+## AppShellManifest
+
+`AppShellManifest` is an architecture manifest that declares app shell intent.
+
+It records:
+
+- role
+- target family
+- renderer family
+- future authoritative build entrypoint
+- current transitional path
+- future responsibilities
+- forbidden responsibilities
+- current status
+
+It does not:
+
+- decide board pins
+- create runtime object graphs
+- contain SDK/HAL code
+- carry CMake, PlatformIO, or ESP-IDF mechanics
+- replace target capability YAML files
+
+## TargetProfile
+
+`TargetProfile` is a product selection descriptor.
+
+It may describe:
+
+- target name
+- board package
+- platform family
+- build entrypoint
+- app shell
+- UX profile placeholder
+- status
+- transitional source path
+
+It must not:
+
+- create runtime object graph
+- define board pins
+- implement protocol policy
+- implement UX pack classes
+- replace board manifests
+- replace build entrypoints
+
+`TargetProfile` answers "which product combination is selected?" It does not
+answer "how does the runtime service graph get constructed?"
+
+## AppShellLifecycle
+
+`AppShellLifecycle` describes the app shell's startup handoff.
+
+Expected lifecycle:
+
+```text
+Build entrypoint starts host runtime
+  -> invokes app shell entrypoint
+    -> app shell selects target profile
+      -> app shell selects board/platform/UX profile
+        -> app shell invokes product composition
+          -> runtime facade starts
+            -> renderer shell runs
+```
+
+The app shell owns the product startup boundary, not the low-level build host.
+
+## AppShellCompatibilityAdapter
+
+`AppShellCompatibilityAdapter` is a temporary adapter from current historical
+entrypoints to future app shell semantics.
+
+Examples:
+
+- `apps/esp_idf` may act as compatibility source for `apps/esp32_lvgl`.
+- `apps/esp_pio` may act as compatibility source for `apps/nrf52_node`.
+- `apps/linux_uconsole` may act as compatibility source for
+  `apps/linux_uconsole_gtk`.
+- `apps/linux_sim` may act as compatibility source for `apps/linux_sim_shell`.
+
+The adapter exists to describe migration. It must not become the new product
+architecture.
+
+## Skeleton App Shells
+
+Phase 8.3 introduces these skeleton app shell names:
+
+```text
+apps/esp32_lvgl/
+apps/nrf52_node/
+apps/linux_uconsole_gtk/
+apps/linux_sim_shell/
+```
+
+They are semantic anchors only. They do not build, register targets, or change
+runtime behavior in Phase 8.3.
+
+## Dependency Direction
+
+Allowed direction:
+
+```text
+builds -> apps
+apps -> modules + platform + boards
+apps -> docs/targets + docs/ux_profiles
+```
+
+Forbidden direction:
+
+```text
+apps -> builds
+apps -> generated build outputs
+apps -> hidden SDK/HAL implementation
+modules -> apps
+platform -> apps
+boards -> apps
+```
+
+## Thin App Shell Entrypoint Declaration
+
+Phase 8.3 app shells may declare future entrypoint names in README/manifest
+files. Those declarations are not implementation.
+
+Future implementations should be thin and explicit, for example:
+
+```text
+apps/esp32_lvgl: trail_mate_esp32_lvgl_start(target_profile)
+apps/nrf52_node: trail_mate_nrf52_node_start(target_profile)
+apps/linux_uconsole_gtk: trail_mate_linux_uconsole_gtk_start(target_profile)
+apps/linux_sim_shell: trail_mate_linux_sim_shell_start(target_profile)
+```
+
+These names are placeholders until a later phase creates real source files.
+
+## Non-Goals
+
+Phase 8.3 does not:
+
+- move `apps/esp_idf`
+- move `apps/esp_pio`
+- move `apps/linux_uconsole` source
+- modify ESP-IDF CMake
+- modify `platformio.ini`
+- modify Linux CMake
+- split `ui_shared`
+- implement UX Pack classes
+- change runtime behavior
+- create a real composition root
+- compile any new app shell code
+
+## Review Rules
+
+When adding app shell work, ask:
+
+- Is this product startup/lifecycle handoff, or build-host mechanics?
+- Is this target selection, or board hardware fact?
+- Is this UX profile selection, or renderer internals?
+- Is this app composition, or hidden Chat/Map/GPS service assembly?
+- Is a historical entrypoint being mistaken for a final app shell?
+
+The app shell may choose. The build entrypoint may invoke. Neither should hide
+business runtime construction in a compatibility wrapper.
diff --git a/docs/specification/BOARD_PACKAGE_SPEC.md b/docs/specification/BOARD_PACKAGE_SPEC.md
new file mode 100644
index 00000000..a400292e
--- /dev/null
+++ b/docs/specification/BOARD_PACKAGE_SPEC.md
@@ -0,0 +1,97 @@
+# Board Package Specification
+
+Board packages describe hardware facts and board-level bring-up constraints.
+They do not describe business behavior.
+
+## File Location
+
+Board manifests live under:
+
+```text
+docs/boards/*.board.yaml
+```
+
+The template lives at:
+
+```text
+docs/boards/BOARD_MANIFEST_TEMPLATE.yaml
+```
+
+## Board Package Owns
+
+```text
+pin map
+bus map
+power rails
+display facts
+input facts
+battery facts
+radio hardware facts
+GPS hardware facts
+board init facts
+board sleep/wake hardware hooks
+```
+
+## Board Package Must Not Own
+
+```text
+ChatService
+ContactService
+DirectMessageService
+MeshtasticPhoneCore
+MeshCorePhoneCore
+ConfigService business interpretation
+UI page state
+BLE phone protocol
+GPS business strategy
+LoRa packet semantics
+PKI policy
+peer key policy
+```
+
+## Board Manifest Semantics
+
+Board manifest answers:
+
+```text
+What hardware is physically present?
+Which chip is used?
+Which bus and pins connect it?
+Which power gates exist?
+Which display and input devices exist?
+Which storage/power features exist?
+```
+
+It does not answer:
+
+```text
+Which protocols are enabled?
+Which UI shell is used?
+Which app owns config?
+How direct messages are sent?
+How BLE phone APIs behave?
+How LoRa packets are interpreted?
+```
+
+## Target Manifest Difference
+
+```text
+board_manifest.yaml describes what hardware exists.
+target_manifest.yaml describes how a product uses that hardware.
+```
+
+## Allowed Consumers
+
+Board facts may be consumed by:
+
+```text
+composition roots
+platform factories
+board bring-up code
+hardware adapter construction
+diagnostic tooling
+```
+
+Board facts must not be consumed directly by shared app services, protocol
+cores, presentation models, or renderers.
+
diff --git a/docs/specification/CAPABILITY_AUTHORITY_GLOSSARY.md b/docs/specification/CAPABILITY_AUTHORITY_GLOSSARY.md
new file mode 100644
index 00000000..da392ef8
--- /dev/null
+++ b/docs/specification/CAPABILITY_AUTHORITY_GLOSSARY.md
@@ -0,0 +1,325 @@
+# Capability and Authority Glossary
+
+This glossary is the required vocabulary for cross-platform Trail Mate
+architecture work. Use these terms in documents, PRs, manifests, code reviews,
+and migration plans.
+
+## Platform
+
+The chip, operating system, SDK, and runtime environment family.
+
+Examples:
+
+```text
+esp32
+nrf52
+linux
+test
+```
+
+Platform owns available SDK APIs, threading/task model, ISR model, storage APIs,
+time APIs, BLE stack family, filesystem model, and build toolchain.
+
+Platform is not a board and is not a product target.
+
+## Board Variant
+
+A concrete hardware variant with physical facts.
+
+Examples:
+
+```text
+t_lora_pager
+t_deck
+gat562
+uconsole_aio2
+```
+
+Board Variant owns pin maps, bus maps, display facts, input facts, LoRa chip and
+wiring facts, GPS wiring facts, power rails, charger/battery facts, and board
+bring-up constraints.
+
+Board Variant must not own product behavior.
+
+## Board Package
+
+The source package and manifest that describe and expose a board variant.
+
+Examples:
+
+```text
+boards/tlora_pager
+boards/tdeck
+boards/gat562_mesh_evb_pro
+platform/linux/uconsole
+```
+
+The board package may provide hardware facts and board-level bring-up hooks. It
+must not interpret protocol semantics or own business services.
+
+## Board Facts
+
+Immutable or slowly changing hardware facts about a board: pins, busses,
+display resolution, radio chip, GPS UART, battery/charger presence, and storage
+presence.
+
+Board facts answer "what is physically there?" not "what should the product do?"
+
+## Target
+
+A concrete product composition that chooses platform, board, runtime model,
+capabilities, authorities, UI shell, storage, protocol enablement, and build
+entrypoint.
+
+Examples:
+
+```text
+esp-t-lora-pager-lvgl
+esp-t-deck-lvgl
+nrf52-gat562-node
+linux-uconsole-gtk
+linux-uconsole-ascii
+linux-headless
+```
+
+Target chooses. Board describes. Platform adapts.
+
+## Runtime Context
+
+The task, thread, event loop, ISR, queue, lock, and scheduling context in which
+work executes.
+
+Examples:
+
+```text
+freertos app_task
+freertos radio_task
+BLE stack callback
+GTK main loop
+Linux event loop
+single-thread test tick
+```
+
+Runtime Context is where race policy is enforced.
+
+## Capability
+
+A product-visible ability provided by some board/platform binding.
+
+Examples:
+
+```text
+lora
+gps
+ble
+hostlink
+storage
+display
+input
+battery
+network
+audio
+map_storage
+```
+
+Capability describes ability, state, endpoint host, and link mode. It does not
+own business semantics.
+
+## Capability Binding
+
+The declaration that connects a target capability to a board provider, platform
+adapter, runtime owner, and protocol consumer.
+
+Example:
+
+```text
+target lora capability
+  -> board provider t_lora_pager.radio
+  -> platform driver esp_sx1262_packet_radio
+  -> runtime owner radio_task
+  -> protocol consumers meshtastic, meshcore
+```
+
+## Authority
+
+The execution host or service that owns mutable truth for a category of state.
+
+Examples:
+
+```text
+identity
+peer_key_store
+node_store
+message_store
+location
+time
+config
+device_status
+ui_state
+```
+
+An authority must have one owner. Other contexts use event queues, command
+queues, snapshots, or adapters to interact with it.
+
+## Execution Host
+
+The device or process where a runtime object executes.
+
+Examples:
+
+```text
+esp32
+nrf52
+linux
+external
+test
+none
+```
+
+Execution Host is not the same thing as platform when multiple hosts cooperate.
+
+## Protocol Core
+
+Shared code that understands protocol wire formats and protocol semantics.
+
+Examples:
+
+```text
+Meshtastic radio packet core
+Meshtastic phone protocol core
+MeshCore phone protocol core
+HostLink frame core
+NMEA parser
+```
+
+Protocol Core must not know platform BLE stacks, USB CDC APIs, board pins, or UI
+toolkit objects.
+
+## App Service
+
+Shared or product-level service that coordinates business objects and use cases.
+
+Examples:
+
+```text
+ChatService
+ContactService
+LocationService
+ConfigService
+DeviceStatusService
+```
+
+App Service must not know LVGL, GTK, ASCII, CLI, or board-specific details.
+
+## Presentation Model
+
+UI-independent page/workspace state and actions. It projects app-service
+snapshots into a shape that renderers can consume.
+
+Presentation Model may know compact, desktop, terminal, or headless
+presentation profiles. It must not contain `lv_obj_t`, `GtkWidget`, terminal
+handles, framebuffer handles, or board drivers.
+
+## Renderer
+
+Concrete drawing and toolkit input adapter.
+
+Examples:
+
+```text
+LVGL renderer
+ASCII canvas renderer
+GTK4 renderer
+stdout renderer
+headless snapshot exporter
+```
+
+Renderer consumes snapshots and sends UI actions. It must not own business
+state.
+
+## Shell
+
+The runtime surface that hosts one or more renderers and input adapters for a
+target.
+
+Examples:
+
+```text
+lvgl embedded compact shell
+ascii terminal shell
+gtk desktop workbench shell
+cli command shell
+headless API/log/snapshot shell
+```
+
+## Command Queue
+
+A queue for requested actions that must be executed by the owner context.
+
+Examples:
+
+```text
+ble_callback -> phone_command_queue -> app_task
+ui_thread -> app_command_queue -> app_task
+```
+
+## Event Queue
+
+A queue for facts that occurred and need to be observed by an owner context.
+
+Examples:
+
+```text
+radio_task -> mesh_event_queue -> app_task
+gps_task -> location_event_queue -> app_task
+```
+
+## Snapshot
+
+An immutable projection of state suitable for cross-context consumption.
+
+UI renderers consume snapshots instead of mutable app-service internals.
+
+## Proxy Mode
+
+The way a local target delegates a capability to another execution host.
+
+Common values:
+
+```text
+local_radio
+packet_proxy
+command_proxy
+raw_stream_proxy
+fix_proxy
+simulated
+none
+```
+
+Proxy Mode must be declared in target manifests so business code does not infer
+it from platform or board names.
+
+## Required Distinction
+
+```text
+Platform != Board != Target
+```
+
+Use this exact split:
+
+```text
+Platform:
+  esp32 / nrf52 / linux / test
+
+Board:
+  t_lora_pager / t_deck / gat562 / uconsole_aio2
+
+Target:
+  esp-t-lora-pager-lvgl
+  esp-t-deck-lvgl
+  nrf52-gat562-node
+  linux-uconsole-gtk
+  linux-uconsole-ascii
+  linux-headless
+```
+
diff --git a/docs/specification/CHAT_DELIVERY_ACTION_RUNTIME_SPEC.md b/docs/specification/CHAT_DELIVERY_ACTION_RUNTIME_SPEC.md
new file mode 100644
index 00000000..6b323c2c
--- /dev/null
+++ b/docs/specification/CHAT_DELIVERY_ACTION_RUNTIME_SPEC.md
@@ -0,0 +1,127 @@
+# Chat Delivery Action Runtime Specification
+
+## Purpose
+
+Define runtime/action ownership for chat delivery actions:
+
+- retry
+- cancel pending
+- clear failure
+
+These actions are commands against delivery runtime state. They are not
+presentation model state and they are not renderer behavior.
+
+## Core Rule
+
+Delivery actions belong to runtime/action sinks.
+
+```text
+renderer/controller intent
+  -> ChatDeliveryActionRequest
+    -> IChatDeliveryActionSink
+      -> ChatDeliveryActionService
+        -> ChatDeliveryReadModel / retry port
+```
+
+`ChatWorkspaceModel` must not own retry, cancel, or clear-failure state.
+
+## Types
+
+Phase 7.4 defines:
+
+- `ChatDeliveryActionKind`
+- `ChatDeliveryActionRequest`
+- `ChatDeliveryActionFailure`
+- `ChatDeliveryActionResult`
+- `IChatDeliveryActionSink`
+- `IRetryChatMessagePort`
+- `ChatDeliveryActionService`
+- `LegacyChatDeliveryActionBridge`
+
+## Ownership
+
+`ChatDeliveryActionRequest` is a command DTO. It describes the requested
+delivery action and carries a `ChatDeliveryRef`.
+
+`IChatDeliveryActionSink` handles delivery actions. It must not build snapshots
+or render UI.
+
+`ChatDeliveryActionService` is the first delivery action command handler. It
+may clear records from `ChatDeliveryReadModel` or delegate retry to
+`IRetryChatMessagePort`.
+
+`IRetryChatMessagePort` is a future retry delegation point. It is intentionally
+separate from the read model so Phase 7.4 does not imply a complete retry
+engine.
+
+`LegacyChatDeliveryActionBridge` maps compatibility UI message references into
+delivery action requests. It must not mutate the read model directly.
+
+## ClearFailure
+
+`ClearFailure` behavior:
+
+- invalid reference returns `InvalidRef`
+- missing record returns `NotFound`
+- failed record is removed from `ChatDeliveryReadModel`
+- non-failed record returns `NotRetryable`
+
+This action clears the projected failure state. It does not delete the chat
+message.
+
+## CancelPending
+
+`CancelPending` behavior:
+
+- invalid reference returns `InvalidRef`
+- missing record returns `NotFound`
+- queued or sending record is removed from `ChatDeliveryReadModel`
+- sent, delivered, received, failed, or unknown records return `NotRetryable`
+
+Phase 7.4 only clears the projection. It does not cancel an already submitted
+radio packet.
+
+## Retry
+
+`Retry` behavior:
+
+- invalid reference returns `InvalidRef`
+- if no `IRetryChatMessagePort` is wired, returns `Unsupported`
+- if a retry port is wired, delegates to `retryMessage(ref)`
+
+The retry port owns resend semantics. `ChatDeliveryActionService` does not
+resend packets itself.
+
+## Boundaries
+
+`ChatDeliveryActionService` must not:
+
+- include LVGL or GTK
+- include `ui_presentation`
+- include `ChatWorkspaceModel`
+- build `MessageRow`
+- render UI
+- own packet send policy
+
+`LegacyChatDeliveryActionBridge` must not:
+
+- include LVGL or GTK
+- build `ChatWorkspaceSnapshot`
+- access `ChatWorkspaceModel`
+- directly clear `ChatDeliveryReadModel`
+- retry or send messages itself
+
+`ChatUiController` may submit a delivery action through a bridge in a future UI
+entry point. It must not own the action service or mutate the read model.
+
+## Non-Goals
+
+Phase 7.4 does not implement a full retry engine.
+
+Phase 7.4 does not add retry button or menu UX.
+
+Phase 7.4 does not cancel radio packets.
+
+Phase 7.4 does not delete failed chat messages.
+
+Phase 7.4 does not make `ChatWorkspaceModel` own delivery actions.
diff --git a/docs/specification/CHAT_DELIVERY_RUNTIME_SPEC.md b/docs/specification/CHAT_DELIVERY_RUNTIME_SPEC.md
new file mode 100644
index 00000000..7e106ff4
--- /dev/null
+++ b/docs/specification/CHAT_DELIVERY_RUNTIME_SPEC.md
@@ -0,0 +1,155 @@
+# Chat Delivery Runtime Specification
+
+## Purpose
+
+Define structured runtime ownership for chat delivery, pending, and failure
+state.
+
+Phase 7.1 makes delivery state explicit without making the presentation model or
+renderer responsible for pending queues.
+
+## Core Rule
+
+Delivery state is runtime state, not UI state.
+
+```text
+send result / ACK / failure event
+  -> ChatDeliveryEventProjector
+    -> ChatDeliveryReadModel
+      -> ChatPresentationSource
+        -> MessageRow delivery/failure
+          -> Renderer
+```
+
+## Types
+
+Phase 7.1 introduces:
+
+- `ChatDeliveryRef`
+- `DeliveryState`
+- `DeliveryFailureKind`
+- `ChatDeliveryRecord`
+- `ChatDeliveryReadModel`
+- `ChatDeliveryEventProjector`
+
+Phase 7.3 adds:
+
+- `ChatDeliveryEvent`
+- `IChatDeliveryEventPort`
+- `ProjectingChatDeliveryEventPort`
+- `LegacyChatSendResultMapper`
+- `LegacyChatDeliveryEventBridge`
+
+## Ownership
+
+`ChatDeliveryReadModel` owns UI-readable delivery records.
+
+`ChatDeliveryEventProjector` updates the read model from send/delivery events.
+
+`IChatDeliveryEventPort` is the runtime event sink port for delivery events.
+
+`ProjectingChatDeliveryEventPort` adapts that port to
+`ChatDeliveryEventProjector`.
+
+`LegacyChatDeliveryEventBridge` maps existing `ChatSendResultEvent` and ACK
+timeout hooks into the delivery event port.
+
+`LegacyChatDeliveryBridge` maps existing coarse `ChatMessage::status` and
+legacy send/failure concepts into delivery records.
+
+`ChatPresentationSource` reads the delivery read model and projects state
+into `MessageRow`.
+
+## Boundaries
+
+`ChatDeliveryReadModel` may:
+
+- store bounded delivery records
+- return records by `ChatDeliveryRef`
+- clear records
+
+`ChatDeliveryReadModel` must not:
+
+- send messages
+- retry messages
+- inspect renderer state
+- include LVGL/GTK
+- include `ui_presentation`
+- own radio or mesh adapters
+
+`ChatDeliveryEventProjector` may:
+
+- project queued/sending/sent/delivered/failed/received events
+- map send failure kinds to delivery failure kinds
+
+`ChatDeliveryEventProjector` must not:
+
+- send packets
+- retry messages
+- build UI snapshots
+- mutate ChatService storage directly
+- render UI
+
+`LegacyChatDeliveryEventBridge` may:
+
+- consume legacy send result events
+- look up the message needed to build `ChatDeliveryRef`
+- publish delivery events through `IChatDeliveryEventPort`
+- expose an ACK timeout projection hook
+
+`LegacyChatDeliveryEventBridge` must not:
+
+- send packets
+- retry messages
+- build UI snapshots
+- include LVGL/GTK
+- mutate renderer state
+
+`ChatPresentationSource` may:
+
+- read delivery records
+- enrich `MessageRow.delivery`
+- enrich `MessageRow.failure`
+
+`ChatPresentationSource` must not:
+
+- maintain pending queues
+- receive send result events
+- call the projector
+- infer failure from renderer state
+
+## Message Reference
+
+Phase 7.1 uses `ChatDeliveryRef` as a compatibility reference:
+
+- `local_id`
+- `protocol_id`
+- `nonce_or_seq`
+
+Existing `ChatMessage::msg_id` maps to `protocol_id` first.
+
+## Failure Kinds
+
+Phase 7.1 recognizes:
+
+- `PeerKeyMissing`
+- `LocalIdentityMissing`
+- `RadioSendFailed`
+- `AckTimeout`
+- `UnsupportedProtocol`
+- `Rejected`
+- `Unknown`
+
+## Non-Goals
+
+Phase 7.1 does not implement a full retry engine.
+
+Phase 7.1 does not change radio packet format.
+
+Phase 7.1 does not move all ChatService storage.
+
+Phase 7.1 does not make `ChatWorkspaceModel` own delivery state.
+
+Phase 7.1 does not make renderers infer pending/failure.
+
+Phase 7.1 does not resolve Team rich payload delivery semantics.
diff --git a/docs/specification/CHAT_PRESENTATION_IDENTITY_SPEC.md b/docs/specification/CHAT_PRESENTATION_IDENTITY_SPEC.md
new file mode 100644
index 00000000..c9417fda
--- /dev/null
+++ b/docs/specification/CHAT_PRESENTATION_IDENTITY_SPEC.md
@@ -0,0 +1,192 @@
+# Chat Presentation Identity Spec
+
+Phase 5.6-pre freezes the identity contract used by chat presentation snapshots.
+It does not introduce a new chat business model and does not change
+`core_chat`.
+
+## Boundary
+
+`chat::ConversationId` is the business conversation identity. It belongs to
+`core_chat` and expresses protocol, channel, and peer.
+
+`ui::chat::ConversationId` is a presentation selection token. It belongs to
+`ui_presentation` and expresses which row or conversation view the UI has
+selected.
+
+Those two identities are related by an adapter mapper. `ui_presentation` must
+not include `chat/domain/chat_types.h`, `ChatService`, `ContactService`,
+`IMeshAdapter`, store cursors, or platform/runtime headers.
+
+## Direction
+
+```text
+core_chat types
+    -> ChatPresentationSource / mapper adapter
+        -> ui::chat snapshot types
+            -> LVGL / ASCII / GTK renderer
+```
+
+The adapter is the only layer allowed to include both core chat identity types
+and UI presentation identity types.
+
+## Rules
+
+- `chat::ConversationId` remains the source of truth for core chat sessions.
+- `ui::chat::ConversationId` is only a UI selection token.
+- `ChatWorkspaceRequest` carries UI selection and list offsets into the
+  presentation source. Its offsets are UI window offsets, not database cursors
+  or `ChatService` cursors.
+- `ChatWorkspaceModel` may own only UI selection state and cursor offsets. It
+  must delegate snapshot construction to `IChatPresentationSource` and user
+  actions to `IChatActionSink`.
+- `ChatWorkspaceModel::selectConversation` uses optimistic UI selection:
+  it validates the presentation id, updates local selected state immediately,
+  resets the message offset, and then notifies `IChatActionSink`. A sink
+  failure does not roll back the UI selection because selection is presentation
+  state, while the sink is a synchronization hook for app-side side effects
+  such as read cursors and mark-read behavior.
+- `ChatWorkspaceModel` must not own or expose `ChatService`, `ContactService`,
+  `IMeshAdapter`, stores, protocol adapters, or `chat::ConversationId`.
+- `ChatWorkspaceSnapshot` must not expose `ChatService`, `ContactService`,
+  `IMeshAdapter`, store cursors, or `chat::ConversationId`.
+- `SendMessageView` uses `ui::chat::ConversationId`, not a bare peer node id.
+- `MessageRow` uses `ui::chat::MessageRef`; it must not assume a message id is
+  a database row id, packet id, retry token, or pending id.
+- Team, system, broadcast, and diagnostic presentation rows do not have to be
+  real `core_chat` conversations.
+
+## Mapping
+
+For current core chat conversations:
+
+```text
+chat::ConversationId(protocol, channel, peer != 0)
+    -> ui::chat::ConversationId {
+         kind = DirectPeer,
+         protocol = map(protocol),
+         primary = peer,
+         secondary = channel
+       }
+
+chat::ConversationId(protocol, channel, peer = 0)
+    -> ui::chat::ConversationId {
+         kind = Channel,
+         protocol = map(protocol),
+         primary = channel,
+         secondary = 0
+       }
+```
+
+Team presentation rows are represented as `ConversationKind::Team`. They are not
+forced into `chat::ConversationId`.
+
+## Message Mapping
+
+Message references and delivery labels are presentation projections. The
+`chat_presentation_adapters` layer may map `chat::MessageStatus` to
+`ui::chat::MessageDeliveryState` and `chat::ChatMessage` to
+`ui::chat::MessageRef`, but it must not treat that reference as a database row
+id, retry token, pending nonce, or packet id unless that source field is
+explicitly available.
+
+Current adapter mapping is intentionally narrow:
+
+```text
+chat::MessageStatus::Incoming -> MessageDeliveryState::Received
+chat::MessageStatus::Queued   -> MessageDeliveryState::Queued
+chat::MessageStatus::Sent     -> MessageDeliveryState::Sent
+chat::MessageStatus::Failed   -> MessageDeliveryState::Failed
+```
+
+Send failure mapping from Mesh/Core send results is deferred until the
+pending/failure ownership is explicit.
+
+The current compatibility mapper copies `chat::ChatMessage::msg_id` into
+`MessageRef::protocol_id`. That is a compatibility projection only. It is not
+a stable local UI id, database row id, retry nonce, or pending token. When a
+message repository exposes a stable local row id or message handle, the source
+adapter should populate `MessageRef::local_id` and keep protocol packet ids in
+`MessageRef::protocol_id`.
+
+## Workspace Model Contract
+
+`ChatWorkspaceModel` is a thin presentation model. It keeps the currently
+selected `ui::chat::ConversationId`, conversation list offset, and message list
+offset. Its read path is:
+
+```text
+ChatWorkspaceModel::snapshot()
+    -> ChatWorkspaceRequest
+    -> IChatPresentationSource::buildChatWorkspaceSnapshot(...)
+```
+
+Its action path is:
+
+```text
+ChatWorkspaceModel::selectConversation(...)
+ChatWorkspaceModel::sendMessage(...)
+ChatWorkspaceModel::markRead(...)
+    -> IChatActionSink
+```
+
+`sendMessage` sends against the selected UI conversation token. Mapping that UI
+token back to `core_chat` identity, `MeshSession`, or legacy send behavior
+belongs to the Source/Sink adapter layer, not to `ui_presentation`.
+
+## Source/Sink Adapter Contract
+
+Chat presentation adapters are the first layer allowed to touch real chat
+services. A Source may read `ChatService`, `ContactService`, `TeamService`, and
+mapper adapters to build `ChatWorkspaceSnapshot`. An ActionSink may translate
+`SendMessageView`, `selectConversation`, and `markRead` into app service
+commands.
+
+The read and write sides stay separate:
+
+```text
+ChatService / ContactService / TeamService
+    -> IChatPresentationSource
+        -> ChatWorkspaceSnapshot
+
+SendMessageView / ConversationId action
+    -> IChatActionSink
+        -> ChatService / MeshSession / TeamService
+```
+
+Source adapters must not send messages or mutate renderer state. ActionSink
+adapters must not build snapshots or format row labels. Renderer code must not
+call these services directly.
+
+The initial legacy sink supports `DirectPeer` and `Channel` conversations.
+`Team`, `Broadcast`, and `System` return `Unsupported` until their semantics are
+explicitly mapped in later phases.
+
+The current Phase 5.6-c compatibility adapter lives in
+`modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp`
+and
+`modules/ui_shared/src/ui/presentation_sources/legacy_chat_action_sink.cpp`.
+It is a Source/Sink boundary around the existing `ChatService`, not a new chat
+domain model.
+
+## Minimal Renderer Connection
+
+Phase 5.6-d may connect an existing renderer surface to `ChatWorkspaceModel`
+for the primary conversation list, selected conversation, message list, send,
+and mark-read paths. During transition, legacy LVGL widgets can still require
+local compatibility conversion back to `chat::ConversationMeta` or
+`chat::ChatMessage`. That compatibility conversion is not a public identity
+adapter and must not be treated as part of the portable presentation contract.
+
+Any remaining renderer access to `ChatService`, `ContactService`, team runtime,
+or event-specific message lookup is migration debt for later hardening. New
+renderer paths must use:
+
+```text
+Renderer -> ChatWorkspaceModel -> Source/Sink
+```
+
+## Non-Goals
+
+Phase 5.6 does not complete team chat behavior, does not change message
+storage, does not redefine `chat::ConversationId`, and does not change the
+underlying send/receive protocol paths.
diff --git a/docs/specification/CHAT_RUNTIME_EVENT_PUMP_SPEC.md b/docs/specification/CHAT_RUNTIME_EVENT_PUMP_SPEC.md
new file mode 100644
index 00000000..ff8bb24d
--- /dev/null
+++ b/docs/specification/CHAT_RUNTIME_EVENT_PUMP_SPEC.md
@@ -0,0 +1,123 @@
+# Chat Runtime Event Pump Specification
+
+## Purpose
+
+Define the Phase 7.7 ownership boundary for Chat runtime event routing, delivery projection, key verification projection, and ChatService scheduling.
+
+## Core Rule
+
+Runtime event projection belongs to the event pump.
+
+UI refresh belongs to the controller.
+
+The controller must not own runtime event projection or runtime scheduling.
+
+## Types
+
+### `IChatUiRefreshSink`
+
+`IChatUiRefreshSink` is the minimal UI refresh port exposed to runtime event code.
+
+It may:
+
+- notify the UI that a runtime message arrived
+- notify the UI that a send result changed
+- notify the UI that unread counts changed
+- ask the UI to show a key verification snapshot
+
+It must not:
+
+- expose `ChatService`
+- expose `ChatDeliveryReadModel`
+- expose `ChatDeliveryEventProjector`
+- expose `LegacyKeyVerificationSource`
+- expose raw EventBus events
+
+### `ChatPageRuntimeEventPump`
+
+`ChatPageRuntimeEventPump` is the chat page event pump and event router.
+
+It may:
+
+- call `ChatService::processIncoming()`
+- call `ChatService::flushStore()`
+- receive EventBus `sys::Event` objects
+- route `ChatSendResultEvent` to `LegacyChatDeliveryEventBridge`
+- route key verification events to `LegacyKeyVerificationSource`
+- select the key verification peer on `KeyVerificationModel`
+- notify `IChatUiRefreshSink`
+- delete consumed EventBus events
+
+It must not:
+
+- render LVGL widgets
+- own `ChatWorkspaceModel`
+- encode Team payloads
+- retry messages
+- implement protocol packet flow
+
+### `ChatPageRuntimeFacade`
+
+`ChatPageRuntimeFacade` implements `IChatUiRuntime` for existing app facade integration.
+
+It calls:
+
+```text
+event_pump.update()
+controller.update()
+```
+
+for ticks, and:
+
+```text
+event_pump.handleEvent(event)
+```
+
+for EventBus events.
+
+`chat_page_runtime.cpp` registers the facade, not `ChatUiController`, as the active chat UI runtime.
+
+## Event Handling Order
+
+### `ChatSendResultEvent`
+
+1. `ChatPageRuntimeEventPump` calls `LegacyChatDeliveryEventBridge::onChatSendResult(...)`.
+2. `ChatPageRuntimeEventPump` calls `IChatUiRefreshSink::onRuntimeSendResult(...)`.
+
+### `ChatNewMessageEvent`
+
+1. Chat service already owns message storage.
+2. `ChatPageRuntimeEventPump` calls `IChatUiRefreshSink::onRuntimeMessageArrived(...)`.
+
+### `ChatUnreadChangedEvent`
+
+1. `ChatPageRuntimeEventPump` calls `IChatUiRefreshSink::onRuntimeUnreadChanged()`.
+
+### Key Verification Events
+
+1. `ChatPageRuntimeEventPump` updates `LegacyKeyVerificationSource`.
+2. `ChatPageRuntimeEventPump` selects peer on `KeyVerificationModel`.
+3. `ChatPageRuntimeEventPump` calls `IChatUiRefreshSink::showKeyVerification(...)`.
+
+## Runtime Scheduling
+
+`ChatPageRuntimeEventPump::update()` owns the chat page's legacy runtime tick:
+
+```text
+ChatService::processIncoming()
+ChatService::flushStore()
+```
+
+`ChatUiController::update()` remains UI-only and may refresh dirty UI state.
+
+## Non-goals
+
+Phase 7.7 does not:
+
+- rewrite EventBus
+- rewrite `ChatService`
+- rewrite `ChatUiController`
+- implement a new thread model
+- change protocol packet flow
+- solve Team rich payload rendering
+- solve Map tile/cache ownership
diff --git a/docs/specification/CHAT_WORKSPACE_MODEL_SPEC.md b/docs/specification/CHAT_WORKSPACE_MODEL_SPEC.md
new file mode 100644
index 00000000..16ea1d4b
--- /dev/null
+++ b/docs/specification/CHAT_WORKSPACE_MODEL_SPEC.md
@@ -0,0 +1,148 @@
+# Chat Workspace Model Specification
+
+## Purpose
+
+`ChatWorkspaceModel` is a presentation-layer ViewModel.
+
+It owns UI-local workspace state only:
+
+- selected conversation
+- conversation list offset
+- message list offset
+
+It does not own:
+
+- ChatService
+- ContactService
+- TeamService
+- MeshSession
+- message repository
+- pending queue
+- ACK tracker
+- retry state
+- failure inference
+
+## Pattern
+
+This model follows:
+
+- MVVM / Passive View
+- Source/Sink Port
+- Immutable Snapshot
+- CQRS Read/Command split
+
+## Snapshot Flow
+
+Renderer calls:
+
+```text
+ChatWorkspaceModel::snapshot()
+    -> IChatPresentationSource::buildChatWorkspaceSnapshot(request, out)
+```
+
+The returned `ChatWorkspaceSnapshot` is an immutable value object for UI
+rendering.
+
+## Action Flow
+
+Renderer calls:
+
+```text
+ChatWorkspaceModel::selectConversation(id)
+ChatWorkspaceModel::sendMessage(text)
+ChatWorkspaceModel::markRead(id)
+```
+
+The model forwards actions to `IChatActionSink`.
+
+## Optimistic Selection
+
+`selectConversation(id)` uses optimistic UI selection.
+
+Semantics:
+
+1. Validate the presentation `ConversationId`.
+2. Update local `selected_conversation`.
+3. Reset `message_offset`.
+4. Notify `IChatActionSink::selectConversation(id)`.
+5. Do not roll back local selection if the sink returns failure.
+
+Rationale:
+
+- selected conversation is presentation-local state.
+- sink selection is a synchronization hook for business-side side effects.
+- unsupported conversations may still be visible/selectable in UI.
+
+## Message Paging
+
+`ChatWorkspaceRequest::message_offset` is reserved for future message paging.
+
+`ChatPresentationSource` currently ignores `message_offset` and returns the
+recent message window.
+
+This is intentional. The closeout phase must not change `ChatService` storage
+or paging behavior.
+
+Renderers must not assume `message_offset` is already honored by the chat read
+projection.
+
+## Source/Sink Adapter Contract
+
+`ChatPresentationSource` is the product chat read projection adapter. It may
+read `ChatService` and `ContactService`, and may use
+`chat_presentation_adapters` to map core chat types into `ui_presentation`
+rows.
+
+It must not:
+
+- send messages
+- mark conversations read
+- mutate `ChatService`
+- access LVGL widgets
+- access radio, mesh adapters, PKI, or packet builders
+
+`LegacyChatActionSink` is the Phase 5.6 compatibility command adapter. It may
+translate UI actions into `ChatService` commands.
+
+It must not:
+
+- build `ChatWorkspaceSnapshot`
+- format UI labels
+- access LVGL widgets
+- inspect renderer state
+- build radio packets or perform PKI logic
+
+## Pending / Failure
+
+`ChatWorkspaceModel` must not own pending messages, ACK tracking, retry state,
+or failure inference.
+
+Pending/failure projection must flow through:
+
+```text
+ChatService / MeshSession / ACK tracker / pending store
+    -> IChatPresentationSource
+        -> MessageRow.delivery
+        -> MessageRow.failure
+```
+
+Until structured failure ownership is explicit, the compatibility projection is
+limited to the coarse `chat::MessageStatus` available from `ChatMessage`.
+
+## Team Chat
+
+Team chat is not part of the generic DirectPeer/Channel path.
+
+Team rows use:
+
+```text
+ConversationKind::Team
+```
+
+Team send/read/projection semantics are handled by a dedicated Team Chat
+Presentation phase.
+
+## Contract Role
+
+This file is an Architecture Decision Record and ViewModel contract. It
+constrains later implementation; it is not only descriptive documentation.
diff --git a/docs/specification/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md b/docs/specification/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md
new file mode 100644
index 00000000..596c5fb9
--- /dev/null
+++ b/docs/specification/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md
@@ -0,0 +1,211 @@
+# Cross-Platform Product Architecture Specification
+
+This is the top-level architecture baseline for Trail Mate's cross-platform
+product family. It does not replace the existing incremental migration. It
+defines the shared language, target structure, and review rules that later
+LoRa, GPS, BLE, UI, Linux, and embedded work must use.
+
+Phase 1 is architecture baseline work only. It must not extract phone cores,
+rewrite adapters, change PKI behavior, move large source trees, or turn target
+manifests into a runtime configuration system.
+
+## Core Rule
+
+```text
+Target chooses.
+Board describes.
+Platform adapts.
+Runtime schedules.
+Capability provides.
+Protocol interprets.
+UseCase decides.
+AppService coordinates.
+PresentationModel projects.
+Renderer draws.
+CompositionRoot wires.
+```
+
+In Chinese project terms:
+
+```text
+Target decides the product combination.
+Board describes hardware facts.
+Platform adapts platform capabilities.
+Runtime owns scheduling and race boundaries.
+Capability provides a device ability.
+Protocol interprets protocol semantics.
+UseCase performs business decisions.
+AppService coordinates business objects.
+PresentationModel projects displayable state.
+Renderer only draws.
+CompositionRoot only assembles dependencies.
+```
+
+## Layer Responsibilities
+
+| Layer | Owns | Must not own |
+| --- | --- | --- |
+| Target | Product combination, selected platform, selected board, UI shell, authorities, capability bindings, race policy | Hardware pin facts, protocol semantics, business code |
+| Board | Hardware facts, pin maps, bus maps, electrical constraints, board bring-up facts | Business behavior, protocol interpretation, UI page logic |
+| Platform | SDK/OS/framework adapters, driver host integration, storage backend adapters, BLE/serial/SPI/I2C/USB host integration | Meshtastic/MeshCore semantics, direct-message policy, PKI policy, UI state |
+| Runtime | Task/thread/event-loop ownership, ISR deferral policy, queue ownership, lock policy | Business decisions or protocol interpretation |
+| Capability | Abstract ability exposed by a board/platform binding, such as LoRa, GPS, BLE, storage, display, input | Product policy, protocol semantics, UI layout |
+| Protocol | Wire formats, protocol codecs, semantic mapping from protocol frames to domain commands/events | Board pins, BLE stack APIs, UI widgets, storage backend details |
+| UseCase | Business decisions and invariants | Platform API calls, renderer code |
+| AppService | Coordination of use cases and domain state behind stable app APIs | LVGL, GTK, ASCII, board-specific branches |
+| PresentationModel | UI-independent view/workspace state and actions | Toolkit objects, terminal handles, hardware access |
+| Renderer | Concrete drawing and input event translation for LVGL, GTK, ASCII, CLI, or headless shell | Business logic and mutable service ownership |
+| CompositionRoot | Wires target manifest, board facts, platform factories, app services, presentation models, and renderers | Runtime behavior hidden across random files |
+
+## Canonical Dependency Direction
+
+```text
+Renderer
+  -> PresentationModel
+    -> AppService
+      -> UseCase
+        -> Domain / Protocol Core / Ports
+          <- Platform Adapter
+
+CompositionRoot
+  -> Target Manifest
+  -> Board Package
+  -> Platform Factory
+  -> Runtime Context
+  -> AppService / PresentationModel / Renderer graph
+```
+
+Board facts may be consumed by platform factories and composition roots. Shared
+core code must not include board, platform, or UI headers.
+
+## Non-Negotiable Boundaries
+
+Board packages must not know business behavior. A board may say that a radio is
+an SX1262 on a given SPI bus; it may not say how direct messages, PKI, contacts,
+or phone protocol responses work.
+
+Platform adapters must not interpret product protocol semantics. A BLE host may
+own advertising, services, characteristics, callbacks, notify operations, MTU,
+chunking, and stack-specific lifecycle. It must not own Meshtastic or MeshCore
+phone protocol behavior.
+
+Radio adapters must not own direct message, PKI, peer key, contact, or phone-core
+policy. They may send and receive packets and report radio status.
+
+GPS drivers must not directly serve UI, BLE, Mesh, or storage policy. They may
+provide bytes, fixes, timestamps, diagnostics, or device status through declared
+capabilities.
+
+Renderers must not own business logic. They consume presentation snapshots and
+emit UI actions.
+
+App services must not know LVGL, GTK, ASCII, CLI, terminal handles, screen sizes,
+font objects, or widget classes.
+
+Protocol cores must not know Bluefruit, NimBLE, BlueZ, USB CDC, UART driver
+objects, board pins, or UI toolkit objects.
+
+Shared core modules must not include platform, board, SDK, or UI toolkit headers.
+
+## Target, Board, Platform
+
+These three words are deliberately separate.
+
+Platform is the chip, OS, SDK, and runtime environment family:
+
+```text
+esp32
+nrf52
+linux
+test
+```
+
+Board Variant is a concrete hardware variant:
+
+```text
+t_lora_pager
+t_deck
+gat562
+uconsole_aio2
+```
+
+Target is the product composition:
+
+```text
+esp-t-lora-pager-lvgl
+esp-t-deck-lvgl
+nrf52-gat562-node
+linux-uconsole-gtk
+linux-uconsole-ascii
+linux-headless
+```
+
+Avoid ambiguous language such as "the ESP32 target" or "the Linux target" when
+the actual distinction is platform, board, shell, or product target.
+
+## Capability and Authority
+
+Capabilities describe available abilities such as LoRa, GPS, BLE, storage,
+display, input, battery, hostlink, and network.
+
+Authorities describe where mutable truth lives. Examples:
+
+```text
+identity
+peer_key_store
+node_store
+message_store
+location
+time
+config
+device_status
+ui_state
+```
+
+Every target manifest must say which execution host owns each authority. If an
+authority is proxied, the target must say whether the proxy is packet-level,
+command-level, snapshot-level, or disabled.
+
+## Composition Root Rule
+
+Composition roots may contain target-specific decisions. They are the place that
+connects board facts to platform adapter factories and app services.
+
+Non-composition-root code must not accumulate product selection macros such as
+`BOARD_*`, `TARGET_*`, or `CONFIG_IDF_TARGET*` unless the file is explicitly a
+platform build adapter or compatibility wrapper already recorded as a known
+violation.
+
+## Phase 1 Scope
+
+Phase 1 adds:
+
+```text
+architecture specification
+glossary
+target manifest specification and drafts
+board package specification and drafts
+runtime/concurrency specification
+UI presentation specification
+core_device vocabulary types
+PR review checklist
+non-blocking boundary report script
+known historical violations log
+```
+
+Phase 1 intentionally does not:
+
+```text
+extract MeshtasticPhoneCore
+extract MeshCorePhoneCore
+rewrite LoRa adapters
+rewrite GPS services
+rewrite LVGL pages
+add GTK or ASCII UI behavior
+fix Linux direct message behavior
+change PKI behavior
+move large source trees
+make target manifests runtime configuration
+block CI on the new architecture checker
+```
+
diff --git a/docs/specification/DEVICE_UX_PACK_ARCHITECTURE_SPEC.md b/docs/specification/DEVICE_UX_PACK_ARCHITECTURE_SPEC.md
new file mode 100644
index 00000000..37ba463d
--- /dev/null
+++ b/docs/specification/DEVICE_UX_PACK_ARCHITECTURE_SPEC.md
@@ -0,0 +1,309 @@
+# Device UX Pack Architecture Specification
+
+## Purpose
+
+Phase 8 introduces explicit device UX packs so Trail Mate can support multiple
+screen sizes, input styles, and product depths without scattering device checks
+inside pages and renderers.
+
+Device differences are not just layout differences. They include page set,
+feature depth, input model, workflow shortcuts, map capability, chat depth,
+team actions, and status-only experiences.
+
+Phase 8.1 defines the vocabulary and boundaries only. It does not split
+`ui_shared`, create UX pack modules, or move existing LVGL screens.
+
+Phase 8 UX Pack Runtime Binding establishes the first executable selection
+chain:
+
+```text
+Target/AppShell
+  -> ux_pack_id
+    -> UxPackRegistry
+      -> IUxPack
+        -> ScreenRegistry / UxFeatureSet / InputBindingSet
+```
+
+This binding names the current default UI as `CompatibilityUxPack`, adds
+`UConsoleDesktopUxPack`, `TinyNodeStatusUxPack`, and `SimulatorFullUxPack`, and
+requires app shell validation to resolve the configured UX pack through
+`findUxPackById`.
+
+## Core Rule
+
+```text
+Board describes.
+Target chooses.
+UX Pack presents.
+Renderer draws.
+```
+
+Expanded chain:
+
+```text
+Board describes hardware facts.
+Target chooses product intent and UX profile.
+DeviceUxProfile declares UX capability decisions.
+UxPack builds page set, input bindings, and renderer choices.
+ScreenFactory creates screens for that pack.
+Renderer draws snapshots and widgets.
+```
+
+## Core Concepts
+
+### DeviceUxProfile
+
+`DeviceUxProfile` is a product UX declaration for a target class.
+
+It describes:
+
+- screen class
+- input model
+- primary workflows
+- feature depth
+- hidden or degraded features
+- selected `UxPack`
+- selected `LayoutProfile`
+- selected `ScreenSet`
+- selected `InputBindingSet`
+
+It does not describe board pins, buses, SDK APIs, or storage paths.
+
+### UxPack
+
+`UxPack` is a strategy-like UI product package for a device family.
+
+It decides:
+
+- which screens exist
+- which workflows are first-class
+- which features are compact, status-only, hidden, or unavailable
+- which renderers are used
+- which input bindings are active
+- which page transitions are available
+- which modal and picker implementations are used
+
+Candidate future packs:
+
+```text
+deck_full
+pager_compact
+watch_quick
+cardputer_wide
+tab5_touch
+tiny_node_status
+```
+
+Current executable baseline packs:
+
+```text
+compatibility
+uconsole_desktop
+tiny_node_status
+simulator_full
+```
+
+### UxFeatureSet
+
+`UxFeatureSet` expresses product-to-UX decisions.
+
+It may classify a feature as:
+
+- full
+- compact
+- quick action
+- status only
+- hidden
+- unavailable
+
+Examples:
+
+| Feature | Full device | Compact device | Status node |
+| --- | --- | --- | --- |
+| Map | full pan/zoom/offline tiles | compact current-position view | hidden |
+| Chat | full conversation and actions | quick reply / recent messages | status only |
+| Team actions | location, command, picker | quick location | hidden |
+| GPS | full status and sky view | compact status | status only |
+
+Feature decisions belong to the target UX profile and UX pack, not to board
+facts or renderers.
+
+### ScreenSet
+
+`ScreenSet` lists screens available in a UX pack.
+
+It defines navigation membership, default screen, screen ordering, modal
+availability, and whether a screen is full, compact, or delegated to a status
+surface.
+
+### InputBindingSet
+
+`InputBindingSet` maps device input affordances to presentation actions.
+
+It may describe:
+
+- rotary encoder bindings
+- keyboard bindings
+- touch gestures
+- button chords
+- long-press behavior
+- paging behavior
+- quick actions
+
+It must not call platform input APIs directly. Platform adapters emit input
+events; the binding set maps them into UX actions.
+
+### ScreenFactory
+
+`ScreenFactory` is an abstract factory owned by a UX pack.
+
+It creates screens, modals, pickers, and renderer variants selected by that UX
+pack. It must not create product services, read board pins, or reach into build
+entrypoints.
+
+### LayoutProfile
+
+`LayoutProfile` describes visual and spatial constraints:
+
+- viewport class
+- density
+- navigation form
+- available chrome
+- touch or non-touch layout assumptions
+- modal sizing
+- list density
+- map viewport behavior
+
+`LayoutProfile` is not the whole UX decision. It is one input to `UxPack`.
+
+## Layering
+
+Target layering:
+
+```text
+ui_presentation
+  portable snapshots/models
+
+ui_lvgl_core
+  LVGL technical primitives
+
+ui_lvgl_ux_packs
+  device-specific pages/features/layouts/input
+
+apps/target
+  chooses UX pack
+
+boards
+  describe hardware facts
+```
+
+Detailed responsibilities:
+
+| Layer | Owns | Must not own |
+| --- | --- | --- |
+| `ui_presentation` | portable snapshots, models, read DTOs, action DTOs | LVGL, GTK, filesystem, platform headers, board macros |
+| `ui_lvgl_core` | LVGL themes, primitive widgets, navigation host, input host helpers, screen host | product feature decisions, target selection, board facts |
+| `ui_lvgl_ux_packs` | device-specific screen sets, feature depth, renderer variants, modal variants, input binding sets | HAL details, SDK build entrypoints, protocol policy |
+| `apps/target` | UX pack choice, target profile choice, platform and board composition | screen internals, LVGL widget trees, board pin facts |
+| `boards` | hardware facts | product feature decisions, UX screen selection |
+
+## Allowed Flow
+
+```text
+Target profile
+  -> DeviceUxProfile
+    -> UxPack
+      -> ScreenSet + InputBindingSet + LayoutProfile
+        -> ScreenFactory
+          -> Renderer / widgets
+            -> LVGL
+```
+
+Presentation snapshots flow in the opposite runtime data direction:
+
+```text
+runtime source
+  -> presentation source / projector
+    -> snapshot / read DTO
+      -> UX pack renderer
+        -> LVGL / GTK / ASCII
+```
+
+The renderer consumes the chosen shape. It does not choose the target, board,
+feature set, or data source.
+
+## Forbidden Patterns
+
+Do not branch inside pages on `BOARD_xxx` macros.
+
+Renderer must not detect concrete device.
+
+Board facts must not decide product features.
+
+Do not put all device UI in one `chat_page.cpp` / `map_page.cpp`.
+
+Do not treat layout profile as the full UX decision.
+
+Do not put PlatformIO, ESP-IDF, or CMake entrypoint logic inside a UX pack.
+
+Do not let a UX pack read filesystem tile paths, GPS runtime, Team store, Chat
+service, or board pin maps directly.
+
+## Device UX Pack Examples
+
+| UX pack | Typical device class | Intent |
+| --- | --- | --- |
+| `deck_full` | keyboard/touch deck | full chat, full map, team actions, settings |
+| `pager_compact` | LoRa pager | compact navigation, quick messages, current GPS, status views |
+| `watch_quick` | watch-sized touch device | glanceable status, quick actions, compact team location |
+| `cardputer_wide` | keyboard landscape device | dense chat and status, compact map |
+| `tab5_touch` | larger touch display | full map, richer team, dashboard-first UX |
+| `tiny_node_status` | small node/status display | telemetry, radio/GPS/battery, no full workflows |
+
+These are architecture examples, not required Phase 8.1 directories.
+
+## Relationship To Phase 7
+
+Phase 7 moved ownership out of controllers and renderers:
+
+- chat delivery runtime
+- chat event pump
+- Team action ownership
+- Team rich payload presentation
+- Team position picker renderer
+- map tile source/cache
+- map render queue/cache
+- map overlay source
+- GPS runtime scheduling
+
+Phase 8 uses those boundaries to decide which objects become shared portable
+models, LVGL core primitives, UX pack renderers, runtime modules, or legacy
+adapters.
+
+## Non-Goals
+
+Phase 8.1 does not:
+
+- implement a `UxPack` class
+- create `ui_lvgl_core`
+- create `ui_lvgl_ux_packs`
+- split LVGL screens
+- change navigation behavior
+- change build entrypoints
+- remove `Legacy*` adapters
+- rewrite page renderers
+
+## Review Rules
+
+When adding or moving UI code, ask:
+
+- Is this portable presentation state, LVGL primitive, UX pack decision,
+  renderer implementation, runtime helper, platform adapter, or board fact?
+- Does this device difference change only geometry, or does it change workflow?
+- Is a renderer choosing a feature that should be chosen by `DeviceUxProfile`?
+- Is a board manifest making a product decision?
+- Is one page accumulating device-specific branches that should be a UX pack
+  split?
+
+Phase 8 should make device UX differences explicit before making directory
+movement broad.
diff --git a/docs/specification/GPS_RUNTIME_SCHEDULING_SPEC.md b/docs/specification/GPS_RUNTIME_SCHEDULING_SPEC.md
new file mode 100644
index 00000000..823d5858
--- /dev/null
+++ b/docs/specification/GPS_RUNTIME_SCHEDULING_SPEC.md
@@ -0,0 +1,75 @@
+# GPS Runtime Scheduling Spec
+
+## Ownership Rule
+
+GPS page cadence belongs to runtime scheduling, not renderers and not page
+widgets.
+
+`GpsPageRuntimePump` owns:
+
+- active/inactive flag
+- refresh interval
+- last refresh timestamp
+- model refresh notification order
+
+It does not own:
+
+- LVGL widgets
+- hardware GPS adapters
+- route/tracker stores
+- map tile loading
+
+## UI Refresh Port
+
+`IGpsUiRefreshSink` exposes the minimal UI notification:
+
+```cpp
+virtual void onGpsRuntimeUpdated() = 0;
+```
+
+It must not expose GPS source, parser, hardware adapter, or snapshots.
+
+## Refresh Model Port
+
+`IGpsStatusRefreshModel` exposes:
+
+```cpp
+virtual void refresh() = 0;
+```
+
+The current implementation may adapt a legacy page refresh function. The pump
+still owns cadence even if the underlying model remains pull-on-render.
+
+## Pump Behavior
+
+Inactive:
+
+- `update(now_ms)` is a no-op.
+
+Active first update:
+
+- call `model.refresh()`
+- call `ui.onGpsRuntimeUpdated()` if a sink exists
+- record `now_ms`
+
+Active subsequent update:
+
+- refresh only when `now_ms - last_update_ms >= interval_ms`
+
+When set inactive:
+
+- clear last update state so the next active update refreshes immediately.
+
+## Runtime Wiring
+
+Page runtime may keep LVGL timers as tick hooks. The timer callback must call
+the pump; the callback must not encode refresh cadence policy itself.
+
+## Non-goals
+
+- No GPS hardware adapter rewrite.
+- No NMEA parser rewrite.
+- No route/tracker rewrite.
+- No map tile loader rewrite.
+- No GNSS skyplot rewrite.
+- No new thread model.
diff --git a/docs/specification/KEY_VERIFICATION_RUNTIME_SPEC.md b/docs/specification/KEY_VERIFICATION_RUNTIME_SPEC.md
new file mode 100644
index 00000000..21b430a0
--- /dev/null
+++ b/docs/specification/KEY_VERIFICATION_RUNTIME_SPEC.md
@@ -0,0 +1,149 @@
+# Key Verification Runtime Specification
+
+## Purpose
+
+Define the runtime/presentation boundary for key verification workflows.
+
+Key verification lets a user compare or submit protocol-specific verification
+data for a peer and then accept, reject, refresh, or complete the workflow.
+
+## Core Rule
+
+Key verification is an independent runtime/presentation workflow.
+
+It is not:
+
+- chat delivery state
+- `ChatWorkspaceModel` state
+- `MessageRow` state
+- renderer-local modal state
+
+## Types
+
+Phase 7.5 defines:
+
+- `VerificationProtocol`
+- `VerificationState`
+- `VerificationFailureKind`
+- `VerificationPromptKind`
+- `KeyVerificationSnapshot`
+- `KeyVerificationRequest`
+- `IKeyVerificationPresentationSource`
+- `IKeyVerificationActionSink`
+- `KeyVerificationModel`
+- `LegacyKeyVerificationSession`
+- `LegacyKeyVerificationSource`
+- `LegacyKeyVerificationActionSink`
+
+## Snapshot
+
+`KeyVerificationSnapshot` is a UI-readable projection. It may contain:
+
+- peer id
+- peer label
+- protocol kind
+- workflow state
+- failure kind
+- prompt kind
+- verification code or number display
+- status line
+- command availability flags
+
+It must not contain:
+
+- private keys
+- raw public keys
+- PSK material
+- protocol packets
+- full peer records
+- storage schema details
+
+## Presentation Source
+
+`IKeyVerificationPresentationSource` builds snapshots from runtime state.
+
+It must not:
+
+- render UI
+- send messages
+- mutate trust state
+- submit verification numbers
+- expose protocol packet details to renderers
+
+## Action Sink
+
+`IKeyVerificationActionSink` handles verification commands:
+
+- accept
+- reject
+- refresh
+- submit number
+
+It must not build snapshots or render UI.
+
+## Model
+
+`KeyVerificationModel` is a portable presentation model. It stores only the
+selected peer/protocol request and delegates all projection/action behavior to
+its source and sink.
+
+It must not:
+
+- include LVGL or GTK
+- include `ChatService`
+- include `IMeshAdapter`
+- read a key store
+- compute verification codes
+- own protocol-specific verification state
+
+## Legacy Bridge
+
+`LegacyKeyVerificationSource` and `LegacyKeyVerificationActionSink` are Phase
+7.5 anti-corruption adapters.
+
+They isolate current MeshCore/Meshtastic key verification helpers and contact
+trust APIs behind the portable key verification model boundary.
+
+The bridge may consume existing key verification events and update a bounded
+legacy session. It must not expose protocol payload details to
+`ChatUiController`.
+
+## Chat UI Controller
+
+`ChatUiController` may:
+
+- receive legacy runtime events
+- forward event data into the key verification legacy source
+- select the peer in `KeyVerificationModel`
+- render a modal from `KeyVerificationSnapshot`
+- parse numeric input from the active textarea
+- call `KeyVerificationModel` actions
+
+It must not:
+
+- store nonce or verification workflow state
+- compute verification codes
+- inspect raw key material
+- call `IMeshAdapter::submitKeyVerificationNumber(...)`
+- call `ContactService::setNodeKeyManuallyVerified(...)`
+
+## Direct Message Intent
+
+Direct-message failures such as peer-key-missing or verification-needed may be
+translated into a key verification presentation intent in a later phase.
+
+Phase 7.5 only establishes the target boundary so that future routing does not
+pollute chat delivery, message rows, or renderer state.
+
+## Non-Goals
+
+Phase 7.5 does not implement full trust management.
+
+Phase 7.5 does not rewrite MeshCore or Meshtastic key exchange.
+
+Phase 7.5 does not make key verification durable.
+
+Phase 7.5 does not add rich key verification rendering to chat messages.
+
+Phase 7.5 does not add key verification to `ChatWorkspaceModel` or
+`MessageRow`.
diff --git a/docs/specs/LOCALE_PACKS.md b/docs/specification/LOCALE_PACKS.md
similarity index 100%
rename from docs/specs/LOCALE_PACKS.md
rename to docs/specification/LOCALE_PACKS.md
diff --git a/docs/specs/LOCALE_PACK_RELEASE_SPEC.md b/docs/specification/LOCALE_PACK_RELEASE_SPEC.md
similarity index 100%
rename from docs/specs/LOCALE_PACK_RELEASE_SPEC.md
rename to docs/specification/LOCALE_PACK_RELEASE_SPEC.md
diff --git a/docs/specs/LOCALIZATION_SPEC.md b/docs/specification/LOCALIZATION_SPEC.md
similarity index 100%
rename from docs/specs/LOCALIZATION_SPEC.md
rename to docs/specification/LOCALIZATION_SPEC.md
diff --git a/docs/specification/MAP_OVERLAY_ROUTE_TRACKER_RUNTIME_SPEC.md b/docs/specification/MAP_OVERLAY_ROUTE_TRACKER_RUNTIME_SPEC.md
new file mode 100644
index 00000000..078896e3
--- /dev/null
+++ b/docs/specification/MAP_OVERLAY_ROUTE_TRACKER_RUNTIME_SPEC.md
@@ -0,0 +1,131 @@
+# Map Overlay / Route / Tracker Runtime Spec
+
+## Ownership Rule
+
+Map overlay state is presentation projection state. It is not tile source state,
+not renderer widget state, and not filesystem state.
+
+The required flow is:
+
+runtime source -> presentation source / projector -> `MapOverlaySnapshot` -> renderer
+
+The forbidden flow is:
+
+renderer -> GPS runtime / Team store / route store / tracker store / filesystem
+
+## Types
+
+`MapOverlayKind` describes what a map item means:
+
+- `CurrentPosition`
+- `TeamMember`
+- `RoutePoint`
+- `TrackPoint`
+- `MeasurementPoint`
+- `SelectedTarget`
+- `Warning`
+
+`MapOverlayStyle` describes renderer styling intent:
+
+- `Default`
+- `OwnPosition`
+- `Team`
+- `Route`
+- `Track`
+- `Warning`
+
+`MapOverlayItem` is a view DTO with:
+
+- kind/style
+- `MapGeoPoint`
+- label/detail fixed text
+- stable id
+- icon id
+- selected/visible flags
+
+`MapOverlaySnapshot` is a fixed-capacity snapshot with `kMaxItems = 64`.
+
+It must not contain:
+
+- `lv_obj_t*`
+- tile paths
+- bitmap bytes
+- route store pointers
+- GPS source pointers
+- Team store pointers
+- filesystem paths
+
+## Source Port
+
+`IMapOverlayPresentationSource` owns read projection:
+
+```cpp
+virtual bool buildMapOverlaySnapshot(MapOverlaySnapshot& out) const = 0;
+```
+
+It may be implemented by a legacy adapter, but renderers must depend on the port
+or on an already-built snapshot, not on concrete runtime sources.
+
+## Projector
+
+`MapOverlayProjector` maps already-read runtime facts to overlay rows:
+
+- `projectCurrentPosition(...)`
+- `projectTeamMember(...)`
+
+It validates coordinates, assigns kind/style/stable id, and appends to the fixed
+snapshot.
+
+It must not:
+
+- read GPS runtime
+- read Team store
+- render LVGL widgets
+- access tile source/cache
+- access filesystem
+
+## Legacy Adapter
+
+`LegacyMapOverlaySource` is an anti-corruption adapter. It may depend on:
+
+- `IMapOverlayGpsSource`
+- `IMapOverlayTeamSource`
+- `MapOverlayProjector`
+
+The adapter exists to contain legacy GPS/team fact gathering. It does not render,
+open files, or mutate map viewport state.
+
+## Runtime Wiring
+
+Map page runtime or composition root owns:
+
+- concrete legacy GPS/team overlay sources
+- `LegacyMapOverlaySource`
+- built overlay snapshot
+
+Renderer consumes the overlay snapshot. During migration, a runtime may build
+the snapshot before render and keep renderer changes small.
+
+## Deferred Items
+
+Route/tracker/breadcrumb overlays are deferred until route and tracker stores
+have presentation source ports. Exit condition:
+
+route/tracker facts are projected into `MapOverlaySnapshot` or a dedicated route
+overlay snapshot, and renderer code no longer reads concrete route/tracker
+stores.
+
+Measurement point overlays are deferred until the measurement tool has a
+runtime/source boundary. Exit condition:
+
+measurement state is projected as `MeasurementPoint` items and renderers consume
+the same overlay snapshot path.
+
+## Non-goals
+
+- No map overlay visual redesign.
+- No online tile download.
+- No route/tracker engine rewrite.
+- No measurement tool rewrite.
+- No UX Pack work.
+- No repository layout work.
diff --git a/docs/specification/MAP_TILE_RENDER_QUEUE_CACHE_SPEC.md b/docs/specification/MAP_TILE_RENDER_QUEUE_CACHE_SPEC.md
new file mode 100644
index 00000000..73b746f1
--- /dev/null
+++ b/docs/specification/MAP_TILE_RENDER_QUEUE_CACHE_SPEC.md
@@ -0,0 +1,71 @@
+# Map Tile Render Queue / Decoded Cache Spec
+
+## Rule
+
+Source owns tile bytes.
+
+Decoder cache owns decoded image lifetime.
+
+Render queue owns the current visible tile plan.
+
+Renderer draws widgets from the visible plan. It must not own tile path policy.
+
+## Objects
+
+| Object | Pattern | Responsibility | Forbidden |
+| --- | --- | --- | --- |
+| `MapTileScreenRect` | View DTO | Screen-space tile rectangle | Filesystem path |
+| `MapTileRenderState` | View state enum | Unknown / Missing / Loading / Ready / Error | Decode ownership |
+| `MapTileRenderRef` | View DTO | Tile identity + screen rect + state | File reads, LVGL object lifecycle |
+| `MapTileRenderQueue` | Read model / render queue | Fixed-capacity current viewport tile plan | `std::vector`, LVGL objects, filesystem reads |
+| `IMapTileDecoderCache` | Cache port | Portable decoded cache boundary | LVGL handles, path mapping |
+| `LvglDecodedTileCache` | Adapter / cache owner | ESP LVGL decoded image cache slots | Viewport calculation, filesystem path policy |
+
+## Render Queue Contract
+
+`MapTileRenderQueue` uses fixed capacity storage and exposes:
+
+- `clear()`
+- `push(item)`
+- `size()`
+- `items()`
+
+It is C++11-compatible and does not allocate.
+
+Platform map tile runtimes may populate the queue from existing `MapTile` records during this burn-down phase.
+
+## Decoded Cache Contract
+
+`IMapTileDecoderCache` exposes only portable cache operations:
+
+- `clear()`
+- `hasDecoded(ref)`
+
+LVGL-specific decoded handles stay in `LvglDecodedTileCache` or other platform-specific adapters.
+
+## Phase 7.11 First Slice
+
+Phase 7.11 introduces:
+
+- `MapTileScreenRect`
+- `MapTileRenderState`
+- `MapTileRenderRef`
+- `MapTileRenderQueue`
+- `IMapTileDecoderCache`
+- ESP `LvglDecodedTileCache` wrapper around the existing decoded cache slots
+
+The platform renderer may continue to own LVGL widget creation temporarily, but visible tile plan state must be projected into `MapTileRenderQueue`.
+
+## Non-Goals
+
+Phase 7.11 does not:
+
+- implement map overlay
+- move route/tracker ownership
+- add measurement tools
+- implement online tile download
+- rewrite the Linux downloader
+- implement a full LRU cache
+- change map projection math
+- change UX Pack
+- change repository layout
diff --git a/docs/specification/MAP_TILE_SOURCE_CACHE_RUNTIME_SPEC.md b/docs/specification/MAP_TILE_SOURCE_CACHE_RUNTIME_SPEC.md
new file mode 100644
index 00000000..96b088ca
--- /dev/null
+++ b/docs/specification/MAP_TILE_SOURCE_CACHE_RUNTIME_SPEC.md
@@ -0,0 +1,70 @@
+# Map Tile Source / Cache Runtime Spec
+
+## Rule
+
+Tile lookup and cache ownership belong to map runtime/source adapters.
+
+Renderers draw tiles. They do not own Trail Mate tile storage paths.
+
+`MapWorkspaceSnapshot` carries viewport, layer, and tool state. It must not carry tile bitmap bytes, decoded image cache objects, or filesystem cache objects.
+
+## Objects
+
+| Object | Pattern | Responsibility | Forbidden |
+| --- | --- | --- | --- |
+| `MapTileRef` | Value Object | Identify layer/z/x/y | Filesystem path, LVGL object |
+| `MapTileLayer` | Layer key | Identify OSM/Terrain/Satellite/Contour layers | Renderer details |
+| `MapTileFormat` | Format enum | Identify PNG/JPEG payload format | Decode ownership |
+| `MapTilePayload` | Data DTO | Optional byte payload returned by a source | Filesystem path ownership |
+| `IMapTileSource` | Port | Lookup/read tile payload by `MapTileRef` | LVGL rendering |
+| `IMapTileFileSystem` | Port | Filesystem operations needed by legacy source | Tile path policy |
+| `IMapTileCache` | Repository / Cache port | Future cache contract | UI rendering |
+| `MapTileResolver` | Strategy | Resolve `MapTileRef` to Trail Mate storage path | LVGL, filesystem reads |
+| `LegacyFilesystemMapTileSource` | Anti-Corruption Adapter | Wrap current filesystem tile lookup | Spread path mapping back to renderer |
+
+## Directory Mapping
+
+`MapTileResolver` maps:
+
+- `MapTileLayer::Osm` -> `/maps/base/osm/{z}/{x}/{y}.png`
+- `MapTileLayer::Terrain` -> `/maps/base/terrain/{z}/{x}/{y}.png`
+- `MapTileLayer::Satellite` -> `/maps/base/satellite/{z}/{x}/{y}.jpg`
+- `MapTileLayer::ContourMajor500` -> `/maps/contour/major-500/{z}/{x}/{y}.png`
+- `MapTileLayer::ContourMajor200` -> `/maps/contour/major-200/{z}/{x}/{y}.png`
+- `MapTileLayer::ContourMajor100` -> `/maps/contour/major-100/{z}/{x}/{y}.png`
+- `MapTileLayer::ContourMajor50` -> `/maps/contour/major-50/{z}/{x}/{y}.png`
+- `MapTileLayer::ContourMajor25` -> `/maps/contour/major-25/{z}/{x}/{y}.png`
+
+The resolver may prepend a target root prefix such as `A:` or a Linux SD root.
+
+## Phase 7.10 First Slice
+
+Phase 7.10 introduces:
+
+- `MapTileRef`
+- `MapTileLayer`
+- `MapTileFormat`
+- `MapTileStatus`
+- `MapTilePayload`
+- `MapTileLookupResult`
+- `IMapTileSource`
+- `IMapTileCache`
+- `MapTileResolver`
+- `LegacyFilesystemMapTileSource`
+
+Existing platform map tile runtimes may keep LVGL drawing and decoded image cache logic temporarily, but path mapping must flow through `LegacyFilesystemMapTileSource`.
+
+## Non-Goals
+
+Phase 7.10 does not:
+
+- implement online tile download
+- change Trail Mate offline tile directory structure
+- store tile bitmaps in `MapWorkspaceSnapshot`
+- implement a full LRU cache
+- redesign Map overlay
+- move route/tracker ownership
+- generate contour tiles
+- change Trail Mate Center
+- change UX Pack
+- change repository layout
diff --git a/docs/specification/MAP_WORKSPACE_MODEL_SPEC.md b/docs/specification/MAP_WORKSPACE_MODEL_SPEC.md
new file mode 100644
index 00000000..c0117f79
--- /dev/null
+++ b/docs/specification/MAP_WORKSPACE_MODEL_SPEC.md
@@ -0,0 +1,218 @@
+# Map Workspace Model Specification
+
+## Purpose
+
+`MapWorkspaceModel` is a presentation-layer workspace ViewModel.
+
+It owns UI-local map workspace state only:
+
+- requested viewport
+- active map tool
+
+It does not own:
+
+- GPS runtime
+- TimeAuthority
+- tile loading
+- tile cache
+- SD card map package scanning
+- offline map directory repair
+- map renderer objects
+- route planning
+- POI storage
+- rich Team marker state
+- touch gesture engine
+- retry state for tile downloads
+
+## Pattern
+
+This model follows:
+
+- MVVM / Passive View
+- Source/Sink Port
+- Immutable Snapshot
+- CQRS Read/Command split
+- Compatibility Adapter boundary for legacy map runtime
+
+## Snapshot Flow
+
+Renderer calls:
+
+```text
+MapWorkspaceModel::snapshot()
+    -> IMapPresentationSource::buildMapWorkspaceSnapshot(request, out)
+```
+
+`MapWorkspaceRequest` contains:
+
+- requested viewport
+- active tool
+
+The returned `MapWorkspaceSnapshot` is a value object for rendering map
+workspace state. It is not a tile engine snapshot.
+
+## Action Flow
+
+Renderer calls:
+
+```text
+MapWorkspaceModel::centerOnSelf()
+MapWorkspaceModel::setViewport(viewport)
+MapWorkspaceModel::setLayer(layer, enabled)
+MapWorkspaceModel::setActiveTool(tool)
+MapWorkspaceModel::clearMeasurement()
+```
+
+The model forwards actions to `IMapActionSink`.
+
+## Center On Self
+
+`centerOnSelf()` uses confirmed update semantics.
+
+Semantics:
+
+1. Notify `IMapActionSink::centerOnSelf()`.
+2. If the sink fails, keep the current viewport unchanged.
+3. If the sink succeeds, request a fresh snapshot.
+4. If the snapshot has a valid self-location overlay, update the local viewport
+   center to that location.
+
+This differs from Chat optimistic selection. Chat selection is UI-local.
+Map center-on-self depends on a real GPS fix and must not pretend success when
+self location is unavailable.
+
+## Viewport
+
+In Phase 5.7, viewport is presentation-local state.
+
+Legacy renderers may still own pan offsets, tile anchors, and gesture details.
+Those are renderer/runtime details and are not part of `MapViewport`.
+
+`MapViewport` expresses:
+
+- center latitude
+- center longitude
+- zoom
+
+It does not express:
+
+- tile x/y
+- tile file path
+- pan pixel offset
+- gesture delta
+- map widget anchor state
+
+## Layer State
+
+`MapLayerState` expresses UI-enabled layer state only.
+
+It does not guarantee:
+
+- tile availability
+- SD card availability
+- cache hit state
+- map package validity
+- contour generation status
+
+Tile availability remains owned by the legacy tile/cache runtime until a later
+map engine phase.
+
+## Self Location
+
+`SelfLocationOverlay` contains only map drawing facts:
+
+- valid
+- latitude
+- longitude
+- course
+- accuracy
+
+Full GPS receiver status belongs to `GpsStatusModel`, not
+`MapWorkspaceModel`.
+
+## Measurement
+
+`MeasurementState` is a Phase 5.7 placeholder for simple presentation state.
+
+Phase 5.7 does not implement:
+
+- advanced distance tools
+- area tools
+- route tracing
+- persisted measurement history
+
+## Team Overlay
+
+`TeamOverlaySummary` is a projection summary only.
+
+TeamOverlaySummary is a projection summary only.
+
+It may expose:
+
+- whether Team overlay data is available
+- visible member count
+- stale member count
+
+It must not expose:
+
+- raw `TeamUiStore` state
+- Team chat payloads
+- Team position ring samples
+- marker widget objects
+- rich Team location/command payloads
+
+Rich Team map markers require a later bounded map overlay presentation phase.
+
+## Legacy Adapters
+
+`LegacyMapPresentationSource` is a read adapter. It projects legacy GPS/map/team
+compatibility surfaces into `MapWorkspaceSnapshot`.
+
+It must not:
+
+- load map tiles
+- mutate viewport state
+- access LVGL widgets
+- open SD card tile paths
+- perform route planning
+- expose Team raw payloads
+
+`LegacyMapActionSink` is a command adapter. It handles presentation-level map
+actions.
+
+It must not:
+
+- build `MapWorkspaceSnapshot`
+- touch LVGL widgets
+- load tile images
+- parse GPS data
+- write map storage directly
+- perform radio or packet work
+
+## Renderer Rule
+
+LVGL, GTK, ASCII, and future renderers should consume:
+
+```text
+MapWorkspaceModel::snapshot()
+MapWorkspaceModel actions
+```
+
+Renderer code must not add new direct reads of:
+
+- GPS runtime
+- tile cache
+- SD card map store
+- raw Team store
+- platform map probes
+
+Existing legacy reads are bounded debt and must be listed in the map legacy
+ownership audit.
+
+## Phase 5.7 Completion
+
+Phase 5.7 establishes the presentation boundary.
+
+It does not make the map stack clean.
+
+Tile/cache/renderer/route/rich overlay cleanup remains future work.
diff --git a/docs/specification/POST_REFACTOR_ARCHITECTURE_FREEZE.md b/docs/specification/POST_REFACTOR_ARCHITECTURE_FREEZE.md
new file mode 100644
index 00000000..bda0509f
--- /dev/null
+++ b/docs/specification/POST_REFACTOR_ARCHITECTURE_FREEZE.md
@@ -0,0 +1,68 @@
+# Post-Refactor Architecture Freeze
+
+## Purpose
+
+This document freezes the directory and ownership rules after the Phase 8-12
+refactor. It is a guardrail for future feature work, not a request for new
+architecture layers.
+
+## Directory Rules
+
+| Directory | Frozen role | Allowed | Forbidden |
+| --- | --- | --- | --- |
+| `apps/` | final product app shells | product startup shell, active UX pack selection, app-owned probes | legacy implementation roots, board-specific historical roots, runtime service implementation sprawl |
+| `builds/` | build entrypoints | thin build wrappers and build target selection | product implementation, UX decisions, renderer ownership |
+| `modules/` | stable runtime / presentation / renderer / descriptor modules | reusable presentation, runtime, descriptor, renderer-safe DTO, adapter ports | dependencies on `apps/`, product shell policy, board facts as UX policy |
+| `platform/` | platform / HAL / SDK adapters | platform-specific SDK and HAL boundaries | app shell behavior, UX selection, product feature policy |
+| `boards/` | hardware facts only | pins, capabilities, hardware descriptions | UX decisions, page/menu selection, runtime routing |
+| `docs/` | specifications, audits, reports | architecture records, phase reports, deletion readiness | executable runtime policy |
+| `tools/architecture/` | phase checkers and final guardrails | structural checker scripts | product behavior or build implementation |
+
+## Frozen Pipeline
+
+New UI/runtime work should enter through this shape:
+
+`app shell -> UX pack -> presentation graph -> descriptor/adoption path -> renderer-safe consumption`
+
+Fallback may exist only as compatibility containment and must not become the
+default path again.
+
+## Explicit Prohibitions
+
+1. Renderers must not select UX packs.
+2. Runtime entries must not call `buildMenuForUxPack`.
+3. Runtime entries must not call `UxPackRegistry` or `findUxPackById`.
+4. App shells must not create concrete runtime services such as chat, map, GPS,
+   or protocol services.
+5. Board facts must not decide UX.
+6. Root `legacy/` and `legacy/app_implementations/` are forbidden.
+7. `modules/` must not depend on `apps/`.
+8. Renderers must not create legacy services.
+9. GTK descriptor consumption must not create `GtkWidget`.
+10. LVGL descriptor consumption must not include `lvgl.h`, create `lv_obj_t`,
+    or branch on `BOARD_`.
+11. New hardcoded page registries must not be primary sources.
+12. New `Legacy*` bridges are forbidden for runtime work.
+13. Active checkers must not require legacy roots to exist.
+14. `docs/archive` must not contain a source archive.
+15. New `legacy_source_descriptor` files are forbidden.
+16. New transitional UI layers are forbidden.
+
+## Removed Legacy Roots
+
+Root `legacy/` has been removed. Historical legacy source roots are recorded
+only in `docs/archive/REMOVED_LEGACY_ROOTS.md`. No active architecture layer may
+be named `legacy/`.
+
+## Post-Freeze Work Classification
+
+Future work should be classified as one of:
+
+- feature work through the frozen pipeline
+- targeted fallback deletion
+- targeted deprecated alias deletion
+- platform/build maintenance
+- documentation/checker maintenance
+
+It should not be classified as another broad architecture refactor unless the
+frozen ownership model is explicitly superseded.
diff --git a/docs/specification/PRESENTATION_WORKSPACE_SPEC.md b/docs/specification/PRESENTATION_WORKSPACE_SPEC.md
new file mode 100644
index 00000000..afa16f35
--- /dev/null
+++ b/docs/specification/PRESENTATION_WORKSPACE_SPEC.md
@@ -0,0 +1,138 @@
+# Presentation Workspace Specification
+
+## Purpose
+
+`PresentationWorkspace` is a typed composition object for presentation models.
+
+It groups presentation models that a shell or target may consume:
+
+- `DeviceStatusModel`
+- `GpsStatusModel`
+- `MeshStatusModel`
+- `SettingsModel`
+- `ChatWorkspaceModel`
+- Team `ChatWorkspaceModel`
+- `MapWorkspaceModel`
+
+Phase 5.8 uses this object to prove that the product presentation graph can be
+consumed by LVGL, uConsole, and ASCII/headless surfaces without each renderer
+directly assembling business or platform state.
+
+## Pattern
+
+This boundary follows:
+
+- Composition Object
+- Typed Presentation Graph
+- Optional Capability Set
+- Headless Probe Boundary
+
+`PresentationWorkspace` is not:
+
+- service locator
+- dependency injection container
+- app service registry
+- platform composition root
+- renderer
+- snapshot cache
+- telemetry service
+
+## Ownership
+
+`PresentationWorkspace` does not own:
+
+- source objects
+- sink objects
+- app services
+- platform runtimes
+- renderers
+- threads
+- tasks
+- event loops
+
+Targets own object lifetime and construction order.
+
+The workspace may hold pointers to already-constructed presentation models. It
+must not construct models, sources, sinks, services, adapters, or platform
+runtimes.
+
+## Nullability
+
+All fields are nullable.
+
+A target may expose only the presentation capabilities it supports.
+
+Examples:
+
+- a headless target may expose Device/GPS/Mesh only
+- compact LVGL may expose Device/GPS/Mesh/Chat/Map
+- desktop GTK may expose Device/GPS/Mesh/Settings/Chat/Team Chat/Map
+
+Null does not mean failure. It means the capability is not present in that
+target composition.
+
+## Snapshot
+
+`PresentationWorkspaceProbe` may build a lightweight composite snapshot.
+
+The composite snapshot is for readiness and probe output only. It must not
+replace individual workspace snapshots.
+
+The composite snapshot may include small status snapshots and map workspace
+summary:
+
+- `DeviceStatusSnapshot`
+- `GpsStatusSnapshot`
+- `MeshStatusSnapshot`
+- `MapWorkspaceSnapshot`
+
+It must not include:
+
+- full `ChatWorkspaceSnapshot`
+- full Team chat snapshot
+- full `SettingsSnapshot`
+- tile cache state
+- raw Team payloads
+- platform runtime state
+
+Settings, Chat, and Team Chat are represented as capability flags in the
+composite snapshot. Renderers that need those details must read the specific
+model snapshot directly.
+
+## Boundary
+
+`ui_presentation/workspace` may include existing presentation model headers.
+
+It must not include or depend on:
+
+- platform headers
+- LVGL or GTK headers
+- `ChatService`
+- `ContactService`
+- `GpsService`
+- `MeshSession`
+- `MapTileCache`
+- stores
+- radio drivers
+- SQLite
+- preferences backends
+
+## Action Semantics
+
+`PresentationWorkspaceProbe` is read-only.
+
+It may call `snapshot()` on contained presentation models. It must not call
+actions such as send, select, mark read, center-on-self, layer toggle, or
+settings apply.
+
+The workspace itself does not expose dynamic lookup. Callers should use typed
+fields:
+
+```text
+workspace.gps->snapshot()
+workspace.map->centerOnSelf()
+workspace.chat->snapshot()
+```
+
+They must not use the workspace as a name-based service locator or route from
+it into business services.
diff --git a/docs/specification/PRODUCT_COMPOSITION_ARCHITECTURE_SPEC.md b/docs/specification/PRODUCT_COMPOSITION_ARCHITECTURE_SPEC.md
new file mode 100644
index 00000000..019c60ea
--- /dev/null
+++ b/docs/specification/PRODUCT_COMPOSITION_ARCHITECTURE_SPEC.md
@@ -0,0 +1,182 @@
+# Product Composition Architecture Specification
+
+## Purpose
+
+This specification defines how Trail Mate product targets assemble runtime,
+app services, presentation models, and renderers.
+
+Phase 6 uses this specification to move object graph construction toward
+explicit target/app shell composition roots.
+
+## Core Rule
+
+CompositionRoot wires.
+
+It does not decide business behavior.
+
+The product architecture responsibility chain is:
+
+```text
+Target chooses.
+Board describes.
+Platform adapts.
+Runtime schedules.
+Capability provides.
+Protocol interprets.
+UseCase decides.
+AppService coordinates.
+PresentationModel projects.
+Renderer draws.
+CompositionRoot wires.
+```
+
+## Composition Root Responsibilities
+
+A composition root may:
+
+- read target manifest or compile target identity
+- select board package
+- create platform adapter factories
+- create runtime context
+- create app services
+- create presentation sources/sinks
+- create presentation models
+- create `PresentationWorkspace`
+- create renderer shell
+- connect lifecycle start/stop hooks
+
+A composition root must not:
+
+- interpret protocol payloads
+- implement business decisions
+- directly render UI widgets
+- own packet parsing
+- own GPS parsing
+- own tile cache behavior
+- own Chat message policy
+- infer pending/failure state
+
+## Target App Shell
+
+`TargetAppShell` owns:
+
+- renderer lifecycle
+- event loop integration
+- presentation workspace binding
+- input dispatch into presentation actions
+- shell-specific timers
+- shell startup/shutdown
+
+`TargetAppShell` must not own:
+
+- protocol interpretation
+- board pin facts
+- storage schema
+- business policy
+- platform adapter semantics
+
+## Platform Factory
+
+Platform factories may create:
+
+- radio adapter
+- GPS byte stream
+- BLE host adapter
+- storage backend
+- display driver host
+- input driver host
+- timer/clock/queue primitives
+
+Platform factories must not:
+
+- select product feature set
+- interpret Meshtastic/MeshCore semantics
+- create UI page business logic
+- own AppService coordination
+
+## Board Package
+
+Board packages describe hardware facts:
+
+- pins
+- buses
+- power rails
+- display dimensions
+- available peripherals
+- electrical constraints
+
+Board packages must not:
+
+- decide product features
+- create app services
+- interpret radio protocols
+- render UI
+- own runtime scheduling policy
+
+## Target Manifest
+
+Target manifests are product configuration contracts.
+
+They may select:
+
+- board package
+- platform profile
+- shell profile
+- capabilities
+- authority sources
+
+They must not become arbitrary runtime configuration systems in Phase 6.
+
+## AppContext Bridge
+
+Existing `AppContext` is a legacy service locator.
+
+Phase 6 may introduce:
+
+- `LegacyAppContextBridge`
+- `AppServicesBundle`
+- `PresentationBundle`
+
+The bridge must shrink over time. New code must not add unrelated service
+lookups to `AppContext`.
+
+## Object Lifetime
+
+Target composition roots own static or long-lived objects.
+
+No renderer may create app services.
+
+No presentation model may create source/sink objects.
+
+No source/sink may create renderer objects.
+
+`PresentationWorkspace` may expose model pointers that are owned by the target
+composition root or app shell. It must not create those models.
+
+## Allowed Dependency Direction
+
+```text
+Target/App Composition Root
+  -> platform factories
+  -> app services
+  -> presentation sources/sinks
+  -> presentation models
+  -> presentation workspace
+  -> renderer shell
+```
+
+Renderers may consume presentation snapshots and send presentation actions.
+
+Renderers must not reach backward into platform factories, app-service
+construction, or board facts.
+
+## Exit Criteria
+
+Phase 6 is successful when:
+
+- each major target has an explicit composition root or documented legacy bridge
+- `PresentationWorkspace` is assembled by target/app shell code
+- `AppContext` usage is bounded
+- product composition contracts exist
+- checker prevents new object graph construction in renderer/page code
+- target/board/platform wiring rules are documented and checked
diff --git a/docs/specification/REPOSITORY_LAYOUT_ARCHITECTURE_SPEC.md b/docs/specification/REPOSITORY_LAYOUT_ARCHITECTURE_SPEC.md
new file mode 100644
index 00000000..a88d4d06
--- /dev/null
+++ b/docs/specification/REPOSITORY_LAYOUT_ARCHITECTURE_SPEC.md
@@ -0,0 +1,350 @@
+# Repository Layout Architecture Specification
+
+## Purpose
+
+Phase 8 normalizes Trail Mate repository semantics before any directory move.
+
+This specification defines what each top-level architecture directory means,
+what dependency directions are allowed, and which historical shapes must remain
+transitional until they can be renamed or moved safely.
+
+Phase 8.1 is documentation and checker work only. It must not move build
+entrypoints, change PlatformIO or ESP-IDF layout, split `ui_shared`, or rename
+legacy adapters.
+
+## Core Rule
+
+Repository folders name architecture responsibilities, not incidental build
+systems.
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+Platform adapts.
+Module provides.
+UX Pack presents.
+Renderer draws.
+```
+
+## Directory Semantics
+
+| Directory | Meaning | Owns | Must not own |
+| --- | --- | --- | --- |
+| `apps/` | Product app shell / target app shell | product startup shell, target composition consumer, UX pack selection, lifecycle handoff | build-system identity, SDK project scaffolding, board hardware facts, reusable module logic |
+| `builds/` | Build system entrypoints | thin wrappers for ESP-IDF, PlatformIO, CMake, and future build hosts | product behavior, app service graphs, runtime object construction, UX decisions |
+| `modules/` | Reusable modules | portable cores, presentation models, runtime helpers, renderers, adapters with explicit ports | build entrypoints, app shell startup, board-specific product selection |
+| `platform/` | OS / SDK / HAL / runtime adapters | ESP, nRF, Linux, and shared platform integration, SDK/HAL bindings, driver hosts | product behavior, UX feature decisions, app shell composition |
+| `boards/` | Board hardware facts | pins, buses, displays, storage devices, power rails, electrical capabilities | product features, UI page sets, protocol policy, app services |
+| `docs/targets/` | Target product selection documentation | target profiles, selected board/platform/app shell/UX pack/capability intent | runtime configuration sprawl, generated build state |
+| `docs/ux_profiles/` | Device UX profile documents | device-specific UX declarations, feature-set decisions, screen sets, input bindings | board facts, SDK details, renderer internals |
+
+The current tree may not yet match these names. Phase 8 uses this document to
+define the target semantics before file movement starts.
+
+## Dependency Direction
+
+Allowed direction:
+
+```text
+builds -> apps
+apps -> modules + platform + boards
+modules -> modules only
+platform -> SDK/HAL/runtime only
+boards -> facts only
+docs -> specification/audit only
+```
+
+Expanded reading:
+
+- `builds/` may invoke an app shell entrypoint and provide build-system glue.
+- `apps/` may select modules, platform adapters, board packages, and UX packs.
+- `modules/` may depend on other modules through declared public contracts.
+- `platform/` may depend on SDK, HAL, OS, and runtime host APIs.
+- `boards/` may provide static facts and manifests only.
+- `docs/` may describe specifications, audits, target decisions, and UX profile
+  decisions.
+
+Forbidden direction:
+
+```text
+modules -> builds
+modules -> apps
+platform -> apps
+boards -> apps
+ui_presentation -> platform
+ui_presentation -> LVGL
+ui_presentation -> filesystem
+```
+
+These directions are forbidden because they make portable code depend on
+entrypoints, product shells, hardware packages, concrete UI toolkits, or storage
+hosts.
+
+## App Shells
+
+An app shell represents a product target's composition-facing startup surface.
+
+Examples of future app shell names:
+
+```text
+apps/esp32_lvgl/
+apps/nrf52_node/
+apps/linux_uconsole_gtk/
+apps/linux_sim/
+apps/linux_headless/
+```
+
+An app shell may:
+
+- select a target profile
+- select a board package
+- select a UX pack
+- connect product composition
+- connect platform adapters
+- start the app runtime
+- hand off to the renderer shell
+
+An app shell must not:
+
+- be named only after a build system such as `esp_idf` or `esp_pio`
+- own ESP-IDF CMake, PlatformIO, or Linux CMake project mechanics
+- implement HAL details
+- decide board facts
+- implement screen internals
+
+`apps cannot be named by build system.`
+
+## Build Entrypoints
+
+A build entrypoint is a thin wrapper around the authoritative build host for a
+platform family.
+
+Target direction:
+
+```text
+builds/
+  esp_idf/
+  pio_nrf52/
+  linux_cmake/
+```
+
+Expected authorities:
+
+| Platform family | Authoritative build entrypoint |
+| --- | --- |
+| ESP / ESP32-P4 | ESP-IDF |
+| nRF52 | PlatformIO |
+| Linux | CMake |
+
+A build entrypoint may:
+
+- expose the build-system project expected by ESP-IDF, PlatformIO, or CMake
+- include minimal wrapper files needed by the build host
+- call the selected app shell startup function
+- pass build flags and generated manifests to app composition
+
+A build entrypoint must not:
+
+- create business object graphs
+- assemble Chat, Map, Team, or GPS runtime services
+- decide UX pack or feature availability
+- hold product-specific page behavior
+
+`builds cannot carry product app shell.`
+
+## Modules
+
+Modules are reusable units. They may be portable domain cores, presentation
+contracts, runtime helper modules, UI toolkit primitives, or explicit adapters.
+
+Module names should express responsibility, not current migration history.
+
+Expected Phase 8 target split examples:
+
+```text
+modules/ui_presentation/
+modules/ui_lvgl_core/
+modules/ui_lvgl_ux_packs/
+modules/ui_legacy_adapters/
+modules/ui_map_runtime/
+modules/ui_chat_runtime/
+modules/ui_gps_runtime/
+```
+
+Portable presentation modules must remain UI-toolkit independent. In
+particular, `ui_presentation` must not depend on LVGL, GTK, platform headers, or
+filesystem APIs.
+
+`modules cannot depend on builds.`
+
+## Platform
+
+`platform/` contains concrete SDK, OS, HAL, runtime, driver-host, and storage
+adapter code.
+
+Platform code may:
+
+- integrate ESP-IDF, Arduino compatibility, nRF SDK/PIO, Linux, GTK, SDL, or
+  filesystem hosts
+- provide platform factories
+- adapt timers, queues, storage, input, display, GPS, radio, BLE, and network
+  capabilities
+
+Platform code must not:
+
+- decide product feature sets
+- own business policy
+- create app services behind hidden globals
+- decide device UX
+
+`platform cannot carry product behavior.`
+
+## Boards
+
+`boards/` describes hardware facts.
+
+Board facts include:
+
+- chip and module identity
+- pins and buses
+- display dimensions and panel facts
+- input devices
+- storage devices
+- radio and GPS peripherals
+- power and battery facts
+
+Board facts must not select product features. A board may say that a display is
+320x240 and has touch. It must not decide whether the target has a full map
+workflow, compact map workflow, team chat, or status-only UX.
+
+`boards cannot decide UX.`
+
+## Target Documents
+
+`docs/targets/` records target product selections.
+
+A target document may say:
+
+- which board package is selected
+- which platform family is selected
+- which app shell is selected
+- which UX profile or UX pack is selected
+- which capabilities are enabled, disabled, proxied, or hidden
+
+It must not become an unbounded runtime configuration system.
+
+## UX Profile Documents
+
+`docs/ux_profiles/` records device UX declarations.
+
+A UX profile document may say:
+
+- which screen set exists
+- which input bindings are active
+- which features are full, compact, hidden, or status-only
+- which renderer family or UX pack is used
+- which layout profile is selected
+
+It must not restate board pin facts or build-system mechanics.
+
+## Transitional Historical Layout
+
+Current `legacy/app_implementations/esp_idf` and
+`legacy/app_implementations/esp_pio` are transitional build entrypoint shapes.
+They may remain while the build entrypoint migration is planned, but Phase 8
+must treat them as legacy build entrypoint directories, not final app shell
+names.
+
+Current `modules/ui_shared` is a transitional mixed UI module. It may remain in
+place while the split is planned, but new Phase 8 work must classify additions
+as LVGL core, UX pack, runtime helper, map runtime, chat runtime, GPS runtime,
+or legacy adapter.
+
+## Phase 8.2 Progress
+
+Phase 8.2 establishes builds/ skeleton but does not move build host files.
+
+The intended authoritative build entrypoint families are:
+
+```text
+ESP / ESP32-P4 -> builds/esp_idf
+nRF52 -> builds/pio_nrf52
+Linux -> builds/linux_cmake
+```
+
+`legacy/app_implementations/esp_idf` and `legacy/app_implementations/esp_pio` remain transitional
+until wrapper migration.
+
+`builds/esp_idf`, `builds/pio_nrf52`, and `builds/linux_cmake` are thin wrapper
+slots. They must not assemble Chat, Map, Team, or GPS runtime, choose UX packs,
+define board facts, or become product app shells.
+
+Phase 8.2 does not change ESP-IDF CMake, PlatformIO, Linux CMake, app runtime
+behavior, or existing target startup paths.
+
+## Phase 8.3 Progress
+
+Phase 8.3 establishes app shell skeletons but does not move runtime
+implementations or build host files.
+
+Skeleton app shells:
+
+```text
+apps/esp32_lvgl
+apps/nrf52_node
+apps/linux_uconsole_gtk
+apps/linux_sim_shell
+```
+
+These names describe product/runtime shape rather than build systems. They are
+architecture anchors for future migration. They do not build or alter runtime
+behavior in Phase 8.3.
+
+Target profile documentation under `docs/targets/` maps product target names to
+board, platform family, build entrypoint, app shell, UX profile placeholder, and
+status.
+
+The first structural migration batch also creates the target UI modules:
+
+```text
+modules/ui_chat_runtime
+modules/ui_map_runtime
+modules/ui_gps_runtime
+modules/ui_legacy_adapters
+modules/ui_lvgl_core
+modules/ui_lvgl_ux_packs
+```
+
+`modules/ui_shared` remains a transitional umbrella, but the moved Phase 7
+runtime/helper/adapter files must not gain new implementation at their old
+paths. Old headers may remain as forwarding headers only.
+
+## Non-Goals
+
+Phase 8.1 does not:
+
+- move `apps/esp_idf`
+- move `apps/esp_pio`
+- create `builds/`
+- split `modules/ui_shared`
+- rename any `Legacy*` adapter
+- change ESP-IDF, PlatformIO, or CMake files
+- change app runtime behavior
+- change UI screens
+
+## Review Rules
+
+New architecture work should answer:
+
+- Is this an app shell, build entrypoint, platform adapter, board fact, module,
+  UX pack, or documentation artifact?
+- Does the folder name match that responsibility?
+- Does the dependency direction follow the allowed direction?
+- Is a historical directory being treated as canonical by accident?
+- Is a board fact being promoted into a UX decision?
+- Is a build-system wrapper being promoted into a product app shell?
+
+Phase 8 file movement may start only after these distinctions are preserved by
+specification, audit, and checker coverage.
diff --git a/docs/specification/RUNTIME_CONCURRENCY_SPEC.md b/docs/specification/RUNTIME_CONCURRENCY_SPEC.md
new file mode 100644
index 00000000..91f607a7
--- /dev/null
+++ b/docs/specification/RUNTIME_CONCURRENCY_SPEC.md
@@ -0,0 +1,175 @@
+# Runtime and Concurrency Specification
+
+This specification defines the concurrency baseline for Trail Mate targets. It
+exists because ESP32, nRF52, Linux, and tests have different runtime mechanics
+but must preserve the same ownership model.
+
+## Sources of Concurrency
+
+Trail Mate targets may receive work from:
+
+```text
+Radio IRQ
+Radio RX task or poll loop
+Radio TX completion
+GPS UART RX
+GPS parser task
+BLE stack callback
+BLE notify queue
+UI event loop
+LVGL tick/input
+GTK main loop
+ASCII terminal input loop
+HostLink USB/serial RX
+Storage write
+Config update
+Power/sleep/wake
+Timer/retry/ACK timeout
+```
+
+## Mandatory Rules
+
+ISR code may only defer.
+
+BLE callbacks must not directly mutate app services.
+
+Radio IRQ handlers must not run protocol or business logic.
+
+GPS tasks must not directly update UI.
+
+UI objects may only be updated on the UI owner thread/task.
+
+Storage backends must declare their concurrency model.
+
+Mutable app-service state must have a single owner context.
+
+Cross-thread and cross-task interaction must use one of:
+
+```text
+event queue
+command queue
+immutable snapshot
+declared mutex-protected store
+```
+
+## Canonical Event Paths
+
+```yaml
+radio_rx:
+  path: "radio_irq -> radio_task -> mesh_event_queue -> app_task"
+  rule: "IRQ defers; radio_task frames bytes; protocol/app processing runs outside IRQ."
+
+gps_rx:
+  path: "uart_irq -> gps_task -> location_event_queue -> app_task"
+  rule: "GPS task may parse/normalize but may not directly mutate UI."
+
+ble_write:
+  path: "ble_callback -> phone_command_queue -> app_task"
+  rule: "BLE stack callback owns transport timing only."
+
+ui_input:
+  path: "ui_thread -> presentation_action -> app_command_queue"
+  rule: "Renderer translates input into UI actions; app owner executes business mutations."
+```
+
+## Forbidden Paths
+
+```text
+ble_callback -> ChatService
+radio_irq -> MeshSession
+gps_task -> lvgl
+gtk_worker -> GtkWidget
+ui_thread -> blocking storage write
+ui_renderer -> direct radio access
+ui_renderer -> direct GPS driver access
+platform_driver -> direct message policy
+```
+
+## UI Thread Only
+
+LVGL:
+
+```text
+lv_obj_* may only be called from the LVGL owner task/thread.
+Other contexts post UI commands or publish snapshots.
+```
+
+GTK:
+
+```text
+GtkWidget mutation may only happen on the GTK main loop.
+Workers use main-context invocation, channels, or idle callbacks.
+```
+
+ASCII/TUI:
+
+```text
+Terminal output has one renderer owner.
+Input and refresh paths must not concurrently write stdout.
+```
+
+Headless:
+
+```text
+No renderer owner exists; state is exposed through logs, API, or snapshots.
+```
+
+## ISR Policy
+
+ISR code may:
+
+```text
+clear interrupt status
+record minimal flags
+post lightweight ISR-safe events
+```
+
+ISR code must not:
+
+```text
+malloc/free
+write storage
+notify BLE
+update UI
+encode/decode protobuf
+send direct messages
+parse GPS sentences
+perform crypto
+```
+
+## Storage Concurrency
+
+Every storage backend must declare:
+
+```text
+single writer or multiple writers
+reader model
+transaction support
+async write support
+erase/write blocking behavior
+required owner context or mutex
+```
+
+Examples:
+
+```text
+ESP32 NVS: blocking, write-limited, usually mutex protected.
+nRF52 flash: erase/write expensive, often async, callback-sensitive.
+SQLite: transactional with file locks; must avoid UI-thread blocking.
+```
+
+## Mutable State Ownership
+
+Every mutable service must have one owner:
+
+```text
+ChatService -> app service context
+MeshSession -> mesh/app context declared by target
+GpsService -> gps/app context declared by target
+ConfigService -> app service context
+DeviceStatusService -> app service context
+UI State -> UI context or presentation owner
+```
+
+Other contexts may send commands, publish events, or consume snapshots.
+
diff --git a/docs/specification/TARGET_MANIFEST_SPEC.md b/docs/specification/TARGET_MANIFEST_SPEC.md
new file mode 100644
index 00000000..fa00ced6
--- /dev/null
+++ b/docs/specification/TARGET_MANIFEST_SPEC.md
@@ -0,0 +1,111 @@
+# Target Manifest Specification
+
+Target manifests describe product composition. They are review artifacts and
+migration guides in Phase 1; they are not runtime configuration files.
+
+## File Location
+
+Target manifests live under:
+
+```text
+docs/targets/*.capabilities.yaml
+```
+
+The template lives at:
+
+```text
+docs/targets/TARGET_MANIFEST_TEMPLATE.yaml
+```
+
+## Required Top-Level Fields
+
+```text
+target
+status
+product
+platform
+board
+runtime
+ui
+execution
+authorities
+capabilities
+capability_bindings
+protocols
+storage
+race_policy
+build
+```
+
+## Semantics
+
+`target` is the product target id, such as `esp-t-lora-pager-lvgl`.
+
+`status` is `draft`, `reviewed`, or `active`. Phase 1 manifests are drafts.
+
+`product` describes product family, form factor, and interaction class.
+
+`platform` describes the selected platform kind, SDK, memory tier, filesystem,
+and allocation policy.
+
+`board` identifies the board variant and board package. It may summarize board
+facts for review, but detailed hardware truth belongs in the board manifest.
+
+`runtime` declares scheduler, owner tasks/threads, ISR policy, and lock policy.
+
+`ui` declares shell, renderer, presentation model host, layout profile, and
+input model.
+
+`execution` declares where major cores execute.
+
+`authorities` declares where mutable truth lives.
+
+`capabilities` declares capability state, endpoint host, stack, role, and link
+mode.
+
+`capability_bindings` connects target capabilities to board providers, platform
+drivers, runtime owners, and protocol consumers.
+
+`protocols` declares enabled protocol cores and where protocol semantics are
+implemented.
+
+`storage` declares backend and authority-backed stores.
+
+`race_policy` declares event, command, snapshot, ISR, storage, and UI-thread
+rules.
+
+`build` points to the current build entrypoint and intended modules for this
+target. It must reflect the current repo state rather than inventing a future
+layout.
+
+## Review Requirements
+
+Every target manifest must answer:
+
+```text
+Which platform is used?
+Which board is used?
+Which UI shell is used?
+Where does mesh core run?
+Where does phone core run?
+Where does GPS core run?
+Where is identity authority?
+Where is peer key authority?
+Where are location/time/config authorities?
+Is LoRa local_radio, packet_proxy, command_proxy, or none?
+Is UI LVGL, ASCII, GTK, CLI, or headless?
+What is the concurrency policy?
+```
+
+## Not Runtime Configuration
+
+Phase 1 target manifests are deliberately not loaded by firmware or Linux
+processes. Later phases may generate constants or build metadata from them only
+after a separate design decision.
+
+## Change Rule
+
+If a PR changes product composition, capability binding, authority ownership,
+runtime ownership, or UI shell choice, update the relevant target manifest in
+the same PR.
+
diff --git a/docs/specification/TEAM_ACTION_RUNTIME_SPEC.md b/docs/specification/TEAM_ACTION_RUNTIME_SPEC.md
new file mode 100644
index 00000000..8cd1d7b1
--- /dev/null
+++ b/docs/specification/TEAM_ACTION_RUNTIME_SPEC.md
@@ -0,0 +1,106 @@
+# Team Action Runtime Specification
+
+## Purpose
+
+Define runtime/action ownership for Team text, location marker, and command
+actions.
+
+Team location and command actions are not Chat presentation state. They are Team
+runtime commands that may be initiated by a chat UI surface.
+
+## Core Rule
+
+Team action payload encoding belongs to Team action/runtime adapters.
+
+```text
+renderer/controller input
+  -> TeamActionRequest
+    -> ITeamActionSink
+      -> LegacyTeamActionBridge
+        -> Team payload encoder / Team runtime command port
+```
+
+## Types
+
+Phase 7.2 defines:
+
+- `TeamActionKind`
+- `TeamCommandKind`
+- `TeamLocationMarkerRequest`
+- `TeamLocationSnapshot`
+- `TeamCommandRequest`
+- `TeamActionRequest`
+- `ITeamActionSink`
+- `ITeamLocationSource`
+- `LegacyTeamActionBridge`
+
+## Ownership
+
+`TeamActionRequest` is a command DTO. It describes the user intent and must not
+contain renderer widgets, LVGL objects, raw packets, or app service references.
+
+`ITeamActionSink` handles Team actions. It must not build chat snapshots.
+
+`LegacyTeamActionBridge` translates Team action requests into the current Team
+runtime command port and Team UI store compatibility helpers.
+
+`ITeamLocationSource` provides current location facts to Team action adapters
+when a renderer submits `use_current_location`. It is a runtime source, not a UI
+widget dependency.
+
+`TeamChatPresentationSource` remains a read projection and must not send Team
+actions.
+
+`ChatUiController` may collect input and submit `TeamActionRequest`, but it must
+not encode Team payloads or directly send Team runtime packets.
+
+## Text
+
+Team text continues to flow through `TeamChatActionSink` and
+`team_chat_model_.sendMessage(...)`.
+
+`LegacyTeamActionBridge` may support text for command sink completeness, but the
+existing Team chat compose path remains owned by `TeamChatActionSink`.
+
+## Location Marker
+
+Location marker send is represented as:
+
+```text
+TeamActionKind::LocationMarker
+TeamLocationMarkerRequest
+```
+
+The request contains location facts and marker identity. Encoding
+`TeamChatLocation` and appending the outgoing structured Team log belong to the
+Team action bridge.
+
+When the UI wants to send the current location, it submits
+`use_current_location` and marker identity. The bridge resolves the current
+location through `ITeamLocationSource`; the renderer/controller must not read
+GPS runtime directly for this action.
+
+## Command
+
+Command send is represented as:
+
+```text
+TeamActionKind::Command
+TeamCommandRequest
+```
+
+Phase 7.2 defines the command request and bridge boundary. If no concrete
+command UI/runtime path is available, the bridge may return `Unsupported`
+rather than encoding command payload in a renderer.
+
+## Non-Goals
+
+Phase 7.2 does not implement rich Team payload UI.
+
+Phase 7.2 does not move Team text out of `TeamChatActionSink`.
+
+Phase 7.2 does not turn Team into DirectPeer or Channel chat.
+
+Phase 7.2 does not rewrite `ChatUiController`.
+
+Phase 7.2 does not change Team wire format.
diff --git a/docs/specification/TEAM_POSITION_PICKER_RENDERER_SPEC.md b/docs/specification/TEAM_POSITION_PICKER_RENDERER_SPEC.md
new file mode 100644
index 00000000..73bbb689
--- /dev/null
+++ b/docs/specification/TEAM_POSITION_PICKER_RENDERER_SPEC.md
@@ -0,0 +1,88 @@
+# Team Position Picker Renderer Spec
+
+## Rule
+
+Picker rendering belongs to `TeamPositionPickerRenderer`.
+
+Team action sending belongs to `ITeamActionSink`.
+
+`ChatUiController` coordinates the selection workflow but must not directly create or store Team position picker widgets.
+
+## Objects
+
+| Object | Pattern | Responsibility | Forbidden |
+| --- | --- | --- | --- |
+| `TeamPositionPickerRenderer` | Passive View / Widget Renderer | Create, close, update, and own LVGL picker widgets | Team action send, GPS read, payload encoding |
+| `TeamPositionPickerRenderer::Callbacks` | Callback Port | Report icon selected / cancel to workflow owner | `ChatService`, `TeamUiStore`, action sink ownership |
+| Icon event context | View State | Connect LVGL icon button events to renderer callbacks | Runtime payload or send state |
+| `ChatUiController` | Workflow Coordinator | Open picker, receive picker result, submit selected marker through Team action sink | Direct picker widget construction |
+| `ITeamActionSink` | Command Sink | Send Team location marker action | Render picker widgets |
+
+## `TeamPositionPickerRenderer`
+
+`TeamPositionPickerRenderer` is constructed with:
+
+- `lv_obj_t* parent`
+- `TeamPositionPickerRenderer::Callbacks`
+
+It exposes:
+
+- `bool open()`
+- `void close(bool restore_group)`
+- `bool isOpen() const`
+- `void updateHint(uint8_t icon_id)`
+
+It owns:
+
+- overlay
+- panel
+- description label
+- picker LVGL group
+- previous LVGL group reference
+- icon event contexts
+- icon and cancel LVGL callbacks
+
+It may use LVGL and page profile helpers because this object is intentionally a widget renderer.
+
+## Callback Contract
+
+`Callbacks::on_icon_selected` receives:
+
+- `void* user_data`
+- `uint8_t icon_id`
+
+`Callbacks::on_cancel` receives:
+
+- `void* user_data`
+
+The renderer invokes callbacks only to report picker results. It must not interpret the result as a Team send operation.
+
+## Controller Contract
+
+`ChatUiController` may call:
+
+- `team_position_picker_->open()`
+- `team_position_picker_->close(...)`
+- `team_position_picker_->updateHint(...)`
+- `team_position_picker_->isOpen()`
+
+`ChatUiController` may keep:
+
+- `sendTeamLocationWithIcon(...)`
+- `onTeamPositionIconSelected(...)`
+- `onTeamPositionCancel(...)`
+
+`sendTeamLocationWithIcon(...)` remains valid only because it submits `TeamActionRequest` to `ITeamActionSink`. It must not encode Team payloads directly.
+
+## Non-Goals
+
+Phase 7.9 does not:
+
+- change Team action send path
+- change Team protocol
+- add Map overlay behavior
+- change GPS source ownership
+- introduce UX Pack
+- change `MessageRow`
+- add rich Team cards
+- remove `sendTeamLocationWithIcon(...)`
diff --git a/docs/specification/TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md b/docs/specification/TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md
new file mode 100644
index 00000000..bb3f67cd
--- /dev/null
+++ b/docs/specification/TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md
@@ -0,0 +1,124 @@
+# Team Rich Payload Presentation Specification
+
+## Purpose
+
+Define the Phase 7.8 ownership boundary for Team location and command display projection.
+
+## Core Rule
+
+Team rich payload display is presentation projection, not controller formatting.
+
+Team payload encoding belongs to Team action/runtime adapters. Team payload decoding for chat display belongs to a Team presentation projector.
+
+## Types
+
+Phase 7.8 defines:
+
+- `TeamRichPayloadKind`
+- `TeamCommandDisplayKind`
+- `TeamLocationDisplay`
+- `TeamCommandDisplay`
+- `TeamRichPayloadDisplay`
+- `TeamRichPayloadProjector`
+
+## TeamRichPayloadDisplay
+
+`TeamRichPayloadDisplay` is a UI-ready read DTO.
+
+It may contain:
+
+- display kind
+- title
+- summary text
+- badge text
+- location display fields
+- command display fields
+
+It must not contain:
+
+- raw packet bytes
+- PSK material
+- raw Team protocol message ownership
+- LVGL widgets
+- send/retry action state
+
+## TeamRichPayloadProjector
+
+`TeamRichPayloadProjector` maps:
+
+```text
+TeamChatLogEntry -> TeamRichPayloadDisplay
+```
+
+It may call legacy Team payload decode helpers because Phase 7.8 is an anti-corruption display projection.
+
+It must remain portable shared code. Shared portable code must remain C++11-compatible unless explicitly marked target-local. Target-local code may use a higher standard provided by its target toolchain.
+
+It must not:
+
+- render LVGL widgets
+- access `ChatUiController`
+- call `sendTeamAction(...)`
+- encode Team location or command payloads
+- mutate `TeamUiStore`
+- build `ChatWorkspaceSnapshot`
+- map Team chat to DirectPeer or Channel chat
+- allocate display summaries through `std::string`
+- use `std::vector`, `iostream`, `sstream`, or `<format>` for projection formatting
+
+## Embedded Hardening
+
+`TeamRichPayloadProjector` must build summary text with fixed buffers, `std::snprintf`, bounded copies, and `ui::copyText`.
+
+The projector may read legacy payload strings after decode, but it must not allocate temporary strings while projecting display rows.
+
+## Team Row Projection
+
+`TeamChatPresentationSource` consumes `TeamRichPayloadProjector`.
+
+For Phase 7.8, it projects `TeamRichPayloadDisplay::summary` into existing `MessageRow::text` and conversation subtitle fields.
+
+This keeps compatibility with the current chat renderer while making the display decode owner explicit.
+
+## Controller Rule
+
+`ChatUiController` may:
+
+- select Team conversation UI
+- render rows from `team_chat_model_.snapshot()`
+- open Team position picker UI
+- submit Team action requests
+
+`ChatUiController` must not:
+
+- define `format_team_chat_entry(...)`
+- call `decodeTeamChatLocation(...)`
+- call `decodeTeamChatCommand(...)`
+- construct `TeamChatLocation` or `TeamChatCommand` for display formatting
+- format Team rich payload rows from raw Team payloads
+
+## Non-goals
+
+Phase 7.8 does not:
+
+- change Team protocol packet format
+- change Team action send path
+- replace `LegacyTeamActionBridge`
+- change `TeamUiStore` schema
+- add Map overlays
+- implement full Team rich cards
+- redesign `MessageRow`
+- rewrite `ChatWorkspaceModel`
+- replace the legacy `TeamUiStore` recent-log API
+
+## Legacy Store Boundary
+
+`TeamChatPresentationSource` still consumes `std::vector<TeamChatLogEntry>` because the legacy `TeamUiStore` recent-log API returns a vector.
+
+Exit condition:
+
+```text
+TeamUiStore exposes a fixed-capacity recent-log visitor or equivalent bounded iterator.
+```
+
+C++11 has no `std::span`, so a future portable API should prefer an explicit visitor/callback over introducing a higher-standard dependency into shared embedded UI code.
diff --git a/docs/specification/UI_PRESENTATION_ARCHITECTURE_SPEC.md b/docs/specification/UI_PRESENTATION_ARCHITECTURE_SPEC.md
new file mode 100644
index 00000000..681079b8
--- /dev/null
+++ b/docs/specification/UI_PRESENTATION_ARCHITECTURE_SPEC.md
@@ -0,0 +1,174 @@
+# UI Presentation Architecture Specification
+
+Trail Mate supports embedded LVGL, ASCII/TUI, GTK, CLI, and headless product
+targets. UI code must therefore be split by responsibility rather than by the
+first toolkit that implemented a page.
+
+## Three UI Layers
+
+```text
+App Service
+  Business state and business actions.
+
+Presentation Model
+  UI-independent page/workspace state and actions.
+
+Shell / Renderer
+  LVGL / ASCII / GTK / CLI / Headless concrete rendering and input.
+```
+
+## App Service
+
+App services own business-facing state and actions.
+
+Examples:
+
+```text
+ChatService
+ContactService
+LocationService
+MeshService
+ConfigService
+DeviceStatusService
+```
+
+App services must not know:
+
+```text
+LVGL
+GTK
+terminal handles
+screen size
+font objects
+button widgets
+layout widgets
+framebuffers
+```
+
+## Presentation Model
+
+Presentation models convert app-service state into displayable workspace state.
+
+Examples:
+
+```text
+ChatWorkspaceModel
+MapWorkspaceModel
+SettingsWorkspaceModel
+DeviceStatusModel
+GpsStatusModel
+MeshStatusModel
+```
+
+Presentation models may know:
+
+```text
+selected conversation
+abstract list cursor
+current workspace action set
+field formatting policy
+row/column/panel concepts
+compact/desktop/terminal presentation profile
+```
+
+Presentation models must not know:
+
+```text
+lv_obj_t
+GtkWidget
+ncurses WINDOW
+stdout
+framebuffer
+RadioLib
+sx1262
+GPS UART
+board pin maps
+```
+
+## Renderer and Shell
+
+Renderers know concrete UI technology:
+
+```text
+LVGL renderer: Presentation snapshot -> lv_obj_t tree
+ASCII renderer: Presentation snapshot -> text grid / ANSI output
+GTK renderer: Presentation snapshot -> GtkWidget tree
+CLI renderer: command result -> stdout/stderr
+Headless shell: snapshot/log/API export only
+```
+
+Renderer rules:
+
+```text
+Renderer consumes PresentationModel snapshots.
+Renderer sends UI actions.
+Renderer does not own business state.
+Renderer does not call platform radio/GPS/storage adapters directly.
+Renderer does not mutate app-service internals.
+```
+
+## UI Shell Roles
+
+LVGL:
+
+```text
+embedded compact shell
+single UI owner task/thread
+small-screen layout profile
+button/touch/encoder/keyboard inputs depending on target
+```
+
+ASCII/TUI:
+
+```text
+terminal shell
+single terminal output owner
+keyboard input
+stable text canvas or panel model
+```
+
+GTK:
+
+```text
+desktop-class workbench shell
+GTK main loop owner
+keyboard/pointer input
+wide layout profile
+```
+
+CLI:
+
+```text
+command shell
+stateless or short-lived command execution
+stdout/stderr output
+```
+
+Headless:
+
+```text
+no renderer
+only API/log/snapshot exposure
+```
+
+## Forbidden Couplings
+
+```text
+lvgl_chat_page.cpp implements message deduplication
+gtk_map_page.cpp parses GPS NMEA
+ascii_mesh_view.cpp reads peer key store directly
+AppService includes lv_obj_t or GtkWidget
+PresentationModel stores terminal handles
+Renderer writes direct to radio or GPS driver
+```
+
+## Allowed Couplings
+
+```text
+Renderer -> PresentationModel snapshot
+Renderer -> PresentationModel action
+PresentationModel -> AppService snapshot/action API
+AppService -> UseCase/Domain/Protocol/Ports
+CompositionRoot -> concrete renderer and service graph
+```
+
diff --git a/docs/specs/Cross_Platform_Product_Architecture_Specification.md b/docs/specs/Cross_Platform_Product_Architecture_Specification.md
new file mode 100644
index 00000000..989b180a
--- /dev/null
+++ b/docs/specs/Cross_Platform_Product_Architecture_Specification.md
@@ -0,0 +1,3555 @@
+# Cross-Platform Product Architecture Specification
+
+```text
+docs/specification/CROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md
+```
+
+# 1. 核心问题重新定义
+
+Trail Mate 不是单一固件，也不是单一 Linux app。它是一个跨平台户外通信/导航产品族。
+
+它面对的变体不是一维的。
+
+```text
+ESP32
+  - T-LoRa Pager
+  - T-Deck
+  - T-Deck Pro
+  - T-Watch S3
+  - Cardputer Zero
+  - 其他 SX1262 / SX127x / GPS / 屏幕组合
+
+nRF52
+  - GAT562
+  - RNode-like endpoint
+  - BLE phone host
+  - LoRa coprocessor
+  - 独立低功耗 Mesh 节点
+
+Linux
+  - uConsole AIO2
+  - RPi
+  - Cardputer Zero Linux shell
+  - desktop simulator
+  - headless daemon
+```
+
+同时 UI 也不是一种：
+
+```text
+- LVGL embedded UI
+- ASCII / TUI UI
+- GTK desktop-class UI
+- CLI
+- Headless daemon
+- Web / remote control future shell
+```
+
+所以规格的目标不是“把代码分成 core/platform/app”这么简单，而是要保证：
+
+```text
+同一个业务语义不因板子、芯片、OS、UI 技术栈、调度模型而漂移。
+```
+
+------
+
+# 2. 总分层模型
+
+完整架构应该是：
+
+```text
+Target Manifest
+    ↓
+Product Composition
+    ↓
+App Services
+    ↓
+Presentation Models
+    ↓
+Shell / Renderer
+```
+
+并行支撑层：
+
+```text
+Board Package
+Platform Runtime
+Capability Drivers
+Protocol Cores
+Storage Backends
+Concurrency Policy
+```
+
+更具体：
+
+```text
+docs/targets/*.yaml
+    声明产品目标
+
+boards/*
+platform/*/boards/*
+    声明硬件事实
+
+platform/*
+    提供平台能力适配
+
+modules/core_*
+    提供共享领域、协议、用例、表现模型
+
+apps/*
+    组合目标产品
+
+shells 或 apps/*/ui/*
+    具体 UI 技术栈
+```
+
+------
+
+# 3. 必须引入 Target / Board / Platform 三重区分
+
+之前我们混用了：
+
+```text
+ESP32 target
+ESP32 platform
+ESP32 board
+```
+
+这三个不能再混。
+
+------
+
+## 3.1 Platform
+
+Platform 是芯片/OS/运行环境。
+
+例如：
+
+```text
+esp32
+nrf52
+linux
+test
+simulator
+```
+
+Platform 决定：
+
+```text
+- 可用 SDK
+- 线程/task 模型
+- ISR 模型
+- 存储 API
+- 随机数 API
+- 时间 API
+- BLE stack
+- filesystem 能力
+- 构建工具链
+```
+
+Platform 不决定：
+
+```text
+- 哪个 LoRa 芯片接在哪个 pin
+- 哪个屏幕分辨率
+- 产品 UI 形态
+- 用户看到哪些功能
+```
+
+------
+
+## 3.2 Board Variant
+
+Board 是具体硬件变体。
+
+例如：
+
+```text
+t_lora_pager
+t_deck
+t_deck_pro
+t_watch_s3
+gat562_mesh_evb_pro
+uconsole_aio2
+cardputer_zero
+```
+
+Board 决定硬件事实：
+
+```text
+- LoRa chip 型号
+- LoRa SPI bus / reset / busy / dio1 / tx_en
+- GPS UART / power pin / PPS
+- display driver / resolution / rotation
+- input device
+- battery / charger / PMU
+- SD card / filesystem
+- BLE antenna / coexistence constraints
+```
+
+Board 不决定：
+
+```text
+- direct message 怎么发
+- Meshtastic BLE 怎么响应
+- MeshCore command 怎么解释
+- ChatService 怎么存消息
+- UI 页面怎么布局
+```
+
+------
+
+## 3.3 Target
+
+Target 是产品构成。
+
+例如：
+
+```text
+trailmate-tpager-esp32
+trailmate-tdeck-esp32
+trailmate-gat562-nrf52-node
+trailmate-uconsole-aio2-linux
+trailmate-uconsole-nrf52-radio-proxy
+trailmate-linux-headless
+trailmate-linux-ascii
+trailmate-linux-gtk
+trailmate-esp32-lvgl
+```
+
+Target 决定：
+
+```text
+- 用哪个 platform
+- 用哪个 board
+- 哪些 capability 启用
+- 状态权威在哪里
+- 使用哪个 UI shell
+- 使用哪个 storage backend
+- 使用哪个 concurrency policy
+- 使用哪个 protocol profile
+```
+
+Target 必须有 manifest。
+
+------
+
+# 4. Target Manifest 必须升级
+
+之前的 manifest 只覆盖 capability/authority。现在要覆盖：
+
+```text
+platform
+board
+runtime
+concurrency
+ui_shell
+renderer
+presentation_model
+capabilities
+protocols
+authorities
+storage
+build features
+race policy
+```
+
+建议模板：
+
+```yaml
+target: "trailmate-tpager-esp32"
+status: "draft"
+updated: "2026-05-12"
+
+product:
+  family: "trail-mate"
+  form_factor: "handheld | watch | linux_handheld | headless | simulator"
+  interaction_class: "embedded_lvgl | ascii_tui | desktop_gtk | cli | headless"
+
+platform:
+  kind: "esp32 | nrf52 | linux | test"
+  sdk: "arduino_esp32 | esp_idf | zephyr | arduino_nrf52 | linux_posix"
+  language_profile: "embedded_cpp | linux_cpp"
+  memory_tier: "tiny | small | medium | large"
+  filesystem: "none | littlefs | sd | posix"
+  dynamic_allocation: "forbidden | limited | allowed"
+
+board:
+  id: "t_lora_pager"
+  package: "platform/esp/boards/t_lora_pager"
+  display:
+    present: true
+    width: 222
+    height: 480
+    rotation: 90
+    driver: "..."
+  input:
+    keyboard: false
+    buttons: true
+    touch: false
+    encoder: false
+    trackball: false
+  lora:
+    present: true
+    chip: "sx1262"
+    owner: "board_facts_only"
+  gps:
+    present: true
+    owner: "board_facts_only"
+  power:
+    battery: true
+    charger: true
+    deep_sleep: true
+
+runtime:
+  scheduler: "freertos | zephyr_workqueue | linux_event_loop | single_thread_tick | test_fake"
+  ui_thread: "main_task | dedicated_task | gtk_main | terminal_loop | none"
+  radio_thread: "task | workqueue | event_loop | poll_tick"
+  gps_thread: "task | workqueue | event_loop | poll_tick"
+  ble_thread: "stack_callback | task | event_loop | none"
+  isr_policy: "defer_to_queue"
+  lock_policy: "single_owner | mutex | message_passing | immutable_snapshot"
+
+ui:
+  shell: "lvgl | ascii | gtk | cli | headless"
+  renderer: "lvgl | ascii_canvas | gtk4 | stdout | none"
+  presentation_model_host: "esp32 | nrf52 | linux | none"
+  layout_profile: "compact_handheld | watch | desktop_workbench | terminal_panel | none"
+  input_model: "buttons | keyboard | touch | mixed | none"
+
+execution:
+  app_host: "esp32 | nrf52 | linux | none"
+  mesh_core_host: "esp32 | nrf52 | linux | none"
+  gps_core_host: "esp32 | nrf52 | linux | none"
+  phone_core_host: "esp32 | nrf52 | linux | none"
+  hostlink_core_host: "esp32 | nrf52 | linux | none"
+  ui_host: "esp32 | nrf52 | linux | none"
+
+authorities:
+  identity: "esp32 | nrf52 | linux | none"
+  peer_key_store: "esp32 | nrf52 | linux | none"
+  node_store: "esp32 | nrf52 | linux | none"
+  message_store: "esp32 | nrf52 | linux | none"
+  location: "esp32 | nrf52 | linux | none"
+  time: "esp32 | nrf52 | linux | none"
+  config: "esp32 | nrf52 | linux | none"
+  device_status: "esp32 | nrf52 | linux | none"
+  ui_state: "esp32 | nrf52 | linux | none"
+
+capabilities:
+  lora:
+    state: "unsupported | absent | present | unbound | ready | degraded | simulated | error"
+    endpoint_host: "esp32 | nrf52 | linux | external | none"
+    mode: "local_radio | packet_proxy | command_proxy | none"
+  gps:
+    state: "unsupported | absent | present | unbound | ready | degraded | simulated | error"
+    endpoint_host: "esp32 | nrf52 | linux | external | none"
+    mode: "local_uart | raw_stream_proxy | fix_proxy | command_proxy | simulated | none"
+  ble:
+    state: "unsupported | absent | present | unbound | ready | degraded | simulated | error"
+    endpoint_host: "esp32 | nrf52 | linux | none"
+    stack: "nimble | bluefruit | bluez | none"
+    roles:
+      meshtastic_phone: "server | client | disabled | unsupported"
+      meshcore_phone: "server | client | disabled | unsupported"
+      trailmate_control: "server | client | disabled | unsupported"
+
+protocols:
+  meshtastic:
+    enabled: true
+    radio_profile_source: "shared_core"
+    ble_phone_core: "shared_core | disabled"
+  meshcore:
+    enabled: true
+    radio_profile_source: "shared_core"
+    ble_phone_core: "shared_core | disabled"
+  hostlink:
+    enabled: true
+    frame_core: "shared_core"
+
+storage:
+  backend: "esp_nvs | nrf52_flash | sqlite | file | fake | none"
+  identity: "..."
+  peer_keys: "..."
+  config: "..."
+  messages: "..."
+  node_store: "..."
+
+race_policy:
+  app_to_ui: "snapshot"
+  radio_to_app: "event_queue"
+  gps_to_app: "event_queue"
+  ble_to_app: "command_queue"
+  isr_to_driver: "defer_only"
+  store_access: "single_owner_or_mutex"
+  ui_update: "ui_thread_only"
+
+build:
+  app: "apps/..."
+  board_package: "platform/.../boards/..."
+  enabled_modules:
+    - "core_chat"
+    - "core_mesh"
+    - "core_gps"
+    - "core_phone"
+    - "core_device"
+    - "ui_presentation"
+  disabled_modules: []
+```
+
+------
+
+# 5. Board Package 规格
+
+必须新增一份板级规格：
+
+```text
+docs/specification/BOARD_PACKAGE_SPEC.md
+```
+
+## 5.1 Board Package 职责
+
+Board package 只拥有硬件事实和板级 bring-up。
+
+允许：
+
+```text
+- pin map
+- bus map
+- power rails
+- display facts
+- input facts
+- battery facts
+- radio hardware facts
+- gps hardware facts
+- board init
+- board sleep/wake hooks
+```
+
+禁止：
+
+```text
+- ChatService
+- ContactService
+- DirectMessageService
+- MeshtasticPhoneCore
+- MeshCorePhoneCore
+- ConfigService 业务解释
+- UI 页面状态
+- BLE phone protocol
+- GPS 业务策略
+- LoRa packet 语义
+```
+
+## 5.2 Board Package 结构
+
+```text
+platform/
+  esp/
+    boards/
+      t_lora_pager/
+        board_manifest.yaml
+        include/board/t_lora_pager_board.h
+        src/t_lora_pager_board.cpp
+        include/board/t_lora_pager_pins.h
+
+      t_deck/
+      t_watch_s3/
+
+  nrf52/
+    boards/
+      gat562_mesh_evb_pro/
+        board_manifest.yaml
+        include/board/gat562_board.h
+        src/gat562_board.cpp
+
+  linux/
+    boards/
+      uconsole_aio2/
+        board_manifest.yaml
+        include/board/uconsole_aio2_facts.h
+        src/uconsole_aio2_facts.cpp
+```
+
+## 5.3 Board Manifest
+
+每个板子必须有：
+
+```yaml
+board: "t_lora_pager"
+platform: "esp32"
+
+facts:
+  display:
+    present: true
+    width: 222
+    height: 480
+    rotation: 90
+    driver: "st7789"
+  lora:
+    present: true
+    chip: "sx1262"
+    spi_bus: "spi2"
+    reset_pin: 8
+    busy_pin: 7
+    dio1_pin: 33
+    power_enable_pin: null
+    dio2_as_rf_switch: true
+    dio3_tcxo_voltage: 1.8
+  gps:
+    present: true
+    uart: "uart1"
+    power_enable_pin: 21
+    pps_pin: null
+  input:
+    buttons: true
+    keyboard: false
+    touch: false
+  storage:
+    sd: true
+    internal_flash: true
+  power:
+    battery: true
+    charger: true
+```
+
+这和 target manifest 不同：
+
+```text
+board_manifest.yaml 说明硬件有什么。
+target_manifest.yaml 说明产品怎么使用这些硬件。
+```
+
+------
+
+# 6. Runtime / Concurrency 规格
+
+这是你刚才指出的重点：不同 ESP32 板子、nRF52、Linux 都会面对不同竞态。
+
+必须新增：
+
+```text
+docs/specification/RUNTIME_CONCURRENCY_SPEC.md
+```
+
+## 6.1 竞态来源
+
+Trail Mate 至少有这些并发源：
+
+```text
+- Radio IRQ
+- Radio RX task / poll loop
+- Radio TX completion
+- GPS UART RX
+- GPS parser task
+- BLE stack callback
+- BLE notify queue
+- UI event loop
+- LVGL tick / input
+- GTK main loop
+- ASCII terminal input loop
+- HostLink USB/serial RX
+- Storage write
+- Config update
+- Power/sleep/wake
+- Timer / retry / ACK timeout
+```
+
+这些如果不规格化，会导致：
+
+```text
+- UI 在非 UI 线程更新
+- BLE callback 直接改 ChatService
+- radio IRQ 直接触发业务
+- GPS parser 和 UI 同时读写 location
+- config 更新和 radio apply 并发
+- sleep 时 radio/gps/ble 还在访问硬件
+- SQLite/NVS/flash 并发写
+```
+
+------
+
+## 6.2 总规则：外部输入全部转成事件
+
+禁止：
+
+```text
+ISR -> 直接业务
+BLE callback -> 直接业务
+UART callback -> 直接业务
+UI callback -> 直接改底层 driver
+```
+
+必须：
+
+```text
+ISR / callback / transport
+    -> event queue / command queue
+        -> app service owner
+            -> state update
+                -> presentation snapshot
+                    -> UI thread render
+```
+
+------
+
+## 6.3 单 owner 规则
+
+每个 mutable service 必须有 owner context。
+
+```text
+ChatService owner: app service context
+MeshSession owner: mesh context
+GpsService owner: gps context
+ConfigService owner: app service context
+DeviceStatus owner: device service context
+UI State owner: UI context
+```
+
+其他线程/task 不能直接改，只能投递 command/event。
+
+------
+
+## 6.4 Snapshot 规则
+
+UI 不应该直接读 mutable service 内部对象。
+
+应该：
+
+```text
+App Service
+    -> immutable snapshot / projection
+        -> Presentation Model
+            -> Shell Renderer
+```
+
+例如：
+
+```cpp
+struct ChatListSnapshot {
+    ConversationRow rows[32];
+    size_t count;
+    uint32_t version;
+};
+```
+
+UI 获取 snapshot 后渲染。
+后台继续更新不会破坏 UI。
+
+------
+
+## 6.5 UI Thread Only 规则
+
+不同 UI 技术栈都要遵守“UI 只能在自己的 UI context 更新”。
+
+### LVGL
+
+```text
+- lv_obj_* 只能在 LVGL owner task/thread 调用
+- 其他 task 只能投递 UI command
+- 不能从 BLE/radio/GPS callback 直接改 LVGL object
+```
+
+### GTK
+
+```text
+- GTK widget 只能在 GTK main loop 更新
+- 后台线程通过 idle/source/channel 投递更新
+```
+
+### ASCII / TUI
+
+```text
+- terminal buffer 有单一 renderer owner
+- 输入线程和刷新线程不能同时写 stdout
+- 后台事件只更新 model 或提交 render request
+```
+
+### Headless
+
+```text
+- 不存在 UI thread
+- 只导出 snapshot / logs / API
+```
+
+------
+
+## 6.6 ISR 规则
+
+ISR 只能：
+
+```text
+- 清中断
+- 记录最小标志
+- 投递 lightweight event
+```
+
+ISR 禁止：
+
+```text
+- malloc/free
+- storage write
+- BLE notify
+- UI update
+- protobuf encode/decode
+- direct message send
+- GPS parse
+```
+
+------
+
+## 6.7 Storage 并发规则
+
+Storage backend 必须声明：
+
+```text
+- single writer
+- multi reader
+- transaction support
+- async write support
+- erase/write blocking behavior
+```
+
+ESP32 NVS、nRF52 flash、SQLite 完全不同：
+
+```text
+ESP32 NVS:
+  blocking, limited write endurance, usually mutex protected
+
+nRF52 flash:
+  erase/write expensive, often async, must avoid callback/context conflict
+
+SQLite:
+  transaction, file lock, can support stronger consistency but must avoid UI thread blocking
+```
+
+所以 store port 不能只是：
+
+```cpp
+bool save(...)
+```
+
+至少要有：
+
+```cpp
+StoreResult
+StoreCapabilities
+StoreConcurrencyPolicy
+```
+
+------
+
+# 7. UI 架构必须拆成 Presentation Model + Renderer
+
+你说的 ASCII/LVGL/GTK 是关键。
+不能让业务层为了 LVGL 组织状态，也不能让 GTK 复用 LVGL 页面。
+
+必须新增：
+
+```text
+docs/specification/UI_PRESENTATION_ARCHITECTURE_SPEC.md
+```
+
+------
+
+## 7.1 三层 UI
+
+```text
+App Service
+    业务状态与动作
+
+Presentation Model
+    UI 无关的页面/工作区状态与动作
+
+Shell / Renderer
+    LVGL / ASCII / GTK / CLI / Headless
+```
+
+------
+
+## 7.2 App Service
+
+例如：
+
+```text
+ChatService
+ContactService
+TeamService
+LocationService
+MeshService
+ConfigService
+DeviceStatusService
+```
+
+不允许知道：
+
+```text
+LVGL
+GTK
+terminal
+screen size
+font
+button
+layout
+```
+
+------
+
+## 7.3 Presentation Model
+
+Presentation Model 负责把 App Service 变成“可展示状态”。
+
+例如：
+
+```text
+ChatWorkspaceModel
+MapWorkspaceModel
+SettingsWorkspaceModel
+DeviceStatusModel
+GpsStatusModel
+MeshStatusModel
+```
+
+它可以知道：
+
+```text
+- 当前选中哪个 conversation
+- 当前列表滚动位置的抽象 cursor
+- 当前 workspace 的 actions
+- 字段格式化
+- 行/列/面板概念
+- compact / desktop / terminal 的 presentation profile
+```
+
+但不能知道：
+
+```text
+lv_obj_t
+GtkWidget
+ncurses WINDOW
+stdout
+framebuffer
+```
+
+------
+
+## 7.4 Renderer / Shell
+
+Renderer 才知道具体技术。
+
+```text
+LVGL renderer:
+  ChatWorkspaceModel -> lv_obj_t tree
+
+ASCII renderer:
+  ChatWorkspaceModel -> text grid / ANSI escape
+
+GTK renderer:
+  ChatWorkspaceModel -> GtkWidget tree
+
+CLI renderer:
+  ChatWorkspaceModel -> command output
+```
+
+------
+
+## 7.5 UI 技术栈不允许拥有业务
+
+禁止：
+
+```text
+lvgl_chat_page.cpp 里直接实现 message dedup
+gtk_map_page.cpp 里直接解析 GPS NMEA
+ascii_mesh_view.cpp 里直接读 peer key store
+```
+
+允许：
+
+```text
+renderer 调用 presentation model action:
+  sendMessage()
+  selectContact()
+  toggleLayer()
+  applyConfigPatch()
+```
+
+------
+
+# 8. UI Target Profile
+
+不同 UI 应该有 profile，而不是靠 ifdef 到处判断。
+
+```yaml
+ui:
+  shell: "lvgl"
+  renderer: "lvgl"
+  layout_profile: "compact_handheld"
+  screen:
+    width: 222
+    height: 480
+    density: "small"
+  input_model:
+    primary: "buttons"
+    text_input: "limited"
+```
+
+ASCII：
+
+```yaml
+ui:
+  shell: "ascii"
+  renderer: "ascii_canvas"
+  layout_profile: "terminal_panel"
+  terminal:
+    min_columns: 80
+    min_rows: 24
+    color: "ansi"
+  input_model:
+    primary: "keyboard"
+```
+
+GTK：
+
+```yaml
+ui:
+  shell: "gtk"
+  renderer: "gtk4"
+  layout_profile: "desktop_workbench"
+  window:
+    default_width: 1280
+    default_height: 720
+  input_model:
+    primary: "keyboard_pointer"
+```
+
+Headless：
+
+```yaml
+ui:
+  shell: "headless"
+  renderer: "none"
+  layout_profile: "none"
+```
+
+------
+
+# 9. Board Variant 与 UI 的关系
+
+Board 可以告诉你：
+
+```text
+屏幕尺寸、输入设备、旋转方向
+```
+
+但 Board 不能决定：
+
+```text
+使用哪个页面布局
+```
+
+Target 决定：
+
+```text
+这个板子上的产品用哪个 shell/profile
+```
+
+例如同一个 Linux：
+
+```text
+linux_uconsole_gtk
+linux_uconsole_ascii
+linux_headless
+```
+
+可以共享同一套 AppService 和 PresentationModel，但 Shell 不同。
+
+------
+
+# 10. Capability 规格需要增加 Board Binding
+
+之前 capability 只说 endpoint_host。现在要增加：
+
+```text
+capability binding
+```
+
+因为同样是 ESP32，不同板子的 LoRa/GPS 接线不同。
+
+```yaml
+capability_bindings:
+  lora:
+    board_provider: "t_lora_pager.radio"
+    platform_driver: "esp_sx1262_packet_radio"
+    protocol_binding: "meshtastic_or_meshcore"
+    runtime_owner: "mesh_task"
+
+  gps:
+    board_provider: "t_lora_pager.gps"
+    platform_driver: "esp_uart_gnss"
+    parser: "core_gps_nmea"
+    runtime_owner: "gps_task"
+
+  display:
+    board_provider: "t_lora_pager.display"
+    platform_driver: "esp_lcd_panel"
+    renderer: "lvgl"
+    runtime_owner: "ui_task"
+
+  input:
+    board_provider: "t_lora_pager.input"
+    platform_driver: "esp_input_driver"
+    event_target: "ui_command_queue"
+```
+
+这样能避免：
+
+```text
+AppContext 直接知道 T-LoRa Pager 的 GPS pin
+BLE service 直接知道 GAT562 board
+UI 直接读 board display rotation
+```
+
+------
+
+# 11. 产品组合层 Product Composition
+
+Apps 层不能无限膨胀成上帝对象。
+应该定义 Product Composition Root。
+
+```text
+apps/<target>/
+  main.cpp
+  target_manifest.yaml
+  product_composition.cpp
+  product_composition.h
+  ui_composition.cpp
+  runtime_composition.cpp
+  capability_composition.cpp
+```
+
+职责：
+
+```text
+- 读取/引用 target manifest
+- 创建 board facts provider
+- 创建 platform drivers
+- 创建 stores
+- 创建 protocol cores
+- 创建 app services
+- 创建 presentation models
+- 创建 shell renderer
+- 连接 event queues
+```
+
+禁止：
+
+```text
+- 在 composition root 里写 direct message 业务
+- 在 composition root 里解析 BLE phone protocol
+- 在 composition root 里解析 NMEA
+- 在 composition root 里拼 UI 业务数据
+```
+
+------
+
+# 12. Event Bus / Command Bus 规格
+
+跨平台共享时，事件模型必须明确。
+
+建议新增：
+
+```text
+modules/core_runtime
+```
+
+或者先作为规格定义。
+
+## 12.1 事件类型分层
+
+```text
+HardwareEvent
+  RadioIrq
+  GpsBytesAvailable
+  BleConnected
+  ButtonPressed
+
+CapabilityEvent
+  RadioPacketReceived
+  GpsFixUpdated
+  BleWriteReceived
+
+ProtocolEvent
+  MeshtasticPacketReceived
+  MeshCoreFrameReceived
+  PhoneCommandReceived
+
+AppEvent
+  MessageReceived
+  ContactUpdated
+  LocationUpdated
+  ConfigChanged
+
+PresentationEvent
+  ChatListChanged
+  MapViewportChanged
+  DeviceStatusChanged
+
+ShellEvent
+  KeyPressed
+  TouchClicked
+  WindowResized
+```
+
+禁止低层事件越级：
+
+```text
+HardwareEvent -> UI
+BLE callback -> ChatModel
+Radio IRQ -> ContactService
+```
+
+------
+
+## 12.2 Command 类型分层
+
+```text
+UiCommand
+  SendMessageClicked
+  SelectContact
+  ToggleMapLayer
+
+AppCommand
+  SendDirectMessage
+  ApplyConfigPatch
+  MarkConversationRead
+
+CapabilityCommand
+  ConfigureRadio
+  StartGps
+  StartBleAdvertising
+
+DriverCommand
+  WriteSpi
+  SetGpio
+```
+
+UI 只能发 `UiCommand` 或调用 presentation action。
+PresentationModel 转成 AppCommand。
+AppService 再转 CapabilityCommand。
+
+------
+
+# 13. 配置系统必须区分三类配置
+
+很多跨平台漂移来自 config 混在一起。
+
+必须区分：
+
+## 13.1 Product Config
+
+用户意义配置：
+
+```text
+- 当前协议 Meshtastic/MeshCore
+- region
+- modem preset
+- screen timeout
+- map layer preference
+- team mode
+```
+
+归属：
+
+```text
+core_config + AppService
+```
+
+## 13.2 Platform Config
+
+平台运行配置：
+
+```text
+- Linux data root
+- SQLite path
+- serial device path
+- framebuffer path
+- GTK window size
+```
+
+归属：
+
+```text
+platform/app target
+```
+
+## 13.3 Board Facts
+
+硬件事实：
+
+```text
+- pins
+- bus
+- display resolution
+- GPS UART
+```
+
+归属：
+
+```text
+board package
+```
+
+禁止把 Board Facts 放进 Product Config。
+禁止让用户 UI 修改 board pin。
+禁止让 Meshtastic BLE config 写 Linux path。
+禁止让 GTK settings 直接改 radio driver without ConfigService。
+
+------
+
+# 14. Shared Core 代码规则要进一步严格
+
+因为要支持 nRF52 + ESP32 + Linux + 多 UI，共享模块要分等级。
+
+## 14.1 Core Portable Level
+
+```text
+core_portable
+```
+
+允许：
+
+```text
+- fixed buffer
+- no exception
+- no RTTI
+- limited STL or no STL
+- no heap hidden allocation
+- explicit capacity
+```
+
+用于：
+
+```text
+core_mesh
+core_gps parser
+core_phone codec
+core_config schema
+```
+
+## 14.2 Core Rich Level
+
+```text
+core_rich
+```
+
+允许更丰富结构，但不能进 MCU 必需路径：
+
+```text
+- std::vector
+- std::string
+- indexes
+- search
+- Linux-friendly projection
+```
+
+用于：
+
+```text
+Linux search
+GTK presentation model maybe
+map package index
+diagnostics
+```
+
+Target manifest 要声明能用哪个 level。
+
+------
+
+# 15. Presentation Model 也要分 portable/rich
+
+嵌入式和 Linux UI 不同，不应该强行共用一个巨大的 presentation model。
+
+建议：
+
+```text
+modules/ui_presentation/
+  include/ui_presentation/
+    chat/
+      chat_summary_model.h        # portable
+      chat_workspace_model.h      # richer
+    map/
+      map_compact_model.h
+      map_workbench_model.h
+    device/
+      device_status_model.h
+```
+
+规则：
+
+```text
+- compact model 可用于 LVGL/ASCII/小屏
+- workbench model 可用于 GTK/uConsole
+- 两者共享 AppService，不共享布局对象
+```
+
+例子：
+
+```text
+ChatSummaryModel:
+  conversation rows
+  selected row
+  unread count
+  simple actions
+
+ChatWorkbenchModel:
+  conversation rail
+  transcript
+  node inspector
+  compose state
+  search/filter
+```
+
+LVGL 不必吃 GTK 的 workspace model。
+GTK 不必复用 LVGL 页面。
+
+------
+
+# 16. ASCII UI 特别规则
+
+ASCII/TUI 不是“简单日志输出”，它也是 Shell。
+
+需要约束：
+
+```text
+ASCII renderer 只能消费 presentation model。
+不能直接读 service/store。
+不能直接访问 radio/GPS/BLE。
+```
+
+ASCII renderer 输出应通过：
+
+```text
+AsciiCanvas
+AsciiLayout
+AsciiTheme
+TerminalInputAdapter
+```
+
+而不是业务代码里到处 `printf()`。
+
+```cpp
+class AsciiCanvas {
+public:
+    void drawText(int x, int y, TextStyle style, const char* text);
+    void drawBox(int x, int y, int w, int h);
+    void flush();
+};
+```
+
+这样以后 CLI/TUI 也能保持架构边界。
+
+------
+
+# 17. LVGL 特别规则
+
+LVGL 页面必须变薄。
+
+禁止：
+
+```text
+lvgl page 直接:
+- 读写 store
+- 解析协议
+- 访问 board
+- 访问 radio driver
+- 访问 gps driver
+- 修改 config backend
+```
+
+允许：
+
+```text
+lvgl page:
+- 绑定 presentation model
+- 渲染 snapshot
+- 发送 UI action
+```
+
+推荐结构：
+
+```text
+platform/esp/.../ui/lvgl_shell/
+  lvgl_chat_page.cpp
+  lvgl_map_page.cpp
+  lvgl_settings_page.cpp
+
+modules/ui_presentation/
+  chat_model.h
+  map_model.h
+  settings_model.h
+```
+
+------
+
+# 18. GTK 特别规则
+
+GTK 是 desktop shell，不是 Linux 业务层。
+
+禁止：
+
+```text
+gtk page:
+- 自己维护 ContactService
+- 自己解析 Meshtastic node info
+- 自己拼 device status
+- 自己读 SQLite 表绕过 AppService
+```
+
+允许：
+
+```text
+gtk page:
+- 显示 richer presentation model
+- 发 action
+- 处理 keyboard/mouse/window
+```
+
+GTK 主线程规则必须写死：
+
+```text
+All GtkWidget mutations must happen on GTK main loop.
+Background services publish snapshots/events only.
+```
+
+------
+
+# 19. Headless / CLI 规则
+
+Linux 可能有 daemon 或 CLI。
+它不能变成“绕过架构的调试捷径”。
+
+CLI 命令也必须走 AppService：
+
+```text
+trailmate send --to ...
+    -> CliShell
+        -> AppCommand
+            -> DirectMessageService
+```
+
+禁止：
+
+```text
+CLI 直接打开 SQLite 改 peer key
+CLI 直接调用 radio driver 发包
+```
+
+除非命令明确是低层诊断命令，并放在 diagnostics capability 下。
+
+------
+
+# 20. 多 ESP32 板子类的具体约束
+
+你特别指出不同 ESP32 有不同板子类。这里必须具体化。
+
+## 20.1 不允许 `#ifdef BOARD_X` 扩散
+
+禁止：
+
+```cpp
+#ifdef BOARD_T_DECK
+  ...
+#elif BOARD_T_LORA_PAGER
+  ...
+#endif
+```
+
+散落在业务、UI、协议代码中。
+
+允许它集中在：
+
+```text
+board package
+target composition
+build config
+```
+
+------
+
+## 20.2 Board Facade
+
+每个 board 实现统一接口：
+
+```cpp
+class IBoardPackage {
+public:
+    virtual BoardId id() const = 0;
+    virtual bool radioFacts(RadioHardwareFacts& out) const = 0;
+    virtual bool gpsFacts(GpsHardwareFacts& out) const = 0;
+    virtual bool displayFacts(DisplayHardwareFacts& out) const = 0;
+    virtual bool inputFacts(InputHardwareFacts& out) const = 0;
+    virtual bool powerFacts(PowerHardwareFacts& out) const = 0;
+};
+```
+
+Board-specific 类可以很多：
+
+```text
+TLoraPagerBoard
+TDeckBoard
+TWatchS3Board
+Gat562Board
+UConsoleAio2Board
+```
+
+但上层只看 `IBoardPackage`。
+
+------
+
+## 20.3 Board Runtime Hooks
+
+板子可以有 runtime hook：
+
+```cpp
+class IBoardRuntimeHooks {
+public:
+    virtual void beforeSleep() = 0;
+    virtual void afterWake() = 0;
+    virtual void onLowPowerModeChanged(PowerMode mode) = 0;
+};
+```
+
+但 hook 不允许调用业务服务，只能处理硬件状态。
+
+------
+
+# 21. Race Policy Manifest
+
+每个 target 必须声明竞态策略：
+
+```yaml
+race_policy:
+  ownership:
+    chat_service: "app_task"
+    mesh_session: "mesh_task"
+    gps_service: "gps_task"
+    config_service: "app_task"
+    ui_state: "ui_task"
+    device_status: "app_task"
+
+  event_paths:
+    radio_rx: "radio_irq -> radio_task -> mesh_event_queue -> app_task"
+    gps_rx: "uart_irq -> gps_task -> location_event_queue -> app_task"
+    ble_write: "ble_callback -> phone_command_queue -> app_task"
+    ui_input: "ui_thread -> presentation_action -> app_command_queue"
+
+  forbidden_direct_calls:
+    - "ble_callback -> ChatService"
+    - "radio_irq -> MeshSession"
+    - "gps_task -> lvgl"
+    - "gtk_worker -> GtkWidget"
+    - "ui_thread -> blocking storage write"
+```
+
+这个比抽象讲“注意线程安全”有用得多。
+
+------
+
+# 22. 新增规格文档清单
+
+最终建议新增这些：
+
+```text
+docs/specification/
+  CROSS_PLATFORM_PRODUCT_ARCHITECTURE_SPEC.md
+  TARGET_MANIFEST_SPEC.md
+  BOARD_PACKAGE_SPEC.md
+  RUNTIME_CONCURRENCY_SPEC.md
+  UI_PRESENTATION_ARCHITECTURE_SPEC.md
+  CAPABILITY_AUTHORITY_GLOSSARY.md
+  STORAGE_AUTHORITY_SPEC.md
+  EVENT_COMMAND_FLOW_SPEC.md
+```
+
+不是一次全写到极致，但 Phase 1 至少要把文件和核心规则立起来。
+
+------
+
+# 23. 目录结构建议
+
+```text
+modules/
+  core_device/
+    capability / authority / target vocabulary
+
+  core_runtime/
+    event / command / scheduler abstractions
+
+  core_config/
+    config schema / patch / validation
+
+  core_mesh/
+    LoRa / Meshtastic / MeshCore radio-side business
+
+  core_gps/
+    GNSS parser / location / time facts
+
+  core_phone/
+    Meshtastic BLE phone core
+    MeshCore BLE/control core
+
+  core_chat/
+    chat/contact/conversation domain
+
+  ui_presentation/
+    UI toolkit independent presentation models
+
+  ui_ascii/
+    optional reusable ASCII canvas/render helpers
+
+platform/
+  esp/
+    boards/
+    drivers/
+    runtime/
+    storage/
+    ble/
+    ui/lvgl/
+
+  nrf52/
+    boards/
+    drivers/
+    runtime/
+    storage/
+    ble/
+
+  linux/
+    boards/
+    drivers/
+    runtime/
+    storage/
+    ui/gtk/
+    ui/ascii/
+
+apps/
+  esp_tpager/
+  esp_tdeck/
+  nrf52_gat562/
+  linux_uconsole_gtk/
+  linux_uconsole_ascii/
+  linux_headless/
+  linux_sim/
+```
+
+
+
+------
+
+# 附录1:实现细则
+
+```text
+业务稳定以后，跨平台改造的目标不是重新设计业务，
+而是把已经稳定的业务语义从平台、板级、UI、协议通道、运行时细节中剥离出来，
+让它成为可复用、可测试、可替换宿主的应用核心。
+```
+
+对应工程原则：
+
+```text
+Domain 定义事实；
+UseCase 编排业务；
+ProtocolCore 解释协议；
+CapabilityPort 描述所需能力；
+PlatformAdapter 提供能力；
+BoardPackage 描述硬件事实；
+RuntimeContext 处理调度和并发；
+PresentationModel 投影界面状态；
+Renderer 只负责绘制；
+CompositionRoot 负责组装。
+```
+
+------
+
+# 1. 分层总览与设计模式对应
+
+先给全局映射。
+
+| 层                            | 责任                 | 主要设计模式                                        | 目的                                      |
+| ----------------------------- | -------------------- | --------------------------------------------------- | ----------------------------------------- |
+| Domain                        | 定义业务事实和值对象 | Value Object、Entity                                | 去平台化，统一语义                        |
+| UseCase / Application Service | 编排业务流程         | Application Service、Command Handler、State Machine | 稳定业务唯一实现                          |
+| Protocol Core                 | 解释外部协议         | Strategy、Codec、State Machine、Mapper              | Meshtastic/MeshCore/BLE/HostLink 协议复用 |
+| Capability Ports              | 定义所需能力         | Ports and Adapters、Repository Interface            | 隔离平台能力                              |
+| Platform Adapters             | 实现能力             | Adapter、Repository、Proxy、Null Object             | ESP32/nRF52/Linux 可替换                  |
+| Board Package                 | 描述硬件事实         | Abstract Factory、Provider                          | 隔离不同板子                              |
+| Runtime Context               | 处理并发调度         | Active Object、Reactor、Command Queue、Event Queue  | 消解竞态                                  |
+| Config Core                   | 管理配置语义         | Schema、Patch、Validator、Repository                | 多入口统一改配置                          |
+| Device Core                   | 聚合能力状态         | Snapshot、Projection、Facade                        | UI/BLE/HostLink 共享设备状态              |
+| Presentation Model            | UI 无关状态          | MVVM、Presenter、CQRS Read Model                    | LVGL/ASCII/GTK 复用                       |
+| Renderer / Shell              | 绘制与输入           | Renderer、Adapter、Command                          | UI 技术栈隔离                             |
+| Composition Root              | 组装对象             | Dependency Injection、Abstract Factory、Builder     | 控制依赖方向                              |
+
+这不是“模式堆砌”。每个模式对应一个具体结构性问题。
+
+------
+
+# 2. Domain 层：稳定业务语义的原子层
+
+## 2.1 目标
+
+Domain 层只定义业务中的“事实”和“值”。
+
+例如：
+
+```text
+NodeId
+Peer
+Contact
+Conversation
+Message
+LocationFix
+TimeFact
+RadioPacket
+MeshProtocol
+DeviceCapability
+ConfigValue
+```
+
+它不做 I/O，不调平台 API，不知道 UI。
+
+## 2.2 使用模式
+
+### Value Object
+
+用于不可变业务值：
+
+```cpp
+namespace domain {
+
+struct NodeId {
+    uint32_t value = 0;
+
+    bool isValid() const {
+        return value != 0;
+    }
+
+    bool operator==(const NodeId& other) const {
+        return value == other.value;
+    }
+};
+
+struct MessageId {
+    uint64_t value = 0;
+};
+
+struct Timestamp {
+    uint64_t epoch_seconds = 0;
+    bool valid = false;
+};
+
+}
+```
+
+目的：
+
+```text
+把“节点 ID”“消息 ID”“时间戳”这些语义从 uint32_t / uint64_t 中解放出来。
+```
+
+避免：
+
+```cpp
+uint32_t node;
+uint32_t peer;
+uint32_t id;
+uint32_t from;
+```
+
+到处混。
+
+------
+
+### Entity
+
+用于有身份、有生命周期的业务对象：
+
+```cpp
+namespace chat {
+
+struct Message {
+    domain::MessageId id;
+    domain::NodeId from;
+    domain::NodeId to;
+    domain::Timestamp timestamp;
+    MessageDirection direction;
+    MessageStatus status;
+    FixedString<240> text;
+};
+
+struct Contact {
+    domain::NodeId node_id;
+    FixedString<32> short_name;
+    FixedString<64> long_name;
+    ContactSource source;
+    TrustState trust;
+};
+
+}
+```
+
+目的：
+
+```text
+让消息、联系人、节点等业务对象在所有平台上语义一致。
+```
+
+------
+
+## 2.3 Domain 层禁止事项
+
+Domain 禁止 include：
+
+```cpp
+Arduino.h
+Preferences.h
+sqlite3.h
+freertos/...
+zephyr/...
+nrf_...
+esp_...
+lvgl.h
+gtk/...
+```
+
+Domain 禁止：
+
+```text
+- 访问 NVS / SQLite / Flash
+- 发 LoRa packet
+- 解析 BLE characteristic
+- 访问 GPS UART
+- 更新 UI
+- 加锁
+- 起线程
+```
+
+------
+
+# 3. UseCase 层：稳定业务的唯一实现
+
+业务已经稳定，所以 UseCase 层要做的是：
+
+```text
+把稳定业务流程固化为唯一实现。
+```
+
+例如：
+
+```text
+发送直连消息
+收到 Mesh packet
+更新联系人
+GPS fix 更新
+BLE phone command 处理
+配置变更
+设备状态聚合
+```
+
+## 3.1 使用模式：Application Service
+
+例如 DirectMessageService：
+
+```cpp
+class DirectMessageService {
+public:
+    DirectMessageService(
+        MeshProtocolStrategy& protocol,
+        PeerIdentityService& identity,
+        IPacketRadio& radio,
+        IClock& clock,
+        IMeshEventSink& events
+    )
+        : protocol_(protocol),
+          identity_(identity),
+          radio_(radio),
+          clock_(clock),
+          events_(events) {}
+
+    SendResult sendDirect(const DirectMessageCommand& cmd) {
+        if (!cmd.isValid()) {
+            return SendResult::fail(SendFailure::InvalidInput);
+        }
+
+        LocalIdentity local;
+        auto local_result = identity_.ensureLocalIdentity(local);
+        if (!local_result.ok) {
+            return SendResult::fail(SendFailure::LocalIdentityMissing);
+        }
+
+        PeerPublicKey peer_key;
+        auto peer_result = identity_.findPeerKey(cmd.to, peer_key);
+        if (!peer_result.ok) {
+            return SendResult::fail(SendFailure::PeerKeyMissing);
+        }
+
+        EncodedPacket packet;
+        auto build_result = protocol_.buildDirectMessage(
+            local,
+            peer_key,
+            cmd,
+            packet
+        );
+
+        if (!build_result.ok) {
+            return SendResult::fail(SendFailure::PacketBuildFailed);
+        }
+
+        auto tx_result = radio_.send(packet.bytes());
+        if (!tx_result.ok) {
+            return SendResult::fail(SendFailure::RadioSendFailed);
+        }
+
+        events_.emit(MeshEvent::messageSent(cmd.to));
+        return SendResult::ok();
+    }
+
+private:
+    MeshProtocolStrategy& protocol_;
+    PeerIdentityService& identity_;
+    IPacketRadio& radio_;
+    IClock& clock_;
+    IMeshEventSink& events_;
+};
+```
+
+目的：
+
+```text
+ESP32、nRF52、Linux 发直连消息时，走同一个 DirectMessageService。
+```
+
+平台差异只在：
+
+```text
+IPacketRadio
+ILocalIdentityStore
+IPeerKeyStore
+IClock
+IRandom
+```
+
+------
+
+## 3.2 使用模式：Command Handler
+
+对于 UI、BLE、HostLink、CLI 进来的操作，不应该直接调用底层服务，而应该统一成 Command。
+
+```cpp
+struct SendDirectMessageCommand {
+    domain::NodeId to;
+    FixedBytes<240> text;
+};
+
+struct ApplyConfigPatchCommand {
+    ConfigPatch patch;
+};
+
+using AppCommand = Variant<
+    SendDirectMessageCommand,
+    ApplyConfigPatchCommand,
+    MarkConversationReadCommand,
+    StartGpsCommand,
+    SetMeshProtocolCommand
+>;
+```
+
+统一处理：
+
+```cpp
+class AppCommandHandler {
+public:
+    CommandResult handle(const AppCommand& command) {
+        return visit(command, [this](const auto& cmd) {
+            return handleTyped(cmd);
+        });
+    }
+
+private:
+    CommandResult handleTyped(const SendDirectMessageCommand& cmd) {
+        DirectMessageCommand direct;
+        direct.to = cmd.to;
+        direct.payload = cmd.text.view();
+        return direct_message_.sendDirect(direct).toCommandResult();
+    }
+
+    CommandResult handleTyped(const ApplyConfigPatchCommand& cmd) {
+        return config_service_.applyPatch(cmd.patch);
+    }
+
+private:
+    DirectMessageService& direct_message_;
+    ConfigService& config_service_;
+};
+```
+
+目的：
+
+```text
+UI / BLE / HostLink / CLI 都只发命令，不直接操纵业务内部对象。
+```
+
+------
+
+## 3.3 使用模式：State Machine
+
+MeshSession、BLE phone session、GPS runtime、HostLink session 都应该是显式状态机。
+
+例如 MeshSession：
+
+```cpp
+enum class MeshSessionState {
+    Stopped,
+    Starting,
+    Ready,
+    Degraded,
+    Error,
+};
+
+class MeshSession {
+public:
+    void start();
+    void stop();
+    void tick(uint32_t now_ms);
+    void onRadioPacket(const RadioRxPacket& packet);
+    SendResult sendDirect(const DirectMessageCommand& cmd);
+
+private:
+    MeshSessionState state_ = MeshSessionState::Stopped;
+};
+```
+
+目的：
+
+```text
+避免一堆 bool：
+radioReady
+meshStarted
+gpsSynced
+bleConnected
+configApplied
+```
+
+状态机可以精确表达：
+
+```text
+Stopped -> Starting -> Ready -> Degraded -> Error
+```
+
+------
+
+# 4. Protocol Core 层：协议语义和 transport 分离
+
+这是 BLE/Meshtastic/MeshCore 里最容易混的地方。
+
+## 4.1 协议核心分四类
+
+```text
+core_mesh/protocol/meshtastic
+core_mesh/protocol/meshcore
+core_phone/protocol/meshtastic
+core_phone/protocol/meshcore
+core_hostlink
+```
+
+区别：
+
+```text
+Meshtastic radio protocol:
+  LoRa packet / protobuf / PKI / channel / direct packet
+
+Meshtastic phone protocol:
+  BLE ToRadio / FromRadio / admin / config
+
+MeshCore radio protocol:
+  frame / sign / encrypt / payload
+
+MeshCore phone/control protocol:
+  BLE/NUS command / device status / contact / telemetry
+
+HostLink protocol:
+  USB/Serial frame / command / event
+```
+
+这些不应该混在 BLE host 或 radio adapter 里。
+
+------
+
+## 4.2 使用模式：Strategy
+
+Meshtastic 和 MeshCore 是不同协议策略。
+
+```cpp
+class MeshProtocolStrategy {
+public:
+    virtual ~MeshProtocolStrategy() = default;
+
+    virtual ProtocolKind kind() const = 0;
+
+    virtual PacketBuildResult buildDirectMessage(
+        const LocalIdentity& local,
+        const PeerPublicKey& peer,
+        const DirectMessageCommand& cmd,
+        EncodedPacket& out
+    ) = 0;
+
+    virtual PacketParseResult parseRadioPacket(
+        const RadioRxPacket& packet,
+        MeshProtocolEvent& out
+    ) = 0;
+
+    virtual RadioConfig deriveRadioConfig(
+        const MeshConfig& config
+    ) = 0;
+};
+```
+
+实现：
+
+```cpp
+class MeshtasticProtocolStrategy final : public MeshProtocolStrategy {
+    ...
+};
+
+class MeshCoreProtocolStrategy final : public MeshProtocolStrategy {
+    ...
+};
+```
+
+目的：
+
+```text
+上层 DirectMessageService 不关心当前是 Meshtastic 还是 MeshCore。
+切协议只替换 strategy。
+```
+
+------
+
+## 4.3 使用模式：Codec
+
+Codec 只做编码/解码，不做业务决策。
+
+```cpp
+class MeshtasticPacketCodec {
+public:
+    DecodeResult decode(ByteView bytes, MeshtasticPacket& out);
+    EncodeResult encode(const MeshtasticPacket& packet, FixedBuffer& out);
+};
+```
+
+Codec 禁止：
+
+```text
+- 查 peer key
+- 决定是否发送
+- 决定是否更新 contact
+- 访问 radio
+- 访问 storage
+```
+
+------
+
+## 4.4 使用模式：Mapper / Translator
+
+BLE phone protocol 与 AppCommand 之间要用 Mapper。
+
+```cpp
+class MeshtasticPhoneCommandMapper {
+public:
+    MapResult toAppCommand(
+        const MeshtasticToRadio& input,
+        AppCommand& out
+    );
+
+    MapResult fromAppEvent(
+        const AppEvent& event,
+        MeshtasticFromRadio& out
+    );
+};
+```
+
+目的：
+
+```text
+Meshtastic BLE 的 ToRadio/FromRadio 是外部协议对象。
+AppCommand/AppEvent 是内部业务对象。
+两者不能互相污染。
+```
+
+------
+
+# 5. Capability Ports：能力接口
+
+这一层是 Hexagonal Architecture / Ports and Adapters 的核心。
+
+## 5.1 使用模式：Port Interface
+
+业务需要什么能力，就定义 port。
+
+### Radio
+
+```cpp
+class IPacketRadio {
+public:
+    virtual ~IPacketRadio() = default;
+
+    virtual RadioResult configure(const RadioConfig& config) = 0;
+    virtual RadioResult send(ByteView packet) = 0;
+    virtual RadioResult poll(RadioRxPacket& out) = 0;
+    virtual RadioStatus status() const = 0;
+};
+```
+
+### GPS
+
+```cpp
+class IGnssByteStream {
+public:
+    virtual ~IGnssByteStream() = default;
+    virtual IoResult read(uint8_t* out, size_t cap, size_t& len) = 0;
+};
+
+class ILocationSource {
+public:
+    virtual ~ILocationSource() = default;
+    virtual bool latest(LocationFix& out) = 0;
+};
+
+class ITimeAuthority {
+public:
+    virtual ~ITimeAuthority() = default;
+    virtual bool nowEpoch(uint64_t& out) = 0;
+    virtual uint32_t nowMonotonicMs() = 0;
+    virtual TimeSyncStatus syncStatus() = 0;
+};
+```
+
+### BLE Transport
+
+```cpp
+class IBleGattHost {
+public:
+    virtual ~IBleGattHost() = default;
+
+    virtual BleResult startAdvertising(const BleAdvertisement& adv) = 0;
+    virtual BleResult registerService(const BleServiceDefinition& service) = 0;
+    virtual BleResult notify(BleCharacteristicId id, ByteView payload) = 0;
+};
+```
+
+### Storage
+
+```cpp
+class IPeerKeyStore {
+public:
+    virtual ~IPeerKeyStore() = default;
+
+    virtual StoreResult get(domain::NodeId node, PeerPublicKey& out) = 0;
+    virtual StoreResult put(const PeerPublicKey& key) = 0;
+    virtual StoreResult remove(domain::NodeId node) = 0;
+    virtual StoreCapabilities capabilities() const = 0;
+};
+```
+
+目的：
+
+```text
+UseCase 不知道 NVS / SQLite / nRF52 flash。
+ProtocolCore 不知道 Bluefruit / NimBLE / BlueZ。
+LocationService 不知道 UART / Linux fd。
+```
+
+------
+
+## 5.2 使用模式：Repository
+
+Store port 用 Repository 模式。
+
+```cpp
+class IMessageRepository {
+public:
+    virtual StoreResult append(const chat::Message& message) = 0;
+    virtual StoreResult listConversation(
+        domain::NodeId peer,
+        MessageCursor cursor,
+        MessagePage& out
+    ) = 0;
+    virtual StoreResult markRead(domain::MessageId id) = 0;
+};
+```
+
+实现：
+
+```text
+EspNvsPeerKeyStore
+Nrf52FlashPeerKeyStore
+SqlitePeerKeyStore
+FakePeerKeyStore
+```
+
+目的：
+
+```text
+同一业务服务可以在不同存储后端运行。
+```
+
+------
+
+## 5.3 使用模式：Null Object
+
+某些 target 没有某能力，例如 headless 没有 display，Linux 当前不支持 BLE。
+
+不要到处写：
+
+```cpp
+if (ble != nullptr) ...
+```
+
+使用 Null Object：
+
+```cpp
+class NullBleGattHost final : public IBleGattHost {
+public:
+    BleResult startAdvertising(const BleAdvertisement&) override {
+        return BleResult::unsupported();
+    }
+
+    BleResult registerService(const BleServiceDefinition&) override {
+        return BleResult::unsupported();
+    }
+
+    BleResult notify(BleCharacteristicId, ByteView) override {
+        return BleResult::unsupported();
+    }
+};
+```
+
+目的：
+
+```text
+能力不存在也是一种明确对象，而不是 null 分支。
+```
+
+------
+
+# 6. Platform Adapter 层：把平台 API 包起来
+
+## 6.1 使用模式：Adapter
+
+ESP32：
+
+```cpp
+class EspSx1262PacketRadio final : public IPacketRadio {
+public:
+    explicit EspSx1262PacketRadio(const RadioHardwareFacts& facts);
+
+    RadioResult configure(const RadioConfig& config) override {
+        // RadioLib / ESP SPI / GPIO
+    }
+
+    RadioResult send(ByteView packet) override {
+        // platform-specific TX
+    }
+
+    RadioResult poll(RadioRxPacket& out) override {
+        // platform-specific RX
+    }
+};
+```
+
+nRF52：
+
+```cpp
+class Nrf52Sx1262PacketRadio final : public IPacketRadio {
+    // Bluefruit / Zephyr / Arduino nRF52 / Nordic SDK specific
+};
+```
+
+Linux：
+
+```cpp
+class LinuxAio2Sx1262PacketRadio final : public IPacketRadio {
+    // spidev / gpiochip / epoll etc.
+};
+```
+
+目的：
+
+```text
+平台 API 的不一致性在 Adapter 内收敛。
+```
+
+Adapter 禁止：
+
+```text
+- direct message 业务
+- peer key 逻辑
+- BLE phone protocol
+- GPS 业务策略
+- UI 状态
+```
+
+------
+
+## 6.2 使用模式：Proxy
+
+Linux + nRF52 radio endpoint 时，Linux 的 `IPacketRadio` 实现不是本机 radio，而是 proxy。
+
+```cpp
+class SerialPacketRadioProxy final : public IPacketRadio {
+public:
+    SerialPacketRadioProxy(ISerialPort& serial);
+
+    RadioResult configure(const RadioConfig& config) override {
+        return protocol_.sendConfigure(serial_, config);
+    }
+
+    RadioResult send(ByteView packet) override {
+        return protocol_.sendPacket(serial_, packet);
+    }
+
+    RadioResult poll(RadioRxPacket& out) override {
+        return protocol_.readPacket(serial_, out);
+    }
+
+private:
+    ISerialPort& serial_;
+    PacketRadioProxyProtocol protocol_;
+};
+```
+
+目的：
+
+```text
+Linux 仍然运行 Mesh 业务核心；
+nRF52 只是 packet radio endpoint。
+```
+
+这和 command proxy 不同。
+
+------
+
+## 6.3 Command Proxy
+
+如果 nRF52 是 smart coprocessor，则 Linux 不运行 DirectMessageService，而是发命令。
+
+```cpp
+class RemoteMeshCommandClient {
+public:
+    SendResult sendDirect(const DirectMessageCommand& cmd) {
+        return link_.sendCommand(HostCommand::sendDirect(cmd));
+    }
+};
+```
+
+这时：
+
+```text
+DirectMessageService 在 nRF52；
+Linux 只有 RemoteMeshCommandClient。
+```
+
+目的：
+
+```text
+防止同一个用户动作被 Linux 和 nRF52 两个业务核心同时处理。
+```
+
+------
+
+# 7. Board Package 层：多 ESP32 板子变体
+
+## 7.1 使用模式：Provider / Abstract Factory
+
+每个板子提供 `IBoardPackage`。
+
+```cpp
+class IBoardPackage {
+public:
+    virtual ~IBoardPackage() = default;
+
+    virtual BoardId id() const = 0;
+
+    virtual bool radioFacts(RadioHardwareFacts& out) const = 0;
+    virtual bool gpsFacts(GpsHardwareFacts& out) const = 0;
+    virtual bool displayFacts(DisplayHardwareFacts& out) const = 0;
+    virtual bool inputFacts(InputHardwareFacts& out) const = 0;
+    virtual bool powerFacts(PowerHardwareFacts& out) const = 0;
+};
+```
+
+T-LoRa Pager：
+
+```cpp
+class TLoraPagerBoard final : public IBoardPackage {
+public:
+    BoardId id() const override {
+        return BoardId::TLoraPager;
+    }
+
+    bool radioFacts(RadioHardwareFacts& out) const override {
+        out.chip = RadioChip::Sx1262;
+        out.spi_bus = SpiBusId::Spi2;
+        out.reset = GpioPin{8};
+        out.busy = GpioPin{7};
+        out.dio1 = GpioPin{33};
+        out.dio2_as_rf_switch = true;
+        out.dio3_tcxo_voltage = 1.8f;
+        return true;
+    }
+
+    bool displayFacts(DisplayHardwareFacts& out) const override {
+        out.width = 222;
+        out.height = 480;
+        out.rotation = DisplayRotation::Landscape;
+        return true;
+    }
+};
+```
+
+T-Deck：
+
+```cpp
+class TDeckBoard final : public IBoardPackage {
+    // different display/input/radio/gps facts
+};
+```
+
+目的：
+
+```text
+不同 ESP32 板子的差异只在 board package 和 composition root。
+业务、协议、UI model 不出现 BOARD_T_DECK / BOARD_TPAGER 分支。
+```
+
+------
+
+## 7.2 使用模式：Abstract Factory
+
+Platform 根据 board facts 创建 driver。
+
+```cpp
+class EspCapabilityFactory {
+public:
+    explicit EspCapabilityFactory(const IBoardPackage& board)
+        : board_(board) {}
+
+    UniquePtr<IPacketRadio> createPacketRadio() {
+        RadioHardwareFacts facts;
+        if (!board_.radioFacts(facts)) {
+            return makeUnique<NullPacketRadio>();
+        }
+
+        if (facts.chip == RadioChip::Sx1262) {
+            return makeUnique<EspSx1262PacketRadio>(facts);
+        }
+
+        return makeUnique<NullPacketRadio>();
+    }
+
+    UniquePtr<IGnssByteStream> createGnssByteStream() {
+        GpsHardwareFacts facts;
+        if (!board_.gpsFacts(facts)) {
+            return makeUnique<NullGnssByteStream>();
+        }
+
+        return makeUnique<EspUartGnssByteStream>(facts);
+    }
+
+private:
+    const IBoardPackage& board_;
+};
+```
+
+目的：
+
+```text
+board 只描述事实；
+factory 才根据事实创建平台驱动；
+业务层完全无感。
+```
+
+------
+
+# 8. Runtime / Concurrency 层：竞态问题结构化
+
+这是嵌入式和 Linux 差异最大的地方。
+
+不能靠“注意线程安全”。必须设计通信模式。
+
+## 8.1 使用模式：Active Object
+
+每个 mutable service 有 owner context。
+
+```text
+RadioContext
+GpsContext
+BleContext
+AppContext
+UiContext
+StorageContext
+```
+
+每个 context 有自己的队列：
+
+```cpp
+class IRuntimeQueue {
+public:
+    virtual bool post(RuntimeCommand command) = 0;
+    virtual bool poll(RuntimeCommand& out) = 0;
+};
+```
+
+例如：
+
+```text
+Radio IRQ
+  -> RadioContext queue
+    -> MeshSession.onRadioPacket
+      -> AppContext queue
+        -> ChatService.onMessageReceived
+          -> UiContext snapshot event
+```
+
+目的：
+
+```text
+跨 task / thread / callback 不直接共享 mutable state。
+```
+
+------
+
+## 8.2 使用模式：Command Queue
+
+UI / BLE / HostLink 都不能直接改业务，只投递命令。
+
+```cpp
+class AppCommandQueue {
+public:
+    bool post(const AppCommand& command);
+    bool poll(AppCommand& out);
+};
+```
+
+BLE callback：
+
+```cpp
+void MeshtasticBleHost::onWrite(ByteView bytes) {
+    PhoneInputEvent event;
+    event.source = PhoneInputSource::Ble;
+    event.bytes.assign(bytes);
+
+    phone_queue_.post(event);
+}
+```
+
+PhoneCore context：
+
+```cpp
+void PhoneRuntime::tick() {
+    PhoneInputEvent event;
+    while (queue_.poll(event)) {
+        auto result = meshtastic_phone_core_.handleInput(event.bytes);
+        dispatchPhoneOutputs(result);
+    }
+}
+```
+
+目的：
+
+```text
+BLE stack callback 不直接进入 ChatService / ConfigService / GPS。
+```
+
+------
+
+## 8.3 使用模式：Event Queue
+
+业务结果通过事件发布。
+
+```cpp
+struct AppEvent {
+    AppEventKind kind;
+    AppEventPayload payload;
+    uint32_t version;
+};
+```
+
+例如：
+
+```text
+MessageReceived
+ContactUpdated
+LocationUpdated
+ConfigChanged
+DeviceStatusChanged
+```
+
+UI 收到后不直接读内部对象，而是请求 snapshot。
+
+------
+
+## 8.4 使用模式：Immutable Snapshot
+
+UI 不直接读 mutable service。
+
+```cpp
+struct DeviceStatusSnapshot {
+    CapabilityState lora;
+    CapabilityState gps;
+    CapabilityState ble;
+    TimeSyncStatus time;
+    uint32_t version;
+};
+
+struct ChatListSnapshot {
+    ConversationRow rows[32];
+    size_t count = 0;
+    uint32_t selected_index = 0;
+    uint32_t version = 0;
+};
+```
+
+AppService 生成 snapshot：
+
+```cpp
+class ChatProjectionService {
+public:
+    ChatListSnapshot buildChatListSnapshot() const;
+};
+```
+
+目的：
+
+```text
+LVGL / GTK / ASCII 都渲染快照，不持有业务内部引用。
+```
+
+------
+
+## 8.5 ISR 规则
+
+ISR 只做 defer。
+
+```cpp
+void IRAM_ATTR radioDio1Isr() {
+    radio_irq_queue.postFromIsr(RadioIrqEvent::Dio1);
+}
+```
+
+禁止：
+
+```text
+ISR 内：
+- protobuf decode
+- packet decrypt
+- storage write
+- BLE notify
+- UI update
+- DirectMessageService
+```
+
+------
+
+## 8.6 UI Thread Only
+
+### LVGL
+
+```cpp
+void UiRuntime::tick() {
+    UiCommand cmd;
+    while (ui_queue_.poll(cmd)) {
+        lvgl_renderer_.apply(cmd);
+    }
+
+    lv_timer_handler();
+}
+```
+
+所有 `lv_obj_*` 只在 UI runtime。
+
+### GTK
+
+```cpp
+void GtkShell::onAppSnapshot(DeviceStatusSnapshot snapshot) {
+    g_main_context_invoke(nullptr, [](gpointer data) {
+        auto* self = static_cast<GtkShell*>(data);
+        self->renderOnGtkThread();
+        return G_SOURCE_REMOVE;
+    }, this);
+}
+```
+
+### ASCII
+
+```cpp
+void AsciiShell::render(const AppSnapshot& snapshot) {
+    canvas_.clear();
+    renderer_.draw(snapshot, canvas_);
+    canvas_.flushSingleWriter();
+}
+```
+
+目的：
+
+```text
+每种 UI 技术栈都有自己的线程/循环约束，但业务层不需要知道。
+```
+
+------
+
+# 9. Config Core：多入口统一配置
+
+配置会从这些入口修改：
+
+```text
+LVGL Settings
+GTK Settings
+ASCII/CLI
+Meshtastic BLE Admin
+MeshCore BLE Command
+HostLink
+配置文件
+```
+
+如果各自直接写存储，必然漂移。
+
+## 9.1 使用模式：Schema + Patch + Validator
+
+```cpp
+struct ConfigPatch {
+    Optional<MeshProtocolKind> mesh_protocol;
+    Optional<RegionCode> region;
+    Optional<ModemPreset> modem_preset;
+    Optional<uint32_t> screen_timeout_sec;
+    Optional<bool> gps_enabled;
+};
+
+class ConfigValidator {
+public:
+    ConfigValidationResult validate(
+        const AppConfig& current,
+        const ConfigPatch& patch,
+        const TargetCapabilitySnapshot& target
+    );
+};
+```
+
+ConfigService：
+
+```cpp
+class ConfigService {
+public:
+    ConfigResult applyPatch(const ConfigPatch& patch) {
+        auto validation = validator_.validate(current_, patch, target_);
+        if (!validation.ok) {
+            return ConfigResult::fail(validation.failure);
+        }
+
+        AppConfig next = current_;
+        patch.applyTo(next);
+
+        auto store_result = store_.save(next);
+        if (!store_result.ok) {
+            return ConfigResult::storeFailed(store_result.failure);
+        }
+
+        current_ = next;
+        events_.emit(AppEvent::configChanged());
+        return ConfigResult::ok();
+    }
+
+private:
+    AppConfig current_;
+    IConfigStore& store_;
+    ConfigValidator& validator_;
+    IAppEventSink& events_;
+    TargetCapabilitySnapshot target_;
+};
+```
+
+目的：
+
+```text
+所有入口都走同一个 ConfigService。
+Meshtastic BLE Admin 不直接改 NVS。
+GTK Settings 不直接改 SQLite。
+HostLink 不直接改 AppContext 内部字段。
+```
+
+------
+
+# 10. Device Core：能力状态聚合
+
+BLE/HostLink/UI 都需要设备状态。不能各自拼。
+
+## 10.1 使用模式：Facade + Projection
+
+```cpp
+class DeviceStatusService {
+public:
+    DeviceStatusSnapshot snapshot() const {
+        DeviceStatusSnapshot out;
+        out.lora = radio_monitor_.state();
+        out.gps = location_monitor_.state();
+        out.ble = ble_monitor_.state();
+        out.time = time_authority_.syncStatus();
+        out.battery = power_monitor_.snapshot();
+        return out;
+    }
+
+private:
+    IRadioMonitor& radio_monitor_;
+    ILocationMonitor& location_monitor_;
+    IBleMonitor& ble_monitor_;
+    ITimeAuthority& time_authority_;
+    IPowerMonitor& power_monitor_;
+};
+```
+
+目的：
+
+```text
+MeshtasticPhoneCore、MeshCorePhoneCore、HostLink、LVGL、GTK、ASCII 都消费同一份 DeviceStatusSnapshot。
+```
+
+------
+
+# 11. BLE 架构：Transport Host + Phone Core
+
+这是必须拆清楚的一块。
+
+## 11.1 BLE Host
+
+```cpp
+class MeshtasticBleHost {
+public:
+    void start() {
+        ble_.registerService(makeMeshtasticServiceDefinition());
+        ble_.startAdvertising(makeAdvertisement());
+    }
+
+    void onToRadioWrite(ByteView bytes) {
+        phone_input_queue_.post(PhoneInputEvent::meshtastic(bytes));
+    }
+
+    void notifyFromRadio(ByteView bytes) {
+        ble_.notify(from_radio_char_, bytes);
+    }
+
+private:
+    IBleGattHost& ble_;
+    IPhoneInputQueue& phone_input_queue_;
+};
+```
+
+BLE Host 只做：
+
+```text
+advertising
+service
+characteristic
+write callback
+notify
+connection
+MTU/chunking
+```
+
+------
+
+## 11.2 MeshtasticPhoneCore
+
+```cpp
+class MeshtasticPhoneCore {
+public:
+    PhoneProcessResult handleToRadio(ByteView bytes) {
+        MeshtasticToRadio msg;
+        auto decode = codec_.decodeToRadio(bytes, msg);
+        if (!decode.ok) {
+            return PhoneProcessResult::protocolError();
+        }
+
+        AppCommand command;
+        auto mapped = mapper_.toAppCommand(msg, command);
+        if (mapped.ok) {
+            app_commands_.post(command);
+        }
+
+        return buildResponses(msg);
+    }
+
+    bool nextNotification(MeshtasticFromRadio& out);
+
+private:
+    MeshtasticPhoneCodec codec_;
+    MeshtasticPhoneCommandMapper mapper_;
+    IPhoneAppFacade& app_;
+    IAppCommandSink& app_commands_;
+};
+```
+
+目的：
+
+```text
+Meshtastic phone API 语义在 shared core。
+ESP32/nRF52 BLE 文件只负责 BLE transport。
+```
+
+------
+
+## 11.3 MeshCorePhoneCore
+
+```cpp
+class MeshCorePhoneCore {
+public:
+    PhoneProcessResult handleFrame(ByteView bytes) {
+        MeshCorePhoneCommand cmd;
+        auto decoded = codec_.decode(bytes, cmd);
+        if (!decoded.ok) {
+            return PhoneProcessResult::protocolError();
+        }
+
+        return dispatcher_.dispatch(cmd);
+    }
+
+private:
+    MeshCorePhoneCodec codec_;
+    MeshCorePhoneCommandDispatcher dispatcher_;
+    IMeshCorePhoneFacade& app_;
+};
+```
+
+目的：
+
+```text
+MeshCore BLE/NUS 命令解释在 shared core。
+BLE host 不拼 contact/status/device info。
+```
+
+------
+
+# 12. GPS 架构：ByteStream + Parser + LocationService + TimeAuthority
+
+## 12.1 GnssByteStream
+
+平台相关：
+
+```cpp
+class EspUartGnssByteStream final : public IGnssByteStream {
+    IoResult read(uint8_t* out, size_t cap, size_t& len) override;
+};
+```
+
+Linux：
+
+```cpp
+class LinuxSerialGnssByteStream final : public IGnssByteStream {
+    ...
+};
+```
+
+nRF52：
+
+```cpp
+class Nrf52UartGnssByteStream final : public IGnssByteStream {
+    ...
+};
+```
+
+------
+
+## 12.2 NMEA Parser
+
+共享：
+
+```cpp
+class NmeaParser {
+public:
+    NmeaParseResult feed(ByteView bytes);
+    bool latestFix(LocationFix& out) const;
+    bool latestTime(TimeSyncFact& out) const;
+};
+```
+
+------
+
+## 12.3 LocationService
+
+```cpp
+class LocationService {
+public:
+    void onGnssBytes(ByteView bytes) {
+        auto result = parser_.feed(bytes);
+
+        LocationFix fix;
+        if (parser_.latestFix(fix)) {
+            auto filtered = jitter_filter_.apply(fix);
+            latest_ = filtered;
+            events_.emit(AppEvent::locationUpdated());
+        }
+
+        TimeSyncFact time;
+        if (parser_.latestTime(time)) {
+            time_authority_.observe(time);
+        }
+    }
+
+    bool latest(LocationFix& out) const {
+        if (!latest_.valid) return false;
+        out = latest_;
+        return true;
+    }
+
+private:
+    NmeaParser parser_;
+    GpsJitterFilter jitter_filter_;
+    ITimeAuthorityUpdater& time_authority_;
+    IAppEventSink& events_;
+    LocationFix latest_;
+};
+```
+
+目的：
+
+```text
+BLE / Mesh / HostLink / UI 不再直接读 GPS driver。
+```
+
+------
+
+# 13. UI 架构：Presentation Model + Renderer
+
+## 13.1 AppService 不知道 UI
+
+```cpp
+class ChatService {
+public:
+    SendResult sendMessage(...);
+    void onMessageReceived(...);
+    ChatListSnapshot buildListSnapshot(...);
+};
+```
+
+不要出现：
+
+```cpp
+lv_obj_t*
+GtkWidget*
+printf
+```
+
+------
+
+## 13.2 Presentation Model
+
+```cpp
+class ChatWorkspaceModel {
+public:
+    ChatWorkspaceSnapshot snapshot() const {
+        ChatWorkspaceSnapshot out;
+        out.conversations = chat_.buildConversationRows();
+        out.active_thread = chat_.buildActiveThread();
+        out.device_status = device_.snapshot();
+        return out;
+    }
+
+    CommandResult sendMessage(const UiSendMessageAction& action) {
+        AppCommand cmd = AppCommand::sendDirect(action.peer, action.text);
+        return commands_.post(cmd);
+    }
+
+    void selectConversation(domain::NodeId peer) {
+        selected_peer_ = peer;
+    }
+
+private:
+    ChatService& chat_;
+    DeviceStatusService& device_;
+    IAppCommandSink& commands_;
+    domain::NodeId selected_peer_;
+};
+```
+
+目的：
+
+```text
+LVGL / ASCII / GTK 都可以消费 ChatWorkspaceModel，
+但不共享布局实现。
+```
+
+------
+
+## 13.3 LVGL Renderer
+
+```cpp
+class LvglChatRenderer {
+public:
+    void render(const ChatWorkspaceSnapshot& snapshot) {
+        // only lv_obj_* operations here
+    }
+
+    void onButtonSendClicked() {
+        UiSendMessageAction action;
+        action.peer = selectedPeerFromUi();
+        action.text = readTextInput();
+        model_.sendMessage(action);
+    }
+
+private:
+    ChatWorkspaceModel& model_;
+};
+```
+
+------
+
+## 13.4 ASCII Renderer
+
+```cpp
+class AsciiChatRenderer {
+public:
+    void render(const ChatWorkspaceSnapshot& snapshot, AsciiCanvas& canvas) {
+        canvas.drawBox(0, 0, 30, 20);
+        canvas.drawText(1, 1, "Conversations");
+
+        for (size_t i = 0; i < snapshot.conversations.count; ++i) {
+            canvas.drawText(1, 2 + i, snapshot.conversations.rows[i].title.c_str());
+        }
+    }
+
+private:
+    ChatWorkspaceModel& model_;
+};
+```
+
+------
+
+## 13.5 GTK Renderer
+
+```cpp
+class GtkChatWorkspace {
+public:
+    void applySnapshot(const ChatWorkspaceSnapshot& snapshot) {
+        // must run on GTK main loop
+        updateConversationList(snapshot.conversations);
+        updateTranscript(snapshot.active_thread);
+        updateInspector(snapshot.device_status);
+    }
+
+private:
+    ChatWorkspaceModel& model_;
+};
+```
+
+目的：
+
+```text
+UI 技术栈之间复用 presentation model，不复用 widget/page。
+```
+
+------
+
+# 14. App Composition Root：依赖注入
+
+最终每个 app 只做组装。
+
+## 14.1 ESP32 T-Pager LVGL
+
+```cpp
+class EspTPagerComposition {
+public:
+    void build() {
+        board_ = makeUnique<TLoraPagerBoard>();
+
+        EspCapabilityFactory factory(*board_);
+
+        radio_ = factory.createPacketRadio();
+        gnss_ = factory.createGnssByteStream();
+        ble_ = factory.createBleGattHost();
+        display_ = factory.createDisplayHost();
+
+        identity_store_ = makeUnique<EspNvsLocalIdentityStore>();
+        peer_key_store_ = makeUnique<EspNvsPeerKeyStore>();
+        message_store_ = makeUnique<EspMessageStore>();
+
+        protocol_ = makeUnique<MeshtasticProtocolStrategy>();
+
+        identity_service_ = makeUnique<PeerIdentityService>(
+            *identity_store_,
+            *peer_key_store_,
+            random_,
+            clock_
+        );
+
+        direct_message_ = makeUnique<DirectMessageService>(
+            *protocol_,
+            *identity_service_,
+            *radio_,
+            clock_,
+            app_events_
+        );
+
+        chat_model_ = makeUnique<ChatWorkspaceModel>(
+            chat_service_,
+            device_status_,
+            app_commands_
+        );
+
+        shell_ = makeUnique<LvglShell>(*chat_model_, ...);
+    }
+};
+```
+
+## 14.2 Linux uConsole GTK
+
+```cpp
+class LinuxUConsoleGtkComposition {
+public:
+    void build() {
+        board_ = makeUnique<UConsoleAio2Board>();
+
+        LinuxCapabilityFactory factory(*board_);
+
+        radio_ = factory.createPacketRadio();
+        gnss_ = factory.createGnssByteStream();
+
+        identity_store_ = makeUnique<SqliteLocalIdentityStore>(db_);
+        peer_key_store_ = makeUnique<SqlitePeerKeyStore>(db_);
+        message_store_ = makeUnique<SqliteMessageStore>(db_);
+
+        protocol_ = makeUnique<MeshtasticProtocolStrategy>();
+
+        identity_service_ = makeUnique<PeerIdentityService>(
+            *identity_store_,
+            *peer_key_store_,
+            random_,
+            clock_
+        );
+
+        direct_message_ = makeUnique<DirectMessageService>(
+            *protocol_,
+            *identity_service_,
+            *radio_,
+            clock_,
+            app_events_
+        );
+
+        chat_model_ = makeUnique<ChatWorkspaceModel>(
+            chat_service_,
+            device_status_,
+            app_commands_
+        );
+
+        shell_ = makeUnique<GtkShell>(*chat_model_, ...);
+    }
+};
+```
+
+业务对象相同。
+替换的是 adapter、store、runtime、renderer。
+
+------
+
+# 15. 自证方式：这套架构如何证明自己正确
+
+这点很重要。架构不能只靠解释，要能被测试证明。
+
+## 15.1 Contract Test
+
+每个 port 都有 contract test。
+
+```cpp
+void runPeerKeyStoreContract(IPeerKeyStore& store) {
+    PeerPublicKey key = makeTestKey();
+
+    REQUIRE(store.put(key).ok());
+
+    PeerPublicKey loaded;
+    REQUIRE(store.get(key.node_id, loaded).ok());
+    REQUIRE(loaded == key);
+
+    REQUIRE(store.remove(key.node_id).ok());
+    REQUIRE(store.get(key.node_id, loaded).isNotFound());
+}
+```
+
+同一测试跑：
+
+```text
+FakePeerKeyStore
+EspNvsPeerKeyStore
+Nrf52FlashPeerKeyStore
+SqlitePeerKeyStore
+```
+
+如果都通过，说明业务层真的不关心存储后端。
+
+------
+
+## 15.2 UseCase Behavior Test
+
+```cpp
+TEST("DirectMessageService sends via any packet radio") {
+    FakePeerKeyStore keys;
+    FakeLocalIdentityStore identity;
+    FakePacketRadio radio;
+    FakeClock clock;
+
+    MeshtasticProtocolStrategy protocol;
+    PeerIdentityService peer_identity(identity, keys, random, clock);
+    DirectMessageService service(protocol, peer_identity, radio, clock, events);
+
+    keys.put(makePeerKey());
+    identity.save(makeLocalIdentity());
+
+    auto result = service.sendDirect(makeDirectMessage());
+
+    REQUIRE(result.ok);
+    REQUIRE(radio.sentPacketCount() == 1);
+}
+```
+
+这个测试不需要 ESP32，不需要 Linux，不需要 nRF52。
+说明业务核心可独立运行。
+
+------
+
+## 15.3 Renderer Test
+
+同一个 snapshot：
+
+```cpp
+ChatWorkspaceSnapshot snapshot = makeChatSnapshot();
+```
+
+分别测试：
+
+```text
+LvglChatRenderer 不改业务
+AsciiChatRenderer 输出稳定文本
+GtkChatWorkspace 只更新 widget model
+```
+
+目的：
+
+```text
+UI 渲染不拥有业务状态。
+```
+
+------
+
+## 15.4 Race Test
+
+用 fake runtime 模拟事件顺序：
+
+```text
+BLE write
+Radio RX
+GPS fix
+Config patch
+UI refresh
+```
+
+验证：
+
+```text
+不会直接跨线程改 service
+所有变化通过 queue/snapshot
+```
+
+------
+
+# 16. 最终依赖方向
+
+必须始终满足：
+
+```text
+Renderer
+  -> PresentationModel
+    -> AppService
+      -> UseCase
+        -> Domain
+        -> Ports
+          <- PlatformAdapter
+```
+
+Board 只被 Factory / CompositionRoot 使用：
+
+```text
+CompositionRoot
+  -> BoardPackage
+  -> PlatformFactory
+```
+
+协议：
+
+```text
+UseCase
+  -> ProtocolStrategy
+    -> Codec / CryptoFlow / Mapper
+```
+
+BLE：
+
+```text
+BleHost
+  -> PhoneCore
+    -> AppFacade / AppCommandSink
+```
+
+GPS：
+
+```text
+GnssDriver
+  -> GnssParser
+    -> LocationService
+      -> TimeAuthority / AppEvent
+```
+
+UI：
+
+```text
+AppService
+  -> Snapshot
+    -> PresentationModel
+      -> Renderer
+```
+
+------
+
+# 17. 架构核心模式总结
+
+最后把模式和目的再压缩一下。
+
+| 模式                      | 用在哪里                      | 解决什么                        |
+| ------------------------- | ----------------------------- | ------------------------------- |
+| Hexagonal Architecture    | 整体结构                      | 业务和平台分离                  |
+| Ports and Adapters        | Capability 接口               | ESP32/nRF52/Linux 替换实现      |
+| Repository                | Store                         | NVS/Flash/SQLite 统一           |
+| Strategy                  | Meshtastic/MeshCore           | 协议切换                        |
+| Codec                     | 协议编解码                    | 协议字节和业务分离              |
+| Mapper                    | 外部协议 ↔ 内部命令           | 防止 ToRadio/FromRadio 污染业务 |
+| Application Service       | UseCase                       | 稳定业务唯一实现                |
+| Command Handler           | UI/BLE/HostLink 输入          | 多入口统一动作                  |
+| State Machine             | Mesh/BLE/GPS/HostLink session | 状态显式化                      |
+| Facade                    | Phone/App/DeviceStatus        | 降低跨模块耦合                  |
+| Adapter                   | 平台驱动                      | 包装 SDK/API                    |
+| Proxy                     | Linux+nRF52 endpoint          | 远端能力本地化                  |
+| Null Object               | 不支持能力                    | 消除 null 分支                  |
+| Abstract Factory          | Board → Driver                | 板级变体隔离                    |
+| Active Object             | Runtime context               | 消解竞态                        |
+| Event Queue               | 异步事件                      | 跨线程安全                      |
+| Command Queue             | 用户/协议命令                 | 多入口统一                      |
+| Immutable Snapshot        | UI 状态                       | 防止 UI 读 mutable service      |
+| MVVM / Presentation Model | UI 复用                       | LVGL/ASCII/GTK 分离             |
+| Renderer                  | UI 绘制                       | 技术栈隔离                      |
+| Composition Root          | apps                          | 集中依赖注入                    |
+| ------------------------- | ----------------------------- | ------------------------------- |
diff --git a/docs/targets/README.md b/docs/targets/README.md
new file mode 100644
index 00000000..24bf1752
--- /dev/null
+++ b/docs/targets/README.md
@@ -0,0 +1,41 @@
+# Target Profiles
+
+`docs/targets/` records product target selections.
+
+Target profiles are documentation baselines in Phase 8.3. They do not generate
+build configuration, create runtime objects, select board pins, or implement UX
+packs.
+
+Core rule:
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+Target profile documents may describe:
+
+- target name
+- board
+- platform family
+- build entrypoint
+- app shell
+- UX profile placeholder
+- status
+
+They must not:
+
+- define board facts
+- own build host files
+- create runtime object graphs
+- implement screen internals
+- replace existing capabilities YAML files
+
+Phase 8.3 target profile baselines:
+
+- `esp32_lvgl_targets.md`
+- `nrf52_node_targets.md`
+- `linux_targets.md`
diff --git a/docs/targets/TARGET_MANIFEST_TEMPLATE.yaml b/docs/targets/TARGET_MANIFEST_TEMPLATE.yaml
new file mode 100644
index 00000000..5635f6ef
--- /dev/null
+++ b/docs/targets/TARGET_MANIFEST_TEMPLATE.yaml
@@ -0,0 +1,146 @@
+target: "esp-t-lora-pager-lvgl"
+status: "draft"
+
+product:
+  family: "trail-mate"
+  form_factor: "handheld"
+  interaction_class: "embedded_lvgl"
+
+platform:
+  kind: "esp32"
+  sdk: "arduino_esp32"
+  memory_tier: "small"
+  filesystem: "sd"
+  dynamic_allocation: "limited"
+
+board:
+  id: "t_lora_pager"
+  package: "boards/tlora_pager"
+
+runtime:
+  scheduler: "freertos"
+  ui_thread: "main_task"
+  radio_thread: "radio_task"
+  gps_thread: "gps_task"
+  ble_thread: "stack_callback"
+  isr_policy: "defer_to_queue"
+  lock_policy: "message_passing"
+
+ui:
+  shell: "lvgl"
+  renderer: "lvgl"
+  presentation_model_host: "esp32"
+  layout_profile: "compact_handheld"
+  input_model: "buttons"
+
+execution:
+  app_host: "esp32"
+  mesh_core_host: "esp32"
+  gps_core_host: "esp32"
+  phone_core_host: "esp32"
+  hostlink_core_host: "esp32"
+  ui_host: "esp32"
+
+authorities:
+  identity: "esp32"
+  peer_key_store: "esp32"
+  node_store: "esp32"
+  message_store: "esp32"
+  location: "esp32"
+  time: "esp32"
+  config: "esp32"
+  device_status: "esp32"
+  ui_state: "esp32"
+
+capabilities:
+  lora:
+    state: "ready"
+    endpoint_host: "esp32"
+    mode: "local_radio"
+  gps:
+    state: "ready"
+    endpoint_host: "esp32"
+    mode: "local_uart"
+  ble:
+    state: "ready"
+    endpoint_host: "esp32"
+    stack: "nimble"
+    roles:
+      meshtastic_phone: "server"
+      meshcore_phone: "server"
+      trailmate_control: "server"
+  storage:
+    state: "ready"
+    endpoint_host: "esp32"
+  display:
+    state: "ready"
+    endpoint_host: "esp32"
+  input:
+    state: "ready"
+    endpoint_host: "esp32"
+  battery:
+    state: "ready"
+    endpoint_host: "esp32"
+
+capability_bindings:
+  lora:
+    board_provider: "t_lora_pager.radio"
+    platform_driver: "esp_sx1262_packet_radio"
+    runtime_owner: "radio_task"
+    protocol_consumers: ["core_mesh.meshtastic", "core_mesh.meshcore"]
+  gps:
+    board_provider: "t_lora_pager.gps"
+    platform_driver: "esp_uart_gnss"
+    runtime_owner: "gps_task"
+    protocol_consumers: ["core_gps.nmea", "core_gps.location_service", "core_gps.time_authority"]
+  ble:
+    board_provider: "esp32.integrated_ble"
+    platform_driver: "nimble_gatt_host"
+    runtime_owner: "stack_callback"
+    protocol_consumers: ["core_phone.meshtastic", "core_phone.meshcore"]
+
+protocols:
+  meshtastic:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "core_phone"
+  meshcore:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "core_phone"
+  hostlink:
+    enabled: true
+    frame_core: "shared_core"
+
+storage:
+  backend: "esp_nvs_and_sd"
+  identity: "esp_nvs"
+  peer_keys: "esp_nvs"
+  config: "esp_nvs"
+  messages: "sd_or_flash"
+  node_store: "sd_or_flash"
+
+race_policy:
+  app_to_ui: "snapshot"
+  radio_to_app: "event_queue"
+  gps_to_app: "event_queue"
+  ble_to_app: "command_queue"
+  isr_to_driver: "defer_only"
+  store_access: "single_owner_or_mutex"
+  ui_update: "ui_thread_only"
+
+build:
+  app: "legacy/app_implementations/esp_pio"
+  board_package: "boards/tlora_pager"
+  enabled_modules:
+    - "core_chat"
+    - "core_device"
+    - "core_gps"
+    - "core_hostlink"
+    - "core_phone"
+    - "core_mesh"
+    - "ui_presentation"
+    - "core_sys"
+    - "core_team"
+    - "ui_shared"
+  disabled_modules: []
diff --git a/docs/targets/TARGET_MATRIX.md b/docs/targets/TARGET_MATRIX.md
new file mode 100644
index 00000000..95c550f3
--- /dev/null
+++ b/docs/targets/TARGET_MATRIX.md
@@ -0,0 +1,37 @@
+# Target Matrix
+
+This matrix records Batch 3 final target architecture ownership. It separates
+final target intent from the currently executable fallback paths already present
+in this repository.
+
+No missing target defaults, widget trees, or hardware facts are invented here.
+Rows marked `PendingHardwareValidation` have final owners assigned, but still
+need build or hardware evidence before they can be called complete product
+routes.
+
+| target_id | board_id | build_entrypoint | app_shell | platform | renderer | ux_pack_id | active_ux_pack | ui_profile_id | page_manifest_id | layout_profile_id | support_status | known_fallback | owner |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| `tab5` | `tab5` | `builds/esp_idf` | `apps/esp32_lvgl` | ESP-IDF | LVGL | `tab5_touch` | `compatibility` | `tab5_touch_ui` | `tab5_touch_manifest` | `tab5_large_touch` | `ActiveWithFallback` | current executable UX pack is `compatibility` | `apps/esp32_lvgl + builds/esp_idf + boards/tab5` |
+| `tdisplayp4_tft` | `tdisplayp4` | `builds/esp_idf` | `apps/esp32_lvgl` | ESP-IDF | LVGL | `tdisplayp4_touch` | `compatibility` | `tdisplayp4_touch_ui` | `tdisplayp4_touch_manifest` | `tdisplayp4_touch` | `ActiveWithFallback` | current executable UX pack is `compatibility` | `apps/esp32_lvgl + builds/esp_idf + boards/tdisplayp4` |
+| `tdisplayp4_amoled` | `tdisplayp4` | `builds/esp_idf` | `apps/esp32_lvgl` | ESP-IDF | LVGL | `tdisplayp4_touch` | `compatibility` | `tdisplayp4_touch_ui` | `tdisplayp4_touch_manifest` | `tdisplayp4_touch` | `ActiveWithFallback` | current executable UX pack is `compatibility` | `apps/esp32_lvgl + builds/esp_idf + boards/tdisplayp4` |
+| `tlora_pager` | `tlora_pager` | `builds/esp_idf` | `apps/esp32_lvgl` | ESP-IDF | LVGL | `pager_compact` | `compatibility` | `pager_compact_ui` | `pager_compact_manifest` | `pager_compact` | `PendingHardwareValidation` | existing target capability still records Arduino/PIO evidence | `apps/esp32_lvgl + builds/esp_idf + boards/tlora_pager` |
+| `tdeck` | `tdeck` | `builds/esp_idf` | `apps/esp32_lvgl` | ESP-IDF | LVGL | `deck_full` | `compatibility` | `deck_wide_ui` | `deck_full_manifest` | `deck_wide` | `PendingHardwareValidation` | existing target capability still records Arduino/PIO evidence | `apps/esp32_lvgl + builds/esp_idf + boards/tdeck` |
+| `twatch` | `twatch` | `builds/esp_idf` | `apps/esp32_lvgl` | ESP-IDF | LVGL | `watch_compact` | `compatibility` | `watch_compact_ui` | `watch_compact_manifest` | `watch_compact` | `PendingHardwareValidation` | current repo evidence is board and variant data, not migrated IDF defaults | `apps/esp32_lvgl + builds/esp_idf + boards/twatch` |
+| `uconsole` | `uconsole` | `builds/linux_cmake` | `apps/linux_uconsole_gtk` | Linux | GTK | `uconsole_desktop` | `uconsole_desktop` | `uconsole_desktop_ui` | `uconsole_desktop_manifest` | `uconsole_desktop` | `Active` | none for UX pack selection | `apps/linux_uconsole_gtk + builds/linux_cmake + boards/uconsole` |
+| `cardputerzero` | `cardputerzero` | `builds/linux_cmake` | `apps/linux_sim_shell` | Linux | ASCII | `cardputer_compact` | `simulator_full` | `cardputer_compact_ui` | `cardputer_compact_manifest` | `cardputer_compact` | `ActiveWithFallback` | dedicated Linux device shell remains deferred by current repo evidence | `apps/linux_sim_shell + builds/linux_cmake + boards/cardputerzero` |
+| `gat562_mesh_evb_pro` | `gat562_mesh_evb_pro` | `builds/pio_nrf52` | `apps/nrf52_node` | PlatformIO | Headless | `node_headless` | `tiny_node_status` | `node_headless_ui` | `node_headless_manifest` | `headless_node` | `Headless` | current executable UX pack is `tiny_node_status`; board hardware still records a 128 x 64 display | `apps/nrf52_node + builds/pio_nrf52 + boards/gat562_mesh_evb_pro` |
+
+## Pending Evidence
+
+| target_id | pending evidence | Final owner |
+| --- | --- | --- |
+| `tlora_pager` | ESP-IDF target defaults and hardware validation for the requested IDF route | `builds/esp_idf + boards/tlora_pager` |
+| `tdeck` | ESP-IDF target defaults and hardware validation for the requested IDF route | `builds/esp_idf + boards/tdeck` |
+| `twatch` | ESP-IDF target defaults and hardware validation for the requested IDF route | `builds/esp_idf + boards/twatch` |
+| `cardputerzero` | final dedicated Linux device app shell decision; current repo evidence points to Linux CMake plus simulator fallback | `apps/linux_sim_shell` until a proven dedicated shell exists |
+
+## Batch 2 Status Tokens
+
+The former Batch 2 statuses `migrated_foundation` and
+`pending_final_profile` are historical labels. Batch 3 replaces them with
+`Active`, `ActiveWithFallback`, `PendingHardwareValidation`, and `Headless`.
diff --git a/docs/targets/esp-t-deck-lvgl.capabilities.yaml b/docs/targets/esp-t-deck-lvgl.capabilities.yaml
new file mode 100644
index 00000000..e3ac6656
--- /dev/null
+++ b/docs/targets/esp-t-deck-lvgl.capabilities.yaml
@@ -0,0 +1,138 @@
+target: "esp-t-deck-lvgl"
+status: "draft"
+
+product:
+  family: "trail-mate"
+  form_factor: "keyboard_handheld"
+  interaction_class: "embedded_lvgl"
+
+platform:
+  kind: "esp32"
+  sdk: "arduino_esp32"
+  memory_tier: "small"
+  filesystem: "sd"
+  dynamic_allocation: "limited"
+
+board:
+  id: "t_deck"
+  package: "boards/tdeck"
+
+runtime:
+  scheduler: "freertos"
+  ui_thread: "main_task"
+  radio_thread: "radio_task"
+  gps_thread: "gps_task"
+  ble_thread: "stack_callback"
+  isr_policy: "defer_to_queue"
+  lock_policy: "message_passing"
+
+ui:
+  shell: "lvgl"
+  renderer: "lvgl"
+  presentation_model_host: "esp32"
+  layout_profile: "compact_keyboard_handheld"
+  input_model: "keyboard_touch_trackball"
+
+execution:
+  app_host: "esp32"
+  mesh_core_host: "esp32"
+  gps_core_host: "esp32"
+  phone_core_host: "esp32"
+  hostlink_core_host: "esp32"
+  ui_host: "esp32"
+
+authorities:
+  identity: "esp32"
+  peer_key_store: "esp32"
+  node_store: "esp32"
+  message_store: "esp32"
+  location: "esp32"
+  time: "esp32"
+  config: "esp32"
+  device_status: "esp32"
+  ui_state: "esp32"
+
+capabilities:
+  lora:
+    state: "ready"
+    endpoint_host: "esp32"
+    mode: "local_radio"
+  gps:
+    state: "ready"
+    endpoint_host: "esp32"
+    mode: "local_uart"
+  ble:
+    state: "ready"
+    endpoint_host: "esp32"
+    stack: "nimble"
+    roles:
+      meshtastic_phone: "server"
+      meshcore_phone: "server"
+      trailmate_control: "server"
+  storage:
+    state: "ready"
+    endpoint_host: "esp32"
+  display:
+    state: "ready"
+    endpoint_host: "esp32"
+  input:
+    state: "ready"
+    endpoint_host: "esp32"
+  battery:
+    state: "ready"
+    endpoint_host: "esp32"
+
+capability_bindings:
+  lora:
+    board_provider: "t_deck.radio"
+    platform_driver: "esp_radiolib_sx1262_packet_radio"
+    runtime_owner: "radio_task"
+    protocol_consumers: ["core_mesh.meshtastic", "core_mesh.meshcore"]
+  gps:
+    board_provider: "t_deck.gps"
+    platform_driver: "esp_uart_gnss"
+    runtime_owner: "gps_task"
+    protocol_consumers: ["core_gps.nmea", "core_gps.location_service", "core_gps.time_authority"]
+  ble:
+    board_provider: "esp32.integrated_ble"
+    platform_driver: "nimble_gatt_host"
+    runtime_owner: "stack_callback"
+    protocol_consumers: ["core_phone.meshtastic", "core_phone.meshcore"]
+
+protocols:
+  meshtastic:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "core_phone"
+  meshcore:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "core_phone"
+  hostlink:
+    enabled: true
+    frame_core: "shared_core"
+
+storage:
+  backend: "esp_nvs_and_sd"
+  identity: "esp_nvs"
+  peer_keys: "esp_nvs"
+  config: "esp_nvs"
+  messages: "sd_or_flash"
+  node_store: "sd_or_flash"
+
+race_policy:
+  app_to_ui: "snapshot"
+  radio_to_app: "event_queue"
+  gps_to_app: "event_queue"
+  ble_to_app: "command_queue"
+  isr_to_driver: "defer_only"
+  store_access: "single_owner_or_mutex"
+  ui_update: "ui_thread_only"
+
+build:
+  app: "legacy/app_implementations/esp_pio"
+  board_package: "boards/tdeck"
+  platformio_envs: ["tdeck", "tdeck_debug"]
+  enabled_modules: ["core_chat", "core_device", "core_gps", "core_hostlink", "core_phone", "core_mesh", "ui_presentation", "core_sys", "core_team", "ui_shared"]
+  disabled_modules: []
+
diff --git a/docs/targets/esp-t-lora-pager-lvgl.capabilities.yaml b/docs/targets/esp-t-lora-pager-lvgl.capabilities.yaml
new file mode 100644
index 00000000..73413d3e
--- /dev/null
+++ b/docs/targets/esp-t-lora-pager-lvgl.capabilities.yaml
@@ -0,0 +1,138 @@
+target: "esp-t-lora-pager-lvgl"
+status: "draft"
+
+product:
+  family: "trail-mate"
+  form_factor: "handheld"
+  interaction_class: "embedded_lvgl"
+
+platform:
+  kind: "esp32"
+  sdk: "arduino_esp32"
+  memory_tier: "small"
+  filesystem: "sd"
+  dynamic_allocation: "limited"
+
+board:
+  id: "t_lora_pager"
+  package: "boards/tlora_pager"
+
+runtime:
+  scheduler: "freertos"
+  ui_thread: "main_task"
+  radio_thread: "radio_task"
+  gps_thread: "gps_task"
+  ble_thread: "stack_callback"
+  isr_policy: "defer_to_queue"
+  lock_policy: "message_passing"
+
+ui:
+  shell: "lvgl"
+  renderer: "lvgl"
+  presentation_model_host: "esp32"
+  layout_profile: "compact_handheld"
+  input_model: "buttons_keyboard_rotary"
+
+execution:
+  app_host: "esp32"
+  mesh_core_host: "esp32"
+  gps_core_host: "esp32"
+  phone_core_host: "esp32"
+  hostlink_core_host: "esp32"
+  ui_host: "esp32"
+
+authorities:
+  identity: "esp32"
+  peer_key_store: "esp32"
+  node_store: "esp32"
+  message_store: "esp32"
+  location: "esp32"
+  time: "esp32"
+  config: "esp32"
+  device_status: "esp32"
+  ui_state: "esp32"
+
+capabilities:
+  lora:
+    state: "ready"
+    endpoint_host: "esp32"
+    mode: "local_radio"
+  gps:
+    state: "ready"
+    endpoint_host: "esp32"
+    mode: "local_uart"
+  ble:
+    state: "ready"
+    endpoint_host: "esp32"
+    stack: "nimble"
+    roles:
+      meshtastic_phone: "server"
+      meshcore_phone: "server"
+      trailmate_control: "server"
+  storage:
+    state: "ready"
+    endpoint_host: "esp32"
+  display:
+    state: "ready"
+    endpoint_host: "esp32"
+  input:
+    state: "ready"
+    endpoint_host: "esp32"
+  battery:
+    state: "ready"
+    endpoint_host: "esp32"
+
+capability_bindings:
+  lora:
+    board_provider: "t_lora_pager.radio"
+    platform_driver: "esp_radiolib_sx1262_packet_radio"
+    runtime_owner: "radio_task"
+    protocol_consumers: ["core_mesh.meshtastic", "core_mesh.meshcore"]
+  gps:
+    board_provider: "t_lora_pager.gps"
+    platform_driver: "esp_uart_gnss"
+    runtime_owner: "gps_task"
+    protocol_consumers: ["core_gps.nmea", "core_gps.location_service", "core_gps.time_authority"]
+  ble:
+    board_provider: "esp32.integrated_ble"
+    platform_driver: "nimble_gatt_host"
+    runtime_owner: "stack_callback"
+    protocol_consumers: ["core_phone.meshtastic", "core_phone.meshcore"]
+
+protocols:
+  meshtastic:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "core_phone"
+  meshcore:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "core_phone"
+  hostlink:
+    enabled: true
+    frame_core: "shared_core"
+
+storage:
+  backend: "esp_nvs_and_sd"
+  identity: "esp_nvs"
+  peer_keys: "esp_nvs"
+  config: "esp_nvs"
+  messages: "sd_or_flash"
+  node_store: "sd_or_flash"
+
+race_policy:
+  app_to_ui: "snapshot"
+  radio_to_app: "event_queue"
+  gps_to_app: "event_queue"
+  ble_to_app: "command_queue"
+  isr_to_driver: "defer_only"
+  store_access: "single_owner_or_mutex"
+  ui_update: "ui_thread_only"
+
+build:
+  app: "apps/esp32_lvgl"
+  board_package: "boards/tlora_pager"
+  platformio_envs: ["tlora_pager_sx1262"]
+  enabled_modules: ["core_chat", "core_device", "core_gps", "core_hostlink", "core_phone", "core_mesh", "ui_presentation", "core_sys", "core_team", "ui_shared"]
+  disabled_modules: []
+
diff --git a/docs/targets/esp32_lvgl_targets.md b/docs/targets/esp32_lvgl_targets.md
new file mode 100644
index 00000000..4ae54494
--- /dev/null
+++ b/docs/targets/esp32_lvgl_targets.md
@@ -0,0 +1,36 @@
+# ESP32 LVGL Target Profiles
+
+Phase 8.3 target profile baseline only.
+
+No behavior change in Phase 8.3.
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+| Target | Board | Platform | Build entrypoint | App shell | UX profile | Status |
+| --- | --- | --- | --- | --- | --- | --- |
+| `tab5` | `tab5` | ESP32-P4 | `builds/esp_idf` | `apps/esp32_lvgl` | `tab5_touch` | transitional |
+| `t_display_p4` | `t_display_p4` | ESP32-P4 | `builds/esp_idf` | `apps/esp32_lvgl` | `tab5_touch` or `touch_tablet` placeholder | transitional |
+| `tdeck` | `tdeck` | ESP32-S3 | `builds/esp_idf` | `apps/esp32_lvgl` | `deck_full` | planned |
+| `tdeck_pro` | `tdeck_pro` | ESP32-S3 | `builds/esp_idf` | `apps/esp32_lvgl` | `deck_full` | planned |
+| `tlora_pager` | `tlora_pager` | ESP32 family | `builds/esp_idf` | `apps/esp32_lvgl` | `pager_compact` | planned |
+| `twatchs3` | `twatchs3` | ESP32-S3 | `builds/esp_idf` | `apps/esp32_lvgl` | `watch_quick` | planned |
+
+## Transitional Source
+
+Current transitional path:
+
+- `legacy/app_implementations/esp_idf`
+
+Current target descriptors under `legacy/app_implementations/esp_idf/targets/*` remain in place until
+wrapper and app shell migration are proven.
+
+## Non-Goals
+
+This document does not move sdkconfig defaults, ESP-IDF CMake files, app
+runtime code, or LVGL screen implementations.
diff --git a/docs/targets/linux-headless.capabilities.yaml b/docs/targets/linux-headless.capabilities.yaml
new file mode 100644
index 00000000..5b545e33
--- /dev/null
+++ b/docs/targets/linux-headless.capabilities.yaml
@@ -0,0 +1,133 @@
+target: "linux-headless"
+status: "draft"
+
+product:
+  family: "trail-mate"
+  form_factor: "headless"
+  interaction_class: "headless"
+
+platform:
+  kind: "linux"
+  sdk: "linux_posix"
+  memory_tier: "large"
+  filesystem: "posix"
+  dynamic_allocation: "allowed"
+
+board:
+  id: "none"
+  package: "none"
+
+runtime:
+  scheduler: "linux_event_loop"
+  ui_thread: "none"
+  radio_thread: "event_loop"
+  gps_thread: "event_loop"
+  ble_thread: "none"
+  isr_policy: "not_applicable"
+  lock_policy: "single_owner_or_mutex"
+
+ui:
+  shell: "headless"
+  renderer: "none"
+  presentation_model_host: "linux"
+  layout_profile: "none"
+  input_model: "none"
+
+execution:
+  app_host: "linux"
+  mesh_core_host: "linux"
+  gps_core_host: "linux"
+  phone_core_host: "linux"
+  hostlink_core_host: "linux"
+  ui_host: "none"
+
+authorities:
+  identity: "linux"
+  peer_key_store: "linux"
+  node_store: "linux"
+  message_store: "linux"
+  location: "linux"
+  time: "linux"
+  config: "linux"
+  device_status: "linux"
+  ui_state: "none"
+
+capabilities:
+  lora:
+    state: "simulated"
+    endpoint_host: "linux"
+    mode: "packet_proxy"
+  gps:
+    state: "simulated"
+    endpoint_host: "linux"
+    mode: "simulated"
+  ble:
+    state: "unsupported"
+    endpoint_host: "none"
+    stack: "none"
+    roles:
+      meshtastic_phone: "disabled"
+      meshcore_phone: "disabled"
+      trailmate_control: "disabled"
+  storage:
+    state: "ready"
+    endpoint_host: "linux"
+  display:
+    state: "unsupported"
+    endpoint_host: "none"
+  input:
+    state: "unsupported"
+    endpoint_host: "none"
+  battery:
+    state: "unsupported"
+    endpoint_host: "none"
+
+capability_bindings:
+  lora:
+    board_provider: "none"
+    platform_driver: "linux_packet_proxy_or_fake_radio"
+    runtime_owner: "linux_event_loop"
+    protocol_consumers: ["core_mesh.meshtastic", "core_mesh.meshcore"]
+  gps:
+    board_provider: "none"
+    platform_driver: "linux_fake_or_file_gnss"
+    runtime_owner: "linux_event_loop"
+    protocol_consumers: ["core_gps.nmea", "core_gps.location_service", "core_gps.time_authority"]
+
+protocols:
+  meshtastic:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "disabled_no_ble_stack"
+  meshcore:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "disabled_no_ble_stack"
+  hostlink:
+    enabled: true
+    frame_core: "shared_core"
+
+storage:
+  backend: "sqlite_and_files"
+  identity: "sqlite"
+  peer_keys: "sqlite"
+  config: "file_or_sqlite"
+  messages: "sqlite"
+  node_store: "sqlite"
+
+race_policy:
+  app_to_ui: "snapshot"
+  radio_to_app: "event_queue"
+  gps_to_app: "event_queue"
+  ble_to_app: "none"
+  isr_to_driver: "not_applicable"
+  store_access: "single_owner_or_mutex"
+  ui_update: "none"
+
+build:
+  app: "legacy/app_implementations/linux_sim"
+  board_package: "none"
+  cmake_presets: ["linux-sim-debug"]
+  enabled_modules: ["core_chat", "core_device", "core_gps", "core_hostlink", "core_phone", "core_mesh", "ui_presentation", "core_sys", "core_team"]
+  disabled_modules: ["ui_shared_renderer"]
+
diff --git a/docs/targets/linux-uconsole-ascii.capabilities.yaml b/docs/targets/linux-uconsole-ascii.capabilities.yaml
new file mode 100644
index 00000000..fced9415
--- /dev/null
+++ b/docs/targets/linux-uconsole-ascii.capabilities.yaml
@@ -0,0 +1,133 @@
+target: "linux-uconsole-ascii"
+status: "draft"
+
+product:
+  family: "trail-mate"
+  form_factor: "linux_handheld"
+  interaction_class: "ascii_tui"
+
+platform:
+  kind: "linux"
+  sdk: "linux_posix"
+  memory_tier: "large"
+  filesystem: "posix"
+  dynamic_allocation: "allowed"
+
+board:
+  id: "uconsole_aio2"
+  package: "platform/linux/uconsole"
+
+runtime:
+  scheduler: "linux_event_loop"
+  ui_thread: "terminal_loop"
+  radio_thread: "event_loop"
+  gps_thread: "event_loop"
+  ble_thread: "none"
+  isr_policy: "not_applicable"
+  lock_policy: "single_owner_or_mutex"
+
+ui:
+  shell: "ascii"
+  renderer: "ascii_canvas"
+  presentation_model_host: "linux"
+  layout_profile: "terminal_panel"
+  input_model: "keyboard"
+
+execution:
+  app_host: "linux"
+  mesh_core_host: "linux"
+  gps_core_host: "linux"
+  phone_core_host: "linux"
+  hostlink_core_host: "linux"
+  ui_host: "linux"
+
+authorities:
+  identity: "linux"
+  peer_key_store: "linux"
+  node_store: "linux"
+  message_store: "linux"
+  location: "linux"
+  time: "linux"
+  config: "linux"
+  device_status: "linux"
+  ui_state: "linux"
+
+capabilities:
+  lora:
+    state: "unbound"
+    endpoint_host: "linux"
+    mode: "local_radio"
+  gps:
+    state: "unbound"
+    endpoint_host: "linux"
+    mode: "local_uart"
+  ble:
+    state: "unsupported"
+    endpoint_host: "none"
+    stack: "none"
+    roles:
+      meshtastic_phone: "disabled"
+      meshcore_phone: "disabled"
+      trailmate_control: "disabled"
+  storage:
+    state: "ready"
+    endpoint_host: "linux"
+  display:
+    state: "ready"
+    endpoint_host: "linux"
+  input:
+    state: "ready"
+    endpoint_host: "linux"
+  battery:
+    state: "unbound"
+    endpoint_host: "linux"
+
+capability_bindings:
+  lora:
+    board_provider: "uconsole_aio2.spi_radio"
+    platform_driver: "linux_sx1262_packet_radio"
+    runtime_owner: "linux_event_loop"
+    protocol_consumers: ["core_mesh.meshtastic", "core_mesh.meshcore"]
+  gps:
+    board_provider: "uconsole_aio2.serial_gps"
+    platform_driver: "linux_serial_gnss"
+    runtime_owner: "linux_event_loop"
+    protocol_consumers: ["core_gps.nmea", "core_gps.location_service", "core_gps.time_authority"]
+
+protocols:
+  meshtastic:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "disabled_no_ble_stack"
+  meshcore:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "disabled_no_ble_stack"
+  hostlink:
+    enabled: true
+    frame_core: "shared_core"
+
+storage:
+  backend: "sqlite_and_files"
+  identity: "sqlite"
+  peer_keys: "sqlite"
+  config: "sqlite_or_file"
+  messages: "sqlite"
+  node_store: "sqlite"
+
+race_policy:
+  app_to_ui: "snapshot"
+  radio_to_app: "event_queue"
+  gps_to_app: "event_queue"
+  ble_to_app: "none"
+  isr_to_driver: "not_applicable"
+  store_access: "single_owner_or_mutex"
+  ui_update: "ui_thread_only"
+
+build:
+  app: "legacy/app_implementations/linux_uconsole"
+  board_package: "platform/linux/uconsole"
+  cmake_presets: ["linux-uconsole-debug", "linux-uconsole-release"]
+  enabled_modules: ["core_chat", "core_device", "core_gps", "core_hostlink", "core_phone", "core_mesh", "ui_presentation", "core_sys", "core_team", "ui_shared"]
+  disabled_modules: []
+
diff --git a/docs/targets/linux-uconsole-gtk.capabilities.yaml b/docs/targets/linux-uconsole-gtk.capabilities.yaml
new file mode 100644
index 00000000..e4f2e47a
--- /dev/null
+++ b/docs/targets/linux-uconsole-gtk.capabilities.yaml
@@ -0,0 +1,136 @@
+target: "linux-uconsole-gtk"
+status: "draft"
+
+product:
+  family: "trail-mate"
+  form_factor: "linux_handheld"
+  interaction_class: "desktop_gtk"
+
+platform:
+  kind: "linux"
+  sdk: "linux_posix"
+  memory_tier: "large"
+  filesystem: "posix"
+  dynamic_allocation: "allowed"
+
+board:
+  id: "uconsole_aio2"
+  package: "platform/linux/uconsole"
+
+runtime:
+  scheduler: "linux_event_loop"
+  ui_thread: "gtk_main"
+  radio_thread: "event_loop"
+  gps_thread: "event_loop"
+  ble_thread: "none"
+  isr_policy: "not_applicable"
+  lock_policy: "single_owner_or_mutex"
+
+ui:
+  shell: "gtk"
+  renderer: "gtk4"
+  presentation_model_host: "linux"
+  layout_profile: "desktop_workbench"
+  input_model: "keyboard_pointer"
+
+execution:
+  app_host: "linux"
+  mesh_core_host: "linux"
+  gps_core_host: "linux"
+  phone_core_host: "linux"
+  hostlink_core_host: "linux"
+  ui_host: "linux"
+
+authorities:
+  identity: "linux"
+  peer_key_store: "linux"
+  node_store: "linux"
+  message_store: "linux"
+  location: "linux"
+  time: "linux"
+  config: "linux"
+  device_status: "linux"
+  ui_state: "linux"
+
+capabilities:
+  lora:
+    state: "unbound"
+    endpoint_host: "linux"
+    mode: "local_radio"
+  gps:
+    state: "unbound"
+    endpoint_host: "linux"
+    mode: "local_uart"
+  ble:
+    state: "unsupported"
+    endpoint_host: "none"
+    stack: "none"
+    roles:
+      meshtastic_phone: "disabled"
+      meshcore_phone: "disabled"
+      trailmate_control: "disabled"
+  storage:
+    state: "ready"
+    endpoint_host: "linux"
+  display:
+    state: "ready"
+    endpoint_host: "linux"
+  input:
+    state: "ready"
+    endpoint_host: "linux"
+  battery:
+    state: "unbound"
+    endpoint_host: "linux"
+
+capability_bindings:
+  lora:
+    board_provider: "uconsole_aio2.spi_radio"
+    platform_driver: "linux_sx1262_packet_radio"
+    runtime_owner: "linux_event_loop"
+    protocol_consumers: ["core_mesh.meshtastic", "core_mesh.meshcore"]
+  gps:
+    board_provider: "uconsole_aio2.serial_gps"
+    platform_driver: "linux_serial_gnss"
+    runtime_owner: "linux_event_loop"
+    protocol_consumers: ["core_gps.nmea", "core_gps.location_service", "core_gps.time_authority"]
+
+protocols:
+  meshtastic:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "disabled_no_ble_stack"
+  meshcore:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "disabled_no_ble_stack"
+  hostlink:
+    enabled: true
+    frame_core: "shared_core"
+
+storage:
+  backend: "sqlite_and_files"
+  identity: "sqlite"
+  peer_keys: "sqlite"
+  config: "sqlite_or_file"
+  messages: "sqlite"
+  node_store: "sqlite"
+
+race_policy:
+  app_to_ui: "snapshot"
+  radio_to_app: "event_queue"
+  gps_to_app: "event_queue"
+  ble_to_app: "none"
+  isr_to_driver: "not_applicable"
+  store_access: "single_owner_or_mutex"
+  ui_update: "ui_thread_only"
+
+build:
+  app: "legacy/app_implementations/linux_uconsole"
+  board_package: "platform/linux/uconsole"
+  cmake_presets: ["linux-uconsole-debug", "linux-uconsole-release"]
+  enabled_modules: ["core_chat", "core_device", "core_gps", "core_hostlink", "core_phone", "core_mesh", "ui_presentation", "core_sys", "core_team", "ui_shared"]
+  disabled_modules: []
+
+draft_notes:
+  - "LoRa/GPS are unbound until AIO2 endpoints are detected or configured."
+
diff --git a/docs/targets/linux_targets.md b/docs/targets/linux_targets.md
new file mode 100644
index 00000000..2c79763f
--- /dev/null
+++ b/docs/targets/linux_targets.md
@@ -0,0 +1,39 @@
+# Linux Target Profiles
+
+Phase 8.3 target profile baseline only.
+
+No behavior change in Phase 8.3.
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+| Target | Board | Platform | Build entrypoint | App shell | UX profile | Status |
+| --- | --- | --- | --- | --- | --- | --- |
+| `uconsole` | `uconsole_aio2` placeholder | Linux | `builds/linux_cmake` | `apps/linux_uconsole_gtk` | `uconsole_desktop` | transitional |
+| `linux_sim` | simulator device profile | Linux | `builds/linux_cmake` | `apps/linux_sim_shell` | `simulator_full` | transitional |
+| `linux_rpi_cardputer_zero` | Cardputer Zero / Pi OS device profile | Linux | `builds/linux_cmake` | future Linux device app shell | `cardputer_wide` | transitional |
+| `linux_unoq` | UNO Q device profile | Linux | `builds/linux_cmake` | future Linux UNO Q app shell | `uconsole_desktop` placeholder | planned |
+| `linux_headless` | host/headless profile | Linux | `builds/linux_cmake` | future Linux headless app shell | `headless_status` | planned |
+
+## Transitional Source
+
+Current transitional paths:
+
+- `legacy/app_implementations/linux_uconsole`
+- `legacy/app_implementations/linux_sim`
+- `legacy/app_implementations/linux_rpi`
+- `legacy/app_implementations/linux_unoq`
+
+Linux CMake wrappers should invoke selected Linux app shells. They must not
+absorb GTK, simulator, framebuffer, device-shell, or runtime behavior into
+`builds/linux_cmake`.
+
+## Non-Goals
+
+This document does not move Linux CMake files, GTK source, simulator source,
+Raspberry Pi source, SCons paths, or platform Linux adapters.
diff --git a/docs/targets/nrf52-gat562-node.capabilities.yaml b/docs/targets/nrf52-gat562-node.capabilities.yaml
new file mode 100644
index 00000000..0f009fe5
--- /dev/null
+++ b/docs/targets/nrf52-gat562-node.capabilities.yaml
@@ -0,0 +1,138 @@
+target: "nrf52-gat562-node"
+status: "draft"
+
+product:
+  family: "trail-mate"
+  form_factor: "embedded_node"
+  interaction_class: "headless_status"
+
+platform:
+  kind: "nrf52"
+  sdk: "arduino_nrf52"
+  memory_tier: "tiny"
+  filesystem: "internal_flash"
+  dynamic_allocation: "limited"
+
+board:
+  id: "gat562"
+  package: "boards/gat562_mesh_evb_pro"
+
+runtime:
+  scheduler: "freertos"
+  ui_thread: "none"
+  radio_thread: "radio_task"
+  gps_thread: "gps_task"
+  ble_thread: "stack_callback"
+  isr_policy: "defer_to_queue"
+  lock_policy: "message_passing"
+
+ui:
+  shell: "headless"
+  renderer: "none"
+  presentation_model_host: "none"
+  layout_profile: "none"
+  input_model: "buttons_joystick_status_only"
+
+execution:
+  app_host: "nrf52"
+  mesh_core_host: "nrf52"
+  gps_core_host: "nrf52"
+  phone_core_host: "nrf52"
+  hostlink_core_host: "none"
+  ui_host: "none"
+
+authorities:
+  identity: "nrf52"
+  peer_key_store: "nrf52"
+  node_store: "nrf52"
+  message_store: "nrf52"
+  location: "nrf52"
+  time: "nrf52"
+  config: "nrf52"
+  device_status: "nrf52"
+  ui_state: "none"
+
+capabilities:
+  lora:
+    state: "ready"
+    endpoint_host: "nrf52"
+    mode: "local_radio"
+  gps:
+    state: "ready"
+    endpoint_host: "nrf52"
+    mode: "local_uart"
+  ble:
+    state: "ready"
+    endpoint_host: "nrf52"
+    stack: "bluefruit"
+    roles:
+      meshtastic_phone: "server"
+      meshcore_phone: "server"
+      trailmate_control: "disabled"
+  storage:
+    state: "ready"
+    endpoint_host: "nrf52"
+  display:
+    state: "present"
+    endpoint_host: "nrf52"
+  input:
+    state: "present"
+    endpoint_host: "nrf52"
+  battery:
+    state: "present"
+    endpoint_host: "nrf52"
+
+capability_bindings:
+  lora:
+    board_provider: "gat562.radio"
+    platform_driver: "nrf52_sx1262_packet_radio"
+    runtime_owner: "radio_task"
+    protocol_consumers: ["core_mesh.meshtastic", "core_mesh.meshcore"]
+  gps:
+    board_provider: "gat562.gps"
+    platform_driver: "nrf52_uart_gnss"
+    runtime_owner: "gps_task"
+    protocol_consumers: ["core_gps.nmea", "core_gps.location_service", "core_gps.time_authority"]
+  ble:
+    board_provider: "nrf52.integrated_ble"
+    platform_driver: "bluefruit_gatt_host"
+    runtime_owner: "stack_callback"
+    protocol_consumers: ["core_phone.meshtastic", "core_phone.meshcore"]
+
+protocols:
+  meshtastic:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "core_phone"
+  meshcore:
+    enabled: true
+    radio_profile_source: "core_mesh"
+    ble_phone_core: "core_phone"
+  hostlink:
+    enabled: false
+    frame_core: "disabled"
+
+storage:
+  backend: "nrf52_flash"
+  identity: "nrf52_flash"
+  peer_keys: "nrf52_flash"
+  config: "nrf52_flash"
+  messages: "nrf52_flash_or_disabled"
+  node_store: "nrf52_flash"
+
+race_policy:
+  app_to_ui: "snapshot"
+  radio_to_app: "event_queue"
+  gps_to_app: "event_queue"
+  ble_to_app: "command_queue"
+  isr_to_driver: "defer_only"
+  store_access: "single_owner_or_mutex"
+  ui_update: "none"
+
+build:
+  app: "legacy/app_implementations/gat562_mesh_evb_pro"
+  board_package: "boards/gat562_mesh_evb_pro"
+  platformio_envs: ["gat562_mesh_evb_pro"]
+  enabled_modules: ["core_chat", "core_device", "core_gps", "core_hostlink", "core_phone", "core_mesh", "ui_presentation", "core_sys", "core_team", "ui_shared"]
+  disabled_modules: []
+
diff --git a/docs/targets/nrf52_node_targets.md b/docs/targets/nrf52_node_targets.md
new file mode 100644
index 00000000..657a2821
--- /dev/null
+++ b/docs/targets/nrf52_node_targets.md
@@ -0,0 +1,35 @@
+# nRF52 Node Target Profiles
+
+Phase 8.3 target profile baseline only.
+
+No behavior change in Phase 8.3.
+
+```text
+Build Entrypoint invokes.
+App Shell composes.
+Target chooses.
+Board describes.
+UX Pack presents.
+```
+
+| Target | Board | Platform | Build entrypoint | App shell | UX profile | Status |
+| --- | --- | --- | --- | --- | --- | --- |
+| `gat562` | `gat562_mesh_evb_pro` | nRF52 | `builds/pio_nrf52` | `apps/nrf52_node` | `tiny_node_status` | transitional |
+| `nrf52_node_dev` | target-selected nRF52 board | nRF52 | `builds/pio_nrf52` | `apps/nrf52_node` | `tiny_node_status` | planned |
+
+## Transitional Source
+
+Current transitional paths:
+
+- `legacy/app_implementations/esp_pio`
+- `legacy/app_implementations/gat562_mesh_evb_pro`
+- root `platformio.ini`
+
+The final `apps/nrf52_node` shell should select target profile and hand off to
+product composition. It should not absorb PlatformIO environment definitions or
+board facts.
+
+## Non-Goals
+
+This document does not move PlatformIO files, root build configuration,
+GAT562 source files, board packages, or mono UI code.
diff --git a/docs/ux_profiles/README.md b/docs/ux_profiles/README.md
new file mode 100644
index 00000000..9f048765
--- /dev/null
+++ b/docs/ux_profiles/README.md
@@ -0,0 +1,39 @@
+# UX Profiles
+
+`docs/ux_profiles/` records Device UX profile baselines.
+
+UX profile documents describe product UX decisions. They do not define board
+facts, build entrypoints, HAL details, or renderer implementation internals.
+
+Core rule:
+
+```text
+Board describes.
+Target chooses.
+UX Pack presents.
+Renderer draws.
+```
+
+Each profile records:
+
+- Screen class
+- Input model
+- Feature set
+- Screen set
+- Map mode
+- Chat mode
+- Team action mode
+- GPS mode
+- Modal/picker strategy
+- Renderer family
+- Deferred decisions
+
+Phase 8 profiles:
+
+- `deck_full.md`
+- `pager_compact.md`
+- `watch_quick.md`
+- `cardputer_wide.md`
+- `tab5_touch.md`
+- `tiny_node_status.md`
+- `uconsole_desktop.md`
diff --git a/docs/ux_profiles/cardputer_wide.md b/docs/ux_profiles/cardputer_wide.md
new file mode 100644
index 00000000..4a46942b
--- /dev/null
+++ b/docs/ux_profiles/cardputer_wide.md
@@ -0,0 +1,48 @@
+# UX Profile: cardputer_wide
+
+## Screen Class
+
+Small landscape keyboard device.
+
+## Input Model
+
+Keyboard, directional controls, limited pointer/touch depending on target.
+
+## Feature Set
+
+Dense chat/status workflow with compact map and practical GPS/team actions.
+
+## Screen Set
+
+Dashboard, Chat, Compact Map/GPS, Team, Settings.
+
+## Map Mode
+
+Compact landscape map with offline tiles and current-position focus.
+
+## Chat Mode
+
+Dense chat list and compose optimized for keyboard entry.
+
+## Team Action Mode
+
+Quick location plus compact command/status actions.
+
+## GPS Mode
+
+Compact GPS status with route/tracker surfaces deferred.
+
+## Modal/Picker Strategy
+
+Keyboard-first compact modals and list pickers.
+
+## Renderer Family
+
+LVGL or Linux framebuffer LVGL depending on target.
+
+## Deferred Decisions
+
+Final Cardputer Zero shell split, keyboard bindings, and hardware UX profile
+name remain deferred.
+
+Board describes. Target chooses. UX Pack presents. Renderer draws.
diff --git a/docs/ux_profiles/deck_full.md b/docs/ux_profiles/deck_full.md
new file mode 100644
index 00000000..8ee71029
--- /dev/null
+++ b/docs/ux_profiles/deck_full.md
@@ -0,0 +1,51 @@
+# UX Profile: deck_full
+
+## Screen Class
+
+Keyboard handheld with medium display.
+
+## Input Model
+
+Keyboard, directional controls, optional touch.
+
+## Feature Set
+
+Full field workflow: chat, map, team actions, GPS, settings, tracker, and
+device status.
+
+## Screen Set
+
+Dashboard, Chat, Team, Map/GPS, Tracker, Settings, Contacts, Extensions.
+
+## Map Mode
+
+Full map mode with pan/zoom, offline tiles, current position, and overlay
+snapshots.
+
+## Chat Mode
+
+Full chat mode with conversation list, compose, delivery state, key
+verification, and Team rich payload summaries.
+
+## Team Action Mode
+
+Full Team action mode with location marker picker and command workflows.
+
+## GPS Mode
+
+Full GPS status and map-adjacent GPS workflow.
+
+## Modal/Picker Strategy
+
+Keyboard-friendly modal and picker renderers from the selected UX pack.
+
+## Renderer Family
+
+LVGL.
+
+## Deferred Decisions
+
+Final screen density, keyboard shortcuts, and rich Team card renderer remain
+deferred until UX pack implementation.
+
+Board describes. Target chooses. UX Pack presents. Renderer draws.
diff --git a/docs/ux_profiles/pager_compact.md b/docs/ux_profiles/pager_compact.md
new file mode 100644
index 00000000..2ad5597b
--- /dev/null
+++ b/docs/ux_profiles/pager_compact.md
@@ -0,0 +1,50 @@
+# UX Profile: pager_compact
+
+## Screen Class
+
+Compact pager display.
+
+## Input Model
+
+Directional buttons, select/back, limited text entry.
+
+## Feature Set
+
+Compact field workflow: quick chat, recent messages, GPS/status, compact map,
+and essential settings.
+
+## Screen Set
+
+Status, Recent Chat, Quick Message, Compact Map/GPS, Settings.
+
+## Map Mode
+
+Compact current-position map with constrained pan/zoom and offline tile
+awareness.
+
+## Chat Mode
+
+Quick message and recent-message mode.
+
+## Team Action Mode
+
+Quick location action if target capability allows it; command workflow is
+deferred.
+
+## GPS Mode
+
+Compact GPS status with current fix and basic diagnostics.
+
+## Modal/Picker Strategy
+
+Short modal flows and single-step pickers.
+
+## Renderer Family
+
+LVGL.
+
+## Deferred Decisions
+
+Text-entry depth, Team command exposure, and map controls remain deferred.
+
+Board describes. Target chooses. UX Pack presents. Renderer draws.
diff --git a/docs/ux_profiles/tab5_touch.md b/docs/ux_profiles/tab5_touch.md
new file mode 100644
index 00000000..f583f8d9
--- /dev/null
+++ b/docs/ux_profiles/tab5_touch.md
@@ -0,0 +1,51 @@
+# UX Profile: tab5_touch
+
+## Screen Class
+
+Larger touch display.
+
+## Input Model
+
+Touch-first with optional hardware buttons.
+
+## Feature Set
+
+Full touch workflow: dashboard, map, chat, team, GPS, settings, tracker, and
+rich diagnostics.
+
+## Screen Set
+
+Dashboard, Full Map/GPS, Chat, Team, Tracker, Settings, Contacts.
+
+## Map Mode
+
+Full map mode with touch pan/zoom, offline tiles, overlay snapshots, and
+route/tracker extension points.
+
+## Chat Mode
+
+Full chat with touch compose, delivery state, key verification, and rich Team
+payload summaries.
+
+## Team Action Mode
+
+Full Team actions including marker picker and future richer cards.
+
+## GPS Mode
+
+Full GPS diagnostics and map integration.
+
+## Modal/Picker Strategy
+
+Touch-first modal panels and larger picker controls.
+
+## Renderer Family
+
+LVGL.
+
+## Deferred Decisions
+
+Final rich cards, route overlay UX, and large-screen dashboard density remain
+deferred.
+
+Board describes. Target chooses. UX Pack presents. Renderer draws.
diff --git a/docs/ux_profiles/tiny_node_status.md b/docs/ux_profiles/tiny_node_status.md
new file mode 100644
index 00000000..850f42ea
--- /dev/null
+++ b/docs/ux_profiles/tiny_node_status.md
@@ -0,0 +1,48 @@
+# UX Profile: tiny_node_status
+
+## Screen Class
+
+Tiny status or monochrome node display.
+
+## Input Model
+
+Minimal buttons, serial/host control, or no direct input.
+
+## Feature Set
+
+Status-only workflow: radio, GPS, battery, identity, packet state, and alerts.
+
+## Screen Set
+
+Status, Radio, GPS, Battery, Diagnostics.
+
+## Map Mode
+
+No full map.
+
+## Chat Mode
+
+Status-only or host-proxied chat state.
+
+## Team Action Mode
+
+Hidden unless target provides a dedicated quick action.
+
+## GPS Mode
+
+Status-only fix and time/diagnostics display.
+
+## Modal/Picker Strategy
+
+No modal-heavy workflows. Prefer host control or simple status pages.
+
+## Renderer Family
+
+Mono/status renderer.
+
+## Deferred Decisions
+
+Host control depth, alert acknowledgement, and tiny-display page order remain
+deferred.
+
+Board describes. Target chooses. UX Pack presents. Renderer draws.
diff --git a/docs/ux_profiles/uconsole_desktop.md b/docs/ux_profiles/uconsole_desktop.md
new file mode 100644
index 00000000..ec106c49
--- /dev/null
+++ b/docs/ux_profiles/uconsole_desktop.md
@@ -0,0 +1,51 @@
+# UX Profile: uconsole_desktop
+
+## Screen Class
+
+Desktop-class Linux handheld display.
+
+## Input Model
+
+Keyboard, pointer, GTK gestures, and desktop window controls.
+
+## Feature Set
+
+Full desktop handheld workflow with chat, map, dashboard, GPS, Team, settings,
+diagnostics, and host integration.
+
+## Screen Set
+
+Dashboard, Chat, Map, Team, GPS, Tracker, Settings, Diagnostics.
+
+## Map Mode
+
+Full Linux map mode with filesystem/cache adapters, offline tiles, overlays, and
+future route/tracker integration.
+
+## Chat Mode
+
+Full chat with richer desktop presentation potential.
+
+## Team Action Mode
+
+Full Team action surface with desktop-friendly controls.
+
+## GPS Mode
+
+Full GPS status and diagnostics with runtime scheduling owned outside renderer.
+
+## Modal/Picker Strategy
+
+GTK-friendly dialogs or desktop panels; LVGL fallback remains compatibility
+only.
+
+## Renderer Family
+
+GTK primary, optional LVGL fallback for legacy surface.
+
+## Deferred Decisions
+
+GTK UX pack object model, rich map overlay controls, and package integration
+remain deferred.
+
+Board describes. Target chooses. UX Pack presents. Renderer draws.
diff --git a/docs/ux_profiles/watch_quick.md b/docs/ux_profiles/watch_quick.md
new file mode 100644
index 00000000..60c299da
--- /dev/null
+++ b/docs/ux_profiles/watch_quick.md
@@ -0,0 +1,47 @@
+# UX Profile: watch_quick
+
+## Screen Class
+
+Watch-sized touch display.
+
+## Input Model
+
+Touch, swipe, short press, long press.
+
+## Feature Set
+
+Glanceable status, quick actions, compact Team location, GPS summary, and alerts.
+
+## Screen Set
+
+Watch face, Status, Quick Actions, GPS Summary, Alerts.
+
+## Map Mode
+
+No full map. Optional current-position glance only.
+
+## Chat Mode
+
+Notification and quick-reply surface only.
+
+## Team Action Mode
+
+Quick check-in or location marker only.
+
+## GPS Mode
+
+Glanceable fix, battery/location status, and alert state.
+
+## Modal/Picker Strategy
+
+Touch-first full-screen lightweight panels.
+
+## Renderer Family
+
+LVGL.
+
+## Deferred Decisions
+
+Gesture map, notification depth, and emergency action flow remain deferred.
+
+Board describes. Target chooses. UX Pack presents. Renderer draws.
diff --git a/modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_conversation_mapper.h b/modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_conversation_mapper.h
new file mode 100644
index 00000000..bcb4f43b
--- /dev/null
+++ b/modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_conversation_mapper.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "chat/domain/chat_types.h"
+#include "ui_presentation/chat/chat_identity.h"
+
+namespace chat_presentation_adapters
+{
+
+ui::chat::ChatProtocolKind mapProtocol(chat::MeshProtocol protocol);
+bool tryMapProtocol(ui::chat::ChatProtocolKind protocol,
+                    chat::MeshProtocol& out);
+ui::chat::ConversationId toUiConversationId(const chat::ConversationId& id);
+bool toCoreConversationId(const ui::chat::ConversationId& id,
+                          chat::ConversationId& out);
+
+} // namespace chat_presentation_adapters
diff --git a/modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_message_mapper.h b/modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_message_mapper.h
new file mode 100644
index 00000000..c6e67933
--- /dev/null
+++ b/modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_message_mapper.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "chat/domain/chat_types.h"
+#include "ui_presentation/chat/chat_message_ref.h"
+
+namespace chat_presentation_adapters
+{
+
+ui::chat::MessageDeliveryState mapMessageStatus(chat::MessageStatus status);
+ui::chat::MessageFailureKind mapMessageFailure(chat::MessageStatus status);
+ui::chat::MessageRef toUiMessageRef(const chat::ChatMessage& message);
+
+} // namespace chat_presentation_adapters
diff --git a/modules/chat_presentation_adapters/library.json b/modules/chat_presentation_adapters/library.json
new file mode 100644
index 00000000..cc9ff4e2
--- /dev/null
+++ b/modules/chat_presentation_adapters/library.json
@@ -0,0 +1,17 @@
+{
+  "name": "chat_presentation_adapters",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../core_chat/include",
+      "-I../ui_presentation/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_chat"
+    }
+  ]
+}
diff --git a/modules/chat_presentation_adapters/src/chat_conversation_mapper.cpp b/modules/chat_presentation_adapters/src/chat_conversation_mapper.cpp
new file mode 100644
index 00000000..73f0962f
--- /dev/null
+++ b/modules/chat_presentation_adapters/src/chat_conversation_mapper.cpp
@@ -0,0 +1,100 @@
+#include "chat_presentation_adapters/chat_conversation_mapper.h"
+
+namespace chat_presentation_adapters
+{
+
+ui::chat::ChatProtocolKind mapProtocol(chat::MeshProtocol protocol)
+{
+    switch (protocol)
+    {
+    case chat::MeshProtocol::Meshtastic:
+        return ui::chat::ChatProtocolKind::Meshtastic;
+    case chat::MeshProtocol::MeshCore:
+        return ui::chat::ChatProtocolKind::MeshCore;
+    case chat::MeshProtocol::RNode:
+        return ui::chat::ChatProtocolKind::RNode;
+    case chat::MeshProtocol::LXMF:
+        return ui::chat::ChatProtocolKind::LXMF;
+    }
+    return ui::chat::ChatProtocolKind::None;
+}
+
+bool tryMapProtocol(ui::chat::ChatProtocolKind protocol,
+                    chat::MeshProtocol& out)
+{
+    switch (protocol)
+    {
+    case ui::chat::ChatProtocolKind::Meshtastic:
+        out = chat::MeshProtocol::Meshtastic;
+        return true;
+    case ui::chat::ChatProtocolKind::MeshCore:
+        out = chat::MeshProtocol::MeshCore;
+        return true;
+    case ui::chat::ChatProtocolKind::RNode:
+        out = chat::MeshProtocol::RNode;
+        return true;
+    case ui::chat::ChatProtocolKind::LXMF:
+        out = chat::MeshProtocol::LXMF;
+        return true;
+    case ui::chat::ChatProtocolKind::None:
+    case ui::chat::ChatProtocolKind::TrailMate:
+    case ui::chat::ChatProtocolKind::Mixed:
+        break;
+    }
+    return false;
+}
+
+ui::chat::ConversationId toUiConversationId(const chat::ConversationId& id)
+{
+    ui::chat::ConversationId out;
+    out.protocol = mapProtocol(id.protocol);
+    const uint32_t channel = static_cast<uint32_t>(id.channel);
+
+    if (id.peer != 0)
+    {
+        out.kind = ui::chat::ConversationKind::DirectPeer;
+        out.primary = id.peer;
+        out.secondary = channel;
+        return out;
+    }
+
+    out.kind = ui::chat::ConversationKind::Channel;
+    out.primary = channel;
+    out.secondary = 0;
+    return out;
+}
+
+bool toCoreConversationId(const ui::chat::ConversationId& id,
+                          chat::ConversationId& out)
+{
+    if (!id.isValid())
+    {
+        return false;
+    }
+
+    chat::MeshProtocol protocol;
+    if (!tryMapProtocol(id.protocol, protocol))
+    {
+        return false;
+    }
+
+    if (id.kind == ui::chat::ConversationKind::DirectPeer)
+    {
+        out = chat::ConversationId(static_cast<chat::ChannelId>(id.secondary),
+                                   id.primary,
+                                   protocol);
+        return id.primary != 0;
+    }
+
+    if (id.kind == ui::chat::ConversationKind::Channel)
+    {
+        out = chat::ConversationId(static_cast<chat::ChannelId>(id.primary),
+                                   0,
+                                   protocol);
+        return true;
+    }
+
+    return false;
+}
+
+} // namespace chat_presentation_adapters
diff --git a/modules/chat_presentation_adapters/src/chat_message_mapper.cpp b/modules/chat_presentation_adapters/src/chat_message_mapper.cpp
new file mode 100644
index 00000000..c8a1efdb
--- /dev/null
+++ b/modules/chat_presentation_adapters/src/chat_message_mapper.cpp
@@ -0,0 +1,50 @@
+#include "chat_presentation_adapters/chat_message_mapper.h"
+
+namespace chat_presentation_adapters
+{
+
+ui::chat::MessageDeliveryState mapMessageStatus(chat::MessageStatus status)
+{
+    switch (status)
+    {
+    case chat::MessageStatus::Incoming:
+        return ui::chat::MessageDeliveryState::Received;
+    case chat::MessageStatus::Queued:
+        return ui::chat::MessageDeliveryState::Queued;
+    case chat::MessageStatus::Sent:
+        return ui::chat::MessageDeliveryState::Sent;
+    case chat::MessageStatus::Failed:
+        return ui::chat::MessageDeliveryState::Failed;
+    }
+    return ui::chat::MessageDeliveryState::Unknown;
+}
+
+ui::chat::MessageFailureKind mapMessageFailure(chat::MessageStatus status)
+{
+    return status == chat::MessageStatus::Failed
+               ? ui::chat::MessageFailureKind::Unknown
+               : ui::chat::MessageFailureKind::None;
+}
+
+ui::chat::MessageRef toUiMessageRef(const chat::ChatMessage& message)
+{
+    ui::chat::MessageRef out;
+
+    if (message.status == chat::MessageStatus::Queued)
+    {
+        out.origin = ui::chat::MessageOrigin::LocalPending;
+    }
+    else if (message.status == chat::MessageStatus::Incoming || message.from != 0)
+    {
+        out.origin = ui::chat::MessageOrigin::RemoteStored;
+    }
+    else
+    {
+        out.origin = ui::chat::MessageOrigin::LocalStored;
+    }
+
+    out.protocol_id = message.msg_id;
+    return out;
+}
+
+} // namespace chat_presentation_adapters
diff --git a/modules/chat_presentation_adapters/tests/test_chat_conversation_mapper.cpp b/modules/chat_presentation_adapters/tests/test_chat_conversation_mapper.cpp
new file mode 100644
index 00000000..019332d5
--- /dev/null
+++ b/modules/chat_presentation_adapters/tests/test_chat_conversation_mapper.cpp
@@ -0,0 +1,134 @@
+#include "chat_presentation_adapters/chat_conversation_mapper.h"
+
+#include <cassert>
+
+namespace
+{
+
+void peerConversationMapsToDirectPeer()
+{
+    chat::ConversationId core(
+        chat::ChannelId::PRIMARY,
+        1234,
+        chat::MeshProtocol::Meshtastic);
+
+    const ui::chat::ConversationId ui =
+        chat_presentation_adapters::toUiConversationId(core);
+
+    assert(ui.kind == ui::chat::ConversationKind::DirectPeer);
+    assert(ui.protocol == ui::chat::ChatProtocolKind::Meshtastic);
+    assert(ui.primary == 1234);
+    assert(ui.secondary == 0);
+}
+
+void channelConversationMapsToChannel()
+{
+    chat::ConversationId core(
+        chat::ChannelId::SECONDARY,
+        0,
+        chat::MeshProtocol::MeshCore);
+
+    const ui::chat::ConversationId ui =
+        chat_presentation_adapters::toUiConversationId(core);
+
+    assert(ui.kind == ui::chat::ConversationKind::Channel);
+    assert(ui.protocol == ui::chat::ChatProtocolKind::MeshCore);
+    assert(ui.primary == static_cast<uint32_t>(chat::ChannelId::SECONDARY));
+    assert(ui.secondary == 0);
+}
+
+void protocolsMapOneToOne()
+{
+    assert(chat_presentation_adapters::mapProtocol(chat::MeshProtocol::Meshtastic) ==
+           ui::chat::ChatProtocolKind::Meshtastic);
+    assert(chat_presentation_adapters::mapProtocol(chat::MeshProtocol::MeshCore) ==
+           ui::chat::ChatProtocolKind::MeshCore);
+    assert(chat_presentation_adapters::mapProtocol(chat::MeshProtocol::RNode) ==
+           ui::chat::ChatProtocolKind::RNode);
+    assert(chat_presentation_adapters::mapProtocol(chat::MeshProtocol::LXMF) ==
+           ui::chat::ChatProtocolKind::LXMF);
+
+    chat::MeshProtocol core_protocol = chat::MeshProtocol::LXMF;
+    assert(chat_presentation_adapters::tryMapProtocol(
+        ui::chat::ChatProtocolKind::Meshtastic,
+        core_protocol));
+    assert(core_protocol == chat::MeshProtocol::Meshtastic);
+    assert(chat_presentation_adapters::tryMapProtocol(
+        ui::chat::ChatProtocolKind::MeshCore,
+        core_protocol));
+    assert(core_protocol == chat::MeshProtocol::MeshCore);
+    assert(chat_presentation_adapters::tryMapProtocol(
+        ui::chat::ChatProtocolKind::RNode,
+        core_protocol));
+    assert(core_protocol == chat::MeshProtocol::RNode);
+    assert(chat_presentation_adapters::tryMapProtocol(
+        ui::chat::ChatProtocolKind::LXMF,
+        core_protocol));
+    assert(core_protocol == chat::MeshProtocol::LXMF);
+}
+
+void unsupportedPresentationProtocolsDoNotMapToCore()
+{
+    chat::MeshProtocol core_protocol = chat::MeshProtocol::Meshtastic;
+    assert(!chat_presentation_adapters::tryMapProtocol(
+        ui::chat::ChatProtocolKind::None,
+        core_protocol));
+    assert(!chat_presentation_adapters::tryMapProtocol(
+        ui::chat::ChatProtocolKind::TrailMate,
+        core_protocol));
+    assert(!chat_presentation_adapters::tryMapProtocol(
+        ui::chat::ChatProtocolKind::Mixed,
+        core_protocol));
+}
+
+void directPeerMapsBackToCoreConversation()
+{
+    ui::chat::ConversationId ui;
+    ui.kind = ui::chat::ConversationKind::DirectPeer;
+    ui.protocol = ui::chat::ChatProtocolKind::Meshtastic;
+    ui.primary = 1234;
+    ui.secondary = static_cast<uint32_t>(chat::ChannelId::SECONDARY);
+
+    chat::ConversationId core;
+    assert(chat_presentation_adapters::toCoreConversationId(ui, core));
+    assert(core.protocol == chat::MeshProtocol::Meshtastic);
+    assert(core.channel == chat::ChannelId::SECONDARY);
+    assert(core.peer == 1234);
+}
+
+void teamDoesNotMapBackToCoreConversation()
+{
+    ui::chat::ConversationId ui;
+    ui.kind = ui::chat::ConversationKind::Team;
+    ui.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    ui.primary = 1234;
+
+    chat::ConversationId core;
+    assert(!chat_presentation_adapters::toCoreConversationId(ui, core));
+}
+
+void trailMateDirectPeerDoesNotMapBackToCoreConversation()
+{
+    ui::chat::ConversationId ui;
+    ui.kind = ui::chat::ConversationKind::DirectPeer;
+    ui.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    ui.primary = 1234;
+    ui.secondary = static_cast<uint32_t>(chat::ChannelId::PRIMARY);
+
+    chat::ConversationId core;
+    assert(!chat_presentation_adapters::toCoreConversationId(ui, core));
+}
+
+} // namespace
+
+int main()
+{
+    peerConversationMapsToDirectPeer();
+    channelConversationMapsToChannel();
+    protocolsMapOneToOne();
+    unsupportedPresentationProtocolsDoNotMapToCore();
+    directPeerMapsBackToCoreConversation();
+    teamDoesNotMapBackToCoreConversation();
+    trailMateDirectPeerDoesNotMapBackToCoreConversation();
+    return 0;
+}
diff --git a/modules/chat_presentation_adapters/tests/test_chat_message_mapper.cpp b/modules/chat_presentation_adapters/tests/test_chat_message_mapper.cpp
new file mode 100644
index 00000000..5244a91d
--- /dev/null
+++ b/modules/chat_presentation_adapters/tests/test_chat_message_mapper.cpp
@@ -0,0 +1,89 @@
+#include "chat_presentation_adapters/chat_message_mapper.h"
+
+#include <cassert>
+
+namespace
+{
+
+void messageStatusesMapToDeliveryStates()
+{
+    assert(chat_presentation_adapters::mapMessageStatus(chat::MessageStatus::Incoming) ==
+           ui::chat::MessageDeliveryState::Received);
+    assert(chat_presentation_adapters::mapMessageStatus(chat::MessageStatus::Queued) ==
+           ui::chat::MessageDeliveryState::Queued);
+    assert(chat_presentation_adapters::mapMessageStatus(chat::MessageStatus::Sent) ==
+           ui::chat::MessageDeliveryState::Sent);
+    assert(chat_presentation_adapters::mapMessageStatus(chat::MessageStatus::Failed) ==
+           ui::chat::MessageDeliveryState::Failed);
+}
+
+void messageStatusesMapToFailureKinds()
+{
+    assert(chat_presentation_adapters::mapMessageFailure(chat::MessageStatus::Incoming) ==
+           ui::chat::MessageFailureKind::None);
+    assert(chat_presentation_adapters::mapMessageFailure(chat::MessageStatus::Queued) ==
+           ui::chat::MessageFailureKind::None);
+    assert(chat_presentation_adapters::mapMessageFailure(chat::MessageStatus::Sent) ==
+           ui::chat::MessageFailureKind::None);
+    assert(chat_presentation_adapters::mapMessageFailure(chat::MessageStatus::Failed) ==
+           ui::chat::MessageFailureKind::Unknown);
+}
+
+void incomingMessageMapsToRemoteStoredRef()
+{
+    chat::ChatMessage message;
+    message.status = chat::MessageStatus::Incoming;
+    message.from = 1234;
+    message.msg_id = 77;
+
+    const ui::chat::MessageRef ref =
+        chat_presentation_adapters::toUiMessageRef(message);
+
+    assert(ref.origin == ui::chat::MessageOrigin::RemoteStored);
+    assert(ref.protocol_id == 77);
+    assert(ref.local_id == 0);
+    assert(ref.nonce_or_seq == 0);
+    assert(ref.isValid());
+}
+
+void queuedMessageMapsToLocalPendingRef()
+{
+    chat::ChatMessage message;
+    message.status = chat::MessageStatus::Queued;
+    message.from = 0;
+    message.msg_id = 88;
+
+    const ui::chat::MessageRef ref =
+        chat_presentation_adapters::toUiMessageRef(message);
+
+    assert(ref.origin == ui::chat::MessageOrigin::LocalPending);
+    assert(ref.protocol_id == 88);
+    assert(ref.isValid());
+}
+
+void storedLocalMessageMapsToLocalStoredRef()
+{
+    chat::ChatMessage message;
+    message.status = chat::MessageStatus::Sent;
+    message.from = 0;
+    message.msg_id = 99;
+
+    const ui::chat::MessageRef ref =
+        chat_presentation_adapters::toUiMessageRef(message);
+
+    assert(ref.origin == ui::chat::MessageOrigin::LocalStored);
+    assert(ref.protocol_id == 99);
+    assert(ref.isValid());
+}
+
+} // namespace
+
+int main()
+{
+    messageStatusesMapToDeliveryStates();
+    messageStatusesMapToFailureKinds();
+    incomingMessageMapsToRemoteStoredRef();
+    queuedMessageMapsToLocalPendingRef();
+    storedLocalMessageMapsToLocalStoredRef();
+    return 0;
+}
diff --git a/modules/core_chat/include/chat/ble/meshcore_phone_core.h b/modules/core_chat/include/chat/ble/meshcore_phone_core.h
index 5cf024c2..154b38bb 100644
--- a/modules/core_chat/include/chat/ble/meshcore_phone_core.h
+++ b/modules/core_chat/include/chat/ble/meshcore_phone_core.h
@@ -1,155 +1,17 @@
 #pragma once
 
-#include "chat/ble/phone_runtime_context.h"
-#include "chat/domain/chat_types.h"
-
-#include <array>
-#include <cstdint>
-#include <deque>
-#include <string>
-#include <vector>
-
-namespace chat
-{
-namespace contacts
-{
-struct NodeEntry;
-}
-} // namespace chat
+#include "phone/meshcore/meshcore_phone_core.h"
 
 namespace ble
 {
 
-struct MeshCoreBleFrame
-{
-    size_t len = 0;
-    std::array<uint8_t, 172> buf{};
-};
-
-struct MeshCorePhoneBatteryInfo
-{
-    uint8_t level = 0;
-    uint16_t millivolts = 0;
-};
-
-struct MeshCorePhoneLocation
-{
-    int32_t lat_i6 = 0;
-    int32_t lon_i6 = 0;
-};
-
-struct MeshCorePhoneRadioStats
-{
-    int16_t noise_floor_dbm = 0;
-    int8_t last_rssi_dbm = 0;
-    int8_t last_snr_qdb = 0;
-    uint32_t tx_air_seconds = 0;
-    uint32_t rx_air_seconds = 0;
-};
-
-struct MeshCorePhonePacketStats
-{
-    uint32_t rx_packets = 0;
-    uint32_t tx_packets = 0;
-    uint32_t tx_flood = 0;
-    uint32_t tx_direct = 0;
-    uint32_t rx_flood = 0;
-    uint32_t rx_direct = 0;
-};
-
-struct MeshCorePhoneTuningParams
-{
-    uint32_t rx_delay_base_ms = 0;
-    uint32_t airtime_factor_milli = 0;
-};
-
-class MeshCorePhoneHooks
-{
-  public:
-    virtual ~MeshCorePhoneHooks() = default;
-    virtual uint32_t getReportedBlePin() const { return 0; }
-    virtual MeshCorePhoneBatteryInfo getBatteryInfo() const { return {}; }
-    virtual MeshCorePhoneLocation getAdvertLocation() const { return {}; }
-    virtual uint8_t getAdvertLocationPolicy() const { return 0; }
-    virtual uint8_t getTelemetryModeBits() const { return 0; }
-    virtual bool getManualAddContacts() const { return false; }
-    virtual bool resolvePeerPublicKey(const uint8_t* in_pubkey, size_t in_len,
-                                      uint8_t* out_pubkey, size_t out_len) const
-    {
-        if (!in_pubkey || !out_pubkey || out_len == 0)
-        {
-            return false;
-        }
-        const size_t copy_len = (in_len < out_len) ? in_len : out_len;
-        for (size_t i = 0; i < copy_len; ++i)
-        {
-            out_pubkey[i] = in_pubkey[i];
-        }
-        for (size_t i = copy_len; i < out_len; ++i)
-        {
-            out_pubkey[i] = 0;
-        }
-        return true;
-    }
-    virtual void onPendingBinaryRequest(uint32_t) {}
-    virtual void onPendingTelemetryRequest(uint32_t) {}
-    virtual void onPendingPathDiscoveryRequest(uint32_t) {}
-    virtual void onSentRoute(bool) {}
-    virtual bool lookupAdvertPath(const uint8_t*, size_t, uint32_t*, uint8_t*, size_t*) const { return false; }
-    virtual bool hasActiveConnection(const uint8_t*, size_t) const { return false; }
-    virtual void logoutActiveConnection(const uint8_t*, size_t) {}
-    virtual bool getRadioStats(MeshCorePhoneRadioStats*) const { return false; }
-    virtual bool getPacketStats(MeshCorePhonePacketStats*) const { return false; }
-    virtual bool setAdvertLocation(int32_t, int32_t) { return false; }
-    virtual bool upsertContactFromFrame(const uint8_t*, size_t) { return false; }
-    virtual bool removeContact(const uint8_t*, size_t) { return false; }
-    virtual bool exportContact(const uint8_t*, size_t, uint8_t*, size_t*) const { return false; }
-    virtual bool importContact(const uint8_t*, size_t) { return false; }
-    virtual bool shareContact(const uint8_t*, size_t) { return false; }
-    virtual bool popOfflineMessage(uint8_t*, size_t*) { return false; }
-    virtual bool setTuningParams(const MeshCorePhoneTuningParams&) { return false; }
-    virtual bool getTuningParams(MeshCorePhoneTuningParams*) const { return false; }
-    virtual bool setOtherParams(uint8_t, uint8_t, bool, uint8_t, uint8_t) { return false; }
-    virtual bool setDevicePin(uint32_t) { return false; }
-    virtual bool getCustomVars(std::string*) const { return false; }
-    virtual bool setCustomVar(const char*, const char*) { return false; }
-    virtual void onFactoryReset() {}
-};
-
-class MeshCorePhoneCore
-{
-  public:
-    MeshCorePhoneCore(IPhoneRuntimeContext& ctx, const std::string& device_name,
-                      MeshCorePhoneHooks* hooks = nullptr);
-
-    void reset();
-    void pumpIncomingAppData();
-    void onIncomingText(const chat::MeshIncomingText& msg);
-    bool handleRxFrame(const uint8_t* data, size_t len);
-    bool popTxFrame(uint8_t* out, size_t* out_len);
-    bool canHandleCommand(uint8_t cmd) const;
-
-  private:
-    void handleCmdFrame(const uint8_t* data, size_t len);
-    void enqueueFrame(const uint8_t* data, size_t len);
-    void enqueueSentOk();
-    void enqueueErr(uint8_t err);
-    void enqueueRawDataPush(const chat::MeshIncomingData& msg);
-    uint32_t resolveNodeIdFromPrefix(const uint8_t* prefix, size_t len) const;
-    bool buildContactFromNode(const chat::contacts::NodeEntry& entry, uint8_t code, MeshCoreBleFrame& out) const;
-
-    IPhoneRuntimeContext& ctx_;
-    std::string device_name_;
-    MeshCorePhoneHooks* hooks_ = nullptr;
-    std::deque<MeshCoreBleFrame> tx_queue_;
-    std::vector<uint8_t> sign_data_;
-    bool sign_active_ = false;
-    uint32_t stats_rx_packets_ = 0;
-    uint32_t stats_tx_packets_ = 0;
-    uint32_t stats_tx_flood_ = 0;
-    uint32_t stats_tx_direct_ = 0;
-    uint32_t stats_rx_flood_ = 0;
-    uint32_t stats_rx_direct_ = 0;
-};
+using MeshCoreBleFrame = ::phone::meshcore::MeshCoreBleFrame;
+using MeshCorePhoneBatteryInfo = ::phone::meshcore::MeshCorePhoneBatteryInfo;
+using MeshCorePhoneLocation = ::phone::meshcore::MeshCorePhoneLocation;
+using MeshCorePhoneRadioStats = ::phone::meshcore::MeshCorePhoneRadioStats;
+using MeshCorePhonePacketStats = ::phone::meshcore::MeshCorePhonePacketStats;
+using MeshCorePhoneTuningParams = ::phone::meshcore::MeshCorePhoneTuningParams;
+using MeshCorePhoneHooks = ::phone::meshcore::MeshCorePhoneHooks;
+using MeshCorePhoneCore = ::phone::meshcore::MeshCorePhoneCore;
 
 } // namespace ble
diff --git a/modules/core_chat/include/chat/ble/meshtastic_defaults.h b/modules/core_chat/include/chat/ble/meshtastic_defaults.h
index 162c772b..ac6bb1dc 100644
--- a/modules/core_chat/include/chat/ble/meshtastic_defaults.h
+++ b/modules/core_chat/include/chat/ble/meshtastic_defaults.h
@@ -1,26 +1,10 @@
 #pragma once
 
-#include <cstdint>
+#include "phone/meshtastic/meshtastic_defaults.h"
 
 namespace ble::meshtastic_defaults
 {
 
-constexpr uint32_t kConfigNonceOnlyConfig = 69420U;
-constexpr uint32_t kConfigNonceOnlyNodes = 69421U;
-constexpr uint8_t kMaxMeshtasticChannels = 8U;
-constexpr uint32_t kOfficialMinAppVersion = 30200U;
-constexpr uint32_t kOfficialDeviceStateVersion = 24U;
-constexpr const char* kCompatFirmwareVersion = "2.7.4.0";
-constexpr uint32_t kModuleConfigVersion = 1U;
-
-constexpr const char* kDefaultMqttAddress = "mqtt.meshtastic.org";
-constexpr const char* kDefaultMqttUsername = "meshdev";
-constexpr const char* kDefaultMqttPassword = "large4cats";
-constexpr const char* kDefaultMqttRoot = "msh";
-constexpr bool kDefaultMqttEncryptionEnabled = true;
-constexpr bool kDefaultMqttTlsEnabled = false;
-constexpr uint32_t kDefaultMapPublishIntervalSecs = 60U * 60U;
-constexpr uint32_t kDefaultDetectionMinBroadcastSecs = 45U;
-constexpr uint32_t kDefaultAmbientCurrent = 10U;
+using namespace ::phone::meshtastic::defaults;
 
 } // namespace ble::meshtastic_defaults
diff --git a/modules/core_chat/include/chat/ble/meshtastic_phone_config_bridge.h b/modules/core_chat/include/chat/ble/meshtastic_phone_config_bridge.h
index cd796fd7..1dcad911 100644
--- a/modules/core_chat/include/chat/ble/meshtastic_phone_config_bridge.h
+++ b/modules/core_chat/include/chat/ble/meshtastic_phone_config_bridge.h
@@ -1,249 +1,10 @@
 #pragma once
 
-#include "chat/ble/meshtastic_defaults.h"
-#include "meshtastic/config.pb.h"
-#include "meshtastic/localonly.pb.h"
-#include "meshtastic/mesh.pb.h"
-
-#include <cstdint>
-#include <cstring>
+#include "phone/meshtastic/meshtastic_phone_config_bridge.h"
 
 namespace ble::meshtastic_config_bridge
 {
 
-struct PersistedState
-{
-    bool has_bluetooth = false;
-    bool has_module = false;
-    meshtastic_Config_BluetoothConfig bluetooth = meshtastic_Config_BluetoothConfig_init_zero;
-    meshtastic_LocalModuleConfig module = meshtastic_LocalModuleConfig_init_zero;
-};
-
-inline bool isValidBluetoothMode(uint8_t mode)
-{
-    return mode <= static_cast<uint8_t>(meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN);
-}
-
-inline bool isValidBlePin(uint32_t pin)
-{
-    return pin == 0 || (pin >= 100000U && pin <= 999999U);
-}
-
-inline void copyBounded(char* dst, size_t dst_len, const char* src)
-{
-    if (!dst || dst_len == 0)
-    {
-        return;
-    }
-    if (!src)
-    {
-        dst[0] = '\0';
-        return;
-    }
-    std::strncpy(dst, src, dst_len - 1);
-    dst[dst_len - 1] = '\0';
-}
-
-inline void normalizeBluetoothConfig(meshtastic_Config_BluetoothConfig* config)
-{
-    if (!config)
-    {
-        return;
-    }
-    if (!isValidBluetoothMode(static_cast<uint8_t>(config->mode)))
-    {
-        config->mode = meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN;
-    }
-    if (!isValidBlePin(config->fixed_pin) ||
-        config->mode == meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN)
-    {
-        config->fixed_pin = 0;
-    }
-}
-
-inline bool loadBluetoothConfigView(const meshtastic_Config_BluetoothConfig& stored,
-                                    bool runtime_enabled,
-                                    meshtastic_Config_BluetoothConfig* out)
-{
-    if (!out)
-    {
-        return false;
-    }
-    *out = stored;
-    normalizeBluetoothConfig(out);
-    out->enabled = runtime_enabled;
-    return true;
-}
-
-inline uint32_t resolveBlePasskey(const meshtastic_Config_BluetoothConfig& config, uint32_t pending_passkey)
-{
-    if (pending_passkey != 0)
-    {
-        return pending_passkey;
-    }
-    if (config.mode == meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN)
-    {
-        return config.fixed_pin;
-    }
-    return 0;
-}
-
-inline bool fillDeviceConnectionStatus(uint32_t passkey,
-                                       bool is_connected,
-                                       meshtastic_DeviceConnectionStatus* out)
-{
-    if (!out)
-    {
-        return false;
-    }
-
-    meshtastic_DeviceConnectionStatus status = meshtastic_DeviceConnectionStatus_init_zero;
-    *out = status;
-    out->has_bluetooth = true;
-    out->bluetooth.pin = passkey;
-    out->bluetooth.rssi = 0;
-    out->bluetooth.is_connected = is_connected;
-    return true;
-}
-
-inline void repairLegacyMqttConfig(meshtastic_LocalModuleConfig* config)
-{
-    if (!config)
-    {
-        return;
-    }
-
-    config->has_mqtt = true;
-    config->mqtt.address[sizeof(config->mqtt.address) - 1] = '\0';
-    config->mqtt.username[sizeof(config->mqtt.username) - 1] = '\0';
-    config->mqtt.password[sizeof(config->mqtt.password) - 1] = '\0';
-    config->mqtt.root[sizeof(config->mqtt.root) - 1] = '\0';
-    if (config->mqtt.address[0] == '\0')
-    {
-        copyBounded(config->mqtt.address, sizeof(config->mqtt.address), meshtastic_defaults::kDefaultMqttAddress);
-    }
-    if (config->mqtt.username[0] == '\0')
-    {
-        copyBounded(config->mqtt.username, sizeof(config->mqtt.username), meshtastic_defaults::kDefaultMqttUsername);
-    }
-    if (config->mqtt.password[0] == '\0')
-    {
-        copyBounded(config->mqtt.password, sizeof(config->mqtt.password), meshtastic_defaults::kDefaultMqttPassword);
-    }
-    if (config->mqtt.root[0] == '\0')
-    {
-        copyBounded(config->mqtt.root, sizeof(config->mqtt.root), meshtastic_defaults::kDefaultMqttRoot);
-    }
-    if (!config->mqtt.has_map_report_settings)
-    {
-        config->mqtt.has_map_report_settings = true;
-        config->mqtt.map_report_settings.publish_interval_secs = meshtastic_defaults::kDefaultMapPublishIntervalSecs;
-        config->mqtt.map_report_settings.position_precision = 0;
-        config->mqtt.map_report_settings.should_report_location = false;
-    }
-}
-
-inline void initDefaultModuleConfig(meshtastic_LocalModuleConfig* config, uint32_t self_node)
-{
-    if (!config)
-    {
-        return;
-    }
-
-    meshtastic_LocalModuleConfig zero = meshtastic_LocalModuleConfig_init_zero;
-    *config = zero;
-    config->version = meshtastic_defaults::kModuleConfigVersion;
-    config->has_mqtt = true;
-    config->has_serial = true;
-    config->has_external_notification = true;
-    config->has_store_forward = true;
-    config->has_range_test = true;
-    config->has_telemetry = true;
-    config->has_canned_message = true;
-    config->has_audio = true;
-    config->has_remote_hardware = true;
-    config->has_neighbor_info = true;
-    config->has_ambient_lighting = true;
-    config->has_detection_sensor = true;
-    config->has_paxcounter = true;
-
-    copyBounded(config->mqtt.address, sizeof(config->mqtt.address), meshtastic_defaults::kDefaultMqttAddress);
-    copyBounded(config->mqtt.username, sizeof(config->mqtt.username), meshtastic_defaults::kDefaultMqttUsername);
-    copyBounded(config->mqtt.password, sizeof(config->mqtt.password), meshtastic_defaults::kDefaultMqttPassword);
-    copyBounded(config->mqtt.root, sizeof(config->mqtt.root), meshtastic_defaults::kDefaultMqttRoot);
-    config->mqtt.enabled = false;
-    config->mqtt.proxy_to_client_enabled = false;
-    config->mqtt.encryption_enabled = meshtastic_defaults::kDefaultMqttEncryptionEnabled;
-    config->mqtt.tls_enabled = meshtastic_defaults::kDefaultMqttTlsEnabled;
-    config->mqtt.has_map_report_settings = true;
-    config->mqtt.map_report_settings.publish_interval_secs = meshtastic_defaults::kDefaultMapPublishIntervalSecs;
-    config->mqtt.map_report_settings.position_precision = 0;
-    config->mqtt.map_report_settings.should_report_location = false;
-
-    config->telemetry.device_update_interval = 3600;
-    config->telemetry.device_telemetry_enabled = true;
-    config->telemetry.environment_update_interval = 0;
-    config->telemetry.environment_measurement_enabled = false;
-    config->telemetry.power_update_interval = 0;
-    config->telemetry.health_update_interval = 0;
-    config->telemetry.air_quality_interval = 0;
-
-    config->neighbor_info.enabled = false;
-    config->neighbor_info.update_interval = 0;
-    config->neighbor_info.transmit_over_lora = false;
-
-    config->detection_sensor.enabled = false;
-    config->detection_sensor.detection_trigger_type =
-        meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_HIGH;
-    config->detection_sensor.minimum_broadcast_secs = meshtastic_defaults::kDefaultDetectionMinBroadcastSecs;
-
-    config->ambient_lighting.current = meshtastic_defaults::kDefaultAmbientCurrent;
-    config->ambient_lighting.red = (self_node >> 16) & 0xFFU;
-    config->ambient_lighting.green = (self_node >> 8) & 0xFFU;
-    config->ambient_lighting.blue = self_node & 0xFFU;
-}
-
-inline void normalizeModuleConfig(meshtastic_LocalModuleConfig* config)
-{
-    if (!config)
-    {
-        return;
-    }
-    if (config->version == 0)
-    {
-        config->version = meshtastic_defaults::kModuleConfigVersion;
-    }
-    repairLegacyMqttConfig(config);
-}
-
-inline void initializeConfigState(const PersistedState& persisted,
-                                  bool default_enabled,
-                                  uint32_t self_node,
-                                  meshtastic_Config_BluetoothConfig* out_bluetooth,
-                                  meshtastic_LocalModuleConfig* out_module)
-{
-    if (out_bluetooth)
-    {
-        *out_bluetooth = meshtastic_Config_BluetoothConfig_init_zero;
-        out_bluetooth->enabled = default_enabled;
-        out_bluetooth->mode = meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN;
-        out_bluetooth->fixed_pin = 0;
-        if (persisted.has_bluetooth)
-        {
-            *out_bluetooth = persisted.bluetooth;
-        }
-        normalizeBluetoothConfig(out_bluetooth);
-    }
-
-    if (out_module)
-    {
-        initDefaultModuleConfig(out_module, self_node);
-        if (persisted.has_module)
-        {
-            *out_module = persisted.module;
-            normalizeModuleConfig(out_module);
-        }
-    }
-}
+using namespace ::phone::meshtastic::config_bridge;
 
 } // namespace ble::meshtastic_config_bridge
diff --git a/modules/core_chat/include/chat/ble/meshtastic_phone_core.h b/modules/core_chat/include/chat/ble/meshtastic_phone_core.h
index 57529992..51cdf79a 100644
--- a/modules/core_chat/include/chat/ble/meshtastic_phone_core.h
+++ b/modules/core_chat/include/chat/ble/meshtastic_phone_core.h
@@ -1,231 +1,19 @@
-#pragma once
+#pragma once
 
-#include "chat/ble/phone_runtime_context.h"
-#include "chat/domain/chat_types.h"
-#include "chat/ports/i_node_store.h"
-#include "meshtastic/admin.pb.h"
-#include "meshtastic/channel.pb.h"
-#include "meshtastic/config.pb.h"
-#include "meshtastic/device_ui.pb.h"
-#include "meshtastic/localonly.pb.h"
-#include "meshtastic/mesh.pb.h"
-#include "meshtastic/module_config.pb.h"
-#include "meshtastic/telemetry.pb.h"
-
-#include <deque>
+#include "phone/meshtastic/meshtastic_phone_core.h"
 
 namespace ble
 {
 
-struct MeshtasticBleFrame
-{
-    size_t len = 0;
-    uint32_t from_num = 0;
-    uint8_t buf[meshtastic_FromRadio_size] = {};
-};
-
-struct MeshtasticGpsFix
-{
-    bool valid = false;
-    double lat = 0.0;
-    double lng = 0.0;
-    bool has_alt = false;
-    double alt_m = 0.0;
-    bool has_speed = false;
-    double speed_mps = 0.0;
-    bool has_course = false;
-    double course_deg = 0.0;
-    uint8_t satellites = 0;
-};
-
-class MeshtasticPhoneTransport
-{
-  public:
-    virtual ~MeshtasticPhoneTransport() = default;
-    virtual bool isBleConnected() const = 0;
-    virtual void notifyFromNum(uint32_t from_num) = 0;
-};
-
-class MeshtasticPhoneBluetoothConfigHooks
-{
-  public:
-    virtual ~MeshtasticPhoneBluetoothConfigHooks() = default;
-    virtual bool loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const
-    {
-        (void)out;
-        return false;
-    }
-    virtual void saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config)
-    {
-        (void)config;
-    }
-};
-
-class MeshtasticPhoneModuleConfigHooks
-{
-  public:
-    virtual ~MeshtasticPhoneModuleConfigHooks() = default;
-    virtual bool loadModuleConfig(meshtastic_LocalModuleConfig* out) const
-    {
-        (void)out;
-        return false;
-    }
-    virtual void saveModuleConfig(const meshtastic_LocalModuleConfig& config)
-    {
-        (void)config;
-    }
-};
-
-class MeshtasticPhoneConfigLifecycleHooks
-{
-  public:
-    virtual ~MeshtasticPhoneConfigLifecycleHooks() = default;
-    virtual void onConfigStart() {}
-    virtual void onConfigComplete() {}
-};
-
-class MeshtasticPhoneStatusHooks
-{
-  public:
-    virtual ~MeshtasticPhoneStatusHooks() = default;
-    virtual bool loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const
-    {
-        (void)out;
-        return false;
-    }
-};
-
-class MeshtasticPhoneMqttHooks
-{
-  public:
-    virtual ~MeshtasticPhoneMqttHooks() = default;
-    virtual bool handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg)
-    {
-        (void)msg;
-        return false;
-    }
-    virtual bool pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out)
-    {
-        (void)out;
-        return false;
-    }
-};
-
-class MeshtasticPhoneDeviceRuntimeHooks
-{
-  public:
-    virtual ~MeshtasticPhoneDeviceRuntimeHooks() = default;
-    virtual bool loadTimezoneTzdef(char* out, size_t out_len) const
-    {
-        (void)out;
-        (void)out_len;
-        return false;
-    }
-    virtual void saveTimezoneTzdef(const char* tzdef)
-    {
-        (void)tzdef;
-    }
-    virtual int getTimezoneOffsetMinutes() const
-    {
-        return 0;
-    }
-    virtual void setTimezoneOffsetMinutes(int offset_min)
-    {
-        (void)offset_min;
-    }
-    virtual bool getGpsFix(MeshtasticGpsFix* out) const
-    {
-        if (!out)
-        {
-            return false;
-        }
-        *out = {};
-        return false;
-    }
-};
-
-class MeshtasticPhoneCore
-{
-  public:
-    MeshtasticPhoneCore(IPhoneRuntimeContext& ctx, MeshtasticPhoneTransport& transport,
-                        MeshtasticPhoneBluetoothConfigHooks* bluetooth_config_hooks = nullptr,
-                        MeshtasticPhoneModuleConfigHooks* module_config_hooks = nullptr,
-                        MeshtasticPhoneConfigLifecycleHooks* config_lifecycle_hooks = nullptr,
-                        MeshtasticPhoneStatusHooks* status_hooks = nullptr,
-                        MeshtasticPhoneMqttHooks* mqtt_hooks = nullptr,
-                        MeshtasticPhoneDeviceRuntimeHooks* device_runtime_hooks = nullptr);
-
-    void reset();
-    void pumpIncomingAppData();
-    void onIncomingText(const chat::MeshIncomingText& msg);
-    void onIncomingData(const chat::MeshIncomingData& msg);
-    bool handleToRadio(const uint8_t* data, size_t len);
-    bool popToPhone(MeshtasticBleFrame* out);
-    bool isSendingPackets() const;
-    bool isConfigFlowActive() const;
-
-  private:
-    bool handleToRadioPacket(meshtastic_MeshPacket& packet);
-    bool handleAdmin(meshtastic_MeshPacket& packet);
-    bool handleLocalSelfPacket(meshtastic_MeshPacket& packet);
-    bool encodeFromRadio(const meshtastic_FromRadio& from, uint32_t from_num, MeshtasticBleFrame* out) const;
-    bool popConfigSnapshotFrame(MeshtasticBleFrame* out);
-    void enqueueQueueStatus(uint32_t packet_id, bool ok);
-    void enqueueConfigSnapshot(uint32_t config_nonce);
-    void enqueueFromRadio(const meshtastic_FromRadio& from, uint32_t from_num);
-    void notifyFromNum(uint32_t from_num);
-    void fillMyInfo(meshtastic_MyNodeInfo* out) const;
-    void fillSelfNodeInfo(meshtastic_NodeInfo* out) const;
-    void fillNodeInfoFromEntry(const chat::contacts::NodeEntry& entry, meshtastic_NodeInfo* out) const;
-    void fillMetadata(meshtastic_DeviceMetadata* out) const;
-    void fillDeviceUi(meshtastic_DeviceUIConfig* out) const;
-    void fillChannel(uint8_t idx, meshtastic_Channel* out) const;
-    void fillConfig(meshtastic_AdminMessage_ConfigType type, meshtastic_Config* out) const;
-    void fillModuleConfig(meshtastic_AdminMessage_ModuleConfigType type, meshtastic_ModuleConfig* out) const;
-    meshtastic_MyNodeInfo buildMyInfo() const;
-    meshtastic_NodeInfo buildSelfNodeInfo() const;
-    meshtastic_NodeInfo buildNodeInfoFromEntry(const chat::contacts::NodeEntry& entry) const;
-    meshtastic_DeviceMetadata buildMetadata() const;
-    meshtastic_DeviceMetrics buildDeviceMetrics() const;
-    meshtastic_LocalStats buildLocalStats() const;
-    meshtastic_DeviceUIConfig buildDeviceUi() const;
-    meshtastic_Channel buildChannel(uint8_t idx) const;
-    meshtastic_Config buildConfig(meshtastic_AdminMessage_ConfigType type) const;
-    meshtastic_ModuleConfig buildModuleConfig(meshtastic_AdminMessage_ModuleConfigType type) const;
-    meshtastic_MeshPacket buildPacketFromText(const chat::MeshIncomingText& msg) const;
-    meshtastic_MeshPacket buildPacketFromData(const chat::MeshIncomingData& msg) const;
-
-    IPhoneRuntimeContext& ctx_;
-    MeshtasticPhoneTransport& transport_;
-    MeshtasticPhoneBluetoothConfigHooks* bluetooth_config_hooks_ = nullptr;
-    MeshtasticPhoneModuleConfigHooks* module_config_hooks_ = nullptr;
-    MeshtasticPhoneConfigLifecycleHooks* config_lifecycle_hooks_ = nullptr;
-    MeshtasticPhoneStatusHooks* status_hooks_ = nullptr;
-    MeshtasticPhoneMqttHooks* mqtt_hooks_ = nullptr;
-    MeshtasticPhoneDeviceRuntimeHooks* device_runtime_hooks_ = nullptr;
-    uint32_t config_nonce_ = 0;
-    size_t config_node_index_ = 0;
-    uint8_t config_channel_index_ = 0;
-    uint8_t config_type_index_ = 0;
-    uint8_t config_module_type_index_ = 0;
-    uint32_t config_request_seq_ = 0;
-    uint8_t last_to_radio_[meshtastic_ToRadio_size] = {};
-    size_t last_to_radio_len_ = 0;
-    bool config_flow_active_ = false;
-    bool config_drain_empty_pending_ = false;
-    std::deque<MeshtasticBleFrame> frame_queue_;
-    std::deque<meshtastic_QueueStatus> queue_status_queue_;
-    std::deque<meshtastic_MeshPacket> packet_queue_;
-    meshtastic_Config_BluetoothConfig bluetooth_config_ = meshtastic_Config_BluetoothConfig_init_zero;
-    meshtastic_LocalModuleConfig module_config_ = meshtastic_LocalModuleConfig_init_zero;
-    char admin_canned_messages_[160] = {};
-    char admin_ringtone_[96] = {};
-    meshtastic_ToRadio to_radio_scratch_ = meshtastic_ToRadio_init_zero;
-    meshtastic_AdminMessage admin_req_scratch_ = meshtastic_AdminMessage_init_zero;
-    meshtastic_AdminMessage admin_resp_scratch_ = meshtastic_AdminMessage_init_zero;
-    meshtastic_MeshPacket reply_packet_scratch_ = meshtastic_MeshPacket_init_zero;
-    meshtastic_MqttClientProxyMessage mqtt_proxy_scratch_ = meshtastic_MqttClientProxyMessage_init_zero;
-    meshtastic_FromRadio from_radio_scratch_ = meshtastic_FromRadio_init_zero;
-};
+using MeshtasticBleFrame = ::phone::meshtastic::MeshtasticBleFrame;
+using MeshtasticGpsFix = ::phone::meshtastic::MeshtasticGpsFix;
+using MeshtasticPhoneTransport = ::phone::meshtastic::MeshtasticPhoneTransport;
+using MeshtasticPhoneBluetoothConfigHooks = ::phone::meshtastic::MeshtasticPhoneBluetoothConfigHooks;
+using MeshtasticPhoneModuleConfigHooks = ::phone::meshtastic::MeshtasticPhoneModuleConfigHooks;
+using MeshtasticPhoneConfigLifecycleHooks = ::phone::meshtastic::MeshtasticPhoneConfigLifecycleHooks;
+using MeshtasticPhoneStatusHooks = ::phone::meshtastic::MeshtasticPhoneStatusHooks;
+using MeshtasticPhoneMqttHooks = ::phone::meshtastic::MeshtasticPhoneMqttHooks;
+using MeshtasticPhoneDeviceRuntimeHooks = ::phone::meshtastic::MeshtasticPhoneDeviceRuntimeHooks;
+using MeshtasticPhoneCore = ::phone::meshtastic::MeshtasticPhoneCore;
 
 } // namespace ble
diff --git a/modules/core_chat/include/chat/ble/meshtastic_phone_session.h b/modules/core_chat/include/chat/ble/meshtastic_phone_session.h
index 853310d4..1acbb895 100644
--- a/modules/core_chat/include/chat/ble/meshtastic_phone_session.h
+++ b/modules/core_chat/include/chat/ble/meshtastic_phone_session.h
@@ -1,33 +1,10 @@
 #pragma once
 
-#include "chat/ble/meshtastic_phone_core.h"
+#include "phone/meshtastic/meshtastic_phone_session.h"
 
 namespace ble
 {
 
-class MeshtasticPhoneSession
-{
-  public:
-    MeshtasticPhoneSession(IPhoneRuntimeContext& ctx,
-                           MeshtasticPhoneTransport& transport,
-                           MeshtasticPhoneBluetoothConfigHooks* bluetooth_config_hooks,
-                           MeshtasticPhoneModuleConfigHooks* module_config_hooks,
-                           MeshtasticPhoneConfigLifecycleHooks* config_lifecycle_hooks,
-                           MeshtasticPhoneStatusHooks* status_hooks,
-                           MeshtasticPhoneMqttHooks* mqtt_hooks,
-                           MeshtasticPhoneDeviceRuntimeHooks* device_runtime_hooks);
-
-    void close();
-    void pumpIncomingAppData();
-    bool isSendingPackets() const;
-    bool isConfigFlowActive() const;
-    bool handleToRadio(const uint8_t* buf, size_t len);
-    bool popToPhone(MeshtasticBleFrame* out);
-    void onIncomingText(const chat::MeshIncomingText& msg);
-    void onIncomingData(const chat::MeshIncomingData& msg);
-
-  private:
-    MeshtasticPhoneCore core_;
-};
+using MeshtasticPhoneSession = ::phone::meshtastic::MeshtasticPhoneSession;
 
 } // namespace ble
diff --git a/modules/core_chat/include/chat/ble/phone_runtime_context.h b/modules/core_chat/include/chat/ble/phone_runtime_context.h
index bb2d4828..3629bfb2 100644
--- a/modules/core_chat/include/chat/ble/phone_runtime_context.h
+++ b/modules/core_chat/include/chat/ble/phone_runtime_context.h
@@ -1,87 +1,12 @@
 #pragma once
 
-#include "chat/domain/chat_types.h"
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-
-namespace chat
-{
-class ChatService;
-class IMeshAdapter;
-namespace contacts
-{
-class ContactService;
-class INodeStore;
-} // namespace contacts
-} // namespace chat
+#include "phone/common/phone_runtime_context.h"
 
 namespace ble
 {
 
-struct MeshtasticPhoneConfigSnapshot
-{
-    chat::MeshConfig mesh{};
-    bool relay_enabled = false;
-    char node_name[32] = {};
-    char short_name[16] = {};
-    bool primary_enabled = false;
-    bool secondary_enabled = false;
-    bool primary_uplink_enabled = false;
-    bool primary_downlink_enabled = false;
-    bool secondary_uplink_enabled = false;
-    bool secondary_downlink_enabled = false;
-    bool gps_enabled = true;
-    uint8_t gps_mode = 0;
-    uint32_t gps_interval_ms = 0;
-    uint8_t gps_strategy = 0;
-};
-
-struct MeshCorePhoneConfigSnapshot
-{
-    chat::MeshProtocol active_protocol = chat::MeshProtocol::Meshtastic;
-    chat::MeshConfig mesh{};
-    char node_name[32] = {};
-    char short_name[16] = {};
-    int8_t tx_power_min_dbm = 0;
-    int8_t tx_power_max_dbm = 0;
-};
-
-class IPhoneRuntimeContext
-{
-  public:
-    virtual ~IPhoneRuntimeContext() = default;
-
-    virtual MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const = 0;
-    virtual void setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config) = 0;
-    virtual MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const = 0;
-    virtual void setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config) = 0;
-    virtual void saveConfig() = 0;
-    virtual void applyMeshConfig() = 0;
-    virtual void applyUserInfo() = 0;
-    virtual void applyPositionConfig() = 0;
-    virtual void getEffectiveUserInfo(char* out_long,
-                                      std::size_t long_len,
-                                      char* out_short,
-                                      std::size_t short_len) const = 0;
-
-    virtual chat::ChatService& getChatService() = 0;
-    virtual chat::contacts::ContactService& getContactService() = 0;
-    virtual chat::IMeshAdapter* getMeshAdapter() = 0;
-    virtual const chat::IMeshAdapter* getMeshAdapter() const = 0;
-    virtual chat::contacts::INodeStore* getNodeStore() = 0;
-    virtual const chat::contacts::INodeStore* getNodeStore() const = 0;
-    virtual chat::NodeId getSelfNodeId() const = 0;
-
-    virtual bool isBleEnabled() const = 0;
-    virtual void setBleEnabled(bool enabled) = 0;
-    virtual bool getDeviceMacAddress(uint8_t out_mac[6]) const = 0;
-    virtual bool syncCurrentEpochSeconds(uint32_t epoch_seconds) = 0;
-    virtual void resetMeshConfig() = 0;
-    virtual void clearNodeDb() = 0;
-    virtual void clearMessageDb() = 0;
-    virtual void restartDevice() = 0;
-};
+using MeshtasticPhoneConfigSnapshot = ::phone::MeshtasticPhoneConfigSnapshot;
+using MeshCorePhoneConfigSnapshot = ::phone::MeshCorePhoneConfigSnapshot;
+using IPhoneRuntimeContext = ::phone::IPhoneRuntimeContext;
 
 } // namespace ble
diff --git a/modules/core_chat/include/chat/delivery/chat_delivery_action_service.h b/modules/core_chat/include/chat/delivery/chat_delivery_action_service.h
new file mode 100644
index 00000000..5eee3b8b
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/chat_delivery_action_service.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_action_sink.h"
+#include "chat/delivery/chat_delivery_read_model.h"
+
+namespace chat::delivery
+{
+
+class IRetryChatMessagePort
+{
+  public:
+    virtual ~IRetryChatMessagePort() = default;
+
+    virtual ChatDeliveryActionResult retryMessage(ChatDeliveryRef ref) = 0;
+};
+
+class ChatDeliveryActionService final : public IChatDeliveryActionSink
+{
+  public:
+    ChatDeliveryActionService(ChatDeliveryReadModel& read_model,
+                              IRetryChatMessagePort* retry_port = nullptr);
+
+    ChatDeliveryActionResult handleDeliveryAction(
+        const ChatDeliveryActionRequest& request) override;
+
+  private:
+    ChatDeliveryActionResult retry(ChatDeliveryRef ref);
+    ChatDeliveryActionResult cancelPending(ChatDeliveryRef ref);
+    ChatDeliveryActionResult clearFailure(ChatDeliveryRef ref);
+
+    ChatDeliveryReadModel& read_model_;
+    IRetryChatMessagePort* retry_port_ = nullptr;
+};
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/delivery/chat_delivery_action_sink.h b/modules/core_chat/include/chat/delivery/chat_delivery_action_sink.h
new file mode 100644
index 00000000..7db2c7c1
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/chat_delivery_action_sink.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_action_types.h"
+
+namespace chat::delivery
+{
+
+class IChatDeliveryActionSink
+{
+  public:
+    virtual ~IChatDeliveryActionSink() = default;
+
+    virtual ChatDeliveryActionResult handleDeliveryAction(
+        const ChatDeliveryActionRequest& request) = 0;
+};
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/delivery/chat_delivery_action_types.h b/modules/core_chat/include/chat/delivery/chat_delivery_action_types.h
new file mode 100644
index 00000000..4abcc809
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/chat_delivery_action_types.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_types.h"
+
+namespace chat::delivery
+{
+
+enum class ChatDeliveryActionKind : uint8_t
+{
+    Retry,
+    CancelPending,
+    ClearFailure,
+};
+
+struct ChatDeliveryActionRequest
+{
+    ChatDeliveryActionKind kind = ChatDeliveryActionKind::ClearFailure;
+    ChatDeliveryRef ref;
+};
+
+enum class ChatDeliveryActionFailure : uint8_t
+{
+    None,
+    InvalidRef,
+    NotFound,
+    Unsupported,
+    NotRetryable,
+    Rejected,
+};
+
+struct ChatDeliveryActionResult
+{
+    bool ok = false;
+    ChatDeliveryActionFailure failure = ChatDeliveryActionFailure::None;
+
+    static ChatDeliveryActionResult success()
+    {
+        ChatDeliveryActionResult result;
+        result.ok = true;
+        result.failure = ChatDeliveryActionFailure::None;
+        return result;
+    }
+
+    static ChatDeliveryActionResult fail(ChatDeliveryActionFailure failure)
+    {
+        ChatDeliveryActionResult result;
+        result.ok = false;
+        result.failure = failure;
+        return result;
+    }
+};
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/delivery/chat_delivery_event_port.h b/modules/core_chat/include/chat/delivery/chat_delivery_event_port.h
new file mode 100644
index 00000000..aeb50e8c
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/chat_delivery_event_port.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_event_projector.h"
+
+namespace chat::delivery
+{
+
+struct ChatDeliveryEvent
+{
+    ChatDeliveryRef ref;
+    DeliveryState state = DeliveryState::Unknown;
+    SendFailureKind failure = SendFailureKind::None;
+    uint32_t timestamp_ms = 0;
+};
+
+class IChatDeliveryEventPort
+{
+  public:
+    virtual ~IChatDeliveryEventPort() = default;
+
+    virtual void publishDeliveryEvent(const ChatDeliveryEvent& event) = 0;
+};
+
+class ProjectingChatDeliveryEventPort final : public IChatDeliveryEventPort
+{
+  public:
+    explicit ProjectingChatDeliveryEventPort(
+        ChatDeliveryEventProjector& projector);
+
+    void publishDeliveryEvent(const ChatDeliveryEvent& event) override;
+
+  private:
+    ChatDeliveryEventProjector& projector_;
+};
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/delivery/chat_delivery_event_projector.h b/modules/core_chat/include/chat/delivery/chat_delivery_event_projector.h
new file mode 100644
index 00000000..4b3a8254
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/chat_delivery_event_projector.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_read_model.h"
+
+namespace chat::delivery
+{
+
+enum class SendFailureKind : uint8_t
+{
+    None,
+    PeerKeyMissing,
+    LocalIdentityMissing,
+    RadioSendFailed,
+    AckTimeout,
+    UnsupportedProtocol,
+    Rejected,
+    Unknown,
+};
+
+class ChatDeliveryEventProjector
+{
+  public:
+    explicit ChatDeliveryEventProjector(ChatDeliveryReadModel& read_model);
+
+    void onQueued(ChatDeliveryRef ref, uint32_t now_ms);
+    void onSending(ChatDeliveryRef ref, uint32_t now_ms);
+    void onSent(ChatDeliveryRef ref, uint32_t now_ms);
+    void onDelivered(ChatDeliveryRef ref, uint32_t now_ms);
+    void onFailed(ChatDeliveryRef ref,
+                  SendFailureKind failure,
+                  uint32_t now_ms);
+    void onReceived(ChatDeliveryRef ref, uint32_t now_ms);
+
+  private:
+    void project(ChatDeliveryRef ref,
+                 DeliveryState state,
+                 DeliveryFailureKind failure,
+                 uint32_t now_ms);
+
+    ChatDeliveryReadModel& read_model_;
+};
+
+DeliveryFailureKind toDeliveryFailureKind(SendFailureKind failure);
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/delivery/chat_delivery_read_model.h b/modules/core_chat/include/chat/delivery/chat_delivery_read_model.h
new file mode 100644
index 00000000..b585e829
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/chat_delivery_read_model.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_types.h"
+
+#include <stddef.h>
+
+namespace chat::delivery
+{
+
+class ChatDeliveryReadModel
+{
+  public:
+    static constexpr size_t kMaxRecords = 32;
+
+    bool upsert(const ChatDeliveryRecord& record);
+    bool find(const ChatDeliveryRef& ref, ChatDeliveryRecord& out) const;
+    void clear(const ChatDeliveryRef& ref);
+    void clearAll();
+
+    size_t size() const;
+
+  private:
+    ChatDeliveryRecord records_[kMaxRecords]{};
+    size_t count_ = 0;
+};
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/delivery/chat_delivery_types.h b/modules/core_chat/include/chat/delivery/chat_delivery_types.h
new file mode 100644
index 00000000..fe80a2bd
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/chat_delivery_types.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace chat::delivery
+{
+
+enum class DeliveryState : uint8_t
+{
+    Unknown,
+    Queued,
+    Sending,
+    Sent,
+    Delivered,
+    Failed,
+    Received,
+};
+
+enum class DeliveryFailureKind : uint8_t
+{
+    None,
+    PeerKeyMissing,
+    LocalIdentityMissing,
+    RadioSendFailed,
+    AckTimeout,
+    UnsupportedProtocol,
+    Rejected,
+    Unknown,
+};
+
+struct ChatDeliveryRef
+{
+    uint64_t local_id = 0;
+    uint32_t protocol_id = 0;
+    uint32_t nonce_or_seq = 0;
+
+    bool isValid() const
+    {
+        return local_id != 0 || protocol_id != 0 || nonce_or_seq != 0;
+    }
+
+    bool operator==(const ChatDeliveryRef& other) const
+    {
+        return local_id == other.local_id &&
+               protocol_id == other.protocol_id &&
+               nonce_or_seq == other.nonce_or_seq;
+    }
+};
+
+struct ChatDeliveryRecord
+{
+    ChatDeliveryRef ref;
+    DeliveryState state = DeliveryState::Unknown;
+    DeliveryFailureKind failure = DeliveryFailureKind::None;
+    uint32_t updated_at_ms = 0;
+};
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/delivery/legacy_chat_delivery_bridge.h b/modules/core_chat/include/chat/delivery/legacy_chat_delivery_bridge.h
new file mode 100644
index 00000000..978b0112
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/legacy_chat_delivery_bridge.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_event_projector.h"
+#include "chat/domain/chat_types.h"
+
+namespace chat::delivery
+{
+
+ChatDeliveryRef toDeliveryRef(const chat::ChatMessage& message);
+ChatDeliveryRecord toDeliveryRecord(const chat::ChatMessage& message,
+                                    uint32_t now_ms = 0);
+ChatDeliveryRecord toFailedDeliveryRecord(ChatDeliveryRef ref,
+                                          SendFailureKind failure,
+                                          uint32_t now_ms = 0);
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/delivery/legacy_chat_send_result_mapper.h b/modules/core_chat/include/chat/delivery/legacy_chat_send_result_mapper.h
new file mode 100644
index 00000000..3a23b77b
--- /dev/null
+++ b/modules/core_chat/include/chat/delivery/legacy_chat_send_result_mapper.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_event_port.h"
+
+namespace chat::delivery
+{
+
+enum class LegacyChatSendFailure : uint8_t
+{
+    None,
+    PeerKeyMissing,
+    LocalIdentityMissing,
+    RadioSendFailed,
+    AckTimeout,
+    UnsupportedProtocol,
+    Rejected,
+    Unknown,
+};
+
+struct LegacyChatSendResult
+{
+    ChatDeliveryRef ref;
+    bool success = false;
+    LegacyChatSendFailure failure = LegacyChatSendFailure::Unknown;
+    uint32_t timestamp_ms = 0;
+};
+
+SendFailureKind mapLegacyChatSendFailure(LegacyChatSendFailure failure);
+ChatDeliveryEvent mapLegacyChatSendResult(
+    const LegacyChatSendResult& result);
+ChatDeliveryEvent makeAckTimeoutDeliveryEvent(ChatDeliveryRef ref,
+                                              uint32_t timestamp_ms = 0);
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/include/chat/domain/chat_types.h b/modules/core_chat/include/chat/domain/chat_types.h
index 6ee1dd6a..656ecec1 100644
--- a/modules/core_chat/include/chat/domain/chat_types.h
+++ b/modules/core_chat/include/chat/domain/chat_types.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <limits>
@@ -14,6 +15,59 @@
 namespace chat
 {
 
+constexpr std::size_t kMeshCoreChannelKeyLen = 16;
+constexpr std::size_t kMeshtasticChannelKeyDefaultLen = 16;
+constexpr std::size_t kMeshtasticChannelKeyMaxLen = 32;
+
+inline bool isAllZeroKeyBytes(const uint8_t* key, std::size_t len)
+{
+    if (!key || len == 0)
+    {
+        return true;
+    }
+    for (std::size_t index = 0; index < len; ++index)
+    {
+        if (key[index] != 0)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+inline uint8_t normalizeMeshtasticChannelKeyLen(const uint8_t* key,
+                                                std::size_t capacity,
+                                                uint8_t stored_len)
+{
+    if (!key || capacity < kMeshtasticChannelKeyDefaultLen)
+    {
+        return 0;
+    }
+
+    if ((stored_len == kMeshtasticChannelKeyDefaultLen ||
+         stored_len == kMeshtasticChannelKeyMaxLen) &&
+        stored_len <= capacity)
+    {
+        return isAllZeroKeyBytes(key, stored_len) ? 0 : stored_len;
+    }
+
+    const std::size_t inspect_len =
+        capacity >= kMeshtasticChannelKeyMaxLen ? kMeshtasticChannelKeyMaxLen
+                                                : kMeshtasticChannelKeyDefaultLen;
+    if (isAllZeroKeyBytes(key, inspect_len))
+    {
+        return 0;
+    }
+
+    if (capacity >= kMeshtasticChannelKeyMaxLen &&
+        !isAllZeroKeyBytes(key + kMeshtasticChannelKeyDefaultLen,
+                           kMeshtasticChannelKeyDefaultLen))
+    {
+        return kMeshtasticChannelKeyMaxLen;
+    }
+    return kMeshtasticChannelKeyDefaultLen;
+}
+
 /**
  * @brief Channel identifier
  * Primary channel (0) is the default public channel
@@ -274,9 +328,15 @@ struct MeshConfig
     bool ignore_mqtt;             // Ignore incoming packets that arrived via MQTT
     bool config_ok_to_mqtt;       // Set ok_to_mqtt bit on outgoing packets
 
-    // Channel encryption keys (PSK for encrypted channels)
-    uint8_t primary_key[16];   // Primary channel key (usually empty for public)
-    uint8_t secondary_key[16]; // Secondary channel key (Squad PSK)
+    // Meshtastic channel identity and encryption keys
+    char primary_channel_name[32];
+    char secondary_channel_name[32];
+    uint32_t primary_channel_id;
+    uint32_t secondary_channel_id;
+    uint8_t primary_key[kMeshtasticChannelKeyMaxLen];   // Meshtastic PSK storage; MeshCore uses first 16 bytes.
+    uint8_t primary_key_len;                            // Meshtastic PSK length: 0, 16, or 32.
+    uint8_t secondary_key[kMeshtasticChannelKeyMaxLen]; // Meshtastic PSK storage; MeshCore uses first 16 bytes.
+    uint8_t secondary_key_len;                          // Meshtastic PSK length: 0, 16, or 32.
 
     // MeshCore radio/channel tuning
     uint8_t meshcore_region_preset; // 0=Custom, >0 preset id
@@ -309,6 +369,10 @@ struct MeshConfig
           enable_relay(true),
           ignore_mqtt(false),
           config_ok_to_mqtt(false),
+          primary_channel_id(0),
+          secondary_channel_id(0),
+          primary_key_len(0),
+          secondary_key_len(0),
           meshcore_region_preset(0),
           meshcore_freq_mhz(915.0f),
           meshcore_bw_khz(125.0f),
@@ -321,8 +385,12 @@ struct MeshConfig
           meshcore_multi_acks(false),
           meshcore_channel_slot(0)
     {
-        memset(primary_key, 0, 16);
-        memset(secondary_key, 0, 16);
+        strncpy(primary_channel_name, "LongFast", sizeof(primary_channel_name) - 1);
+        primary_channel_name[sizeof(primary_channel_name) - 1] = '\0';
+        strncpy(secondary_channel_name, "Secondary", sizeof(secondary_channel_name) - 1);
+        secondary_channel_name[sizeof(secondary_channel_name) - 1] = '\0';
+        memset(primary_key, 0, sizeof(primary_key));
+        memset(secondary_key, 0, sizeof(secondary_key));
         meshcore_channel_name[0] = '\0';
     }
 };
diff --git a/modules/core_chat/include/chat/infra/meshcore/mc_region_presets.h b/modules/core_chat/include/chat/infra/meshcore/mc_region_presets.h
index df76d3d5..e6463c9b 100644
--- a/modules/core_chat/include/chat/infra/meshcore/mc_region_presets.h
+++ b/modules/core_chat/include/chat/infra/meshcore/mc_region_presets.h
@@ -21,6 +21,7 @@ struct RegionPreset
     float bw_khz;
     uint8_t sf;
     uint8_t cr;
+    int8_t tx_power_dbm;
 };
 
 const RegionPreset* getRegionPresetTable(size_t* out_count);
diff --git a/modules/core_chat/include/chat/infra/meshtastic/mt_radio_config.h b/modules/core_chat/include/chat/infra/meshtastic/mt_radio_config.h
index 4f4d364d..bf3d79e8 100644
--- a/modules/core_chat/include/chat/infra/meshtastic/mt_radio_config.h
+++ b/modules/core_chat/include/chat/infra/meshtastic/mt_radio_config.h
@@ -34,6 +34,8 @@ struct RadioConfig
 };
 
 const char* primaryChannelName(const MeshConfig& config);
+const char* secondaryChannelName(const MeshConfig& config);
+const char* channelName(const MeshConfig& config, ChannelId channel);
 RadioConfig deriveRadioConfig(const MeshConfig& config);
 
 } // namespace meshtastic
diff --git a/modules/core_chat/src/delivery/chat_delivery_action_service.cpp b/modules/core_chat/src/delivery/chat_delivery_action_service.cpp
new file mode 100644
index 00000000..4a880a98
--- /dev/null
+++ b/modules/core_chat/src/delivery/chat_delivery_action_service.cpp
@@ -0,0 +1,88 @@
+#include "chat/delivery/chat_delivery_action_service.h"
+
+namespace chat::delivery
+{
+
+ChatDeliveryActionService::ChatDeliveryActionService(
+    ChatDeliveryReadModel& read_model,
+    IRetryChatMessagePort* retry_port)
+    : read_model_(read_model),
+      retry_port_(retry_port)
+{
+}
+
+ChatDeliveryActionResult ChatDeliveryActionService::handleDeliveryAction(
+    const ChatDeliveryActionRequest& request)
+{
+    if (!request.ref.isValid())
+    {
+        return ChatDeliveryActionResult::fail(
+            ChatDeliveryActionFailure::InvalidRef);
+    }
+
+    switch (request.kind)
+    {
+    case ChatDeliveryActionKind::Retry:
+        return retry(request.ref);
+    case ChatDeliveryActionKind::CancelPending:
+        return cancelPending(request.ref);
+    case ChatDeliveryActionKind::ClearFailure:
+        return clearFailure(request.ref);
+    }
+
+    return ChatDeliveryActionResult::fail(
+        ChatDeliveryActionFailure::Unsupported);
+}
+
+ChatDeliveryActionResult ChatDeliveryActionService::retry(ChatDeliveryRef ref)
+{
+    if (retry_port_ == nullptr)
+    {
+        return ChatDeliveryActionResult::fail(
+            ChatDeliveryActionFailure::Unsupported);
+    }
+    return retry_port_->retryMessage(ref);
+}
+
+ChatDeliveryActionResult ChatDeliveryActionService::cancelPending(
+    ChatDeliveryRef ref)
+{
+    ChatDeliveryRecord record{};
+    if (!read_model_.find(ref, record))
+    {
+        return ChatDeliveryActionResult::fail(
+            ChatDeliveryActionFailure::NotFound);
+    }
+
+    if (record.state != DeliveryState::Queued &&
+        record.state != DeliveryState::Sending)
+    {
+        return ChatDeliveryActionResult::fail(
+            ChatDeliveryActionFailure::NotRetryable);
+    }
+
+    read_model_.clear(ref);
+    return ChatDeliveryActionResult::success();
+}
+
+ChatDeliveryActionResult ChatDeliveryActionService::clearFailure(
+    ChatDeliveryRef ref)
+{
+    ChatDeliveryRecord record{};
+    if (!read_model_.find(ref, record))
+    {
+        return ChatDeliveryActionResult::fail(
+            ChatDeliveryActionFailure::NotFound);
+    }
+
+    if (record.state != DeliveryState::Failed)
+    {
+        return ChatDeliveryActionResult::fail(
+            ChatDeliveryActionFailure::NotRetryable);
+    }
+
+    read_model_.clear(ref);
+    return ChatDeliveryActionResult::success();
+}
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/src/delivery/chat_delivery_event_port.cpp b/modules/core_chat/src/delivery/chat_delivery_event_port.cpp
new file mode 100644
index 00000000..1dbfb254
--- /dev/null
+++ b/modules/core_chat/src/delivery/chat_delivery_event_port.cpp
@@ -0,0 +1,45 @@
+#include "chat/delivery/chat_delivery_event_port.h"
+
+namespace chat::delivery
+{
+
+ProjectingChatDeliveryEventPort::ProjectingChatDeliveryEventPort(
+    ChatDeliveryEventProjector& projector)
+    : projector_(projector)
+{
+}
+
+void ProjectingChatDeliveryEventPort::publishDeliveryEvent(
+    const ChatDeliveryEvent& event)
+{
+    if (!event.ref.isValid())
+    {
+        return;
+    }
+
+    switch (event.state)
+    {
+    case DeliveryState::Queued:
+        projector_.onQueued(event.ref, event.timestamp_ms);
+        break;
+    case DeliveryState::Sending:
+        projector_.onSending(event.ref, event.timestamp_ms);
+        break;
+    case DeliveryState::Sent:
+        projector_.onSent(event.ref, event.timestamp_ms);
+        break;
+    case DeliveryState::Delivered:
+        projector_.onDelivered(event.ref, event.timestamp_ms);
+        break;
+    case DeliveryState::Failed:
+        projector_.onFailed(event.ref, event.failure, event.timestamp_ms);
+        break;
+    case DeliveryState::Received:
+        projector_.onReceived(event.ref, event.timestamp_ms);
+        break;
+    case DeliveryState::Unknown:
+        break;
+    }
+}
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/src/delivery/chat_delivery_event_projector.cpp b/modules/core_chat/src/delivery/chat_delivery_event_projector.cpp
new file mode 100644
index 00000000..0f6a8cd6
--- /dev/null
+++ b/modules/core_chat/src/delivery/chat_delivery_event_projector.cpp
@@ -0,0 +1,86 @@
+#include "chat/delivery/chat_delivery_event_projector.h"
+
+namespace chat::delivery
+{
+
+DeliveryFailureKind toDeliveryFailureKind(SendFailureKind failure)
+{
+    switch (failure)
+    {
+    case SendFailureKind::None:
+        return DeliveryFailureKind::None;
+    case SendFailureKind::PeerKeyMissing:
+        return DeliveryFailureKind::PeerKeyMissing;
+    case SendFailureKind::LocalIdentityMissing:
+        return DeliveryFailureKind::LocalIdentityMissing;
+    case SendFailureKind::RadioSendFailed:
+        return DeliveryFailureKind::RadioSendFailed;
+    case SendFailureKind::AckTimeout:
+        return DeliveryFailureKind::AckTimeout;
+    case SendFailureKind::UnsupportedProtocol:
+        return DeliveryFailureKind::UnsupportedProtocol;
+    case SendFailureKind::Rejected:
+        return DeliveryFailureKind::Rejected;
+    case SendFailureKind::Unknown:
+        return DeliveryFailureKind::Unknown;
+    }
+    return DeliveryFailureKind::Unknown;
+}
+
+ChatDeliveryEventProjector::ChatDeliveryEventProjector(
+    ChatDeliveryReadModel& read_model)
+    : read_model_(read_model)
+{
+}
+
+void ChatDeliveryEventProjector::onQueued(ChatDeliveryRef ref, uint32_t now_ms)
+{
+    project(ref, DeliveryState::Queued, DeliveryFailureKind::None, now_ms);
+}
+
+void ChatDeliveryEventProjector::onSending(ChatDeliveryRef ref, uint32_t now_ms)
+{
+    project(ref, DeliveryState::Sending, DeliveryFailureKind::None, now_ms);
+}
+
+void ChatDeliveryEventProjector::onSent(ChatDeliveryRef ref, uint32_t now_ms)
+{
+    project(ref, DeliveryState::Sent, DeliveryFailureKind::None, now_ms);
+}
+
+void ChatDeliveryEventProjector::onDelivered(ChatDeliveryRef ref,
+                                             uint32_t now_ms)
+{
+    project(ref, DeliveryState::Delivered, DeliveryFailureKind::None, now_ms);
+}
+
+void ChatDeliveryEventProjector::onFailed(ChatDeliveryRef ref,
+                                          SendFailureKind failure,
+                                          uint32_t now_ms)
+{
+    project(ref,
+            DeliveryState::Failed,
+            toDeliveryFailureKind(failure),
+            now_ms);
+}
+
+void ChatDeliveryEventProjector::onReceived(ChatDeliveryRef ref,
+                                            uint32_t now_ms)
+{
+    project(ref, DeliveryState::Received, DeliveryFailureKind::None, now_ms);
+}
+
+void ChatDeliveryEventProjector::project(ChatDeliveryRef ref,
+                                         DeliveryState state,
+                                         DeliveryFailureKind failure,
+                                         uint32_t now_ms)
+{
+    ChatDeliveryRecord record{};
+    record.ref = ref;
+    record.state = state;
+    record.failure = failure;
+    record.updated_at_ms = now_ms;
+    (void)read_model_.upsert(record);
+}
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/src/delivery/chat_delivery_read_model.cpp b/modules/core_chat/src/delivery/chat_delivery_read_model.cpp
new file mode 100644
index 00000000..014bd5de
--- /dev/null
+++ b/modules/core_chat/src/delivery/chat_delivery_read_model.cpp
@@ -0,0 +1,93 @@
+#include "chat/delivery/chat_delivery_read_model.h"
+
+namespace chat::delivery
+{
+
+bool ChatDeliveryReadModel::upsert(const ChatDeliveryRecord& record)
+{
+    if (!record.ref.isValid())
+    {
+        return false;
+    }
+
+    for (size_t i = 0; i < count_; ++i)
+    {
+        if (records_[i].ref == record.ref)
+        {
+            records_[i] = record;
+            return true;
+        }
+    }
+
+    if (count_ < kMaxRecords)
+    {
+        records_[count_++] = record;
+        return true;
+    }
+
+    for (size_t i = 1; i < count_; ++i)
+    {
+        records_[i - 1] = records_[i];
+    }
+    records_[count_ - 1] = record;
+    return true;
+}
+
+bool ChatDeliveryReadModel::find(const ChatDeliveryRef& ref,
+                                 ChatDeliveryRecord& out) const
+{
+    if (!ref.isValid())
+    {
+        return false;
+    }
+
+    for (size_t i = 0; i < count_; ++i)
+    {
+        if (records_[i].ref == ref)
+        {
+            out = records_[i];
+            return true;
+        }
+    }
+    return false;
+}
+
+void ChatDeliveryReadModel::clear(const ChatDeliveryRef& ref)
+{
+    if (!ref.isValid())
+    {
+        return;
+    }
+
+    for (size_t i = 0; i < count_; ++i)
+    {
+        if (!(records_[i].ref == ref))
+        {
+            continue;
+        }
+
+        for (size_t j = i + 1; j < count_; ++j)
+        {
+            records_[j - 1] = records_[j];
+        }
+        --count_;
+        records_[count_] = ChatDeliveryRecord{};
+        return;
+    }
+}
+
+void ChatDeliveryReadModel::clearAll()
+{
+    for (size_t i = 0; i < count_; ++i)
+    {
+        records_[i] = ChatDeliveryRecord{};
+    }
+    count_ = 0;
+}
+
+size_t ChatDeliveryReadModel::size() const
+{
+    return count_;
+}
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp b/modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp
new file mode 100644
index 00000000..fb576804
--- /dev/null
+++ b/modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp
@@ -0,0 +1,63 @@
+#include "chat/delivery/legacy_chat_delivery_bridge.h"
+
+namespace chat::delivery
+{
+namespace
+{
+
+DeliveryState mapStatus(chat::MessageStatus status)
+{
+    switch (status)
+    {
+    case chat::MessageStatus::Incoming:
+        return DeliveryState::Received;
+    case chat::MessageStatus::Queued:
+        return DeliveryState::Queued;
+    case chat::MessageStatus::Sent:
+        return DeliveryState::Sent;
+    case chat::MessageStatus::Failed:
+        return DeliveryState::Failed;
+    }
+    return DeliveryState::Unknown;
+}
+
+DeliveryFailureKind mapFailure(chat::MessageStatus status)
+{
+    return status == chat::MessageStatus::Failed
+               ? DeliveryFailureKind::Unknown
+               : DeliveryFailureKind::None;
+}
+
+} // namespace
+
+ChatDeliveryRef toDeliveryRef(const chat::ChatMessage& message)
+{
+    ChatDeliveryRef ref{};
+    ref.protocol_id = message.msg_id;
+    return ref;
+}
+
+ChatDeliveryRecord toDeliveryRecord(const chat::ChatMessage& message,
+                                    uint32_t now_ms)
+{
+    ChatDeliveryRecord record{};
+    record.ref = toDeliveryRef(message);
+    record.state = mapStatus(message.status);
+    record.failure = mapFailure(message.status);
+    record.updated_at_ms = now_ms;
+    return record;
+}
+
+ChatDeliveryRecord toFailedDeliveryRecord(ChatDeliveryRef ref,
+                                          SendFailureKind failure,
+                                          uint32_t now_ms)
+{
+    ChatDeliveryRecord record{};
+    record.ref = ref;
+    record.state = DeliveryState::Failed;
+    record.failure = toDeliveryFailureKind(failure);
+    record.updated_at_ms = now_ms;
+    return record;
+}
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/src/delivery/legacy_chat_send_result_mapper.cpp b/modules/core_chat/src/delivery/legacy_chat_send_result_mapper.cpp
new file mode 100644
index 00000000..b333a697
--- /dev/null
+++ b/modules/core_chat/src/delivery/legacy_chat_send_result_mapper.cpp
@@ -0,0 +1,63 @@
+#include "chat/delivery/legacy_chat_send_result_mapper.h"
+
+namespace chat::delivery
+{
+
+SendFailureKind mapLegacyChatSendFailure(LegacyChatSendFailure failure)
+{
+    switch (failure)
+    {
+    case LegacyChatSendFailure::None:
+        return SendFailureKind::None;
+    case LegacyChatSendFailure::PeerKeyMissing:
+        return SendFailureKind::PeerKeyMissing;
+    case LegacyChatSendFailure::LocalIdentityMissing:
+        return SendFailureKind::LocalIdentityMissing;
+    case LegacyChatSendFailure::RadioSendFailed:
+        return SendFailureKind::RadioSendFailed;
+    case LegacyChatSendFailure::AckTimeout:
+        return SendFailureKind::AckTimeout;
+    case LegacyChatSendFailure::UnsupportedProtocol:
+        return SendFailureKind::UnsupportedProtocol;
+    case LegacyChatSendFailure::Rejected:
+        return SendFailureKind::Rejected;
+    case LegacyChatSendFailure::Unknown:
+        return SendFailureKind::Unknown;
+    }
+    return SendFailureKind::Unknown;
+}
+
+ChatDeliveryEvent mapLegacyChatSendResult(
+    const LegacyChatSendResult& result)
+{
+    ChatDeliveryEvent event{};
+    event.ref = result.ref;
+    event.timestamp_ms = result.timestamp_ms;
+    if (result.success)
+    {
+        event.state = DeliveryState::Sent;
+        event.failure = SendFailureKind::None;
+        return event;
+    }
+
+    event.state = DeliveryState::Failed;
+    event.failure = mapLegacyChatSendFailure(result.failure);
+    if (event.failure == SendFailureKind::None)
+    {
+        event.failure = SendFailureKind::Unknown;
+    }
+    return event;
+}
+
+ChatDeliveryEvent makeAckTimeoutDeliveryEvent(ChatDeliveryRef ref,
+                                              uint32_t timestamp_ms)
+{
+    LegacyChatSendResult result{};
+    result.ref = ref;
+    result.success = false;
+    result.failure = LegacyChatSendFailure::AckTimeout;
+    result.timestamp_ms = timestamp_ms;
+    return mapLegacyChatSendResult(result);
+}
+
+} // namespace chat::delivery
diff --git a/modules/core_chat/src/infra/meshcore/mc_region_presets.cpp b/modules/core_chat/src/infra/meshcore/mc_region_presets.cpp
index c663eb09..b32de227 100644
--- a/modules/core_chat/src/infra/meshcore/mc_region_presets.cpp
+++ b/modules/core_chat/src/infra/meshcore/mc_region_presets.cpp
@@ -14,22 +14,23 @@ namespace
 {
 
 const RegionPreset kRegionPresets[] = {
-    {1, "Australia", 915.800f, 250.0f, 10, 5},
-    {2, "Australia (Narrow)", 916.575f, 62.5f, 7, 8},
-    {3, "Australia: SA, WA", 923.125f, 62.5f, 8, 8},
-    {4, "Australia: QLD", 923.125f, 62.5f, 8, 5},
-    {5, "EU/UK (Narrow)", 869.618f, 62.5f, 8, 8},
-    {6, "EU/UK (Long Range)", 869.525f, 250.0f, 11, 5},
-    {7, "EU/UK (Medium Range)", 869.525f, 250.0f, 10, 5},
-    {8, "Czech Republic (Narrow)", 869.432f, 62.5f, 7, 5},
-    {9, "EU 433MHz (Long Range)", 433.650f, 250.0f, 11, 5},
-    {10, "New Zealand", 917.375f, 250.0f, 11, 5},
-    {11, "New Zealand (Narrow)", 917.375f, 62.5f, 7, 5},
-    {12, "Portugal 433", 433.375f, 62.5f, 9, 6},
-    {13, "Portugal 868", 869.618f, 62.5f, 7, 6},
-    {14, "Switzerland", 869.618f, 62.5f, 8, 8},
-    {15, "USA/Canada (Recommended)", 910.525f, 62.5f, 7, 5},
-    {16, "Vietnam", 920.250f, 250.0f, 11, 5},
+    {1, "Australia", 915.800f, 250.0f, 10, 5, 20},
+    {2, "Australia (Narrow)", 916.575f, 62.5f, 7, 8, 20},
+    {3, "Australia: SA, WA", 923.125f, 62.5f, 8, 8, 20},
+    {4, "Australia: QLD", 923.125f, 62.5f, 8, 5, 20},
+    {5, "EU/UK (Narrow)", 869.618f, 62.5f, 8, 8, 20},
+    {6, "EU/UK (Long Range)", 869.525f, 250.0f, 11, 5, 20},
+    {7, "EU/UK (Medium Range)", 869.525f, 250.0f, 10, 5, 20},
+    {8, "Czech Republic (Narrow)", 869.432f, 62.5f, 7, 5, 20},
+    {9, "EU 433MHz (Long Range)", 433.650f, 250.0f, 11, 5, 20},
+    {10, "New Zealand", 917.375f, 250.0f, 11, 5, 20},
+    {11, "New Zealand (Narrow)", 917.375f, 62.5f, 7, 5, 20},
+    {12, "Portugal 433", 433.375f, 62.5f, 9, 6, 20},
+    {13, "Portugal 868", 869.618f, 62.5f, 7, 6, 20},
+    {14, "Switzerland", 869.618f, 62.5f, 8, 8, 20},
+    {15, "USA/Canada (Recommended)", 910.525f, 62.5f, 7, 5, 20},
+    {16, "Vietnam", 920.250f, 250.0f, 11, 5, 20},
+    {17, "CN", 495.200f, 125.0f, 9, 5, 12},
 };
 
 } // namespace
diff --git a/modules/core_chat/src/infra/meshcore/meshcore_payload_helpers.cpp b/modules/core_chat/src/infra/meshcore/meshcore_payload_helpers.cpp
index e7af17c0..96ae1cf7 100644
--- a/modules/core_chat/src/infra/meshcore/meshcore_payload_helpers.cpp
+++ b/modules/core_chat/src/infra/meshcore/meshcore_payload_helpers.cpp
@@ -62,8 +62,8 @@ using chat::meshcore::isZeroKey;
 
 bool shouldUsePublicChannelFallback(const chat::MeshConfig& cfg)
 {
-    const bool has_primary = !isZeroKey(cfg.primary_key, sizeof(cfg.primary_key));
-    const bool has_secondary = !isZeroKey(cfg.secondary_key, sizeof(cfg.secondary_key));
+    const bool has_primary = !isZeroKey(cfg.primary_key, chat::kMeshCoreChannelKeyLen);
+    const bool has_secondary = !isZeroKey(cfg.secondary_key, chat::kMeshCoreChannelKeyLen);
     if (!has_primary && !has_secondary)
     {
         return true;
@@ -112,19 +112,19 @@ const uint8_t* selectChannelKey(const chat::MeshConfig& cfg, size_t* out_len)
     {
         *out_len = 0;
     }
-    if (!isZeroKey(cfg.secondary_key, sizeof(cfg.secondary_key)))
+    if (!isZeroKey(cfg.secondary_key, chat::kMeshCoreChannelKeyLen))
     {
         if (out_len)
         {
-            *out_len = sizeof(cfg.secondary_key);
+            *out_len = chat::kMeshCoreChannelKeyLen;
         }
         return cfg.secondary_key;
     }
-    if (!isZeroKey(cfg.primary_key, sizeof(cfg.primary_key)))
+    if (!isZeroKey(cfg.primary_key, chat::kMeshCoreChannelKeyLen))
     {
         if (out_len)
         {
-            *out_len = sizeof(cfg.primary_key);
+            *out_len = chat::kMeshCoreChannelKeyLen;
         }
         return cfg.primary_key;
     }
diff --git a/modules/core_chat/src/infra/meshcore/meshcore_protocol_helpers.cpp b/modules/core_chat/src/infra/meshcore/meshcore_protocol_helpers.cpp
index ca46c014..a1252d26 100644
--- a/modules/core_chat/src/infra/meshcore/meshcore_protocol_helpers.cpp
+++ b/modules/core_chat/src/infra/meshcore/meshcore_protocol_helpers.cpp
@@ -9,9 +9,16 @@
 #include "mbedtls/aes.h"
 #include "mbedtls/md.h"
 #include "mbedtls/sha256.h"
+#elif defined(TRAIL_MATE_HAS_OPENSSL)
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
 #else
+#if defined(ARDUINO)
 #include <AES.h>
 #include <SHA256.h>
+#else
+#define CHAT_MESHCORE_NO_CRYPTO_BACKEND 1
+#endif
 #endif
 
 #include <algorithm>
@@ -150,6 +157,130 @@ bool hmacSha256(const uint8_t* key,
     return info &&
            mbedtls_md_hmac(info, key, key_len, input, data_len, out_hash) == 0;
 }
+#elif defined(TRAIL_MATE_HAS_OPENSSL)
+class Sha256Accumulator
+{
+  public:
+    Sha256Accumulator()
+        : ctx_(EVP_MD_CTX_new())
+    {
+        valid_ = ctx_ && EVP_DigestInit_ex(ctx_, EVP_sha256(), nullptr) == 1;
+    }
+
+    ~Sha256Accumulator()
+    {
+        if (ctx_)
+        {
+            EVP_MD_CTX_free(ctx_);
+        }
+    }
+
+    void update(const void* data, size_t len)
+    {
+        if (!valid_ || !data || len == 0)
+        {
+            return;
+        }
+        valid_ = EVP_DigestUpdate(ctx_, data, len) == 1;
+    }
+
+    bool finalize(uint8_t out_hash[32])
+    {
+        if (!valid_ || !out_hash)
+        {
+            return false;
+        }
+        unsigned int out_len = 0;
+        return EVP_DigestFinal_ex(ctx_, out_hash, &out_len) == 1 && out_len == 32;
+    }
+
+  private:
+    EVP_MD_CTX* ctx_ = nullptr;
+    bool valid_ = false;
+};
+
+class Aes128EcbCipher
+{
+  public:
+    Aes128EcbCipher()
+        : encrypt_(EVP_CIPHER_CTX_new()),
+          decrypt_(EVP_CIPHER_CTX_new())
+    {
+    }
+
+    ~Aes128EcbCipher()
+    {
+        if (encrypt_)
+        {
+            EVP_CIPHER_CTX_free(encrypt_);
+        }
+        if (decrypt_)
+        {
+            EVP_CIPHER_CTX_free(decrypt_);
+        }
+    }
+
+    bool setKey(const uint8_t* key, size_t len)
+    {
+        if (!key || len != kCipherKeySize || !encrypt_ || !decrypt_)
+        {
+            return false;
+        }
+        if (EVP_EncryptInit_ex(encrypt_, EVP_aes_128_ecb(), nullptr, key, nullptr) != 1 ||
+            EVP_CIPHER_CTX_set_padding(encrypt_, 0) != 1 ||
+            EVP_DecryptInit_ex(decrypt_, EVP_aes_128_ecb(), nullptr, key, nullptr) != 1 ||
+            EVP_CIPHER_CTX_set_padding(decrypt_, 0) != 1)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    bool encryptBlock(uint8_t* out, const uint8_t* in)
+    {
+        if (!out || !in)
+        {
+            return false;
+        }
+        int out_len = 0;
+        return EVP_EncryptUpdate(encrypt_, out, &out_len, in, kCipherBlockSize) == 1 &&
+               out_len == static_cast<int>(kCipherBlockSize);
+    }
+
+    bool decryptBlock(uint8_t* out, const uint8_t* in)
+    {
+        if (!out || !in)
+        {
+            return false;
+        }
+        int out_len = 0;
+        return EVP_DecryptUpdate(decrypt_, out, &out_len, in, kCipherBlockSize) == 1 &&
+               out_len == static_cast<int>(kCipherBlockSize);
+    }
+
+  private:
+    EVP_CIPHER_CTX* encrypt_ = nullptr;
+    EVP_CIPHER_CTX* decrypt_ = nullptr;
+};
+
+bool hmacSha256(const uint8_t* key,
+                size_t key_len,
+                const uint8_t* data,
+                size_t data_len,
+                uint8_t out_hash[32])
+{
+    if (!key || key_len == 0 || !out_hash)
+    {
+        return false;
+    }
+
+    static constexpr uint8_t kEmpty = 0;
+    const uint8_t* input = (data && data_len != 0) ? data : &kEmpty;
+    unsigned int out_len = 0;
+    return HMAC(EVP_sha256(), key, static_cast<int>(key_len),
+                input, data_len, out_hash, &out_len) != nullptr &&
+           out_len == 32;
+}
 #endif
 
 } // namespace
@@ -247,7 +378,7 @@ uint32_t packetSignature(uint8_t payload_type, size_t path_len,
                          const uint8_t* payload, size_t payload_len)
 {
     uint8_t sig_bytes[sizeof(uint32_t)] = {};
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
     uint8_t hash_bytes[32] = {};
     Sha256Accumulator sha;
     sha.update(&payload_type, sizeof(payload_type));
@@ -265,7 +396,7 @@ uint32_t packetSignature(uint8_t payload_type, size_t path_len,
         return 0;
     }
     memcpy(sig_bytes, hash_bytes, sizeof(sig_bytes));
-#else
+#elif defined(ARDUINO)
     SHA256 sha;
     sha.update(&payload_type, sizeof(payload_type));
     if (payload_type == kPayloadTypeTrace)
@@ -278,6 +409,21 @@ uint32_t packetSignature(uint8_t payload_type, size_t path_len,
         sha.update(payload, payload_len);
     }
     sha.finalize(sig_bytes, sizeof(sig_bytes));
+#else
+    uint32_t fallback = 2166136261u;
+    fallback ^= static_cast<uint32_t>(payload_type);
+    fallback *= 16777619u;
+    fallback ^= static_cast<uint32_t>(path_len & 0xFFU);
+    fallback *= 16777619u;
+    if (payload && payload_len > 0)
+    {
+        for (size_t index = 0; index < payload_len; ++index)
+        {
+            fallback ^= static_cast<uint32_t>(payload[index]);
+            fallback *= 16777619u;
+        }
+    }
+    memcpy(sig_bytes, &fallback, sizeof(sig_bytes));
 #endif
 
     uint32_t sig = 0;
@@ -414,7 +560,7 @@ void sha256Trunc(uint8_t* out_hash, size_t out_len, const uint8_t* msg, size_t m
     {
         return;
     }
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
     uint8_t full_hash[32] = {};
     Sha256Accumulator sha;
     if (msg && msg_len != 0)
@@ -427,10 +573,22 @@ void sha256Trunc(uint8_t* out_hash, size_t out_len, const uint8_t* msg, size_t m
         return;
     }
     memcpy(out_hash, full_hash, std::min(out_len, sizeof(full_hash)));
-#else
+#elif defined(ARDUINO)
     SHA256 sha;
     sha.update(msg, static_cast<size_t>(msg_len));
     sha.finalize(out_hash, out_len);
+#else
+    uint32_t fallback = 2166136261u;
+    if (msg && msg_len != 0)
+    {
+        for (size_t index = 0; index < msg_len; ++index)
+        {
+            fallback ^= static_cast<uint32_t>(msg[index]);
+            fallback *= 16777619u;
+        }
+    }
+    memset(out_hash, 0, out_len);
+    memcpy(out_hash, &fallback, std::min(out_len, sizeof(fallback)));
 #endif
 }
 
@@ -451,15 +609,17 @@ size_t aesEncrypt(const uint8_t* key16, uint8_t* dest, const uint8_t* src, size_
     {
         return 0;
     }
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
     Aes128EcbCipher aes;
     if (!aes.setKey(key16, kCipherKeySize))
     {
         return 0;
     }
-#else
+#elif defined(ARDUINO)
     AES128 aes;
     aes.setKey(key16, kCipherKeySize);
+#else
+    return 0;
 #endif
 
     uint8_t* dest_ptr = dest;
@@ -467,12 +627,12 @@ size_t aesEncrypt(const uint8_t* key16, uint8_t* dest, const uint8_t* src, size_
     size_t remaining = src_len;
     while (remaining >= kCipherBlockSize)
     {
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
         if (!aes.encryptBlock(dest_ptr, src_ptr))
         {
             return 0;
         }
-#else
+#elif defined(ARDUINO)
         aes.encryptBlock(dest_ptr, src_ptr);
 #endif
         dest_ptr += kCipherBlockSize;
@@ -484,12 +644,12 @@ size_t aesEncrypt(const uint8_t* key16, uint8_t* dest, const uint8_t* src, size_
         uint8_t tail[kCipherBlockSize];
         memset(tail, 0, sizeof(tail));
         memcpy(tail, src_ptr, remaining);
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
         if (!aes.encryptBlock(dest_ptr, tail))
         {
             return 0;
         }
-#else
+#elif defined(ARDUINO)
         aes.encryptBlock(dest_ptr, tail);
 #endif
         dest_ptr += kCipherBlockSize;
@@ -503,15 +663,17 @@ size_t aesDecrypt(const uint8_t* key16, uint8_t* dest, const uint8_t* src, size_
     {
         return 0;
     }
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
     Aes128EcbCipher aes;
     if (!aes.setKey(key16, kCipherKeySize))
     {
         return 0;
     }
-#else
+#elif defined(ARDUINO)
     AES128 aes;
     aes.setKey(key16, kCipherKeySize);
+#else
+    return 0;
 #endif
 
     uint8_t* dest_ptr = dest;
@@ -519,12 +681,12 @@ size_t aesDecrypt(const uint8_t* key16, uint8_t* dest, const uint8_t* src, size_
     size_t remaining = src_len;
     while (remaining >= kCipherBlockSize)
     {
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
         if (!aes.decryptBlock(dest_ptr, src_ptr))
         {
             return 0;
         }
-#else
+#elif defined(ARDUINO)
         aes.decryptBlock(dest_ptr, src_ptr);
 #endif
         dest_ptr += kCipherBlockSize;
@@ -556,18 +718,20 @@ size_t encryptThenMac(const uint8_t* key16, const uint8_t* key32,
         return 0;
     }
 
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
     uint8_t full_hash[32] = {};
     if (!hmacSha256(key32, kCipherHmacKeySize, out + kCipherMacSize, enc_len, full_hash))
     {
         return 0;
     }
     memcpy(out, full_hash, kCipherMacSize);
-#else
+#elif defined(ARDUINO)
     SHA256 sha;
     sha.resetHMAC(key32, kCipherHmacKeySize);
     sha.update(out + kCipherMacSize, enc_len);
     sha.finalizeHMAC(key32, kCipherHmacKeySize, out, kCipherMacSize);
+#else
+    return 0;
 #endif
     return kCipherMacSize + enc_len;
 }
@@ -586,18 +750,20 @@ bool macThenDecrypt(const uint8_t* key16, const uint8_t* key32,
     }
 
     uint8_t expected[kCipherMacSize];
-#if defined(ESP_PLATFORM)
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL)
     uint8_t full_hash[32] = {};
     if (!hmacSha256(key32, kCipherHmacKeySize, src + kCipherMacSize, cipher_len, full_hash))
     {
         return false;
     }
     memcpy(expected, full_hash, sizeof(expected));
-#else
+#elif defined(ARDUINO)
     SHA256 sha;
     sha.resetHMAC(key32, kCipherHmacKeySize);
     sha.update(src + kCipherMacSize, cipher_len);
     sha.finalizeHMAC(key32, kCipherHmacKeySize, expected, kCipherMacSize);
+#else
+    return false;
 #endif
     if (memcmp(expected, src, kCipherMacSize) != 0)
     {
diff --git a/modules/core_chat/src/infra/meshtastic/mt_node_payload.cpp b/modules/core_chat/src/infra/meshtastic/mt_node_payload.cpp
index 147e4b76..a3afdccb 100644
--- a/modules/core_chat/src/infra/meshtastic/mt_node_payload.cpp
+++ b/modules/core_chat/src/infra/meshtastic/mt_node_payload.cpp
@@ -224,8 +224,9 @@ contacts::NodeUpdate DecodedNodePayload::toNodeUpdate() const
     update.is_ignored = is_ignored;
     update.has_public_key = has_user;
     update.public_key_present = has_public_key;
-    update.has_key_manually_verified = true;
-    update.key_manually_verified = key_manually_verified;
+    // Trust is a local decision. Do not overwrite local trust state with
+    // remote NODEINFO flags.
+    update.has_key_manually_verified = false;
     update.has_device_metrics = has_device_metrics;
     if (has_device_metrics)
     {
diff --git a/modules/core_chat/src/infra/meshtastic/mt_pki_crypto.cpp b/modules/core_chat/src/infra/meshtastic/mt_pki_crypto.cpp
index 90bdc77d..f6c7f4e8 100644
--- a/modules/core_chat/src/infra/meshtastic/mt_pki_crypto.cpp
+++ b/modules/core_chat/src/infra/meshtastic/mt_pki_crypto.cpp
@@ -5,11 +5,20 @@
 
 #include "chat/infra/meshtastic/mt_pki_crypto.h"
 
+#include <cstring>
+
+#if __has_include(<AES.h>) && __has_include(<Crypto.h>) && __has_include(<SHA256.h>)
 #include <AES.h>
 #include <Crypto.h>
 #include <SHA256.h>
+#define TRAILMATE_MESHTASTIC_PKI_HAS_ARDUINO_CRYPTO 1
+#else
+#define TRAILMATE_MESHTASTIC_PKI_HAS_ARDUINO_CRYPTO 0
+#endif
 
-#include <cstring>
+#if defined(TRAIL_MATE_HAS_OPENSSL)
+#include <openssl/evp.h>
+#endif
 
 namespace chat
 {
@@ -19,6 +28,32 @@ namespace
 {
 constexpr size_t kAesBlockSize = 16;
 constexpr size_t kMaxAadLen = 30;
+#if TRAILMATE_MESHTASTIC_PKI_HAS_ARDUINO_CRYPTO || defined(TRAIL_MATE_HAS_OPENSSL)
+constexpr size_t kCcmLengthSize = 2;
+#endif
+
+#if TRAILMATE_MESHTASTIC_PKI_HAS_ARDUINO_CRYPTO
+int constantTimeCompare(const void* a_, const void* b_, size_t len)
+{
+    const volatile uint8_t* volatile a =
+        reinterpret_cast<const volatile uint8_t*>(a_);
+    const volatile uint8_t* volatile b =
+        reinterpret_cast<const volatile uint8_t*>(b_);
+    if (len == 0)
+    {
+        return 0;
+    }
+    if (!a || !b)
+    {
+        return -1;
+    }
+    volatile uint8_t diff = 0U;
+    for (size_t index = 0; index < len; ++index)
+    {
+        diff |= static_cast<uint8_t>(a[index] ^ b[index]);
+    }
+    return diff;
+}
 
 class AesCcmCipher
 {
@@ -57,26 +92,6 @@ class AesCcmCipher
     AESSmall256* aes_ = nullptr;
 };
 
-int constantTimeCompare(const void* a_, const void* b_, size_t len)
-{
-    const volatile uint8_t* volatile a = (const volatile uint8_t* volatile)a_;
-    const volatile uint8_t* volatile b = (const volatile uint8_t* volatile)b_;
-    if (len == 0)
-    {
-        return 0;
-    }
-    if (!a || !b)
-    {
-        return -1;
-    }
-    volatile uint8_t diff = 0U;
-    for (size_t index = 0; index < len; ++index)
-    {
-        diff |= static_cast<uint8_t>(a[index] ^ b[index]);
-    }
-    return diff;
-}
-
 void putBe16(uint8_t* out, uint16_t value)
 {
     if (!out)
@@ -213,6 +228,196 @@ void aesCcmDecryptAuth(AesCcmCipher& cipher,
         out_tag[index] = auth[index] ^ tmp[index];
     }
 }
+#endif
+
+#if defined(TRAIL_MATE_HAS_OPENSSL)
+constexpr size_t kOpenSslCcmNonceLen = 15 - kCcmLengthSize;
+
+const EVP_CIPHER* opensslAesCcmCipher(size_t key_len)
+{
+    if (key_len == 16)
+    {
+        return EVP_aes_128_ccm();
+    }
+    if (key_len == 32)
+    {
+        return EVP_aes_256_ccm();
+    }
+    return nullptr;
+}
+
+bool opensslSha256Update(EVP_MD_CTX* ctx, const void* data, size_t len)
+{
+    if (!ctx || !data || len == 0)
+    {
+        return true;
+    }
+    return EVP_DigestUpdate(ctx, data, len) == 1;
+}
+
+bool opensslSha256(const void* first,
+                   size_t first_len,
+                   const void* second,
+                   size_t second_len,
+                   const void* third,
+                   size_t third_len,
+                   const void* fourth,
+                   size_t fourth_len,
+                   const void* fifth,
+                   size_t fifth_len,
+                   const void* sixth,
+                   size_t sixth_len,
+                   uint8_t out[32])
+{
+    if (!out)
+    {
+        return false;
+    }
+    EVP_MD_CTX* ctx = EVP_MD_CTX_new();
+    if (!ctx)
+    {
+        return false;
+    }
+    bool ok = EVP_DigestInit_ex(ctx, EVP_sha256(), nullptr) == 1;
+    ok = ok && opensslSha256Update(ctx, first, first_len);
+    ok = ok && opensslSha256Update(ctx, second, second_len);
+    ok = ok && opensslSha256Update(ctx, third, third_len);
+    ok = ok && opensslSha256Update(ctx, fourth, fourth_len);
+    ok = ok && opensslSha256Update(ctx, fifth, fifth_len);
+    ok = ok && opensslSha256Update(ctx, sixth, sixth_len);
+    unsigned int out_len = 0;
+    ok = ok && EVP_DigestFinal_ex(ctx, out, &out_len) == 1 && out_len == 32;
+    EVP_MD_CTX_free(ctx);
+    return ok;
+}
+
+bool opensslAesCcmDecrypt(const uint8_t* key,
+                          size_t key_len,
+                          const uint8_t nonce[kPkiNonceSize],
+                          size_t auth_len,
+                          const uint8_t* crypt,
+                          size_t crypt_len,
+                          const uint8_t* aad,
+                          size_t aad_len,
+                          const uint8_t* auth,
+                          uint8_t* out_plain)
+{
+    const EVP_CIPHER* cipher = opensslAesCcmCipher(key_len);
+    if (!cipher || !nonce || !crypt || !auth || !out_plain ||
+        auth_len == 0 || auth_len > kAesBlockSize || aad_len > kMaxAadLen)
+    {
+        return false;
+    }
+
+    EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
+    if (!ctx)
+    {
+        return false;
+    }
+
+    int out_len = 0;
+    bool ok =
+        EVP_DecryptInit_ex(ctx, cipher, nullptr, nullptr, nullptr) == 1 &&
+        EVP_CIPHER_CTX_ctrl(ctx,
+                            EVP_CTRL_CCM_SET_IVLEN,
+                            static_cast<int>(kOpenSslCcmNonceLen),
+                            nullptr) == 1 &&
+        EVP_CIPHER_CTX_ctrl(ctx,
+                            EVP_CTRL_CCM_SET_TAG,
+                            static_cast<int>(auth_len),
+                            const_cast<uint8_t*>(auth)) == 1 &&
+        EVP_DecryptInit_ex(ctx, nullptr, nullptr, key, nonce) == 1 &&
+        EVP_DecryptUpdate(ctx,
+                          nullptr,
+                          &out_len,
+                          nullptr,
+                          static_cast<int>(crypt_len)) == 1;
+    if (ok && aad && aad_len > 0)
+    {
+        ok = EVP_DecryptUpdate(ctx,
+                               nullptr,
+                               &out_len,
+                               aad,
+                               static_cast<int>(aad_len)) == 1;
+    }
+    if (ok)
+    {
+        ok = EVP_DecryptUpdate(ctx,
+                               out_plain,
+                               &out_len,
+                               crypt,
+                               static_cast<int>(crypt_len)) == 1 &&
+             static_cast<size_t>(out_len) == crypt_len;
+    }
+
+    EVP_CIPHER_CTX_free(ctx);
+    return ok;
+}
+
+bool opensslAesCcmEncrypt(const uint8_t* key,
+                          size_t key_len,
+                          const uint8_t nonce[kPkiNonceSize],
+                          size_t auth_len,
+                          const uint8_t* aad,
+                          size_t aad_len,
+                          const uint8_t* plain,
+                          size_t plain_len,
+                          uint8_t* out_cipher,
+                          uint8_t* out_auth)
+{
+    const EVP_CIPHER* cipher = opensslAesCcmCipher(key_len);
+    if (!cipher || !nonce || !plain || !out_cipher || !out_auth ||
+        auth_len == 0 || auth_len > kAesBlockSize || aad_len > kMaxAadLen)
+    {
+        return false;
+    }
+
+    EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
+    if (!ctx)
+    {
+        return false;
+    }
+
+    int out_len = 0;
+    bool ok =
+        EVP_EncryptInit_ex(ctx, cipher, nullptr, nullptr, nullptr) == 1 &&
+        EVP_CIPHER_CTX_ctrl(ctx,
+                            EVP_CTRL_CCM_SET_IVLEN,
+                            static_cast<int>(kOpenSslCcmNonceLen),
+                            nullptr) == 1 &&
+        EVP_EncryptInit_ex(ctx, nullptr, nullptr, key, nonce) == 1 &&
+        EVP_EncryptUpdate(ctx,
+                          nullptr,
+                          &out_len,
+                          nullptr,
+                          static_cast<int>(plain_len)) == 1;
+    if (ok && aad && aad_len > 0)
+    {
+        ok = EVP_EncryptUpdate(ctx,
+                               nullptr,
+                               &out_len,
+                               aad,
+                               static_cast<int>(aad_len)) == 1;
+    }
+    if (ok)
+    {
+        ok = EVP_EncryptUpdate(ctx,
+                               out_cipher,
+                               &out_len,
+                               plain,
+                               static_cast<int>(plain_len)) == 1 &&
+             static_cast<size_t>(out_len) == plain_len &&
+             EVP_EncryptFinal_ex(ctx, out_cipher + out_len, &out_len) == 1 &&
+             EVP_CIPHER_CTX_ctrl(ctx,
+                                 EVP_CTRL_CCM_GET_TAG,
+                                 static_cast<int>(auth_len),
+                                 out_auth) == 1;
+    }
+
+    EVP_CIPHER_CTX_free(ctx);
+    return ok;
+}
+#endif
 
 } // namespace
 
@@ -223,6 +428,7 @@ void hashSharedKey(uint8_t* bytes, size_t num_bytes)
         return;
     }
 
+#if TRAILMATE_MESHTASTIC_PKI_HAS_ARDUINO_CRYPTO
     SHA256 hash;
     uint8_t size = static_cast<uint8_t>(num_bytes);
     constexpr uint8_t kChunkSize = 16;
@@ -237,6 +443,22 @@ void hashSharedKey(uint8_t* bytes, size_t num_bytes)
         hash.update(bytes + pos, len);
     }
     hash.finalize(bytes, 32);
+#elif defined(TRAIL_MATE_HAS_OPENSSL)
+    uint8_t digest[32] = {};
+    if (opensslSha256(bytes, num_bytes,
+                      nullptr, 0,
+                      nullptr, 0,
+                      nullptr, 0,
+                      nullptr, 0,
+                      nullptr, 0,
+                      digest))
+    {
+        memcpy(bytes, digest, sizeof(digest));
+    }
+#else
+    (void)bytes;
+    (void)num_bytes;
+#endif
 }
 
 void initPkiNonce(uint32_t from,
@@ -275,18 +497,34 @@ bool decryptPkiAesCcm(const uint8_t* key,
         return false;
     }
 
-    const size_t length_size = 2;
+#if TRAILMATE_MESHTASTIC_PKI_HAS_ARDUINO_CRYPTO
     uint8_t x[kAesBlockSize];
     uint8_t block[kAesBlockSize];
     uint8_t tag[kAesBlockSize];
     AesCcmCipher cipher;
     cipher.setKey(key, key_len);
-    aesCcmEncrStart(length_size, nonce, block);
+    aesCcmEncrStart(kCcmLengthSize, nonce, block);
     aesCcmDecryptAuth(cipher, auth_len, block, auth, tag);
-    aesCcmEncr(cipher, length_size, crypt, crypt_len, out_plain, block);
-    aesCcmAuthStart(cipher, auth_len, length_size, nonce, aad, aad_len, crypt_len, x);
+    aesCcmEncr(cipher, kCcmLengthSize, crypt, crypt_len, out_plain, block);
+    aesCcmAuthStart(cipher, auth_len, kCcmLengthSize, nonce, aad, aad_len, crypt_len, x);
     aesCcmAuth(cipher, out_plain, crypt_len, x);
     return constantTimeCompare(x, tag, auth_len) == 0;
+#elif defined(TRAIL_MATE_HAS_OPENSSL)
+    return opensslAesCcmDecrypt(key, key_len, nonce, auth_len,
+                                crypt, crypt_len, aad, aad_len, auth, out_plain);
+#else
+    (void)key;
+    (void)key_len;
+    (void)nonce;
+    (void)auth_len;
+    (void)crypt;
+    (void)crypt_len;
+    (void)aad;
+    (void)aad_len;
+    (void)auth;
+    (void)out_plain;
+    return false;
+#endif
 }
 
 bool encryptPkiAesCcm(const uint8_t* key,
@@ -306,17 +544,34 @@ bool encryptPkiAesCcm(const uint8_t* key,
         return false;
     }
 
-    const size_t length_size = 2;
+#if TRAILMATE_MESHTASTIC_PKI_HAS_ARDUINO_CRYPTO
     uint8_t x[kAesBlockSize];
     uint8_t block[kAesBlockSize];
     AesCcmCipher cipher;
     cipher.setKey(key, key_len);
-    aesCcmAuthStart(cipher, auth_len, length_size, nonce, aad, aad_len, plain_len, x);
+    aesCcmAuthStart(cipher, auth_len, kCcmLengthSize, nonce, aad, aad_len, plain_len, x);
     aesCcmAuth(cipher, plain, plain_len, x);
-    aesCcmEncrStart(length_size, nonce, block);
-    aesCcmEncr(cipher, length_size, plain, plain_len, out_cipher, block);
+    aesCcmEncrStart(kCcmLengthSize, nonce, block);
+    aesCcmEncr(cipher, kCcmLengthSize, plain, plain_len, out_cipher, block);
     aesCcmEncryptAuth(cipher, auth_len, x, block, out_auth);
     return true;
+#elif defined(TRAIL_MATE_HAS_OPENSSL)
+    return opensslAesCcmEncrypt(key, key_len, nonce, auth_len,
+                                aad, aad_len, plain, plain_len,
+                                out_cipher, out_auth);
+#else
+    (void)key;
+    (void)key_len;
+    (void)nonce;
+    (void)auth_len;
+    (void)aad;
+    (void)aad_len;
+    (void)plain;
+    (void)plain_len;
+    (void)out_cipher;
+    (void)out_auth;
+    return false;
+#endif
 }
 
 bool computeKeyVerificationHashes(uint32_t security_number,
@@ -337,6 +592,7 @@ bool computeKeyVerificationHashes(uint32_t security_number,
         return false;
     }
 
+#if TRAILMATE_MESHTASTIC_PKI_HAS_ARDUINO_CRYPTO
     SHA256 hash;
     hash.reset();
     hash.update(&security_number, sizeof(security_number));
@@ -352,6 +608,34 @@ bool computeKeyVerificationHashes(uint32_t security_number,
     hash.update(out_hash1, 32);
     hash.finalize(out_hash2, 32);
     return true;
+#elif defined(TRAIL_MATE_HAS_OPENSSL)
+    return opensslSha256(&security_number, sizeof(security_number),
+                         &nonce, sizeof(nonce),
+                         &first_node_id, sizeof(first_node_id),
+                         &second_node_id, sizeof(second_node_id),
+                         first_pubkey, first_pubkey_len,
+                         second_pubkey, second_pubkey_len,
+                         out_hash1) &&
+           opensslSha256(&nonce, sizeof(nonce),
+                         out_hash1, 32,
+                         nullptr, 0,
+                         nullptr, 0,
+                         nullptr, 0,
+                         nullptr, 0,
+                         out_hash2);
+#else
+    (void)security_number;
+    (void)nonce;
+    (void)first_node_id;
+    (void)second_node_id;
+    (void)first_pubkey;
+    (void)first_pubkey_len;
+    (void)second_pubkey;
+    (void)second_pubkey_len;
+    (void)out_hash1;
+    (void)out_hash2;
+    return false;
+#endif
 }
 
 } // namespace meshtastic
diff --git a/modules/core_chat/src/infra/meshtastic/mt_radio_config.cpp b/modules/core_chat/src/infra/meshtastic/mt_radio_config.cpp
index b235534f..ca2d04c8 100644
--- a/modules/core_chat/src/infra/meshtastic/mt_radio_config.cpp
+++ b/modules/core_chat/src/infra/meshtastic/mt_radio_config.cpp
@@ -63,6 +63,11 @@ std::uint32_t channelCount(const RegionInfo& region, float bw_khz)
 
 const char* primaryChannelName(const MeshConfig& config)
 {
+    if (config.primary_channel_name[0] != '\0')
+    {
+        return config.primary_channel_name;
+    }
+
     if (!config.use_preset)
     {
         return "Custom";
@@ -74,6 +79,16 @@ const char* primaryChannelName(const MeshConfig& config)
     return (name != nullptr && name[0] != '\0') ? name : "Custom";
 }
 
+const char* secondaryChannelName(const MeshConfig& config)
+{
+    return (config.secondary_channel_name[0] != '\0') ? config.secondary_channel_name : "Secondary";
+}
+
+const char* channelName(const MeshConfig& config, ChannelId channel)
+{
+    return (channel == ChannelId::SECONDARY) ? secondaryChannelName(config) : primaryChannelName(config);
+}
+
 RadioConfig deriveRadioConfig(const MeshConfig& config)
 {
     RadioConfig out{};
@@ -141,8 +156,7 @@ RadioConfig deriveRadioConfig(const MeshConfig& config)
         }
     }
 
-    out.channel_name =
-        out.using_preset ? presetDisplayName(out.modem_preset) : "Custom";
+    out.channel_name = primaryChannelName(config);
     if (out.channel_name == nullptr || out.channel_name[0] == '\0')
     {
         out.channel_name = "Custom";
diff --git a/modules/core_chat/src/runtime/meshtastic_self_announcement_core.cpp b/modules/core_chat/src/runtime/meshtastic_self_announcement_core.cpp
index 7d6dd526..d7935859 100644
--- a/modules/core_chat/src/runtime/meshtastic_self_announcement_core.cpp
+++ b/modules/core_chat/src/runtime/meshtastic_self_announcement_core.cpp
@@ -3,6 +3,7 @@
 #include "chat/infra/meshtastic/mt_codec_pb.h"
 #include "chat/infra/meshtastic/mt_packet_wire.h"
 #include "chat/infra/meshtastic/mt_protocol_helpers.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/infra/meshtastic/mt_region.h"
 
 #include <cstdio>
@@ -23,25 +24,6 @@ std::string buildMeshtasticUserId(NodeId node_id)
 
 constexpr uint8_t kDefaultPskIndex = 1;
 
-const char* resolveChannelName(const MeshConfig& config, ChannelId channel)
-{
-    if (channel == ChannelId::SECONDARY)
-    {
-        return "Secondary";
-    }
-
-    if (config.use_preset)
-    {
-        const char* preset_name = chat::meshtastic::presetDisplayName(
-            static_cast<meshtastic_Config_LoRaConfig_ModemPreset>(config.modem_preset));
-        if (preset_name && preset_name[0] != '\0' && std::strcmp(preset_name, "Invalid") != 0)
-        {
-            return preset_name;
-        }
-    }
-    return "Custom";
-}
-
 const uint8_t* resolveChannelKey(const MeshConfig& config, ChannelId channel, size_t* out_len)
 {
     if (out_len)
@@ -51,22 +33,28 @@ const uint8_t* resolveChannelKey(const MeshConfig& config, ChannelId channel, si
 
     if (channel == ChannelId::SECONDARY)
     {
-        if (!chat::meshtastic::isZeroKey(config.secondary_key, sizeof(config.secondary_key)))
+        const uint8_t key_len = chat::normalizeMeshtasticChannelKeyLen(config.secondary_key,
+                                                                       sizeof(config.secondary_key),
+                                                                       config.secondary_key_len);
+        if (key_len > 0)
         {
             if (out_len)
             {
-                *out_len = sizeof(config.secondary_key);
+                *out_len = key_len;
             }
             return config.secondary_key;
         }
         return nullptr;
     }
 
-    if (!chat::meshtastic::isZeroKey(config.primary_key, sizeof(config.primary_key)))
+    const uint8_t key_len = chat::normalizeMeshtasticChannelKeyLen(config.primary_key,
+                                                                   sizeof(config.primary_key),
+                                                                   config.primary_key_len);
+    if (key_len > 0)
     {
         if (out_len)
         {
-            *out_len = sizeof(config.primary_key);
+            *out_len = key_len;
         }
         return config.primary_key;
     }
@@ -113,10 +101,11 @@ bool MeshtasticSelfAnnouncementCore::buildNodeInfoPacket(const MeshtasticAnnounc
 
     size_t key_len = 0;
     const uint8_t* key = resolveChannelKey(request.mesh_config, request.channel, &key_len);
-    out_packet->channel_hash = chat::meshtastic::computeChannelHash(resolveChannelName(request.mesh_config,
-                                                                                       request.channel),
-                                                                    key,
-                                                                    key_len);
+    out_packet->channel_hash = chat::meshtastic::computeChannelHash(
+        chat::meshtastic::channelName(request.mesh_config,
+                                      request.channel),
+        key,
+        key_len);
     out_packet->wire_size = sizeof(out_packet->wire);
     if (!chat::meshtastic::buildWirePacket(payload,
                                            payload_size,
diff --git a/modules/core_chat/tests/test_chat_delivery_action_service.cpp b/modules/core_chat/tests/test_chat_delivery_action_service.cpp
new file mode 100644
index 00000000..5c87e733
--- /dev/null
+++ b/modules/core_chat/tests/test_chat_delivery_action_service.cpp
@@ -0,0 +1,134 @@
+#include "chat/delivery/chat_delivery_action_service.h"
+
+#include <cassert>
+
+namespace
+{
+
+chat::delivery::ChatDeliveryRef ref(uint32_t id)
+{
+    chat::delivery::ChatDeliveryRef out{};
+    out.protocol_id = id;
+    return out;
+}
+
+chat::delivery::ChatDeliveryRecord record(
+    uint32_t id,
+    chat::delivery::DeliveryState state,
+    chat::delivery::DeliveryFailureKind failure =
+        chat::delivery::DeliveryFailureKind::None)
+{
+    chat::delivery::ChatDeliveryRecord out{};
+    out.ref = ref(id);
+    out.state = state;
+    out.failure = failure;
+    out.updated_at_ms = id * 10U;
+    return out;
+}
+
+chat::delivery::ChatDeliveryActionRequest request(
+    chat::delivery::ChatDeliveryActionKind kind,
+    uint32_t id)
+{
+    chat::delivery::ChatDeliveryActionRequest out{};
+    out.kind = kind;
+    out.ref = ref(id);
+    return out;
+}
+
+class FakeRetryPort final : public chat::delivery::IRetryChatMessagePort
+{
+  public:
+    chat::delivery::ChatDeliveryActionResult retryMessage(
+        chat::delivery::ChatDeliveryRef ref) override
+    {
+        ++call_count;
+        last_ref = ref;
+        return result;
+    }
+
+    int call_count = 0;
+    chat::delivery::ChatDeliveryRef last_ref{};
+    chat::delivery::ChatDeliveryActionResult result =
+        chat::delivery::ChatDeliveryActionResult::success();
+};
+
+} // namespace
+
+int main()
+{
+    using namespace chat::delivery;
+
+    ChatDeliveryReadModel read_model;
+    ChatDeliveryActionService service(read_model);
+
+    ChatDeliveryActionRequest invalid{};
+    invalid.kind = ChatDeliveryActionKind::ClearFailure;
+    auto result = service.handleDeliveryAction(invalid);
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::InvalidRef);
+
+    result = service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::ClearFailure, 100));
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::NotFound);
+
+    assert(read_model.upsert(record(101,
+                                    DeliveryState::Failed,
+                                    DeliveryFailureKind::AckTimeout)));
+    result = service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::ClearFailure, 101));
+    assert(result.ok);
+    ChatDeliveryRecord found{};
+    assert(!read_model.find(ref(101), found));
+
+    assert(read_model.upsert(record(102, DeliveryState::Sent)));
+    result = service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::ClearFailure, 102));
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::NotRetryable);
+    assert(read_model.find(ref(102), found));
+
+    assert(read_model.upsert(record(103, DeliveryState::Queued)));
+    result = service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::CancelPending, 103));
+    assert(result.ok);
+    assert(!read_model.find(ref(103), found));
+
+    assert(read_model.upsert(record(104, DeliveryState::Sending)));
+    result = service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::CancelPending, 104));
+    assert(result.ok);
+    assert(!read_model.find(ref(104), found));
+
+    assert(read_model.upsert(record(105, DeliveryState::Delivered)));
+    result = service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::CancelPending, 105));
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::NotRetryable);
+    assert(read_model.find(ref(105), found));
+
+    result = service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::Retry, 106));
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::Unsupported);
+
+    FakeRetryPort retry_port;
+    ChatDeliveryActionService retrying_service(read_model, &retry_port);
+    result = retrying_service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::Retry, 107));
+    assert(result.ok);
+    assert(retry_port.call_count == 1);
+    assert(retry_port.last_ref == ref(107));
+
+    retry_port.result =
+        ChatDeliveryActionResult::fail(ChatDeliveryActionFailure::Rejected);
+    result = retrying_service.handleDeliveryAction(
+        request(ChatDeliveryActionKind::Retry, 108));
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::Rejected);
+    assert(retry_port.call_count == 2);
+    assert(retry_port.last_ref == ref(108));
+
+    return 0;
+}
diff --git a/modules/core_chat/tests/test_chat_delivery_event_port.cpp b/modules/core_chat/tests/test_chat_delivery_event_port.cpp
new file mode 100644
index 00000000..0f25015b
--- /dev/null
+++ b/modules/core_chat/tests/test_chat_delivery_event_port.cpp
@@ -0,0 +1,41 @@
+#include "chat/delivery/chat_delivery_event_port.h"
+
+#include <cassert>
+
+int main()
+{
+    chat::delivery::ChatDeliveryReadModel read_model;
+    chat::delivery::ChatDeliveryEventProjector projector(read_model);
+    chat::delivery::ProjectingChatDeliveryEventPort port(projector);
+
+    chat::delivery::ChatDeliveryEvent sent{};
+    sent.ref.protocol_id = 101;
+    sent.state = chat::delivery::DeliveryState::Sent;
+    sent.timestamp_ms = 1000;
+    port.publishDeliveryEvent(sent);
+
+    chat::delivery::ChatDeliveryRecord record{};
+    assert(read_model.find(sent.ref, record));
+    assert(record.state == chat::delivery::DeliveryState::Sent);
+    assert(record.failure == chat::delivery::DeliveryFailureKind::None);
+    assert(record.updated_at_ms == 1000);
+
+    chat::delivery::ChatDeliveryEvent failed{};
+    failed.ref.protocol_id = 102;
+    failed.state = chat::delivery::DeliveryState::Failed;
+    failed.failure = chat::delivery::SendFailureKind::PeerKeyMissing;
+    failed.timestamp_ms = 2000;
+    port.publishDeliveryEvent(failed);
+
+    assert(read_model.find(failed.ref, record));
+    assert(record.state == chat::delivery::DeliveryState::Failed);
+    assert(record.failure == chat::delivery::DeliveryFailureKind::PeerKeyMissing);
+    assert(record.updated_at_ms == 2000);
+
+    chat::delivery::ChatDeliveryEvent invalid{};
+    invalid.state = chat::delivery::DeliveryState::Delivered;
+    port.publishDeliveryEvent(invalid);
+    assert(read_model.size() == 2);
+
+    return 0;
+}
diff --git a/modules/core_chat/tests/test_chat_delivery_event_projector.cpp b/modules/core_chat/tests/test_chat_delivery_event_projector.cpp
new file mode 100644
index 00000000..15284383
--- /dev/null
+++ b/modules/core_chat/tests/test_chat_delivery_event_projector.cpp
@@ -0,0 +1,76 @@
+#include "chat/delivery/chat_delivery_event_projector.h"
+
+#include <cassert>
+
+namespace
+{
+
+chat::delivery::ChatDeliveryRef ref(uint32_t id)
+{
+    chat::delivery::ChatDeliveryRef out{};
+    out.protocol_id = id;
+    return out;
+}
+
+} // namespace
+
+int main()
+{
+    chat::delivery::ChatDeliveryReadModel read_model;
+    chat::delivery::ChatDeliveryEventProjector projector(read_model);
+
+    projector.onQueued(ref(1), 100);
+    chat::delivery::ChatDeliveryRecord record{};
+    assert(read_model.find(ref(1), record));
+    assert(record.state == chat::delivery::DeliveryState::Queued);
+    assert(record.failure == chat::delivery::DeliveryFailureKind::None);
+    assert(record.updated_at_ms == 100);
+
+    projector.onSending(ref(1), 150);
+    assert(read_model.find(ref(1), record));
+    assert(record.state == chat::delivery::DeliveryState::Sending);
+    assert(record.failure == chat::delivery::DeliveryFailureKind::None);
+
+    projector.onSent(ref(1), 200);
+    assert(read_model.find(ref(1), record));
+    assert(record.state == chat::delivery::DeliveryState::Sent);
+
+    projector.onDelivered(ref(1), 250);
+    assert(read_model.find(ref(1), record));
+    assert(record.state == chat::delivery::DeliveryState::Delivered);
+
+    projector.onFailed(ref(2),
+                       chat::delivery::SendFailureKind::PeerKeyMissing,
+                       300);
+    assert(read_model.find(ref(2), record));
+    assert(record.state == chat::delivery::DeliveryState::Failed);
+    assert(record.failure ==
+           chat::delivery::DeliveryFailureKind::PeerKeyMissing);
+
+    projector.onFailed(ref(3),
+                       chat::delivery::SendFailureKind::LocalIdentityMissing,
+                       400);
+    assert(read_model.find(ref(3), record));
+    assert(record.failure ==
+           chat::delivery::DeliveryFailureKind::LocalIdentityMissing);
+
+    projector.onFailed(ref(4),
+                       chat::delivery::SendFailureKind::RadioSendFailed,
+                       500);
+    assert(read_model.find(ref(4), record));
+    assert(record.failure ==
+           chat::delivery::DeliveryFailureKind::RadioSendFailed);
+
+    projector.onFailed(ref(5),
+                       chat::delivery::SendFailureKind::AckTimeout,
+                       600);
+    assert(read_model.find(ref(5), record));
+    assert(record.failure == chat::delivery::DeliveryFailureKind::AckTimeout);
+
+    projector.onReceived(ref(6), 700);
+    assert(read_model.find(ref(6), record));
+    assert(record.state == chat::delivery::DeliveryState::Received);
+    assert(record.failure == chat::delivery::DeliveryFailureKind::None);
+
+    return 0;
+}
diff --git a/modules/core_chat/tests/test_chat_delivery_read_model.cpp b/modules/core_chat/tests/test_chat_delivery_read_model.cpp
new file mode 100644
index 00000000..3b93856b
--- /dev/null
+++ b/modules/core_chat/tests/test_chat_delivery_read_model.cpp
@@ -0,0 +1,65 @@
+#include "chat/delivery/chat_delivery_read_model.h"
+
+#include <cassert>
+
+namespace
+{
+
+chat::delivery::ChatDeliveryRef ref(uint32_t id)
+{
+    chat::delivery::ChatDeliveryRef out{};
+    out.protocol_id = id;
+    return out;
+}
+
+} // namespace
+
+int main()
+{
+    chat::delivery::ChatDeliveryReadModel model;
+    assert(model.size() == 0);
+
+    chat::delivery::ChatDeliveryRecord invalid{};
+    invalid.state = chat::delivery::DeliveryState::Queued;
+    assert(!model.upsert(invalid));
+    assert(model.size() == 0);
+
+    chat::delivery::ChatDeliveryRecord queued{};
+    queued.ref = ref(10);
+    queued.state = chat::delivery::DeliveryState::Queued;
+    queued.updated_at_ms = 100;
+    assert(model.upsert(queued));
+    assert(model.size() == 1);
+
+    chat::delivery::ChatDeliveryRecord found{};
+    assert(model.find(ref(10), found));
+    assert(found.state == chat::delivery::DeliveryState::Queued);
+    assert(found.updated_at_ms == 100);
+
+    queued.state = chat::delivery::DeliveryState::Sent;
+    queued.updated_at_ms = 200;
+    assert(model.upsert(queued));
+    assert(model.size() == 1);
+    assert(model.find(ref(10), found));
+    assert(found.state == chat::delivery::DeliveryState::Sent);
+    assert(found.updated_at_ms == 200);
+
+    for (uint32_t id = 11; id < 11 + chat::delivery::ChatDeliveryReadModel::kMaxRecords;
+         ++id)
+    {
+        chat::delivery::ChatDeliveryRecord record{};
+        record.ref = ref(id);
+        record.state = chat::delivery::DeliveryState::Sending;
+        assert(model.upsert(record));
+    }
+    assert(model.size() == chat::delivery::ChatDeliveryReadModel::kMaxRecords);
+    assert(!model.find(ref(10), found));
+
+    model.clear(ref(20));
+    assert(model.size() == chat::delivery::ChatDeliveryReadModel::kMaxRecords - 1);
+    assert(!model.find(ref(20), found));
+
+    model.clearAll();
+    assert(model.size() == 0);
+    return 0;
+}
diff --git a/modules/core_chat/tests/test_legacy_chat_delivery_bridge.cpp b/modules/core_chat/tests/test_legacy_chat_delivery_bridge.cpp
new file mode 100644
index 00000000..21448d31
--- /dev/null
+++ b/modules/core_chat/tests/test_legacy_chat_delivery_bridge.cpp
@@ -0,0 +1,55 @@
+#include "chat/delivery/legacy_chat_delivery_bridge.h"
+
+#include <cassert>
+
+namespace
+{
+
+chat::ChatMessage message(chat::MessageStatus status, chat::MessageId id)
+{
+    chat::ChatMessage out;
+    out.status = status;
+    out.msg_id = id;
+    return out;
+}
+
+} // namespace
+
+int main()
+{
+    const auto queued =
+        chat::delivery::toDeliveryRecord(message(chat::MessageStatus::Queued, 10),
+                                         100);
+    assert(queued.ref.protocol_id == 10);
+    assert(queued.state == chat::delivery::DeliveryState::Queued);
+    assert(queued.failure == chat::delivery::DeliveryFailureKind::None);
+    assert(queued.updated_at_ms == 100);
+
+    const auto sent =
+        chat::delivery::toDeliveryRecord(message(chat::MessageStatus::Sent, 11));
+    assert(sent.state == chat::delivery::DeliveryState::Sent);
+    assert(sent.failure == chat::delivery::DeliveryFailureKind::None);
+
+    const auto failed =
+        chat::delivery::toDeliveryRecord(message(chat::MessageStatus::Failed, 12));
+    assert(failed.state == chat::delivery::DeliveryState::Failed);
+    assert(failed.failure == chat::delivery::DeliveryFailureKind::Unknown);
+
+    const auto incoming = chat::delivery::toDeliveryRecord(
+        message(chat::MessageStatus::Incoming, 13));
+    assert(incoming.state == chat::delivery::DeliveryState::Received);
+
+    chat::delivery::ChatDeliveryRef ref{};
+    ref.protocol_id = 99;
+    const auto key_missing = chat::delivery::toFailedDeliveryRecord(
+        ref,
+        chat::delivery::SendFailureKind::PeerKeyMissing,
+        500);
+    assert(key_missing.ref.protocol_id == 99);
+    assert(key_missing.state == chat::delivery::DeliveryState::Failed);
+    assert(key_missing.failure ==
+           chat::delivery::DeliveryFailureKind::PeerKeyMissing);
+    assert(key_missing.updated_at_ms == 500);
+
+    return 0;
+}
diff --git a/modules/core_chat/tests/test_legacy_chat_send_result_mapper.cpp b/modules/core_chat/tests/test_legacy_chat_send_result_mapper.cpp
new file mode 100644
index 00000000..6249a1ff
--- /dev/null
+++ b/modules/core_chat/tests/test_legacy_chat_send_result_mapper.cpp
@@ -0,0 +1,53 @@
+#include "chat/delivery/legacy_chat_send_result_mapper.h"
+
+#include <cassert>
+
+int main()
+{
+    using namespace chat::delivery;
+
+    assert(mapLegacyChatSendFailure(LegacyChatSendFailure::PeerKeyMissing) ==
+           SendFailureKind::PeerKeyMissing);
+    assert(mapLegacyChatSendFailure(LegacyChatSendFailure::LocalIdentityMissing) ==
+           SendFailureKind::LocalIdentityMissing);
+    assert(mapLegacyChatSendFailure(LegacyChatSendFailure::RadioSendFailed) ==
+           SendFailureKind::RadioSendFailed);
+    assert(mapLegacyChatSendFailure(LegacyChatSendFailure::UnsupportedProtocol) ==
+           SendFailureKind::UnsupportedProtocol);
+    assert(mapLegacyChatSendFailure(LegacyChatSendFailure::Rejected) ==
+           SendFailureKind::Rejected);
+
+    LegacyChatSendResult sent{};
+    sent.ref.protocol_id = 10;
+    sent.success = true;
+    sent.failure = LegacyChatSendFailure::PeerKeyMissing;
+    sent.timestamp_ms = 111;
+    ChatDeliveryEvent event = mapLegacyChatSendResult(sent);
+    assert(event.ref.protocol_id == 10);
+    assert(event.state == DeliveryState::Sent);
+    assert(event.failure == SendFailureKind::None);
+    assert(event.timestamp_ms == 111);
+
+    LegacyChatSendResult failed{};
+    failed.ref.protocol_id = 11;
+    failed.success = false;
+    failed.failure = LegacyChatSendFailure::None;
+    failed.timestamp_ms = 222;
+    event = mapLegacyChatSendResult(failed);
+    assert(event.state == DeliveryState::Failed);
+    assert(event.failure == SendFailureKind::Unknown);
+    assert(event.timestamp_ms == 222);
+
+    failed.failure = LegacyChatSendFailure::RadioSendFailed;
+    event = mapLegacyChatSendResult(failed);
+    assert(event.state == DeliveryState::Failed);
+    assert(event.failure == SendFailureKind::RadioSendFailed);
+
+    event = makeAckTimeoutDeliveryEvent(ChatDeliveryRef{0, 12, 0}, 333);
+    assert(event.ref.protocol_id == 12);
+    assert(event.state == DeliveryState::Failed);
+    assert(event.failure == SendFailureKind::AckTimeout);
+    assert(event.timestamp_ms == 333);
+
+    return 0;
+}
diff --git a/modules/core_device/include/device/authority_types.h b/modules/core_device/include/device/authority_types.h
new file mode 100644
index 00000000..44d880e7
--- /dev/null
+++ b/modules/core_device/include/device/authority_types.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <cstdint>
+
+#include "device/host_types.h"
+
+namespace device
+{
+
+enum class AuthorityKind : std::uint8_t
+{
+    None,
+    Identity,
+    PeerKeyStore,
+    NodeStore,
+    MessageStore,
+    Location,
+    Time,
+    Config,
+    DeviceStatus,
+    UiState,
+};
+
+struct AuthorityBinding
+{
+    AuthorityKind authority = AuthorityKind::None;
+    HostKind owner = HostKind::None;
+};
+
+} // namespace device
diff --git a/modules/core_device/include/device/board_types.h b/modules/core_device/include/device/board_types.h
new file mode 100644
index 00000000..c6e3581c
--- /dev/null
+++ b/modules/core_device/include/device/board_types.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <cstdint>
+
+#include "device/platform_types.h"
+
+namespace device
+{
+
+struct BoardId
+{
+    const char* value = "";
+};
+
+struct BoardPackageRef
+{
+    BoardId id{};
+    PlatformKind platform = PlatformKind::None;
+    const char* package_path = "";
+};
+
+struct DisplayFacts
+{
+    bool present = false;
+    std::uint16_t width = 0;
+    std::uint16_t height = 0;
+    std::uint16_t rotation = 0;
+    const char* driver = "";
+};
+
+struct InputFacts
+{
+    bool keyboard = false;
+    bool buttons = false;
+    bool touch = false;
+    bool encoder = false;
+    bool trackball = false;
+};
+
+} // namespace device
diff --git a/modules/core_device/include/device/capability_types.h b/modules/core_device/include/device/capability_types.h
new file mode 100644
index 00000000..bda7305b
--- /dev/null
+++ b/modules/core_device/include/device/capability_types.h
@@ -0,0 +1,69 @@
+#pragma once
+
+#include <cstdint>
+
+#include "device/host_types.h"
+
+namespace device
+{
+
+enum class CapabilityKind : std::uint8_t
+{
+    None,
+    Lora,
+    Gps,
+    Ble,
+    HostLink,
+    Storage,
+    Display,
+    Input,
+    Battery,
+    Network,
+    Audio,
+    MapStorage,
+};
+
+enum class CapabilityState : std::uint8_t
+{
+    Unsupported,
+    Absent,
+    Present,
+    Unbound,
+    Initializing,
+    Ready,
+    Degraded,
+    Simulated,
+    Error,
+};
+
+enum class RadioLinkMode : std::uint8_t
+{
+    None,
+    LocalRadio,
+    PacketProxy,
+    CommandProxy,
+};
+
+enum class GpsLinkMode : std::uint8_t
+{
+    None,
+    LocalUart,
+    RawStreamProxy,
+    FixProxy,
+    CommandProxy,
+    Simulated,
+};
+
+struct CapabilityStatus
+{
+    CapabilityKind kind = CapabilityKind::None;
+    CapabilityState state = CapabilityState::Unsupported;
+    HostKind endpoint_host = HostKind::None;
+};
+
+const char* to_string(CapabilityKind kind) noexcept;
+const char* to_string(CapabilityState state) noexcept;
+const char* to_string(RadioLinkMode mode) noexcept;
+const char* to_string(GpsLinkMode mode) noexcept;
+
+} // namespace device
diff --git a/modules/core_device/include/device/host_types.h b/modules/core_device/include/device/host_types.h
new file mode 100644
index 00000000..d6623238
--- /dev/null
+++ b/modules/core_device/include/device/host_types.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <cstdint>
+
+namespace device
+{
+
+enum class HostKind : std::uint8_t
+{
+    None,
+    Esp32,
+    Nrf52,
+    Linux,
+    External,
+    Test,
+};
+
+} // namespace device
diff --git a/modules/core_device/include/device/platform_types.h b/modules/core_device/include/device/platform_types.h
new file mode 100644
index 00000000..e1c26995
--- /dev/null
+++ b/modules/core_device/include/device/platform_types.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <cstdint>
+
+namespace device
+{
+
+enum class PlatformKind : std::uint8_t
+{
+    None,
+    Esp32,
+    Nrf52,
+    Linux,
+    Test,
+};
+
+} // namespace device
diff --git a/modules/core_device/include/device/runtime_types.h b/modules/core_device/include/device/runtime_types.h
new file mode 100644
index 00000000..bb0abcb4
--- /dev/null
+++ b/modules/core_device/include/device/runtime_types.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <cstdint>
+
+namespace device
+{
+
+enum class RuntimeSchedulerKind : std::uint8_t
+{
+    None,
+    FreeRtos,
+    ZephyrWorkQueue,
+    LinuxEventLoop,
+    SingleThreadTick,
+    TestFake,
+};
+
+enum class QueuePolicyKind : std::uint8_t
+{
+    None,
+    EventQueue,
+    CommandQueue,
+    Snapshot,
+    DirectCallForbidden,
+};
+
+struct RuntimePolicy
+{
+    RuntimeSchedulerKind scheduler = RuntimeSchedulerKind::None;
+    QueuePolicyKind app_to_ui = QueuePolicyKind::Snapshot;
+    QueuePolicyKind radio_to_app = QueuePolicyKind::EventQueue;
+    QueuePolicyKind gps_to_app = QueuePolicyKind::EventQueue;
+    QueuePolicyKind ble_to_app = QueuePolicyKind::CommandQueue;
+    bool isr_defer_only = true;
+    bool ui_thread_only = true;
+};
+
+} // namespace device
diff --git a/modules/core_device/include/device/target_manifest_types.h b/modules/core_device/include/device/target_manifest_types.h
new file mode 100644
index 00000000..d789d070
--- /dev/null
+++ b/modules/core_device/include/device/target_manifest_types.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include <cstddef>
+
+#include "device/authority_types.h"
+#include "device/board_types.h"
+#include "device/capability_types.h"
+#include "device/platform_types.h"
+#include "device/runtime_types.h"
+#include "device/ui_types.h"
+
+namespace device
+{
+
+struct TargetId
+{
+    const char* value = "";
+};
+
+struct ProductDescriptor
+{
+    const char* family = "";
+    const char* form_factor = "";
+    const char* interaction_class = "";
+};
+
+struct PlatformDescriptor
+{
+    PlatformKind kind = PlatformKind::None;
+    const char* sdk = "";
+    const char* memory_tier = "";
+    const char* filesystem = "";
+    const char* dynamic_allocation = "";
+};
+
+struct CapabilityBindingRef
+{
+    CapabilityKind capability = CapabilityKind::None;
+    const char* board_provider = "";
+    const char* platform_driver = "";
+    const char* runtime_owner = "";
+};
+
+struct TargetManifestView
+{
+    TargetId target{};
+    ProductDescriptor product{};
+    PlatformDescriptor platform{};
+    BoardPackageRef board{};
+    RuntimePolicy runtime{};
+    UiBinding ui{};
+    const AuthorityBinding* authorities = nullptr;
+    std::size_t authority_count = 0;
+    const CapabilityStatus* capabilities = nullptr;
+    std::size_t capability_count = 0;
+    const CapabilityBindingRef* capability_bindings = nullptr;
+    std::size_t capability_binding_count = 0;
+};
+
+} // namespace device
diff --git a/modules/core_device/include/device/ui_types.h b/modules/core_device/include/device/ui_types.h
new file mode 100644
index 00000000..3985e4bb
--- /dev/null
+++ b/modules/core_device/include/device/ui_types.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <cstdint>
+
+#include "device/host_types.h"
+
+namespace device
+{
+
+enum class UiShellKind : std::uint8_t
+{
+    None,
+    Lvgl,
+    Ascii,
+    Gtk,
+    Cli,
+    Headless,
+};
+
+enum class RendererKind : std::uint8_t
+{
+    None,
+    Lvgl,
+    AsciiCanvas,
+    Gtk4,
+    Stdout,
+};
+
+struct UiBinding
+{
+    UiShellKind shell = UiShellKind::None;
+    RendererKind renderer = RendererKind::None;
+    HostKind presentation_model_host = HostKind::None;
+    HostKind ui_host = HostKind::None;
+};
+
+} // namespace device
diff --git a/apps/esp_idf/library.json b/modules/core_device/library.json
similarity index 62%
rename from apps/esp_idf/library.json
rename to modules/core_device/library.json
index 2842f96c..4d392efb 100644
--- a/apps/esp_idf/library.json
+++ b/modules/core_device/library.json
@@ -1,9 +1,9 @@
 {
-  "name": "apps_esp_idf",
+  "name": "core_device",
   "version": "0.1.0",
-  "frameworks": ["espidf"],
   "build": {
     "includeDir": "include",
     "srcDir": "src"
   }
-}
\ No newline at end of file
+}
+
diff --git a/modules/core_device/src/device/capability_types.cpp b/modules/core_device/src/device/capability_types.cpp
new file mode 100644
index 00000000..265b4eb0
--- /dev/null
+++ b/modules/core_device/src/device/capability_types.cpp
@@ -0,0 +1,100 @@
+#include "device/capability_types.h"
+
+namespace device
+{
+
+const char* to_string(CapabilityKind kind) noexcept
+{
+    switch (kind)
+    {
+    case CapabilityKind::None:
+        return "none";
+    case CapabilityKind::Lora:
+        return "lora";
+    case CapabilityKind::Gps:
+        return "gps";
+    case CapabilityKind::Ble:
+        return "ble";
+    case CapabilityKind::HostLink:
+        return "hostlink";
+    case CapabilityKind::Storage:
+        return "storage";
+    case CapabilityKind::Display:
+        return "display";
+    case CapabilityKind::Input:
+        return "input";
+    case CapabilityKind::Battery:
+        return "battery";
+    case CapabilityKind::Network:
+        return "network";
+    case CapabilityKind::Audio:
+        return "audio";
+    case CapabilityKind::MapStorage:
+        return "map_storage";
+    }
+    return "unknown";
+}
+
+const char* to_string(CapabilityState state) noexcept
+{
+    switch (state)
+    {
+    case CapabilityState::Unsupported:
+        return "unsupported";
+    case CapabilityState::Absent:
+        return "absent";
+    case CapabilityState::Present:
+        return "present";
+    case CapabilityState::Unbound:
+        return "unbound";
+    case CapabilityState::Initializing:
+        return "initializing";
+    case CapabilityState::Ready:
+        return "ready";
+    case CapabilityState::Degraded:
+        return "degraded";
+    case CapabilityState::Simulated:
+        return "simulated";
+    case CapabilityState::Error:
+        return "error";
+    }
+    return "unknown";
+}
+
+const char* to_string(RadioLinkMode mode) noexcept
+{
+    switch (mode)
+    {
+    case RadioLinkMode::None:
+        return "none";
+    case RadioLinkMode::LocalRadio:
+        return "local_radio";
+    case RadioLinkMode::PacketProxy:
+        return "packet_proxy";
+    case RadioLinkMode::CommandProxy:
+        return "command_proxy";
+    }
+    return "unknown";
+}
+
+const char* to_string(GpsLinkMode mode) noexcept
+{
+    switch (mode)
+    {
+    case GpsLinkMode::None:
+        return "none";
+    case GpsLinkMode::LocalUart:
+        return "local_uart";
+    case GpsLinkMode::RawStreamProxy:
+        return "raw_stream_proxy";
+    case GpsLinkMode::FixProxy:
+        return "fix_proxy";
+    case GpsLinkMode::CommandProxy:
+        return "command_proxy";
+    case GpsLinkMode::Simulated:
+        return "simulated";
+    }
+    return "unknown";
+}
+
+} // namespace device
diff --git a/modules/core_gps/README.md b/modules/core_gps/README.md
index 94492739..e0689ed5 100644
--- a/modules/core_gps/README.md
+++ b/modules/core_gps/README.md
@@ -5,15 +5,32 @@ Home for shared GPS domain logic, filtering, and portable contracts.
 ## Migrated now
 
 - `include/gps/domain/gnss_satellite.h`
+- `include/gps/domain/location_fix.h`
+- `include/gps/domain/time_fact.h`
+- `include/gps/domain/gps_status.h`
+- `include/gps/domain/satellite_info.h`
 - `include/gps/domain/gps_state.h`
 - `include/gps/domain/motion_sensor_ids.h`
 - `include/gps/domain/motion_config.h`
 - `include/gps/ports/i_gps_hw.h`
+- `include/gps/ports/i_gnss_byte_stream.h`
+- `include/gps/ports/i_gps_power_control.h`
+- `include/gps/ports/i_gps_config_applier.h`
+- `include/gps/ports/i_location_source.h`
+- `include/gps/ports/i_time_authority.h`
+- `include/gps/ports/i_location_event_sink.h`
 - `include/gps/ports/i_motion_hw.h`
+- `include/gps/protocol/nmea/nmea_sentence.h`
+- `include/gps/protocol/nmea/nmea_parser.h`
+- `include/gps/protocol/ubx/ubx_parser.h`
 - `include/gps/motion_policy.h`
 - `src/motion_policy.cpp`
 - `include/gps/usecase/gps_jitter_filter.h`
 - `src/usecase/gps_jitter_filter.cpp`
+- `include/gps/usecase/location_service.h`
+- `src/usecase/location_service.cpp`
+- `include/gps/usecase/time_authority.h`
+- `src/usecase/time_authority.cpp`
 - `include/gps/usecase/gps_runtime_policy.h`
 - `src/usecase/gps_runtime_policy.cpp`
 - `include/gps/usecase/gps_runtime_config.h`
diff --git a/modules/core_gps/include/gps/domain/gps_status.h b/modules/core_gps/include/gps/domain/gps_status.h
new file mode 100644
index 00000000..82e19e17
--- /dev/null
+++ b/modules/core_gps/include/gps/domain/gps_status.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "gps/domain/gnss_satellite.h"
+#include "gps/domain/gps_diagnostics.h"
+
+namespace gps
+{
+
+struct GpsStatusSnapshot
+{
+    bool supported = false;
+    bool enabled = false;
+    bool powered = false;
+    bool ready = false;
+    bool has_fix = false;
+    uint8_t satellites = 0;
+    GnssStatus gnss{};
+    GpsDiagnosticCode diagnostic = GpsDiagnosticCode::Disabled;
+};
+
+inline GpsStatusSnapshot gpsStatusFromDiagnostics(const GpsDiagnosticsSnapshot& diagnostics,
+                                                  const GnssStatus& gnss = GnssStatus{})
+{
+    GpsStatusSnapshot status{};
+    status.supported = diagnostics.supported;
+    status.enabled = diagnostics.enabled;
+    status.powered = diagnostics.powered;
+    status.ready = diagnostics.ready;
+    status.has_fix = diagnostics.has_fix;
+    status.satellites = diagnostics.satellites;
+    status.gnss = gnss;
+    status.diagnostic = diagnostics.code;
+    return status;
+}
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/domain/location_fix.h b/modules/core_gps/include/gps/domain/location_fix.h
new file mode 100644
index 00000000..89f615bf
--- /dev/null
+++ b/modules/core_gps/include/gps/domain/location_fix.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include "gps/domain/gps_state.h"
+
+#include <cstdint>
+
+namespace gps
+{
+
+struct LocationFix
+{
+    bool valid = false;
+    double latitude = 0.0;
+    double longitude = 0.0;
+    float altitude_m = 0.0f;
+    float speed_mps = 0.0f;
+    float course_deg = 0.0f;
+    bool has_altitude = false;
+    bool has_speed = false;
+    bool has_course = false;
+    uint8_t satellites = 0;
+    float hdop = 0.0f;
+    uint64_t epoch_seconds = 0;
+    uint32_t observed_at_ms = 0;
+};
+
+inline LocationFix locationFixFromGpsState(const GpsState& state,
+                                           uint32_t observed_at_ms = 0,
+                                           uint64_t epoch_seconds = 0,
+                                           float hdop = 0.0f)
+{
+    LocationFix fix{};
+    fix.valid = state.valid;
+    fix.latitude = state.lat;
+    fix.longitude = state.lng;
+    fix.altitude_m = static_cast<float>(state.alt_m);
+    fix.speed_mps = static_cast<float>(state.speed_mps);
+    fix.course_deg = static_cast<float>(state.course_deg);
+    fix.has_altitude = state.has_alt;
+    fix.has_speed = state.has_speed;
+    fix.has_course = state.has_course;
+    fix.satellites = state.satellites;
+    fix.hdop = hdop;
+    fix.epoch_seconds = epoch_seconds;
+    fix.observed_at_ms = observed_at_ms;
+    return fix;
+}
+
+inline GpsState gpsStateFromLocationFix(const LocationFix& fix)
+{
+    GpsState state{};
+    state.valid = fix.valid;
+    state.lat = fix.latitude;
+    state.lng = fix.longitude;
+    state.alt_m = fix.has_altitude ? static_cast<double>(fix.altitude_m) : 0.0;
+    state.speed_mps = fix.has_speed ? static_cast<double>(fix.speed_mps) : 0.0;
+    state.course_deg = fix.has_course ? static_cast<double>(fix.course_deg) : 0.0;
+    state.has_alt = fix.has_altitude;
+    state.has_speed = fix.has_speed;
+    state.has_course = fix.has_course;
+    state.satellites = fix.satellites;
+    state.age = 0;
+    return state;
+}
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/domain/satellite_info.h b/modules/core_gps/include/gps/domain/satellite_info.h
new file mode 100644
index 00000000..e4fa6f74
--- /dev/null
+++ b/modules/core_gps/include/gps/domain/satellite_info.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "gps/domain/gnss_satellite.h"
+
+#include <array>
+
+namespace gps
+{
+
+struct SatelliteSnapshot
+{
+    std::array<GnssSatInfo, kMaxGnssSats> satellites{};
+    std::size_t count = 0;
+    GnssStatus status{};
+};
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/domain/time_fact.h b/modules/core_gps/include/gps/domain/time_fact.h
new file mode 100644
index 00000000..2c2387ae
--- /dev/null
+++ b/modules/core_gps/include/gps/domain/time_fact.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <cstdint>
+
+namespace gps
+{
+
+enum class TimeSourceKind : uint8_t
+{
+    None = 0,
+    System,
+    Gps,
+    Host,
+    Rtc,
+    Test,
+};
+
+struct TimeSyncStatus
+{
+    bool epoch_valid = false;
+    bool synced = false;
+    TimeSourceKind source = TimeSourceKind::None;
+    uint64_t epoch_seconds = 0;
+    uint32_t observed_at_ms = 0;
+};
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/ports/i_gnss_byte_stream.h b/modules/core_gps/include/gps/ports/i_gnss_byte_stream.h
new file mode 100644
index 00000000..ab50d789
--- /dev/null
+++ b/modules/core_gps/include/gps/ports/i_gnss_byte_stream.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+namespace gps
+{
+
+enum class IoFailure : uint8_t
+{
+    None = 0,
+    NotReady,
+    Timeout,
+    DeviceError,
+    BufferTooSmall,
+};
+
+struct IoResult
+{
+    bool ok = false;
+    IoFailure failure = IoFailure::None;
+    std::size_t bytes_read = 0;
+
+    static IoResult success(std::size_t n)
+    {
+        return IoResult{true, IoFailure::None, n};
+    }
+
+    static IoResult fail(IoFailure failure)
+    {
+        return IoResult{false, failure, 0};
+    }
+};
+
+class IGnssByteStream
+{
+  public:
+    virtual ~IGnssByteStream() = default;
+
+    virtual IoResult read(uint8_t* out, std::size_t capacity) = 0;
+};
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/ports/i_gps_config_applier.h b/modules/core_gps/include/gps/ports/i_gps_config_applier.h
new file mode 100644
index 00000000..c181d9eb
--- /dev/null
+++ b/modules/core_gps/include/gps/ports/i_gps_config_applier.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "gps/usecase/gps_runtime_config.h"
+
+#include <cstdint>
+
+namespace gps
+{
+
+enum class ConfigApplyFailure : uint8_t
+{
+    None = 0,
+    Unsupported,
+    DeviceNotReady,
+    IoError,
+};
+
+struct ConfigApplyResult
+{
+    bool ok = false;
+    ConfigApplyFailure failure = ConfigApplyFailure::None;
+
+    static ConfigApplyResult success()
+    {
+        return ConfigApplyResult{true, ConfigApplyFailure::None};
+    }
+
+    static ConfigApplyResult fail(ConfigApplyFailure failure)
+    {
+        return ConfigApplyResult{false, failure};
+    }
+};
+
+class IGpsConfigApplier
+{
+  public:
+    virtual ~IGpsConfigApplier() = default;
+
+    virtual ConfigApplyResult apply(const GnssRuntimeConfig& config) = 0;
+};
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/ports/i_gps_power_control.h b/modules/core_gps/include/gps/ports/i_gps_power_control.h
new file mode 100644
index 00000000..ec6c4af7
--- /dev/null
+++ b/modules/core_gps/include/gps/ports/i_gps_power_control.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <cstdint>
+
+namespace gps
+{
+
+enum class PowerState : uint8_t
+{
+    Off,
+    Starting,
+    On,
+    Stopping,
+    Error,
+};
+
+class IGpsPowerControl
+{
+  public:
+    virtual ~IGpsPowerControl() = default;
+
+    virtual bool setPower(bool enabled) = 0;
+    virtual PowerState powerState() const = 0;
+};
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/ports/i_location_event_sink.h b/modules/core_gps/include/gps/ports/i_location_event_sink.h
new file mode 100644
index 00000000..4443b18a
--- /dev/null
+++ b/modules/core_gps/include/gps/ports/i_location_event_sink.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "gps/domain/location_fix.h"
+
+namespace gps
+{
+
+class ILocationEventSink
+{
+  public:
+    virtual ~ILocationEventSink() = default;
+
+    virtual void onLocationUpdated(const LocationFix& fix) = 0;
+};
+
+class NullLocationEventSink final : public ILocationEventSink
+{
+  public:
+    void onLocationUpdated(const LocationFix& fix) override
+    {
+        (void)fix;
+    }
+};
+
+inline ILocationEventSink& nullLocationEventSink()
+{
+    static NullLocationEventSink sink;
+    return sink;
+}
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/ports/i_location_source.h b/modules/core_gps/include/gps/ports/i_location_source.h
new file mode 100644
index 00000000..a6951ff0
--- /dev/null
+++ b/modules/core_gps/include/gps/ports/i_location_source.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "gps/domain/location_fix.h"
+
+namespace gps
+{
+
+class ILocationSource
+{
+  public:
+    virtual ~ILocationSource() = default;
+
+    virtual bool latestFix(LocationFix& out) const = 0;
+};
+
+class NullLocationSource final : public ILocationSource
+{
+  public:
+    bool latestFix(LocationFix& out) const override
+    {
+        out = {};
+        return false;
+    }
+};
+
+inline const ILocationSource& nullLocationSource()
+{
+    static NullLocationSource source;
+    return source;
+}
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/ports/i_time_authority.h b/modules/core_gps/include/gps/ports/i_time_authority.h
new file mode 100644
index 00000000..7ddd4ba8
--- /dev/null
+++ b/modules/core_gps/include/gps/ports/i_time_authority.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "gps/domain/time_fact.h"
+
+namespace gps
+{
+
+class ITimeAuthority
+{
+  public:
+    virtual ~ITimeAuthority() = default;
+
+    virtual uint32_t nowMonotonicMs() const = 0;
+    virtual bool nowEpoch(uint64_t& out_epoch_seconds) const = 0;
+    virtual TimeSyncStatus syncStatus() const = 0;
+};
+
+class ITimeAuthorityUpdater
+{
+  public:
+    virtual ~ITimeAuthorityUpdater() = default;
+
+    virtual void observeGpsTime(const TimeSyncStatus& fact) = 0;
+    virtual void observeHostTime(const TimeSyncStatus& fact) = 0;
+};
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/protocol/nmea/nmea_parser.h b/modules/core_gps/include/gps/protocol/nmea/nmea_parser.h
new file mode 100644
index 00000000..7802055e
--- /dev/null
+++ b/modules/core_gps/include/gps/protocol/nmea/nmea_parser.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "gps/domain/location_fix.h"
+#include "gps/domain/satellite_info.h"
+#include "gps/domain/time_fact.h"
+#include "gps/protocol/nmea/nmea_sentence.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace gps::nmea
+{
+
+class NmeaParser
+{
+  public:
+    void reset();
+    void feed(const uint8_t* bytes, std::size_t len);
+
+    bool latestFix(LocationFix& out) const;
+    bool latestTime(TimeSyncStatus& out) const;
+    bool latestSatellites(SatelliteSnapshot& out) const;
+
+    uint32_t fixRevision() const { return fix_revision_; }
+    uint32_t timeRevision() const { return time_revision_; }
+    uint32_t satelliteRevision() const { return satellite_revision_; }
+
+  private:
+    void processSentence(const NmeaSentence& sentence);
+    void processRmc(char** fields, int field_count);
+    void processGga(char** fields, int field_count);
+    void processGsa(char** fields, int field_count);
+
+    NmeaSentenceAssembler assembler_{};
+    LocationFix latest_fix_{};
+    TimeSyncStatus latest_time_{};
+    SatelliteSnapshot latest_satellites_{};
+    uint32_t fix_revision_ = 0;
+    uint32_t time_revision_ = 0;
+    uint32_t satellite_revision_ = 0;
+    uint16_t last_date_year_ = 0;
+    uint8_t last_date_month_ = 0;
+    uint8_t last_date_day_ = 0;
+};
+
+} // namespace gps::nmea
diff --git a/modules/core_gps/include/gps/protocol/nmea/nmea_sentence.h b/modules/core_gps/include/gps/protocol/nmea/nmea_sentence.h
new file mode 100644
index 00000000..da5e38f6
--- /dev/null
+++ b/modules/core_gps/include/gps/protocol/nmea/nmea_sentence.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+namespace gps::nmea
+{
+
+constexpr std::size_t kMaxNmeaSentenceLen = 128;
+
+struct NmeaSentence
+{
+    char text[kMaxNmeaSentenceLen] = {};
+    std::size_t len = 0;
+    bool has_checksum = false;
+    bool checksum_valid = false;
+};
+
+class NmeaSentenceAssembler
+{
+  public:
+    void reset();
+    bool feed(uint8_t byte, NmeaSentence& out);
+
+  private:
+    char buffer_[kMaxNmeaSentenceLen] = {};
+    std::size_t len_ = 0;
+    bool collecting_ = false;
+};
+
+bool verifyChecksum(const char* sentence, bool* out_has_checksum = nullptr);
+
+} // namespace gps::nmea
diff --git a/modules/core_gps/include/gps/protocol/ubx/ubx_parser.h b/modules/core_gps/include/gps/protocol/ubx/ubx_parser.h
new file mode 100644
index 00000000..69224308
--- /dev/null
+++ b/modules/core_gps/include/gps/protocol/ubx/ubx_parser.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+namespace gps::ubx
+{
+
+class UbxParser
+{
+  public:
+    void reset() {}
+    void feed(const uint8_t* bytes, std::size_t len)
+    {
+        (void)bytes;
+        (void)len;
+    }
+};
+
+} // namespace gps::ubx
diff --git a/modules/core_gps/include/gps/usecase/gps_runtime_config.h b/modules/core_gps/include/gps/usecase/gps_runtime_config.h
index 51e6aa1e..787e82d6 100644
--- a/modules/core_gps/include/gps/usecase/gps_runtime_config.h
+++ b/modules/core_gps/include/gps/usecase/gps_runtime_config.h
@@ -46,8 +46,12 @@ struct GpsReceiverInitConfig
 
 struct GnssRuntimeConfig
 {
+    uint32_t baud = 9600;
+    uint32_t update_interval_ms = 1000;
     uint8_t mode = 0;
     uint8_t sat_mask = kDefaultGnssSatelliteMask;
+    bool nmea_enabled = true;
+    bool ubx_enabled = false;
 };
 
 struct ExternalNmeaRuntimeConfig
diff --git a/modules/core_gps/include/gps/usecase/location_service.h b/modules/core_gps/include/gps/usecase/location_service.h
new file mode 100644
index 00000000..bfbbec8c
--- /dev/null
+++ b/modules/core_gps/include/gps/usecase/location_service.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "gps/ports/i_location_event_sink.h"
+#include "gps/ports/i_location_source.h"
+#include "gps/ports/i_time_authority.h"
+#include "gps/protocol/nmea/nmea_parser.h"
+#include "gps/usecase/gps_jitter_filter.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace gps
+{
+
+class LocationService final : public ILocationSource
+{
+  public:
+    LocationService(nmea::NmeaParser& parser,
+                    GpsJitterFilter& jitter_filter,
+                    ITimeAuthorityUpdater& time_updater,
+                    ILocationEventSink& events);
+
+    void reset();
+    void onGnssBytes(const uint8_t* bytes, std::size_t len);
+    void onGnssBytes(const uint8_t* bytes, std::size_t len, uint32_t now_ms, uint32_t last_motion_ms);
+
+    bool latestFix(LocationFix& out) const override;
+
+  private:
+    nmea::NmeaParser& parser_;
+    GpsJitterFilter& jitter_filter_;
+    ITimeAuthorityUpdater& time_updater_;
+    ILocationEventSink& events_;
+    LocationFix latest_fix_{};
+    uint32_t last_fix_revision_ = 0;
+    uint32_t last_time_revision_ = 0;
+};
+
+} // namespace gps
diff --git a/modules/core_gps/include/gps/usecase/time_authority.h b/modules/core_gps/include/gps/usecase/time_authority.h
new file mode 100644
index 00000000..f3cb58ea
--- /dev/null
+++ b/modules/core_gps/include/gps/usecase/time_authority.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "gps/ports/i_time_authority.h"
+
+namespace gps
+{
+
+class IClock
+{
+  public:
+    virtual ~IClock() = default;
+
+    virtual uint32_t nowMs() const = 0;
+};
+
+struct TimeAuthorityPolicy
+{
+    bool gps_overrides_host = true;
+    bool host_time_fallback = true;
+};
+
+class TimeAuthority final : public ITimeAuthority, public ITimeAuthorityUpdater
+{
+  public:
+    explicit TimeAuthority(IClock& clock, TimeAuthorityPolicy policy = TimeAuthorityPolicy{});
+
+    uint32_t nowMonotonicMs() const override;
+    bool nowEpoch(uint64_t& out_epoch_seconds) const override;
+    TimeSyncStatus syncStatus() const override;
+
+    void observeGpsTime(const TimeSyncStatus& fact) override;
+    void observeHostTime(const TimeSyncStatus& fact) override;
+
+  private:
+    bool shouldAcceptGpsTime(const TimeSyncStatus& fact) const;
+    bool shouldAcceptHostTime(const TimeSyncStatus& fact) const;
+
+    IClock& clock_;
+    TimeAuthorityPolicy policy_{};
+    TimeSyncStatus status_{};
+};
+
+class SystemClock final : public IClock
+{
+  public:
+    uint32_t nowMs() const override;
+};
+
+} // namespace gps
diff --git a/modules/core_gps/src/protocol/nmea/nmea_parser.cpp b/modules/core_gps/src/protocol/nmea/nmea_parser.cpp
new file mode 100644
index 00000000..6efba679
--- /dev/null
+++ b/modules/core_gps/src/protocol/nmea/nmea_parser.cpp
@@ -0,0 +1,382 @@
+#include "gps/protocol/nmea/nmea_parser.h"
+
+#include <cstdlib>
+#include <cstring>
+
+namespace gps::nmea
+{
+namespace
+{
+constexpr double kKnotsToMps = 0.514444444;
+
+bool isSentenceType(const char* field0, const char* type)
+{
+    return field0 && std::strlen(field0) >= 5 && std::strncmp(field0 + 2, type, 3) == 0;
+}
+
+bool parseUintField(const char* text, uint32_t& out)
+{
+    if (!text || text[0] == '\0')
+    {
+        return false;
+    }
+    char* end = nullptr;
+    const unsigned long value = std::strtoul(text, &end, 10);
+    if (end == text)
+    {
+        return false;
+    }
+    out = static_cast<uint32_t>(value);
+    return true;
+}
+
+double parseDoubleField(const char* text, double fallback = 0.0)
+{
+    if (!text || text[0] == '\0')
+    {
+        return fallback;
+    }
+    char* end = nullptr;
+    const double value = std::strtod(text, &end);
+    return end == text ? fallback : value;
+}
+
+bool parseNmeaCoordinate(const char* value, const char* hemisphere, double& out)
+{
+    if (!value || !hemisphere || value[0] == '\0' || hemisphere[0] == '\0')
+    {
+        return false;
+    }
+
+    const double raw = parseDoubleField(value);
+    const int degrees = static_cast<int>(raw / 100.0);
+    const double minutes = raw - static_cast<double>(degrees * 100);
+    double decimal = static_cast<double>(degrees) + minutes / 60.0;
+    if (hemisphere[0] == 'S' || hemisphere[0] == 'W')
+    {
+        decimal = -decimal;
+    }
+    out = decimal;
+    return true;
+}
+
+bool parseTimeParts(const char* value, uint8_t& hour, uint8_t& minute, uint8_t& second)
+{
+    if (!value || std::strlen(value) < 6)
+    {
+        return false;
+    }
+    char buf[3] = {};
+    buf[0] = value[0];
+    buf[1] = value[1];
+    hour = static_cast<uint8_t>(std::atoi(buf));
+    buf[0] = value[2];
+    buf[1] = value[3];
+    minute = static_cast<uint8_t>(std::atoi(buf));
+    buf[0] = value[4];
+    buf[1] = value[5];
+    second = static_cast<uint8_t>(std::atoi(buf));
+    return hour < 24 && minute < 60 && second < 60;
+}
+
+bool parseDateParts(const char* value, uint16_t& year, uint8_t& month, uint8_t& day)
+{
+    if (!value || std::strlen(value) < 6)
+    {
+        return false;
+    }
+    char buf[3] = {};
+    buf[0] = value[0];
+    buf[1] = value[1];
+    day = static_cast<uint8_t>(std::atoi(buf));
+    buf[0] = value[2];
+    buf[1] = value[3];
+    month = static_cast<uint8_t>(std::atoi(buf));
+    buf[0] = value[4];
+    buf[1] = value[5];
+    const uint8_t yy = static_cast<uint8_t>(std::atoi(buf));
+    year = static_cast<uint16_t>((yy >= 80U) ? (1900U + yy) : (2000U + yy));
+    return year >= 1980 && month >= 1 && month <= 12 && day >= 1 && day <= 31;
+}
+
+int64_t daysFromCivil(int year, unsigned month, unsigned day)
+{
+    year -= month <= 2;
+    const int era = (year >= 0 ? year : year - 399) / 400;
+    const unsigned yoe = static_cast<unsigned>(year - era * 400);
+    const unsigned doy = (153 * (month + (month > 2 ? -3 : 9)) + 2) / 5 + day - 1;
+    const unsigned doe = yoe * 365 + yoe / 4 - yoe / 100 + doy;
+    return era * 146097 + static_cast<int>(doe) - 719468;
+}
+
+bool makeEpoch(uint16_t year, uint8_t month, uint8_t day,
+               uint8_t hour, uint8_t minute, uint8_t second,
+               uint64_t& out)
+{
+    if (year < 1970 || month == 0 || day == 0 || month > 12 || day > 31 ||
+        hour > 23 || minute > 59 || second > 59)
+    {
+        return false;
+    }
+    const int64_t days = daysFromCivil(static_cast<int>(year), month, day);
+    if (days < 0)
+    {
+        return false;
+    }
+    out = static_cast<uint64_t>(days) * 86400ULL +
+          static_cast<uint64_t>(hour) * 3600ULL +
+          static_cast<uint64_t>(minute) * 60ULL +
+          static_cast<uint64_t>(second);
+    return true;
+}
+} // namespace
+
+void NmeaParser::reset()
+{
+    assembler_.reset();
+    latest_fix_ = {};
+    latest_time_ = {};
+    latest_satellites_ = {};
+    fix_revision_ = 0;
+    time_revision_ = 0;
+    satellite_revision_ = 0;
+    last_date_year_ = 0;
+    last_date_month_ = 0;
+    last_date_day_ = 0;
+}
+
+void NmeaParser::feed(const uint8_t* bytes, std::size_t len)
+{
+    if (!bytes || len == 0)
+    {
+        return;
+    }
+
+    for (std::size_t i = 0; i < len; ++i)
+    {
+        NmeaSentence sentence{};
+        if (assembler_.feed(bytes[i], sentence))
+        {
+            processSentence(sentence);
+        }
+    }
+}
+
+bool NmeaParser::latestFix(LocationFix& out) const
+{
+    if (!latest_fix_.valid)
+    {
+        out = {};
+        return false;
+    }
+    out = latest_fix_;
+    return true;
+}
+
+bool NmeaParser::latestTime(TimeSyncStatus& out) const
+{
+    if (!latest_time_.epoch_valid)
+    {
+        out = {};
+        return false;
+    }
+    out = latest_time_;
+    return true;
+}
+
+bool NmeaParser::latestSatellites(SatelliteSnapshot& out) const
+{
+    out = latest_satellites_;
+    return latest_satellites_.count > 0 ||
+           latest_satellites_.status.sats_in_use > 0 ||
+           latest_satellites_.status.fix != GnssFix::NOFIX;
+}
+
+void NmeaParser::processSentence(const NmeaSentence& sentence)
+{
+    if (!sentence.checksum_valid || sentence.len == 0)
+    {
+        return;
+    }
+
+    char scratch[kMaxNmeaSentenceLen] = {};
+    std::strncpy(scratch, sentence.text, sizeof(scratch) - 1U);
+    char* star = std::strchr(scratch, '*');
+    if (star)
+    {
+        *star = '\0';
+    }
+
+    char* start = scratch[0] == '$' ? scratch + 1 : scratch;
+    char* fields[32] = {};
+    int field_count = 0;
+    fields[field_count++] = start;
+    for (char* p = start; *p && field_count < 32; ++p)
+    {
+        if (*p == ',')
+        {
+            *p = '\0';
+            fields[field_count++] = p + 1;
+        }
+    }
+
+    if (field_count == 0)
+    {
+        return;
+    }
+
+    if (isSentenceType(fields[0], "RMC"))
+    {
+        processRmc(fields, field_count);
+    }
+    else if (isSentenceType(fields[0], "GGA"))
+    {
+        processGga(fields, field_count);
+    }
+    else if (isSentenceType(fields[0], "GSA"))
+    {
+        processGsa(fields, field_count);
+    }
+}
+
+void NmeaParser::processRmc(char** fields, int field_count)
+{
+    if (field_count < 10 || !fields[2] || fields[2][0] != 'A')
+    {
+        return;
+    }
+
+    uint8_t hour = 0;
+    uint8_t minute = 0;
+    uint8_t second = 0;
+    uint16_t year = 0;
+    uint8_t month = 0;
+    uint8_t day = 0;
+    uint64_t epoch = 0;
+    const bool has_time = parseTimeParts(fields[1], hour, minute, second);
+    const bool has_date = parseDateParts(fields[9], year, month, day);
+    if (has_date)
+    {
+        last_date_year_ = year;
+        last_date_month_ = month;
+        last_date_day_ = day;
+    }
+    if (has_time && has_date && makeEpoch(year, month, day, hour, minute, second, epoch))
+    {
+        latest_time_.epoch_valid = true;
+        latest_time_.synced = true;
+        latest_time_.source = TimeSourceKind::Gps;
+        latest_time_.epoch_seconds = epoch;
+        ++time_revision_;
+    }
+
+    double lat = 0.0;
+    double lon = 0.0;
+    if (!parseNmeaCoordinate(fields[3], fields[4], lat) ||
+        !parseNmeaCoordinate(fields[5], fields[6], lon))
+    {
+        return;
+    }
+
+    latest_fix_.valid = true;
+    latest_fix_.latitude = lat;
+    latest_fix_.longitude = lon;
+    latest_fix_.speed_mps = static_cast<float>(parseDoubleField(fields[7]) * kKnotsToMps);
+    latest_fix_.course_deg = static_cast<float>(parseDoubleField(fields[8]));
+    latest_fix_.has_speed = fields[7] && fields[7][0] != '\0';
+    latest_fix_.has_course = fields[8] && fields[8][0] != '\0';
+    if (epoch != 0)
+    {
+        latest_fix_.epoch_seconds = epoch;
+    }
+    ++fix_revision_;
+}
+
+void NmeaParser::processGga(char** fields, int field_count)
+{
+    if (field_count < 10)
+    {
+        return;
+    }
+
+    uint32_t fix_quality = 0;
+    if (!parseUintField(fields[6], fix_quality) || fix_quality == 0)
+    {
+        latest_satellites_.status.fix = GnssFix::NOFIX;
+        ++satellite_revision_;
+        return;
+    }
+
+    double lat = 0.0;
+    double lon = 0.0;
+    if (!parseNmeaCoordinate(fields[2], fields[3], lat) ||
+        !parseNmeaCoordinate(fields[4], fields[5], lon))
+    {
+        return;
+    }
+
+    uint32_t satellites = 0;
+    (void)parseUintField(fields[7], satellites);
+    const float hdop = static_cast<float>(parseDoubleField(fields[8]));
+
+    uint8_t hour = 0;
+    uint8_t minute = 0;
+    uint8_t second = 0;
+    uint64_t epoch = 0;
+    if (parseTimeParts(fields[1], hour, minute, second) &&
+        last_date_year_ != 0 &&
+        makeEpoch(last_date_year_, last_date_month_, last_date_day_, hour, minute, second, epoch))
+    {
+        latest_time_.epoch_valid = true;
+        latest_time_.synced = true;
+        latest_time_.source = TimeSourceKind::Gps;
+        latest_time_.epoch_seconds = epoch;
+        ++time_revision_;
+    }
+
+    latest_fix_.valid = true;
+    latest_fix_.latitude = lat;
+    latest_fix_.longitude = lon;
+    latest_fix_.satellites = static_cast<uint8_t>(satellites > 255U ? 255U : satellites);
+    latest_fix_.hdop = hdop;
+    latest_fix_.altitude_m = static_cast<float>(parseDoubleField(fields[9]));
+    latest_fix_.has_altitude = fields[9] && fields[9][0] != '\0';
+    if (epoch != 0)
+    {
+        latest_fix_.epoch_seconds = epoch;
+    }
+    latest_satellites_.status.sats_in_use = latest_fix_.satellites;
+    latest_satellites_.status.hdop = hdop;
+    latest_satellites_.status.fix = GnssFix::FIX3D;
+    ++fix_revision_;
+    ++satellite_revision_;
+}
+
+void NmeaParser::processGsa(char** fields, int field_count)
+{
+    if (field_count < 3)
+    {
+        return;
+    }
+
+    const int fix = std::atoi(fields[2]);
+    if (fix <= 1)
+    {
+        latest_satellites_.status.fix = GnssFix::NOFIX;
+    }
+    else if (fix == 2)
+    {
+        latest_satellites_.status.fix = GnssFix::FIX2D;
+    }
+    else
+    {
+        latest_satellites_.status.fix = GnssFix::FIX3D;
+    }
+    if (field_count >= 17 && fields[16] && fields[16][0] != '\0')
+    {
+        latest_satellites_.status.hdop = static_cast<float>(parseDoubleField(fields[16]));
+    }
+    ++satellite_revision_;
+}
+
+} // namespace gps::nmea
diff --git a/modules/core_gps/src/protocol/nmea/nmea_sentence.cpp b/modules/core_gps/src/protocol/nmea/nmea_sentence.cpp
new file mode 100644
index 00000000..36d2c255
--- /dev/null
+++ b/modules/core_gps/src/protocol/nmea/nmea_sentence.cpp
@@ -0,0 +1,116 @@
+#include "gps/protocol/nmea/nmea_sentence.h"
+
+#include <cctype>
+#include <cstring>
+
+namespace gps::nmea
+{
+namespace
+{
+int hexValue(char c)
+{
+    if (c >= '0' && c <= '9')
+    {
+        return c - '0';
+    }
+    if (c >= 'A' && c <= 'F')
+    {
+        return c - 'A' + 10;
+    }
+    if (c >= 'a' && c <= 'f')
+    {
+        return c - 'a' + 10;
+    }
+    return -1;
+}
+} // namespace
+
+void NmeaSentenceAssembler::reset()
+{
+    len_ = 0;
+    collecting_ = false;
+    buffer_[0] = '\0';
+}
+
+bool NmeaSentenceAssembler::feed(uint8_t byte, NmeaSentence& out)
+{
+    const char c = static_cast<char>(byte);
+    if (c == '$')
+    {
+        collecting_ = true;
+        len_ = 0;
+        buffer_[len_++] = c;
+        return false;
+    }
+
+    if (!collecting_)
+    {
+        return false;
+    }
+
+    if (c == '\r')
+    {
+        return false;
+    }
+
+    if (c == '\n')
+    {
+        buffer_[len_] = '\0';
+        out = {};
+        std::memcpy(out.text, buffer_, len_ + 1U);
+        out.len = len_;
+        out.checksum_valid = verifyChecksum(out.text, &out.has_checksum);
+        reset();
+        return out.len > 0;
+    }
+
+    if (len_ + 1U >= kMaxNmeaSentenceLen)
+    {
+        reset();
+        return false;
+    }
+
+    buffer_[len_++] = c;
+    return false;
+}
+
+bool verifyChecksum(const char* sentence, bool* out_has_checksum)
+{
+    if (out_has_checksum)
+    {
+        *out_has_checksum = false;
+    }
+    if (!sentence || sentence[0] != '$')
+    {
+        return false;
+    }
+
+    const char* star = std::strchr(sentence, '*');
+    if (!star)
+    {
+        return true;
+    }
+    if (!star[1] || !star[2])
+    {
+        return false;
+    }
+    const int hi = hexValue(star[1]);
+    const int lo = hexValue(star[2]);
+    if (hi < 0 || lo < 0)
+    {
+        return false;
+    }
+    if (out_has_checksum)
+    {
+        *out_has_checksum = true;
+    }
+
+    uint8_t checksum = 0;
+    for (const char* cursor = sentence + 1; cursor < star; ++cursor)
+    {
+        checksum ^= static_cast<uint8_t>(*cursor);
+    }
+    return checksum == static_cast<uint8_t>((hi << 4) | lo);
+}
+
+} // namespace gps::nmea
diff --git a/modules/core_gps/src/usecase/location_service.cpp b/modules/core_gps/src/usecase/location_service.cpp
new file mode 100644
index 00000000..2d9c0b1a
--- /dev/null
+++ b/modules/core_gps/src/usecase/location_service.cpp
@@ -0,0 +1,82 @@
+#include "gps/usecase/location_service.h"
+
+namespace gps
+{
+
+LocationService::LocationService(nmea::NmeaParser& parser,
+                                 GpsJitterFilter& jitter_filter,
+                                 ITimeAuthorityUpdater& time_updater,
+                                 ILocationEventSink& events)
+    : parser_(parser),
+      jitter_filter_(jitter_filter),
+      time_updater_(time_updater),
+      events_(events)
+{
+}
+
+void LocationService::reset()
+{
+    parser_.reset();
+    jitter_filter_.reset();
+    latest_fix_ = {};
+    last_fix_revision_ = 0;
+    last_time_revision_ = 0;
+}
+
+void LocationService::onGnssBytes(const uint8_t* bytes, std::size_t len)
+{
+    onGnssBytes(bytes, len, 0, 0);
+}
+
+void LocationService::onGnssBytes(const uint8_t* bytes, std::size_t len,
+                                  uint32_t now_ms, uint32_t last_motion_ms)
+{
+    parser_.feed(bytes, len);
+
+    TimeSyncStatus time{};
+    const uint32_t time_revision = parser_.timeRevision();
+    if (time_revision != last_time_revision_ && parser_.latestTime(time))
+    {
+        if (time.observed_at_ms == 0)
+        {
+            time.observed_at_ms = now_ms;
+        }
+        time_updater_.observeGpsTime(time);
+        last_time_revision_ = time_revision;
+    }
+
+    LocationFix fix{};
+    const uint32_t fix_revision = parser_.fixRevision();
+    if (fix_revision == last_fix_revision_ || !parser_.latestFix(fix))
+    {
+        return;
+    }
+    last_fix_revision_ = fix_revision;
+
+    if (fix.observed_at_ms == 0)
+    {
+        fix.observed_at_ms = now_ms;
+    }
+
+    const auto decision = jitter_filter_.update(fix.latitude, fix.longitude, fix.observed_at_ms, last_motion_ms);
+    if (!decision.accepted)
+    {
+        return;
+    }
+
+    latest_fix_ = fix;
+    events_.onLocationUpdated(latest_fix_);
+}
+
+bool LocationService::latestFix(LocationFix& out) const
+{
+    if (!latest_fix_.valid)
+    {
+        out = {};
+        return false;
+    }
+    out = latest_fix_;
+    return true;
+}
+
+} // namespace gps
diff --git a/modules/core_gps/src/usecase/time_authority.cpp b/modules/core_gps/src/usecase/time_authority.cpp
new file mode 100644
index 00000000..b3302d0a
--- /dev/null
+++ b/modules/core_gps/src/usecase/time_authority.cpp
@@ -0,0 +1,90 @@
+#include "gps/usecase/time_authority.h"
+
+#include "sys/clock.h"
+
+namespace gps
+{
+
+TimeAuthority::TimeAuthority(IClock& clock, TimeAuthorityPolicy policy)
+    : clock_(clock),
+      policy_(policy)
+{
+}
+
+uint32_t TimeAuthority::nowMonotonicMs() const
+{
+    return clock_.nowMs();
+}
+
+bool TimeAuthority::nowEpoch(uint64_t& out_epoch_seconds) const
+{
+    if (!status_.epoch_valid)
+    {
+        out_epoch_seconds = 0;
+        return false;
+    }
+
+    const uint32_t delta_ms = clock_.nowMs() - status_.observed_at_ms;
+    out_epoch_seconds = status_.epoch_seconds + delta_ms / 1000U;
+    return true;
+}
+
+TimeSyncStatus TimeAuthority::syncStatus() const
+{
+    return status_;
+}
+
+void TimeAuthority::observeGpsTime(const TimeSyncStatus& fact)
+{
+    if (!shouldAcceptGpsTime(fact))
+    {
+        return;
+    }
+
+    status_ = fact;
+    status_.source = TimeSourceKind::Gps;
+    status_.synced = true;
+    status_.epoch_valid = true;
+}
+
+void TimeAuthority::observeHostTime(const TimeSyncStatus& fact)
+{
+    if (!shouldAcceptHostTime(fact))
+    {
+        return;
+    }
+
+    status_ = fact;
+    status_.source = TimeSourceKind::Host;
+    status_.synced = true;
+    status_.epoch_valid = true;
+}
+
+bool TimeAuthority::shouldAcceptGpsTime(const TimeSyncStatus& fact) const
+{
+    if (!fact.epoch_valid)
+    {
+        return false;
+    }
+    if (policy_.gps_overrides_host)
+    {
+        return true;
+    }
+    return !status_.synced || status_.source != TimeSourceKind::Host;
+}
+
+bool TimeAuthority::shouldAcceptHostTime(const TimeSyncStatus& fact) const
+{
+    if (!fact.epoch_valid || !policy_.host_time_fallback)
+    {
+        return false;
+    }
+    return !status_.synced || status_.source != TimeSourceKind::Gps;
+}
+
+uint32_t SystemClock::nowMs() const
+{
+    return sys::millis_now();
+}
+
+} // namespace gps
diff --git a/modules/core_gps/tests/test_location_service.cpp b/modules/core_gps/tests/test_location_service.cpp
new file mode 100644
index 00000000..b43d0a06
--- /dev/null
+++ b/modules/core_gps/tests/test_location_service.cpp
@@ -0,0 +1,85 @@
+#include "gps/usecase/location_service.h"
+
+#include <cassert>
+#include <cstdint>
+#include <string>
+
+namespace
+{
+std::string withChecksum(const char* body)
+{
+    uint8_t checksum = 0;
+    for (const char* p = body; p && *p; ++p)
+    {
+        checksum ^= static_cast<uint8_t>(*p);
+    }
+    static constexpr char kHex[] = "0123456789ABCDEF";
+    std::string out = "$";
+    out += body;
+    out += "*";
+    out.push_back(kHex[(checksum >> 4) & 0x0F]);
+    out.push_back(kHex[checksum & 0x0F]);
+    out += "\n";
+    return out;
+}
+
+class FakeTimeUpdater final : public gps::ITimeAuthorityUpdater
+{
+  public:
+    void observeGpsTime(const gps::TimeSyncStatus& fact) override
+    {
+        gps_count++;
+        last = fact;
+    }
+
+    void observeHostTime(const gps::TimeSyncStatus& fact) override
+    {
+        host_count++;
+        last = fact;
+    }
+
+    int gps_count = 0;
+    int host_count = 0;
+    gps::TimeSyncStatus last{};
+};
+
+class FakeLocationEventSink final : public gps::ILocationEventSink
+{
+  public:
+    void onLocationUpdated(const gps::LocationFix& fix) override
+    {
+        event_count++;
+        last = fix;
+    }
+
+    int event_count = 0;
+    gps::LocationFix last{};
+};
+} // namespace
+
+int main()
+{
+    gps::nmea::NmeaParser parser;
+    gps::GpsJitterFilterConfig cfg{};
+    cfg.max_speed_mps = 500.0f;
+    gps::GpsJitterFilter jitter(cfg);
+    FakeTimeUpdater time;
+    FakeLocationEventSink events;
+    gps::LocationService service(parser, jitter, time, events);
+
+    const std::string rmc = withChecksum("GPRMC,010203,A,2502.334,N,10243.098,E,001.0,090.0,010124,,,A");
+    service.onGnssBytes(reinterpret_cast<const uint8_t*>(rmc.data()), rmc.size(), 1000, 0);
+
+    gps::LocationFix fix{};
+    assert(service.latestFix(fix));
+    assert(fix.valid);
+    assert(events.event_count == 1);
+    assert(time.gps_count == 1);
+    assert(time.last.epoch_valid);
+    assert(events.last.observed_at_ms == 1000);
+
+    const std::string jump = withChecksum("GPRMC,010204,A,2602.334,N,10343.098,E,001.0,090.0,010124,,,A");
+    service.onGnssBytes(reinterpret_cast<const uint8_t*>(jump.data()), jump.size(), 2000, 2000);
+    assert(events.event_count == 1);
+    return 0;
+}
diff --git a/modules/core_gps/tests/test_nmea_parser.cpp b/modules/core_gps/tests/test_nmea_parser.cpp
new file mode 100644
index 00000000..45510aea
--- /dev/null
+++ b/modules/core_gps/tests/test_nmea_parser.cpp
@@ -0,0 +1,69 @@
+#include "gps/protocol/nmea/nmea_parser.h"
+
+#include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <string>
+
+namespace
+{
+std::string withChecksum(const char* body)
+{
+    uint8_t checksum = 0;
+    for (const char* p = body; p && *p; ++p)
+    {
+        checksum ^= static_cast<uint8_t>(*p);
+    }
+    static constexpr char kHex[] = "0123456789ABCDEF";
+    std::string out = "$";
+    out += body;
+    out += "*";
+    out.push_back(kHex[(checksum >> 4) & 0x0F]);
+    out.push_back(kHex[checksum & 0x0F]);
+    out += "\r\n";
+    return out;
+}
+} // namespace
+
+int main()
+{
+    gps::nmea::NmeaParser parser;
+
+    const std::string rmc = withChecksum("GPRMC,123519,A,4807.038,N,01131.000,E,022.4,084.4,231123,,,A");
+    parser.feed(reinterpret_cast<const uint8_t*>(rmc.data()), rmc.size());
+
+    gps::TimeSyncStatus time{};
+    assert(parser.latestTime(time));
+    assert(time.epoch_valid);
+    assert(time.source == gps::TimeSourceKind::Gps);
+
+    gps::LocationFix fix{};
+    assert(parser.latestFix(fix));
+    assert(fix.valid);
+    assert(fix.latitude > 48.117 && fix.latitude < 48.118);
+    assert(fix.longitude > 11.516 && fix.longitude < 11.517);
+    assert(fix.has_speed);
+    assert(fix.has_course);
+
+    const std::string gga = withChecksum("GPGGA,123520,4807.038,N,01131.000,E,1,08,0.9,545.4,M,46.9,M,,");
+    parser.feed(reinterpret_cast<const uint8_t*>(gga.data()), gga.size());
+    assert(parser.latestFix(fix));
+    assert(fix.satellites == 8);
+    assert(fix.has_altitude);
+    assert(fix.altitude_m > 545.3f && fix.altitude_m < 545.5f);
+    assert(fix.hdop > 0.8f && fix.hdop < 1.0f);
+
+    const uint32_t before_bad = parser.fixRevision();
+    const char* invalid = "$GPGGA,123520,0000.000,N,00000.000,E,1,01,9.9,0.0,M,0.0,M,,*00\r\n";
+    parser.feed(reinterpret_cast<const uint8_t*>(invalid), std::strlen(invalid));
+    assert(parser.fixRevision() == before_bad);
+
+    gps::nmea::NmeaParser partial_parser;
+    const std::string partial = withChecksum("GPRMC,010203,A,2502.334,N,10243.098,E,000.0,000.0,010124,,,A");
+    partial_parser.feed(reinterpret_cast<const uint8_t*>(partial.data()), 10);
+    assert(!partial_parser.latestFix(fix));
+    partial_parser.feed(reinterpret_cast<const uint8_t*>(partial.data() + 10), partial.size() - 10);
+    assert(partial_parser.latestFix(fix));
+    assert(fix.latitude > 25.0 && fix.longitude > 102.0);
+    return 0;
+}
diff --git a/modules/core_gps/tests/test_time_authority.cpp b/modules/core_gps/tests/test_time_authority.cpp
new file mode 100644
index 00000000..5dff990d
--- /dev/null
+++ b/modules/core_gps/tests/test_time_authority.cpp
@@ -0,0 +1,58 @@
+#include "gps/usecase/time_authority.h"
+
+#include <cassert>
+
+namespace
+{
+class FakeClock final : public gps::IClock
+{
+  public:
+    uint32_t nowMs() const override
+    {
+        return now_ms;
+    }
+
+    uint32_t now_ms = 0;
+};
+} // namespace
+
+int main()
+{
+    FakeClock clock;
+    gps::TimeAuthority authority(clock);
+
+    uint64_t epoch = 0;
+    assert(!authority.nowEpoch(epoch));
+
+    gps::TimeSyncStatus invalid{};
+    authority.observeGpsTime(invalid);
+    assert(!authority.nowEpoch(epoch));
+
+    gps::TimeSyncStatus host{};
+    host.epoch_valid = true;
+    host.synced = true;
+    host.source = gps::TimeSourceKind::Host;
+    host.epoch_seconds = 1700000000ULL;
+    host.observed_at_ms = 1000;
+    clock.now_ms = 1000;
+    authority.observeHostTime(host);
+    assert(authority.nowEpoch(epoch));
+    assert(epoch == 1700000000ULL);
+
+    clock.now_ms = 3500;
+    assert(authority.nowEpoch(epoch));
+    assert(epoch == 1700000002ULL);
+
+    gps::TimeSyncStatus gps_time{};
+    gps_time.epoch_valid = true;
+    gps_time.synced = true;
+    gps_time.source = gps::TimeSourceKind::Gps;
+    gps_time.epoch_seconds = 1800000000ULL;
+    gps_time.observed_at_ms = 4000;
+    clock.now_ms = 4000;
+    authority.observeGpsTime(gps_time);
+    assert(authority.syncStatus().source == gps::TimeSourceKind::Gps);
+    assert(authority.nowEpoch(epoch));
+    assert(epoch == 1800000000ULL);
+    return 0;
+}
diff --git a/modules/core_mesh/README.md b/modules/core_mesh/README.md
new file mode 100644
index 00000000..e6981152
--- /dev/null
+++ b/modules/core_mesh/README.md
@@ -0,0 +1,15 @@
+# core_mesh
+
+`core_mesh` is the Phase 4 home for LoRa/Mesh domain language, ports, protocol
+strategies, and use cases.
+
+The boundary is deliberately narrow:
+
+- platform radio drivers implement ports such as `IPacketRadio`
+- platform storage implements repository ports such as `ILocalIdentityStore`
+  and `IPeerKeyStore`
+- protocol strategies build and parse Meshtastic/MeshCore packets
+- use cases coordinate identity, direct send, receive, events, and session state
+
+This module must not include Arduino, RadioLib, Preferences, SQLite, board,
+BLE, UI, or platform SDK headers.
diff --git a/modules/core_mesh/include/mesh/domain/direct_message.h b/modules/core_mesh/include/mesh/domain/direct_message.h
new file mode 100644
index 00000000..2a4eddc1
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/direct_message.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include "mesh/domain/mesh_packet.h"
+#include "mesh/domain/node_id.h"
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+struct DirectMessageCommand
+{
+    NodeId from;
+    NodeId to;
+    ByteView payload;
+    bool request_ack = true;
+    uint32_t application_port = 0;
+    uint32_t packet_id = 0;
+    ByteView channel_key;
+    uint8_t channel_hash = 0;
+    uint8_t hop_limit = 2;
+    bool has_air_want_ack = false;
+    bool air_want_ack = false;
+    bool include_payload_dest = true;
+    bool require_local_identity = true;
+    bool require_peer_key = true;
+
+    DirectMessageCommand() = default;
+
+    DirectMessageCommand(NodeId command_to, ByteView command_payload, bool command_request_ack)
+        : from(),
+          to(command_to),
+          payload(command_payload),
+          request_ack(command_request_ack),
+          application_port(0)
+    {
+    }
+};
+
+enum class SendFailure : uint8_t
+{
+    None = 0,
+    InvalidInput,
+    LocalIdentityMissing,
+    PeerKeyMissing,
+    CryptoFailed,
+    PacketBuildFailed,
+    RadioSendFailed,
+    AckTimeout,
+    ProtocolUnsupported,
+    NotReady,
+};
+
+struct SendResult
+{
+    bool ok = false;
+    SendFailure failure = SendFailure::None;
+
+    SendResult() = default;
+
+    SendResult(bool result_ok, SendFailure result_failure)
+        : ok(result_ok),
+          failure(result_failure)
+    {
+    }
+
+    static SendResult success()
+    {
+        return SendResult(true, SendFailure::None);
+    }
+
+    static SendResult fail(SendFailure failure)
+    {
+        return SendResult(false, failure);
+    }
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/domain/local_identity.h b/modules/core_mesh/include/mesh/domain/local_identity.h
new file mode 100644
index 00000000..7957f176
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/local_identity.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+struct LocalIdentity
+{
+    uint8_t private_key[32]{};
+    uint8_t public_key[32]{};
+    bool valid = false;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/domain/mesh_message.h b/modules/core_mesh/include/mesh/domain/mesh_message.h
new file mode 100644
index 00000000..ae102d4e
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/mesh_message.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "mesh/domain/mesh_packet.h"
+#include "mesh/domain/node_id.h"
+#include "mesh/domain/peer_identity.h"
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+enum class MeshProtocolEventKind : uint8_t
+{
+    None = 0,
+    MessageReceived,
+    PeerDiscovered,
+    PeerKeyLearned,
+    AckReceived,
+    Duplicate,
+};
+
+struct MeshProtocolEvent
+{
+    MeshProtocolEventKind kind = MeshProtocolEventKind::None;
+    NodeId peer{};
+    PeerPublicKey peer_key{};
+    ByteView payload{};
+    uint32_t packet_id = 0;
+    uint8_t payload_bytes[256]{};
+    size_t payload_size = 0;
+
+    void setPayload(const uint8_t* data, size_t size)
+    {
+        payload = ByteView{};
+        payload_size = 0;
+        if (!data || size == 0 || size > sizeof(payload_bytes))
+        {
+            return;
+        }
+        for (size_t index = 0; index < size; ++index)
+        {
+            payload_bytes[index] = data[index];
+        }
+        payload_size = size;
+        payload = ByteView{payload_bytes, payload_size};
+    }
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/domain/mesh_packet.h b/modules/core_mesh/include/mesh/domain/mesh_packet.h
new file mode 100644
index 00000000..f6dd07a1
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/mesh_packet.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace mesh
+{
+
+struct ByteView
+{
+    const uint8_t* data = nullptr;
+    size_t size = 0;
+
+    constexpr ByteView() = default;
+
+    constexpr ByteView(const uint8_t* view_data, size_t view_size)
+        : data(view_data),
+          size(view_size)
+    {
+    }
+
+    constexpr bool empty() const
+    {
+        return data == nullptr || size == 0;
+    }
+};
+
+struct MutableByteBuffer
+{
+    uint8_t* data = nullptr;
+    size_t capacity = 0;
+    size_t size = 0;
+
+    MutableByteBuffer() = default;
+
+    MutableByteBuffer(uint8_t* buffer_data, size_t buffer_capacity, size_t buffer_size)
+        : data(buffer_data),
+          capacity(buffer_capacity),
+          size(buffer_size)
+    {
+    }
+};
+
+struct EncodedPacket
+{
+    uint8_t bytes[256]{};
+    size_t size = 0;
+
+    ByteView view() const
+    {
+        return ByteView(bytes, size);
+    }
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/domain/mesh_protocol_kind.h b/modules/core_mesh/include/mesh/domain/mesh_protocol_kind.h
new file mode 100644
index 00000000..4a372597
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/mesh_protocol_kind.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+enum class MeshProtocolKind : uint8_t
+{
+    None = 0,
+    Meshtastic,
+    MeshCore,
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/domain/mesh_result.h b/modules/core_mesh/include/mesh/domain/mesh_result.h
new file mode 100644
index 00000000..545be352
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/mesh_result.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+enum class StoreFailure : uint8_t
+{
+    None = 0,
+    NotFound,
+    Corrupt,
+    VersionUnsupported,
+    IoError,
+    NoSpace,
+    PermissionDenied,
+    InvalidArgument,
+};
+
+struct StoreResult
+{
+    bool ok = false;
+    StoreFailure failure = StoreFailure::None;
+
+    StoreResult() = default;
+
+    StoreResult(bool result_ok, StoreFailure result_failure)
+        : ok(result_ok),
+          failure(result_failure)
+    {
+    }
+
+    static StoreResult success()
+    {
+        return StoreResult(true, StoreFailure::None);
+    }
+
+    static StoreResult fail(StoreFailure failure)
+    {
+        return StoreResult(false, failure);
+    }
+};
+
+enum class ProtocolFailure : uint8_t
+{
+    None = 0,
+    Unsupported,
+    MissingPeerKey,
+    CryptoFailed,
+    EncodeFailed,
+    DecodeFailed,
+    InvalidInput,
+};
+
+struct ProtocolResult
+{
+    bool ok = false;
+    ProtocolFailure failure = ProtocolFailure::None;
+
+    ProtocolResult() = default;
+
+    ProtocolResult(bool result_ok, ProtocolFailure result_failure)
+        : ok(result_ok),
+          failure(result_failure)
+    {
+    }
+
+    static ProtocolResult success()
+    {
+        return ProtocolResult(true, ProtocolFailure::None);
+    }
+
+    static ProtocolResult fail(ProtocolFailure failure)
+    {
+        return ProtocolResult(false, failure);
+    }
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/domain/node_id.h b/modules/core_mesh/include/mesh/domain/node_id.h
new file mode 100644
index 00000000..31f09947
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/node_id.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+struct NodeId
+{
+    uint32_t value = 0;
+
+    constexpr NodeId() = default;
+
+    constexpr explicit NodeId(uint32_t node_value)
+        : value(node_value)
+    {
+    }
+
+    constexpr bool isBroadcast() const
+    {
+        return value == 0xFFFFFFFFUL;
+    }
+
+    constexpr bool isValidUnicast() const
+    {
+        return value != 0 && !isBroadcast();
+    }
+
+    constexpr bool operator==(const NodeId& other) const
+    {
+        return value == other.value;
+    }
+
+    constexpr bool operator!=(const NodeId& other) const
+    {
+        return !(*this == other);
+    }
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/domain/peer_identity.h b/modules/core_mesh/include/mesh/domain/peer_identity.h
new file mode 100644
index 00000000..bfeb53b3
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/peer_identity.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "mesh/domain/node_id.h"
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+struct PeerPublicKey
+{
+    NodeId node_id;
+    uint8_t public_key[32]{};
+    uint32_t updated_at_ms = 0;
+    bool verified = false;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/domain/radio_packet.h b/modules/core_mesh/include/mesh/domain/radio_packet.h
new file mode 100644
index 00000000..50f91110
--- /dev/null
+++ b/modules/core_mesh/include/mesh/domain/radio_packet.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "mesh/domain/mesh_packet.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace mesh
+{
+
+struct RadioConfig
+{
+    uint32_t frequency_hz = 0;
+    uint32_t bandwidth_hz = 0;
+    uint8_t spreading_factor = 0;
+    uint8_t coding_rate = 0;
+    uint8_t sync_word = 0;
+    int8_t tx_power_dbm = 0;
+    bool dio2_as_rf_switch = false;
+    float dio3_tcxo_voltage = 0.0f;
+};
+
+struct RadioRxPacket
+{
+    uint8_t bytes[256]{};
+    size_t size = 0;
+    int16_t rssi = 0;
+    int8_t snr = 0;
+    uint32_t received_at_ms = 0;
+};
+
+enum class RadioFailure : uint8_t
+{
+    None = 0,
+    NotReady,
+    InvalidConfig,
+    TxFailed,
+    RxFailed,
+    Timeout,
+    Busy,
+    Unsupported,
+};
+
+struct RadioResult
+{
+    bool ok = false;
+    RadioFailure failure = RadioFailure::None;
+
+    RadioResult() = default;
+
+    RadioResult(bool result_ok, RadioFailure result_failure)
+        : ok(result_ok),
+          failure(result_failure)
+    {
+    }
+
+    static RadioResult success()
+    {
+        return RadioResult(true, RadioFailure::None);
+    }
+
+    static RadioResult fail(RadioFailure failure)
+    {
+        return RadioResult(false, failure);
+    }
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_clock.h b/modules/core_mesh/include/mesh/ports/i_clock.h
new file mode 100644
index 00000000..bd2572ad
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_clock.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+class IClock
+{
+  public:
+    virtual ~IClock() = default;
+
+    virtual uint32_t nowMs() const = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_crypto_provider.h b/modules/core_mesh/include/mesh/ports/i_crypto_provider.h
new file mode 100644
index 00000000..7d2187a9
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_crypto_provider.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include "mesh/domain/mesh_packet.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace mesh
+{
+
+enum class CryptoFailure : uint8_t
+{
+    None = 0,
+    InvalidInput,
+    VerifyFailed,
+    EncryptFailed,
+    DecryptFailed,
+    Unsupported,
+};
+
+struct CryptoResult
+{
+    bool ok = false;
+    CryptoFailure failure = CryptoFailure::None;
+
+    CryptoResult() = default;
+
+    CryptoResult(bool result_ok, CryptoFailure result_failure)
+        : ok(result_ok),
+          failure(result_failure)
+    {
+    }
+
+    static CryptoResult success()
+    {
+        return CryptoResult(true, CryptoFailure::None);
+    }
+
+    static CryptoResult fail(CryptoFailure failure)
+    {
+        return CryptoResult(false, failure);
+    }
+};
+
+class ICryptoProvider
+{
+  public:
+    virtual ~ICryptoProvider() = default;
+
+    virtual CryptoResult random(uint8_t* out, size_t len) = 0;
+    virtual CryptoResult sha256(ByteView input, uint8_t out[32]) = 0;
+
+    virtual CryptoResult aesCcmEncrypt(ByteView key,
+                                       ByteView nonce,
+                                       ByteView aad,
+                                       ByteView plaintext,
+                                       uint8_t* ciphertext,
+                                       size_t ciphertext_capacity,
+                                       size_t& ciphertext_size) = 0;
+
+    virtual CryptoResult aesCcmDecrypt(ByteView key,
+                                       ByteView nonce,
+                                       ByteView aad,
+                                       ByteView ciphertext,
+                                       uint8_t* plaintext,
+                                       size_t plaintext_capacity,
+                                       size_t& plaintext_size) = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_local_identity_store.h b/modules/core_mesh/include/mesh/ports/i_local_identity_store.h
new file mode 100644
index 00000000..dfec4c92
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_local_identity_store.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "mesh/domain/local_identity.h"
+#include "mesh/domain/mesh_result.h"
+
+namespace mesh
+{
+
+class ILocalIdentityStore
+{
+  public:
+    virtual ~ILocalIdentityStore() = default;
+
+    virtual StoreResult load(LocalIdentity& out) = 0;
+    virtual StoreResult save(const LocalIdentity& identity) = 0;
+    virtual StoreResult clear() = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_mesh_event_sink.h b/modules/core_mesh/include/mesh/ports/i_mesh_event_sink.h
new file mode 100644
index 00000000..f4ee237f
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_mesh_event_sink.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "mesh/domain/node_id.h"
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+enum class MeshEventKind : uint8_t
+{
+    None = 0,
+    MessageReceived,
+    MessageSent,
+    SendFailed,
+    PeerDiscovered,
+    PeerKeyLearned,
+    PeerKeyMissing,
+    RadioError,
+    ProtocolError,
+};
+
+struct MeshEvent
+{
+    MeshEventKind kind = MeshEventKind::None;
+    NodeId peer{};
+    int code = 0;
+
+    MeshEvent() = default;
+
+    MeshEvent(MeshEventKind event_kind, NodeId event_peer, int event_code)
+        : kind(event_kind),
+          peer(event_peer),
+          code(event_code)
+    {
+    }
+};
+
+class IMeshEventSink
+{
+  public:
+    virtual ~IMeshEventSink() = default;
+
+    virtual void emit(const MeshEvent& event) = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_mesh_logger.h b/modules/core_mesh/include/mesh/ports/i_mesh_logger.h
new file mode 100644
index 00000000..1f0a3da8
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_mesh_logger.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace mesh
+{
+
+class IMeshLogger
+{
+  public:
+    virtual ~IMeshLogger() = default;
+
+    virtual void info(const char* message) = 0;
+    virtual void warn(const char* message) = 0;
+    virtual void error(const char* message) = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_mesh_runtime.h b/modules/core_mesh/include/mesh/ports/i_mesh_runtime.h
new file mode 100644
index 00000000..94882670
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_mesh_runtime.h
@@ -0,0 +1,14 @@
+#pragma once
+
+namespace mesh
+{
+
+class IMeshRuntime
+{
+  public:
+    virtual ~IMeshRuntime() = default;
+
+    virtual void requestTick() = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_node_store.h b/modules/core_mesh/include/mesh/ports/i_node_store.h
new file mode 100644
index 00000000..499accae
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_node_store.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+#include "mesh/domain/node_id.h"
+
+namespace mesh
+{
+
+struct NodeInfoView
+{
+    NodeId node_id;
+    uint32_t last_seen_ms = 0;
+    bool direct_reachable = false;
+};
+
+class INodeStore
+{
+  public:
+    virtual ~INodeStore() = default;
+
+    virtual StoreResult get(NodeId node_id, NodeInfoView& out) = 0;
+    virtual StoreResult put(const NodeInfoView& node) = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_packet_radio.h b/modules/core_mesh/include/mesh/ports/i_packet_radio.h
new file mode 100644
index 00000000..a8bc8271
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_packet_radio.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "mesh/domain/mesh_packet.h"
+#include "mesh/domain/radio_packet.h"
+
+namespace mesh
+{
+
+class IPacketRadio
+{
+  public:
+    virtual ~IPacketRadio() = default;
+
+    virtual RadioResult configure(const RadioConfig& config) = 0;
+    virtual RadioResult send(ByteView packet) = 0;
+    virtual bool poll(RadioRxPacket& out) = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/ports/i_peer_key_store.h b/modules/core_mesh/include/mesh/ports/i_peer_key_store.h
new file mode 100644
index 00000000..15e93225
--- /dev/null
+++ b/modules/core_mesh/include/mesh/ports/i_peer_key_store.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+#include "mesh/domain/node_id.h"
+#include "mesh/domain/peer_identity.h"
+
+namespace mesh
+{
+
+class IPeerKeyStore
+{
+  public:
+    virtual ~IPeerKeyStore() = default;
+
+    virtual StoreResult get(NodeId node_id, PeerPublicKey& out) = 0;
+    virtual StoreResult put(const PeerPublicKey& key) = 0;
+    virtual StoreResult remove(NodeId node_id) = 0;
+    virtual StoreResult clear() = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/mesh_protocol_strategy.h b/modules/core_mesh/include/mesh/protocol/mesh_protocol_strategy.h
new file mode 100644
index 00000000..8c243596
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/mesh_protocol_strategy.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "mesh/domain/direct_message.h"
+#include "mesh/domain/local_identity.h"
+#include "mesh/domain/mesh_message.h"
+#include "mesh/domain/mesh_protocol_kind.h"
+#include "mesh/domain/mesh_result.h"
+#include "mesh/domain/peer_identity.h"
+#include "mesh/domain/radio_packet.h"
+#include "mesh/usecase/mesh_runtime_state.h"
+
+namespace mesh
+{
+
+struct ProtocolBuildContext
+{
+    NodeId local_node{};
+    LocalIdentity local_identity{};
+    PeerPublicKey peer_key{};
+    ByteView channel_key{};
+    uint32_t now_ms = 0;
+    uint32_t packet_id = 0;
+    uint8_t channel_hash = 0;
+    uint8_t hop_limit = 2;
+    uint8_t route_type = 0;
+    ByteView route_path{};
+    bool has_air_want_ack = false;
+    bool air_want_ack = false;
+    bool include_payload_dest = true;
+};
+
+class MeshProtocolStrategy
+{
+  public:
+    virtual ~MeshProtocolStrategy() = default;
+
+    virtual MeshProtocolKind kind() const = 0;
+
+    virtual RadioConfig deriveRadioConfig(const MeshRuntimeConfig& config) = 0;
+
+    virtual ProtocolResult buildDirectMessage(const ProtocolBuildContext& context,
+                                              const DirectMessageCommand& command,
+                                              EncodedPacket& out) = 0;
+
+    virtual ProtocolResult parseRadioPacket(const RadioRxPacket& packet,
+                                            MeshProtocolEvent& out) = 0;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshcore/mc_direct_message_flow.h b/modules/core_mesh/include/mesh/protocol/meshcore/mc_direct_message_flow.h
new file mode 100644
index 00000000..3df281bb
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshcore/mc_direct_message_flow.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+
+namespace mesh
+{
+namespace meshcore
+{
+
+class McDirectMessageFlow
+{
+  public:
+    ProtocolResult unsupported() const
+    {
+        return ProtocolResult::fail(ProtocolFailure::Unsupported);
+    }
+};
+
+} // namespace meshcore
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshcore/mc_identity_flow.h b/modules/core_mesh/include/mesh/protocol/meshcore/mc_identity_flow.h
new file mode 100644
index 00000000..b479db3c
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshcore/mc_identity_flow.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "mesh/domain/mesh_packet.h"
+#include "mesh/domain/mesh_result.h"
+#include "mesh/domain/node_id.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace mesh
+{
+namespace meshcore
+{
+
+constexpr size_t kMeshCorePublicKeySize = 32;
+constexpr size_t kMeshCorePrivateKeySize = 64;
+constexpr size_t kMeshCoreSignatureSize = 64;
+constexpr size_t kMeshCoreSeedSize = 32;
+
+struct MeshCoreKeyPairView
+{
+    const uint8_t* private_key = nullptr;
+    size_t private_key_size = 0;
+    const uint8_t* public_key = nullptr;
+    size_t public_key_size = 0;
+};
+
+class McIdentityFlow
+{
+  public:
+    ProtocolResult createKeypair(ByteView seed,
+                                 uint8_t out_public_key[kMeshCorePublicKeySize],
+                                 uint8_t out_private_key[kMeshCorePrivateKeySize]) const;
+    ProtocolResult derivePublicKey(ByteView private_key,
+                                   uint8_t out_public_key[kMeshCorePublicKeySize]) const;
+    ProtocolResult sign(const MeshCoreKeyPairView& keypair,
+                        ByteView message,
+                        uint8_t out_signature[kMeshCoreSignatureSize]) const;
+    ProtocolResult verify(ByteView public_key,
+                          ByteView signature,
+                          ByteView message) const;
+    ProtocolResult deriveSharedSecret(ByteView private_key,
+                                      ByteView peer_public_key,
+                                      uint8_t out_secret[kMeshCorePublicKeySize]) const;
+    NodeId deriveNodeId(ByteView public_key) const;
+};
+
+} // namespace meshcore
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshcore/mc_packet_codec.h b/modules/core_mesh/include/mesh/protocol/meshcore/mc_packet_codec.h
new file mode 100644
index 00000000..664a3c60
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshcore/mc_packet_codec.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+
+namespace mesh
+{
+namespace meshcore
+{
+
+class McPacketCodec
+{
+  public:
+    ProtocolResult unsupported() const
+    {
+        return ProtocolResult::fail(ProtocolFailure::Unsupported);
+    }
+};
+
+} // namespace meshcore
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshcore/mc_receive_flow.h b/modules/core_mesh/include/mesh/protocol/meshcore/mc_receive_flow.h
new file mode 100644
index 00000000..be54badc
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshcore/mc_receive_flow.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+
+namespace mesh
+{
+namespace meshcore
+{
+
+class McReceiveFlow
+{
+  public:
+    ProtocolResult unsupported() const
+    {
+        return ProtocolResult::fail(ProtocolFailure::Unsupported);
+    }
+};
+
+} // namespace meshcore
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshcore/meshcore_protocol_strategy.h b/modules/core_mesh/include/mesh/protocol/meshcore/meshcore_protocol_strategy.h
new file mode 100644
index 00000000..86477ba8
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshcore/meshcore_protocol_strategy.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "mesh/protocol/mesh_protocol_strategy.h"
+
+namespace mesh
+{
+namespace meshcore
+{
+
+class MeshCoreProtocolStrategy final : public MeshProtocolStrategy
+{
+  public:
+    MeshProtocolKind kind() const override;
+    RadioConfig deriveRadioConfig(const MeshRuntimeConfig& config) override;
+    ProtocolResult buildDirectMessage(const ProtocolBuildContext& context,
+                                      const DirectMessageCommand& command,
+                                      EncodedPacket& out) override;
+    ProtocolResult parseRadioPacket(const RadioRxPacket& packet,
+                                    MeshProtocolEvent& out) override;
+
+    void setLocalPublicHash(uint8_t public_hash);
+    void setDirectSharedSecret(ByteView shared_secret);
+    void clearDirectSharedSecret();
+    void setGroupKey(ByteView key, uint8_t channel_hash = 0);
+    void clearGroupKey();
+
+  private:
+    uint8_t local_public_hash_ = 0;
+    uint8_t direct_key16_[16]{};
+    uint8_t direct_key32_[32]{};
+    bool has_direct_secret_ = false;
+    uint8_t group_key16_[16]{};
+    uint8_t group_key32_[32]{};
+    uint8_t group_channel_hash_ = 0;
+    bool has_group_key_ = false;
+};
+
+} // namespace meshcore
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshtastic/meshtastic_protocol_strategy.h b/modules/core_mesh/include/mesh/protocol/meshtastic/meshtastic_protocol_strategy.h
new file mode 100644
index 00000000..77f1f2c3
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshtastic/meshtastic_protocol_strategy.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "mesh/protocol/mesh_protocol_strategy.h"
+
+namespace mesh
+{
+namespace meshtastic
+{
+
+class MeshtasticProtocolStrategy final : public MeshProtocolStrategy
+{
+  public:
+    MeshProtocolKind kind() const override;
+    RadioConfig deriveRadioConfig(const MeshRuntimeConfig& config) override;
+    ProtocolResult buildDirectMessage(const ProtocolBuildContext& context,
+                                      const DirectMessageCommand& command,
+                                      EncodedPacket& out) override;
+    ProtocolResult parseRadioPacket(const RadioRxPacket& packet,
+                                    MeshProtocolEvent& out) override;
+};
+
+} // namespace meshtastic
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshtastic/mt_direct_message_flow.h b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_direct_message_flow.h
new file mode 100644
index 00000000..738be2ae
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_direct_message_flow.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+
+namespace mesh
+{
+namespace meshtastic
+{
+
+class MtDirectMessageFlow
+{
+  public:
+    ProtocolResult unsupported() const
+    {
+        return ProtocolResult::fail(ProtocolFailure::Unsupported);
+    }
+};
+
+} // namespace meshtastic
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshtastic/mt_identity_flow.h b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_identity_flow.h
new file mode 100644
index 00000000..c71d97bc
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_identity_flow.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+
+namespace mesh
+{
+namespace meshtastic
+{
+
+class MtIdentityFlow
+{
+  public:
+    ProtocolResult unsupported() const
+    {
+        return ProtocolResult::fail(ProtocolFailure::Unsupported);
+    }
+};
+
+} // namespace meshtastic
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshtastic/mt_packet_codec.h b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_packet_codec.h
new file mode 100644
index 00000000..d1645519
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_packet_codec.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+
+namespace mesh
+{
+namespace meshtastic
+{
+
+class MtPacketCodec
+{
+  public:
+    ProtocolResult unsupported() const
+    {
+        return ProtocolResult::fail(ProtocolFailure::Unsupported);
+    }
+};
+
+} // namespace meshtastic
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshtastic/mt_pki_flow.h b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_pki_flow.h
new file mode 100644
index 00000000..ea692a41
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_pki_flow.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "mesh/domain/mesh_packet.h"
+#include "mesh/domain/mesh_result.h"
+#include "mesh/domain/node_id.h"
+
+namespace mesh
+{
+namespace meshtastic
+{
+
+struct MtPkiPayloadRequest
+{
+    ByteView shared_secret{};
+    ByteView plaintext{};
+    NodeId from{};
+    uint32_t packet_id = 0;
+    uint32_t extra_nonce = 0;
+};
+
+class MtPkiFlow
+{
+  public:
+    ProtocolResult encryptWithSharedSecret(const MtPkiPayloadRequest& request,
+                                           EncodedPacket& out) const;
+};
+
+} // namespace meshtastic
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/protocol/meshtastic/mt_receive_flow.h b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_receive_flow.h
new file mode 100644
index 00000000..745971b7
--- /dev/null
+++ b/modules/core_mesh/include/mesh/protocol/meshtastic/mt_receive_flow.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "mesh/domain/mesh_result.h"
+
+namespace mesh
+{
+namespace meshtastic
+{
+
+class MtReceiveFlow
+{
+  public:
+    ProtocolResult unsupported() const
+    {
+        return ProtocolResult::fail(ProtocolFailure::Unsupported);
+    }
+};
+
+} // namespace meshtastic
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/usecase/direct_message_service.h b/modules/core_mesh/include/mesh/usecase/direct_message_service.h
new file mode 100644
index 00000000..6d5ec0b2
--- /dev/null
+++ b/modules/core_mesh/include/mesh/usecase/direct_message_service.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "mesh/domain/direct_message.h"
+#include "mesh/ports/i_clock.h"
+#include "mesh/ports/i_mesh_event_sink.h"
+#include "mesh/ports/i_packet_radio.h"
+#include "mesh/protocol/mesh_protocol_strategy.h"
+#include "mesh/usecase/peer_identity_service.h"
+
+namespace mesh
+{
+
+class DirectMessageService
+{
+  public:
+    DirectMessageService(MeshProtocolStrategy& protocol,
+                         PeerIdentityService& identity,
+                         IPacketRadio& radio,
+                         IClock& clock,
+                         IMeshEventSink& events);
+
+    SendResult sendDirect(const DirectMessageCommand& command);
+
+  private:
+    MeshProtocolStrategy& protocol_;
+    PeerIdentityService& identity_;
+    IPacketRadio& radio_;
+    IClock& clock_;
+    IMeshEventSink& events_;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/usecase/mesh_dedup_service.h b/modules/core_mesh/include/mesh/usecase/mesh_dedup_service.h
new file mode 100644
index 00000000..616e0b5c
--- /dev/null
+++ b/modules/core_mesh/include/mesh/usecase/mesh_dedup_service.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "mesh/domain/node_id.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace mesh
+{
+
+class MeshDedupService
+{
+  public:
+    explicit MeshDedupService(uint32_t ttl_ms = 60000);
+
+    bool accept(NodeId peer, uint32_t packet_id, uint32_t now_ms);
+    void clear();
+
+  private:
+    struct Entry
+    {
+        NodeId peer{};
+        uint32_t packet_id = 0;
+        uint32_t seen_at_ms = 0;
+        bool valid = false;
+    };
+
+    static constexpr size_t kCapacity = 32;
+    Entry entries_[kCapacity]{};
+    size_t next_slot_ = 0;
+    uint32_t ttl_ms_ = 60000;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/usecase/mesh_retry_policy.h b/modules/core_mesh/include/mesh/usecase/mesh_retry_policy.h
new file mode 100644
index 00000000..219ee65f
--- /dev/null
+++ b/modules/core_mesh/include/mesh/usecase/mesh_retry_policy.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace mesh
+{
+
+struct MeshRetryPolicy
+{
+    uint8_t max_attempts = 3;
+    uint32_t base_delay_ms = 1500;
+    uint32_t ack_timeout_ms = 15000;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/usecase/mesh_runtime_state.h b/modules/core_mesh/include/mesh/usecase/mesh_runtime_state.h
new file mode 100644
index 00000000..89843382
--- /dev/null
+++ b/modules/core_mesh/include/mesh/usecase/mesh_runtime_state.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "mesh/domain/mesh_protocol_kind.h"
+#include "mesh/domain/radio_packet.h"
+
+namespace mesh
+{
+
+enum class MeshSessionState : uint8_t
+{
+    Stopped = 0,
+    Starting,
+    Ready,
+    Degraded,
+    Error,
+};
+
+struct MeshRuntimeConfig
+{
+    MeshProtocolKind protocol = MeshProtocolKind::None;
+    RadioConfig radio{};
+    bool tx_enabled = true;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/usecase/mesh_session.h b/modules/core_mesh/include/mesh/usecase/mesh_session.h
new file mode 100644
index 00000000..46ad39fd
--- /dev/null
+++ b/modules/core_mesh/include/mesh/usecase/mesh_session.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "mesh/ports/i_clock.h"
+#include "mesh/ports/i_packet_radio.h"
+#include "mesh/protocol/mesh_protocol_strategy.h"
+#include "mesh/usecase/direct_message_service.h"
+#include "mesh/usecase/mesh_runtime_state.h"
+#include "mesh/usecase/receive_packet_service.h"
+
+namespace mesh
+{
+
+class MeshSession
+{
+  public:
+    MeshSession(IPacketRadio& radio,
+                MeshProtocolStrategy& protocol,
+                DirectMessageService& direct,
+                ReceivePacketService& receive,
+                IClock& clock);
+
+    bool start(const MeshRuntimeConfig& config);
+    void stop();
+    void tick();
+    SendResult sendDirect(const DirectMessageCommand& command);
+    MeshSessionState state() const;
+
+  private:
+    IPacketRadio& radio_;
+    MeshProtocolStrategy& protocol_;
+    DirectMessageService& direct_;
+    ReceivePacketService& receive_;
+    IClock& clock_;
+    MeshSessionState state_ = MeshSessionState::Stopped;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/usecase/peer_identity_service.h b/modules/core_mesh/include/mesh/usecase/peer_identity_service.h
new file mode 100644
index 00000000..b5212a98
--- /dev/null
+++ b/modules/core_mesh/include/mesh/usecase/peer_identity_service.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "mesh/domain/local_identity.h"
+#include "mesh/domain/mesh_result.h"
+#include "mesh/domain/node_id.h"
+#include "mesh/domain/peer_identity.h"
+#include "mesh/ports/i_clock.h"
+#include "mesh/ports/i_crypto_provider.h"
+#include "mesh/ports/i_local_identity_store.h"
+#include "mesh/ports/i_peer_key_store.h"
+
+namespace mesh
+{
+
+class PeerIdentityService
+{
+  public:
+    PeerIdentityService(ILocalIdentityStore& local_store,
+                        IPeerKeyStore& peer_store,
+                        ICryptoProvider& crypto,
+                        IClock& clock);
+
+    StoreResult ensureLocalIdentity(LocalIdentity& out);
+    StoreResult findPeerKey(NodeId node_id, PeerPublicKey& out);
+    StoreResult rememberPeerKey(const PeerPublicKey& key);
+
+  private:
+    ILocalIdentityStore& local_store_;
+    IPeerKeyStore& peer_store_;
+    ICryptoProvider& crypto_;
+    IClock& clock_;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/include/mesh/usecase/receive_packet_service.h b/modules/core_mesh/include/mesh/usecase/receive_packet_service.h
new file mode 100644
index 00000000..3f2a5746
--- /dev/null
+++ b/modules/core_mesh/include/mesh/usecase/receive_packet_service.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "mesh/ports/i_clock.h"
+#include "mesh/ports/i_mesh_event_sink.h"
+#include "mesh/protocol/mesh_protocol_strategy.h"
+#include "mesh/usecase/mesh_dedup_service.h"
+#include "mesh/usecase/peer_identity_service.h"
+
+namespace mesh
+{
+
+class ReceivePacketService
+{
+  public:
+    ReceivePacketService(MeshProtocolStrategy& protocol,
+                         PeerIdentityService& identity,
+                         IMeshEventSink& events,
+                         IClock& clock,
+                         MeshDedupService* dedup = nullptr);
+
+    void onRadioPacket(const RadioRxPacket& packet);
+
+  private:
+    void handleProtocolEvent(const MeshProtocolEvent& event);
+
+    MeshProtocolStrategy& protocol_;
+    PeerIdentityService& identity_;
+    IMeshEventSink& events_;
+    IClock& clock_;
+    MeshDedupService* dedup_ = nullptr;
+};
+
+} // namespace mesh
diff --git a/modules/core_mesh/library.json b/modules/core_mesh/library.json
new file mode 100644
index 00000000..7bb6db98
--- /dev/null
+++ b/modules/core_mesh/library.json
@@ -0,0 +1,18 @@
+{
+  "name": "core_mesh",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../core_chat/include",
+      "-I../core_chat/generated",
+      "-I../core_chat/third_party/nanopb"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_chat"
+    }
+  ]
+}
diff --git a/modules/core_mesh/src/protocol/meshcore/mc_identity_flow.cpp b/modules/core_mesh/src/protocol/meshcore/mc_identity_flow.cpp
new file mode 100644
index 00000000..5385e02d
--- /dev/null
+++ b/modules/core_mesh/src/protocol/meshcore/mc_identity_flow.cpp
@@ -0,0 +1,135 @@
+#include "mesh/protocol/meshcore/mc_identity_flow.h"
+
+#include "chat/infra/meshcore/meshcore_identity_crypto.h"
+#include "chat/infra/meshcore/meshcore_payload_helpers.h"
+
+namespace mesh
+{
+namespace meshcore
+{
+
+namespace
+{
+
+bool hasSize(ByteView view, size_t expected)
+{
+    return view.data != nullptr && view.size == expected;
+}
+
+} // namespace
+
+ProtocolResult McIdentityFlow::createKeypair(
+    ByteView seed,
+    uint8_t out_public_key[kMeshCorePublicKeySize],
+    uint8_t out_private_key[kMeshCorePrivateKeySize]) const
+{
+    if (!hasSize(seed, kMeshCoreSeedSize) || !out_public_key || !out_private_key)
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    if (!chat::meshcore::meshcoreCreateKeypair(seed.data, out_public_key, out_private_key))
+    {
+        return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+    }
+
+    return ProtocolResult::success();
+}
+
+ProtocolResult McIdentityFlow::derivePublicKey(
+    ByteView private_key,
+    uint8_t out_public_key[kMeshCorePublicKeySize]) const
+{
+    if (!hasSize(private_key, kMeshCorePrivateKeySize) || !out_public_key)
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    if (!chat::meshcore::meshcoreDerivePublicKey(private_key.data, out_public_key))
+    {
+        return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+    }
+
+    return ProtocolResult::success();
+}
+
+ProtocolResult McIdentityFlow::sign(
+    const MeshCoreKeyPairView& keypair,
+    ByteView message,
+    uint8_t out_signature[kMeshCoreSignatureSize]) const
+{
+    if (!keypair.private_key || keypair.private_key_size != kMeshCorePrivateKeySize ||
+        !keypair.public_key || keypair.public_key_size != kMeshCorePublicKeySize ||
+        message.empty() || !out_signature)
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    if (!chat::meshcore::meshcoreSign(keypair.private_key,
+                                      keypair.public_key,
+                                      message.data,
+                                      message.size,
+                                      out_signature))
+    {
+        return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+    }
+
+    return ProtocolResult::success();
+}
+
+ProtocolResult McIdentityFlow::verify(ByteView public_key,
+                                      ByteView signature,
+                                      ByteView message) const
+{
+    if (!hasSize(public_key, kMeshCorePublicKeySize) ||
+        !hasSize(signature, kMeshCoreSignatureSize) ||
+        message.empty())
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    if (!chat::meshcore::meshcoreVerify(public_key.data,
+                                        signature.data,
+                                        message.data,
+                                        message.size))
+    {
+        return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+    }
+
+    return ProtocolResult::success();
+}
+
+ProtocolResult McIdentityFlow::deriveSharedSecret(
+    ByteView private_key,
+    ByteView peer_public_key,
+    uint8_t out_secret[kMeshCorePublicKeySize]) const
+{
+    if (!hasSize(private_key, kMeshCorePrivateKeySize) ||
+        !hasSize(peer_public_key, kMeshCorePublicKeySize) ||
+        !out_secret)
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    if (!chat::meshcore::meshcoreDeriveSharedSecret(private_key.data,
+                                                    peer_public_key.data,
+                                                    out_secret))
+    {
+        return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+    }
+
+    return ProtocolResult::success();
+}
+
+NodeId McIdentityFlow::deriveNodeId(ByteView public_key) const
+{
+    if (!hasSize(public_key, kMeshCorePublicKeySize))
+    {
+        return NodeId{};
+    }
+
+    return NodeId{chat::meshcore::deriveNodeIdFromPubkey(public_key.data, public_key.size)};
+}
+
+} // namespace meshcore
+} // namespace mesh
diff --git a/modules/core_mesh/src/protocol/meshcore/meshcore_protocol_strategy.cpp b/modules/core_mesh/src/protocol/meshcore/meshcore_protocol_strategy.cpp
new file mode 100644
index 00000000..d33f2411
--- /dev/null
+++ b/modules/core_mesh/src/protocol/meshcore/meshcore_protocol_strategy.cpp
@@ -0,0 +1,456 @@
+#include "mesh/protocol/meshcore/meshcore_protocol_strategy.h"
+
+#include "chat/domain/chat_types.h"
+#include "chat/infra/meshcore/mc_region_presets.h"
+#include "chat/infra/meshcore/meshcore_payload_helpers.h"
+#include "chat/infra/meshcore/meshcore_protocol_helpers.h"
+
+#include <cstring>
+
+namespace mesh
+{
+namespace meshcore
+{
+
+namespace
+{
+
+constexpr uint8_t kRouteTypeFlood = 0x01;
+constexpr uint8_t kPayloadTypeAdvert = 0x04;
+constexpr uint8_t kPayloadTypeGrpData = 0x06;
+constexpr uint8_t kPayloadTypeDirectData = 0x07;
+constexpr uint8_t kPayloadVer1 = 0x00;
+constexpr uint8_t kDirectAppMagic0 = 0xDA;
+constexpr uint8_t kDirectAppMagic1 = 0x7A;
+constexpr uint8_t kDirectAppFlagWantAck = 0x01;
+constexpr uint8_t kGroupDataMagic0 = 0x47;
+constexpr uint8_t kGroupDataMagic1 = 0x44;
+constexpr uint8_t kLoraSyncWordPrivate = 0x12;
+constexpr size_t kCipherMacSize = 2;
+constexpr size_t kCipherBlockSize = 16;
+constexpr size_t kMeshCoreMaxFrameSize = 255;
+constexpr size_t kMeshCoreMaxPayloadSize = 184;
+constexpr size_t kMeshCorePubKeySize = 32;
+
+bool isDirectSharedSecret(ByteView secret)
+{
+    return secret.data != nullptr && secret.size == 32;
+}
+
+bool isSupportedDirectSecret(ByteView secret)
+{
+    return secret.data != nullptr && (secret.size == 16 || secret.size == 32);
+}
+
+bool copyPayload(const DirectMessageCommand& command,
+                 uint8_t* out_plain,
+                 size_t plain_capacity,
+                 size_t prefix_size,
+                 size_t& out_plain_len)
+{
+    if (!out_plain || command.payload.empty() || prefix_size > plain_capacity)
+    {
+        return false;
+    }
+
+    size_t body_len = command.payload.size;
+    if (body_len + prefix_size > plain_capacity)
+    {
+        body_len = plain_capacity - prefix_size;
+    }
+    if (body_len == 0)
+    {
+        return false;
+    }
+
+    std::memcpy(out_plain + prefix_size, command.payload.data, body_len);
+    out_plain_len = prefix_size + body_len;
+    return true;
+}
+
+bool mapSecretToKeys(ByteView secret, uint8_t out_key16[16], uint8_t out_key32[32])
+{
+    if (!secret.data || !out_key16 || !out_key32)
+    {
+        return false;
+    }
+
+    if (secret.size == 32)
+    {
+        chat::meshcore::sharedSecretToKeys(secret.data, out_key16, out_key32);
+        return true;
+    }
+
+    if (secret.size == 16)
+    {
+        std::memcpy(out_key16, secret.data, 16);
+        chat::meshcore::toHmacKey32(out_key16, out_key32);
+        return true;
+    }
+
+    return false;
+}
+
+uint8_t lowNodeHash(NodeId node)
+{
+    return static_cast<uint8_t>(node.value & 0xFFU);
+}
+
+uint32_t toFrequencyHz(float mhz)
+{
+    return static_cast<uint32_t>(mhz * 1000000.0f);
+}
+
+uint32_t toBandwidthHz(float khz)
+{
+    return static_cast<uint32_t>(khz * 1000.0f);
+}
+
+RadioConfig defaultMeshCoreRadioConfig()
+{
+    chat::MeshConfig defaults;
+    if (const auto* preset =
+            chat::meshcore::findRegionPresetById(defaults.meshcore_region_preset))
+    {
+        defaults.meshcore_freq_mhz = preset->freq_mhz;
+        defaults.meshcore_bw_khz = preset->bw_khz;
+        defaults.meshcore_sf = preset->sf;
+        defaults.meshcore_cr = preset->cr;
+        defaults.tx_power = preset->tx_power_dbm;
+    }
+
+    RadioConfig radio;
+    radio.frequency_hz = toFrequencyHz(defaults.meshcore_freq_mhz);
+    radio.bandwidth_hz = toBandwidthHz(defaults.meshcore_bw_khz);
+    radio.spreading_factor = defaults.meshcore_sf;
+    radio.coding_rate = defaults.meshcore_cr;
+    radio.sync_word = kLoraSyncWordPrivate;
+    radio.tx_power_dbm = defaults.tx_power;
+    return radio;
+}
+
+} // namespace
+
+MeshProtocolKind MeshCoreProtocolStrategy::kind() const
+{
+    return MeshProtocolKind::MeshCore;
+}
+
+RadioConfig MeshCoreProtocolStrategy::deriveRadioConfig(const MeshRuntimeConfig& config)
+{
+    if (config.radio.frequency_hz != 0)
+    {
+        return config.radio;
+    }
+    return defaultMeshCoreRadioConfig();
+}
+
+ProtocolResult MeshCoreProtocolStrategy::buildDirectMessage(
+    const ProtocolBuildContext& context,
+    const DirectMessageCommand& command,
+    EncodedPacket& out)
+{
+    out = EncodedPacket{};
+    if (command.payload.empty() || command.application_port == 0)
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    const bool group_packet = command.to.value == 0 || command.to.isBroadcast();
+    if (!group_packet && !command.to.isValidUnicast())
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    uint8_t key16[16] = {};
+    uint8_t key32[32] = {};
+
+    if (!group_packet)
+    {
+        ByteView secret = isSupportedDirectSecret(context.channel_key)
+                              ? context.channel_key
+                              : ByteView{direct_key32_, sizeof(direct_key32_)};
+        if (!has_direct_secret_ && !isSupportedDirectSecret(context.channel_key))
+        {
+            return ProtocolResult::fail(ProtocolFailure::MissingPeerKey);
+        }
+        if (!mapSecretToKeys(secret, key16, key32))
+        {
+            return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+        }
+
+        constexpr size_t kDirectPlainPrefix = 2 + 1 + sizeof(command.application_port);
+        constexpr size_t kDirectCipherBudget =
+            ((kMeshCoreMaxPayloadSize - 2 - kCipherMacSize) / kCipherBlockSize) * kCipherBlockSize;
+        uint8_t plain[kDirectCipherBudget] = {};
+        size_t plain_len = 0;
+        plain[0] = kDirectAppMagic0;
+        plain[1] = kDirectAppMagic1;
+        plain[2] = command.request_ack ? kDirectAppFlagWantAck : 0x00;
+        std::memcpy(plain + 3, &command.application_port, sizeof(command.application_port));
+        if (!copyPayload(command, plain, sizeof(plain), kDirectPlainPrefix, plain_len))
+        {
+            return ProtocolResult::fail(ProtocolFailure::EncodeFailed);
+        }
+
+        uint8_t payload[kMeshCoreMaxPayloadSize] = {};
+        size_t payload_len = 0;
+        const uint8_t dest_hash = lowNodeHash(command.to);
+        const uint8_t src_hash = lowNodeHash(context.local_node);
+        if (src_hash == 0 || !chat::meshcore::buildPeerDatagramPayload(dest_hash,
+                                                                       src_hash,
+                                                                       key16,
+                                                                       key32,
+                                                                       plain,
+                                                                       plain_len,
+                                                                       payload,
+                                                                       sizeof(payload),
+                                                                       &payload_len))
+        {
+            return ProtocolResult::fail(ProtocolFailure::EncodeFailed);
+        }
+
+        const uint8_t route_type = context.route_type != 0 ? context.route_type : kRouteTypeFlood;
+        const uint8_t* route_path = context.route_path.empty() ? nullptr : context.route_path.data;
+        const size_t route_path_len = context.route_path.empty() ? 0 : context.route_path.size;
+        if (!chat::meshcore::buildFrameNoTransport(route_type,
+                                                   kPayloadTypeDirectData,
+                                                   route_path,
+                                                   route_path_len,
+                                                   payload,
+                                                   payload_len,
+                                                   out.bytes,
+                                                   sizeof(out.bytes),
+                                                   &out.size))
+        {
+            return ProtocolResult::fail(ProtocolFailure::EncodeFailed);
+        }
+        return ProtocolResult::success();
+    }
+
+    ByteView group_key = context.channel_key.empty()
+                             ? ByteView{group_key16_, sizeof(group_key16_)}
+                             : context.channel_key;
+    if (!has_group_key_ && context.channel_key.empty())
+    {
+        return ProtocolResult::fail(ProtocolFailure::MissingPeerKey);
+    }
+    if (!mapSecretToKeys(group_key, key16, key32))
+    {
+        return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+    }
+
+    constexpr size_t kGroupPlainPrefix = 2 + sizeof(context.local_node.value) +
+                                         sizeof(command.application_port);
+    constexpr size_t kGroupCipherBudget =
+        ((kMeshCoreMaxPayloadSize - 1 - kCipherMacSize) / kCipherBlockSize) * kCipherBlockSize;
+    uint8_t plain[kGroupCipherBudget] = {};
+    size_t plain_len = 0;
+    plain[0] = kGroupDataMagic0;
+    plain[1] = kGroupDataMagic1;
+    std::memcpy(plain + 2, &context.local_node.value, sizeof(context.local_node.value));
+    std::memcpy(plain + 2 + sizeof(context.local_node.value),
+                &command.application_port,
+                sizeof(command.application_port));
+    if (!copyPayload(command, plain, sizeof(plain), kGroupPlainPrefix, plain_len))
+    {
+        return ProtocolResult::fail(ProtocolFailure::EncodeFailed);
+    }
+
+    uint8_t encrypted[kMeshCoreMaxPayloadSize] = {};
+    const size_t encrypted_len = chat::meshcore::encryptThenMac(key16,
+                                                                key32,
+                                                                encrypted,
+                                                                sizeof(encrypted),
+                                                                plain,
+                                                                plain_len);
+    if (encrypted_len == 0 || encrypted_len > (kMeshCoreMaxPayloadSize - 1))
+    {
+        return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+    }
+
+    uint8_t payload[kMeshCoreMaxPayloadSize] = {};
+    size_t payload_len = 0;
+    payload[payload_len++] = context.channel_hash != 0
+                                 ? context.channel_hash
+                                 : chat::meshcore::computeChannelHash(key16);
+    std::memcpy(payload + payload_len, encrypted, encrypted_len);
+    payload_len += encrypted_len;
+
+    if (!chat::meshcore::buildFrameNoTransport(kRouteTypeFlood,
+                                               kPayloadTypeGrpData,
+                                               nullptr,
+                                               0,
+                                               payload,
+                                               payload_len,
+                                               out.bytes,
+                                               sizeof(out.bytes),
+                                               &out.size))
+    {
+        return ProtocolResult::fail(ProtocolFailure::EncodeFailed);
+    }
+
+    return ProtocolResult::success();
+}
+
+ProtocolResult MeshCoreProtocolStrategy::parseRadioPacket(const RadioRxPacket& packet,
+                                                          MeshProtocolEvent& out)
+{
+    out = MeshProtocolEvent{};
+    if (packet.size == 0 || packet.size > kMeshCoreMaxFrameSize)
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    chat::meshcore::ParsedPacket parsed;
+    if (!chat::meshcore::parsePacket(packet.bytes, packet.size, &parsed) ||
+        parsed.payload_ver != kPayloadVer1 ||
+        !parsed.payload || parsed.payload_len == 0)
+    {
+        return ProtocolResult::fail(ProtocolFailure::DecodeFailed);
+    }
+
+    if (parsed.payload_type == kPayloadTypeAdvert && parsed.payload_len >= kMeshCorePubKeySize)
+    {
+        out.kind = MeshProtocolEventKind::PeerKeyLearned;
+        out.peer_key.node_id = NodeId{
+            chat::meshcore::deriveNodeIdFromPubkey(parsed.payload, kMeshCorePubKeySize)};
+        out.peer = out.peer_key.node_id;
+        std::memcpy(out.peer_key.public_key, parsed.payload, kMeshCorePubKeySize);
+        out.peer_key.updated_at_ms = packet.received_at_ms;
+        return ProtocolResult::success();
+    }
+
+    uint8_t plain[kMeshCoreMaxPayloadSize] = {};
+    size_t plain_len = 0;
+
+    if (parsed.payload_type == kPayloadTypeDirectData)
+    {
+        if (!has_direct_secret_ || parsed.payload_len <= (2 + kCipherMacSize))
+        {
+            return ProtocolResult::fail(ProtocolFailure::MissingPeerKey);
+        }
+        const uint8_t dest_hash = parsed.payload[0];
+        const uint8_t src_hash = parsed.payload[1];
+        if (local_public_hash_ != 0 && dest_hash != local_public_hash_)
+        {
+            return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+        }
+        if (!chat::meshcore::macThenDecrypt(direct_key16_,
+                                            direct_key32_,
+                                            parsed.payload + 2,
+                                            parsed.payload_len - 2,
+                                            plain,
+                                            &plain_len))
+        {
+            return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+        }
+        plain_len = chat::meshcore::trimTrailingZeros(plain, plain_len);
+
+        chat::meshcore::DecodedDirectAppPayload decoded;
+        if (!chat::meshcore::decodeDirectAppPayload(plain, plain_len, &decoded))
+        {
+            return ProtocolResult::fail(ProtocolFailure::DecodeFailed);
+        }
+
+        out.kind = MeshProtocolEventKind::MessageReceived;
+        out.peer = NodeId{src_hash};
+        out.packet_id = chat::meshcore::packetSignature(parsed.payload_type,
+                                                        parsed.path_len,
+                                                        parsed.payload,
+                                                        parsed.payload_len);
+        out.setPayload(decoded.payload, decoded.payload_len);
+        return ProtocolResult::success();
+    }
+
+    if (parsed.payload_type == kPayloadTypeGrpData)
+    {
+        if (!has_group_key_ || parsed.payload_len <= (1 + kCipherMacSize))
+        {
+            return ProtocolResult::fail(ProtocolFailure::MissingPeerKey);
+        }
+        const uint8_t channel_hash = parsed.payload[0];
+        if (group_channel_hash_ != 0 && channel_hash != group_channel_hash_)
+        {
+            return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+        }
+        if (!chat::meshcore::macThenDecrypt(group_key16_,
+                                            group_key32_,
+                                            parsed.payload + 1,
+                                            parsed.payload_len - 1,
+                                            plain,
+                                            &plain_len))
+        {
+            return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+        }
+        plain_len = chat::meshcore::trimTrailingZeros(plain, plain_len);
+
+        chat::meshcore::DecodedGroupAppPayload decoded;
+        if (!chat::meshcore::decodeGroupAppPayload(plain, plain_len, &decoded))
+        {
+            return ProtocolResult::fail(ProtocolFailure::DecodeFailed);
+        }
+
+        out.kind = MeshProtocolEventKind::MessageReceived;
+        out.peer = NodeId{decoded.sender};
+        out.packet_id = chat::meshcore::packetSignature(parsed.payload_type,
+                                                        parsed.path_len,
+                                                        parsed.payload,
+                                                        parsed.payload_len);
+        out.setPayload(decoded.payload, decoded.payload_len);
+        return ProtocolResult::success();
+    }
+
+    return ProtocolResult::fail(ProtocolFailure::Unsupported);
+}
+
+void MeshCoreProtocolStrategy::setLocalPublicHash(uint8_t public_hash)
+{
+    local_public_hash_ = public_hash;
+}
+
+void MeshCoreProtocolStrategy::setDirectSharedSecret(ByteView shared_secret)
+{
+    has_direct_secret_ = false;
+    std::memset(direct_key16_, 0, sizeof(direct_key16_));
+    std::memset(direct_key32_, 0, sizeof(direct_key32_));
+    if (!isDirectSharedSecret(shared_secret))
+    {
+        return;
+    }
+    chat::meshcore::sharedSecretToKeys(shared_secret.data, direct_key16_, direct_key32_);
+    has_direct_secret_ = true;
+}
+
+void MeshCoreProtocolStrategy::clearDirectSharedSecret()
+{
+    has_direct_secret_ = false;
+    std::memset(direct_key16_, 0, sizeof(direct_key16_));
+    std::memset(direct_key32_, 0, sizeof(direct_key32_));
+}
+
+void MeshCoreProtocolStrategy::setGroupKey(ByteView key, uint8_t channel_hash)
+{
+    has_group_key_ = false;
+    std::memset(group_key16_, 0, sizeof(group_key16_));
+    std::memset(group_key32_, 0, sizeof(group_key32_));
+    group_channel_hash_ = 0;
+    if (!mapSecretToKeys(key, group_key16_, group_key32_))
+    {
+        return;
+    }
+    group_channel_hash_ = channel_hash != 0 ? channel_hash
+                                            : chat::meshcore::computeChannelHash(group_key16_);
+    has_group_key_ = true;
+}
+
+void MeshCoreProtocolStrategy::clearGroupKey()
+{
+    has_group_key_ = false;
+    std::memset(group_key16_, 0, sizeof(group_key16_));
+    std::memset(group_key32_, 0, sizeof(group_key32_));
+    group_channel_hash_ = 0;
+}
+
+} // namespace meshcore
+} // namespace mesh
diff --git a/modules/core_mesh/src/protocol/meshtastic/meshtastic_protocol_strategy.cpp b/modules/core_mesh/src/protocol/meshtastic/meshtastic_protocol_strategy.cpp
new file mode 100644
index 00000000..c89d0e7d
--- /dev/null
+++ b/modules/core_mesh/src/protocol/meshtastic/meshtastic_protocol_strategy.cpp
@@ -0,0 +1,181 @@
+#include "mesh/protocol/meshtastic/meshtastic_protocol_strategy.h"
+
+#include "chat/infra/meshtastic/mt_packet_wire.h"
+#include "chat/infra/meshtastic/mt_protocol_helpers.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
+#include "meshtastic/mesh.pb.h"
+#include "meshtastic/portnums.pb.h"
+#include "pb_decode.h"
+#include "pb_encode.h"
+
+#include <cstring>
+
+namespace mesh
+{
+namespace meshtastic
+{
+namespace
+{
+
+RadioConfig mapRadioConfig(const ::chat::meshtastic::RadioConfig& config)
+{
+    RadioConfig out{};
+    out.frequency_hz = static_cast<uint32_t>(config.freq_mhz * 1000000.0f);
+    out.bandwidth_hz = static_cast<uint32_t>(config.bw_khz * 1000.0f);
+    out.spreading_factor = config.sf;
+    out.coding_rate = config.cr_denom;
+    out.sync_word = config.sync_word;
+    out.tx_power_dbm = config.tx_power_dbm;
+    return out;
+}
+
+uint32_t packetIdFromContext(const ProtocolBuildContext& context)
+{
+    if (context.packet_id != 0)
+    {
+        return context.packet_id;
+    }
+    return context.now_ms != 0 ? context.now_ms : 1U;
+}
+
+uint8_t hopLimitFromContext(const ProtocolBuildContext& context)
+{
+    return context.hop_limit == 0 ? 2 : context.hop_limit;
+}
+
+uint32_t portFromCommand(const DirectMessageCommand& command)
+{
+    return command.application_port != 0
+               ? command.application_port
+               : static_cast<uint32_t>(meshtastic_PortNum_TEXT_MESSAGE_APP);
+}
+
+bool encodeAppData(const ProtocolBuildContext& context,
+                   const DirectMessageCommand& command,
+                   uint8_t* out,
+                   size_t* out_size)
+{
+    if (!out || !out_size || command.payload.size > sizeof(meshtastic_Data::payload.bytes))
+    {
+        return false;
+    }
+    meshtastic_Data data = meshtastic_Data_init_default;
+    data.portnum = static_cast<meshtastic_PortNum>(portFromCommand(command));
+    data.want_response = command.request_ack;
+    data.has_bitfield = true;
+    data.bitfield = 0;
+    if (context.include_payload_dest)
+    {
+        data.dest = command.to.value;
+    }
+    data.payload.size = static_cast<pb_size_t>(command.payload.size);
+    std::memcpy(data.payload.bytes, command.payload.data, command.payload.size);
+
+    pb_ostream_t stream = pb_ostream_from_buffer(out, *out_size);
+    if (!pb_encode(&stream, meshtastic_Data_fields, &data))
+    {
+        return false;
+    }
+    *out_size = stream.bytes_written;
+    return true;
+}
+
+} // namespace
+
+MeshProtocolKind MeshtasticProtocolStrategy::kind() const
+{
+    return MeshProtocolKind::Meshtastic;
+}
+
+RadioConfig MeshtasticProtocolStrategy::deriveRadioConfig(const MeshRuntimeConfig& config)
+{
+    if (config.radio.frequency_hz != 0)
+    {
+        return config.radio;
+    }
+    ::chat::MeshConfig default_config;
+    auto derived = ::chat::meshtastic::deriveRadioConfig(default_config);
+    return mapRadioConfig(derived);
+}
+
+ProtocolResult MeshtasticProtocolStrategy::buildDirectMessage(
+    const ProtocolBuildContext& context,
+    const DirectMessageCommand& command,
+    EncodedPacket& out)
+{
+    if (!context.local_node.isValidUnicast() ||
+        (!command.to.isValidUnicast() && !command.to.isBroadcast()) ||
+        command.payload.empty())
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    uint8_t data[256]{};
+    size_t data_size = sizeof(data);
+    if (!encodeAppData(context, command, data, &data_size))
+    {
+        return ProtocolResult::fail(ProtocolFailure::EncodeFailed);
+    }
+
+    out.size = sizeof(out.bytes);
+    const bool want_ack = context.has_air_want_ack
+                              ? context.air_want_ack
+                              : ::chat::meshtastic::shouldSetAirWantAck(command.to.value,
+                                                                        command.request_ack);
+    const uint8_t* psk = context.channel_key.data;
+    const size_t psk_len = context.channel_key.size;
+    if (!::chat::meshtastic::buildWirePacket(data,
+                                             data_size,
+                                             context.local_node.value,
+                                             packetIdFromContext(context),
+                                             command.to.value,
+                                             context.channel_hash,
+                                             hopLimitFromContext(context),
+                                             want_ack,
+                                             psk,
+                                             psk_len,
+                                             out.bytes,
+                                             &out.size))
+    {
+        return ProtocolResult::fail(ProtocolFailure::EncodeFailed);
+    }
+    return ProtocolResult::success();
+}
+
+ProtocolResult MeshtasticProtocolStrategy::parseRadioPacket(const RadioRxPacket& packet,
+                                                            MeshProtocolEvent& out)
+{
+    if (packet.size == 0 || packet.size > sizeof(packet.bytes))
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    ::chat::meshtastic::PacketHeaderWire header{};
+    uint8_t payload[256]{};
+    size_t payload_size = sizeof(payload);
+    if (!::chat::meshtastic::parseWirePacket(packet.bytes,
+                                             packet.size,
+                                             &header,
+                                             payload,
+                                             &payload_size))
+    {
+        return ProtocolResult::fail(ProtocolFailure::DecodeFailed);
+    }
+
+    meshtastic_Data data = meshtastic_Data_init_default;
+    pb_istream_t stream = pb_istream_from_buffer(payload, payload_size);
+    if (!pb_decode(&stream, meshtastic_Data_fields, &data))
+    {
+        return ProtocolResult::fail(ProtocolFailure::DecodeFailed);
+    }
+
+    out = MeshProtocolEvent{};
+    out.kind = MeshProtocolEventKind::MessageReceived;
+    out.peer = NodeId{header.from};
+    out.packet_id = header.id;
+    out.setPayload(data.payload.bytes, data.payload.size);
+    return ProtocolResult::success();
+}
+
+} // namespace meshtastic
+} // namespace mesh
diff --git a/modules/core_mesh/src/protocol/meshtastic/mt_pki_flow.cpp b/modules/core_mesh/src/protocol/meshtastic/mt_pki_flow.cpp
new file mode 100644
index 00000000..3a4b3855
--- /dev/null
+++ b/modules/core_mesh/src/protocol/meshtastic/mt_pki_flow.cpp
@@ -0,0 +1,63 @@
+#include "mesh/protocol/meshtastic/mt_pki_flow.h"
+
+#include "chat/infra/meshtastic/mt_pki_crypto.h"
+
+#include <cstring>
+
+namespace mesh
+{
+namespace meshtastic
+{
+
+ProtocolResult MtPkiFlow::encryptWithSharedSecret(const MtPkiPayloadRequest& request,
+                                                  EncodedPacket& out) const
+{
+    if (request.shared_secret.size != 32 || request.shared_secret.data == nullptr ||
+        request.plaintext.empty() || !request.from.isValidUnicast() ||
+        request.packet_id == 0)
+    {
+        return ProtocolResult::fail(ProtocolFailure::InvalidInput);
+    }
+
+    constexpr size_t auth_len = 8;
+    const size_t needed = request.plaintext.size + auth_len + sizeof(uint32_t);
+    if (needed > sizeof(out.bytes))
+    {
+        return ProtocolResult::fail(ProtocolFailure::EncodeFailed);
+    }
+
+    uint8_t shared[32]{};
+    std::memcpy(shared, request.shared_secret.data, sizeof(shared));
+    ::chat::meshtastic::hashSharedKey(shared, sizeof(shared));
+
+    uint8_t nonce[::chat::meshtastic::kPkiNonceSize]{};
+    ::chat::meshtastic::initPkiNonce(request.from.value,
+                                     request.packet_id,
+                                     request.extra_nonce,
+                                     nonce);
+
+    uint8_t auth[16]{};
+    if (!::chat::meshtastic::encryptPkiAesCcm(shared,
+                                              sizeof(shared),
+                                              nonce,
+                                              auth_len,
+                                              nullptr,
+                                              0,
+                                              request.plaintext.data,
+                                              request.plaintext.size,
+                                              out.bytes,
+                                              auth))
+    {
+        return ProtocolResult::fail(ProtocolFailure::CryptoFailed);
+    }
+
+    std::memcpy(out.bytes + request.plaintext.size, auth, auth_len);
+    std::memcpy(out.bytes + request.plaintext.size + auth_len,
+                &request.extra_nonce,
+                sizeof(request.extra_nonce));
+    out.size = needed;
+    return ProtocolResult::success();
+}
+
+} // namespace meshtastic
+} // namespace mesh
diff --git a/modules/core_mesh/src/usecase/direct_message_service.cpp b/modules/core_mesh/src/usecase/direct_message_service.cpp
new file mode 100644
index 00000000..1d89d886
--- /dev/null
+++ b/modules/core_mesh/src/usecase/direct_message_service.cpp
@@ -0,0 +1,102 @@
+#include "mesh/usecase/direct_message_service.h"
+
+namespace mesh
+{
+
+DirectMessageService::DirectMessageService(MeshProtocolStrategy& protocol,
+                                           PeerIdentityService& identity,
+                                           IPacketRadio& radio,
+                                           IClock& clock,
+                                           IMeshEventSink& events)
+    : protocol_(protocol),
+      identity_(identity),
+      radio_(radio),
+      clock_(clock),
+      events_(events)
+{
+}
+
+SendResult DirectMessageService::sendDirect(const DirectMessageCommand& command)
+{
+    if (!command.to.isValidUnicast() || command.payload.empty())
+    {
+        return SendResult::fail(SendFailure::InvalidInput);
+    }
+
+    LocalIdentity local{};
+    if (command.require_local_identity)
+    {
+        auto local_result = identity_.ensureLocalIdentity(local);
+        if (!local_result.ok || !local.valid)
+        {
+            events_.emit(MeshEvent{MeshEventKind::SendFailed,
+                                   command.to,
+                                   static_cast<int>(SendFailure::LocalIdentityMissing)});
+            return SendResult::fail(SendFailure::LocalIdentityMissing);
+        }
+    }
+
+    PeerPublicKey peer{};
+    if (command.require_peer_key)
+    {
+        auto peer_result = identity_.findPeerKey(command.to, peer);
+        if (!peer_result.ok)
+        {
+            events_.emit(MeshEvent{MeshEventKind::PeerKeyMissing, command.to, 0});
+            return SendResult::fail(SendFailure::PeerKeyMissing);
+        }
+    }
+
+    ProtocolBuildContext context{};
+    context.local_node = command.from;
+    context.local_identity = local;
+    context.peer_key = peer;
+    context.now_ms = clock_.nowMs();
+    context.packet_id = command.packet_id;
+    context.channel_key = command.channel_key;
+    context.channel_hash = command.channel_hash;
+    context.hop_limit = command.hop_limit;
+    context.has_air_want_ack = command.has_air_want_ack;
+    context.air_want_ack = command.air_want_ack;
+    context.include_payload_dest = command.include_payload_dest;
+
+    EncodedPacket packet{};
+    auto built = protocol_.buildDirectMessage(context, command, packet);
+    if (!built.ok)
+    {
+        events_.emit(MeshEvent{MeshEventKind::SendFailed,
+                               command.to,
+                               static_cast<int>(built.failure)});
+        if (built.failure == ProtocolFailure::MissingPeerKey)
+        {
+            events_.emit(MeshEvent{MeshEventKind::PeerKeyMissing, command.to, 0});
+            return SendResult::fail(SendFailure::PeerKeyMissing);
+        }
+        if (built.failure == ProtocolFailure::CryptoFailed)
+        {
+            return SendResult::fail(SendFailure::CryptoFailed);
+        }
+        if (built.failure == ProtocolFailure::Unsupported)
+        {
+            return SendResult::fail(SendFailure::ProtocolUnsupported);
+        }
+        return SendResult::fail(SendFailure::PacketBuildFailed);
+    }
+
+    auto sent = radio_.send(packet.view());
+    if (!sent.ok)
+    {
+        events_.emit(MeshEvent{MeshEventKind::RadioError,
+                               command.to,
+                               static_cast<int>(sent.failure)});
+        events_.emit(MeshEvent{MeshEventKind::SendFailed,
+                               command.to,
+                               static_cast<int>(SendFailure::RadioSendFailed)});
+        return SendResult::fail(SendFailure::RadioSendFailed);
+    }
+
+    events_.emit(MeshEvent{MeshEventKind::MessageSent, command.to, 0});
+    return SendResult::success();
+}
+
+} // namespace mesh
diff --git a/modules/core_mesh/src/usecase/mesh_dedup_service.cpp b/modules/core_mesh/src/usecase/mesh_dedup_service.cpp
new file mode 100644
index 00000000..50377bc3
--- /dev/null
+++ b/modules/core_mesh/src/usecase/mesh_dedup_service.cpp
@@ -0,0 +1,50 @@
+#include "mesh/usecase/mesh_dedup_service.h"
+
+namespace mesh
+{
+
+MeshDedupService::MeshDedupService(uint32_t ttl_ms)
+    : ttl_ms_(ttl_ms)
+{
+}
+
+bool MeshDedupService::accept(NodeId peer, uint32_t packet_id, uint32_t now_ms)
+{
+    if (packet_id == 0)
+    {
+        return true;
+    }
+
+    for (const auto& entry : entries_)
+    {
+        if (!entry.valid)
+        {
+            continue;
+        }
+        if (entry.peer == peer && entry.packet_id == packet_id &&
+            static_cast<uint32_t>(now_ms - entry.seen_at_ms) <= ttl_ms_)
+        {
+            return false;
+        }
+    }
+
+    Entry entry{};
+    entry.peer = peer;
+    entry.packet_id = packet_id;
+    entry.seen_at_ms = now_ms;
+    entry.valid = true;
+    entries_[next_slot_] = entry;
+    next_slot_ = (next_slot_ + 1) % kCapacity;
+    return true;
+}
+
+void MeshDedupService::clear()
+{
+    for (auto& entry : entries_)
+    {
+        entry = Entry{};
+    }
+    next_slot_ = 0;
+}
+
+} // namespace mesh
diff --git a/modules/core_mesh/src/usecase/mesh_session.cpp b/modules/core_mesh/src/usecase/mesh_session.cpp
new file mode 100644
index 00000000..9cd2ed71
--- /dev/null
+++ b/modules/core_mesh/src/usecase/mesh_session.cpp
@@ -0,0 +1,69 @@
+#include "mesh/usecase/mesh_session.h"
+
+namespace mesh
+{
+
+MeshSession::MeshSession(IPacketRadio& radio,
+                         MeshProtocolStrategy& protocol,
+                         DirectMessageService& direct,
+                         ReceivePacketService& receive,
+                         IClock& clock)
+    : radio_(radio),
+      protocol_(protocol),
+      direct_(direct),
+      receive_(receive),
+      clock_(clock)
+{
+}
+
+bool MeshSession::start(const MeshRuntimeConfig& config)
+{
+    state_ = MeshSessionState::Starting;
+    auto radio_config = protocol_.deriveRadioConfig(config);
+    auto configured = radio_.configure(radio_config);
+    if (!configured.ok)
+    {
+        state_ = MeshSessionState::Error;
+        return false;
+    }
+
+    state_ = MeshSessionState::Ready;
+    return true;
+}
+
+void MeshSession::stop()
+{
+    state_ = MeshSessionState::Stopped;
+}
+
+void MeshSession::tick()
+{
+    (void)clock_;
+    if (state_ != MeshSessionState::Ready)
+    {
+        return;
+    }
+
+    RadioRxPacket packet{};
+    while (radio_.poll(packet))
+    {
+        receive_.onRadioPacket(packet);
+        packet = RadioRxPacket{};
+    }
+}
+
+SendResult MeshSession::sendDirect(const DirectMessageCommand& command)
+{
+    if (state_ != MeshSessionState::Ready)
+    {
+        return SendResult::fail(SendFailure::NotReady);
+    }
+    return direct_.sendDirect(command);
+}
+
+MeshSessionState MeshSession::state() const
+{
+    return state_;
+}
+
+} // namespace mesh
diff --git a/modules/core_mesh/src/usecase/peer_identity_service.cpp b/modules/core_mesh/src/usecase/peer_identity_service.cpp
new file mode 100644
index 00000000..ead3cf87
--- /dev/null
+++ b/modules/core_mesh/src/usecase/peer_identity_service.cpp
@@ -0,0 +1,93 @@
+#include "mesh/usecase/peer_identity_service.h"
+
+#include <cstring>
+
+namespace mesh
+{
+
+namespace
+{
+
+bool sameKey(const uint8_t left[32], const uint8_t right[32])
+{
+    return std::memcmp(left, right, 32) == 0;
+}
+
+} // namespace
+
+PeerIdentityService::PeerIdentityService(ILocalIdentityStore& local_store,
+                                         IPeerKeyStore& peer_store,
+                                         ICryptoProvider& crypto,
+                                         IClock& clock)
+    : local_store_(local_store),
+      peer_store_(peer_store),
+      crypto_(crypto),
+      clock_(clock)
+{
+}
+
+StoreResult PeerIdentityService::ensureLocalIdentity(LocalIdentity& out)
+{
+    auto load = local_store_.load(out);
+    if (load.ok && out.valid)
+    {
+        return StoreResult::success();
+    }
+
+    LocalIdentity generated{};
+    auto random = crypto_.random(generated.private_key, sizeof(generated.private_key));
+    if (!random.ok)
+    {
+        return StoreResult::fail(StoreFailure::IoError);
+    }
+
+    generated.valid = true;
+    auto save = local_store_.save(generated);
+    if (!save.ok)
+    {
+        return save;
+    }
+
+    out = generated;
+    return StoreResult::success();
+}
+
+StoreResult PeerIdentityService::findPeerKey(NodeId node_id, PeerPublicKey& out)
+{
+    if (!node_id.isValidUnicast())
+    {
+        return StoreResult::fail(StoreFailure::InvalidArgument);
+    }
+    return peer_store_.get(node_id, out);
+}
+
+StoreResult PeerIdentityService::rememberPeerKey(const PeerPublicKey& key)
+{
+    if (!key.node_id.isValidUnicast())
+    {
+        return StoreResult::fail(StoreFailure::InvalidArgument);
+    }
+
+    PeerPublicKey current{};
+    auto existing = peer_store_.get(key.node_id, current);
+    const bool should_preserve_verification = existing.ok &&
+                                              current.verified &&
+                                              !key.verified;
+    if (should_preserve_verification && !sameKey(current.public_key, key.public_key))
+    {
+        return StoreResult::fail(StoreFailure::PermissionDenied);
+    }
+
+    PeerPublicKey stored = key;
+    if (should_preserve_verification)
+    {
+        stored.verified = true;
+    }
+    if (stored.updated_at_ms == 0)
+    {
+        stored.updated_at_ms = clock_.nowMs();
+    }
+    return peer_store_.put(stored);
+}
+
+} // namespace mesh
diff --git a/modules/core_mesh/src/usecase/receive_packet_service.cpp b/modules/core_mesh/src/usecase/receive_packet_service.cpp
new file mode 100644
index 00000000..26cf7ce8
--- /dev/null
+++ b/modules/core_mesh/src/usecase/receive_packet_service.cpp
@@ -0,0 +1,59 @@
+#include "mesh/usecase/receive_packet_service.h"
+
+namespace mesh
+{
+
+ReceivePacketService::ReceivePacketService(MeshProtocolStrategy& protocol,
+                                           PeerIdentityService& identity,
+                                           IMeshEventSink& events,
+                                           IClock& clock,
+                                           MeshDedupService* dedup)
+    : protocol_(protocol),
+      identity_(identity),
+      events_(events),
+      clock_(clock),
+      dedup_(dedup)
+{
+}
+
+void ReceivePacketService::onRadioPacket(const RadioRxPacket& packet)
+{
+    MeshProtocolEvent event{};
+    auto parsed = protocol_.parseRadioPacket(packet, event);
+    if (!parsed.ok)
+    {
+        events_.emit(MeshEvent{MeshEventKind::ProtocolError,
+                               {},
+                               static_cast<int>(parsed.failure)});
+        return;
+    }
+
+    if (dedup_ && event.packet_id != 0 &&
+        !dedup_->accept(event.peer, event.packet_id, clock_.nowMs()))
+    {
+        return;
+    }
+
+    handleProtocolEvent(event);
+}
+
+void ReceivePacketService::handleProtocolEvent(const MeshProtocolEvent& event)
+{
+    switch (event.kind)
+    {
+    case MeshProtocolEventKind::MessageReceived:
+        events_.emit(MeshEvent{MeshEventKind::MessageReceived, event.peer, 0});
+        break;
+    case MeshProtocolEventKind::PeerKeyLearned:
+        (void)identity_.rememberPeerKey(event.peer_key);
+        events_.emit(MeshEvent{MeshEventKind::PeerKeyLearned, event.peer, 0});
+        break;
+    case MeshProtocolEventKind::PeerDiscovered:
+        events_.emit(MeshEvent{MeshEventKind::PeerDiscovered, event.peer, 0});
+        break;
+    default:
+        break;
+    }
+}
+
+} // namespace mesh
diff --git a/modules/core_mesh/tests/contract/store_contracts.h b/modules/core_mesh/tests/contract/store_contracts.h
new file mode 100644
index 00000000..8c293b09
--- /dev/null
+++ b/modules/core_mesh/tests/contract/store_contracts.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include "mesh/ports/i_local_identity_store.h"
+#include "mesh/ports/i_peer_key_store.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace mesh::tests::contract
+{
+
+inline LocalIdentity makeContractIdentity(uint8_t seed)
+{
+    LocalIdentity identity{};
+    for (size_t index = 0; index < 32; ++index)
+    {
+        identity.public_key[index] = static_cast<uint8_t>(seed + index);
+        identity.private_key[index] = static_cast<uint8_t>(seed + 0x40 + index);
+    }
+    identity.valid = true;
+    return identity;
+}
+
+inline PeerPublicKey makeContractPeerKey(uint32_t node_id,
+                                         uint8_t seed,
+                                         bool verified)
+{
+    PeerPublicKey key{};
+    key.node_id = NodeId{node_id};
+    key.updated_at_ms = seed;
+    key.verified = verified;
+    for (size_t index = 0; index < 32; ++index)
+    {
+        key.public_key[index] = static_cast<uint8_t>(seed + index);
+    }
+    return key;
+}
+
+inline void runLocalIdentityStoreContract(ILocalIdentityStore& store)
+{
+    assert(store.clear().ok);
+
+    LocalIdentity loaded{};
+    auto missing = store.load(loaded);
+    assert(!missing.ok);
+    assert(missing.failure == StoreFailure::NotFound);
+
+    auto identity = makeContractIdentity(0x11);
+    assert(store.save(identity).ok);
+    loaded = LocalIdentity{};
+    assert(store.load(loaded).ok);
+    assert(loaded.valid);
+    assert(std::memcmp(loaded.public_key, identity.public_key, 32) == 0);
+    assert(std::memcmp(loaded.private_key, identity.private_key, 32) == 0);
+
+    auto replacement = makeContractIdentity(0x22);
+    assert(store.save(replacement).ok);
+    loaded = LocalIdentity{};
+    assert(store.load(loaded).ok);
+    assert(std::memcmp(loaded.public_key, replacement.public_key, 32) == 0);
+    assert(std::memcmp(loaded.private_key, replacement.private_key, 32) == 0);
+
+    assert(store.clear().ok);
+    missing = store.load(loaded);
+    assert(!missing.ok);
+    assert(missing.failure == StoreFailure::NotFound);
+}
+
+inline void runPeerKeyStoreContract(IPeerKeyStore& store)
+{
+    assert(store.clear().ok);
+
+    PeerPublicKey loaded{};
+    auto missing = store.get(NodeId{0x1234}, loaded);
+    assert(!missing.ok);
+    assert(missing.failure == StoreFailure::NotFound);
+
+    auto first = makeContractPeerKey(0x1234, 0x31, true);
+    assert(store.put(first).ok);
+    assert(store.get(NodeId{0x1234}, loaded).ok);
+    assert(loaded.node_id == first.node_id);
+    assert(loaded.verified == first.verified);
+    assert(loaded.updated_at_ms == first.updated_at_ms);
+    assert(std::memcmp(loaded.public_key, first.public_key, 32) == 0);
+
+    auto second = makeContractPeerKey(0x5678, 0x41, false);
+    assert(store.put(second).ok);
+    assert(store.get(NodeId{0x5678}, loaded).ok);
+    assert(loaded.node_id == second.node_id);
+    assert(std::memcmp(loaded.public_key, second.public_key, 32) == 0);
+
+    auto replacement = makeContractPeerKey(0x1234, 0x51, true);
+    assert(store.put(replacement).ok);
+    assert(store.get(NodeId{0x1234}, loaded).ok);
+    assert(std::memcmp(loaded.public_key, replacement.public_key, 32) == 0);
+
+    assert(store.remove(NodeId{0x1234}).ok);
+    missing = store.get(NodeId{0x1234}, loaded);
+    assert(!missing.ok);
+    assert(missing.failure == StoreFailure::NotFound);
+
+    assert(store.clear().ok);
+    missing = store.get(NodeId{0x5678}, loaded);
+    assert(!missing.ok);
+    assert(missing.failure == StoreFailure::NotFound);
+}
+
+} // namespace mesh::tests::contract
diff --git a/modules/core_mesh/tests/fake/fake_mesh_dependencies.h b/modules/core_mesh/tests/fake/fake_mesh_dependencies.h
new file mode 100644
index 00000000..2dfe5a5e
--- /dev/null
+++ b/modules/core_mesh/tests/fake/fake_mesh_dependencies.h
@@ -0,0 +1,332 @@
+#pragma once
+
+#include "mesh/ports/i_clock.h"
+#include "mesh/ports/i_crypto_provider.h"
+#include "mesh/ports/i_local_identity_store.h"
+#include "mesh/ports/i_mesh_event_sink.h"
+#include "mesh/ports/i_packet_radio.h"
+#include "mesh/ports/i_peer_key_store.h"
+#include "mesh/protocol/mesh_protocol_strategy.h"
+
+#include <algorithm>
+#include <cstring>
+#include <vector>
+
+namespace mesh::tests
+{
+
+class FakeClock final : public IClock
+{
+  public:
+    uint32_t nowMs() const override
+    {
+        return now_ms;
+    }
+
+    uint32_t now_ms = 0;
+};
+
+class FakeCryptoProvider final : public ICryptoProvider
+{
+  public:
+    CryptoResult random(uint8_t* out, size_t len) override
+    {
+        if (!out)
+        {
+            return CryptoResult::fail(CryptoFailure::InvalidInput);
+        }
+        if (!random_result.ok)
+        {
+            return random_result;
+        }
+        for (size_t index = 0; index < len; ++index)
+        {
+            out[index] = static_cast<uint8_t>(index + 1);
+        }
+        random_count++;
+        return CryptoResult::success();
+    }
+
+    CryptoResult sha256(ByteView input, uint8_t out[32]) override
+    {
+        if (input.empty() || !out)
+        {
+            return CryptoResult::fail(CryptoFailure::InvalidInput);
+        }
+        std::memset(out, 0xA5, 32);
+        return CryptoResult::success();
+    }
+
+    CryptoResult aesCcmEncrypt(ByteView key,
+                               ByteView nonce,
+                               ByteView aad,
+                               ByteView plaintext,
+                               uint8_t* ciphertext,
+                               size_t ciphertext_capacity,
+                               size_t& ciphertext_size) override
+    {
+        (void)key;
+        (void)nonce;
+        (void)aad;
+        if (plaintext.empty() || !ciphertext || ciphertext_capacity < plaintext.size)
+        {
+            return CryptoResult::fail(CryptoFailure::InvalidInput);
+        }
+        std::memcpy(ciphertext, plaintext.data, plaintext.size);
+        ciphertext_size = plaintext.size;
+        return CryptoResult::success();
+    }
+
+    CryptoResult aesCcmDecrypt(ByteView key,
+                               ByteView nonce,
+                               ByteView aad,
+                               ByteView ciphertext,
+                               uint8_t* plaintext,
+                               size_t plaintext_capacity,
+                               size_t& plaintext_size) override
+    {
+        (void)key;
+        (void)nonce;
+        (void)aad;
+        if (ciphertext.empty() || !plaintext || plaintext_capacity < ciphertext.size)
+        {
+            return CryptoResult::fail(CryptoFailure::InvalidInput);
+        }
+        std::memcpy(plaintext, ciphertext.data, ciphertext.size);
+        plaintext_size = ciphertext.size;
+        return CryptoResult::success();
+    }
+
+    int random_count = 0;
+    CryptoResult random_result = CryptoResult::success();
+};
+
+class FakeLocalIdentityStore final : public ILocalIdentityStore
+{
+  public:
+    StoreResult load(LocalIdentity& out) override
+    {
+        if (!has_identity)
+        {
+            return StoreResult::fail(StoreFailure::NotFound);
+        }
+        out = identity;
+        return StoreResult::success();
+    }
+
+    StoreResult save(const LocalIdentity& value) override
+    {
+        identity = value;
+        has_identity = true;
+        save_count++;
+        return save_result;
+    }
+
+    StoreResult clear() override
+    {
+        identity = LocalIdentity{};
+        has_identity = false;
+        return StoreResult::success();
+    }
+
+    LocalIdentity identity{};
+    bool has_identity = false;
+    int save_count = 0;
+    StoreResult save_result = StoreResult::success();
+};
+
+class FakePeerKeyStore final : public IPeerKeyStore
+{
+  public:
+    StoreResult get(NodeId node_id, PeerPublicKey& out) override
+    {
+        for (const auto& key : keys)
+        {
+            if (key.node_id == node_id)
+            {
+                out = key;
+                return StoreResult::success();
+            }
+        }
+        return StoreResult::fail(StoreFailure::NotFound);
+    }
+
+    StoreResult put(const PeerPublicKey& key) override
+    {
+        for (auto& existing : keys)
+        {
+            if (existing.node_id == key.node_id)
+            {
+                existing = key;
+                put_count++;
+                return StoreResult::success();
+            }
+        }
+        keys.push_back(key);
+        put_count++;
+        return StoreResult::success();
+    }
+
+    StoreResult remove(NodeId node_id) override
+    {
+        keys.erase(std::remove_if(keys.begin(),
+                                  keys.end(),
+                                  [node_id](const PeerPublicKey& key)
+                                  {
+                                      return key.node_id == node_id;
+                                  }),
+                   keys.end());
+        return StoreResult::success();
+    }
+
+    StoreResult clear() override
+    {
+        keys.clear();
+        return StoreResult::success();
+    }
+
+    std::vector<PeerPublicKey> keys;
+    int put_count = 0;
+};
+
+class FakeMeshEventSink final : public IMeshEventSink
+{
+  public:
+    void emit(const MeshEvent& event) override
+    {
+        events.push_back(event);
+    }
+
+    int count(MeshEventKind kind) const
+    {
+        int result = 0;
+        for (const auto& event : events)
+        {
+            if (event.kind == kind)
+            {
+                result++;
+            }
+        }
+        return result;
+    }
+
+    std::vector<MeshEvent> events;
+};
+
+class FakePacketRadio final : public IPacketRadio
+{
+  public:
+    RadioResult configure(const RadioConfig& config) override
+    {
+        last_config = config;
+        configure_count++;
+        return configure_result;
+    }
+
+    RadioResult send(ByteView packet) override
+    {
+        send_count++;
+        last_sent.assign(packet.data, packet.data + packet.size);
+        return send_result;
+    }
+
+    bool poll(RadioRxPacket& out) override
+    {
+        if (rx_packets.empty())
+        {
+            return false;
+        }
+        out = rx_packets.front();
+        rx_packets.erase(rx_packets.begin());
+        return true;
+    }
+
+    RadioConfig last_config{};
+    RadioResult configure_result = RadioResult::success();
+    RadioResult send_result = RadioResult::success();
+    int configure_count = 0;
+    int send_count = 0;
+    std::vector<uint8_t> last_sent;
+    std::vector<RadioRxPacket> rx_packets;
+};
+
+class FakeProtocolStrategy final : public MeshProtocolStrategy
+{
+  public:
+    MeshProtocolKind kind() const override
+    {
+        return protocol_kind;
+    }
+
+    RadioConfig deriveRadioConfig(const MeshRuntimeConfig& config) override
+    {
+        derive_count++;
+        return config.radio;
+    }
+
+    ProtocolResult buildDirectMessage(const ProtocolBuildContext& context,
+                                      const DirectMessageCommand& command,
+                                      EncodedPacket& out) override
+    {
+        last_context = context;
+        last_command = command;
+        build_count++;
+        if (!build_result.ok)
+        {
+            return build_result;
+        }
+        out.size = command.payload.size;
+        std::memcpy(out.bytes, command.payload.data, out.size);
+        return ProtocolResult::success();
+    }
+
+    ProtocolResult parseRadioPacket(const RadioRxPacket& packet,
+                                    MeshProtocolEvent& out) override
+    {
+        (void)packet;
+        parse_count++;
+        if (!parse_result.ok)
+        {
+            return parse_result;
+        }
+        out = next_event;
+        return ProtocolResult::success();
+    }
+
+    MeshProtocolKind protocol_kind = MeshProtocolKind::Meshtastic;
+    ProtocolResult build_result = ProtocolResult::success();
+    ProtocolResult parse_result = ProtocolResult::success();
+    MeshProtocolEvent next_event{};
+    ProtocolBuildContext last_context{};
+    DirectMessageCommand last_command{};
+    int derive_count = 0;
+    int build_count = 0;
+    int parse_count = 0;
+};
+
+inline LocalIdentity makeIdentity()
+{
+    LocalIdentity identity{};
+    for (size_t index = 0; index < 32; ++index)
+    {
+        identity.private_key[index] = static_cast<uint8_t>(index + 1);
+        identity.public_key[index] = static_cast<uint8_t>(0x80 + index);
+    }
+    identity.valid = true;
+    return identity;
+}
+
+inline PeerPublicKey makePeerKey(uint32_t node_id, bool verified = true)
+{
+    PeerPublicKey key{};
+    key.node_id = NodeId{node_id};
+    for (size_t index = 0; index < 32; ++index)
+    {
+        key.public_key[index] = static_cast<uint8_t>(node_id + index);
+    }
+    key.updated_at_ms = 100;
+    key.verified = verified;
+    return key;
+}
+
+} // namespace mesh::tests
diff --git a/modules/core_mesh/tests/test_direct_message_service.cpp b/modules/core_mesh/tests/test_direct_message_service.cpp
new file mode 100644
index 00000000..a4eb6a1d
--- /dev/null
+++ b/modules/core_mesh/tests/test_direct_message_service.cpp
@@ -0,0 +1,157 @@
+#include "fake/fake_mesh_dependencies.h"
+#include "mesh/usecase/direct_message_service.h"
+#include "mesh/usecase/peer_identity_service.h"
+
+#include <cassert>
+
+namespace
+{
+
+struct Harness
+{
+    mesh::tests::FakeClock clock;
+    mesh::tests::FakeCryptoProvider crypto;
+    mesh::tests::FakeLocalIdentityStore local_store;
+    mesh::tests::FakePeerKeyStore peer_store;
+    mesh::tests::FakePacketRadio radio;
+    mesh::tests::FakeMeshEventSink events;
+    mesh::tests::FakeProtocolStrategy protocol;
+    mesh::PeerIdentityService identity{local_store, peer_store, crypto, clock};
+    mesh::DirectMessageService direct{protocol, identity, radio, clock, events};
+};
+
+} // namespace
+
+int main()
+{
+    Harness ok;
+    ok.local_store.identity = mesh::tests::makeIdentity();
+    ok.local_store.has_identity = true;
+    ok.peer_store.keys.push_back(mesh::tests::makePeerKey(0xAA01));
+
+    const uint8_t payload[] = {1, 2, 3};
+    mesh::DirectMessageCommand command{mesh::NodeId{0xAA01},
+                                       mesh::ByteView{payload, sizeof(payload)},
+                                       true};
+    auto sent = ok.direct.sendDirect(command);
+    assert(sent.ok);
+    assert(ok.protocol.build_count == 1);
+    assert(ok.protocol.last_context.local_identity.valid);
+    assert(ok.protocol.last_context.peer_key.node_id == mesh::NodeId{0xAA01});
+    assert(ok.radio.send_count == 1);
+    assert(ok.events.count(mesh::MeshEventKind::MessageSent) == 1);
+
+    Harness channel_key_path;
+    mesh::DirectMessageCommand channel_command{mesh::NodeId{0xAA02},
+                                               mesh::ByteView{payload, sizeof(payload)},
+                                               false};
+    const uint8_t psk[] = {0x10, 0x11, 0x12, 0x13};
+    channel_command.from = mesh::NodeId{0x1001};
+    channel_command.application_port = 77;
+    channel_command.packet_id = 0x12345678;
+    channel_command.channel_hash = 0x2A;
+    channel_command.channel_key = mesh::ByteView{psk, sizeof(psk)};
+    channel_command.hop_limit = 5;
+    channel_command.has_air_want_ack = true;
+    channel_command.air_want_ack = false;
+    channel_command.include_payload_dest = false;
+    channel_command.require_local_identity = false;
+    channel_command.require_peer_key = false;
+    auto channel_sent = channel_key_path.direct.sendDirect(channel_command);
+    assert(channel_sent.ok);
+    assert(channel_key_path.crypto.random_count == 0);
+    assert(channel_key_path.peer_store.keys.empty());
+    assert(channel_key_path.protocol.last_context.local_node == mesh::NodeId{0x1001});
+    assert(channel_key_path.protocol.last_context.packet_id == 0x12345678);
+    assert(channel_key_path.protocol.last_context.channel_hash == 0x2A);
+    assert(channel_key_path.protocol.last_context.channel_key.data == psk);
+    assert(channel_key_path.protocol.last_context.channel_key.size == sizeof(psk));
+    assert(channel_key_path.protocol.last_context.hop_limit == 5);
+    assert(channel_key_path.protocol.last_context.has_air_want_ack);
+    assert(!channel_key_path.protocol.last_context.air_want_ack);
+    assert(!channel_key_path.protocol.last_context.include_payload_dest);
+    assert(channel_key_path.radio.send_count == 1);
+
+    Harness invalid;
+    mesh::DirectMessageCommand invalid_command{mesh::NodeId{},
+                                               mesh::ByteView{payload, sizeof(payload)},
+                                               true};
+    auto invalid_result = invalid.direct.sendDirect(invalid_command);
+    assert(!invalid_result.ok);
+    assert(invalid_result.failure == mesh::SendFailure::InvalidInput);
+    assert(invalid.protocol.build_count == 0);
+    assert(invalid.radio.send_count == 0);
+
+    Harness missing_local;
+    missing_local.crypto.random_result =
+        mesh::CryptoResult::fail(mesh::CryptoFailure::InvalidInput);
+    missing_local.peer_store.keys.push_back(mesh::tests::makePeerKey(0xAA01));
+    auto local_missing = missing_local.direct.sendDirect(command);
+    assert(!local_missing.ok);
+    assert(local_missing.failure == mesh::SendFailure::LocalIdentityMissing);
+    assert(missing_local.protocol.build_count == 0);
+    assert(missing_local.events.count(mesh::MeshEventKind::SendFailed) == 1);
+
+    Harness missing_peer;
+    missing_peer.local_store.identity = mesh::tests::makeIdentity();
+    missing_peer.local_store.has_identity = true;
+    auto peer_missing = missing_peer.direct.sendDirect(command);
+    assert(!peer_missing.ok);
+    assert(peer_missing.failure == mesh::SendFailure::PeerKeyMissing);
+    assert(missing_peer.events.count(mesh::MeshEventKind::PeerKeyMissing) == 1);
+
+    Harness build_fail;
+    build_fail.local_store.identity = mesh::tests::makeIdentity();
+    build_fail.local_store.has_identity = true;
+    build_fail.peer_store.keys.push_back(mesh::tests::makePeerKey(0xAA01));
+    build_fail.protocol.build_result =
+        mesh::ProtocolResult::fail(mesh::ProtocolFailure::EncodeFailed);
+    auto build_result = build_fail.direct.sendDirect(command);
+    assert(!build_result.ok);
+    assert(build_result.failure == mesh::SendFailure::PacketBuildFailed);
+    assert(build_fail.radio.send_count == 0);
+    assert(build_fail.events.count(mesh::MeshEventKind::SendFailed) == 1);
+
+    Harness protocol_missing_peer;
+    protocol_missing_peer.local_store.identity = mesh::tests::makeIdentity();
+    protocol_missing_peer.local_store.has_identity = true;
+    protocol_missing_peer.peer_store.keys.push_back(mesh::tests::makePeerKey(0xAA01));
+    protocol_missing_peer.protocol.build_result =
+        mesh::ProtocolResult::fail(mesh::ProtocolFailure::MissingPeerKey);
+    auto protocol_peer_missing = protocol_missing_peer.direct.sendDirect(command);
+    assert(!protocol_peer_missing.ok);
+    assert(protocol_peer_missing.failure == mesh::SendFailure::PeerKeyMissing);
+    assert(protocol_missing_peer.events.count(mesh::MeshEventKind::PeerKeyMissing) == 1);
+
+    Harness crypto_fail;
+    crypto_fail.local_store.identity = mesh::tests::makeIdentity();
+    crypto_fail.local_store.has_identity = true;
+    crypto_fail.peer_store.keys.push_back(mesh::tests::makePeerKey(0xAA01));
+    crypto_fail.protocol.build_result =
+        mesh::ProtocolResult::fail(mesh::ProtocolFailure::CryptoFailed);
+    auto crypto_result = crypto_fail.direct.sendDirect(command);
+    assert(!crypto_result.ok);
+    assert(crypto_result.failure == mesh::SendFailure::CryptoFailed);
+
+    Harness unsupported;
+    unsupported.local_store.identity = mesh::tests::makeIdentity();
+    unsupported.local_store.has_identity = true;
+    unsupported.peer_store.keys.push_back(mesh::tests::makePeerKey(0xAA01));
+    unsupported.protocol.build_result =
+        mesh::ProtocolResult::fail(mesh::ProtocolFailure::Unsupported);
+    auto unsupported_result = unsupported.direct.sendDirect(command);
+    assert(!unsupported_result.ok);
+    assert(unsupported_result.failure == mesh::SendFailure::ProtocolUnsupported);
+
+    Harness radio_fail;
+    radio_fail.local_store.identity = mesh::tests::makeIdentity();
+    radio_fail.local_store.has_identity = true;
+    radio_fail.peer_store.keys.push_back(mesh::tests::makePeerKey(0xAA01));
+    radio_fail.radio.send_result = mesh::RadioResult::fail(mesh::RadioFailure::Busy);
+    auto radio_result = radio_fail.direct.sendDirect(command);
+    assert(!radio_result.ok);
+    assert(radio_result.failure == mesh::SendFailure::RadioSendFailed);
+    assert(radio_fail.events.count(mesh::MeshEventKind::RadioError) == 1);
+    assert(radio_fail.events.count(mesh::MeshEventKind::SendFailed) == 1);
+    return 0;
+}
diff --git a/modules/core_mesh/tests/test_mesh_session.cpp b/modules/core_mesh/tests/test_mesh_session.cpp
new file mode 100644
index 00000000..06af59e2
--- /dev/null
+++ b/modules/core_mesh/tests/test_mesh_session.cpp
@@ -0,0 +1,54 @@
+#include "fake/fake_mesh_dependencies.h"
+#include "mesh/usecase/direct_message_service.h"
+#include "mesh/usecase/mesh_session.h"
+#include "mesh/usecase/peer_identity_service.h"
+#include "mesh/usecase/receive_packet_service.h"
+
+#include <cassert>
+
+int main()
+{
+    mesh::tests::FakeClock clock;
+    mesh::tests::FakeCryptoProvider crypto;
+    mesh::tests::FakeLocalIdentityStore local_store;
+    mesh::tests::FakePeerKeyStore peer_store;
+    mesh::tests::FakePacketRadio radio;
+    mesh::tests::FakeMeshEventSink events;
+    mesh::tests::FakeProtocolStrategy protocol;
+    mesh::PeerIdentityService identity(local_store, peer_store, crypto, clock);
+    mesh::ReceivePacketService receive(protocol, identity, events, clock);
+    mesh::DirectMessageService direct(protocol, identity, radio, clock, events);
+    mesh::MeshSession session(radio, protocol, direct, receive, clock);
+
+    mesh::MeshRuntimeConfig config{};
+    config.protocol = mesh::MeshProtocolKind::Meshtastic;
+    config.radio.frequency_hz = 915000000;
+    config.radio.spreading_factor = 7;
+    assert(session.start(config));
+    assert(session.state() == mesh::MeshSessionState::Ready);
+    assert(radio.configure_count == 1);
+    assert(radio.last_config.frequency_hz == 915000000);
+
+    protocol.next_event.kind = mesh::MeshProtocolEventKind::MessageReceived;
+    protocol.next_event.peer = mesh::NodeId{0x4401};
+    mesh::RadioRxPacket rx{};
+    rx.size = 1;
+    rx.bytes[0] = 0x42;
+    radio.rx_packets.push_back(rx);
+    session.tick();
+    assert(events.count(mesh::MeshEventKind::MessageReceived) == 1);
+
+    local_store.identity = mesh::tests::makeIdentity();
+    local_store.has_identity = true;
+    peer_store.keys.push_back(mesh::tests::makePeerKey(0x4401));
+    const uint8_t payload[] = {0x10, 0x11};
+    mesh::DirectMessageCommand command{mesh::NodeId{0x4401},
+                                       mesh::ByteView{payload, sizeof(payload)},
+                                       true};
+    assert(session.sendDirect(command).ok);
+    assert(radio.send_count == 1);
+
+    session.stop();
+    assert(!session.sendDirect(command).ok);
+    return 0;
+}
diff --git a/modules/core_mesh/tests/test_meshcore_protocol_strategy.cpp b/modules/core_mesh/tests/test_meshcore_protocol_strategy.cpp
new file mode 100644
index 00000000..d3a01fa3
--- /dev/null
+++ b/modules/core_mesh/tests/test_meshcore_protocol_strategy.cpp
@@ -0,0 +1,107 @@
+#include "mesh/protocol/meshcore/meshcore_protocol_strategy.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+bool hasCryptoBackend()
+{
+#if defined(ESP_PLATFORM) || defined(TRAIL_MATE_HAS_OPENSSL) || defined(ARDUINO)
+    return true;
+#else
+    return false;
+#endif
+}
+
+} // namespace
+
+int main()
+{
+    mesh::meshcore::MeshCoreProtocolStrategy strategy;
+
+    mesh::MeshRuntimeConfig runtime{};
+    auto radio = strategy.deriveRadioConfig(runtime);
+    assert(radio.frequency_hz != 0);
+    assert(radio.bandwidth_hz != 0);
+    assert(radio.sync_word == 0x12);
+
+    const char text[] = "meshcore";
+    mesh::DirectMessageCommand command{
+        mesh::NodeId{0x33333344UL},
+        mesh::ByteView{reinterpret_cast<const uint8_t*>(text), sizeof(text) - 1},
+        true};
+    command.application_port = 123;
+
+    mesh::ProtocolBuildContext context{};
+    context.local_node = mesh::NodeId{0x11111122UL};
+
+    mesh::EncodedPacket encoded{};
+    auto missing_key = strategy.buildDirectMessage(context, command, encoded);
+    assert(!missing_key.ok);
+    assert(missing_key.failure == mesh::ProtocolFailure::MissingPeerKey);
+
+    if (!hasCryptoBackend())
+    {
+        return 0;
+    }
+
+    uint8_t direct_secret[32] = {};
+    for (size_t index = 0; index < sizeof(direct_secret); ++index)
+    {
+        direct_secret[index] = static_cast<uint8_t>(index + 1);
+    }
+    context.channel_key = mesh::ByteView{direct_secret, sizeof(direct_secret)};
+
+    auto direct_built = strategy.buildDirectMessage(context, command, encoded);
+    assert(direct_built.ok);
+    assert(encoded.size > 0);
+
+    mesh::RadioRxPacket packet{};
+    std::memcpy(packet.bytes, encoded.bytes, encoded.size);
+    packet.size = encoded.size;
+    packet.received_at_ms = 42;
+
+    mesh::meshcore::MeshCoreProtocolStrategy receiver;
+    receiver.setLocalPublicHash(0x44);
+    receiver.setDirectSharedSecret(mesh::ByteView{direct_secret, sizeof(direct_secret)});
+    mesh::MeshProtocolEvent event{};
+    auto direct_parsed = receiver.parseRadioPacket(packet, event);
+    assert(direct_parsed.ok);
+    assert(event.kind == mesh::MeshProtocolEventKind::MessageReceived);
+    assert(event.peer == mesh::NodeId{0x22});
+    assert(event.payload.size == sizeof(text) - 1);
+    assert(std::memcmp(event.payload.data, text, sizeof(text) - 1) == 0);
+
+    uint8_t group_key[16] = {};
+    for (size_t index = 0; index < sizeof(group_key); ++index)
+    {
+        group_key[index] = static_cast<uint8_t>(0xA0 + index);
+    }
+
+    mesh::DirectMessageCommand group_command{
+        mesh::NodeId{},
+        mesh::ByteView{reinterpret_cast<const uint8_t*>(text), sizeof(text) - 1},
+        false};
+    group_command.application_port = 321;
+    context.channel_key = mesh::ByteView{group_key, sizeof(group_key)};
+
+    auto group_built = strategy.buildDirectMessage(context, group_command, encoded);
+    assert(group_built.ok);
+
+    packet = mesh::RadioRxPacket{};
+    std::memcpy(packet.bytes, encoded.bytes, encoded.size);
+    packet.size = encoded.size;
+
+    receiver.setGroupKey(mesh::ByteView{group_key, sizeof(group_key)});
+    event = mesh::MeshProtocolEvent{};
+    auto group_parsed = receiver.parseRadioPacket(packet, event);
+    assert(group_parsed.ok);
+    assert(event.kind == mesh::MeshProtocolEventKind::MessageReceived);
+    assert(event.peer == context.local_node);
+    assert(event.payload.size == sizeof(text) - 1);
+    assert(std::memcmp(event.payload.data, text, sizeof(text) - 1) == 0);
+
+    return 0;
+}
diff --git a/modules/core_mesh/tests/test_meshtastic_protocol_strategy.cpp b/modules/core_mesh/tests/test_meshtastic_protocol_strategy.cpp
new file mode 100644
index 00000000..5fea5f6f
--- /dev/null
+++ b/modules/core_mesh/tests/test_meshtastic_protocol_strategy.cpp
@@ -0,0 +1,51 @@
+#include "mesh/protocol/meshtastic/meshtastic_protocol_strategy.h"
+
+#include "meshtastic/portnums.pb.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    mesh::meshtastic::MeshtasticProtocolStrategy strategy;
+
+    mesh::MeshRuntimeConfig runtime{};
+    auto radio = strategy.deriveRadioConfig(runtime);
+    assert(radio.frequency_hz != 0);
+    assert(radio.bandwidth_hz != 0);
+    assert(radio.sync_word == 0x2B);
+
+    const char text[] = "hello";
+    mesh::DirectMessageCommand command{
+        mesh::NodeId{0x22222222UL},
+        mesh::ByteView{reinterpret_cast<const uint8_t*>(text), sizeof(text) - 1},
+        true};
+    command.application_port = static_cast<uint32_t>(meshtastic_PortNum_TEXT_MESSAGE_APP);
+
+    mesh::ProtocolBuildContext context{};
+    context.local_node = mesh::NodeId{0x11111111UL};
+    context.packet_id = 0xAABBCCDDUL;
+    context.channel_hash = 0x01;
+    context.hop_limit = 3;
+
+    mesh::EncodedPacket encoded{};
+    auto built = strategy.buildDirectMessage(context, command, encoded);
+    assert(built.ok);
+    assert(encoded.size > 0);
+
+    mesh::RadioRxPacket packet{};
+    std::memcpy(packet.bytes, encoded.bytes, encoded.size);
+    packet.size = encoded.size;
+    packet.received_at_ms = 42;
+
+    mesh::MeshProtocolEvent event{};
+    auto parsed = strategy.parseRadioPacket(packet, event);
+    assert(parsed.ok);
+    assert(event.kind == mesh::MeshProtocolEventKind::MessageReceived);
+    assert(event.peer == mesh::NodeId{0x11111111UL});
+    assert(event.packet_id == 0xAABBCCDDUL);
+    assert(event.payload.size == sizeof(text) - 1);
+    assert(std::memcmp(event.payload.data, text, sizeof(text) - 1) == 0);
+
+    return 0;
+}
diff --git a/modules/core_mesh/tests/test_peer_identity_service.cpp b/modules/core_mesh/tests/test_peer_identity_service.cpp
new file mode 100644
index 00000000..48b8a8fb
--- /dev/null
+++ b/modules/core_mesh/tests/test_peer_identity_service.cpp
@@ -0,0 +1,54 @@
+#include "fake/fake_mesh_dependencies.h"
+#include "mesh/usecase/peer_identity_service.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    mesh::tests::FakeClock clock;
+    mesh::tests::FakeCryptoProvider crypto;
+    mesh::tests::FakeLocalIdentityStore local_store;
+    mesh::tests::FakePeerKeyStore peer_store;
+    mesh::PeerIdentityService identity(local_store, peer_store, crypto, clock);
+
+    mesh::LocalIdentity out{};
+    assert(identity.ensureLocalIdentity(out).ok);
+    assert(out.valid);
+    assert(local_store.save_count == 1);
+    assert(crypto.random_count == 1);
+
+    out = mesh::LocalIdentity{};
+    assert(identity.ensureLocalIdentity(out).ok);
+    assert(out.valid);
+    assert(local_store.save_count == 1);
+
+    auto verified = mesh::tests::makePeerKey(0x1234, true);
+    assert(identity.rememberPeerKey(verified).ok);
+
+    auto unverified_changed = mesh::tests::makePeerKey(0x1234, false);
+    unverified_changed.public_key[0] ^= 0x55;
+    auto rejected = identity.rememberPeerKey(unverified_changed);
+    assert(!rejected.ok);
+    assert(rejected.failure == mesh::StoreFailure::PermissionDenied);
+
+    mesh::PeerPublicKey loaded{};
+    assert(identity.findPeerKey(mesh::NodeId{0x1234}, loaded).ok);
+    assert(loaded.verified);
+    assert(std::memcmp(loaded.public_key, verified.public_key, 32) == 0);
+
+    clock.now_ms = 4242;
+    auto unverified_same = verified;
+    unverified_same.verified = false;
+    unverified_same.updated_at_ms = 0;
+    assert(identity.rememberPeerKey(unverified_same).ok);
+    assert(identity.findPeerKey(mesh::NodeId{0x1234}, loaded).ok);
+    assert(loaded.verified);
+    assert(loaded.updated_at_ms == 4242);
+    assert(std::memcmp(loaded.public_key, verified.public_key, 32) == 0);
+
+    mesh::PeerPublicKey invalid{};
+    invalid.node_id = mesh::NodeId{0};
+    assert(!identity.rememberPeerKey(invalid).ok);
+    return 0;
+}
diff --git a/modules/core_mesh/tests/test_receive_packet_service.cpp b/modules/core_mesh/tests/test_receive_packet_service.cpp
new file mode 100644
index 00000000..301030cc
--- /dev/null
+++ b/modules/core_mesh/tests/test_receive_packet_service.cpp
@@ -0,0 +1,72 @@
+#include "fake/fake_mesh_dependencies.h"
+#include "mesh/usecase/mesh_dedup_service.h"
+#include "mesh/usecase/peer_identity_service.h"
+#include "mesh/usecase/receive_packet_service.h"
+
+#include <cassert>
+
+namespace
+{
+
+struct Harness
+{
+    mesh::tests::FakeClock clock;
+    mesh::tests::FakeCryptoProvider crypto;
+    mesh::tests::FakeLocalIdentityStore local_store;
+    mesh::tests::FakePeerKeyStore peer_store;
+    mesh::tests::FakeMeshEventSink events;
+    mesh::tests::FakeProtocolStrategy protocol;
+    mesh::MeshDedupService dedup;
+    mesh::PeerIdentityService identity{local_store, peer_store, crypto, clock};
+    mesh::ReceivePacketService receive{protocol, identity, events, clock, &dedup};
+};
+
+} // namespace
+
+int main()
+{
+    mesh::RadioRxPacket packet{};
+    packet.bytes[0] = 1;
+    packet.size = 1;
+
+    Harness message;
+    message.protocol.next_event.kind = mesh::MeshProtocolEventKind::MessageReceived;
+    message.protocol.next_event.peer = mesh::NodeId{0x1101};
+    message.receive.onRadioPacket(packet);
+    assert(message.events.count(mesh::MeshEventKind::MessageReceived) == 1);
+
+    Harness discovered;
+    discovered.protocol.next_event.kind = mesh::MeshProtocolEventKind::PeerDiscovered;
+    discovered.protocol.next_event.peer = mesh::NodeId{0x1201};
+    discovered.receive.onRadioPacket(packet);
+    assert(discovered.events.count(mesh::MeshEventKind::PeerDiscovered) == 1);
+
+    Harness learned;
+    learned.clock.now_ms = 500;
+    learned.protocol.next_event.kind = mesh::MeshProtocolEventKind::PeerKeyLearned;
+    learned.protocol.next_event.peer = mesh::NodeId{0x2201};
+    learned.protocol.next_event.peer_key = mesh::tests::makePeerKey(0x2201, false);
+    learned.protocol.next_event.peer_key.updated_at_ms = 0;
+
+    learned.receive.onRadioPacket(packet);
+    assert(learned.events.count(mesh::MeshEventKind::PeerKeyLearned) == 1);
+
+    mesh::PeerPublicKey key{};
+    assert(learned.peer_store.get(mesh::NodeId{0x2201}, key).ok);
+    assert(key.updated_at_ms == 500);
+
+    Harness protocol_error;
+    protocol_error.protocol.parse_result =
+        mesh::ProtocolResult::fail(mesh::ProtocolFailure::DecodeFailed);
+    protocol_error.receive.onRadioPacket(packet);
+    assert(protocol_error.events.count(mesh::MeshEventKind::ProtocolError) == 1);
+
+    Harness duplicate;
+    duplicate.protocol.next_event.kind = mesh::MeshProtocolEventKind::MessageReceived;
+    duplicate.protocol.next_event.peer = mesh::NodeId{0x3301};
+    duplicate.protocol.next_event.packet_id = 77;
+    duplicate.receive.onRadioPacket(packet);
+    duplicate.receive.onRadioPacket(packet);
+    assert(duplicate.events.count(mesh::MeshEventKind::MessageReceived) == 1);
+    return 0;
+}
diff --git a/modules/core_mesh/tests/test_store_contracts.cpp b/modules/core_mesh/tests/test_store_contracts.cpp
new file mode 100644
index 00000000..8ab1fdb1
--- /dev/null
+++ b/modules/core_mesh/tests/test_store_contracts.cpp
@@ -0,0 +1,13 @@
+#include "contract/store_contracts.h"
+#include "fake/fake_mesh_dependencies.h"
+
+int main()
+{
+    mesh::tests::FakeLocalIdentityStore local_store;
+    mesh::tests::contract::runLocalIdentityStoreContract(local_store);
+
+    mesh::tests::FakePeerKeyStore peer_store;
+    mesh::tests::contract::runPeerKeyStoreContract(peer_store);
+
+    return 0;
+}
diff --git a/modules/core_phone/include/phone/common/phone_app_facade.h b/modules/core_phone/include/phone/common/phone_app_facade.h
new file mode 100644
index 00000000..d21989fb
--- /dev/null
+++ b/modules/core_phone/include/phone/common/phone_app_facade.h
@@ -0,0 +1,154 @@
+#pragma once
+
+#include "chat/domain/chat_types.h"
+#include "chat/domain/contact_types.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <string>
+
+namespace phone
+{
+
+struct MeshtasticPhoneConfigSnapshot
+{
+    chat::MeshConfig mesh{};
+    bool relay_enabled = false;
+    char node_name[32] = {};
+    char short_name[16] = {};
+    bool primary_enabled = false;
+    bool secondary_enabled = false;
+    bool primary_uplink_enabled = false;
+    bool primary_downlink_enabled = false;
+    bool secondary_uplink_enabled = false;
+    bool secondary_downlink_enabled = false;
+    bool gps_enabled = true;
+    uint8_t gps_mode = 0;
+    uint32_t gps_interval_ms = 0;
+    uint8_t gps_strategy = 0;
+};
+
+struct MeshCorePhoneConfigSnapshot
+{
+    chat::MeshProtocol active_protocol = chat::MeshProtocol::Meshtastic;
+    chat::MeshConfig mesh{};
+    char node_name[32] = {};
+    char short_name[16] = {};
+    int8_t tx_power_min_dbm = 0;
+    int8_t tx_power_max_dbm = 0;
+};
+
+struct PhoneNodeView
+{
+    uint32_t node_id = 0;
+    char short_name[10] = {};
+    char long_name[32] = {};
+    uint32_t last_seen = 0;
+    float snr = 0.0f;
+    float rssi = 0.0f;
+    uint8_t hops_away = 0xFF;
+    uint8_t channel = 0xFF;
+    uint8_t next_hop = 0;
+    uint8_t protocol = 0;
+    uint8_t role = 0xFF;
+    uint8_t hw_model = 0;
+    bool has_macaddr = false;
+    uint8_t macaddr[6] = {};
+    bool via_mqtt = false;
+    bool is_ignored = false;
+    bool has_public_key = false;
+    bool key_manually_verified = false;
+    bool has_device_metrics = false;
+    chat::contacts::NodeDeviceMetrics device_metrics{};
+    chat::contacts::NodePosition position{};
+};
+
+class IPhoneAppFacade
+{
+  public:
+    virtual ~IPhoneAppFacade() = default;
+
+    virtual MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const = 0;
+    virtual void setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config) = 0;
+    virtual MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const = 0;
+    virtual void setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config) = 0;
+    virtual void saveConfig() = 0;
+    virtual void applyMeshConfig() = 0;
+    virtual void applyUserInfo() = 0;
+    virtual void applyPositionConfig() = 0;
+    virtual void getEffectiveUserInfo(char* out_long,
+                                      std::size_t long_len,
+                                      char* out_short,
+                                      std::size_t short_len) const = 0;
+
+    virtual chat::NodeId getSelfNodeId() const = 0;
+    virtual bool sendPhoneText(chat::ChannelId channel,
+                               const std::string& text,
+                               chat::MessageId forced_msg_id,
+                               chat::NodeId peer,
+                               chat::MessageId& out_msg_id) = 0;
+    virtual bool sendPhoneAppData(chat::ChannelId channel,
+                                  uint32_t portnum,
+                                  const uint8_t* payload,
+                                  std::size_t len,
+                                  chat::NodeId dest,
+                                  bool want_ack,
+                                  chat::MessageId packet_id,
+                                  bool want_response) = 0;
+    virtual bool pollIncomingPhoneData(chat::MeshIncomingData& out) = 0;
+    virtual std::size_t phoneNodeCount() const = 0;
+    virtual bool getPhoneNodeByIndex(std::size_t index, PhoneNodeView& out) const = 0;
+    virtual bool findPhoneNode(chat::NodeId node_id, PhoneNodeView& out) const = 0;
+    virtual bool isMeshPkiReady() const = 0;
+
+    virtual bool isBleEnabled() const = 0;
+    virtual void setBleEnabled(bool enabled) = 0;
+    virtual bool getDeviceMacAddress(uint8_t out_mac[6]) const = 0;
+    virtual bool syncCurrentEpochSeconds(uint32_t epoch_seconds) = 0;
+    virtual void resetMeshConfig() = 0;
+    virtual void clearNodeDb() = 0;
+    virtual void clearMessageDb() = 0;
+    virtual void restartDevice() = 0;
+
+    virtual bool meshCoreExportIdentityPublicKey(uint8_t* out_pubkey, std::size_t len) = 0;
+    virtual bool meshCoreExportIdentityPrivateKey(uint8_t* out_priv, std::size_t len) = 0;
+    virtual bool meshCoreImportIdentityPrivateKey(const uint8_t* in_priv, std::size_t len) = 0;
+    virtual bool meshCoreSignPayload(const uint8_t* data, std::size_t len, uint8_t* out_sig, std::size_t out_len) = 0;
+    virtual bool meshCoreSendSelfAdvert(bool broadcast) = 0;
+    virtual bool meshCoreSendPeerRequestType(const uint8_t* pubkey,
+                                             std::size_t len,
+                                             uint8_t req_type,
+                                             uint32_t* out_tag,
+                                             uint32_t* out_est_timeout,
+                                             bool* out_sent_flood) = 0;
+    virtual bool meshCoreSendPeerRequestPayload(const uint8_t* pubkey,
+                                                std::size_t len,
+                                                const uint8_t* payload,
+                                                std::size_t payload_len,
+                                                bool force_flood,
+                                                uint32_t* out_tag,
+                                                uint32_t* out_est_timeout,
+                                                bool* out_sent_flood) = 0;
+    virtual bool meshCoreSendAnonRequestPayload(const uint8_t* pubkey,
+                                                std::size_t len,
+                                                const uint8_t* payload,
+                                                std::size_t payload_len,
+                                                uint32_t* out_est_timeout,
+                                                bool* out_sent_flood) = 0;
+    virtual bool meshCoreSendTracePath(const uint8_t* path,
+                                       std::size_t path_len,
+                                       uint32_t tag,
+                                       uint32_t auth,
+                                       uint8_t flags,
+                                       uint32_t* out_est_timeout) = 0;
+    virtual bool meshCoreSendControlData(const uint8_t* payload, std::size_t payload_len) = 0;
+    virtual bool meshCoreSendRawData(const uint8_t* path,
+                                     std::size_t path_len,
+                                     const uint8_t* payload,
+                                     std::size_t payload_len,
+                                     uint32_t* out_est_timeout) = 0;
+    virtual void meshCoreSetFloodScopeKey(const uint8_t* key, std::size_t len) = 0;
+};
+
+} // namespace phone
diff --git a/modules/core_phone/include/phone/common/phone_facade.h b/modules/core_phone/include/phone/common/phone_facade.h
new file mode 100644
index 00000000..ae306dd9
--- /dev/null
+++ b/modules/core_phone/include/phone/common/phone_facade.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+#include "phone/common/phone_result.h"
+
+namespace phone
+{
+
+struct TimeSyncFact
+{
+    bool valid = false;
+    std::uint64_t epoch_seconds = 0;
+    bool synced = false;
+};
+
+struct LocationFixView
+{
+    bool valid = false;
+    double lat = 0;
+    double lon = 0;
+    float altitude_m = 0;
+    std::uint8_t satellites = 0;
+};
+
+struct DeviceStatusView
+{
+    bool lora_ready = false;
+    bool gps_ready = false;
+    bool ble_ready = false;
+    bool time_synced = false;
+};
+
+struct ConfigSnapshotView
+{
+    std::uint8_t active_protocol = 0;
+    std::uint8_t region = 0;
+    std::uint8_t modem_preset = 0;
+};
+
+struct ConfigPatchView
+{
+    bool has_active_protocol = false;
+    std::uint8_t active_protocol = 0;
+    bool has_region = false;
+    std::uint8_t region = 0;
+    bool has_modem_preset = false;
+    std::uint8_t modem_preset = 0;
+};
+
+enum class AppCommandKind : std::uint8_t
+{
+    None = 0,
+    SendText,
+    ApplyConfig,
+    RequestConfig,
+    RequestNodeInfo,
+};
+
+struct AppCommandView
+{
+    AppCommandKind kind = AppCommandKind::None;
+    const std::uint8_t* payload = nullptr;
+    std::size_t payload_size = 0;
+};
+
+class IPhoneAppFacade
+{
+  public:
+    virtual ~IPhoneAppFacade() = default;
+
+    virtual PhoneResult getTime(TimeSyncFact& out) = 0;
+    virtual PhoneResult getLocation(LocationFixView& out) = 0;
+    virtual PhoneResult getDeviceStatus(DeviceStatusView& out) = 0;
+    virtual PhoneResult getConfig(ConfigSnapshotView& out) = 0;
+    virtual PhoneResult applyConfigPatch(const ConfigPatchView& patch) = 0;
+    virtual PhoneResult submitCommand(const AppCommandView& command) = 0;
+};
+
+} // namespace phone
diff --git a/modules/core_phone/include/phone/common/phone_io.h b/modules/core_phone/include/phone/common/phone_io.h
new file mode 100644
index 00000000..517bb95e
--- /dev/null
+++ b/modules/core_phone/include/phone/common/phone_io.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+#include "phone/common/phone_result.h"
+
+namespace phone
+{
+
+struct ByteView
+{
+    const std::uint8_t* data = nullptr;
+    std::size_t size = 0;
+};
+
+struct MutableBytes
+{
+    std::uint8_t* data = nullptr;
+    std::size_t capacity = 0;
+    std::size_t size = 0;
+};
+
+struct PhoneNotification
+{
+    PhoneProtocolKind protocol = PhoneProtocolKind::None;
+    const std::uint8_t* data = nullptr;
+    std::size_t size = 0;
+};
+
+} // namespace phone
diff --git a/modules/core_phone/include/phone/common/phone_result.h b/modules/core_phone/include/phone/common/phone_result.h
new file mode 100644
index 00000000..3f654b6c
--- /dev/null
+++ b/modules/core_phone/include/phone/common/phone_result.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <cstdint>
+
+namespace phone
+{
+
+enum class PhoneProtocolKind : std::uint8_t
+{
+    None = 0,
+    Meshtastic,
+    MeshCore,
+};
+
+enum class PhoneError : std::uint8_t
+{
+    None = 0,
+    InvalidFrame,
+    DecodeFailed,
+    UnsupportedCommand,
+    AppCommandRejected,
+    BufferTooSmall,
+    NotReady,
+};
+
+struct PhoneResult
+{
+    bool ok = false;
+    PhoneError error = PhoneError::None;
+
+    static PhoneResult success()
+    {
+        return PhoneResult{true, PhoneError::None};
+    }
+
+    static PhoneResult fail(PhoneError error)
+    {
+        return PhoneResult{false, error};
+    }
+};
+
+} // namespace phone
diff --git a/modules/core_phone/include/phone/common/phone_runtime_context.h b/modules/core_phone/include/phone/common/phone_runtime_context.h
new file mode 100644
index 00000000..77e57cf2
--- /dev/null
+++ b/modules/core_phone/include/phone/common/phone_runtime_context.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "phone/common/phone_app_facade.h"
+
+namespace phone
+{
+
+using IPhoneRuntimeContext = IPhoneAppFacade;
+
+} // namespace phone
diff --git a/modules/core_phone/include/phone/meshcore/meshcore_phone_core.h b/modules/core_phone/include/phone/meshcore/meshcore_phone_core.h
new file mode 100644
index 00000000..fc691a71
--- /dev/null
+++ b/modules/core_phone/include/phone/meshcore/meshcore_phone_core.h
@@ -0,0 +1,155 @@
+#pragma once
+
+#include "chat/domain/chat_types.h"
+#include "phone/common/phone_app_facade.h"
+
+#include <array>
+#include <cstdint>
+#include <deque>
+#include <string>
+#include <vector>
+
+namespace chat
+{
+namespace contacts
+{
+struct NodeEntry;
+}
+} // namespace chat
+
+namespace phone::meshcore
+{
+
+struct MeshCoreBleFrame
+{
+    size_t len = 0;
+    std::array<uint8_t, 172> buf{};
+};
+
+struct MeshCorePhoneBatteryInfo
+{
+    uint8_t level = 0;
+    uint16_t millivolts = 0;
+};
+
+struct MeshCorePhoneLocation
+{
+    int32_t lat_i6 = 0;
+    int32_t lon_i6 = 0;
+};
+
+struct MeshCorePhoneRadioStats
+{
+    int16_t noise_floor_dbm = 0;
+    int8_t last_rssi_dbm = 0;
+    int8_t last_snr_qdb = 0;
+    uint32_t tx_air_seconds = 0;
+    uint32_t rx_air_seconds = 0;
+};
+
+struct MeshCorePhonePacketStats
+{
+    uint32_t rx_packets = 0;
+    uint32_t tx_packets = 0;
+    uint32_t tx_flood = 0;
+    uint32_t tx_direct = 0;
+    uint32_t rx_flood = 0;
+    uint32_t rx_direct = 0;
+};
+
+struct MeshCorePhoneTuningParams
+{
+    uint32_t rx_delay_base_ms = 0;
+    uint32_t airtime_factor_milli = 0;
+};
+
+class MeshCorePhoneHooks
+{
+  public:
+    virtual ~MeshCorePhoneHooks() = default;
+    virtual uint32_t getReportedBlePin() const { return 0; }
+    virtual MeshCorePhoneBatteryInfo getBatteryInfo() const { return {}; }
+    virtual MeshCorePhoneLocation getAdvertLocation() const { return {}; }
+    virtual uint8_t getAdvertLocationPolicy() const { return 0; }
+    virtual uint8_t getTelemetryModeBits() const { return 0; }
+    virtual bool getManualAddContacts() const { return false; }
+    virtual bool resolvePeerPublicKey(const uint8_t* in_pubkey, size_t in_len,
+                                      uint8_t* out_pubkey, size_t out_len) const
+    {
+        if (!in_pubkey || !out_pubkey || out_len == 0)
+        {
+            return false;
+        }
+        const size_t copy_len = (in_len < out_len) ? in_len : out_len;
+        for (size_t i = 0; i < copy_len; ++i)
+        {
+            out_pubkey[i] = in_pubkey[i];
+        }
+        for (size_t i = copy_len; i < out_len; ++i)
+        {
+            out_pubkey[i] = 0;
+        }
+        return true;
+    }
+    virtual void onPendingBinaryRequest(uint32_t) {}
+    virtual void onPendingTelemetryRequest(uint32_t) {}
+    virtual void onPendingPathDiscoveryRequest(uint32_t) {}
+    virtual void onSentRoute(bool) {}
+    virtual bool lookupAdvertPath(const uint8_t*, size_t, uint32_t*, uint8_t*, size_t*) const { return false; }
+    virtual bool hasActiveConnection(const uint8_t*, size_t) const { return false; }
+    virtual void logoutActiveConnection(const uint8_t*, size_t) {}
+    virtual bool getRadioStats(MeshCorePhoneRadioStats*) const { return false; }
+    virtual bool getPacketStats(MeshCorePhonePacketStats*) const { return false; }
+    virtual bool setAdvertLocation(int32_t, int32_t) { return false; }
+    virtual bool upsertContactFromFrame(const uint8_t*, size_t) { return false; }
+    virtual bool removeContact(const uint8_t*, size_t) { return false; }
+    virtual bool exportContact(const uint8_t*, size_t, uint8_t*, size_t*) const { return false; }
+    virtual bool importContact(const uint8_t*, size_t) { return false; }
+    virtual bool shareContact(const uint8_t*, size_t) { return false; }
+    virtual bool popOfflineMessage(uint8_t*, size_t*) { return false; }
+    virtual bool setTuningParams(const MeshCorePhoneTuningParams&) { return false; }
+    virtual bool getTuningParams(MeshCorePhoneTuningParams*) const { return false; }
+    virtual bool setOtherParams(uint8_t, uint8_t, bool, uint8_t, uint8_t) { return false; }
+    virtual bool setDevicePin(uint32_t) { return false; }
+    virtual bool getCustomVars(std::string*) const { return false; }
+    virtual bool setCustomVar(const char*, const char*) { return false; }
+    virtual void onFactoryReset() {}
+};
+
+class MeshCorePhoneCore
+{
+  public:
+    MeshCorePhoneCore(IPhoneAppFacade& app, const std::string& device_name,
+                      MeshCorePhoneHooks* hooks = nullptr);
+
+    void reset();
+    void pumpIncomingAppData();
+    void onIncomingText(const chat::MeshIncomingText& msg);
+    bool handleRxFrame(const uint8_t* data, size_t len);
+    bool popTxFrame(uint8_t* out, size_t* out_len);
+    bool canHandleCommand(uint8_t cmd) const;
+
+  private:
+    void handleCmdFrame(const uint8_t* data, size_t len);
+    void enqueueFrame(const uint8_t* data, size_t len);
+    void enqueueSentOk();
+    void enqueueErr(uint8_t err);
+    void enqueueRawDataPush(const chat::MeshIncomingData& msg);
+    uint32_t resolveNodeIdFromPrefix(const uint8_t* prefix, size_t len) const;
+    bool buildContactFromNode(const PhoneNodeView& entry, uint8_t code, MeshCoreBleFrame& out) const;
+
+    IPhoneAppFacade& app_;
+    std::string device_name_;
+    MeshCorePhoneHooks* hooks_ = nullptr;
+    std::deque<MeshCoreBleFrame> tx_queue_;
+    std::vector<uint8_t> sign_data_;
+    bool sign_active_ = false;
+    uint32_t stats_rx_packets_ = 0;
+    uint32_t stats_tx_packets_ = 0;
+    uint32_t stats_tx_flood_ = 0;
+    uint32_t stats_tx_direct_ = 0;
+    uint32_t stats_rx_flood_ = 0;
+    uint32_t stats_rx_direct_ = 0;
+};
+
+} // namespace phone::meshcore
diff --git a/modules/core_phone/include/phone/meshtastic/meshtastic_defaults.h b/modules/core_phone/include/phone/meshtastic/meshtastic_defaults.h
new file mode 100644
index 00000000..c8672afc
--- /dev/null
+++ b/modules/core_phone/include/phone/meshtastic/meshtastic_defaults.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <cstdint>
+
+namespace phone::meshtastic::defaults
+{
+
+constexpr uint32_t kConfigNonceOnlyConfig = 69420U;
+constexpr uint32_t kConfigNonceOnlyNodes = 69421U;
+constexpr uint8_t kMaxMeshtasticChannels = 8U;
+constexpr uint32_t kOfficialMinAppVersion = 30200U;
+constexpr uint32_t kOfficialDeviceStateVersion = 24U;
+constexpr const char* kCompatFirmwareVersion = "2.7.4.0";
+constexpr uint32_t kModuleConfigVersion = 1U;
+
+constexpr const char* kDefaultMqttAddress = "mqtt.meshtastic.org";
+constexpr const char* kDefaultMqttUsername = "meshdev";
+constexpr const char* kDefaultMqttPassword = "large4cats";
+constexpr const char* kDefaultMqttRoot = "msh";
+constexpr bool kDefaultMqttEncryptionEnabled = true;
+constexpr bool kDefaultMqttTlsEnabled = false;
+constexpr uint32_t kDefaultMapPublishIntervalSecs = 60U * 60U;
+constexpr uint32_t kDefaultDetectionMinBroadcastSecs = 45U;
+constexpr uint32_t kDefaultAmbientCurrent = 10U;
+
+} // namespace phone::meshtastic::defaults
diff --git a/modules/core_phone/include/phone/meshtastic/meshtastic_phone_config_bridge.h b/modules/core_phone/include/phone/meshtastic/meshtastic_phone_config_bridge.h
new file mode 100644
index 00000000..8aaaa75e
--- /dev/null
+++ b/modules/core_phone/include/phone/meshtastic/meshtastic_phone_config_bridge.h
@@ -0,0 +1,250 @@
+#pragma once
+
+#include "meshtastic/config.pb.h"
+#include "meshtastic/connection_status.pb.h"
+#include "meshtastic/localonly.pb.h"
+#include "meshtastic/mesh.pb.h"
+#include "phone/meshtastic/meshtastic_defaults.h"
+
+#include <cstdint>
+#include <cstring>
+
+namespace phone::meshtastic::config_bridge
+{
+
+struct PersistedState
+{
+    bool has_bluetooth = false;
+    bool has_module = false;
+    meshtastic_Config_BluetoothConfig bluetooth = meshtastic_Config_BluetoothConfig_init_zero;
+    meshtastic_LocalModuleConfig module = meshtastic_LocalModuleConfig_init_zero;
+};
+
+inline bool isValidBluetoothMode(uint8_t mode)
+{
+    return mode <= static_cast<uint8_t>(meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN);
+}
+
+inline bool isValidBlePin(uint32_t pin)
+{
+    return pin == 0 || (pin >= 100000U && pin <= 999999U);
+}
+
+inline void copyBounded(char* dst, size_t dst_len, const char* src)
+{
+    if (!dst || dst_len == 0)
+    {
+        return;
+    }
+    if (!src)
+    {
+        dst[0] = '\0';
+        return;
+    }
+    std::strncpy(dst, src, dst_len - 1);
+    dst[dst_len - 1] = '\0';
+}
+
+inline void normalizeBluetoothConfig(meshtastic_Config_BluetoothConfig* config)
+{
+    if (!config)
+    {
+        return;
+    }
+    if (!isValidBluetoothMode(static_cast<uint8_t>(config->mode)))
+    {
+        config->mode = meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN;
+    }
+    if (!isValidBlePin(config->fixed_pin) ||
+        config->mode == meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN)
+    {
+        config->fixed_pin = 0;
+    }
+}
+
+inline bool loadBluetoothConfigView(const meshtastic_Config_BluetoothConfig& stored,
+                                    bool runtime_enabled,
+                                    meshtastic_Config_BluetoothConfig* out)
+{
+    if (!out)
+    {
+        return false;
+    }
+    *out = stored;
+    normalizeBluetoothConfig(out);
+    out->enabled = runtime_enabled;
+    return true;
+}
+
+inline uint32_t resolveBlePasskey(const meshtastic_Config_BluetoothConfig& config, uint32_t pending_passkey)
+{
+    if (pending_passkey != 0)
+    {
+        return pending_passkey;
+    }
+    if (config.mode == meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN)
+    {
+        return config.fixed_pin;
+    }
+    return 0;
+}
+
+inline bool fillDeviceConnectionStatus(uint32_t passkey,
+                                       bool is_connected,
+                                       meshtastic_DeviceConnectionStatus* out)
+{
+    if (!out)
+    {
+        return false;
+    }
+
+    meshtastic_DeviceConnectionStatus status = meshtastic_DeviceConnectionStatus_init_zero;
+    *out = status;
+    out->has_bluetooth = true;
+    out->bluetooth.pin = passkey;
+    out->bluetooth.rssi = 0;
+    out->bluetooth.is_connected = is_connected;
+    return true;
+}
+
+inline void repairLegacyMqttConfig(meshtastic_LocalModuleConfig* config)
+{
+    if (!config)
+    {
+        return;
+    }
+
+    config->has_mqtt = true;
+    config->mqtt.address[sizeof(config->mqtt.address) - 1] = '\0';
+    config->mqtt.username[sizeof(config->mqtt.username) - 1] = '\0';
+    config->mqtt.password[sizeof(config->mqtt.password) - 1] = '\0';
+    config->mqtt.root[sizeof(config->mqtt.root) - 1] = '\0';
+    if (config->mqtt.address[0] == '\0')
+    {
+        copyBounded(config->mqtt.address, sizeof(config->mqtt.address), defaults::kDefaultMqttAddress);
+    }
+    if (config->mqtt.username[0] == '\0')
+    {
+        copyBounded(config->mqtt.username, sizeof(config->mqtt.username), defaults::kDefaultMqttUsername);
+    }
+    if (config->mqtt.password[0] == '\0')
+    {
+        copyBounded(config->mqtt.password, sizeof(config->mqtt.password), defaults::kDefaultMqttPassword);
+    }
+    if (config->mqtt.root[0] == '\0')
+    {
+        copyBounded(config->mqtt.root, sizeof(config->mqtt.root), defaults::kDefaultMqttRoot);
+    }
+    if (!config->mqtt.has_map_report_settings)
+    {
+        config->mqtt.has_map_report_settings = true;
+        config->mqtt.map_report_settings.publish_interval_secs = defaults::kDefaultMapPublishIntervalSecs;
+        config->mqtt.map_report_settings.position_precision = 0;
+        config->mqtt.map_report_settings.should_report_location = false;
+    }
+}
+
+inline void initDefaultModuleConfig(meshtastic_LocalModuleConfig* config, uint32_t self_node)
+{
+    if (!config)
+    {
+        return;
+    }
+
+    meshtastic_LocalModuleConfig zero = meshtastic_LocalModuleConfig_init_zero;
+    *config = zero;
+    config->version = defaults::kModuleConfigVersion;
+    config->has_mqtt = true;
+    config->has_serial = true;
+    config->has_external_notification = true;
+    config->has_store_forward = true;
+    config->has_range_test = true;
+    config->has_telemetry = true;
+    config->has_canned_message = true;
+    config->has_audio = true;
+    config->has_remote_hardware = true;
+    config->has_neighbor_info = true;
+    config->has_ambient_lighting = true;
+    config->has_detection_sensor = true;
+    config->has_paxcounter = true;
+
+    copyBounded(config->mqtt.address, sizeof(config->mqtt.address), defaults::kDefaultMqttAddress);
+    copyBounded(config->mqtt.username, sizeof(config->mqtt.username), defaults::kDefaultMqttUsername);
+    copyBounded(config->mqtt.password, sizeof(config->mqtt.password), defaults::kDefaultMqttPassword);
+    copyBounded(config->mqtt.root, sizeof(config->mqtt.root), defaults::kDefaultMqttRoot);
+    config->mqtt.enabled = false;
+    config->mqtt.proxy_to_client_enabled = false;
+    config->mqtt.encryption_enabled = defaults::kDefaultMqttEncryptionEnabled;
+    config->mqtt.tls_enabled = defaults::kDefaultMqttTlsEnabled;
+    config->mqtt.has_map_report_settings = true;
+    config->mqtt.map_report_settings.publish_interval_secs = defaults::kDefaultMapPublishIntervalSecs;
+    config->mqtt.map_report_settings.position_precision = 0;
+    config->mqtt.map_report_settings.should_report_location = false;
+
+    config->telemetry.device_update_interval = 3600;
+    config->telemetry.device_telemetry_enabled = true;
+    config->telemetry.environment_update_interval = 0;
+    config->telemetry.environment_measurement_enabled = false;
+    config->telemetry.power_update_interval = 0;
+    config->telemetry.health_update_interval = 0;
+    config->telemetry.air_quality_interval = 0;
+
+    config->neighbor_info.enabled = false;
+    config->neighbor_info.update_interval = 0;
+    config->neighbor_info.transmit_over_lora = false;
+
+    config->detection_sensor.enabled = false;
+    config->detection_sensor.detection_trigger_type =
+        meshtastic_ModuleConfig_DetectionSensorConfig_TriggerType_LOGIC_HIGH;
+    config->detection_sensor.minimum_broadcast_secs = defaults::kDefaultDetectionMinBroadcastSecs;
+
+    config->ambient_lighting.current = defaults::kDefaultAmbientCurrent;
+    config->ambient_lighting.red = (self_node >> 16) & 0xFFU;
+    config->ambient_lighting.green = (self_node >> 8) & 0xFFU;
+    config->ambient_lighting.blue = self_node & 0xFFU;
+}
+
+inline void normalizeModuleConfig(meshtastic_LocalModuleConfig* config)
+{
+    if (!config)
+    {
+        return;
+    }
+    if (config->version == 0)
+    {
+        config->version = defaults::kModuleConfigVersion;
+    }
+    repairLegacyMqttConfig(config);
+}
+
+inline void initializeConfigState(const PersistedState& persisted,
+                                  bool default_enabled,
+                                  uint32_t self_node,
+                                  meshtastic_Config_BluetoothConfig* out_bluetooth,
+                                  meshtastic_LocalModuleConfig* out_module)
+{
+    if (out_bluetooth)
+    {
+        *out_bluetooth = meshtastic_Config_BluetoothConfig_init_zero;
+        out_bluetooth->enabled = default_enabled;
+        out_bluetooth->mode = meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN;
+        out_bluetooth->fixed_pin = 0;
+        if (persisted.has_bluetooth)
+        {
+            *out_bluetooth = persisted.bluetooth;
+        }
+        normalizeBluetoothConfig(out_bluetooth);
+    }
+
+    if (out_module)
+    {
+        initDefaultModuleConfig(out_module, self_node);
+        if (persisted.has_module)
+        {
+            *out_module = persisted.module;
+            normalizeModuleConfig(out_module);
+        }
+    }
+}
+
+} // namespace phone::meshtastic::config_bridge
diff --git a/modules/core_phone/include/phone/meshtastic/meshtastic_phone_core.h b/modules/core_phone/include/phone/meshtastic/meshtastic_phone_core.h
new file mode 100644
index 00000000..0ab82f00
--- /dev/null
+++ b/modules/core_phone/include/phone/meshtastic/meshtastic_phone_core.h
@@ -0,0 +1,231 @@
+#pragma once
+
+#include "chat/domain/chat_types.h"
+#include "meshtastic/admin.pb.h"
+#include "meshtastic/channel.pb.h"
+#include "meshtastic/config.pb.h"
+#include "meshtastic/connection_status.pb.h"
+#include "meshtastic/device_ui.pb.h"
+#include "meshtastic/localonly.pb.h"
+#include "meshtastic/mesh.pb.h"
+#include "meshtastic/module_config.pb.h"
+#include "meshtastic/telemetry.pb.h"
+#include "phone/common/phone_app_facade.h"
+
+#include <deque>
+
+namespace phone::meshtastic
+{
+
+struct MeshtasticBleFrame
+{
+    size_t len = 0;
+    uint32_t from_num = 0;
+    uint8_t buf[meshtastic_FromRadio_size] = {};
+};
+
+struct MeshtasticGpsFix
+{
+    bool valid = false;
+    double lat = 0.0;
+    double lng = 0.0;
+    bool has_alt = false;
+    double alt_m = 0.0;
+    bool has_speed = false;
+    double speed_mps = 0.0;
+    bool has_course = false;
+    double course_deg = 0.0;
+    uint8_t satellites = 0;
+};
+
+class MeshtasticPhoneTransport
+{
+  public:
+    virtual ~MeshtasticPhoneTransport() = default;
+    virtual bool isBleConnected() const = 0;
+    virtual void notifyFromNum(uint32_t from_num) = 0;
+};
+
+class MeshtasticPhoneBluetoothConfigHooks
+{
+  public:
+    virtual ~MeshtasticPhoneBluetoothConfigHooks() = default;
+    virtual bool loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const
+    {
+        (void)out;
+        return false;
+    }
+    virtual void saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config)
+    {
+        (void)config;
+    }
+};
+
+class MeshtasticPhoneModuleConfigHooks
+{
+  public:
+    virtual ~MeshtasticPhoneModuleConfigHooks() = default;
+    virtual bool loadModuleConfig(meshtastic_LocalModuleConfig* out) const
+    {
+        (void)out;
+        return false;
+    }
+    virtual void saveModuleConfig(const meshtastic_LocalModuleConfig& config)
+    {
+        (void)config;
+    }
+};
+
+class MeshtasticPhoneConfigLifecycleHooks
+{
+  public:
+    virtual ~MeshtasticPhoneConfigLifecycleHooks() = default;
+    virtual void onConfigStart() {}
+    virtual void onConfigComplete() {}
+};
+
+class MeshtasticPhoneStatusHooks
+{
+  public:
+    virtual ~MeshtasticPhoneStatusHooks() = default;
+    virtual bool loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const
+    {
+        (void)out;
+        return false;
+    }
+};
+
+class MeshtasticPhoneMqttHooks
+{
+  public:
+    virtual ~MeshtasticPhoneMqttHooks() = default;
+    virtual bool handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg)
+    {
+        (void)msg;
+        return false;
+    }
+    virtual bool pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out)
+    {
+        (void)out;
+        return false;
+    }
+};
+
+class MeshtasticPhoneDeviceRuntimeHooks
+{
+  public:
+    virtual ~MeshtasticPhoneDeviceRuntimeHooks() = default;
+    virtual bool loadTimezoneTzdef(char* out, size_t out_len) const
+    {
+        (void)out;
+        (void)out_len;
+        return false;
+    }
+    virtual void saveTimezoneTzdef(const char* tzdef)
+    {
+        (void)tzdef;
+    }
+    virtual int getTimezoneOffsetMinutes() const
+    {
+        return 0;
+    }
+    virtual void setTimezoneOffsetMinutes(int offset_min)
+    {
+        (void)offset_min;
+    }
+    virtual bool getGpsFix(MeshtasticGpsFix* out) const
+    {
+        if (!out)
+        {
+            return false;
+        }
+        *out = {};
+        return false;
+    }
+};
+
+class MeshtasticPhoneCore
+{
+  public:
+    MeshtasticPhoneCore(IPhoneAppFacade& app, MeshtasticPhoneTransport& transport,
+                        MeshtasticPhoneBluetoothConfigHooks* bluetooth_config_hooks = nullptr,
+                        MeshtasticPhoneModuleConfigHooks* module_config_hooks = nullptr,
+                        MeshtasticPhoneConfigLifecycleHooks* config_lifecycle_hooks = nullptr,
+                        MeshtasticPhoneStatusHooks* status_hooks = nullptr,
+                        MeshtasticPhoneMqttHooks* mqtt_hooks = nullptr,
+                        MeshtasticPhoneDeviceRuntimeHooks* device_runtime_hooks = nullptr);
+
+    void reset();
+    void pumpIncomingAppData();
+    void onIncomingText(const chat::MeshIncomingText& msg);
+    void onIncomingData(const chat::MeshIncomingData& msg);
+    bool handleToRadio(const uint8_t* data, size_t len);
+    bool popToPhone(MeshtasticBleFrame* out);
+    bool isSendingPackets() const;
+    bool isConfigFlowActive() const;
+
+  private:
+    bool handleToRadioPacket(meshtastic_MeshPacket& packet);
+    bool handleAdmin(meshtastic_MeshPacket& packet);
+    bool handleLocalSelfPacket(meshtastic_MeshPacket& packet);
+    bool encodeFromRadio(const meshtastic_FromRadio& from, uint32_t from_num, MeshtasticBleFrame* out) const;
+    bool popConfigSnapshotFrame(MeshtasticBleFrame* out);
+    void enqueueQueueStatus(uint32_t packet_id, bool ok);
+    void enqueueConfigSnapshot(uint32_t config_nonce);
+    void enqueueFromRadio(const meshtastic_FromRadio& from, uint32_t from_num);
+    void notifyFromNum(uint32_t from_num);
+    void fillMyInfo(meshtastic_MyNodeInfo* out) const;
+    void fillSelfNodeInfo(meshtastic_NodeInfo* out) const;
+    void fillNodeInfoFromEntry(const PhoneNodeView& entry, meshtastic_NodeInfo* out) const;
+    void fillMetadata(meshtastic_DeviceMetadata* out) const;
+    void fillDeviceUi(meshtastic_DeviceUIConfig* out) const;
+    void fillChannel(uint8_t idx, meshtastic_Channel* out) const;
+    void fillConfig(meshtastic_AdminMessage_ConfigType type, meshtastic_Config* out) const;
+    void fillModuleConfig(meshtastic_AdminMessage_ModuleConfigType type, meshtastic_ModuleConfig* out) const;
+    meshtastic_MyNodeInfo buildMyInfo() const;
+    meshtastic_NodeInfo buildSelfNodeInfo() const;
+    meshtastic_NodeInfo buildNodeInfoFromEntry(const PhoneNodeView& entry) const;
+    meshtastic_DeviceMetadata buildMetadata() const;
+    meshtastic_DeviceMetrics buildDeviceMetrics() const;
+    meshtastic_LocalStats buildLocalStats() const;
+    meshtastic_DeviceUIConfig buildDeviceUi() const;
+    meshtastic_Channel buildChannel(uint8_t idx) const;
+    meshtastic_Config buildConfig(meshtastic_AdminMessage_ConfigType type) const;
+    meshtastic_ModuleConfig buildModuleConfig(meshtastic_AdminMessage_ModuleConfigType type) const;
+    meshtastic_MeshPacket buildPacketFromText(const chat::MeshIncomingText& msg) const;
+    meshtastic_MeshPacket buildPacketFromData(const chat::MeshIncomingData& msg) const;
+
+    IPhoneAppFacade& app_;
+    MeshtasticPhoneTransport& transport_;
+    MeshtasticPhoneBluetoothConfigHooks* bluetooth_config_hooks_ = nullptr;
+    MeshtasticPhoneModuleConfigHooks* module_config_hooks_ = nullptr;
+    MeshtasticPhoneConfigLifecycleHooks* config_lifecycle_hooks_ = nullptr;
+    MeshtasticPhoneStatusHooks* status_hooks_ = nullptr;
+    MeshtasticPhoneMqttHooks* mqtt_hooks_ = nullptr;
+    MeshtasticPhoneDeviceRuntimeHooks* device_runtime_hooks_ = nullptr;
+    uint32_t config_nonce_ = 0;
+    size_t config_node_index_ = 0;
+    uint8_t config_channel_index_ = 0;
+    uint8_t config_type_index_ = 0;
+    uint8_t config_module_type_index_ = 0;
+    uint32_t config_request_seq_ = 0;
+    uint8_t last_to_radio_[meshtastic_ToRadio_size] = {};
+    size_t last_to_radio_len_ = 0;
+    bool config_flow_active_ = false;
+    bool config_drain_empty_pending_ = false;
+    std::deque<MeshtasticBleFrame> frame_queue_;
+    std::deque<meshtastic_QueueStatus> queue_status_queue_;
+    std::deque<meshtastic_MeshPacket> packet_queue_;
+    meshtastic_Config_BluetoothConfig bluetooth_config_ = meshtastic_Config_BluetoothConfig_init_zero;
+    meshtastic_LocalModuleConfig module_config_ = meshtastic_LocalModuleConfig_init_zero;
+    char admin_canned_messages_[160] = {};
+    char admin_ringtone_[96] = {};
+    meshtastic_ToRadio to_radio_scratch_ = meshtastic_ToRadio_init_zero;
+    meshtastic_AdminMessage admin_req_scratch_ = meshtastic_AdminMessage_init_zero;
+    meshtastic_AdminMessage admin_resp_scratch_ = meshtastic_AdminMessage_init_zero;
+    meshtastic_MeshPacket reply_packet_scratch_ = meshtastic_MeshPacket_init_zero;
+    meshtastic_MqttClientProxyMessage mqtt_proxy_scratch_ = meshtastic_MqttClientProxyMessage_init_zero;
+    meshtastic_FromRadio from_radio_scratch_ = meshtastic_FromRadio_init_zero;
+};
+
+} // namespace phone::meshtastic
diff --git a/modules/core_phone/include/phone/meshtastic/meshtastic_phone_session.h b/modules/core_phone/include/phone/meshtastic/meshtastic_phone_session.h
new file mode 100644
index 00000000..d8bd72b6
--- /dev/null
+++ b/modules/core_phone/include/phone/meshtastic/meshtastic_phone_session.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "phone/meshtastic/meshtastic_phone_core.h"
+
+namespace phone::meshtastic
+{
+
+class MeshtasticPhoneSession
+{
+  public:
+    MeshtasticPhoneSession(IPhoneAppFacade& app,
+                           MeshtasticPhoneTransport& transport,
+                           MeshtasticPhoneBluetoothConfigHooks* bluetooth_config_hooks,
+                           MeshtasticPhoneModuleConfigHooks* module_config_hooks,
+                           MeshtasticPhoneConfigLifecycleHooks* config_lifecycle_hooks,
+                           MeshtasticPhoneStatusHooks* status_hooks,
+                           MeshtasticPhoneMqttHooks* mqtt_hooks,
+                           MeshtasticPhoneDeviceRuntimeHooks* device_runtime_hooks);
+
+    void close();
+    void pumpIncomingAppData();
+    bool isSendingPackets() const;
+    bool isConfigFlowActive() const;
+    bool handleToRadio(const uint8_t* buf, size_t len);
+    bool popToPhone(MeshtasticBleFrame* out);
+    void onIncomingText(const chat::MeshIncomingText& msg);
+    void onIncomingData(const chat::MeshIncomingData& msg);
+
+  private:
+    MeshtasticPhoneCore core_;
+};
+
+} // namespace phone::meshtastic
diff --git a/modules/core_phone/library.json b/modules/core_phone/library.json
new file mode 100644
index 00000000..b24e84a8
--- /dev/null
+++ b/modules/core_phone/library.json
@@ -0,0 +1,23 @@
+{
+  "name": "core_phone",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../core_sys/include",
+      "-I../core_chat/include",
+      "-I../core_chat/generated",
+      "-I../core_chat/third_party/nanopb"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_chat"
+    },
+    {
+      "name": "core_sys"
+    }
+  ]
+}
+
diff --git a/modules/core_chat/src/ble/meshcore_phone_core.cpp b/modules/core_phone/src/meshcore/meshcore_phone_core.cpp
similarity index 84%
rename from modules/core_chat/src/ble/meshcore_phone_core.cpp
rename to modules/core_phone/src/meshcore/meshcore_phone_core.cpp
index 49c8725b..9eac42f1 100644
--- a/modules/core_chat/src/ble/meshcore_phone_core.cpp
+++ b/modules/core_phone/src/meshcore/meshcore_phone_core.cpp
@@ -1,16 +1,13 @@
-#include "chat/ble/meshcore_phone_core.h"
+#include "phone/meshcore/meshcore_phone_core.h"
 
-#include "chat/infra/meshcore/meshcore_ble_backend.h"
-#include "chat/ports/i_mesh_adapter.h"
-#include "chat/ports/i_node_store.h"
-#include "chat/usecase/chat_service.h"
+#include "chat/infra/meshcore/meshcore_identity_crypto.h"
 #include "sys/clock.h"
 
 #include <algorithm>
 #include <cstdio>
 #include <cstring>
 
-namespace ble
+namespace phone::meshcore
 {
 namespace
 {
@@ -132,26 +129,10 @@ uint32_t nowSeconds()
     return sys::epoch_seconds_now();
 }
 
-chat::meshcore::IMeshCoreBleBackend* resolveMeshCoreAdapter(IPhoneRuntimeContext& ctx)
-{
-    auto* adapter = ctx.getMeshAdapter();
-    if (!adapter || ctx.getMeshCorePhoneConfig().active_protocol != chat::MeshProtocol::MeshCore)
-    {
-        return nullptr;
-    }
-
-    if (auto* backend = adapter->backendForProtocol(chat::MeshProtocol::MeshCore))
-    {
-        return backend->asMeshCoreBleBackend();
-    }
-
-    return adapter->asMeshCoreBleBackend();
-}
-
 } // namespace
 
-MeshCorePhoneCore::MeshCorePhoneCore(IPhoneRuntimeContext& ctx, const std::string& device_name, MeshCorePhoneHooks* hooks)
-    : ctx_(ctx), device_name_(device_name), hooks_(hooks) {}
+MeshCorePhoneCore::MeshCorePhoneCore(IPhoneAppFacade& app, const std::string& device_name, MeshCorePhoneHooks* hooks)
+    : app_(app), device_name_(device_name), hooks_(hooks) {}
 
 void MeshCorePhoneCore::reset()
 {
@@ -292,16 +273,10 @@ bool MeshCorePhoneCore::canHandleCommand(uint8_t cmd) const
 
 void MeshCorePhoneCore::pumpIncomingAppData()
 {
-    chat::IMeshAdapter* adapter = ctx_.getMeshAdapter();
-    if (!adapter)
-    {
-        return;
-    }
-
     for (uint8_t count = 0; count < 4; ++count)
     {
         chat::MeshIncomingData msg{};
-        if (!adapter->pollIncomingData(&msg))
+        if (!app_.pollIncomingPhoneData(msg))
         {
             break;
         }
@@ -312,9 +287,7 @@ void MeshCorePhoneCore::pumpIncomingAppData()
 void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 {
     const uint8_t cmd = data[0];
-    chat::IMeshAdapter* adapter = ctx_.getMeshAdapter();
-    auto cfg = ctx_.getMeshCorePhoneConfig();
-    auto* backend = resolveMeshCoreAdapter(ctx_);
+    auto cfg = app_.getMeshCorePhoneConfig();
 
     if (cmd == CMD_DEVICE_QEURY && len >= 2)
     {
@@ -348,10 +321,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         out[index++] = static_cast<uint8_t>(cfg.tx_power_max_dbm);
 
         uint8_t pubkey[chat::meshcore::kMeshCorePubKeySize] = {};
-        if (backend)
-        {
-            backend->exportIdentityPublicKey(pubkey);
-        }
+        app_.meshCoreExportIdentityPublicKey(pubkey, sizeof(pubkey));
         std::memcpy(&out[index], pubkey, sizeof(pubkey));
         index += sizeof(pubkey);
 
@@ -379,7 +349,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
         char long_name[32] = {};
         char short_name[16] = {};
-        ctx_.getEffectiveUserInfo(long_name, sizeof(long_name), short_name, sizeof(short_name));
+        app_.getEffectiveUserInfo(long_name, sizeof(long_name), short_name, sizeof(short_name));
 
         const char* display_name = long_name[0] != '\0' ? long_name : short_name;
         const size_t name_len = strnlen(display_name, long_name[0] != '\0' ? sizeof(long_name)
@@ -403,20 +373,22 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         }
 
         uint32_t total = 0;
-        if (const auto* store = ctx_.getNodeStore())
+        PhoneNodeView entry{};
+        for (size_t node_index = 0; node_index < app_.phoneNodeCount(); ++node_index)
         {
-            for (const auto& entry : store->getEntries())
+            if (!app_.getPhoneNodeByIndex(node_index, entry))
             {
-                if (entry.node_id == 0)
-                {
-                    continue;
-                }
-                if (filter_since != 0 && entry.last_seen <= filter_since)
-                {
-                    continue;
-                }
-                ++total;
+                continue;
             }
+            if (entry.node_id == 0)
+            {
+                continue;
+            }
+            if (filter_since != 0 && entry.last_seen <= filter_since)
+            {
+                continue;
+            }
+            ++total;
         }
 
         uint8_t start_buf[5] = {RESP_CODE_CONTACTS_START, 0, 0, 0, 0};
@@ -424,24 +396,25 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         enqueueFrame(start_buf, sizeof(start_buf));
 
         uint32_t most_recent = 0;
-        if (const auto* store = ctx_.getNodeStore())
+        for (size_t node_index = 0; node_index < app_.phoneNodeCount(); ++node_index)
         {
-            for (const auto& entry : store->getEntries())
+            if (!app_.getPhoneNodeByIndex(node_index, entry))
             {
-                if (entry.node_id == 0)
-                {
-                    continue;
-                }
-                if (filter_since != 0 && entry.last_seen <= filter_since)
-                {
-                    continue;
-                }
-                MeshCoreBleFrame frame{};
-                if (buildContactFromNode(entry, RESP_CODE_CONTACT, frame))
-                {
-                    enqueueFrame(frame.buf.data(), frame.len);
-                    most_recent = std::max(most_recent, entry.last_seen);
-                }
+                continue;
+            }
+            if (entry.node_id == 0)
+            {
+                continue;
+            }
+            if (filter_since != 0 && entry.last_seen <= filter_since)
+            {
+                continue;
+            }
+            MeshCoreBleFrame frame{};
+            if (buildContactFromNode(entry, RESP_CODE_CONTACT, frame))
+            {
+                enqueueFrame(frame.buf.data(), frame.len);
+                most_recent = std::max(most_recent, entry.last_seen);
             }
         }
 
@@ -453,11 +426,6 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SEND_TXT_MSG && len >= 14)
     {
-        if (!adapter)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         size_t index = 1;
         const uint8_t txt_type = data[index++];
         index++;
@@ -479,7 +447,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
         const std::string text(reinterpret_cast<const char*>(&data[index]), len - index);
         chat::MessageId msg_id = 0;
-        if (!adapter->sendText(chat::ChannelId::PRIMARY, text, &msg_id, dest))
+        if (!app_.sendPhoneText(chat::ChannelId::PRIMARY, text, 0, dest, msg_id))
         {
             enqueueErr(ERR_CODE_BAD_STATE);
             return;
@@ -500,11 +468,6 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SEND_CHANNEL_TXT_MSG && len >= 7)
     {
-        if (!adapter)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         size_t index = 1;
         const uint8_t txt_type = data[index++];
         const uint8_t channel_idx = data[index++];
@@ -517,7 +480,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         const std::string text(reinterpret_cast<const char*>(&data[index]), len - index);
         chat::MessageId msg_id = 0;
         const chat::ChannelId channel = (channel_idx == 1U) ? chat::ChannelId::SECONDARY : chat::ChannelId::PRIMARY;
-        if (!adapter->sendText(channel, text, &msg_id, 0))
+        if (!app_.sendPhoneText(channel, text, 0, 0, msg_id))
         {
             enqueueErr(ERR_CODE_BAD_STATE);
             return;
@@ -530,11 +493,6 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SEND_LOGIN && len >= 1 + kPubKeySize)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         const uint8_t* pubkey = &data[1];
         const size_t pass_len = (len > (1 + kPubKeySize)) ? (len - (1 + kPubKeySize)) : 0;
         uint8_t payload[24] = {};
@@ -551,12 +509,12 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
         uint32_t est_timeout = 0;
         bool sent_flood = false;
-        if (!backend->sendAnonRequestPayload(pubkey,
-                                             kPubKeySize,
-                                             payload,
-                                             payload_len,
-                                             &est_timeout,
-                                             &sent_flood))
+        if (!app_.meshCoreSendAnonRequestPayload(pubkey,
+                                                 kPubKeySize,
+                                                 payload,
+                                                 payload_len,
+                                                 &est_timeout,
+                                                 &sent_flood))
         {
             enqueueErr(ERR_CODE_TABLE_FULL);
             return;
@@ -575,21 +533,16 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SEND_STATUS_REQ && len >= 1 + kPubKeySize)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         const uint8_t* pubkey = &data[1];
         uint32_t tag = 0;
         uint32_t est_timeout = 0;
         bool sent_flood = false;
-        if (!backend->sendPeerRequestType(pubkey,
-                                          kPubKeySize,
-                                          0x01,
-                                          &tag,
-                                          &est_timeout,
-                                          &sent_flood))
+        if (!app_.meshCoreSendPeerRequestType(pubkey,
+                                              kPubKeySize,
+                                              0x01,
+                                              &tag,
+                                              &est_timeout,
+                                              &sent_flood))
         {
             enqueueErr(ERR_CODE_TABLE_FULL);
             return;
@@ -611,9 +564,9 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         const size_t nlen = std::min(len - 1, sizeof(cfg.node_name) - 1);
         std::memcpy(cfg.node_name, &data[1], nlen);
         cfg.node_name[nlen] = '\0';
-        ctx_.setMeshCorePhoneConfig(cfg);
-        ctx_.saveConfig();
-        ctx_.applyUserInfo();
+        app_.setMeshCorePhoneConfig(cfg);
+        app_.saveConfig();
+        app_.applyUserInfo();
         enqueueSentOk();
         return;
     }
@@ -752,7 +705,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
     if (cmd == CMD_SEND_SELF_ADVERT)
     {
         const bool broadcast = (len >= 2 && data[1] == 1);
-        if (backend && backend->sendSelfAdvert(broadcast))
+        if (app_.meshCoreSendSelfAdvert(broadcast))
         {
             ++stats_tx_packets_;
             if (broadcast)
@@ -786,7 +739,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
     {
         uint32_t epoch = 0;
         std::memcpy(&epoch, &data[1], sizeof(epoch));
-        if (ctx_.syncCurrentEpochSeconds(epoch))
+        if (app_.syncCurrentEpochSeconds(epoch))
         {
             enqueueSentOk();
         }
@@ -830,9 +783,9 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         cfg.mesh.meshcore_bw_khz = static_cast<float>(bw) / 1000.0f;
         cfg.mesh.meshcore_sf = sf;
         cfg.mesh.meshcore_cr = cr;
-        ctx_.setMeshCorePhoneConfig(cfg);
-        ctx_.saveConfig();
-        ctx_.applyMeshConfig();
+        app_.setMeshCorePhoneConfig(cfg);
+        app_.saveConfig();
+        app_.applyMeshConfig();
         enqueueSentOk();
         return;
     }
@@ -846,9 +799,9 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
             return;
         }
         cfg.mesh.tx_power = tx;
-        ctx_.setMeshCorePhoneConfig(cfg);
-        ctx_.saveConfig();
-        ctx_.applyMeshConfig();
+        app_.setMeshCorePhoneConfig(cfg);
+        app_.saveConfig();
+        app_.applyMeshConfig();
         enqueueSentOk();
         return;
     }
@@ -946,13 +899,8 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_EXPORT_PRIVATE_KEY)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         uint8_t priv[chat::meshcore::kMeshCorePrivKeySize] = {};
-        if (!backend->exportIdentityPrivateKey(priv))
+        if (!app_.meshCoreExportIdentityPrivateKey(priv, sizeof(priv)))
         {
             enqueueErr(ERR_CODE_BAD_STATE);
             return;
@@ -966,12 +914,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_IMPORT_PRIVATE_KEY && len >= 1 + chat::meshcore::kMeshCorePrivKeySize)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
-        if (!backend->importIdentityPrivateKey(&data[1], chat::meshcore::kMeshCorePrivKeySize))
+        if (!app_.meshCoreImportIdentityPrivateKey(&data[1], chat::meshcore::kMeshCorePrivKeySize))
         {
             enqueueErr(ERR_CODE_ILLEGAL_ARG);
             return;
@@ -982,11 +925,6 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SEND_PATH_DISCOVERY_REQ)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         if (len < 2 + kPubKeySize || data[1] != 0)
         {
             enqueueErr(ERR_CODE_ILLEGAL_ARG);
@@ -1002,14 +940,14 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         uint32_t tag = 0;
         uint32_t est_timeout = 0;
         bool sent_flood = false;
-        if (!backend->sendPeerRequestPayload(pubkey,
-                                             kPubKeySize,
-                                             req_data,
-                                             sizeof(req_data),
-                                             true,
-                                             &tag,
-                                             &est_timeout,
-                                             &sent_flood))
+        if (!app_.meshCoreSendPeerRequestPayload(pubkey,
+                                                 kPubKeySize,
+                                                 req_data,
+                                                 sizeof(req_data),
+                                                 true,
+                                                 &tag,
+                                                 &est_timeout,
+                                                 &sent_flood))
         {
             enqueueErr(ERR_CODE_TABLE_FULL);
             return;
@@ -1033,11 +971,6 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SEND_RAW_DATA && len >= 6)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         size_t index = 1;
         const int8_t path_len = static_cast<int8_t>(data[index++]);
         if (path_len < 0 || (index + static_cast<size_t>(path_len) + 4U) > len)
@@ -1050,7 +983,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         const uint8_t* payload = &data[index];
         const size_t payload_len = len - index;
         uint32_t est_timeout = 0;
-        if (!backend->sendRawData(path, static_cast<size_t>(path_len), payload, payload_len, &est_timeout))
+        if (!app_.meshCoreSendRawData(path, static_cast<size_t>(path_len), payload, payload_len, &est_timeout))
         {
             enqueueErr(ERR_CODE_TABLE_FULL);
             return;
@@ -1063,11 +996,6 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SEND_BINARY_REQ && len >= 1 + kPubKeySize + 1)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         uint8_t resolved_pubkey[kPubKeySize] = {};
         const uint8_t* pubkey = &data[1];
         if (hooks_ && !hooks_->resolvePeerPublicKey(&data[1], kPubKeySize, resolved_pubkey, sizeof(resolved_pubkey)))
@@ -1089,14 +1017,14 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         uint32_t tag = 0;
         uint32_t est_timeout = 0;
         bool sent_flood = false;
-        if (!backend->sendPeerRequestPayload(pubkey,
-                                             kPubKeySize,
-                                             payload,
-                                             payload_len,
-                                             false,
-                                             &tag,
-                                             &est_timeout,
-                                             &sent_flood))
+        if (!app_.meshCoreSendPeerRequestPayload(pubkey,
+                                                 kPubKeySize,
+                                                 payload,
+                                                 payload_len,
+                                                 false,
+                                                 &tag,
+                                                 &est_timeout,
+                                                 &sent_flood))
         {
             enqueueErr(ERR_CODE_TABLE_FULL);
             return;
@@ -1127,17 +1055,14 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
             out[index++] = PUSH_CODE_TELEMETRY_RESPONSE;
             out[index++] = 0;
             uint8_t prefix[kPrefixSize] = {};
-            if (backend)
+            uint8_t pubkey[kPubKeySize] = {};
+            if (app_.meshCoreExportIdentityPublicKey(pubkey, sizeof(pubkey)))
             {
-                uint8_t pubkey[kPubKeySize] = {};
-                if (backend->exportIdentityPublicKey(pubkey))
-                {
-                    std::memcpy(prefix, pubkey, kPrefixSize);
-                }
+                std::memcpy(prefix, pubkey, kPrefixSize);
             }
             if (prefix[0] == 0)
             {
-                const uint32_t self_id = ctx_.getSelfNodeId();
+                const uint32_t self_id = app_.getSelfNodeId();
                 std::memcpy(prefix, &self_id, std::min(sizeof(self_id), sizeof(prefix)));
             }
             std::memcpy(&out[index], prefix, sizeof(prefix));
@@ -1154,11 +1079,6 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         }
         if (len >= 4 + kPubKeySize)
         {
-            if (!backend)
-            {
-                enqueueErr(ERR_CODE_BAD_STATE);
-                return;
-            }
             uint8_t resolved_pubkey[kPubKeySize] = {};
             const uint8_t* pubkey = &data[4];
             if (hooks_ && !hooks_->resolvePeerPublicKey(&data[4], kPubKeySize, resolved_pubkey, sizeof(resolved_pubkey)))
@@ -1173,7 +1093,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
             uint32_t tag = 0;
             uint32_t est_timeout = 0;
             bool sent_flood = false;
-            if (!backend->sendPeerRequestType(pubkey, kPubKeySize, 0x03, &tag, &est_timeout, &sent_flood))
+            if (!app_.meshCoreSendPeerRequestType(pubkey, kPubKeySize, 0x03, &tag, &est_timeout, &sent_flood))
             {
                 enqueueErr(ERR_CODE_TABLE_FULL);
                 return;
@@ -1199,11 +1119,6 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SEND_TRACE_PATH && len > 10)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
         uint32_t tag = 0;
         uint32_t auth = 0;
         std::memcpy(&tag, &data[1], sizeof(tag));
@@ -1218,7 +1133,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
             return;
         }
         uint32_t est_timeout = 0;
-        if (!backend->sendTracePath(&data[10], path_len, tag, auth, flags, &est_timeout))
+        if (!app_.meshCoreSendTracePath(&data[10], path_len, tag, auth, flags, &est_timeout))
         {
             enqueueErr(ERR_CODE_TABLE_FULL);
             return;
@@ -1250,26 +1165,28 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
                 path_len = static_cast<uint8_t>(std::min(lookup_len, static_cast<size_t>(kMaxPathSize)));
             }
         }
-        if (const auto* store = ctx_.getNodeStore())
+        PhoneNodeView entry{};
+        for (size_t node_index = 0; node_index < app_.phoneNodeCount(); ++node_index)
         {
-            for (const auto& entry : store->getEntries())
+            if (!app_.getPhoneNodeByIndex(node_index, entry))
             {
-                if (found)
-                {
-                    break;
-                }
-                if (entry.node_id == 0)
-                {
-                    continue;
-                }
-                uint32_t entry_id = 0;
-                std::memcpy(&entry_id, pubkey, std::min(sizeof(entry_id), kPubKeySize));
-                if (entry.node_id == entry_id)
-                {
-                    ts = entry.last_seen;
-                    found = true;
-                    break;
-                }
+                continue;
+            }
+            if (found)
+            {
+                break;
+            }
+            if (entry.node_id == 0)
+            {
+                continue;
+            }
+            uint32_t entry_id = 0;
+            std::memcpy(&entry_id, pubkey, std::min(sizeof(entry_id), kPubKeySize));
+            if (entry.node_id == entry_id)
+            {
+                ts = entry.last_seen;
+                found = true;
+                break;
             }
         }
         if (!found)
@@ -1301,7 +1218,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         }
         enqueueSentOk();
         sys::sleep_ms(100);
-        ctx_.restartDevice();
+        app_.restartDevice();
         return;
     }
 
@@ -1309,22 +1226,24 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
     {
         const uint8_t* key = &data[1];
         const size_t key_len = len - 1;
-        if (const auto* store = ctx_.getNodeStore())
+        PhoneNodeView entry{};
+        for (size_t node_index = 0; node_index < app_.phoneNodeCount(); ++node_index)
         {
-            for (const auto& entry : store->getEntries())
+            if (!app_.getPhoneNodeByIndex(node_index, entry))
             {
-                if (entry.node_id == 0)
+                continue;
+            }
+            if (entry.node_id == 0)
+            {
+                continue;
+            }
+            if (std::memcmp(&entry.node_id, key, std::min(key_len, sizeof(entry.node_id))) == 0)
+            {
+                MeshCoreBleFrame frame{};
+                if (buildContactFromNode(entry, RESP_CODE_CONTACT, frame))
                 {
-                    continue;
-                }
-                if (std::memcmp(&entry.node_id, key, std::min(key_len, sizeof(entry.node_id))) == 0)
-                {
-                    MeshCoreBleFrame frame{};
-                    if (buildContactFromNode(entry, RESP_CODE_CONTACT, frame))
-                    {
-                        enqueueFrame(frame.buf.data(), frame.len);
-                        return;
-                    }
+                    enqueueFrame(frame.buf.data(), frame.len);
+                    return;
                 }
             }
         }
@@ -1334,10 +1253,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_RESET_PATH && len >= 1 + kPubKeySize)
     {
-        if (backend)
-        {
-            backend->setFloodScopeKey(nullptr, 0);
-        }
+        app_.meshCoreSetFloodScopeKey(nullptr, 0);
         enqueueSentOk();
         return;
     }
@@ -1375,14 +1291,14 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SIGN_FINISH)
     {
-        if (!sign_active_ || !backend)
+        if (!sign_active_)
         {
             enqueueErr(ERR_CODE_BAD_STATE);
             return;
         }
         sign_active_ = false;
         uint8_t sig[chat::meshcore::kMeshCoreSignatureSize] = {};
-        if (!backend->signPayload(sign_data_.data(), sign_data_.size(), sig))
+        if (!app_.meshCoreSignPayload(sign_data_.data(), sign_data_.size(), sig, sizeof(sig)))
         {
             enqueueErr(ERR_CODE_BAD_STATE);
             sign_data_.clear();
@@ -1421,21 +1337,16 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         {
             std::memcpy(cfg.mesh.secondary_key, &data[34], 16);
         }
-        ctx_.setMeshCorePhoneConfig(cfg);
-        ctx_.saveConfig();
-        ctx_.applyMeshConfig();
+        app_.setMeshCorePhoneConfig(cfg);
+        app_.saveConfig();
+        app_.applyMeshConfig();
         enqueueSentOk();
         return;
     }
 
     if (cmd == CMD_SEND_CONTROL_DATA && len >= 2 && (data[1] & 0x80U) != 0)
     {
-        if (!backend)
-        {
-            enqueueErr(ERR_CODE_BAD_STATE);
-            return;
-        }
-        if (!backend->sendControlData(&data[1], len - 1))
+        if (!app_.meshCoreSendControlData(&data[1], len - 1))
         {
             enqueueErr(ERR_CODE_TABLE_FULL);
             return;
@@ -1516,16 +1427,13 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
 
     if (cmd == CMD_SET_FLOOD_SCOPE && len >= 2 && data[1] == 0)
     {
-        if (backend)
+        if (len >= 18)
         {
-            if (len >= 18)
-            {
-                backend->setFloodScopeKey(&data[2], 16);
-            }
-            else
-            {
-                backend->setFloodScopeKey(nullptr, 0);
-            }
+            app_.meshCoreSetFloodScopeKey(&data[2], 16);
+        }
+        else
+        {
+            app_.meshCoreSetFloodScopeKey(nullptr, 0);
         }
         enqueueSentOk();
         return;
@@ -1651,10 +1559,10 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
             enqueueErr(ERR_CODE_ILLEGAL_ARG);
             return;
         }
-        ctx_.resetMeshConfig();
-        ctx_.clearNodeDb();
-        ctx_.clearMessageDb();
-        ctx_.setBleEnabled(true);
+        app_.resetMeshConfig();
+        app_.clearNodeDb();
+        app_.clearMessageDb();
+        app_.setBleEnabled(true);
         if (hooks_)
         {
             hooks_->onFactoryReset();
@@ -1664,7 +1572,7 @@ void MeshCorePhoneCore::handleCmdFrame(const uint8_t* data, size_t len)
         sign_active_ = false;
         enqueueSentOk();
         sys::sleep_ms(100);
-        ctx_.restartDevice();
+        app_.restartDevice();
         return;
     }
 
@@ -1737,14 +1645,13 @@ uint32_t MeshCorePhoneCore::resolveNodeIdFromPrefix(const uint8_t* prefix, size_
         }
     }
 
-    const auto* store = ctx_.getNodeStore();
-    if (!store)
-    {
-        return 0;
-    }
-
-    for (const auto& entry : store->getEntries())
+    PhoneNodeView entry{};
+    for (size_t node_index = 0; node_index < app_.phoneNodeCount(); ++node_index)
     {
+        if (!app_.getPhoneNodeByIndex(node_index, entry))
+        {
+            continue;
+        }
         if (entry.node_id == 0)
         {
             continue;
@@ -1757,7 +1664,7 @@ uint32_t MeshCorePhoneCore::resolveNodeIdFromPrefix(const uint8_t* prefix, size_
     return 0;
 }
 
-bool MeshCorePhoneCore::buildContactFromNode(const chat::contacts::NodeEntry& entry, uint8_t code, MeshCoreBleFrame& out) const
+bool MeshCorePhoneCore::buildContactFromNode(const PhoneNodeView& entry, uint8_t code, MeshCoreBleFrame& out) const
 {
     size_t index = 0;
     out.buf[index++] = code;
@@ -1797,4 +1704,4 @@ bool MeshCorePhoneCore::buildContactFromNode(const chat::contacts::NodeEntry& en
     return true;
 }
 
-} // namespace ble
+} // namespace phone::meshcore
diff --git a/modules/core_chat/src/ble/meshtastic_phone_core.cpp b/modules/core_phone/src/meshtastic/meshtastic_phone_core.cpp
similarity index 88%
rename from modules/core_chat/src/ble/meshtastic_phone_core.cpp
rename to modules/core_phone/src/meshtastic/meshtastic_phone_core.cpp
index cb1c115e..99e147a7 100644
--- a/modules/core_chat/src/ble/meshtastic_phone_core.cpp
+++ b/modules/core_phone/src/meshtastic/meshtastic_phone_core.cpp
@@ -1,13 +1,12 @@
-#include "chat/ble/meshtastic_phone_core.h"
+#include "phone/meshtastic/meshtastic_phone_core.h"
 
-#include "chat/ble/meshtastic_defaults.h"
-#include "chat/ble/meshtastic_phone_config_bridge.h"
-#include "chat/ports/i_mesh_adapter.h"
+#include "chat/infra/meshtastic/mt_protocol_helpers.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/runtime/self_identity_policy.h"
-#include "chat/usecase/chat_service.h"
-#include "chat/usecase/contact_service.h"
 #include "pb_decode.h"
 #include "pb_encode.h"
+#include "phone/meshtastic/meshtastic_defaults.h"
+#include "phone/meshtastic/meshtastic_phone_config_bridge.h"
 #include "sys/clock.h"
 
 #include <algorithm>
@@ -18,7 +17,7 @@
 #include <cstdio>
 #include <cstring>
 
-namespace ble
+namespace phone::meshtastic
 {
 namespace
 {
@@ -79,6 +78,63 @@ void copyBounded(char* dst, size_t dst_len, const char* src)
     dst[dst_len - 1] = '\0';
 }
 
+void applyChannelPsk(uint8_t* dst,
+                     size_t dst_len,
+                     uint8_t* dst_key_len,
+                     const meshtastic_ChannelSettings_psk_t& psk)
+{
+    if (!dst || !dst_key_len || dst_len == 0)
+    {
+        return;
+    }
+    std::memset(dst, 0, dst_len);
+    *dst_key_len = 0;
+    if (psk.size == 16 || psk.size == 32)
+    {
+        const size_t copy_len = std::min(static_cast<size_t>(psk.size), dst_len);
+        std::memcpy(dst, psk.bytes, copy_len);
+        if (copy_len == 16 || copy_len == 32)
+        {
+            *dst_key_len = static_cast<uint8_t>(copy_len);
+        }
+    }
+    else if (psk.size == 1)
+    {
+        size_t expanded_len = 0;
+        chat::meshtastic::expandShortPsk(psk.bytes[0], dst, &expanded_len);
+        if (expanded_len == 16 && expanded_len <= dst_len)
+        {
+            *dst_key_len = static_cast<uint8_t>(expanded_len);
+        }
+    }
+}
+
+size_t meshtasticKeyLen(const uint8_t* key, size_t key_capacity, uint8_t stored_len)
+{
+    return chat::normalizeMeshtasticChannelKeyLen(key, key_capacity, stored_len);
+}
+
+void logChannelSummary(const char* prefix, const meshtastic_Channel& channel)
+{
+    const char* name = channel.has_settings ? channel.settings.name : "<none>";
+    const unsigned psk_size = channel.has_settings ? static_cast<unsigned>(channel.settings.psk.size) : 0U;
+    const unsigned channel_num = channel.has_settings ? static_cast<unsigned>(channel.settings.channel_num) : 0U;
+    const unsigned id = channel.has_settings ? static_cast<unsigned>(channel.settings.id) : 0U;
+    const unsigned uplink = channel.has_settings && channel.settings.uplink_enabled ? 1U : 0U;
+    const unsigned downlink = channel.has_settings && channel.settings.downlink_enabled ? 1U : 0U;
+    logDual("[BLE][mtcore][channel] %s idx=%d role=%u has_settings=%u ch_num=%u name=%s id=%u psk_size=%u uplink=%u downlink=%u\n",
+            prefix ? prefix : "channel",
+            static_cast<int>(channel.index),
+            static_cast<unsigned>(channel.role),
+            channel.has_settings ? 1U : 0U,
+            channel_num,
+            name,
+            id,
+            psk_size,
+            uplink,
+            downlink);
+}
+
 bool parsePosixTzOffsetMinutes(const char* tzdef, int* out_offset_min)
 {
     if (!tzdef || !out_offset_min || tzdef[0] == '\0')
@@ -327,9 +383,9 @@ const char* configStageName(uint32_t nonce)
 {
     switch (nonce)
     {
-    case meshtastic_defaults::kConfigNonceOnlyConfig:
+    case defaults::kConfigNonceOnlyConfig:
         return "stage1_config";
-    case meshtastic_defaults::kConfigNonceOnlyNodes:
+    case defaults::kConfigNonceOnlyNodes:
         return "stage2_nodes";
     default:
         return "stage_unknown";
@@ -373,7 +429,7 @@ meshtastic_Config_DeviceConfig_Role roleFromEntry(uint8_t role)
 
 void initDefaultModuleConfig(meshtastic_LocalModuleConfig* out, uint32_t self_node)
 {
-    meshtastic_config_bridge::initDefaultModuleConfig(out, self_node);
+    config_bridge::initDefaultModuleConfig(out, self_node);
     if (out)
     {
         out->ambient_lighting.current = 8;
@@ -382,7 +438,7 @@ void initDefaultModuleConfig(meshtastic_LocalModuleConfig* out, uint32_t self_no
 
 void applyLegacyMqttDefaults(meshtastic_LocalModuleConfig* out)
 {
-    meshtastic_config_bridge::normalizeModuleConfig(out);
+    config_bridge::normalizeModuleConfig(out);
 }
 
 bool moduleConfigTypeFromVariant(pb_size_t variant_tag, meshtastic_AdminMessage_ModuleConfigType* out)
@@ -439,7 +495,7 @@ bool moduleConfigTypeFromVariant(pb_size_t variant_tag, meshtastic_AdminMessage_
 
 } // namespace
 
-MeshtasticPhoneCore::MeshtasticPhoneCore(IPhoneRuntimeContext& ctx,
+MeshtasticPhoneCore::MeshtasticPhoneCore(IPhoneAppFacade& app,
                                          MeshtasticPhoneTransport& transport,
                                          MeshtasticPhoneBluetoothConfigHooks* bluetooth_config_hooks,
                                          MeshtasticPhoneModuleConfigHooks* module_config_hooks,
@@ -447,7 +503,7 @@ MeshtasticPhoneCore::MeshtasticPhoneCore(IPhoneRuntimeContext& ctx,
                                          MeshtasticPhoneStatusHooks* status_hooks,
                                          MeshtasticPhoneMqttHooks* mqtt_hooks,
                                          MeshtasticPhoneDeviceRuntimeHooks* device_runtime_hooks)
-    : ctx_(ctx),
+    : app_(app),
       transport_(transport),
       bluetooth_config_hooks_(bluetooth_config_hooks),
       module_config_hooks_(module_config_hooks),
@@ -457,7 +513,7 @@ MeshtasticPhoneCore::MeshtasticPhoneCore(IPhoneRuntimeContext& ctx,
       device_runtime_hooks_(device_runtime_hooks)
 {
     bluetooth_config_ = meshtastic_Config_BluetoothConfig_init_zero;
-    bluetooth_config_.enabled = ctx_.isBleEnabled();
+    bluetooth_config_.enabled = app_.isBleEnabled();
     bluetooth_config_.mode = meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN;
     bluetooth_config_.fixed_pin = 0;
     if (bluetooth_config_hooks_)
@@ -468,7 +524,7 @@ MeshtasticPhoneCore::MeshtasticPhoneCore(IPhoneRuntimeContext& ctx,
             bluetooth_config_ = loaded_bt;
         }
     }
-    initDefaultModuleConfig(&module_config_, ctx_.getSelfNodeId());
+    initDefaultModuleConfig(&module_config_, app_.getSelfNodeId());
     if (module_config_hooks_)
     {
         meshtastic_LocalModuleConfig loaded = meshtastic_LocalModuleConfig_init_zero;
@@ -535,11 +591,6 @@ bool MeshtasticPhoneCore::handleToRadio(const uint8_t* data, size_t len)
     {
         return false;
     }
-
-    if (last_to_radio_len_ == len && std::memcmp(last_to_radio_, data, len) == 0)
-    {
-        return true;
-    }
     std::memcpy(last_to_radio_, data, len);
     last_to_radio_len_ = len;
 
@@ -591,7 +642,7 @@ bool MeshtasticPhoneCore::handleToRadioPacket(meshtastic_MeshPacket& packet)
         packet.id = sys::millis_now();
     }
 
-    packet.from = ctx_.getSelfNodeId();
+    packet.from = app_.getSelfNodeId();
     packet.rx_time = nowSeconds();
     logDual("[BLE][mtcore] packet port=%u to=%08lX want_resp=%u len=%u\n",
             static_cast<unsigned>(packet.decoded.portnum),
@@ -601,7 +652,7 @@ bool MeshtasticPhoneCore::handleToRadioPacket(meshtastic_MeshPacket& packet)
 
     const bool admin_for_self =
         (packet.decoded.portnum == meshtastic_PortNum_ADMIN_APP) &&
-        (packet.to == 0 || packet.to == ctx_.getSelfNodeId());
+        (packet.to == 0 || packet.to == app_.getSelfNodeId());
     if (admin_for_self)
     {
         const bool ok = handleAdmin(packet);
@@ -620,26 +671,20 @@ bool MeshtasticPhoneCore::handleToRadioPacket(meshtastic_MeshPacket& packet)
     if (packet.decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP)
     {
         std::string text(reinterpret_cast<const char*>(packet.decoded.payload.bytes), packet.decoded.payload.size);
-        const chat::MessageId msg_id = ctx_.getChatService().sendTextWithId(channel, text, packet.id, packet.to);
+        chat::MessageId msg_id = 0;
+        app_.sendPhoneText(channel, text, packet.id, packet.to, msg_id);
         enqueueQueueStatus(packet.id, msg_id != 0);
         return msg_id != 0;
     }
 
-    chat::IMeshAdapter* adapter = ctx_.getMeshAdapter();
-    if (!adapter)
-    {
-        enqueueQueueStatus(packet.id, false);
-        return false;
-    }
-
-    const bool ok = adapter->sendAppData(channel,
-                                         static_cast<uint32_t>(packet.decoded.portnum),
-                                         packet.decoded.payload.bytes,
-                                         packet.decoded.payload.size,
-                                         packet.to,
-                                         packet.want_ack,
-                                         packet.id,
-                                         packet.decoded.want_response);
+    const bool ok = app_.sendPhoneAppData(channel,
+                                          static_cast<uint32_t>(packet.decoded.portnum),
+                                          packet.decoded.payload.bytes,
+                                          packet.decoded.payload.size,
+                                          packet.to,
+                                          packet.want_ack,
+                                          packet.id,
+                                          packet.decoded.want_response);
     enqueueQueueStatus(packet.id, ok);
     return ok;
 }
@@ -657,7 +702,7 @@ bool MeshtasticPhoneCore::handleAdmin(meshtastic_MeshPacket& packet)
     meshtastic_AdminMessage& req = admin_req_scratch_;
     meshtastic_AdminMessage& resp = admin_resp_scratch_;
     bool has_resp = false;
-    auto cfg = ctx_.getMeshtasticPhoneConfig();
+    auto cfg = app_.getMeshtasticPhoneConfig();
 
     switch (req.which_payload_variant)
     {
@@ -723,47 +768,49 @@ bool MeshtasticPhoneCore::handleAdmin(meshtastic_MeshPacket& packet)
     case meshtastic_AdminMessage_set_owner_tag:
         copyBounded(cfg.node_name, sizeof(cfg.node_name), req.set_owner.long_name);
         copyBounded(cfg.short_name, sizeof(cfg.short_name), req.set_owner.short_name);
-        ctx_.setMeshtasticPhoneConfig(cfg);
-        ctx_.saveConfig();
-        ctx_.applyUserInfo();
+        app_.setMeshtasticPhoneConfig(cfg);
+        app_.saveConfig();
+        app_.applyUserInfo();
         resp.which_payload_variant = meshtastic_AdminMessage_get_owner_response_tag;
         resp.get_owner_response = buildSelfNodeInfo().user;
         has_resp = true;
         break;
     case meshtastic_AdminMessage_set_channel_tag:
+        logChannelSummary("set_req", req.set_channel);
         if (req.set_channel.index == 0)
         {
             cfg.primary_enabled = (req.set_channel.role != meshtastic_Channel_Role_DISABLED);
             cfg.primary_uplink_enabled = req.set_channel.settings.uplink_enabled;
             cfg.primary_downlink_enabled = req.set_channel.settings.downlink_enabled;
-            if (req.set_channel.settings.psk.size == 16)
-            {
-                std::memcpy(cfg.mesh.primary_key, req.set_channel.settings.psk.bytes, 16);
-            }
-            else if (req.set_channel.settings.psk.size == 0)
-            {
-                std::memset(cfg.mesh.primary_key, 0, sizeof(cfg.mesh.primary_key));
-            }
+            copyBounded(cfg.mesh.primary_channel_name,
+                        sizeof(cfg.mesh.primary_channel_name),
+                        req.set_channel.settings.name);
+            cfg.mesh.primary_channel_id = req.set_channel.settings.id;
+            applyChannelPsk(cfg.mesh.primary_key,
+                            sizeof(cfg.mesh.primary_key),
+                            &cfg.mesh.primary_key_len,
+                            req.set_channel.settings.psk);
         }
         else if (req.set_channel.index == 1)
         {
             cfg.secondary_enabled = (req.set_channel.role != meshtastic_Channel_Role_DISABLED);
             cfg.secondary_uplink_enabled = req.set_channel.settings.uplink_enabled;
             cfg.secondary_downlink_enabled = req.set_channel.settings.downlink_enabled;
-            if (req.set_channel.settings.psk.size == 16)
-            {
-                std::memcpy(cfg.mesh.secondary_key, req.set_channel.settings.psk.bytes, 16);
-            }
-            else if (req.set_channel.settings.psk.size == 0)
-            {
-                std::memset(cfg.mesh.secondary_key, 0, sizeof(cfg.mesh.secondary_key));
-            }
+            copyBounded(cfg.mesh.secondary_channel_name,
+                        sizeof(cfg.mesh.secondary_channel_name),
+                        req.set_channel.settings.name);
+            cfg.mesh.secondary_channel_id = req.set_channel.settings.id;
+            applyChannelPsk(cfg.mesh.secondary_key,
+                            sizeof(cfg.mesh.secondary_key),
+                            &cfg.mesh.secondary_key_len,
+                            req.set_channel.settings.psk);
         }
-        ctx_.setMeshtasticPhoneConfig(cfg);
-        ctx_.saveConfig();
-        ctx_.applyMeshConfig();
+        app_.setMeshtasticPhoneConfig(cfg);
+        app_.saveConfig();
+        app_.applyMeshConfig();
         resp.which_payload_variant = meshtastic_AdminMessage_get_channel_response_tag;
         resp.get_channel_response = buildChannel(req.set_channel.index);
+        logChannelSummary("set_resp", resp.get_channel_response);
         has_resp = true;
         break;
     case meshtastic_AdminMessage_set_config_tag:
@@ -794,18 +841,18 @@ bool MeshtasticPhoneCore::handleAdmin(meshtastic_MeshPacket& packet)
             logDual("[BLE][mtcore] set_config lora pre-save ok_to_mqtt=%u ignore_mqtt=%u\n",
                     cfg.mesh.config_ok_to_mqtt ? 1U : 0U,
                     cfg.mesh.ignore_mqtt ? 1U : 0U);
-            ctx_.setMeshtasticPhoneConfig(cfg);
-            ctx_.saveConfig();
+            app_.setMeshtasticPhoneConfig(cfg);
+            app_.saveConfig();
             logDual("[BLE][mtcore] set_config lora post-save\n");
-            ctx_.applyMeshConfig();
+            app_.applyMeshConfig();
             logDual("[BLE][mtcore] set_config lora post-apply\n");
             break;
         case meshtastic_Config_position_tag:
             cfg.gps_enabled = req.set_config.payload_variant.position.gps_enabled;
             cfg.gps_interval_ms = req.set_config.payload_variant.position.gps_update_interval * 1000U;
-            ctx_.setMeshtasticPhoneConfig(cfg);
-            ctx_.saveConfig();
-            ctx_.applyPositionConfig();
+            app_.setMeshtasticPhoneConfig(cfg);
+            app_.saveConfig();
+            app_.applyPositionConfig();
             break;
         case meshtastic_Config_bluetooth_tag:
             bluetooth_config_ = req.set_config.payload_variant.bluetooth;
@@ -818,7 +865,7 @@ bool MeshtasticPhoneCore::handleAdmin(meshtastic_MeshPacket& packet)
             {
                 bluetooth_config_hooks_->saveBluetoothConfig(bluetooth_config_);
             }
-            ctx_.setBleEnabled(req.set_config.payload_variant.bluetooth.enabled);
+            app_.setBleEnabled(req.set_config.payload_variant.bluetooth.enabled);
             break;
         case meshtastic_Config_device_tag:
         {
@@ -990,14 +1037,14 @@ bool MeshtasticPhoneCore::handleAdmin(meshtastic_MeshPacket& packet)
         break;
     case meshtastic_AdminMessage_set_time_only_tag:
     {
-        return ctx_.syncCurrentEpochSeconds(static_cast<uint32_t>(req.set_time_only));
+        return app_.syncCurrentEpochSeconds(static_cast<uint32_t>(req.set_time_only));
     }
     case meshtastic_AdminMessage_remove_by_nodenum_tag:
         return true;
     case meshtastic_AdminMessage_factory_reset_config_tag:
-        ctx_.resetMeshConfig();
-        ctx_.clearNodeDb();
-        ctx_.clearMessageDb();
+        app_.resetMeshConfig();
+        app_.clearNodeDb();
+        app_.clearMessageDb();
         return true;
     default:
         return false;
@@ -1015,8 +1062,8 @@ bool MeshtasticPhoneCore::handleAdmin(meshtastic_MeshPacket& packet)
 
     auto& reply = reply_packet_scratch_;
     std::memset(&reply, 0, sizeof(reply));
-    reply.from = ctx_.getSelfNodeId();
-    reply.to = ctx_.getSelfNodeId();
+    reply.from = app_.getSelfNodeId();
+    reply.to = app_.getSelfNodeId();
     reply.channel = packet.channel;
     reply.id = sys::millis_now();
     reply.rx_time = nowSeconds();
@@ -1037,13 +1084,12 @@ bool MeshtasticPhoneCore::handleAdmin(meshtastic_MeshPacket& packet)
     }
     reply.decoded.payload.size = static_cast<pb_size_t>(out_stream.bytes_written);
     packet_queue_.push_back(reply);
-    notifyFromNum(reply.id);
     return true;
 }
 
 bool MeshtasticPhoneCore::handleLocalSelfPacket(meshtastic_MeshPacket& packet)
 {
-    const uint32_t self = ctx_.getSelfNodeId();
+    const uint32_t self = app_.getSelfNodeId();
     if (self == 0 || packet.to != self || packet.which_payload_variant != meshtastic_MeshPacket_decoded_tag)
     {
         return false;
@@ -1179,16 +1225,10 @@ bool MeshtasticPhoneCore::handleLocalSelfPacket(meshtastic_MeshPacket& packet)
 
 void MeshtasticPhoneCore::pumpIncomingAppData()
 {
-    chat::IMeshAdapter* adapter = ctx_.getMeshAdapter();
-    if (!adapter)
-    {
-        return;
-    }
-
     for (uint8_t count = 0; count < kQueueDepthHint; ++count)
     {
         chat::MeshIncomingData incoming{};
-        if (!adapter->pollIncomingData(&incoming))
+        if (!app_.pollIncomingPhoneData(incoming))
         {
             break;
         }
@@ -1305,21 +1345,23 @@ bool MeshtasticPhoneCore::popConfigSnapshotFrame(MeshtasticBleFrame* out)
         return encodeFromRadio(from, from_num, out);
     }
 
-    if (const auto* store = ctx_.getNodeStore())
+    const size_t node_count = app_.phoneNodeCount();
+    PhoneNodeView entry{};
+    while ((config_node_index_ - 3) < node_count)
     {
-        const auto& entries = store->getEntries();
-        while ((config_node_index_ - 3) < entries.size())
+        const size_t node_index = config_node_index_ - 3;
+        ++config_node_index_;
+        if (!app_.getPhoneNodeByIndex(node_index, entry))
         {
-            const auto& entry = entries[config_node_index_ - 3];
-            ++config_node_index_;
-            if (entry.node_id == 0 || entry.node_id == ctx_.getSelfNodeId())
-            {
-                continue;
-            }
-            from.which_payload_variant = meshtastic_FromRadio_node_info_tag;
-            fillNodeInfoFromEntry(entry, &from.node_info);
-            return encodeFromRadio(from, entry.node_id, out);
+            continue;
         }
+        if (entry.node_id == 0 || entry.node_id == app_.getSelfNodeId())
+        {
+            continue;
+        }
+        from.which_payload_variant = meshtastic_FromRadio_node_info_tag;
+        fillNodeInfoFromEntry(entry, &from.node_info);
+        return encodeFromRadio(from, entry.node_id, out);
     }
 
     if (config_channel_index_ == 0)
@@ -1331,10 +1373,11 @@ bool MeshtasticPhoneCore::popConfigSnapshotFrame(MeshtasticBleFrame* out)
     }
 
     const uint8_t channel_slot = static_cast<uint8_t>(config_channel_index_ - 1);
-    if (channel_slot < meshtastic_defaults::kMaxMeshtasticChannels)
+    if (channel_slot < defaults::kMaxMeshtasticChannels)
     {
         from.which_payload_variant = meshtastic_FromRadio_channel_tag;
         fillChannel(channel_slot, &from.channel);
+        logChannelSummary("snapshot", from.channel);
         ++config_channel_index_;
         return encodeFromRadio(from, from_num, out);
     }
@@ -1394,8 +1437,14 @@ bool MeshtasticPhoneCore::encodeFromRadio(const meshtastic_FromRadio& from, uint
         return false;
     }
 
+    meshtastic_FromRadio encoded = from;
+    if (from.which_payload_variant == meshtastic_FromRadio_queueStatus_tag ||
+        from.which_payload_variant == meshtastic_FromRadio_packet_tag)
+    {
+        encoded.id = from_num;
+    }
     pb_ostream_t ostream = pb_ostream_from_buffer(out->buf, sizeof(out->buf));
-    if (!pb_encode(&ostream, meshtastic_FromRadio_fields, const_cast<meshtastic_FromRadio*>(&from)))
+    if (!pb_encode(&ostream, meshtastic_FromRadio_fields, &encoded))
     {
         logDual("[BLE][mtcore] encode from_radio failed: variant=%u from_num=%08lX\n",
                 static_cast<unsigned>(from.which_payload_variant),
@@ -1473,15 +1522,11 @@ void MeshtasticPhoneCore::fillMyInfo(meshtastic_MyNodeInfo* out) const
     }
     meshtastic_MyNodeInfo& info = *out;
     std::memset(&info, 0, sizeof(info));
-    info.my_node_num = ctx_.getSelfNodeId();
+    info.my_node_num = app_.getSelfNodeId();
     info.reboot_count = 0;
-    info.min_app_version = meshtastic_defaults::kOfficialMinAppVersion;
+    info.min_app_version = defaults::kOfficialMinAppVersion;
 
-    size_t nodedb_count = 1;
-    if (const auto* store = ctx_.getNodeStore())
-    {
-        nodedb_count += store->getEntries().size();
-    }
+    size_t nodedb_count = 1 + app_.phoneNodeCount();
     if (nodedb_count > 0xFFFFU)
     {
         nodedb_count = 0xFFFFU;
@@ -1489,7 +1534,7 @@ void MeshtasticPhoneCore::fillMyInfo(meshtastic_MyNodeInfo* out) const
     info.nodedb_count = static_cast<uint16_t>(nodedb_count);
 
     uint8_t mac[6] = {};
-    const bool has_mac = ctx_.getDeviceMacAddress(mac);
+    const bool has_mac = app_.getDeviceMacAddress(mac);
     const size_t mac_len = has_mac ? sizeof(mac) : 0;
     std::memcpy(info.device_id.bytes, mac, mac_len);
     std::memcpy(info.device_id.bytes + mac_len, &info.my_node_num, sizeof(info.my_node_num));
@@ -1514,15 +1559,15 @@ void MeshtasticPhoneCore::fillSelfNodeInfo(meshtastic_NodeInfo* out) const
     }
     meshtastic_NodeInfo& info = *out;
     std::memset(&info, 0, sizeof(info));
-    info.num = ctx_.getSelfNodeId();
+    info.num = app_.getSelfNodeId();
     info.has_user = true;
 
     char long_name[32] = {};
     char short_name[16] = {};
-    ctx_.getEffectiveUserInfo(long_name, sizeof(long_name), short_name, sizeof(short_name));
+    app_.getEffectiveUserInfo(long_name, sizeof(long_name), short_name, sizeof(short_name));
 
     char user_id[16] = {};
-    std::snprintf(user_id, sizeof(user_id), "!%08lX", static_cast<unsigned long>(ctx_.getSelfNodeId()));
+    std::snprintf(user_id, sizeof(user_id), "!%08lX", static_cast<unsigned long>(app_.getSelfNodeId()));
     copyBounded(info.user.id, sizeof(info.user.id), user_id);
     copyBounded(info.user.long_name, sizeof(info.user.long_name), long_name);
     copyBounded(info.user.short_name, sizeof(info.user.short_name), short_name);
@@ -1541,7 +1586,7 @@ meshtastic_NodeInfo MeshtasticPhoneCore::buildSelfNodeInfo() const
     return info;
 }
 
-void MeshtasticPhoneCore::fillNodeInfoFromEntry(const chat::contacts::NodeEntry& entry, meshtastic_NodeInfo* out) const
+void MeshtasticPhoneCore::fillNodeInfoFromEntry(const PhoneNodeView& entry, meshtastic_NodeInfo* out) const
 {
     if (!out)
     {
@@ -1586,30 +1631,26 @@ void MeshtasticPhoneCore::fillNodeInfoFromEntry(const chat::contacts::NodeEntry&
         info.device_metrics.uptime_seconds = entry.device_metrics.uptime_seconds;
     }
 
-    const chat::contacts::NodeInfo* node = ctx_.getContactService().getNodeInfo(entry.node_id);
-    if (node != nullptr)
+    if (entry.position.valid)
     {
-        if (node->position.valid)
-        {
-            info.has_position = true;
-            info.position = meshtastic_Position_init_zero;
-            info.position.has_latitude_i = true;
-            info.position.latitude_i = node->position.latitude_i;
-            info.position.has_longitude_i = true;
-            info.position.longitude_i = node->position.longitude_i;
-            info.position.timestamp = node->position.timestamp;
-            info.position.has_altitude = node->position.has_altitude;
-            info.position.altitude = node->position.altitude;
-            info.position.precision_bits = node->position.precision_bits;
-            info.position.PDOP = node->position.pdop;
-            info.position.HDOP = node->position.hdop;
-            info.position.VDOP = node->position.vdop;
-            info.position.gps_accuracy = node->position.gps_accuracy_mm;
-        }
+        info.has_position = true;
+        info.position = meshtastic_Position_init_zero;
+        info.position.has_latitude_i = true;
+        info.position.latitude_i = entry.position.latitude_i;
+        info.position.has_longitude_i = true;
+        info.position.longitude_i = entry.position.longitude_i;
+        info.position.timestamp = entry.position.timestamp;
+        info.position.has_altitude = entry.position.has_altitude;
+        info.position.altitude = entry.position.altitude;
+        info.position.precision_bits = entry.position.precision_bits;
+        info.position.PDOP = entry.position.pdop;
+        info.position.HDOP = entry.position.hdop;
+        info.position.VDOP = entry.position.vdop;
+        info.position.gps_accuracy = entry.position.gps_accuracy_mm;
     }
 }
 
-meshtastic_NodeInfo MeshtasticPhoneCore::buildNodeInfoFromEntry(const chat::contacts::NodeEntry& entry) const
+meshtastic_NodeInfo MeshtasticPhoneCore::buildNodeInfoFromEntry(const PhoneNodeView& entry) const
 {
     meshtastic_NodeInfo info = meshtastic_NodeInfo_init_zero;
     fillNodeInfoFromEntry(entry, &info);
@@ -1624,8 +1665,8 @@ void MeshtasticPhoneCore::fillMetadata(meshtastic_DeviceMetadata* out) const
     }
     meshtastic_DeviceMetadata& metadata = *out;
     std::memset(&metadata, 0, sizeof(metadata));
-    copyBounded(metadata.firmware_version, sizeof(metadata.firmware_version), meshtastic_defaults::kCompatFirmwareVersion);
-    metadata.device_state_version = meshtastic_defaults::kOfficialDeviceStateVersion;
+    copyBounded(metadata.firmware_version, sizeof(metadata.firmware_version), defaults::kCompatFirmwareVersion);
+    metadata.device_state_version = defaults::kOfficialDeviceStateVersion;
     metadata.canShutdown = true;
     metadata.hasBluetooth = true;
     metadata.hasWifi = false;
@@ -1638,7 +1679,7 @@ void MeshtasticPhoneCore::fillMetadata(meshtastic_DeviceMetadata* out) const
     // immediately after pairing.
     metadata.hasPKC = false;
 #else
-    metadata.hasPKC = ctx_.getMeshAdapter() ? ctx_.getMeshAdapter()->isPkiReady() : false;
+    metadata.hasPKC = app_.isMeshPkiReady();
 #endif
     metadata.role = meshtastic_Config_DeviceConfig_Role_CLIENT;
     metadata.position_flags = 0;
@@ -1676,12 +1717,9 @@ meshtastic_LocalStats MeshtasticPhoneCore::buildLocalStats() const
     stats.num_tx_dropped = 0;
     stats.heap_total_bytes = 0;
     stats.heap_free_bytes = 0;
-    if (const auto* store = ctx_.getNodeStore())
-    {
-        const size_t total = store->getEntries().size();
-        stats.num_total_nodes = static_cast<uint16_t>(std::min<size_t>(total, 0xFFFFU));
-        stats.num_online_nodes = stats.num_total_nodes;
-    }
+    const size_t total = app_.phoneNodeCount();
+    stats.num_total_nodes = static_cast<uint16_t>(std::min<size_t>(total, 0xFFFFU));
+    stats.num_online_nodes = stats.num_total_nodes;
     return stats;
 }
 
@@ -1730,7 +1768,7 @@ void MeshtasticPhoneCore::fillChannel(uint8_t idx, meshtastic_Channel* out) cons
     std::memset(&channel, 0, sizeof(channel));
     channel.index = idx;
 
-    const auto cfg = ctx_.getMeshtasticPhoneConfig();
+    const auto cfg = app_.getMeshtasticPhoneConfig();
     bool enabled = false;
     if (idx == 0 && cfg.primary_enabled)
     {
@@ -1759,20 +1797,25 @@ void MeshtasticPhoneCore::fillChannel(uint8_t idx, meshtastic_Channel* out) cons
         channel.settings = settings;
     }
     channel.settings.channel_num = idx;
-    channel.settings.id = 0;
     channel.settings.uplink_enabled = (idx == 0) ? cfg.primary_uplink_enabled : cfg.secondary_uplink_enabled;
     channel.settings.downlink_enabled = (idx == 0) ? cfg.primary_downlink_enabled : cfg.secondary_downlink_enabled;
     channel.settings.has_module_settings = false;
 
     if (idx == 0)
     {
-        copyBounded(channel.settings.name, sizeof(channel.settings.name), "Primary");
-        if (cfg.mesh.primary_key[0] != 0)
+        copyBounded(channel.settings.name,
+                    sizeof(channel.settings.name),
+                    chat::meshtastic::primaryChannelName(cfg.mesh));
+        channel.settings.id = cfg.mesh.primary_channel_id;
+        const size_t key_len = meshtasticKeyLen(cfg.mesh.primary_key,
+                                                sizeof(cfg.mesh.primary_key),
+                                                cfg.mesh.primary_key_len);
+        if (key_len > 0)
         {
-            channel.settings.psk.size = sizeof(cfg.mesh.primary_key);
+            channel.settings.psk.size = key_len;
             std::memcpy(channel.settings.psk.bytes,
                         cfg.mesh.primary_key,
-                        sizeof(cfg.mesh.primary_key));
+                        key_len);
         }
         else
         {
@@ -1782,13 +1825,19 @@ void MeshtasticPhoneCore::fillChannel(uint8_t idx, meshtastic_Channel* out) cons
     }
     else
     {
-        copyBounded(channel.settings.name, sizeof(channel.settings.name), "Secondary");
-        if (cfg.mesh.secondary_key[0] != 0)
+        copyBounded(channel.settings.name,
+                    sizeof(channel.settings.name),
+                    chat::meshtastic::secondaryChannelName(cfg.mesh));
+        channel.settings.id = cfg.mesh.secondary_channel_id;
+        const size_t key_len = meshtasticKeyLen(cfg.mesh.secondary_key,
+                                                sizeof(cfg.mesh.secondary_key),
+                                                cfg.mesh.secondary_key_len);
+        if (key_len > 0)
         {
-            channel.settings.psk.size = sizeof(cfg.mesh.secondary_key);
+            channel.settings.psk.size = key_len;
             std::memcpy(channel.settings.psk.bytes,
                         cfg.mesh.secondary_key,
-                        sizeof(cfg.mesh.secondary_key));
+                        key_len);
         }
     }
 }
@@ -1806,7 +1855,7 @@ void MeshtasticPhoneCore::fillConfig(meshtastic_AdminMessage_ConfigType type, me
     {
         return;
     }
-    const auto cfg = ctx_.getMeshtasticPhoneConfig();
+    const auto cfg = app_.getMeshtasticPhoneConfig();
     std::memset(out, 0, sizeof(*out));
     meshtastic_Config& cfg_out = *out;
     switch (type)
@@ -1886,7 +1935,7 @@ void MeshtasticPhoneCore::fillConfig(meshtastic_AdminMessage_ConfigType type, me
             cfg_out.payload_variant.bluetooth = bluetooth;
         }
         cfg_out.payload_variant.bluetooth = bluetooth_config_;
-        cfg_out.payload_variant.bluetooth.enabled = ctx_.isBleEnabled();
+        cfg_out.payload_variant.bluetooth.enabled = app_.isBleEnabled();
         break;
     case meshtastic_AdminMessage_ConfigType_SECURITY_CONFIG:
         cfg_out.which_payload_variant = meshtastic_Config_security_tag;
@@ -2065,4 +2114,4 @@ meshtastic_MeshPacket MeshtasticPhoneCore::buildPacketFromData(const chat::MeshI
     return packet;
 }
 
-} // namespace ble
+} // namespace phone::meshtastic
diff --git a/modules/core_chat/src/ble/meshtastic_phone_session.cpp b/modules/core_phone/src/meshtastic/meshtastic_phone_session.cpp
similarity index 87%
rename from modules/core_chat/src/ble/meshtastic_phone_session.cpp
rename to modules/core_phone/src/meshtastic/meshtastic_phone_session.cpp
index 32a953ea..01592850 100644
--- a/modules/core_chat/src/ble/meshtastic_phone_session.cpp
+++ b/modules/core_phone/src/meshtastic/meshtastic_phone_session.cpp
@@ -1,16 +1,16 @@
-#include "chat/ble/meshtastic_phone_session.h"
+#include "phone/meshtastic/meshtastic_phone_session.h"
 
-namespace ble
+namespace phone::meshtastic
 {
 
-MeshtasticPhoneSession::MeshtasticPhoneSession(IPhoneRuntimeContext& ctx, MeshtasticPhoneTransport& transport,
+MeshtasticPhoneSession::MeshtasticPhoneSession(IPhoneAppFacade& app, MeshtasticPhoneTransport& transport,
                                                MeshtasticPhoneBluetoothConfigHooks* bluetooth_config_hooks,
                                                MeshtasticPhoneModuleConfigHooks* module_config_hooks,
                                                MeshtasticPhoneConfigLifecycleHooks* config_lifecycle_hooks,
                                                MeshtasticPhoneStatusHooks* status_hooks,
                                                MeshtasticPhoneMqttHooks* mqtt_hooks,
                                                MeshtasticPhoneDeviceRuntimeHooks* device_runtime_hooks)
-    : core_(ctx,
+    : core_(app,
             transport,
             bluetooth_config_hooks,
             module_config_hooks,
@@ -61,4 +61,4 @@ void MeshtasticPhoneSession::onIncomingData(const chat::MeshIncomingData& msg)
     core_.onIncomingData(msg);
 }
 
-} // namespace ble
+} // namespace phone::meshtastic
diff --git a/modules/core_phone/tests/fake_phone_runtime_context.h b/modules/core_phone/tests/fake_phone_runtime_context.h
new file mode 100644
index 00000000..40891078
--- /dev/null
+++ b/modules/core_phone/tests/fake_phone_runtime_context.h
@@ -0,0 +1,292 @@
+#pragma once
+
+#include "phone/common/phone_app_facade.h"
+
+#include <algorithm>
+#include <vector>
+
+namespace phone::tests
+{
+
+class FakePhoneRuntimeContext final : public IPhoneAppFacade
+{
+  public:
+    MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const override { return meshtastic_config_; }
+    void setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config) override
+    {
+        meshtastic_config_ = config;
+    }
+    MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const override { return meshcore_config_; }
+    void setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config) override
+    {
+        meshcore_config_ = config;
+    }
+    void saveConfig() override { save_config_count++; }
+    void applyMeshConfig() override { apply_mesh_config_count++; }
+    void applyUserInfo() override { apply_user_info_count++; }
+    void applyPositionConfig() override { apply_position_config_count++; }
+    void getEffectiveUserInfo(char* out_long,
+                              std::size_t long_len,
+                              char* out_short,
+                              std::size_t short_len) const override
+    {
+        copyBounded(out_long, long_len, "Trail Mate");
+        copyBounded(out_short, short_len, "TM");
+    }
+
+    chat::NodeId getSelfNodeId() const override { return self_node_id; }
+    bool sendPhoneText(chat::ChannelId,
+                       const std::string&,
+                       chat::MessageId forced_msg_id,
+                       chat::NodeId,
+                       chat::MessageId& out_msg_id) override
+    {
+        send_text_count++;
+        out_msg_id = forced_msg_id != 0 ? forced_msg_id : next_message_id++;
+        return true;
+    }
+    bool sendPhoneAppData(chat::ChannelId,
+                          uint32_t,
+                          const uint8_t* payload,
+                          std::size_t len,
+                          chat::NodeId,
+                          bool,
+                          chat::MessageId,
+                          bool) override
+    {
+        send_app_data_count++;
+        return payload != nullptr || len == 0;
+    }
+    bool pollIncomingPhoneData(chat::MeshIncomingData& out) override
+    {
+        if (incoming_data.empty())
+        {
+            return false;
+        }
+        out = incoming_data.front();
+        incoming_data.erase(incoming_data.begin());
+        return true;
+    }
+    std::size_t phoneNodeCount() const override { return nodes.size(); }
+    bool getPhoneNodeByIndex(std::size_t index, PhoneNodeView& out) const override
+    {
+        if (index >= nodes.size())
+        {
+            return false;
+        }
+        out = nodes[index];
+        return true;
+    }
+    bool findPhoneNode(chat::NodeId node_id, PhoneNodeView& out) const override
+    {
+        for (const auto& node : nodes)
+        {
+            if (node.node_id == node_id)
+            {
+                out = node;
+                return true;
+            }
+        }
+        return false;
+    }
+    bool isMeshPkiReady() const override { return mesh_pki_ready; }
+
+    bool isBleEnabled() const override { return ble_enabled; }
+    void setBleEnabled(bool enabled) override { ble_enabled = enabled; }
+    bool getDeviceMacAddress(uint8_t out_mac[6]) const override
+    {
+        if (!out_mac)
+        {
+            return false;
+        }
+        for (size_t i = 0; i < 6; ++i)
+        {
+            out_mac[i] = mac[i];
+        }
+        return true;
+    }
+    bool syncCurrentEpochSeconds(uint32_t epoch_seconds) override
+    {
+        last_synced_epoch = epoch_seconds;
+        sync_time_count++;
+        return true;
+    }
+    void resetMeshConfig() override { reset_mesh_config_count++; }
+    void clearNodeDb() override { clear_node_db_count++; }
+    void clearMessageDb() override { clear_message_db_count++; }
+    void restartDevice() override { restart_device_count++; }
+
+    bool meshCoreExportIdentityPublicKey(uint8_t* out_pubkey, std::size_t len) override
+    {
+        return copyFixed(out_pubkey, len, meshcore_public_key, sizeof(meshcore_public_key));
+    }
+    bool meshCoreExportIdentityPrivateKey(uint8_t* out_priv, std::size_t len) override
+    {
+        return copyFixed(out_priv, len, meshcore_private_key, sizeof(meshcore_private_key));
+    }
+    bool meshCoreImportIdentityPrivateKey(const uint8_t* in_priv, std::size_t len) override
+    {
+        if (!in_priv || len != sizeof(meshcore_private_key))
+        {
+            return false;
+        }
+        std::copy(in_priv, in_priv + len, meshcore_private_key);
+        return true;
+    }
+    bool meshCoreSignPayload(const uint8_t*, std::size_t, uint8_t* out_sig, std::size_t out_len) override
+    {
+        if (!out_sig || out_len < 64)
+        {
+            return false;
+        }
+        for (std::size_t i = 0; i < 64; ++i)
+        {
+            out_sig[i] = static_cast<uint8_t>(i);
+        }
+        return true;
+    }
+    bool meshCoreSendSelfAdvert(bool) override { return meshcore_backend_ready; }
+    bool meshCoreSendPeerRequestType(const uint8_t*,
+                                     std::size_t,
+                                     uint8_t,
+                                     uint32_t* out_tag,
+                                     uint32_t* out_est_timeout,
+                                     bool* out_sent_flood) override
+    {
+        return markMeshCoreSend(out_tag, out_est_timeout, out_sent_flood);
+    }
+    bool meshCoreSendPeerRequestPayload(const uint8_t*,
+                                        std::size_t,
+                                        const uint8_t*,
+                                        std::size_t,
+                                        bool,
+                                        uint32_t* out_tag,
+                                        uint32_t* out_est_timeout,
+                                        bool* out_sent_flood) override
+    {
+        return markMeshCoreSend(out_tag, out_est_timeout, out_sent_flood);
+    }
+    bool meshCoreSendAnonRequestPayload(const uint8_t*,
+                                        std::size_t,
+                                        const uint8_t*,
+                                        std::size_t,
+                                        uint32_t* out_est_timeout,
+                                        bool* out_sent_flood) override
+    {
+        if (!meshcore_backend_ready)
+        {
+            return false;
+        }
+        if (out_est_timeout)
+        {
+            *out_est_timeout = 0;
+        }
+        if (out_sent_flood)
+        {
+            *out_sent_flood = true;
+        }
+        meshcore_send_count++;
+        return true;
+    }
+    bool meshCoreSendTracePath(const uint8_t*, std::size_t, uint32_t, uint32_t, uint8_t, uint32_t* out_est_timeout) override
+    {
+        if (out_est_timeout)
+        {
+            *out_est_timeout = 0;
+        }
+        meshcore_send_count++;
+        return meshcore_backend_ready;
+    }
+    bool meshCoreSendControlData(const uint8_t*, std::size_t) override
+    {
+        meshcore_send_count++;
+        return meshcore_backend_ready;
+    }
+    bool meshCoreSendRawData(const uint8_t*, std::size_t, const uint8_t*, std::size_t, uint32_t* out_est_timeout) override
+    {
+        if (out_est_timeout)
+        {
+            *out_est_timeout = 0;
+        }
+        meshcore_send_count++;
+        return meshcore_backend_ready;
+    }
+    void meshCoreSetFloodScopeKey(const uint8_t*, std::size_t) override { meshcore_set_flood_scope_count++; }
+
+    chat::NodeId self_node_id = 0x12345678;
+    bool ble_enabled = true;
+    bool mesh_pki_ready = false;
+    bool meshcore_backend_ready = false;
+    uint8_t mac[6] = {1, 2, 3, 4, 5, 6};
+    uint8_t meshcore_public_key[32] = {};
+    uint8_t meshcore_private_key[32] = {};
+    uint32_t last_synced_epoch = 0;
+    int save_config_count = 0;
+    int apply_mesh_config_count = 0;
+    int apply_user_info_count = 0;
+    int apply_position_config_count = 0;
+    int sync_time_count = 0;
+    int reset_mesh_config_count = 0;
+    int clear_node_db_count = 0;
+    int clear_message_db_count = 0;
+    int restart_device_count = 0;
+    int send_text_count = 0;
+    int send_app_data_count = 0;
+    int meshcore_send_count = 0;
+    int meshcore_set_flood_scope_count = 0;
+    chat::MessageId next_message_id = 1;
+    std::vector<PhoneNodeView> nodes;
+    std::vector<chat::MeshIncomingData> incoming_data;
+
+  private:
+    static bool copyFixed(uint8_t* out, std::size_t out_len, const uint8_t* in, std::size_t in_len)
+    {
+        if (!out || !in || out_len < in_len)
+        {
+            return false;
+        }
+        std::copy(in, in + in_len, out);
+        return true;
+    }
+
+    bool markMeshCoreSend(uint32_t* out_tag, uint32_t* out_est_timeout, bool* out_sent_flood)
+    {
+        if (!meshcore_backend_ready)
+        {
+            return false;
+        }
+        if (out_tag)
+        {
+            *out_tag = static_cast<uint32_t>(meshcore_send_count + 1);
+        }
+        if (out_est_timeout)
+        {
+            *out_est_timeout = 0;
+        }
+        if (out_sent_flood)
+        {
+            *out_sent_flood = true;
+        }
+        meshcore_send_count++;
+        return true;
+    }
+
+    static void copyBounded(char* dst, std::size_t dst_len, const char* src)
+    {
+        if (!dst || dst_len == 0)
+        {
+            return;
+        }
+        std::size_t i = 0;
+        for (; src && src[i] != '\0' && i + 1 < dst_len; ++i)
+        {
+            dst[i] = src[i];
+        }
+        dst[i] = '\0';
+    }
+
+    MeshtasticPhoneConfigSnapshot meshtastic_config_{};
+    MeshCorePhoneConfigSnapshot meshcore_config_{};
+};
+
+} // namespace phone::tests
diff --git a/modules/core_phone/tests/test_phone_core_smoke.cpp b/modules/core_phone/tests/test_phone_core_smoke.cpp
new file mode 100644
index 00000000..dd89ba0d
--- /dev/null
+++ b/modules/core_phone/tests/test_phone_core_smoke.cpp
@@ -0,0 +1,238 @@
+#include "fake_phone_runtime_context.h"
+#include "phone/meshcore/meshcore_phone_core.h"
+#include "phone/meshtastic/meshtastic_phone_session.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+
+#include "meshtastic/admin.pb.h"
+#include "meshtastic/portnums.pb.h"
+#include "pb_decode.h"
+#include "pb_encode.h"
+
+namespace
+{
+
+constexpr uint8_t kMeshCoreResponseError = 1;
+constexpr uint8_t kMeshCoreErrorIllegalArg = 6;
+
+class FakeMeshtasticTransport final : public phone::meshtastic::MeshtasticPhoneTransport
+{
+  public:
+    bool isBleConnected() const override { return connected; }
+    void notifyFromNum(uint32_t from_num) override
+    {
+        last_from_num = from_num;
+        notify_count++;
+    }
+
+    bool connected = true;
+    uint32_t last_from_num = 0;
+    int notify_count = 0;
+};
+
+void copyBounded(char* dst, size_t dst_len, const char* src)
+{
+    if (!dst || dst_len == 0)
+    {
+        return;
+    }
+    size_t i = 0;
+    for (; src && src[i] != '\0' && i + 1 < dst_len; ++i)
+    {
+        dst[i] = src[i];
+    }
+    dst[i] = '\0';
+}
+
+bool encodeAdminSetChannelToRadio(uint8_t* out, size_t out_len, size_t& written, uint32_t packet_id)
+{
+    meshtastic_AdminMessage admin = meshtastic_AdminMessage_init_zero;
+    admin.which_payload_variant = meshtastic_AdminMessage_set_channel_tag;
+    admin.set_channel.index = 1;
+    admin.set_channel.has_settings = true;
+    admin.set_channel.role = meshtastic_Channel_Role_SECONDARY;
+    admin.set_channel.settings.channel_num = 1;
+    admin.set_channel.settings.id = 0xAABBCCDD;
+    admin.set_channel.settings.psk.size = 32;
+    for (uint8_t index = 0; index < admin.set_channel.settings.psk.size; ++index)
+    {
+        admin.set_channel.settings.psk.bytes[index] = static_cast<uint8_t>(index + 1);
+    }
+    admin.set_channel.settings.uplink_enabled = true;
+    admin.set_channel.settings.downlink_enabled = true;
+    copyBounded(admin.set_channel.settings.name, sizeof(admin.set_channel.settings.name), "vic");
+
+    meshtastic_MeshPacket packet = meshtastic_MeshPacket_init_zero;
+    packet.id = packet_id;
+    packet.to = 0x12345678;
+    packet.which_payload_variant = meshtastic_MeshPacket_decoded_tag;
+    packet.decoded = meshtastic_Data_init_zero;
+    packet.decoded.portnum = meshtastic_PortNum_ADMIN_APP;
+    packet.decoded.dest = packet.to;
+    packet.decoded.want_response = false;
+
+    pb_ostream_t admin_stream = pb_ostream_from_buffer(packet.decoded.payload.bytes,
+                                                       sizeof(packet.decoded.payload.bytes));
+    if (!pb_encode(&admin_stream, meshtastic_AdminMessage_fields, &admin))
+    {
+        return false;
+    }
+    packet.decoded.payload.size = static_cast<pb_size_t>(admin_stream.bytes_written);
+
+    meshtastic_ToRadio to_radio = meshtastic_ToRadio_init_zero;
+    to_radio.which_payload_variant = meshtastic_ToRadio_packet_tag;
+    to_radio.packet = packet;
+
+    pb_ostream_t to_radio_stream = pb_ostream_from_buffer(out, out_len);
+    if (!pb_encode(&to_radio_stream, meshtastic_ToRadio_fields, &to_radio))
+    {
+        return false;
+    }
+    written = to_radio_stream.bytes_written;
+    return true;
+}
+
+bool encodeWantConfigToRadio(uint8_t* out, size_t out_len, size_t& written, uint32_t nonce)
+{
+    meshtastic_ToRadio to_radio = meshtastic_ToRadio_init_zero;
+    to_radio.which_payload_variant = meshtastic_ToRadio_want_config_id_tag;
+    to_radio.want_config_id = nonce;
+
+    pb_ostream_t to_radio_stream = pb_ostream_from_buffer(out, out_len);
+    if (!pb_encode(&to_radio_stream, meshtastic_ToRadio_fields, &to_radio))
+    {
+        return false;
+    }
+    written = to_radio_stream.bytes_written;
+    return true;
+}
+
+bool decodeFromRadio(const phone::meshtastic::MeshtasticBleFrame& frame, meshtastic_FromRadio& out)
+{
+    out = meshtastic_FromRadio_init_zero;
+    pb_istream_t stream = pb_istream_from_buffer(frame.buf, frame.len);
+    return pb_decode(&stream, meshtastic_FromRadio_fields, &out);
+}
+
+} // namespace
+
+int main()
+{
+    phone::tests::FakePhoneRuntimeContext runtime;
+    FakeMeshtasticTransport transport;
+
+    phone::meshtastic::MeshtasticPhoneSession meshtastic_session(
+        runtime, transport, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
+    const uint8_t invalid_meshtastic[] = {0xFF, 0xFF, 0xFF};
+    assert(!meshtastic_session.handleToRadio(invalid_meshtastic, sizeof(invalid_meshtastic)));
+    meshtastic_session.close();
+
+    phone::tests::FakePhoneRuntimeContext admin_runtime;
+    FakeMeshtasticTransport admin_transport;
+    phone::meshtastic::MeshtasticPhoneSession admin_session(
+        admin_runtime, admin_transport, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
+    constexpr uint32_t kSetChannelPacketId = 0xABCDEF12;
+    uint8_t set_channel_to_radio[meshtastic_ToRadio_size] = {};
+    size_t set_channel_to_radio_len = 0;
+    assert(encodeAdminSetChannelToRadio(set_channel_to_radio,
+                                        sizeof(set_channel_to_radio),
+                                        set_channel_to_radio_len,
+                                        kSetChannelPacketId));
+    assert(admin_session.handleToRadio(set_channel_to_radio, set_channel_to_radio_len));
+    assert(admin_runtime.save_config_count == 1);
+    assert(admin_runtime.apply_mesh_config_count == 1);
+    const auto saved_admin_config = admin_runtime.getMeshtasticPhoneConfig();
+    assert(saved_admin_config.mesh.secondary_key_len == 32);
+    assert(std::memcmp(saved_admin_config.mesh.secondary_key,
+                       "\x01\x02\x03\x04\x05\x06\x07\x08"
+                       "\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10"
+                       "\x11\x12\x13\x14\x15\x16\x17\x18"
+                       "\x19\x1A\x1B\x1C\x1D\x1E\x1F\x20",
+                       32) == 0);
+
+    phone::meshtastic::MeshtasticBleFrame first_frame{};
+    assert(admin_session.popToPhone(&first_frame));
+    meshtastic_FromRadio first_from = meshtastic_FromRadio_init_zero;
+    assert(decodeFromRadio(first_frame, first_from));
+    assert(first_frame.from_num == kSetChannelPacketId);
+    assert(first_from.id == kSetChannelPacketId);
+    assert(first_from.which_payload_variant == meshtastic_FromRadio_queueStatus_tag);
+    assert(first_from.queueStatus.mesh_packet_id == kSetChannelPacketId);
+    assert(first_from.queueStatus.res == 0);
+
+    phone::meshtastic::MeshtasticBleFrame second_frame{};
+    assert(admin_session.popToPhone(&second_frame));
+    meshtastic_FromRadio second_from = meshtastic_FromRadio_init_zero;
+    assert(decodeFromRadio(second_frame, second_from));
+    assert(second_from.id == second_frame.from_num);
+    assert(second_from.which_payload_variant == meshtastic_FromRadio_packet_tag);
+    assert(second_from.packet.decoded.portnum == meshtastic_PortNum_ADMIN_APP);
+    assert(second_from.packet.decoded.request_id == kSetChannelPacketId);
+    meshtastic_AdminMessage admin_response = meshtastic_AdminMessage_init_zero;
+    pb_istream_t admin_response_stream =
+        pb_istream_from_buffer(second_from.packet.decoded.payload.bytes,
+                               second_from.packet.decoded.payload.size);
+    assert(pb_decode(&admin_response_stream, meshtastic_AdminMessage_fields, &admin_response));
+    assert(admin_response.which_payload_variant == meshtastic_AdminMessage_get_channel_response_tag);
+    assert(admin_response.get_channel_response.index == 1);
+    assert(admin_response.get_channel_response.role == meshtastic_Channel_Role_SECONDARY);
+    assert(std::strcmp(admin_response.get_channel_response.settings.name, "vic") == 0);
+    assert(admin_response.get_channel_response.settings.psk.size == 32);
+    assert(std::memcmp(admin_response.get_channel_response.settings.psk.bytes,
+                       saved_admin_config.mesh.secondary_key,
+                       32) == 0);
+    assert(!admin_session.popToPhone(&second_frame));
+
+    phone::tests::FakePhoneRuntimeContext config_runtime;
+    FakeMeshtasticTransport config_transport;
+    phone::meshtastic::MeshtasticPhoneSession config_session(
+        config_runtime, config_transport, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
+    constexpr uint32_t kConfigNonce = 0x00010F2D;
+    uint8_t want_config_to_radio[meshtastic_ToRadio_size] = {};
+    size_t want_config_to_radio_len = 0;
+    assert(encodeWantConfigToRadio(want_config_to_radio,
+                                   sizeof(want_config_to_radio),
+                                   want_config_to_radio_len,
+                                   kConfigNonce));
+    assert(config_session.handleToRadio(want_config_to_radio, want_config_to_radio_len));
+
+    phone::meshtastic::MeshtasticBleFrame config_frame{};
+    assert(config_session.popToPhone(&config_frame));
+    meshtastic_FromRadio config_from = meshtastic_FromRadio_init_zero;
+    assert(decodeFromRadio(config_frame, config_from));
+    assert(config_frame.from_num == kConfigNonce);
+    assert(config_from.id == 0);
+    assert(config_from.which_payload_variant == meshtastic_FromRadio_my_info_tag);
+
+    bool saw_config_complete = false;
+    while (config_session.popToPhone(&config_frame))
+    {
+        config_from = meshtastic_FromRadio_init_zero;
+        assert(decodeFromRadio(config_frame, config_from));
+        if (config_from.which_payload_variant == meshtastic_FromRadio_config_complete_id_tag)
+        {
+            assert(config_frame.from_num == kConfigNonce);
+            assert(config_from.id == 0);
+            assert(config_from.config_complete_id == kConfigNonce);
+            saw_config_complete = true;
+            break;
+        }
+    }
+    assert(saw_config_complete);
+
+    phone::meshcore::MeshCorePhoneCore meshcore_core(runtime, "Trail Mate");
+    assert(!meshcore_core.handleRxFrame(nullptr, 0));
+    const uint8_t unknown_meshcore_cmd[] = {2, 0, 0, 0};
+    assert(meshcore_core.handleRxFrame(unknown_meshcore_cmd, sizeof(unknown_meshcore_cmd)));
+
+    uint8_t out[172] = {};
+    size_t out_len = 0;
+    assert(meshcore_core.popTxFrame(out, &out_len));
+    assert(out_len == 2);
+    assert(out[0] == kMeshCoreResponseError);
+    assert(out[1] == kMeshCoreErrorIllegalArg);
+    return 0;
+}
diff --git a/modules/core_sys/include/app/app_config.h b/modules/core_sys/include/app/app_config.h
index 35373803..8cf9ec39 100644
--- a/modules/core_sys/include/app/app_config.h
+++ b/modules/core_sys/include/app/app_config.h
@@ -97,7 +97,7 @@ struct AppConfig
     bool primary_downlink_enabled;
     bool secondary_uplink_enabled;
     bool secondary_downlink_enabled;
-    uint8_t secondary_key[16]; // PSK for secondary channel
+    uint8_t secondary_key[chat::kMeshtasticChannelKeyMaxLen]; // Legacy mirror of Meshtastic secondary PSK.
 
     // GPS settings
     bool gps_enabled;
@@ -174,7 +174,7 @@ struct AppConfig
         primary_downlink_enabled = false;
         secondary_uplink_enabled = false;
         secondary_downlink_enabled = false;
-        memset(secondary_key, 0, 16);
+        memset(secondary_key, 0, sizeof(secondary_key));
         gps_enabled = true;
         gps_init_baud = 0;
         gps_init_probe_ms = 900;
diff --git a/modules/core_sys/include/platform/ui/README.md b/modules/core_sys/include/platform/ui/README.md
index fb498c11..4a89afbc 100644
--- a/modules/core_sys/include/platform/ui/README.md
+++ b/modules/core_sys/include/platform/ui/README.md
@@ -48,6 +48,9 @@ They must not depend on concrete implementations under `platform/esp/*`,
   lifecycle hooks.
 - `settings_store.h`
   Persistent key/value and blob storage for shared UI/runtime settings.
+- `settings_backup_runtime.h`
+  SD-card Trail-Mate settings backup/restore contract for shared Settings UI
+  while keeping filesystem and platform persistence details out of shared code.
 - `sstv_runtime.h`
   SSTV support and session lifecycle hooks.
 - `team_ui_store_runtime.h`
diff --git a/modules/core_sys/include/platform/ui/settings_backup_runtime.h b/modules/core_sys/include/platform/ui/settings_backup_runtime.h
new file mode 100644
index 00000000..adecdb56
--- /dev/null
+++ b/modules/core_sys/include/platform/ui/settings_backup_runtime.h
@@ -0,0 +1,22 @@
+#pragma once
+
+namespace platform::ui::settings_backup
+{
+
+struct Status
+{
+    bool supported = false;
+    bool sd_present = false;
+    bool has_backup = false;
+    bool busy = false;
+    char message[96] = {};
+    char detail[128] = {};
+};
+
+bool is_supported();
+Status status();
+bool backup();
+bool restore();
+bool remove();
+
+} // namespace platform::ui::settings_backup
diff --git a/modules/product_composition/include/product_composition/app_services_bundle.h b/modules/product_composition/include/product_composition/app_services_bundle.h
new file mode 100644
index 00000000..05e720ff
--- /dev/null
+++ b/modules/product_composition/include/product_composition/app_services_bundle.h
@@ -0,0 +1,30 @@
+#pragma once
+
+namespace chat
+{
+class ChatService;
+
+namespace contacts
+{
+class ContactService;
+} // namespace contacts
+} // namespace chat
+
+namespace product_composition
+{
+
+struct AppServicesBundle
+{
+    chat::ChatService* chat = nullptr;
+    chat::contacts::ContactService* contacts = nullptr;
+
+    // Keep this intentionally small. Add services only when a composition root
+    // actually wires them; this must not become a new AppContext.
+};
+
+inline bool hasChatServices(const AppServicesBundle& bundle)
+{
+    return bundle.chat != nullptr && bundle.contacts != nullptr;
+}
+
+} // namespace product_composition
diff --git a/modules/product_composition/include/product_composition/composition_status.h b/modules/product_composition/include/product_composition/composition_status.h
new file mode 100644
index 00000000..70ac4743
--- /dev/null
+++ b/modules/product_composition/include/product_composition/composition_status.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace product_composition
+{
+
+enum class CompositionStatus
+{
+    Ok,
+    MissingRequiredService,
+    MissingRequiredCapability,
+    UnsupportedTarget,
+    InvalidManifest,
+    RuntimeUnavailable,
+};
+
+} // namespace product_composition
diff --git a/modules/product_composition/include/product_composition/presentation_bundle.h b/modules/product_composition/include/product_composition/presentation_bundle.h
new file mode 100644
index 00000000..2a5c3e61
--- /dev/null
+++ b/modules/product_composition/include/product_composition/presentation_bundle.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+#include "ui_presentation/screen/screen_binding_registry.h"
+#include "ui_presentation/workspace/presentation_workspace.h"
+
+namespace product_composition
+{
+
+struct PresentationBundle
+{
+    ui::workspace::PresentationWorkspace workspace;
+    const ui::menu::MenuModel* ux_menu = nullptr;
+    const ui::screen::ScreenBindingRegistry* screen_bindings = nullptr;
+
+    // Source/sink/model lifetime is owned by the target composition root.
+    // This bundle only exposes the presentation graph to app shells.
+};
+
+inline bool hasInteractivePresentation(const PresentationBundle& bundle)
+{
+    return ui::workspace::hasInteractiveWorkspaceModels(bundle.workspace);
+}
+
+inline bool hasUxMenu(const PresentationBundle& bundle)
+{
+    return bundle.ux_menu != nullptr && bundle.ux_menu->size() > 0;
+}
+
+inline bool hasScreenBindings(const PresentationBundle& bundle)
+{
+    return bundle.screen_bindings != nullptr &&
+           bundle.screen_bindings->size() > 0;
+}
+
+} // namespace product_composition
diff --git a/modules/product_composition/include/product_composition/target_app_shell.h b/modules/product_composition/include/product_composition/target_app_shell.h
new file mode 100644
index 00000000..a77f0d11
--- /dev/null
+++ b/modules/product_composition/include/product_composition/target_app_shell.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace product_composition
+{
+
+class ITargetAppShell
+{
+  public:
+    virtual ~ITargetAppShell() = default;
+
+    virtual bool initialize() = 0;
+    virtual void tick() = 0;
+    virtual void shutdown() = 0;
+};
+
+} // namespace product_composition
diff --git a/modules/product_composition/include/product_composition/target_build_binding.h b/modules/product_composition/include/product_composition/target_build_binding.h
new file mode 100644
index 00000000..5b97960a
--- /dev/null
+++ b/modules/product_composition/include/product_composition/target_build_binding.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstddef>
+
+namespace product_composition
+{
+
+struct TargetBuildBinding
+{
+    const char* target_id;
+    const char* build_entrypoint;
+    const char* app_shell;
+    const char* sdkconfig_defaults;
+    const char* status;
+};
+
+const TargetBuildBinding* findTargetBuildBinding(const char* target_id);
+const TargetBuildBinding* allTargetBuildBindings(std::size_t* count);
+const TargetBuildBinding* esp32LvglTargetBuildBindings(std::size_t* count);
+
+} // namespace product_composition
diff --git a/modules/product_composition/include/product_composition/target_profile.h b/modules/product_composition/include/product_composition/target_profile.h
new file mode 100644
index 00000000..c58009cc
--- /dev/null
+++ b/modules/product_composition/include/product_composition/target_profile.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <cstddef>
+
+namespace product_composition
+{
+
+enum class TargetPlatform
+{
+    EspIdf,
+    PlatformIo,
+    Linux,
+};
+
+enum class TargetRenderer
+{
+    Lvgl,
+    Gtk,
+    Ascii,
+    Headless,
+};
+
+enum class TargetSupportStatus
+{
+    Active,
+    ActiveWithFallback,
+    PendingHardwareValidation,
+    Headless,
+};
+
+struct TargetProfile
+{
+    const char* target_id;
+    const char* board_id;
+    const char* build_entrypoint;
+    const char* app_shell;
+    const char* ux_pack_id;
+    const char* ui_profile_id;
+    const char* page_manifest_id;
+    const char* layout_profile_id;
+    TargetPlatform platform;
+    TargetRenderer renderer;
+    TargetSupportStatus status;
+    bool has_display;
+    bool has_touch;
+    bool has_keyboard;
+    bool has_trackball;
+    bool has_lora;
+    bool has_gps;
+    bool has_audio;
+};
+
+const TargetProfile* findTargetProfile(const char* target_id);
+const TargetProfile* allTargetProfiles(std::size_t* count);
+const TargetProfile* esp32LvglTargetProfiles(std::size_t* count);
+
+} // namespace product_composition
diff --git a/modules/product_composition/include/product_composition/target_ux_binding.h b/modules/product_composition/include/product_composition/target_ux_binding.h
new file mode 100644
index 00000000..53778b5e
--- /dev/null
+++ b/modules/product_composition/include/product_composition/target_ux_binding.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <cstddef>
+
+namespace product_composition
+{
+
+struct TargetUxBinding
+{
+    const char* target_id;
+    const char* desired_ux_pack_id;
+    const char* active_ux_pack_id;
+    const char* fallback_ux_pack_id;
+    bool final_ux_pack_available;
+};
+
+const TargetUxBinding* findTargetUxBinding(const char* target_id);
+const TargetUxBinding* allTargetUxBindings(std::size_t* count);
+
+} // namespace product_composition
diff --git a/modules/product_composition/library.json b/modules/product_composition/library.json
new file mode 100644
index 00000000..105c4a2f
--- /dev/null
+++ b/modules/product_composition/library.json
@@ -0,0 +1,8 @@
+{
+  "name": "product_composition",
+  "version": "0.0.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src"
+  }
+}
diff --git a/modules/product_composition/src/target_build_binding.cpp b/modules/product_composition/src/target_build_binding.cpp
new file mode 100644
index 00000000..c57d5343
--- /dev/null
+++ b/modules/product_composition/src/target_build_binding.cpp
@@ -0,0 +1,122 @@
+#include "product_composition/target_build_binding.h"
+
+#include <cstring>
+
+namespace product_composition
+{
+namespace
+{
+
+constexpr TargetBuildBinding kTargetBuildBindings[] = {
+    {
+        "tab5",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "builds/esp_idf/targets/tab5/sdkconfig.defaults",
+        "migrated",
+    },
+    {
+        "tdisplayp4_tft",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "builds/esp_idf/targets/tdisplayp4_tft/sdkconfig.defaults",
+        "migrated",
+    },
+    {
+        "tdisplayp4_amoled",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "builds/esp_idf/targets/tdisplayp4_amoled/sdkconfig.defaults",
+        "migrated",
+    },
+    {
+        "tlora_pager",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        nullptr,
+        "pending_target_defaults",
+    },
+    {
+        "tdeck",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        nullptr,
+        "pending_target_defaults",
+    },
+    {
+        "twatch",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        nullptr,
+        "pending_target_defaults",
+    },
+    {
+        "uconsole",
+        "builds/linux_cmake",
+        "apps/linux_uconsole_gtk",
+        nullptr,
+        "linux_cmake",
+    },
+    {
+        "cardputerzero",
+        "builds/linux_cmake",
+        "apps/linux_sim_shell",
+        nullptr,
+        "linux_fallback_shell",
+    },
+    {
+        "gat562_mesh_evb_pro",
+        "builds/pio_nrf52",
+        "apps/nrf52_node",
+        nullptr,
+        "platformio",
+    },
+};
+
+} // namespace
+
+const TargetBuildBinding* findTargetBuildBinding(const char* target_id)
+{
+    if (target_id == nullptr)
+    {
+        return nullptr;
+    }
+
+    for (const auto& binding : kTargetBuildBindings)
+    {
+        if (std::strcmp(binding.target_id, target_id) == 0)
+        {
+            return &binding;
+        }
+    }
+    return nullptr;
+}
+
+const TargetBuildBinding* allTargetBuildBindings(std::size_t* count)
+{
+    if (count != nullptr)
+    {
+        *count = sizeof(kTargetBuildBindings) / sizeof(kTargetBuildBindings[0]);
+    }
+    return kTargetBuildBindings;
+}
+
+const TargetBuildBinding* esp32LvglTargetBuildBindings(std::size_t* count)
+{
+    static constexpr TargetBuildBinding kEsp32LvglBuildBindings[] = {
+        kTargetBuildBindings[0],
+        kTargetBuildBindings[1],
+        kTargetBuildBindings[2],
+        kTargetBuildBindings[3],
+        kTargetBuildBindings[4],
+        kTargetBuildBindings[5],
+    };
+
+    if (count != nullptr)
+    {
+        *count = sizeof(kEsp32LvglBuildBindings) / sizeof(kEsp32LvglBuildBindings[0]);
+    }
+    return kEsp32LvglBuildBindings;
+}
+
+} // namespace product_composition
diff --git a/modules/product_composition/src/target_profile.cpp b/modules/product_composition/src/target_profile.cpp
new file mode 100644
index 00000000..0df7b034
--- /dev/null
+++ b/modules/product_composition/src/target_profile.cpp
@@ -0,0 +1,239 @@
+#include "product_composition/target_profile.h"
+
+#include <cstring>
+
+namespace product_composition
+{
+namespace
+{
+
+constexpr TargetProfile kTargetProfiles[] = {
+    {
+        "tab5",
+        "tab5",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "tab5_touch",
+        "tab5_touch_ui",
+        "tab5_touch_manifest",
+        "tab5_large_touch",
+        TargetPlatform::EspIdf,
+        TargetRenderer::Lvgl,
+        TargetSupportStatus::ActiveWithFallback,
+        true,
+        true,
+        false,
+        false,
+        true,
+        true,
+        true,
+    },
+    {
+        "tdisplayp4_tft",
+        "tdisplayp4",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "tdisplayp4_touch",
+        "tdisplayp4_touch_ui",
+        "tdisplayp4_touch_manifest",
+        "tdisplayp4_touch",
+        TargetPlatform::EspIdf,
+        TargetRenderer::Lvgl,
+        TargetSupportStatus::ActiveWithFallback,
+        true,
+        true,
+        false,
+        false,
+        true,
+        true,
+        true,
+    },
+    {
+        "tdisplayp4_amoled",
+        "tdisplayp4",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "tdisplayp4_touch",
+        "tdisplayp4_touch_ui",
+        "tdisplayp4_touch_manifest",
+        "tdisplayp4_touch",
+        TargetPlatform::EspIdf,
+        TargetRenderer::Lvgl,
+        TargetSupportStatus::ActiveWithFallback,
+        true,
+        true,
+        false,
+        false,
+        true,
+        true,
+        true,
+    },
+    {
+        "tlora_pager",
+        "tlora_pager",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "pager_compact",
+        "pager_compact_ui",
+        "pager_compact_manifest",
+        "pager_compact",
+        TargetPlatform::EspIdf,
+        TargetRenderer::Lvgl,
+        TargetSupportStatus::PendingHardwareValidation,
+        true,
+        false,
+        true,
+        false,
+        true,
+        true,
+        true,
+    },
+    {
+        "tdeck",
+        "tdeck",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "deck_full",
+        "deck_wide_ui",
+        "deck_full_manifest",
+        "deck_wide",
+        TargetPlatform::EspIdf,
+        TargetRenderer::Lvgl,
+        TargetSupportStatus::PendingHardwareValidation,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+    },
+    {
+        "twatch",
+        "twatch",
+        "builds/esp_idf",
+        "apps/esp32_lvgl",
+        "watch_compact",
+        "watch_compact_ui",
+        "watch_compact_manifest",
+        "watch_compact",
+        TargetPlatform::EspIdf,
+        TargetRenderer::Lvgl,
+        TargetSupportStatus::PendingHardwareValidation,
+        true,
+        true,
+        false,
+        false,
+        true,
+        false,
+        true,
+    },
+    {
+        "uconsole",
+        "uconsole",
+        "builds/linux_cmake",
+        "apps/linux_uconsole_gtk",
+        "uconsole_desktop",
+        "uconsole_desktop_ui",
+        "uconsole_desktop_manifest",
+        "uconsole_desktop",
+        TargetPlatform::Linux,
+        TargetRenderer::Gtk,
+        TargetSupportStatus::Active,
+        true,
+        false,
+        true,
+        false,
+        true,
+        true,
+        false,
+    },
+    {
+        "cardputerzero",
+        "cardputerzero",
+        "builds/linux_cmake",
+        "apps/linux_sim_shell",
+        "cardputer_compact",
+        "cardputer_compact_ui",
+        "cardputer_compact_manifest",
+        "cardputer_compact",
+        TargetPlatform::Linux,
+        TargetRenderer::Ascii,
+        TargetSupportStatus::ActiveWithFallback,
+        true,
+        false,
+        true,
+        false,
+        false,
+        false,
+        false,
+    },
+    {
+        "gat562_mesh_evb_pro",
+        "gat562_mesh_evb_pro",
+        "builds/pio_nrf52",
+        "apps/nrf52_node",
+        "node_headless",
+        "node_headless_ui",
+        "node_headless_manifest",
+        "headless_node",
+        TargetPlatform::PlatformIo,
+        TargetRenderer::Headless,
+        TargetSupportStatus::Headless,
+        true,
+        false,
+        false,
+        false,
+        true,
+        true,
+        false,
+    },
+};
+
+} // namespace
+
+const TargetProfile* findTargetProfile(const char* target_id)
+{
+    if (target_id == nullptr)
+    {
+        return nullptr;
+    }
+
+    for (const auto& profile : kTargetProfiles)
+    {
+        if (std::strcmp(profile.target_id, target_id) == 0)
+        {
+            return &profile;
+        }
+    }
+    return nullptr;
+}
+
+const TargetProfile* allTargetProfiles(std::size_t* count)
+{
+    if (count != nullptr)
+    {
+        *count = sizeof(kTargetProfiles) / sizeof(kTargetProfiles[0]);
+    }
+    return kTargetProfiles;
+}
+
+const TargetProfile* esp32LvglTargetProfiles(std::size_t* count)
+{
+    static constexpr TargetProfile kEsp32LvglTargets[] = {
+        kTargetProfiles[0],
+        kTargetProfiles[1],
+        kTargetProfiles[2],
+        kTargetProfiles[3],
+        kTargetProfiles[4],
+        kTargetProfiles[5],
+    };
+
+    if (count != nullptr)
+    {
+        *count = sizeof(kEsp32LvglTargets) / sizeof(kEsp32LvglTargets[0]);
+    }
+    return kEsp32LvglTargets;
+}
+
+} // namespace product_composition
diff --git a/modules/product_composition/src/target_ux_binding.cpp b/modules/product_composition/src/target_ux_binding.cpp
new file mode 100644
index 00000000..ba9c1f75
--- /dev/null
+++ b/modules/product_composition/src/target_ux_binding.cpp
@@ -0,0 +1,50 @@
+#include "product_composition/target_ux_binding.h"
+
+#include <cstring>
+
+namespace product_composition
+{
+namespace
+{
+
+constexpr TargetUxBinding kTargetUxBindings[] = {
+    {"tab5", "tab5_touch", "compatibility", "compatibility", false},
+    {"tdisplayp4_tft", "tdisplayp4_touch", "compatibility", "compatibility", false},
+    {"tdisplayp4_amoled", "tdisplayp4_touch", "compatibility", "compatibility", false},
+    {"tlora_pager", "pager_compact", "compatibility", "compatibility", false},
+    {"tdeck", "deck_full", "compatibility", "compatibility", false},
+    {"twatch", "watch_compact", "compatibility", "compatibility", false},
+    {"uconsole", "uconsole_desktop", "uconsole_desktop", nullptr, true},
+    {"cardputerzero", "cardputer_compact", "simulator_full", "simulator_full", false},
+    {"gat562_mesh_evb_pro", "node_headless", "tiny_node_status", "tiny_node_status", false},
+};
+
+} // namespace
+
+const TargetUxBinding* findTargetUxBinding(const char* target_id)
+{
+    if (target_id == nullptr)
+    {
+        return nullptr;
+    }
+
+    for (const auto& binding : kTargetUxBindings)
+    {
+        if (std::strcmp(binding.target_id, target_id) == 0)
+        {
+            return &binding;
+        }
+    }
+    return nullptr;
+}
+
+const TargetUxBinding* allTargetUxBindings(std::size_t* count)
+{
+    if (count != nullptr)
+    {
+        *count = sizeof(kTargetUxBindings) / sizeof(kTargetUxBindings[0]);
+    }
+    return kTargetUxBindings;
+}
+
+} // namespace product_composition
diff --git a/modules/product_composition/tests/test_presentation_bundle_shape.cpp b/modules/product_composition/tests/test_presentation_bundle_shape.cpp
new file mode 100644
index 00000000..fd7c5840
--- /dev/null
+++ b/modules/product_composition/tests/test_presentation_bundle_shape.cpp
@@ -0,0 +1,133 @@
+#include "fake/fake_chat_action_sink.h"
+#include "fake/fake_chat_presentation_source.h"
+
+#include "product_composition/app_services_bundle.h"
+#include "product_composition/composition_status.h"
+#include "product_composition/presentation_bundle.h"
+#include "product_composition/target_app_shell.h"
+#include "ui_presentation/chat/chat_workspace_model.h"
+#include "ui_presentation/menu/menu_model.h"
+#include "ui_presentation/screen/screen_binding_registry.h"
+
+#include <cassert>
+
+namespace chat
+{
+class ChatService
+{
+};
+
+namespace contacts
+{
+class ContactService
+{
+};
+} // namespace contacts
+} // namespace chat
+
+namespace
+{
+
+class FakeShell final : public product_composition::ITargetAppShell
+{
+  public:
+    bool initialize() override
+    {
+        initialized = true;
+        return true;
+    }
+
+    void tick() override
+    {
+        ++ticks;
+    }
+
+    void shutdown() override
+    {
+        shutdown_called = true;
+    }
+
+    bool initialized = false;
+    bool shutdown_called = false;
+    int ticks = 0;
+};
+
+void test_app_services_bundle_is_explicit()
+{
+    product_composition::AppServicesBundle empty;
+    assert(!product_composition::hasChatServices(empty));
+
+    chat::ChatService chat_service;
+    chat::contacts::ContactService contacts;
+
+    product_composition::AppServicesBundle bundle;
+    bundle.chat = &chat_service;
+    assert(!product_composition::hasChatServices(bundle));
+
+    bundle.contacts = &contacts;
+    assert(product_composition::hasChatServices(bundle));
+}
+
+void test_presentation_bundle_exports_workspace_graph()
+{
+    product_composition::PresentationBundle bundle;
+    assert(!product_composition::hasInteractivePresentation(bundle));
+    assert(bundle.ux_menu == nullptr);
+    assert(!product_composition::hasUxMenu(bundle));
+    assert(bundle.screen_bindings == nullptr);
+    assert(!product_composition::hasScreenBindings(bundle));
+
+    ui::tests::FakeChatPresentationSource chat_source;
+    ui::tests::FakeChatActionSink chat_sink;
+    ui::chat::ChatWorkspaceModel chat_model(chat_source, chat_sink);
+
+    bundle.workspace.chat = &chat_model;
+    assert(product_composition::hasInteractivePresentation(bundle));
+    assert(bundle.workspace.hasChat());
+
+    ui::menu::MenuModel ux_menu;
+    assert(ux_menu.add({ui::menu::MenuScreenId::Chat, "Chat", true}));
+    bundle.ux_menu = &ux_menu;
+    assert(bundle.ux_menu != nullptr);
+    assert(bundle.ux_menu->size() == 1);
+    assert(product_composition::hasUxMenu(bundle));
+
+    ui::screen::ScreenBindingRegistry screen_bindings;
+    assert(screen_bindings.add({ui::menu::MenuScreenId::Chat, "chat", true}));
+    bundle.screen_bindings = &screen_bindings;
+    assert(bundle.screen_bindings != nullptr);
+    assert(product_composition::hasScreenBindings(bundle));
+}
+
+void test_target_app_shell_lifecycle_contract()
+{
+    FakeShell shell;
+    assert(shell.initialize());
+    shell.tick();
+    shell.tick();
+    shell.shutdown();
+
+    assert(shell.initialized);
+    assert(shell.ticks == 2);
+    assert(shell.shutdown_called);
+}
+
+void test_composition_status_is_explicit()
+{
+    auto status = product_composition::CompositionStatus::Ok;
+    assert(status == product_composition::CompositionStatus::Ok);
+
+    status = product_composition::CompositionStatus::MissingRequiredService;
+    assert(status != product_composition::CompositionStatus::Ok);
+}
+
+} // namespace
+
+int main()
+{
+    test_app_services_bundle_is_explicit();
+    test_presentation_bundle_exports_workspace_graph();
+    test_target_app_shell_lifecycle_contract();
+    test_composition_status_is_explicit();
+    return 0;
+}
diff --git a/modules/product_composition/tests/test_target_build_binding.cpp b/modules/product_composition/tests/test_target_build_binding.cpp
new file mode 100644
index 00000000..5143572f
--- /dev/null
+++ b/modules/product_composition/tests/test_target_build_binding.cpp
@@ -0,0 +1,65 @@
+#include "product_composition/target_build_binding.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    std::size_t count = 0;
+    const auto* all = product_composition::allTargetBuildBindings(&count);
+    assert(all != nullptr);
+    assert(count == 9);
+
+    const auto* bindings = product_composition::esp32LvglTargetBuildBindings(&count);
+    assert(bindings != nullptr);
+    assert(count == 6);
+
+    const auto* tab5 = product_composition::findTargetBuildBinding("tab5");
+    assert(tab5 != nullptr);
+    assert(std::strcmp(tab5->build_entrypoint, "builds/esp_idf") == 0);
+    assert(std::strcmp(tab5->app_shell, "apps/esp32_lvgl") == 0);
+    assert(std::strcmp(tab5->sdkconfig_defaults,
+                       "builds/esp_idf/targets/tab5/sdkconfig.defaults") == 0);
+
+    const auto* tft = product_composition::findTargetBuildBinding("tdisplayp4_tft");
+    assert(tft != nullptr);
+    assert(std::strcmp(tft->sdkconfig_defaults,
+                       "builds/esp_idf/targets/tdisplayp4_tft/sdkconfig.defaults") == 0);
+
+    const auto* amoled = product_composition::findTargetBuildBinding("tdisplayp4_amoled");
+    assert(amoled != nullptr);
+    assert(std::strcmp(amoled->sdkconfig_defaults,
+                       "builds/esp_idf/targets/tdisplayp4_amoled/sdkconfig.defaults") == 0);
+
+    const auto* pager = product_composition::findTargetBuildBinding("tlora_pager");
+    assert(pager != nullptr);
+    assert(std::strcmp(pager->build_entrypoint, "builds/esp_idf") == 0);
+    assert(pager->sdkconfig_defaults == nullptr);
+    assert(std::strcmp(pager->status, "pending_target_defaults") == 0);
+
+    const auto* deck = product_composition::findTargetBuildBinding("tdeck");
+    assert(deck != nullptr);
+    assert(std::strcmp(deck->build_entrypoint, "builds/esp_idf") == 0);
+
+    const auto* watch = product_composition::findTargetBuildBinding("twatch");
+    assert(watch != nullptr);
+    assert(std::strcmp(watch->build_entrypoint, "builds/esp_idf") == 0);
+
+    const auto* uconsole = product_composition::findTargetBuildBinding("uconsole");
+    assert(uconsole != nullptr);
+    assert(std::strcmp(uconsole->build_entrypoint, "builds/linux_cmake") == 0);
+    assert(std::strcmp(uconsole->app_shell, "apps/linux_uconsole_gtk") == 0);
+
+    const auto* cardputer = product_composition::findTargetBuildBinding("cardputerzero");
+    assert(cardputer != nullptr);
+    assert(std::strcmp(cardputer->build_entrypoint, "builds/linux_cmake") == 0);
+    assert(std::strcmp(cardputer->app_shell, "apps/linux_sim_shell") == 0);
+
+    const auto* gat562 = product_composition::findTargetBuildBinding("gat562_mesh_evb_pro");
+    assert(gat562 != nullptr);
+    assert(std::strcmp(gat562->build_entrypoint, "builds/pio_nrf52") == 0);
+    assert(std::strcmp(gat562->app_shell, "apps/nrf52_node") == 0);
+
+    assert(product_composition::findTargetBuildBinding("unknown") == nullptr);
+    return 0;
+}
diff --git a/modules/product_composition/tests/test_target_profile.cpp b/modules/product_composition/tests/test_target_profile.cpp
new file mode 100644
index 00000000..989f98db
--- /dev/null
+++ b/modules/product_composition/tests/test_target_profile.cpp
@@ -0,0 +1,78 @@
+#include "product_composition/target_profile.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    std::size_t count = 0;
+    const auto* all = product_composition::allTargetProfiles(&count);
+    assert(all != nullptr);
+    assert(count == 9);
+
+    const auto* profiles = product_composition::esp32LvglTargetProfiles(&count);
+    assert(profiles != nullptr);
+    assert(count == 6);
+
+    const auto* tab5 = product_composition::findTargetProfile("tab5");
+    assert(tab5 != nullptr);
+    assert(std::strcmp(tab5->board_id, "tab5") == 0);
+    assert(std::strcmp(tab5->build_entrypoint, "builds/esp_idf") == 0);
+    assert(std::strcmp(tab5->app_shell, "apps/esp32_lvgl") == 0);
+    assert(std::strcmp(tab5->ux_pack_id, "tab5_touch") == 0);
+    assert(std::strcmp(tab5->ui_profile_id, "tab5_touch_ui") == 0);
+    assert(std::strcmp(tab5->page_manifest_id, "tab5_touch_manifest") == 0);
+    assert(std::strcmp(tab5->layout_profile_id, "tab5_large_touch") == 0);
+    assert(tab5->platform == product_composition::TargetPlatform::EspIdf);
+    assert(tab5->renderer == product_composition::TargetRenderer::Lvgl);
+    assert(tab5->status == product_composition::TargetSupportStatus::ActiveWithFallback);
+    assert(tab5->has_display);
+    assert(tab5->has_touch);
+    assert(tab5->has_lora);
+    assert(tab5->has_gps);
+    assert(tab5->has_audio);
+
+    const auto* tft = product_composition::findTargetProfile("tdisplayp4_tft");
+    assert(tft != nullptr);
+    assert(std::strcmp(tft->board_id, "tdisplayp4") == 0);
+
+    const auto* amoled = product_composition::findTargetProfile("tdisplayp4_amoled");
+    assert(amoled != nullptr);
+    assert(std::strcmp(amoled->board_id, "tdisplayp4") == 0);
+
+    const auto* pager = product_composition::findTargetProfile("tlora_pager");
+    assert(pager != nullptr);
+    assert(pager->status == product_composition::TargetSupportStatus::PendingHardwareValidation);
+    assert(pager->has_keyboard);
+    assert(!pager->has_touch);
+
+    const auto* deck = product_composition::findTargetProfile("tdeck");
+    assert(deck != nullptr);
+    assert(deck->has_keyboard);
+    assert(deck->has_trackball);
+
+    const auto* watch = product_composition::findTargetProfile("twatch");
+    assert(watch != nullptr);
+    assert(watch->has_touch);
+    assert(!watch->has_gps);
+
+    const auto* uconsole = product_composition::findTargetProfile("uconsole");
+    assert(uconsole != nullptr);
+    assert(uconsole->renderer == product_composition::TargetRenderer::Gtk);
+    assert(uconsole->platform == product_composition::TargetPlatform::Linux);
+
+    const auto* cardputer = product_composition::findTargetProfile("cardputerzero");
+    assert(cardputer != nullptr);
+    assert(cardputer->renderer == product_composition::TargetRenderer::Ascii);
+
+    const auto* gat562 = product_composition::findTargetProfile("gat562_mesh_evb_pro");
+    assert(gat562 != nullptr);
+    assert(gat562->renderer == product_composition::TargetRenderer::Headless);
+    assert(gat562->status == product_composition::TargetSupportStatus::Headless);
+    assert(gat562->has_display);
+    assert(gat562->has_lora);
+    assert(gat562->has_gps);
+
+    assert(product_composition::findTargetProfile("unknown") == nullptr);
+    return 0;
+}
diff --git a/modules/product_composition/tests/test_target_ux_binding.cpp b/modules/product_composition/tests/test_target_ux_binding.cpp
new file mode 100644
index 00000000..5f19f096
--- /dev/null
+++ b/modules/product_composition/tests/test_target_ux_binding.cpp
@@ -0,0 +1,38 @@
+#include "product_composition/target_ux_binding.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    std::size_t count = 0;
+    const auto* bindings = product_composition::allTargetUxBindings(&count);
+    assert(bindings != nullptr);
+    assert(count == 9);
+
+    const auto* tab5 = product_composition::findTargetUxBinding("tab5");
+    assert(tab5 != nullptr);
+    assert(std::strcmp(tab5->desired_ux_pack_id, "tab5_touch") == 0);
+    assert(std::strcmp(tab5->active_ux_pack_id, "compatibility") == 0);
+    assert(!tab5->final_ux_pack_available);
+
+    const auto* uconsole = product_composition::findTargetUxBinding("uconsole");
+    assert(uconsole != nullptr);
+    assert(std::strcmp(uconsole->desired_ux_pack_id, "uconsole_desktop") == 0);
+    assert(std::strcmp(uconsole->active_ux_pack_id, "uconsole_desktop") == 0);
+    assert(uconsole->fallback_ux_pack_id == nullptr);
+    assert(uconsole->final_ux_pack_available);
+
+    const auto* cardputer = product_composition::findTargetUxBinding("cardputerzero");
+    assert(cardputer != nullptr);
+    assert(std::strcmp(cardputer->desired_ux_pack_id, "cardputer_compact") == 0);
+    assert(std::strcmp(cardputer->active_ux_pack_id, "simulator_full") == 0);
+
+    const auto* gat562 = product_composition::findTargetUxBinding("gat562_mesh_evb_pro");
+    assert(gat562 != nullptr);
+    assert(std::strcmp(gat562->desired_ux_pack_id, "node_headless") == 0);
+    assert(std::strcmp(gat562->active_ux_pack_id, "tiny_node_status") == 0);
+
+    assert(product_composition::findTargetUxBinding("unknown") == nullptr);
+    return 0;
+}
diff --git a/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_descriptor_renderer.h b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_descriptor_renderer.h
new file mode 100644
index 00000000..af3a1993
--- /dev/null
+++ b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_descriptor_renderer.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "ui_ascii_runtime/ascii_runtime_entry_adoption.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cstddef>
+
+namespace trailmate::linux_sim
+{
+
+struct AsciiRenderLine
+{
+    const char* text = nullptr;
+    bool enabled = false;
+};
+
+class AsciiDescriptorRenderer
+{
+  public:
+    bool render(const AsciiRuntimeEntryAdoption& adoption);
+
+    std::size_t lineCount() const noexcept;
+    const AsciiRenderLine* lines() const noexcept;
+    const char* line(std::size_t index) const noexcept;
+
+  private:
+    static constexpr std::size_t kMaxLineLength = 96;
+
+    char line_storage_[ui::menu::MenuModel::kMaxItems][kMaxLineLength]{};
+    AsciiRenderLine lines_[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t line_count_ = 0;
+};
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_menu_runtime_adapter.h b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_menu_runtime_adapter.h
new file mode 100644
index 00000000..cf925c80
--- /dev/null
+++ b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_menu_runtime_adapter.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+#include "ui_presentation/screen/screen_route.h"
+
+#include <cstddef>
+
+namespace trailmate::linux_sim
+{
+
+struct AsciiMenuLine
+{
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    ui::screen::ScreenRoute route{};
+    const char* label = nullptr;
+    bool enabled = false;
+};
+
+class AsciiMenuRuntimeAdapter
+{
+  public:
+    bool buildLines(const ui::menu::MenuModel& menu,
+                    AsciiMenuLine* out,
+                    std::size_t capacity,
+                    std::size_t& out_count) const;
+};
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_entry_adoption.h b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_entry_adoption.h
new file mode 100644
index 00000000..07514418
--- /dev/null
+++ b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_entry_adoption.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h"
+
+#include <cstddef>
+
+namespace trailmate::linux_sim
+{
+
+class AsciiRuntimeEntryAdoption
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    bool ready() const;
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const AsciiRuntimeScreenGraphPresenter& presenter() const;
+
+  private:
+    AsciiRuntimeScreenGraphPresenter presenter_{};
+    bool ready_ = false;
+};
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h
new file mode 100644
index 00000000..77a31c60
--- /dev/null
+++ b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_ascii_runtime/ascii_screen_graph_bridge.h"
+
+#include <cstddef>
+
+namespace trailmate::linux_sim
+{
+
+class AsciiRuntimeScreenGraphPresenter
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const AsciiMenuLine* menuLines() const;
+    const AsciiScreenDescriptor* screens() const;
+
+  private:
+    AsciiScreenGraphBridge bridge_{};
+};
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h
new file mode 100644
index 00000000..ba10c78f
--- /dev/null
+++ b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_ascii_runtime/ascii_menu_runtime_adapter.h"
+#include "ui_ascii_runtime/ascii_screen_host_adapter.h"
+
+#include <cstddef>
+
+namespace trailmate::linux_sim
+{
+
+struct AsciiScreenGraph
+{
+    AsciiMenuLine menu_lines[ui::menu::MenuModel::kMaxItems]{};
+    AsciiScreenDescriptor screens[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t menu_count = 0;
+    std::size_t screen_count = 0;
+};
+
+class AsciiScreenGraphBridge
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const AsciiMenuLine* menuItems() const;
+    const AsciiScreenDescriptor* screenItems() const;
+    const AsciiScreenGraph& graph() const;
+
+  private:
+    AsciiMenuRuntimeAdapter menu_adapter_{};
+    AsciiScreenHostAdapter screen_host_{};
+    AsciiScreenGraph graph_{};
+};
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_host_adapter.h b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_host_adapter.h
new file mode 100644
index 00000000..1b3c8c13
--- /dev/null
+++ b/modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_host_adapter.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "ui_presentation/screen/screen_route.h"
+
+namespace trailmate::linux_sim
+{
+
+struct AsciiScreenDescriptor
+{
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    const char* binding_id = nullptr;
+    bool available = false;
+};
+
+class AsciiScreenHostAdapter
+{
+  public:
+    bool resolve(const ui::screen::ScreenRoute& route,
+                 AsciiScreenDescriptor& out) const;
+};
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/src/ascii_descriptor_renderer.cpp b/modules/ui_ascii_runtime/src/ascii_descriptor_renderer.cpp
new file mode 100644
index 00000000..865cf577
--- /dev/null
+++ b/modules/ui_ascii_runtime/src/ascii_descriptor_renderer.cpp
@@ -0,0 +1,75 @@
+#include "ui_ascii_runtime/ascii_descriptor_renderer.h"
+
+#include <cstdio>
+
+namespace trailmate::linux_sim
+{
+
+namespace
+{
+
+const char* bindingForScreen(const AsciiRuntimeScreenGraphPresenter& presenter,
+                             ui::menu::MenuScreenId screen_id)
+{
+    for (std::size_t index = 0; index < presenter.screenCount(); ++index)
+    {
+        const AsciiScreenDescriptor& screen = presenter.screens()[index];
+        if (screen.screen_id == screen_id && screen.available &&
+            screen.binding_id != nullptr)
+        {
+            return screen.binding_id;
+        }
+    }
+    return "unbound";
+}
+
+} // namespace
+
+bool AsciiDescriptorRenderer::render(
+    const AsciiRuntimeEntryAdoption& adoption)
+{
+    line_count_ = 0;
+    if (!adoption.ready())
+    {
+        return false;
+    }
+
+    const AsciiRuntimeScreenGraphPresenter& presenter = adoption.presenter();
+    const std::size_t count = presenter.menuCount();
+    for (std::size_t index = 0;
+         index < count && line_count_ < ui::menu::MenuModel::kMaxItems; ++index)
+    {
+        const AsciiMenuLine& item = presenter.menuLines()[index];
+        const char* label = item.label != nullptr ? item.label : "(untitled)";
+        const char* binding = bindingForScreen(presenter, item.screen_id);
+        const char* state = item.enabled ? "enabled" : "disabled";
+        std::snprintf(line_storage_[line_count_],
+                      kMaxLineLength,
+                      "%s | %s | %s",
+                      label,
+                      binding,
+                      state);
+        lines_[line_count_].text = line_storage_[line_count_];
+        lines_[line_count_].enabled = item.enabled;
+        ++line_count_;
+    }
+
+    return line_count_ > 0;
+}
+
+std::size_t AsciiDescriptorRenderer::lineCount() const noexcept
+{
+    return line_count_;
+}
+
+const AsciiRenderLine* AsciiDescriptorRenderer::lines() const noexcept
+{
+    return lines_;
+}
+
+const char* AsciiDescriptorRenderer::line(std::size_t index) const noexcept
+{
+    return index < line_count_ ? lines_[index].text : nullptr;
+}
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp b/modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp
new file mode 100644
index 00000000..ff578117
--- /dev/null
+++ b/modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp
@@ -0,0 +1,46 @@
+#include "ui_ascii_runtime/ascii_menu_runtime_adapter.h"
+
+namespace trailmate::linux_sim
+{
+
+bool AsciiMenuRuntimeAdapter::buildLines(const ui::menu::MenuModel& menu,
+                                         AsciiMenuLine* out,
+                                         std::size_t capacity,
+                                         std::size_t& out_count) const
+{
+    out_count = 0;
+
+    if (menu.size() == 0)
+    {
+        return true;
+    }
+
+    if (out == nullptr)
+    {
+        return false;
+    }
+
+    for (std::size_t index = 0; index < menu.size(); ++index)
+    {
+        const ui::menu::MenuItem& item = menu.items()[index];
+        if (!item.enabled)
+        {
+            continue;
+        }
+
+        if (out_count >= capacity)
+        {
+            return false;
+        }
+
+        out[out_count].screen_id = item.screen_id;
+        out[out_count].route = ui::screen::routeForMenuScreen(item.screen_id);
+        out[out_count].label = item.label;
+        out[out_count].enabled = item.enabled;
+        ++out_count;
+    }
+
+    return true;
+}
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp b/modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp
new file mode 100644
index 00000000..a06c39af
--- /dev/null
+++ b/modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp
@@ -0,0 +1,34 @@
+#include "ui_ascii_runtime/ascii_runtime_entry_adoption.h"
+
+namespace trailmate::linux_sim
+{
+
+bool AsciiRuntimeEntryAdoption::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    ready_ = presenter_.load(presentation);
+    return ready_;
+}
+
+bool AsciiRuntimeEntryAdoption::ready() const
+{
+    return ready_;
+}
+
+std::size_t AsciiRuntimeEntryAdoption::menuCount() const
+{
+    return ready_ ? presenter_.menuCount() : 0;
+}
+
+std::size_t AsciiRuntimeEntryAdoption::screenCount() const
+{
+    return ready_ ? presenter_.screenCount() : 0;
+}
+
+const AsciiRuntimeScreenGraphPresenter&
+AsciiRuntimeEntryAdoption::presenter() const
+{
+    return presenter_;
+}
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/src/ascii_runtime_screen_graph_presenter.cpp b/modules/ui_ascii_runtime/src/ascii_runtime_screen_graph_presenter.cpp
new file mode 100644
index 00000000..b8daa23b
--- /dev/null
+++ b/modules/ui_ascii_runtime/src/ascii_runtime_screen_graph_presenter.cpp
@@ -0,0 +1,39 @@
+#include "ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h"
+
+namespace trailmate::linux_sim
+{
+
+bool AsciiRuntimeScreenGraphPresenter::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    if (!product_composition::hasUxMenu(presentation) ||
+        !product_composition::hasScreenBindings(presentation))
+    {
+        return false;
+    }
+
+    return bridge_.load(presentation);
+}
+
+std::size_t AsciiRuntimeScreenGraphPresenter::menuCount() const
+{
+    return bridge_.menuCount();
+}
+
+std::size_t AsciiRuntimeScreenGraphPresenter::screenCount() const
+{
+    return bridge_.screenCount();
+}
+
+const AsciiMenuLine* AsciiRuntimeScreenGraphPresenter::menuLines() const
+{
+    return bridge_.menuItems();
+}
+
+const AsciiScreenDescriptor*
+AsciiRuntimeScreenGraphPresenter::screens() const
+{
+    return bridge_.screenItems();
+}
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp b/modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp
new file mode 100644
index 00000000..deb01b0a
--- /dev/null
+++ b/modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp
@@ -0,0 +1,90 @@
+#include "ui_ascii_runtime/ascii_screen_graph_bridge.h"
+
+namespace trailmate::linux_sim
+{
+namespace
+{
+
+using MenuRuntimeAdapterContract = AsciiMenuRuntimeAdapter;
+using ScreenHostAdapterContract = AsciiScreenHostAdapter;
+
+void resetGraph(AsciiScreenGraph& graph)
+{
+    graph.menu_count = 0;
+    graph.screen_count = 0;
+}
+
+} // namespace
+
+bool AsciiScreenGraphBridge::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    resetGraph(graph_);
+
+    if (!product_composition::hasUxMenu(presentation) ||
+        !product_composition::hasScreenBindings(presentation))
+    {
+        return false;
+    }
+
+    if (!menu_adapter_.buildLines(*presentation.ux_menu,
+                                  graph_.menu_lines,
+                                  ui::menu::MenuModel::kMaxItems,
+                                  graph_.menu_count))
+    {
+        resetGraph(graph_);
+        return false;
+    }
+
+    for (std::size_t index = 0; index < graph_.menu_count; ++index)
+    {
+        const AsciiMenuLine& line = graph_.menu_lines[index];
+        if (!line.route.valid)
+        {
+            continue;
+        }
+
+        AsciiScreenDescriptor screen;
+        if (!screen_host_.resolve(line.route, screen))
+        {
+            continue;
+        }
+
+        if (presentation.screen_bindings->find(screen.screen_id) == nullptr)
+        {
+            continue;
+        }
+
+        graph_.screens[graph_.screen_count] = screen;
+        ++graph_.screen_count;
+    }
+
+    return graph_.menu_count > 0 && graph_.screen_count > 0;
+}
+
+std::size_t AsciiScreenGraphBridge::menuCount() const
+{
+    return graph_.menu_count;
+}
+
+std::size_t AsciiScreenGraphBridge::screenCount() const
+{
+    return graph_.screen_count;
+}
+
+const AsciiMenuLine* AsciiScreenGraphBridge::menuItems() const
+{
+    return graph_.menu_lines;
+}
+
+const AsciiScreenDescriptor* AsciiScreenGraphBridge::screenItems() const
+{
+    return graph_.screens;
+}
+
+const AsciiScreenGraph& AsciiScreenGraphBridge::graph() const
+{
+    return graph_;
+}
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp b/modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp
new file mode 100644
index 00000000..940c5a16
--- /dev/null
+++ b/modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp
@@ -0,0 +1,42 @@
+#include "ui_ascii_runtime/ascii_screen_host_adapter.h"
+
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+
+namespace trailmate::linux_sim
+{
+namespace
+{
+
+void clearDescriptor(AsciiScreenDescriptor& out)
+{
+    out.screen_id = ui::menu::MenuScreenId::Dashboard;
+    out.binding_id = nullptr;
+    out.available = false;
+}
+
+} // namespace
+
+bool AsciiScreenHostAdapter::resolve(const ui::screen::ScreenRoute& route,
+                                     AsciiScreenDescriptor& out) const
+{
+    if (!route.valid)
+    {
+        clearDescriptor(out);
+        return false;
+    }
+
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    ui_lvgl_ux::CompatibilityScreenDescriptor descriptor;
+    if (!factory.describe(route.screen_id, descriptor))
+    {
+        clearDescriptor(out);
+        return false;
+    }
+
+    out.screen_id = descriptor.screen_id;
+    out.binding_id = descriptor.binding_id;
+    out.available = descriptor.available;
+    return true;
+}
+
+} // namespace trailmate::linux_sim
diff --git a/modules/ui_ascii_runtime/tests/ascii_menu_runtime_adapter_smoke.cpp b/modules/ui_ascii_runtime/tests/ascii_menu_runtime_adapter_smoke.cpp
new file mode 100644
index 00000000..1adab9a9
--- /dev/null
+++ b/modules/ui_ascii_runtime/tests/ascii_menu_runtime_adapter_smoke.cpp
@@ -0,0 +1,42 @@
+#include "linux_sim_composition_root.h"
+#include "ui_ascii_runtime/ascii_menu_runtime_adapter.h"
+
+#include "product_composition/presentation_bundle.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+
+int main()
+{
+    trailmate::linux_sim::LinuxSimCompositionRoot root;
+    assert(root.initialize());
+    assert(root.presentation().ux_menu != nullptr);
+    assert(product_composition::hasUxMenu(root.presentation()));
+
+    trailmate::linux_sim::AsciiMenuRuntimeAdapter adapter;
+    trailmate::linux_sim::AsciiMenuLine lines[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t count = 0;
+
+    assert(adapter.buildLines(*root.presentation().ux_menu,
+                              lines,
+                              ui::menu::MenuModel::kMaxItems,
+                              count));
+    assert(count > 0);
+
+    bool found_chat = false;
+    for (std::size_t index = 0; index < count; ++index)
+    {
+        assert(lines[index].enabled);
+        assert(lines[index].route.valid);
+        assert(lines[index].route.screen_id == lines[index].screen_id);
+        assert(lines[index].label != nullptr);
+        if (std::strcmp(lines[index].label, "Chat") == 0)
+        {
+            found_chat = true;
+        }
+    }
+
+    assert(found_chat);
+    return 0;
+}
diff --git a/modules/ui_ascii_runtime/tests/ascii_runtime_entry_adoption_smoke.cpp b/modules/ui_ascii_runtime/tests/ascii_runtime_entry_adoption_smoke.cpp
new file mode 100644
index 00000000..82207054
--- /dev/null
+++ b/modules/ui_ascii_runtime/tests/ascii_runtime_entry_adoption_smoke.cpp
@@ -0,0 +1,28 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_ascii_runtime/ascii_runtime_entry_adoption.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("simulator_full", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    trailmate::linux_sim::AsciiRuntimeEntryAdoption adoption;
+    assert(adoption.load(presentation));
+    assert(adoption.ready());
+    assert(adoption.menuCount() > 0);
+    assert(adoption.screenCount() > 0);
+    assert(adoption.presenter().menuLines()[0].route.valid);
+    return 0;
+}
diff --git a/modules/ui_ascii_runtime/tests/ascii_runtime_screen_graph_presenter_smoke.cpp b/modules/ui_ascii_runtime/tests/ascii_runtime_screen_graph_presenter_smoke.cpp
new file mode 100644
index 00000000..13f783cb
--- /dev/null
+++ b/modules/ui_ascii_runtime/tests/ascii_runtime_screen_graph_presenter_smoke.cpp
@@ -0,0 +1,53 @@
+#include "linux_sim_composition_root.h"
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+
+namespace
+{
+
+bool containsScreen(const trailmate::linux_sim::AsciiRuntimeScreenGraphPresenter& presenter,
+                    ui::menu::MenuScreenId screen_id,
+                    const char* binding_id)
+{
+    for (std::size_t index = 0; index < presenter.screenCount(); ++index)
+    {
+        const trailmate::linux_sim::AsciiScreenDescriptor& screen =
+            presenter.screens()[index];
+        if (screen.screen_id == screen_id && screen.available &&
+            screen.binding_id != nullptr &&
+            std::strcmp(screen.binding_id, binding_id) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    trailmate::linux_sim::LinuxSimCompositionRoot root;
+    assert(root.initialize());
+    assert(product_composition::hasUxMenu(root.presentation()));
+    assert(product_composition::hasScreenBindings(root.presentation()));
+
+    trailmate::linux_sim::AsciiRuntimeScreenGraphPresenter presenter;
+    assert(presenter.load(root.presentation()));
+    assert(presenter.menuCount() > 0);
+    assert(presenter.screenCount() > 0);
+    assert(presenter.menuLines()[0].route.valid);
+
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Chat, "chat"));
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Map, "map"));
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Settings, "settings"));
+
+    product_composition::PresentationBundle empty;
+    assert(!presenter.load(empty));
+    return 0;
+}
diff --git a/modules/ui_ascii_runtime/tests/ascii_screen_graph_bridge_smoke.cpp b/modules/ui_ascii_runtime/tests/ascii_screen_graph_bridge_smoke.cpp
new file mode 100644
index 00000000..e21e8d61
--- /dev/null
+++ b/modules/ui_ascii_runtime/tests/ascii_screen_graph_bridge_smoke.cpp
@@ -0,0 +1,56 @@
+#include "linux_sim_composition_root.h"
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_ascii_runtime/ascii_screen_graph_bridge.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+
+namespace
+{
+
+bool containsScreen(const trailmate::linux_sim::AsciiScreenGraphBridge& bridge,
+                    ui::menu::MenuScreenId screen_id,
+                    const char* binding_id)
+{
+    for (std::size_t index = 0; index < bridge.screenCount(); ++index)
+    {
+        const trailmate::linux_sim::AsciiScreenDescriptor& screen =
+            bridge.screenItems()[index];
+        if (screen.screen_id == screen_id && screen.available &&
+            screen.binding_id != nullptr &&
+            std::strcmp(screen.binding_id, binding_id) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    trailmate::linux_sim::LinuxSimCompositionRoot root;
+    assert(root.initialize());
+    assert(root.presentation().ux_menu != nullptr);
+    assert(product_composition::hasUxMenu(root.presentation()));
+    assert(product_composition::hasScreenBindings(root.presentation()));
+
+    trailmate::linux_sim::AsciiScreenGraphBridge bridge;
+    assert(bridge.load(root.presentation()));
+    assert(bridge.menuCount() > 0);
+    assert(bridge.screenCount() > 0);
+    assert(bridge.graph().menu_count == bridge.menuCount());
+    assert(bridge.graph().screen_count == bridge.screenCount());
+    const ui::screen::ScreenRoute route = bridge.menuItems()[0].route;
+    assert(route.valid);
+
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Dashboard, "dashboard"));
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Chat, "chat"));
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Map, "map"));
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Gps, "gps"));
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Settings, "settings"));
+    return 0;
+}
diff --git a/modules/ui_ascii_runtime/tests/ascii_screen_host_adapter_smoke.cpp b/modules/ui_ascii_runtime/tests/ascii_screen_host_adapter_smoke.cpp
new file mode 100644
index 00000000..93fb88b2
--- /dev/null
+++ b/modules/ui_ascii_runtime/tests/ascii_screen_host_adapter_smoke.cpp
@@ -0,0 +1,50 @@
+#include "linux_sim_composition_root.h"
+#include "ui_ascii_runtime/ascii_menu_runtime_adapter.h"
+#include "ui_ascii_runtime/ascii_screen_host_adapter.h"
+
+#include "product_composition/presentation_bundle.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+
+int main()
+{
+    trailmate::linux_sim::LinuxSimCompositionRoot root;
+    assert(root.initialize());
+    assert(root.presentation().ux_menu != nullptr);
+    assert(product_composition::hasUxMenu(root.presentation()));
+    assert(product_composition::hasScreenBindings(root.presentation()));
+
+    trailmate::linux_sim::AsciiMenuRuntimeAdapter menu_adapter;
+    trailmate::linux_sim::AsciiMenuLine lines[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t line_count = 0;
+    assert(menu_adapter.buildLines(*root.presentation().ux_menu,
+                                   lines,
+                                   ui::menu::MenuModel::kMaxItems,
+                                   line_count));
+    assert(line_count > 0);
+
+    const trailmate::linux_sim::AsciiMenuLine* chat_line = nullptr;
+    for (std::size_t index = 0; index < line_count; ++index)
+    {
+        if (lines[index].screen_id == ui::menu::MenuScreenId::Chat)
+        {
+            chat_line = &lines[index];
+            break;
+        }
+    }
+
+    assert(chat_line != nullptr);
+    assert(chat_line->route.valid);
+    const ui::screen::ScreenRoute route = chat_line->route;
+
+    trailmate::linux_sim::AsciiScreenHostAdapter screen_host;
+    trailmate::linux_sim::AsciiScreenDescriptor screen;
+    assert(screen_host.resolve(route, screen));
+    assert(screen.available);
+    assert(screen.screen_id == ui::menu::MenuScreenId::Chat);
+    assert(std::strcmp(screen.binding_id, "chat") == 0);
+    assert(root.presentation().screen_bindings->find(screen.screen_id) != nullptr);
+    return 0;
+}
diff --git a/modules/ui_ascii_runtime/tests/test_ascii_descriptor_renderer.cpp b/modules/ui_ascii_runtime/tests/test_ascii_descriptor_renderer.cpp
new file mode 100644
index 00000000..ed17ec72
--- /dev/null
+++ b/modules/ui_ascii_runtime/tests/test_ascii_descriptor_renderer.cpp
@@ -0,0 +1,35 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_ascii_runtime/ascii_descriptor_renderer.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("simulator_full", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    trailmate::linux_sim::AsciiRuntimeEntryAdoption adoption;
+    assert(adoption.load(presentation));
+
+    trailmate::linux_sim::AsciiDescriptorRenderer renderer;
+    assert(renderer.render(adoption));
+    assert(renderer.lineCount() > 0);
+    assert(renderer.lines() != nullptr);
+    assert(renderer.lines()[0].text != nullptr);
+    assert(renderer.line(0) != nullptr);
+
+    trailmate::linux_sim::AsciiRuntimeEntryAdoption empty;
+    assert(!renderer.render(empty));
+    assert(renderer.lineCount() == 0);
+    return 0;
+}
diff --git a/modules/ui_chat_runtime/README.md b/modules/ui_chat_runtime/README.md
new file mode 100644
index 00000000..36e035e9
--- /dev/null
+++ b/modules/ui_chat_runtime/README.md
@@ -0,0 +1,20 @@
+# ui_chat_runtime
+
+Chat runtime scheduling helpers.
+
+May contain:
+
+- chat event pump
+- UI refresh sink ports
+- chat page runtime scheduling helpers
+
+Must not contain:
+
+- LVGL widget trees
+- app shell startup
+- build entrypoints
+- board facts
+- renderer-specific layout
+
+This module was split from `modules/ui_shared` during the Phase 8 structural
+migration batch. The old `ui/screens/chat/*` headers remain forwarding headers.
diff --git a/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h
new file mode 100644
index 00000000..14542e0e
--- /dev/null
+++ b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_action_sink.h"
+#include "chat/delivery/chat_delivery_action_types.h"
+
+namespace ui_chat_runtime
+{
+
+using ChatDeliveryActionRequest =
+    ::chat::delivery::ChatDeliveryActionRequest;
+using ChatDeliveryActionResult =
+    ::chat::delivery::ChatDeliveryActionResult;
+using IChatDeliveryActionPort =
+    ::chat::delivery::IChatDeliveryActionSink;
+
+} // namespace ui_chat_runtime
diff --git a/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h
new file mode 100644
index 00000000..9ddfbb0b
--- /dev/null
+++ b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_types.h"
+#include "ui_chat_runtime/chat_delivery_action_port.h"
+#include "ui_presentation/chat/chat_message_ref.h"
+
+namespace ui_chat_runtime
+{
+
+class ChatDeliveryActionPortAdapter
+{
+  public:
+    explicit ChatDeliveryActionPortAdapter(
+        IChatDeliveryActionPort& action_port);
+
+    ChatDeliveryActionResult handleMessageAction(
+        ::chat::delivery::ChatDeliveryActionKind kind,
+        const ::ui::chat::MessageRef& ref);
+
+    ChatDeliveryActionResult retryMessage(const ::ui::chat::MessageRef& ref);
+    ChatDeliveryActionResult cancelPending(const ::ui::chat::MessageRef& ref);
+    ChatDeliveryActionResult clearFailure(const ::ui::chat::MessageRef& ref);
+
+  private:
+    IChatDeliveryActionPort& action_port_;
+};
+
+::chat::delivery::ChatDeliveryRef toDeliveryRef(
+    const ::ui::chat::MessageRef& ref);
+
+} // namespace ui_chat_runtime
diff --git a/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h
new file mode 100644
index 00000000..112ba3db
--- /dev/null
+++ b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_event_port.h"
+
+namespace ui_chat_runtime
+{
+
+using ChatDeliveryEvent = ::chat::delivery::ChatDeliveryEvent;
+using IChatDeliveryEventPort = ::chat::delivery::IChatDeliveryEventPort;
+
+} // namespace ui_chat_runtime
diff --git a/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h
new file mode 100644
index 00000000..d53ff6a1
--- /dev/null
+++ b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "chat/delivery/legacy_chat_send_result_mapper.h"
+#include "chat/domain/chat_types.h"
+#include "ui_chat_runtime/chat_delivery_event_port.h"
+
+namespace chat
+{
+class ChatService;
+}
+
+namespace sys
+{
+struct ChatSendResultEvent;
+}
+
+namespace ui_chat_runtime
+{
+
+class ChatDeliveryEventProjectionAdapter
+{
+  public:
+    ChatDeliveryEventProjectionAdapter(
+        ::chat::ChatService& chat_service,
+        IChatDeliveryEventPort& delivery_events);
+
+    void onChatSendResult(const ::sys::ChatSendResultEvent& event);
+    void onAckTimeout(::chat::MessageId msg_id, uint32_t timestamp_ms = 0);
+
+  private:
+    bool publishSendResult(::chat::MessageId msg_id,
+                           bool success,
+                           ::chat::delivery::LegacyChatSendFailure failure,
+                           uint32_t timestamp_ms);
+
+    ::chat::ChatService& chat_service_;
+    IChatDeliveryEventPort& delivery_events_;
+};
+
+} // namespace ui_chat_runtime
diff --git a/modules/ui_chat_runtime/include/ui_chat_runtime/chat_page_runtime_event_pump.h b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_page_runtime_event_pump.h
new file mode 100644
index 00000000..2cad5758
--- /dev/null
+++ b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_page_runtime_event_pump.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "chat/domain/chat_types.h"
+#include "chat/usecase/chat_service.h"
+#include "sys/event_bus.h"
+#include "ui/screens/chat/chat_protocol_support.h"
+#include "ui_chat_runtime/chat_ui_refresh_sink.h"
+#include "ui_presentation/key_verification/key_verification_model.h"
+
+namespace ui_chat_runtime
+{
+class ChatDeliveryEventProjectionAdapter;
+}
+
+namespace ui_key_verification_runtime
+{
+class KeyVerificationPresentationSource;
+}
+
+namespace chat::ui
+{
+
+class ChatPageRuntimeEventPump
+{
+  public:
+    ChatPageRuntimeEventPump(
+        chat::ChatService& service,
+        ::ui_chat_runtime::ChatDeliveryEventProjectionAdapter*
+            delivery_adapter,
+        ::ui_key_verification_runtime::KeyVerificationPresentationSource*
+            key_verification_source,
+        ::ui::key_verification::KeyVerificationModel* key_verification_model,
+        IChatUiRefreshSink* ui);
+
+    void update();
+    void handleEvent(sys::Event* event);
+
+  private:
+    void handleChatNewMessage(const sys::ChatNewMessageEvent& event);
+    void handleChatSendResult(const sys::ChatSendResultEvent& event);
+    void handleUnreadChanged();
+    void handleKeyVerificationNumberRequest(
+        const sys::KeyVerificationNumberRequestEvent& event);
+    void handleKeyVerificationNumberInform(
+        const sys::KeyVerificationNumberInformEvent& event);
+    void handleKeyVerificationFinal(const sys::KeyVerificationFinalEvent& event);
+
+    void showKeyVerificationForPeer(chat::MeshProtocol protocol,
+                                    uint32_t peer_id);
+
+    chat::ChatService& service_;
+    ::ui_chat_runtime::ChatDeliveryEventProjectionAdapter*
+        delivery_adapter_ = nullptr;
+    ::ui_key_verification_runtime::KeyVerificationPresentationSource*
+        key_verification_source_ = nullptr;
+    ::ui::key_verification::KeyVerificationModel* key_verification_model_ =
+        nullptr;
+    IChatUiRefreshSink* ui_ = nullptr;
+};
+
+} // namespace chat::ui
diff --git a/modules/ui_chat_runtime/include/ui_chat_runtime/chat_ui_refresh_sink.h b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_ui_refresh_sink.h
new file mode 100644
index 00000000..91701408
--- /dev/null
+++ b/modules/ui_chat_runtime/include/ui_chat_runtime/chat_ui_refresh_sink.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "chat/domain/chat_types.h"
+#include "ui_presentation/key_verification/key_verification_snapshot.h"
+
+namespace chat::ui
+{
+
+class IChatUiRefreshSink
+{
+  public:
+    virtual ~IChatUiRefreshSink() = default;
+
+    virtual void onRuntimeMessageArrived(chat::MessageId msg_id) = 0;
+    virtual void onRuntimeSendResult(chat::MessageId msg_id) = 0;
+    virtual void onRuntimeUnreadChanged() = 0;
+
+    virtual void showKeyVerification(
+        const ::ui::key_verification::KeyVerificationSnapshot& snapshot) = 0;
+};
+
+} // namespace chat::ui
diff --git a/modules/ui_chat_runtime/library.json b/modules/ui_chat_runtime/library.json
new file mode 100644
index 00000000..d265c91d
--- /dev/null
+++ b/modules/ui_chat_runtime/library.json
@@ -0,0 +1,30 @@
+{
+  "name": "ui_chat_runtime",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../../modules/ui_chat_runtime/include",
+      "-I../../modules/ui_shared/include",
+      "-I../../modules/ui_key_verification_runtime/include",
+      "-I../../modules/ui_presentation/include",
+      "-I../../modules/core_chat/include",
+      "-I../../modules/core_sys/include",
+      "-I../../modules/core_team/include",
+      "-I../../platform/shared/include",
+      "-I../../platform/esp/arduino_common/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_chat"
+    },
+    {
+      "name": "core_sys"
+    },
+    {
+      "name": "core_team"
+    }
+  ]
+}
diff --git a/modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp b/modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp
new file mode 100644
index 00000000..649338f0
--- /dev/null
+++ b/modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp
@@ -0,0 +1,57 @@
+#include "ui_chat_runtime/chat_delivery_action_port_adapter.h"
+
+namespace ui_chat_runtime
+{
+
+ChatDeliveryActionPortAdapter::ChatDeliveryActionPortAdapter(
+    IChatDeliveryActionPort& action_port)
+    : action_port_(action_port)
+{
+}
+
+ChatDeliveryActionResult
+ChatDeliveryActionPortAdapter::handleMessageAction(
+    ::chat::delivery::ChatDeliveryActionKind kind,
+    const ::ui::chat::MessageRef& ref)
+{
+    ::chat::delivery::ChatDeliveryActionRequest request{};
+    request.kind = kind;
+    request.ref = toDeliveryRef(ref);
+    return action_port_.handleDeliveryAction(request);
+}
+
+ChatDeliveryActionResult ChatDeliveryActionPortAdapter::retryMessage(
+    const ::ui::chat::MessageRef& ref)
+{
+    return handleMessageAction(
+        ::chat::delivery::ChatDeliveryActionKind::Retry,
+        ref);
+}
+
+ChatDeliveryActionResult ChatDeliveryActionPortAdapter::cancelPending(
+    const ::ui::chat::MessageRef& ref)
+{
+    return handleMessageAction(
+        ::chat::delivery::ChatDeliveryActionKind::CancelPending,
+        ref);
+}
+
+ChatDeliveryActionResult ChatDeliveryActionPortAdapter::clearFailure(
+    const ::ui::chat::MessageRef& ref)
+{
+    return handleMessageAction(
+        ::chat::delivery::ChatDeliveryActionKind::ClearFailure,
+        ref);
+}
+
+::chat::delivery::ChatDeliveryRef toDeliveryRef(
+    const ::ui::chat::MessageRef& ref)
+{
+    ::chat::delivery::ChatDeliveryRef out{};
+    out.local_id = ref.local_id;
+    out.protocol_id = ref.protocol_id;
+    out.nonce_or_seq = ref.nonce_or_seq;
+    return out;
+}
+
+} // namespace ui_chat_runtime
diff --git a/modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp b/modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp
new file mode 100644
index 00000000..68620198
--- /dev/null
+++ b/modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp
@@ -0,0 +1,68 @@
+#include "ui_chat_runtime/chat_delivery_event_projection_adapter.h"
+
+#include "chat/delivery/legacy_chat_delivery_bridge.h"
+#include "chat/usecase/chat_service.h"
+#include "sys/event_bus.h"
+
+namespace ui_chat_runtime
+{
+
+ChatDeliveryEventProjectionAdapter::ChatDeliveryEventProjectionAdapter(
+    ::chat::ChatService& chat_service,
+    IChatDeliveryEventPort& delivery_events)
+    : chat_service_(chat_service),
+      delivery_events_(delivery_events)
+{
+}
+
+void ChatDeliveryEventProjectionAdapter::onChatSendResult(
+    const ::sys::ChatSendResultEvent& event)
+{
+    const auto failure = event.success
+                             ? ::chat::delivery::LegacyChatSendFailure::None
+                             : ::chat::delivery::LegacyChatSendFailure::Unknown;
+    (void)publishSendResult(event.msg_id,
+                            event.success,
+                            failure,
+                            event.timestamp);
+}
+
+void ChatDeliveryEventProjectionAdapter::onAckTimeout(
+    ::chat::MessageId msg_id,
+    uint32_t timestamp_ms)
+{
+    (void)publishSendResult(
+        msg_id,
+        false,
+        ::chat::delivery::LegacyChatSendFailure::AckTimeout,
+        timestamp_ms);
+}
+
+bool ChatDeliveryEventProjectionAdapter::publishSendResult(
+    ::chat::MessageId msg_id,
+    bool success,
+    ::chat::delivery::LegacyChatSendFailure failure,
+    uint32_t timestamp_ms)
+{
+    if (msg_id == 0)
+    {
+        return false;
+    }
+
+    const ::chat::ChatMessage* message = chat_service_.getMessage(msg_id);
+    if (message == nullptr)
+    {
+        return false;
+    }
+
+    ::chat::delivery::LegacyChatSendResult result{};
+    result.ref = ::chat::delivery::toDeliveryRef(*message);
+    result.success = success;
+    result.failure = failure;
+    result.timestamp_ms = timestamp_ms;
+    delivery_events_.publishDeliveryEvent(
+        ::chat::delivery::mapLegacyChatSendResult(result));
+    return true;
+}
+
+} // namespace ui_chat_runtime
diff --git a/modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp b/modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp
new file mode 100644
index 00000000..c501d349
--- /dev/null
+++ b/modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp
@@ -0,0 +1,173 @@
+#include "ui_chat_runtime/chat_page_runtime_event_pump.h"
+
+#include "ui_chat_runtime/chat_delivery_event_projection_adapter.h"
+#include "ui_key_verification_runtime/key_verification_presentation_source.h"
+
+namespace chat::ui
+{
+
+namespace
+{
+
+::ui::key_verification::VerificationProtocol toVerificationProtocol(
+    chat::MeshProtocol protocol)
+{
+    switch (protocol)
+    {
+    case chat::MeshProtocol::MeshCore:
+        return ::ui::key_verification::VerificationProtocol::MeshCore;
+    case chat::MeshProtocol::Meshtastic:
+        return ::ui::key_verification::VerificationProtocol::Meshtastic;
+    case chat::MeshProtocol::RNode:
+    case chat::MeshProtocol::LXMF:
+    default:
+        return ::ui::key_verification::VerificationProtocol::Unknown;
+    }
+}
+
+} // namespace
+
+ChatPageRuntimeEventPump::ChatPageRuntimeEventPump(
+    chat::ChatService& service,
+    ::ui_chat_runtime::ChatDeliveryEventProjectionAdapter* delivery_adapter,
+    ::ui_key_verification_runtime::KeyVerificationPresentationSource*
+        key_verification_source,
+    ::ui::key_verification::KeyVerificationModel* key_verification_model,
+    IChatUiRefreshSink* ui)
+    : service_(service),
+      delivery_adapter_(delivery_adapter),
+      key_verification_source_(key_verification_source),
+      key_verification_model_(key_verification_model),
+      ui_(ui)
+{
+}
+
+void ChatPageRuntimeEventPump::update()
+{
+    service_.processIncoming();
+    service_.flushStore();
+}
+
+void ChatPageRuntimeEventPump::handleEvent(sys::Event* event)
+{
+    if (event == nullptr)
+    {
+        return;
+    }
+
+    switch (event->type)
+    {
+    case sys::EventType::ChatNewMessage:
+        handleChatNewMessage(*static_cast<sys::ChatNewMessageEvent*>(event));
+        break;
+    case sys::EventType::ChatSendResult:
+        handleChatSendResult(*static_cast<sys::ChatSendResultEvent*>(event));
+        break;
+    case sys::EventType::ChatUnreadChanged:
+        handleUnreadChanged();
+        break;
+    case sys::EventType::KeyVerificationNumberRequest:
+        handleKeyVerificationNumberRequest(
+            *static_cast<sys::KeyVerificationNumberRequestEvent*>(event));
+        break;
+    case sys::EventType::KeyVerificationNumberInform:
+        handleKeyVerificationNumberInform(
+            *static_cast<sys::KeyVerificationNumberInformEvent*>(event));
+        break;
+    case sys::EventType::KeyVerificationFinal:
+        handleKeyVerificationFinal(
+            *static_cast<sys::KeyVerificationFinalEvent*>(event));
+        break;
+    default:
+        break;
+    }
+
+    delete event;
+}
+
+void ChatPageRuntimeEventPump::handleChatNewMessage(
+    const sys::ChatNewMessageEvent& event)
+{
+    if (ui_ != nullptr)
+    {
+        ui_->onRuntimeMessageArrived(event.msg_id);
+    }
+}
+
+void ChatPageRuntimeEventPump::handleChatSendResult(
+    const sys::ChatSendResultEvent& event)
+{
+    if (delivery_adapter_ != nullptr)
+    {
+        delivery_adapter_->onChatSendResult(event);
+    }
+    if (ui_ != nullptr)
+    {
+        ui_->onRuntimeSendResult(event.msg_id);
+    }
+}
+
+void ChatPageRuntimeEventPump::handleUnreadChanged()
+{
+    if (ui_ != nullptr)
+    {
+        ui_->onRuntimeUnreadChanged();
+    }
+}
+
+void ChatPageRuntimeEventPump::handleKeyVerificationNumberRequest(
+    const sys::KeyVerificationNumberRequestEvent& event)
+{
+    if (key_verification_source_ != nullptr)
+    {
+        key_verification_source_->onNumberRequest(event.node_id, event.nonce);
+    }
+    showKeyVerificationForPeer(
+        chat::ui::support::active_mesh_protocol(),
+        event.node_id);
+}
+
+void ChatPageRuntimeEventPump::handleKeyVerificationNumberInform(
+    const sys::KeyVerificationNumberInformEvent& event)
+{
+    if (key_verification_source_ != nullptr)
+    {
+        key_verification_source_->onNumberInform(event.node_id,
+                                                 event.nonce,
+                                                 event.security_number);
+    }
+    showKeyVerificationForPeer(
+        chat::ui::support::active_mesh_protocol(),
+        event.node_id);
+}
+
+void ChatPageRuntimeEventPump::handleKeyVerificationFinal(
+    const sys::KeyVerificationFinalEvent& event)
+{
+    if (key_verification_source_ != nullptr)
+    {
+        key_verification_source_->onFinal(event.node_id,
+                                          event.nonce,
+                                          event.is_sender,
+                                          event.verification_code);
+    }
+    showKeyVerificationForPeer(
+        chat::ui::support::active_mesh_protocol(),
+        event.node_id);
+}
+
+void ChatPageRuntimeEventPump::showKeyVerificationForPeer(
+    chat::MeshProtocol protocol,
+    uint32_t peer_id)
+{
+    if (key_verification_model_ == nullptr || ui_ == nullptr)
+    {
+        return;
+    }
+
+    key_verification_model_->selectPeer(toVerificationProtocol(protocol),
+                                        peer_id);
+    ui_->showKeyVerification(key_verification_model_->snapshot());
+}
+
+} // namespace chat::ui
diff --git a/modules/ui_chat_runtime/tests/.gitkeep b/modules/ui_chat_runtime/tests/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/modules/ui_chat_runtime/tests/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/modules/ui_chat_runtime/tests/test_chat_delivery_action_port_adapter.cpp b/modules/ui_chat_runtime/tests/test_chat_delivery_action_port_adapter.cpp
new file mode 100644
index 00000000..dcfa5152
--- /dev/null
+++ b/modules/ui_chat_runtime/tests/test_chat_delivery_action_port_adapter.cpp
@@ -0,0 +1,105 @@
+#include "chat/delivery/chat_delivery_action_service.h"
+#include "ui_chat_runtime/chat_delivery_action_port_adapter.h"
+
+#include <cassert>
+
+namespace
+{
+
+ui::chat::MessageRef messageRef(uint32_t id)
+{
+    ui::chat::MessageRef out{};
+    out.origin = ui::chat::MessageOrigin::LocalStored;
+    out.protocol_id = id;
+    return out;
+}
+
+chat::delivery::ChatDeliveryRecord deliveryRecord(
+    uint32_t id,
+    chat::delivery::DeliveryState state,
+    chat::delivery::DeliveryFailureKind failure =
+        chat::delivery::DeliveryFailureKind::None)
+{
+    chat::delivery::ChatDeliveryRecord out{};
+    out.ref.protocol_id = id;
+    out.state = state;
+    out.failure = failure;
+    return out;
+}
+
+class FakeRetryPort final : public chat::delivery::IRetryChatMessagePort
+{
+  public:
+    chat::delivery::ChatDeliveryActionResult retryMessage(
+        chat::delivery::ChatDeliveryRef ref) override
+    {
+        ++call_count;
+        last_ref = ref;
+        return chat::delivery::ChatDeliveryActionResult::success();
+    }
+
+    int call_count = 0;
+    chat::delivery::ChatDeliveryRef last_ref{};
+};
+
+} // namespace
+
+int main()
+{
+    using namespace chat::delivery;
+
+    ChatDeliveryReadModel read_model;
+    ChatDeliveryActionService action_service(read_model);
+    ui_chat_runtime::ChatDeliveryActionPortAdapter adapter(action_service);
+
+    const auto mapped = ui_chat_runtime::toDeliveryRef(messageRef(700));
+    assert(mapped.local_id == 0);
+    assert(mapped.protocol_id == 700);
+    assert(mapped.nonce_or_seq == 0);
+
+    ui::chat::MessageRef invalid{};
+    auto result = adapter.clearFailure(invalid);
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::InvalidRef);
+
+    assert(read_model.upsert(deliveryRecord(701,
+                                            DeliveryState::Failed,
+                                            DeliveryFailureKind::Rejected)));
+    result = adapter.clearFailure(messageRef(701));
+    assert(result.ok);
+    ChatDeliveryRecord found{};
+    assert(!read_model.find(ChatDeliveryRef{0, 701, 0}, found));
+
+    assert(read_model.upsert(deliveryRecord(702, DeliveryState::Queued)));
+    result = adapter.cancelPending(messageRef(702));
+    assert(result.ok);
+    assert(!read_model.find(ChatDeliveryRef{0, 702, 0}, found));
+
+    assert(read_model.upsert(deliveryRecord(703, DeliveryState::Sent)));
+    result = adapter.cancelPending(messageRef(703));
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::NotRetryable);
+    assert(read_model.find(ChatDeliveryRef{0, 703, 0}, found));
+
+    result = adapter.retryMessage(messageRef(704));
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::Unsupported);
+
+    FakeRetryPort retry_port;
+    ChatDeliveryActionService retrying_service(read_model, &retry_port);
+    ui_chat_runtime::ChatDeliveryActionPortAdapter retrying_adapter(
+        retrying_service);
+    result = retrying_adapter.retryMessage(messageRef(705));
+    assert(result.ok);
+    assert(retry_port.call_count == 1);
+    const ChatDeliveryRef expected_retry_ref{0, 705, 0};
+    assert(retry_port.last_ref == expected_retry_ref);
+
+    result = retrying_adapter.handleMessageAction(
+        ChatDeliveryActionKind::ClearFailure,
+        messageRef(706));
+    assert(!result.ok);
+    assert(result.failure == ChatDeliveryActionFailure::NotFound);
+
+    return 0;
+}
diff --git a/modules/ui_chat_runtime/tests/test_chat_delivery_event_projection_adapter.cpp b/modules/ui_chat_runtime/tests/test_chat_delivery_event_projection_adapter.cpp
new file mode 100644
index 00000000..416d706a
--- /dev/null
+++ b/modules/ui_chat_runtime/tests/test_chat_delivery_event_projection_adapter.cpp
@@ -0,0 +1,116 @@
+#include "chat/delivery/chat_delivery_event_port.h"
+#include "chat/domain/chat_model.h"
+#include "chat/infra/store/ram_store.h"
+#include "chat/ports/i_mesh_adapter.h"
+#include "chat/usecase/chat_service.h"
+#include "sys/event_bus.h"
+#include "ui_chat_runtime/chat_delivery_event_projection_adapter.h"
+
+#include <cassert>
+#include <string>
+
+namespace
+{
+
+class FakeMeshAdapter final : public ::chat::IMeshAdapter
+{
+  public:
+    bool sendText(::chat::ChannelId,
+                  const std::string&,
+                  ::chat::MessageId* out_msg_id,
+                  ::chat::NodeId = 0) override
+    {
+        if (out_msg_id != nullptr)
+        {
+            *out_msg_id = next_id++;
+        }
+        return send_ok;
+    }
+
+    bool pollIncomingText(::chat::MeshIncomingText*) override { return false; }
+    bool sendAppData(::chat::ChannelId,
+                     uint32_t,
+                     const uint8_t*,
+                     size_t,
+                     ::chat::NodeId = 0,
+                     bool = false,
+                     ::chat::MessageId = 0,
+                     bool = false) override
+    {
+        return false;
+    }
+    bool pollIncomingData(::chat::MeshIncomingData*) override { return false; }
+    void applyConfig(const ::chat::MeshConfig&) override {}
+    bool isReady() const override { return true; }
+    bool pollIncomingRawPacket(uint8_t*, size_t&, size_t) override { return false; }
+
+    bool send_ok = true;
+    ::chat::MessageId next_id = 700;
+};
+
+} // namespace
+
+int main()
+{
+    ::chat::ChatModel model;
+    FakeMeshAdapter adapter;
+    ::chat::RamStore store;
+    ::chat::ChatService service(model, adapter, store);
+
+    ::chat::delivery::ChatDeliveryReadModel read_model;
+    ::chat::delivery::ChatDeliveryEventProjector projector(read_model);
+    ::chat::delivery::ProjectingChatDeliveryEventPort event_port(projector);
+    ::ui_chat_runtime::ChatDeliveryEventProjectionAdapter projection_adapter(
+        service,
+        event_port);
+
+    const auto sent_id =
+        service.sendText(::chat::ChannelId::PRIMARY, "queued", 0);
+    assert(sent_id == 700);
+
+    service.handleSendResult(sent_id, true);
+    ::sys::ChatSendResultEvent sent_event(sent_id, true);
+    sent_event.timestamp = 1234;
+    projection_adapter.onChatSendResult(sent_event);
+
+    ::chat::delivery::ChatDeliveryRecord record{};
+    assert(read_model.find(::chat::delivery::ChatDeliveryRef{0, sent_id, 0},
+                           record));
+    assert(record.state == ::chat::delivery::DeliveryState::Sent);
+    assert(record.failure == ::chat::delivery::DeliveryFailureKind::None);
+    assert(record.updated_at_ms == 1234);
+
+    const auto failed_id =
+        service.sendText(::chat::ChannelId::PRIMARY, "fail", 0);
+    assert(failed_id == 701);
+
+    service.handleSendResult(failed_id, false);
+    ::sys::ChatSendResultEvent failed_event(failed_id, false);
+    failed_event.timestamp = 2345;
+    projection_adapter.onChatSendResult(failed_event);
+
+    assert(read_model.find(::chat::delivery::ChatDeliveryRef{0, failed_id, 0},
+                           record));
+    assert(record.state == ::chat::delivery::DeliveryState::Failed);
+    assert(record.failure == ::chat::delivery::DeliveryFailureKind::Unknown);
+    assert(record.updated_at_ms == 2345);
+
+    const auto timeout_id =
+        service.sendText(::chat::ChannelId::PRIMARY, "timeout", 0);
+    assert(timeout_id == 702);
+    projection_adapter.onAckTimeout(timeout_id, 3456);
+    assert(read_model.find(::chat::delivery::ChatDeliveryRef{0, timeout_id, 0},
+                           record));
+    assert(record.state == ::chat::delivery::DeliveryState::Failed);
+    assert(record.failure == ::chat::delivery::DeliveryFailureKind::AckTimeout);
+    assert(record.updated_at_ms == 3456);
+
+    projection_adapter.onAckTimeout(0, 4567);
+    assert(read_model.size() == 3);
+
+    ::sys::ChatSendResultEvent unknown_event(9999, false);
+    projection_adapter.onChatSendResult(unknown_event);
+    assert(read_model.size() == 3);
+
+    return 0;
+}
diff --git a/modules/ui_gps_runtime/README.md b/modules/ui_gps_runtime/README.md
new file mode 100644
index 00000000..9595cc8b
--- /dev/null
+++ b/modules/ui_gps_runtime/README.md
@@ -0,0 +1,21 @@
+# ui_gps_runtime
+
+GPS page runtime scheduling helpers.
+
+May contain:
+
+- GPS runtime pump
+- GPS UI refresh sink ports
+- GPS page scheduling adapters
+
+Must not contain:
+
+- LVGL widget trees
+- app shell startup
+- build entrypoints
+- board facts
+- GPS parser implementation
+
+This module was split from `modules/ui_shared` during the Phase 8 structural
+migration batch. The old `ui/screens/gps/*runtime*` headers remain forwarding
+headers.
diff --git a/modules/ui_gps_runtime/include/ui_gps_runtime/gps_page_runtime_pump.h b/modules/ui_gps_runtime/include/ui_gps_runtime/gps_page_runtime_pump.h
new file mode 100644
index 00000000..63c86f70
--- /dev/null
+++ b/modules/ui_gps_runtime/include/ui_gps_runtime/gps_page_runtime_pump.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "ui_gps_runtime/gps_ui_refresh_sink.h"
+
+#include <cstdint>
+
+namespace ui
+{
+namespace screens
+{
+namespace gps
+{
+
+class IGpsStatusRefreshModel
+{
+  public:
+    virtual ~IGpsStatusRefreshModel() = default;
+
+    virtual void refresh() = 0;
+};
+
+class GpsPageRuntimePump
+{
+  public:
+    GpsPageRuntimePump(IGpsStatusRefreshModel& model,
+                       IGpsUiRefreshSink* ui,
+                       uint32_t interval_ms);
+
+    void setActive(bool active);
+    bool active() const;
+
+    void update(uint32_t now_ms);
+
+  private:
+    IGpsStatusRefreshModel& model_;
+    IGpsUiRefreshSink* ui_ = nullptr;
+
+    uint32_t interval_ms_ = 1000;
+    uint32_t last_update_ms_ = 0;
+    bool active_ = false;
+    bool has_last_update_ = false;
+};
+
+} // namespace gps
+} // namespace screens
+} // namespace ui
diff --git a/modules/ui_gps_runtime/include/ui_gps_runtime/gps_ui_refresh_sink.h b/modules/ui_gps_runtime/include/ui_gps_runtime/gps_ui_refresh_sink.h
new file mode 100644
index 00000000..0871cbc2
--- /dev/null
+++ b/modules/ui_gps_runtime/include/ui_gps_runtime/gps_ui_refresh_sink.h
@@ -0,0 +1,20 @@
+#pragma once
+
+namespace ui
+{
+namespace screens
+{
+namespace gps
+{
+
+class IGpsUiRefreshSink
+{
+  public:
+    virtual ~IGpsUiRefreshSink() = default;
+
+    virtual void onGpsRuntimeUpdated() = 0;
+};
+
+} // namespace gps
+} // namespace screens
+} // namespace ui
diff --git a/modules/ui_gps_runtime/library.json b/modules/ui_gps_runtime/library.json
new file mode 100644
index 00000000..3538a310
--- /dev/null
+++ b/modules/ui_gps_runtime/library.json
@@ -0,0 +1,11 @@
+{
+  "name": "ui_gps_runtime",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../../modules/ui_gps_runtime/include"
+    ]
+  }
+}
diff --git a/modules/ui_gps_runtime/src/gps_page_runtime_pump.cpp b/modules/ui_gps_runtime/src/gps_page_runtime_pump.cpp
new file mode 100644
index 00000000..93de45fb
--- /dev/null
+++ b/modules/ui_gps_runtime/src/gps_page_runtime_pump.cpp
@@ -0,0 +1,57 @@
+#include "ui_gps_runtime/gps_page_runtime_pump.h"
+
+namespace ui
+{
+namespace screens
+{
+namespace gps
+{
+
+GpsPageRuntimePump::GpsPageRuntimePump(IGpsStatusRefreshModel& model,
+                                       IGpsUiRefreshSink* ui,
+                                       uint32_t interval_ms)
+    : model_(model),
+      ui_(ui),
+      interval_ms_(interval_ms == 0 ? 1000 : interval_ms)
+{
+}
+
+void GpsPageRuntimePump::setActive(bool active)
+{
+    active_ = active;
+    if (!active_)
+    {
+        has_last_update_ = false;
+        last_update_ms_ = 0;
+    }
+}
+
+bool GpsPageRuntimePump::active() const
+{
+    return active_;
+}
+
+void GpsPageRuntimePump::update(uint32_t now_ms)
+{
+    if (!active_)
+    {
+        return;
+    }
+
+    if (has_last_update_ && static_cast<uint32_t>(now_ms - last_update_ms_) < interval_ms_)
+    {
+        return;
+    }
+
+    model_.refresh();
+    if (ui_ != nullptr)
+    {
+        ui_->onGpsRuntimeUpdated();
+    }
+    last_update_ms_ = now_ms;
+    has_last_update_ = true;
+}
+
+} // namespace gps
+} // namespace screens
+} // namespace ui
diff --git a/modules/ui_gps_runtime/tests/test_gps_page_runtime_pump.cpp b/modules/ui_gps_runtime/tests/test_gps_page_runtime_pump.cpp
new file mode 100644
index 00000000..b6736868
--- /dev/null
+++ b/modules/ui_gps_runtime/tests/test_gps_page_runtime_pump.cpp
@@ -0,0 +1,75 @@
+#include "ui_gps_runtime/gps_page_runtime_pump.h"
+
+#include <cassert>
+
+namespace
+{
+
+class FakeModel final : public ui::screens::gps::IGpsStatusRefreshModel
+{
+  public:
+    void refresh() override
+    {
+        ++refresh_count;
+    }
+
+    int refresh_count = 0;
+};
+
+class FakeSink final : public ui::screens::gps::IGpsUiRefreshSink
+{
+  public:
+    void onGpsRuntimeUpdated() override
+    {
+        ++notify_count;
+    }
+
+    int notify_count = 0;
+};
+
+} // namespace
+
+int main()
+{
+    FakeModel model;
+    FakeSink sink;
+    ui::screens::gps::GpsPageRuntimePump pump(model, &sink, 500);
+
+    pump.update(0);
+    assert(model.refresh_count == 0);
+    assert(sink.notify_count == 0);
+
+    pump.setActive(true);
+    assert(pump.active());
+    pump.update(100);
+    assert(model.refresh_count == 1);
+    assert(sink.notify_count == 1);
+
+    pump.update(400);
+    assert(model.refresh_count == 1);
+    assert(sink.notify_count == 1);
+
+    pump.update(600);
+    assert(model.refresh_count == 2);
+    assert(sink.notify_count == 2);
+
+    pump.setActive(false);
+    assert(!pump.active());
+    pump.update(2000);
+    assert(model.refresh_count == 2);
+
+    pump.setActive(true);
+    pump.update(2100);
+    assert(model.refresh_count == 3);
+    assert(sink.notify_count == 3);
+
+    FakeModel zero_model;
+    ui::screens::gps::GpsPageRuntimePump zero_interval(zero_model, nullptr, 0);
+    zero_interval.setActive(true);
+    zero_interval.update(10);
+    zero_interval.update(500);
+    zero_interval.update(1010);
+    assert(zero_model.refresh_count == 2);
+
+    return 0;
+}
diff --git a/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_descriptor_page_registry.h b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_descriptor_page_registry.h
new file mode 100644
index 00000000..a8f1b5dd
--- /dev/null
+++ b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_descriptor_page_registry.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "ui_gtk_runtime/gtk_runtime_entry_adoption.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cstddef>
+
+namespace trailmate::uconsole
+{
+
+struct GtkDescriptorPage
+{
+    const char* binding_id = nullptr;
+    const char* label = nullptr;
+    bool enabled = false;
+};
+
+class GtkDescriptorPageRegistry
+{
+  public:
+    bool load(const gtk::GtkRuntimeEntryAdoption& adoption);
+
+    std::size_t pageCount() const noexcept;
+    const GtkDescriptorPage* pages() const noexcept;
+
+  private:
+    GtkDescriptorPage pages_[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t page_count_ = 0;
+};
+
+} // namespace trailmate::uconsole
diff --git a/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_menu_runtime_adapter.h b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_menu_runtime_adapter.h
new file mode 100644
index 00000000..93ea348a
--- /dev/null
+++ b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_menu_runtime_adapter.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+#include "ui_presentation/screen/screen_route.h"
+
+#include <cstddef>
+
+namespace trailmate::uconsole
+{
+
+struct GtkMenuDescriptor
+{
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    ui::screen::ScreenRoute route{};
+    const char* label = nullptr;
+    bool enabled = false;
+};
+
+class GtkMenuRuntimeAdapter
+{
+  public:
+    bool buildDescriptors(const ui::menu::MenuModel& menu,
+                          GtkMenuDescriptor* out,
+                          std::size_t capacity,
+                          std::size_t& out_count) const;
+};
+
+} // namespace trailmate::uconsole
diff --git a/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_runtime_entry_adoption.h b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_runtime_entry_adoption.h
new file mode 100644
index 00000000..f5774f31
--- /dev/null
+++ b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_runtime_entry_adoption.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h"
+
+#include <cstddef>
+
+namespace trailmate::uconsole::gtk
+{
+
+class GtkRuntimeEntryAdoption
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    bool ready() const;
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const GtkUConsoleScreenGraphPresenter& presenter() const;
+
+  private:
+    GtkUConsoleScreenGraphPresenter presenter_{};
+    bool ready_ = false;
+};
+
+} // namespace trailmate::uconsole::gtk
diff --git a/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_screen_host_adapter.h b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_screen_host_adapter.h
new file mode 100644
index 00000000..e3996126
--- /dev/null
+++ b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_screen_host_adapter.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "ui_presentation/screen/screen_route.h"
+
+namespace trailmate::uconsole
+{
+
+struct GtkScreenDescriptor
+{
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    const char* binding_id = nullptr;
+    bool available = false;
+};
+
+class GtkScreenHostAdapter
+{
+  public:
+    bool resolve(const ui::screen::ScreenRoute& route,
+                 GtkScreenDescriptor& out) const;
+};
+
+} // namespace trailmate::uconsole
diff --git a/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h
new file mode 100644
index 00000000..5ffa683e
--- /dev/null
+++ b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_gtk_runtime/gtk_menu_runtime_adapter.h"
+#include "ui_gtk_runtime/gtk_screen_host_adapter.h"
+
+#include <cstddef>
+
+namespace trailmate::uconsole::gtk
+{
+
+class GtkUConsoleScreenGraphBridge
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    std::size_t menuCount() const;
+    std::size_t screenBindingCount() const;
+
+    const trailmate::uconsole::GtkMenuDescriptor* menuItems() const;
+    const trailmate::uconsole::GtkScreenDescriptor* screenItems() const;
+
+  private:
+    trailmate::uconsole::GtkMenuRuntimeAdapter menu_adapter_{};
+    trailmate::uconsole::GtkScreenHostAdapter screen_host_{};
+    trailmate::uconsole::GtkMenuDescriptor menu_items_[ui::menu::MenuModel::kMaxItems]{};
+    trailmate::uconsole::GtkScreenDescriptor screen_items_[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t menu_count_ = 0;
+    std::size_t screen_binding_count_ = 0;
+};
+
+} // namespace trailmate::uconsole::gtk
diff --git a/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h
new file mode 100644
index 00000000..5fc56a1c
--- /dev/null
+++ b/modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h"
+
+#include <cstddef>
+
+namespace trailmate::uconsole::gtk
+{
+
+class GtkUConsoleScreenGraphPresenter
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const trailmate::uconsole::GtkMenuDescriptor* menuDescriptors() const;
+    const trailmate::uconsole::GtkScreenDescriptor* screenDescriptors() const;
+
+  private:
+    GtkUConsoleScreenGraphBridge bridge_{};
+};
+
+} // namespace trailmate::uconsole::gtk
diff --git a/modules/ui_gtk_runtime/src/gtk_descriptor_page_registry.cpp b/modules/ui_gtk_runtime/src/gtk_descriptor_page_registry.cpp
new file mode 100644
index 00000000..2d5d689d
--- /dev/null
+++ b/modules/ui_gtk_runtime/src/gtk_descriptor_page_registry.cpp
@@ -0,0 +1,69 @@
+#include "ui_gtk_runtime/gtk_descriptor_page_registry.h"
+
+namespace trailmate::uconsole
+{
+
+namespace
+{
+
+const GtkMenuDescriptor* menuForScreen(
+    const gtk::GtkUConsoleScreenGraphPresenter& presenter,
+    ui::menu::MenuScreenId screen_id)
+{
+    for (std::size_t index = 0; index < presenter.menuCount(); ++index)
+    {
+        const GtkMenuDescriptor& menu = presenter.menuDescriptors()[index];
+        if (menu.screen_id == screen_id)
+        {
+            return &menu;
+        }
+    }
+    return nullptr;
+}
+
+} // namespace
+
+bool GtkDescriptorPageRegistry::load(
+    const gtk::GtkRuntimeEntryAdoption& adoption)
+{
+    page_count_ = 0;
+    if (!adoption.ready())
+    {
+        return false;
+    }
+
+    const gtk::GtkUConsoleScreenGraphPresenter& presenter = adoption.presenter();
+    for (std::size_t index = 0;
+         index < presenter.screenCount() &&
+         page_count_ < ui::menu::MenuModel::kMaxItems;
+         ++index)
+    {
+        const GtkScreenDescriptor& screen = presenter.screenDescriptors()[index];
+        if (!screen.available || screen.binding_id == nullptr)
+        {
+            continue;
+        }
+
+        const GtkMenuDescriptor* menu =
+            menuForScreen(presenter, screen.screen_id);
+        pages_[page_count_].binding_id = screen.binding_id;
+        pages_[page_count_].label =
+            menu != nullptr && menu->label != nullptr ? menu->label : screen.binding_id;
+        pages_[page_count_].enabled = menu == nullptr || menu->enabled;
+        ++page_count_;
+    }
+
+    return page_count_ > 0;
+}
+
+std::size_t GtkDescriptorPageRegistry::pageCount() const noexcept
+{
+    return page_count_;
+}
+
+const GtkDescriptorPage* GtkDescriptorPageRegistry::pages() const noexcept
+{
+    return pages_;
+}
+
+} // namespace trailmate::uconsole
diff --git a/modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp b/modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp
new file mode 100644
index 00000000..af5cb4a8
--- /dev/null
+++ b/modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp
@@ -0,0 +1,46 @@
+#include "ui_gtk_runtime/gtk_menu_runtime_adapter.h"
+
+namespace trailmate::uconsole
+{
+
+bool GtkMenuRuntimeAdapter::buildDescriptors(const ui::menu::MenuModel& menu,
+                                             GtkMenuDescriptor* out,
+                                             std::size_t capacity,
+                                             std::size_t& out_count) const
+{
+    out_count = 0;
+
+    if (menu.size() == 0)
+    {
+        return true;
+    }
+
+    if (out == nullptr)
+    {
+        return false;
+    }
+
+    for (std::size_t index = 0; index < menu.size(); ++index)
+    {
+        const ui::menu::MenuItem& item = menu.items()[index];
+        if (!item.enabled)
+        {
+            continue;
+        }
+
+        if (out_count >= capacity)
+        {
+            return false;
+        }
+
+        out[out_count].screen_id = item.screen_id;
+        out[out_count].route = ui::screen::routeForMenuScreen(item.screen_id);
+        out[out_count].label = item.label;
+        out[out_count].enabled = item.enabled;
+        ++out_count;
+    }
+
+    return true;
+}
+
+} // namespace trailmate::uconsole
diff --git a/modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp b/modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp
new file mode 100644
index 00000000..24a9f6e5
--- /dev/null
+++ b/modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp
@@ -0,0 +1,34 @@
+#include "ui_gtk_runtime/gtk_runtime_entry_adoption.h"
+
+namespace trailmate::uconsole::gtk
+{
+
+bool GtkRuntimeEntryAdoption::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    ready_ = presenter_.load(presentation);
+    return ready_;
+}
+
+bool GtkRuntimeEntryAdoption::ready() const
+{
+    return ready_;
+}
+
+std::size_t GtkRuntimeEntryAdoption::menuCount() const
+{
+    return ready_ ? presenter_.menuCount() : 0;
+}
+
+std::size_t GtkRuntimeEntryAdoption::screenCount() const
+{
+    return ready_ ? presenter_.screenCount() : 0;
+}
+
+const GtkUConsoleScreenGraphPresenter&
+GtkRuntimeEntryAdoption::presenter() const
+{
+    return presenter_;
+}
+
+} // namespace trailmate::uconsole::gtk
diff --git a/modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp b/modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp
new file mode 100644
index 00000000..45795b32
--- /dev/null
+++ b/modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp
@@ -0,0 +1,42 @@
+#include "ui_gtk_runtime/gtk_screen_host_adapter.h"
+
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+
+namespace trailmate::uconsole
+{
+namespace
+{
+
+void clearDescriptor(GtkScreenDescriptor& out)
+{
+    out.screen_id = ui::menu::MenuScreenId::Dashboard;
+    out.binding_id = nullptr;
+    out.available = false;
+}
+
+} // namespace
+
+bool GtkScreenHostAdapter::resolve(const ui::screen::ScreenRoute& route,
+                                   GtkScreenDescriptor& out) const
+{
+    if (!route.valid)
+    {
+        clearDescriptor(out);
+        return false;
+    }
+
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    ui_lvgl_ux::CompatibilityScreenDescriptor descriptor;
+    if (!factory.describe(route.screen_id, descriptor))
+    {
+        clearDescriptor(out);
+        return false;
+    }
+
+    out.screen_id = descriptor.screen_id;
+    out.binding_id = descriptor.binding_id;
+    out.available = descriptor.available;
+    return true;
+}
+
+} // namespace trailmate::uconsole
diff --git a/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp b/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp
new file mode 100644
index 00000000..76ec02d2
--- /dev/null
+++ b/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp
@@ -0,0 +1,83 @@
+#include "ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h"
+
+namespace trailmate::uconsole::gtk
+{
+namespace
+{
+
+using MenuRuntimeAdapterContract = GtkMenuRuntimeAdapter;
+using ScreenHostAdapterContract = GtkScreenHostAdapter;
+
+} // namespace
+
+bool GtkUConsoleScreenGraphBridge::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    menu_count_ = 0;
+    screen_binding_count_ = 0;
+
+    if (!product_composition::hasUxMenu(presentation) ||
+        !product_composition::hasScreenBindings(presentation))
+    {
+        return false;
+    }
+
+    if (!menu_adapter_.buildDescriptors(*presentation.ux_menu,
+                                        menu_items_,
+                                        ui::menu::MenuModel::kMaxItems,
+                                        menu_count_))
+    {
+        menu_count_ = 0;
+        return false;
+    }
+
+    for (std::size_t index = 0; index < menu_count_; ++index)
+    {
+        const trailmate::uconsole::GtkMenuDescriptor& menu_item =
+            menu_items_[index];
+        if (!menu_item.route.valid)
+        {
+            continue;
+        }
+
+        trailmate::uconsole::GtkScreenDescriptor screen_item;
+        if (!screen_host_.resolve(menu_item.route, screen_item))
+        {
+            continue;
+        }
+
+        if (presentation.screen_bindings->find(screen_item.screen_id) == nullptr)
+        {
+            continue;
+        }
+
+        screen_items_[screen_binding_count_] = screen_item;
+        ++screen_binding_count_;
+    }
+
+    return menu_count_ > 0 && screen_binding_count_ > 0;
+}
+
+std::size_t GtkUConsoleScreenGraphBridge::menuCount() const
+{
+    return menu_count_;
+}
+
+std::size_t GtkUConsoleScreenGraphBridge::screenBindingCount() const
+{
+    return screen_binding_count_;
+}
+
+const trailmate::uconsole::GtkMenuDescriptor*
+GtkUConsoleScreenGraphBridge::menuItems() const
+{
+    return menu_items_;
+}
+
+const trailmate::uconsole::GtkScreenDescriptor*
+GtkUConsoleScreenGraphBridge::screenItems() const
+{
+    return screen_items_;
+}
+
+} // namespace trailmate::uconsole::gtk
diff --git a/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_presenter.cpp b/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_presenter.cpp
new file mode 100644
index 00000000..0373d44f
--- /dev/null
+++ b/modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_presenter.cpp
@@ -0,0 +1,40 @@
+#include "ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h"
+
+namespace trailmate::uconsole::gtk
+{
+
+bool GtkUConsoleScreenGraphPresenter::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    if (!product_composition::hasUxMenu(presentation) ||
+        !product_composition::hasScreenBindings(presentation))
+    {
+        return false;
+    }
+
+    return bridge_.load(presentation);
+}
+
+std::size_t GtkUConsoleScreenGraphPresenter::menuCount() const
+{
+    return bridge_.menuCount();
+}
+
+std::size_t GtkUConsoleScreenGraphPresenter::screenCount() const
+{
+    return bridge_.screenBindingCount();
+}
+
+const trailmate::uconsole::GtkMenuDescriptor*
+GtkUConsoleScreenGraphPresenter::menuDescriptors() const
+{
+    return bridge_.menuItems();
+}
+
+const trailmate::uconsole::GtkScreenDescriptor*
+GtkUConsoleScreenGraphPresenter::screenDescriptors() const
+{
+    return bridge_.screenItems();
+}
+
+} // namespace trailmate::uconsole::gtk
diff --git a/modules/ui_gtk_runtime/tests/gtk_menu_runtime_adapter_smoke.cpp b/modules/ui_gtk_runtime/tests/gtk_menu_runtime_adapter_smoke.cpp
new file mode 100644
index 00000000..f8829ad4
--- /dev/null
+++ b/modules/ui_gtk_runtime/tests/gtk_menu_runtime_adapter_smoke.cpp
@@ -0,0 +1,73 @@
+#include "uconsole_composition_root.h"
+#include "ui_gtk_runtime/gtk_menu_runtime_adapter.h"
+
+#include "product_composition/presentation_bundle.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
+#include <filesystem>
+#include <string>
+
+namespace
+{
+
+void set_env_var(const char* name, const std::string& value)
+{
+    setenv(name, value.c_str(), 1);
+}
+
+} // namespace
+
+int main()
+{
+    const auto root_dir =
+        std::filesystem::temp_directory_path() /
+        "trailmate_gtk_menu_runtime_adapter_smoke";
+
+    std::error_code ec;
+    std::filesystem::remove_all(root_dir, ec);
+    std::filesystem::create_directories(root_dir / "settings", ec);
+    std::filesystem::create_directories(root_dir / "sd", ec);
+    std::filesystem::create_directories(root_dir / "cache", ec);
+
+    set_env_var("TRAIL_MATE_SETTINGS_ROOT",
+                (root_dir / "settings").string());
+    set_env_var("TRAIL_MATE_SD_ROOT", (root_dir / "sd").string());
+    set_env_var("TRAIL_MATE_CACHE_ROOT", (root_dir / "cache").string());
+    set_env_var("TRAIL_MATE_LORA_DISABLE", "1");
+    set_env_var("TRAIL_MATE_GPS_VALID", "0");
+
+    trailmate::uconsole::UConsoleCompositionRoot root;
+    assert(root.initialize());
+    assert(root.presentation().ux_menu != nullptr);
+    assert(product_composition::hasUxMenu(root.presentation()));
+
+    trailmate::uconsole::GtkMenuRuntimeAdapter adapter;
+    trailmate::uconsole::GtkMenuDescriptor descriptors[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t count = 0;
+
+    assert(adapter.buildDescriptors(*root.presentation().ux_menu,
+                                    descriptors,
+                                    ui::menu::MenuModel::kMaxItems,
+                                    count));
+    assert(count > 0);
+
+    bool found_map = false;
+    for (std::size_t index = 0; index < count; ++index)
+    {
+        assert(descriptors[index].enabled);
+        assert(descriptors[index].route.valid);
+        assert(descriptors[index].route.screen_id == descriptors[index].screen_id);
+        assert(descriptors[index].label != nullptr);
+        if (descriptors[index].screen_id == ui::menu::MenuScreenId::Map)
+        {
+            found_map = true;
+        }
+    }
+
+    assert(found_map);
+    root.shutdown();
+    std::filesystem::remove_all(root_dir, ec);
+    return 0;
+}
diff --git a/modules/ui_gtk_runtime/tests/gtk_runtime_entry_adoption_smoke.cpp b/modules/ui_gtk_runtime/tests/gtk_runtime_entry_adoption_smoke.cpp
new file mode 100644
index 00000000..37172181
--- /dev/null
+++ b/modules/ui_gtk_runtime/tests/gtk_runtime_entry_adoption_smoke.cpp
@@ -0,0 +1,28 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_gtk_runtime/gtk_runtime_entry_adoption.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("uconsole_desktop", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    trailmate::uconsole::gtk::GtkRuntimeEntryAdoption adoption;
+    assert(adoption.load(presentation));
+    assert(adoption.ready());
+    assert(adoption.menuCount() > 0);
+    assert(adoption.screenCount() > 0);
+    assert(adoption.presenter().menuDescriptors()[0].route.valid);
+    return 0;
+}
diff --git a/modules/ui_gtk_runtime/tests/gtk_screen_host_adapter_smoke.cpp b/modules/ui_gtk_runtime/tests/gtk_screen_host_adapter_smoke.cpp
new file mode 100644
index 00000000..4deee6aa
--- /dev/null
+++ b/modules/ui_gtk_runtime/tests/gtk_screen_host_adapter_smoke.cpp
@@ -0,0 +1,83 @@
+#include "uconsole_composition_root.h"
+#include "ui_gtk_runtime/gtk_menu_runtime_adapter.h"
+#include "ui_gtk_runtime/gtk_screen_host_adapter.h"
+
+#include "product_composition/presentation_bundle.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <filesystem>
+#include <string>
+
+namespace
+{
+
+void set_env_var(const char* name, const std::string& value)
+{
+    setenv(name, value.c_str(), 1);
+}
+
+} // namespace
+
+int main()
+{
+    const auto root_dir =
+        std::filesystem::temp_directory_path() /
+        "trailmate_gtk_screen_host_adapter_smoke";
+
+    std::error_code ec;
+    std::filesystem::remove_all(root_dir, ec);
+    std::filesystem::create_directories(root_dir / "settings", ec);
+    std::filesystem::create_directories(root_dir / "sd", ec);
+    std::filesystem::create_directories(root_dir / "cache", ec);
+
+    set_env_var("TRAIL_MATE_SETTINGS_ROOT",
+                (root_dir / "settings").string());
+    set_env_var("TRAIL_MATE_SD_ROOT", (root_dir / "sd").string());
+    set_env_var("TRAIL_MATE_CACHE_ROOT", (root_dir / "cache").string());
+    set_env_var("TRAIL_MATE_LORA_DISABLE", "1");
+    set_env_var("TRAIL_MATE_GPS_VALID", "0");
+
+    trailmate::uconsole::UConsoleCompositionRoot root;
+    assert(root.initialize());
+    assert(root.presentation().ux_menu != nullptr);
+    assert(product_composition::hasUxMenu(root.presentation()));
+    assert(product_composition::hasScreenBindings(root.presentation()));
+
+    trailmate::uconsole::GtkMenuRuntimeAdapter menu_adapter;
+    trailmate::uconsole::GtkMenuDescriptor descriptors[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t descriptor_count = 0;
+    assert(menu_adapter.buildDescriptors(*root.presentation().ux_menu,
+                                         descriptors,
+                                         ui::menu::MenuModel::kMaxItems,
+                                         descriptor_count));
+    assert(descriptor_count > 0);
+
+    const trailmate::uconsole::GtkMenuDescriptor* map_descriptor = nullptr;
+    for (std::size_t index = 0; index < descriptor_count; ++index)
+    {
+        if (descriptors[index].screen_id == ui::menu::MenuScreenId::Map)
+        {
+            map_descriptor = &descriptors[index];
+            break;
+        }
+    }
+
+    assert(map_descriptor != nullptr);
+    assert(map_descriptor->route.valid);
+    const ui::screen::ScreenRoute route = map_descriptor->route;
+
+    trailmate::uconsole::GtkScreenHostAdapter screen_host;
+    trailmate::uconsole::GtkScreenDescriptor screen;
+    assert(screen_host.resolve(route, screen));
+    assert(screen.available);
+    assert(screen.screen_id == ui::menu::MenuScreenId::Map);
+    assert(std::strcmp(screen.binding_id, "map") == 0);
+    assert(root.presentation().screen_bindings->find(screen.screen_id) != nullptr);
+
+    root.shutdown();
+    std::filesystem::remove_all(root_dir, ec);
+    return 0;
+}
diff --git a/modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_bridge_smoke.cpp b/modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_bridge_smoke.cpp
new file mode 100644
index 00000000..df1c3dfe
--- /dev/null
+++ b/modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_bridge_smoke.cpp
@@ -0,0 +1,81 @@
+#include "uconsole_composition_root.h"
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <filesystem>
+#include <string>
+
+namespace
+{
+
+void set_env_var(const char* name, const std::string& value)
+{
+    setenv(name, value.c_str(), 1);
+}
+
+bool containsScreen(
+    const trailmate::uconsole::gtk::GtkUConsoleScreenGraphBridge& bridge,
+    ui::menu::MenuScreenId screen_id,
+    const char* binding_id)
+{
+    for (std::size_t index = 0; index < bridge.screenBindingCount(); ++index)
+    {
+        const trailmate::uconsole::GtkScreenDescriptor& screen =
+            bridge.screenItems()[index];
+        if (screen.screen_id == screen_id && screen.available &&
+            screen.binding_id != nullptr &&
+            std::strcmp(screen.binding_id, binding_id) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    const auto root_dir =
+        std::filesystem::temp_directory_path() /
+        "trailmate_gtk_uconsole_screen_graph_bridge_smoke";
+
+    std::error_code ec;
+    std::filesystem::remove_all(root_dir, ec);
+    std::filesystem::create_directories(root_dir / "settings", ec);
+    std::filesystem::create_directories(root_dir / "sd", ec);
+    std::filesystem::create_directories(root_dir / "cache", ec);
+
+    set_env_var("TRAIL_MATE_SETTINGS_ROOT",
+                (root_dir / "settings").string());
+    set_env_var("TRAIL_MATE_SD_ROOT", (root_dir / "sd").string());
+    set_env_var("TRAIL_MATE_CACHE_ROOT", (root_dir / "cache").string());
+    set_env_var("TRAIL_MATE_LORA_DISABLE", "1");
+    set_env_var("TRAIL_MATE_GPS_VALID", "0");
+
+    trailmate::uconsole::UConsoleCompositionRoot root;
+    assert(root.initialize());
+    assert(root.presentation().ux_menu != nullptr);
+    assert(product_composition::hasUxMenu(root.presentation()));
+    assert(product_composition::hasScreenBindings(root.presentation()));
+
+    trailmate::uconsole::gtk::GtkUConsoleScreenGraphBridge bridge;
+    assert(bridge.load(root.presentation()));
+    assert(bridge.menuCount() > 0);
+    assert(bridge.screenBindingCount() > 0);
+    const ui::screen::ScreenRoute route = bridge.menuItems()[0].route;
+    assert(route.valid);
+
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Chat, "chat"));
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Map, "map"));
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Settings, "settings"));
+
+    root.shutdown();
+    std::filesystem::remove_all(root_dir, ec);
+    return 0;
+}
diff --git a/modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_presenter_smoke.cpp b/modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_presenter_smoke.cpp
new file mode 100644
index 00000000..3811fc11
--- /dev/null
+++ b/modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_presenter_smoke.cpp
@@ -0,0 +1,79 @@
+#include "uconsole_composition_root.h"
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <filesystem>
+#include <string>
+
+namespace
+{
+
+void set_env_var(const char* name, const std::string& value)
+{
+    setenv(name, value.c_str(), 1);
+}
+
+bool containsScreen(
+    const trailmate::uconsole::gtk::GtkUConsoleScreenGraphPresenter& presenter,
+    ui::menu::MenuScreenId screen_id,
+    const char* binding_id)
+{
+    for (std::size_t index = 0; index < presenter.screenCount(); ++index)
+    {
+        const trailmate::uconsole::GtkScreenDescriptor& screen =
+            presenter.screenDescriptors()[index];
+        if (screen.screen_id == screen_id && screen.available &&
+            screen.binding_id != nullptr &&
+            std::strcmp(screen.binding_id, binding_id) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    const auto root_dir =
+        std::filesystem::temp_directory_path() /
+        "trailmate_gtk_uconsole_screen_graph_presenter_smoke";
+
+    std::error_code ec;
+    std::filesystem::remove_all(root_dir, ec);
+    std::filesystem::create_directories(root_dir / "settings", ec);
+    std::filesystem::create_directories(root_dir / "sd", ec);
+    std::filesystem::create_directories(root_dir / "cache", ec);
+
+    set_env_var("TRAIL_MATE_SETTINGS_ROOT",
+                (root_dir / "settings").string());
+    set_env_var("TRAIL_MATE_SD_ROOT", (root_dir / "sd").string());
+    set_env_var("TRAIL_MATE_CACHE_ROOT", (root_dir / "cache").string());
+    set_env_var("TRAIL_MATE_LORA_DISABLE", "1");
+    set_env_var("TRAIL_MATE_GPS_VALID", "0");
+
+    trailmate::uconsole::UConsoleCompositionRoot root;
+    assert(root.initialize());
+    assert(product_composition::hasUxMenu(root.presentation()));
+    assert(product_composition::hasScreenBindings(root.presentation()));
+
+    trailmate::uconsole::gtk::GtkUConsoleScreenGraphPresenter presenter;
+    assert(presenter.load(root.presentation()));
+    assert(presenter.menuCount() > 0);
+    assert(presenter.screenCount() > 0);
+    assert(presenter.menuDescriptors()[0].route.valid);
+
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Chat, "chat"));
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Map, "map"));
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Settings, "settings"));
+
+    root.shutdown();
+    std::filesystem::remove_all(root_dir, ec);
+    return 0;
+}
diff --git a/modules/ui_gtk_runtime/tests/test_gtk_descriptor_page_registry.cpp b/modules/ui_gtk_runtime/tests/test_gtk_descriptor_page_registry.cpp
new file mode 100644
index 00000000..d0aebf18
--- /dev/null
+++ b/modules/ui_gtk_runtime/tests/test_gtk_descriptor_page_registry.cpp
@@ -0,0 +1,34 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_gtk_runtime/gtk_descriptor_page_registry.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("uconsole_desktop", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    trailmate::uconsole::gtk::GtkRuntimeEntryAdoption adoption;
+    assert(adoption.load(presentation));
+
+    trailmate::uconsole::GtkDescriptorPageRegistry registry;
+    assert(registry.load(adoption));
+    assert(registry.pageCount() > 0);
+    assert(registry.pages()[0].binding_id != nullptr);
+    assert(registry.pages()[0].label != nullptr);
+
+    trailmate::uconsole::gtk::GtkRuntimeEntryAdoption empty;
+    assert(!registry.load(empty));
+    assert(registry.pageCount() == 0);
+    return 0;
+}
diff --git a/modules/ui_headless_runtime/include/ui_headless_runtime/headless_descriptor_consumer.h b/modules/ui_headless_runtime/include/ui_headless_runtime/headless_descriptor_consumer.h
new file mode 100644
index 00000000..b285e99a
--- /dev/null
+++ b/modules/ui_headless_runtime/include/ui_headless_runtime/headless_descriptor_consumer.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <cstddef>
+
+namespace trailmate::headless
+{
+
+struct NodeStatusDescriptor
+{
+    const char* target_id = nullptr;
+    const char* status_label = nullptr;
+    bool enabled = false;
+};
+
+class HeadlessRuntimeDescriptorConsumer
+{
+  public:
+    bool consume(const NodeStatusDescriptor& descriptor) noexcept;
+
+    bool consumed() const noexcept;
+    const NodeStatusDescriptor& nodeStatus() const noexcept;
+
+  private:
+    NodeStatusDescriptor node_status_{};
+    bool consumed_ = false;
+};
+
+class HeadlessPageManifestConsumer
+{
+  public:
+    bool consume(const char* manifest_id, std::size_t page_count) noexcept;
+
+    const char* manifestId() const noexcept;
+    std::size_t pageCount() const noexcept;
+    bool consumed() const noexcept;
+
+  private:
+    const char* manifest_id_ = nullptr;
+    std::size_t page_count_ = 0;
+    bool consumed_ = false;
+};
+
+} // namespace trailmate::headless
diff --git a/modules/ui_headless_runtime/src/headless_descriptor_consumer.cpp b/modules/ui_headless_runtime/src/headless_descriptor_consumer.cpp
new file mode 100644
index 00000000..3d0646d3
--- /dev/null
+++ b/modules/ui_headless_runtime/src/headless_descriptor_consumer.cpp
@@ -0,0 +1,64 @@
+#include "ui_headless_runtime/headless_descriptor_consumer.h"
+
+namespace trailmate::headless
+{
+
+bool HeadlessRuntimeDescriptorConsumer::consume(
+    const NodeStatusDescriptor& descriptor) noexcept
+{
+    if (descriptor.target_id == nullptr || descriptor.status_label == nullptr)
+    {
+        consumed_ = false;
+        node_status_ = {};
+        return false;
+    }
+
+    node_status_ = descriptor;
+    consumed_ = true;
+    return true;
+}
+
+bool HeadlessRuntimeDescriptorConsumer::consumed() const noexcept
+{
+    return consumed_;
+}
+
+const NodeStatusDescriptor& HeadlessRuntimeDescriptorConsumer::nodeStatus()
+    const noexcept
+{
+    return node_status_;
+}
+
+bool HeadlessPageManifestConsumer::consume(const char* manifest_id,
+                                           std::size_t page_count) noexcept
+{
+    if (manifest_id == nullptr)
+    {
+        manifest_id_ = nullptr;
+        page_count_ = 0;
+        consumed_ = false;
+        return false;
+    }
+
+    manifest_id_ = manifest_id;
+    page_count_ = page_count;
+    consumed_ = true;
+    return true;
+}
+
+const char* HeadlessPageManifestConsumer::manifestId() const noexcept
+{
+    return manifest_id_;
+}
+
+std::size_t HeadlessPageManifestConsumer::pageCount() const noexcept
+{
+    return page_count_;
+}
+
+bool HeadlessPageManifestConsumer::consumed() const noexcept
+{
+    return consumed_;
+}
+
+} // namespace trailmate::headless
diff --git a/modules/ui_headless_runtime/tests/test_headless_descriptor_consumer.cpp b/modules/ui_headless_runtime/tests/test_headless_descriptor_consumer.cpp
new file mode 100644
index 00000000..8a8a37bd
--- /dev/null
+++ b/modules/ui_headless_runtime/tests/test_headless_descriptor_consumer.cpp
@@ -0,0 +1,34 @@
+#include "ui_headless_runtime/headless_descriptor_consumer.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    trailmate::headless::HeadlessRuntimeDescriptorConsumer runtime_consumer;
+    trailmate::headless::NodeStatusDescriptor status{
+        "gat562_mesh_evb_pro",
+        "node status",
+        true,
+    };
+
+    assert(runtime_consumer.consume(status));
+    assert(runtime_consumer.consumed());
+    assert(std::strcmp(runtime_consumer.nodeStatus().target_id,
+                       "gat562_mesh_evb_pro") == 0);
+    assert(std::strcmp(runtime_consumer.nodeStatus().status_label,
+                       "node status") == 0);
+    assert(runtime_consumer.nodeStatus().enabled);
+
+    trailmate::headless::HeadlessPageManifestConsumer page_consumer;
+    assert(page_consumer.consume("node_status_manifest", 1));
+    assert(page_consumer.consumed());
+    assert(std::strcmp(page_consumer.manifestId(), "node_status_manifest") == 0);
+    assert(page_consumer.pageCount() == 1);
+
+    assert(!runtime_consumer.consume({}));
+    assert(!runtime_consumer.consumed());
+    assert(!page_consumer.consume(nullptr, 0));
+    assert(!page_consumer.consumed());
+    return 0;
+}
diff --git a/modules/ui_key_verification_runtime/README.md b/modules/ui_key_verification_runtime/README.md
new file mode 100644
index 00000000..867a6b19
--- /dev/null
+++ b/modules/ui_key_verification_runtime/README.md
@@ -0,0 +1,5 @@
+# UI Key Verification Runtime
+
+This module owns stable key verification runtime adapters used by UI runtime
+composition. Legacy `ui_legacy_adapters` headers may forward here for downstream
+compatibility, but new main runtime code should include this module directly.
diff --git a/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h b/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h
new file mode 100644
index 00000000..0ca807db
--- /dev/null
+++ b/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "ui_key_verification_runtime/key_verification_session_adapter.h"
+#include "ui_presentation/key_verification/key_verification_action_sink.h"
+
+namespace chat
+{
+class IMeshAdapter;
+namespace contacts
+{
+class ContactService;
+}
+} // namespace chat
+
+namespace ui_key_verification_runtime
+{
+
+class KeyVerificationActionSink final
+    : public ::ui::key_verification::IKeyVerificationActionSink
+{
+  public:
+    KeyVerificationActionSink(
+        KeyVerificationSessionAdapter& session,
+        ::chat::IMeshAdapter* mesh = nullptr,
+        ::chat::contacts::ContactService* contacts = nullptr);
+
+    ::ui::UiActionResult accept(uint32_t peer_id) override;
+    ::ui::UiActionResult reject(uint32_t peer_id) override;
+    ::ui::UiActionResult refresh(uint32_t peer_id) override;
+    ::ui::UiActionResult copyCode(uint32_t peer_id) override;
+    ::ui::UiActionResult submitNumber(uint32_t peer_id,
+                                      uint32_t number) override;
+
+  private:
+    bool sessionMatches(uint32_t peer_id) const;
+
+    KeyVerificationSessionAdapter& session_;
+    ::chat::IMeshAdapter* mesh_ = nullptr;
+    ::chat::contacts::ContactService* contacts_ = nullptr;
+};
+
+} // namespace ui_key_verification_runtime
diff --git a/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h b/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h
new file mode 100644
index 00000000..037c99f6
--- /dev/null
+++ b/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "ui_key_verification_runtime/key_verification_session_adapter.h"
+#include "ui_presentation/key_verification/key_verification_source.h"
+
+namespace chat
+{
+class IMeshAdapter;
+namespace contacts
+{
+class ContactService;
+}
+} // namespace chat
+
+namespace ui_key_verification_runtime
+{
+
+class KeyVerificationPresentationSource final
+    : public ::ui::key_verification::IKeyVerificationPresentationSource
+{
+  public:
+    KeyVerificationPresentationSource(
+        KeyVerificationSessionAdapter& session,
+        const ::chat::contacts::ContactService* contacts = nullptr,
+        const ::chat::IMeshAdapter* mesh = nullptr);
+
+    bool buildKeyVerificationSnapshot(
+        const ::ui::key_verification::KeyVerificationRequest& request,
+        ::ui::key_verification::KeyVerificationSnapshot& out) const override;
+
+    void onNumberRequest(uint32_t peer_id, uint64_t nonce);
+    void onNumberInform(uint32_t peer_id,
+                        uint64_t nonce,
+                        uint32_t security_number);
+    void onFinal(uint32_t peer_id,
+                 uint64_t nonce,
+                 bool is_sender,
+                 const char* verification_code);
+    void onPeerKeyMissing(uint32_t peer_id);
+    void clear();
+
+  private:
+    ::ui::key_verification::VerificationProtocol currentProtocol() const;
+    void copyPeerLabel(uint32_t peer_id,
+                       ::ui::key_verification::KeyVerificationSnapshot& out) const;
+    void copyStatusLine(
+        ::ui::key_verification::KeyVerificationSnapshot& out) const;
+
+    KeyVerificationSessionAdapter& session_;
+    const ::chat::contacts::ContactService* contacts_ = nullptr;
+    const ::chat::IMeshAdapter* mesh_ = nullptr;
+};
+
+} // namespace ui_key_verification_runtime
diff --git a/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h b/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h
new file mode 100644
index 00000000..3ce60450
--- /dev/null
+++ b/modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "ui_presentation/key_verification/key_verification_snapshot.h"
+
+#include <stdint.h>
+
+namespace ui_key_verification_runtime
+{
+
+struct KeyVerificationSessionAdapter
+{
+    ::ui::key_verification::VerificationProtocol protocol =
+        ::ui::key_verification::VerificationProtocol::Unknown;
+    ::ui::key_verification::VerificationState state =
+        ::ui::key_verification::VerificationState::Idle;
+    ::ui::key_verification::VerificationFailureKind failure =
+        ::ui::key_verification::VerificationFailureKind::None;
+    ::ui::key_verification::VerificationPromptKind prompt =
+        ::ui::key_verification::VerificationPromptKind::None;
+
+    uint32_t peer_id = 0;
+    uint64_t nonce = 0;
+    uint32_t security_number = 0;
+    bool is_sender = false;
+    char verification_code[32]{};
+};
+
+} // namespace ui_key_verification_runtime
diff --git a/modules/ui_key_verification_runtime/library.json b/modules/ui_key_verification_runtime/library.json
new file mode 100644
index 00000000..40f98986
--- /dev/null
+++ b/modules/ui_key_verification_runtime/library.json
@@ -0,0 +1,18 @@
+{
+  "name": "ui_key_verification_runtime",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../../modules/ui_key_verification_runtime/include",
+      "-I../../modules/ui_presentation/include",
+      "-I../../modules/core_chat/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_chat"
+    }
+  ]
+}
diff --git a/modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp b/modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp
new file mode 100644
index 00000000..05f68727
--- /dev/null
+++ b/modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp
@@ -0,0 +1,162 @@
+#include "ui_key_verification_runtime/key_verification_action_sink.h"
+
+#include "chat/domain/chat_types.h"
+#include "chat/ports/i_mesh_adapter.h"
+#include "chat/usecase/contact_service.h"
+
+namespace ui_key_verification_runtime
+{
+
+namespace
+{
+
+::ui::key_verification::VerificationProtocol mapProtocol(
+    ::chat::MeshProtocol protocol)
+{
+    switch (protocol)
+    {
+    case ::chat::MeshProtocol::MeshCore:
+        return ::ui::key_verification::VerificationProtocol::MeshCore;
+    case ::chat::MeshProtocol::Meshtastic:
+        return ::ui::key_verification::VerificationProtocol::Meshtastic;
+    case ::chat::MeshProtocol::RNode:
+    case ::chat::MeshProtocol::LXMF:
+    default:
+        return ::ui::key_verification::VerificationProtocol::Unknown;
+    }
+}
+
+} // namespace
+
+KeyVerificationActionSink::KeyVerificationActionSink(
+    KeyVerificationSessionAdapter& session,
+    ::chat::IMeshAdapter* mesh,
+    ::chat::contacts::ContactService* contacts)
+    : session_(session),
+      mesh_(mesh),
+      contacts_(contacts)
+{
+}
+
+::ui::UiActionResult KeyVerificationActionSink::accept(uint32_t peer_id)
+{
+    if (peer_id == 0 || !sessionMatches(peer_id))
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::InvalidInput);
+    }
+    if (session_.prompt !=
+        ::ui::key_verification::VerificationPromptKind::CompareCode)
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::Rejected);
+    }
+    if (contacts_ == nullptr)
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::NotReady);
+    }
+
+    if (!contacts_->setNodeKeyManuallyVerified(peer_id, true))
+    {
+        session_.state = ::ui::key_verification::VerificationState::Failed;
+        session_.failure =
+            ::ui::key_verification::VerificationFailureKind::RuntimeUnavailable;
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::Rejected);
+    }
+
+    session_.state = ::ui::key_verification::VerificationState::Verified;
+    session_.failure = ::ui::key_verification::VerificationFailureKind::None;
+    session_.prompt = ::ui::key_verification::VerificationPromptKind::None;
+    return ::ui::UiActionResult::success();
+}
+
+::ui::UiActionResult KeyVerificationActionSink::reject(uint32_t peer_id)
+{
+    if (peer_id == 0)
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::InvalidInput);
+    }
+
+    if (session_.peer_id == 0 || session_.peer_id == peer_id)
+    {
+        session_.peer_id = peer_id;
+        session_.state = ::ui::key_verification::VerificationState::Rejected;
+        session_.failure = ::ui::key_verification::VerificationFailureKind::None;
+        session_.prompt = ::ui::key_verification::VerificationPromptKind::None;
+        return ::ui::UiActionResult::success();
+    }
+
+    return ::ui::UiActionResult::fail(::ui::UiActionFailure::InvalidInput);
+}
+
+::ui::UiActionResult KeyVerificationActionSink::refresh(uint32_t peer_id)
+{
+    if (peer_id == 0)
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::InvalidInput);
+    }
+    if (mesh_ == nullptr)
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::NotReady);
+    }
+
+    if (!mesh_->startKeyVerification(peer_id))
+    {
+        session_.peer_id = peer_id;
+        session_.protocol = mapProtocol(mesh_->backendProtocol());
+        session_.state = ::ui::key_verification::VerificationState::Failed;
+        session_.failure =
+            ::ui::key_verification::VerificationFailureKind::RuntimeUnavailable;
+        session_.prompt = ::ui::key_verification::VerificationPromptKind::None;
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::Rejected);
+    }
+
+    session_ = {};
+    session_.peer_id = peer_id;
+    session_.protocol = mapProtocol(mesh_->backendProtocol());
+    session_.state = ::ui::key_verification::VerificationState::Pending;
+    return ::ui::UiActionResult::success();
+}
+
+::ui::UiActionResult KeyVerificationActionSink::copyCode(uint32_t peer_id)
+{
+    if (peer_id == 0 || !sessionMatches(peer_id))
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::InvalidInput);
+    }
+    return ::ui::UiActionResult::fail(::ui::UiActionFailure::Unsupported);
+}
+
+::ui::UiActionResult KeyVerificationActionSink::submitNumber(
+    uint32_t peer_id,
+    uint32_t number)
+{
+    if (peer_id == 0 || number > 999999U || !sessionMatches(peer_id))
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::InvalidInput);
+    }
+    if (session_.prompt !=
+            ::ui::key_verification::VerificationPromptKind::EnterNumber ||
+        session_.nonce == 0)
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::Rejected);
+    }
+    if (mesh_ == nullptr)
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::NotReady);
+    }
+
+    if (!mesh_->submitKeyVerificationNumber(peer_id, session_.nonce, number))
+    {
+        return ::ui::UiActionResult::fail(::ui::UiActionFailure::Rejected);
+    }
+
+    session_.prompt = ::ui::key_verification::VerificationPromptKind::None;
+    session_.state = ::ui::key_verification::VerificationState::Pending;
+    return ::ui::UiActionResult::success();
+}
+
+bool KeyVerificationActionSink::sessionMatches(uint32_t peer_id) const
+{
+    return session_.peer_id == peer_id && peer_id != 0;
+}
+
+} // namespace ui_key_verification_runtime
diff --git a/modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp b/modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp
new file mode 100644
index 00000000..c2c1033b
--- /dev/null
+++ b/modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp
@@ -0,0 +1,291 @@
+#include "ui_key_verification_runtime/key_verification_presentation_source.h"
+
+#include "chat/domain/chat_types.h"
+#include "chat/ports/i_mesh_adapter.h"
+#include "chat/usecase/contact_service.h"
+#include "ui_presentation/common/fixed_text.h"
+
+#include <cstdio>
+#include <cstring>
+#include <string>
+
+namespace ui_key_verification_runtime
+{
+
+namespace
+{
+
+::ui::key_verification::VerificationProtocol mapProtocol(
+    ::chat::MeshProtocol protocol)
+{
+    switch (protocol)
+    {
+    case ::chat::MeshProtocol::MeshCore:
+        return ::ui::key_verification::VerificationProtocol::MeshCore;
+    case ::chat::MeshProtocol::Meshtastic:
+        return ::ui::key_verification::VerificationProtocol::Meshtastic;
+    case ::chat::MeshProtocol::RNode:
+    case ::chat::MeshProtocol::LXMF:
+    default:
+        return ::ui::key_verification::VerificationProtocol::Unknown;
+    }
+}
+
+void copySecurityNumber(
+    uint32_t number,
+    ::ui::key_verification::KeyVerificationSnapshot& out)
+{
+    char buffer[24] = {};
+    std::snprintf(buffer,
+                  sizeof(buffer),
+                  "%03u %03u",
+                  static_cast<unsigned>(number / 1000U),
+                  static_cast<unsigned>(number % 1000U));
+    ::ui::copyText(out.verification_code, buffer);
+}
+
+const char* failureStatus(
+    ::ui::key_verification::VerificationFailureKind failure)
+{
+    switch (failure)
+    {
+    case ::ui::key_verification::VerificationFailureKind::MissingPeerKey:
+        return "Peer key missing";
+    case ::ui::key_verification::VerificationFailureKind::MissingLocalIdentity:
+        return "Local identity missing";
+    case ::ui::key_verification::VerificationFailureKind::CodeMismatch:
+        return "Verification code mismatch";
+    case ::ui::key_verification::VerificationFailureKind::UnsupportedProtocol:
+        return "Key verification unsupported";
+    case ::ui::key_verification::VerificationFailureKind::RuntimeUnavailable:
+        return "Key verification unavailable";
+    case ::ui::key_verification::VerificationFailureKind::Unknown:
+        return "Key verification failed";
+    case ::ui::key_verification::VerificationFailureKind::None:
+    default:
+        return "";
+    }
+}
+
+} // namespace
+
+KeyVerificationPresentationSource::KeyVerificationPresentationSource(
+    KeyVerificationSessionAdapter& session,
+    const ::chat::contacts::ContactService* contacts,
+    const ::chat::IMeshAdapter* mesh)
+    : session_(session),
+      contacts_(contacts),
+      mesh_(mesh)
+{
+}
+
+bool KeyVerificationPresentationSource::buildKeyVerificationSnapshot(
+    const ::ui::key_verification::KeyVerificationRequest& request,
+    ::ui::key_verification::KeyVerificationSnapshot& out) const
+{
+    if (!request.isValid())
+    {
+        out = {};
+        out.header.valid = true;
+        out.state = ::ui::key_verification::VerificationState::Idle;
+        return true;
+    }
+
+    out = {};
+    out.header.valid = true;
+    out.header.version = 1;
+    out.peer_id = request.peer_id;
+    out.protocol = request.protocol !=
+                           ::ui::key_verification::VerificationProtocol::Unknown
+                       ? request.protocol
+                       : currentProtocol();
+    copyPeerLabel(request.peer_id, out);
+
+    if (session_.peer_id != request.peer_id ||
+        session_.state == ::ui::key_verification::VerificationState::Idle)
+    {
+        out.state = ::ui::key_verification::VerificationState::Idle;
+        out.prompt = ::ui::key_verification::VerificationPromptKind::None;
+        out.can_refresh = true;
+        ::ui::copyText(out.status_line, "No active key verification");
+        return true;
+    }
+
+    out.protocol = session_.protocol !=
+                           ::ui::key_verification::VerificationProtocol::Unknown
+                       ? session_.protocol
+                       : out.protocol;
+    out.state = session_.state;
+    out.failure = session_.failure;
+    out.prompt = session_.prompt;
+
+    if (session_.prompt ==
+        ::ui::key_verification::VerificationPromptKind::EnterNumber)
+    {
+        out.requires_number = true;
+        out.can_reject = true;
+    }
+    else if (session_.prompt ==
+             ::ui::key_verification::VerificationPromptKind::ShowNumber)
+    {
+        out.can_copy_code = true;
+        copySecurityNumber(session_.security_number, out);
+    }
+    else if (session_.prompt ==
+             ::ui::key_verification::VerificationPromptKind::CompareCode)
+    {
+        out.can_accept = true;
+        out.can_reject = true;
+        out.can_copy_code = true;
+        ::ui::copyText(out.verification_code,
+                       session_.verification_code[0] != '\0'
+                           ? session_.verification_code
+                           : "--------");
+    }
+
+    if (session_.state ==
+        ::ui::key_verification::VerificationState::Failed)
+    {
+        out.can_refresh = true;
+    }
+
+    copyStatusLine(out);
+    return true;
+}
+
+void KeyVerificationPresentationSource::onNumberRequest(uint32_t peer_id,
+                                                        uint64_t nonce)
+{
+    session_ = {};
+    session_.peer_id = peer_id;
+    session_.nonce = nonce;
+    session_.protocol = currentProtocol();
+    session_.state = ::ui::key_verification::VerificationState::Pending;
+    session_.prompt =
+        ::ui::key_verification::VerificationPromptKind::EnterNumber;
+}
+
+void KeyVerificationPresentationSource::onNumberInform(
+    uint32_t peer_id,
+    uint64_t nonce,
+    uint32_t security_number)
+{
+    session_ = {};
+    session_.peer_id = peer_id;
+    session_.nonce = nonce;
+    session_.security_number = security_number;
+    session_.protocol = currentProtocol();
+    session_.state = ::ui::key_verification::VerificationState::Pending;
+    session_.prompt =
+        ::ui::key_verification::VerificationPromptKind::ShowNumber;
+}
+
+void KeyVerificationPresentationSource::onFinal(
+    uint32_t peer_id,
+    uint64_t nonce,
+    bool is_sender,
+    const char* verification_code)
+{
+    session_ = {};
+    session_.peer_id = peer_id;
+    session_.nonce = nonce;
+    session_.is_sender = is_sender;
+    session_.protocol = currentProtocol();
+    session_.state = ::ui::key_verification::VerificationState::Pending;
+    session_.prompt =
+        ::ui::key_verification::VerificationPromptKind::CompareCode;
+    if (verification_code != nullptr)
+    {
+        std::strncpy(session_.verification_code,
+                     verification_code,
+                     sizeof(session_.verification_code) - 1U);
+        session_.verification_code[sizeof(session_.verification_code) - 1U] =
+            '\0';
+    }
+}
+
+void KeyVerificationPresentationSource::onPeerKeyMissing(uint32_t peer_id)
+{
+    session_ = {};
+    session_.peer_id = peer_id;
+    session_.protocol = currentProtocol();
+    session_.state = ::ui::key_verification::VerificationState::Failed;
+    session_.failure =
+        ::ui::key_verification::VerificationFailureKind::MissingPeerKey;
+}
+
+void KeyVerificationPresentationSource::clear()
+{
+    session_ = {};
+}
+
+::ui::key_verification::VerificationProtocol
+KeyVerificationPresentationSource::currentProtocol() const
+{
+    if (mesh_ == nullptr)
+    {
+        return ::ui::key_verification::VerificationProtocol::Unknown;
+    }
+    return mapProtocol(mesh_->backendProtocol());
+}
+
+void KeyVerificationPresentationSource::copyPeerLabel(
+    uint32_t peer_id,
+    ::ui::key_verification::KeyVerificationSnapshot& out) const
+{
+    if (contacts_ != nullptr)
+    {
+        const std::string name = contacts_->getContactName(peer_id);
+        if (!name.empty())
+        {
+            ::ui::copyText(out.peer_label, name.c_str());
+            return;
+        }
+    }
+
+    char fallback[16] = {};
+    std::snprintf(fallback,
+                  sizeof(fallback),
+                  "%08lX",
+                  static_cast<unsigned long>(peer_id));
+    ::ui::copyText(out.peer_label, fallback);
+}
+
+void KeyVerificationPresentationSource::copyStatusLine(
+    ::ui::key_verification::KeyVerificationSnapshot& out) const
+{
+    if (out.state == ::ui::key_verification::VerificationState::Verified)
+    {
+        ::ui::copyText(out.status_line, "Key trusted");
+        return;
+    }
+    if (out.state == ::ui::key_verification::VerificationState::Rejected)
+    {
+        ::ui::copyText(out.status_line, "Verification rejected");
+        return;
+    }
+    if (out.state == ::ui::key_verification::VerificationState::Failed)
+    {
+        ::ui::copyText(out.status_line, failureStatus(out.failure));
+        return;
+    }
+
+    switch (out.prompt)
+    {
+    case ::ui::key_verification::VerificationPromptKind::EnterNumber:
+        ::ui::copyText(out.status_line, "Enter verification number");
+        break;
+    case ::ui::key_verification::VerificationPromptKind::ShowNumber:
+        ::ui::copyText(out.status_line, "Share this verification number");
+        break;
+    case ::ui::key_verification::VerificationPromptKind::CompareCode:
+        ::ui::copyText(out.status_line, "Compare verification code");
+        break;
+    case ::ui::key_verification::VerificationPromptKind::None:
+    default:
+        ::ui::copyText(out.status_line, "Key verification pending");
+        break;
+    }
+}
+
+} // namespace ui_key_verification_runtime
diff --git a/modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp b/modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp
new file mode 100644
index 00000000..cee53e62
--- /dev/null
+++ b/modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp
@@ -0,0 +1,293 @@
+#include "chat/ports/i_contact_store.h"
+#include "chat/ports/i_mesh_adapter.h"
+#include "chat/ports/i_node_store.h"
+#include "chat/usecase/contact_service.h"
+#include "ui_key_verification_runtime/key_verification_action_sink.h"
+#include "ui_key_verification_runtime/key_verification_presentation_source.h"
+
+#include <cassert>
+#include <cstring>
+#include <string>
+#include <vector>
+
+namespace
+{
+
+class FakeMeshAdapter final : public ::chat::IMeshAdapter
+{
+  public:
+    bool sendText(::chat::ChannelId,
+                  const std::string&,
+                  ::chat::MessageId*,
+                  ::chat::NodeId = 0) override
+    {
+        return false;
+    }
+
+    bool pollIncomingText(::chat::MeshIncomingText*) override { return false; }
+
+    bool sendAppData(::chat::ChannelId,
+                     uint32_t,
+                     const uint8_t*,
+                     size_t,
+                     ::chat::NodeId = 0,
+                     bool = false,
+                     ::chat::MessageId = 0,
+                     bool = false) override
+    {
+        return false;
+    }
+
+    bool pollIncomingData(::chat::MeshIncomingData*) override { return false; }
+    void applyConfig(const ::chat::MeshConfig&) override {}
+    bool isReady() const override { return true; }
+    bool pollIncomingRawPacket(uint8_t*, size_t&, size_t) override { return false; }
+
+    bool startKeyVerification(::chat::NodeId dest) override
+    {
+        ++start_count;
+        last_start_peer = dest;
+        return start_ok;
+    }
+
+    bool submitKeyVerificationNumber(::chat::NodeId dest,
+                                     uint64_t nonce,
+                                     uint32_t number) override
+    {
+        ++submit_count;
+        last_submit_peer = dest;
+        last_nonce = nonce;
+        last_number = number;
+        return submit_ok;
+    }
+
+    ::chat::MeshProtocol backendProtocol() const override
+    {
+        return protocol;
+    }
+
+    bool start_ok = true;
+    bool submit_ok = true;
+    int start_count = 0;
+    int submit_count = 0;
+    ::chat::NodeId last_start_peer = 0;
+    ::chat::NodeId last_submit_peer = 0;
+    uint64_t last_nonce = 0;
+    uint32_t last_number = 0;
+    ::chat::MeshProtocol protocol = ::chat::MeshProtocol::MeshCore;
+};
+
+class FakeNodeStore final : public ::chat::contacts::INodeStore
+{
+  public:
+    void begin() override {}
+
+    void applyUpdate(uint32_t node_id,
+                     const ::chat::contacts::NodeUpdate& update) override
+    {
+        for (auto& entry : entries_)
+        {
+            if (entry.node_id == node_id)
+            {
+                if (update.has_key_manually_verified)
+                {
+                    entry.key_manually_verified =
+                        update.key_manually_verified;
+                }
+                return;
+            }
+        }
+    }
+
+    void upsert(uint32_t node_id,
+                const char* short_name,
+                const char* long_name,
+                uint32_t now_secs,
+                float = 0.0f,
+                float = 0.0f,
+                uint8_t protocol = 0,
+                uint8_t = ::chat::contacts::kNodeRoleUnknown,
+                uint8_t = 0xFF,
+                uint8_t = 0,
+                uint8_t = 0xFF) override
+    {
+        ::chat::contacts::NodeEntry entry{};
+        entry.node_id = node_id;
+        std::strncpy(entry.short_name, short_name ? short_name : "",
+                     sizeof(entry.short_name) - 1U);
+        std::strncpy(entry.long_name, long_name ? long_name : "",
+                     sizeof(entry.long_name) - 1U);
+        entry.last_seen = now_secs;
+        entry.protocol = protocol;
+        entries_.push_back(entry);
+    }
+
+    void updateProtocol(uint32_t, uint8_t, uint32_t) override {}
+    void updatePosition(uint32_t,
+                        const ::chat::contacts::NodePosition&) override {}
+    bool remove(uint32_t) override { return false; }
+    const std::vector<::chat::contacts::NodeEntry>& getEntries() const override
+    {
+        return entries_;
+    }
+    void clear() override { entries_.clear(); }
+    bool flush() override { return true; }
+
+    std::vector<::chat::contacts::NodeEntry> entries_;
+};
+
+class FakeContactStore final : public ::chat::contacts::IContactStore
+{
+  public:
+    void begin() override {}
+
+    std::string getNickname(uint32_t node_id) const override
+    {
+        return node_id == nickname_node ? nickname : std::string();
+    }
+
+    bool setNickname(uint32_t node_id, const char* value) override
+    {
+        nickname_node = node_id;
+        nickname = value ? value : "";
+        return true;
+    }
+
+    bool removeNickname(uint32_t node_id) override
+    {
+        if (node_id == nickname_node)
+        {
+            nickname_node = 0;
+            nickname.clear();
+            return true;
+        }
+        return false;
+    }
+
+    bool hasNickname(const char*) const override { return false; }
+    std::vector<uint32_t> getAllContactIds() const override
+    {
+        if (nickname_node == 0)
+        {
+            return {};
+        }
+        return {nickname_node};
+    }
+    size_t getCount() const override { return nickname_node == 0 ? 0U : 1U; }
+
+    uint32_t nickname_node = 0;
+    std::string nickname;
+};
+
+} // namespace
+
+int main()
+{
+    using namespace ui::key_verification;
+
+    FakeNodeStore node_store;
+    node_store.upsert(0x1234, "ADA", "Ada Lovelace", 1);
+    FakeContactStore contact_store;
+    assert(contact_store.setNickname(0x1234, "Ada"));
+    ::chat::contacts::ContactService contacts(node_store, contact_store);
+
+    FakeMeshAdapter mesh;
+    ui_key_verification_runtime::KeyVerificationSessionAdapter session{};
+    ui_key_verification_runtime::KeyVerificationPresentationSource source(
+        session,
+        &contacts,
+        &mesh);
+    ui_key_verification_runtime::KeyVerificationActionSink sink(session,
+                                                                &mesh,
+                                                                &contacts);
+
+    source.onNumberRequest(0x1234, 99);
+    KeyVerificationSnapshot snapshot{};
+    assert(source.buildKeyVerificationSnapshot(
+        KeyVerificationRequest{VerificationProtocol::Unknown, 0x1234},
+        snapshot));
+    assert(snapshot.header.valid);
+    assert(snapshot.protocol == VerificationProtocol::MeshCore);
+    assert(snapshot.state == VerificationState::Pending);
+    assert(snapshot.prompt == VerificationPromptKind::EnterNumber);
+    assert(snapshot.requires_number);
+    assert(snapshot.can_reject);
+    assert(std::strcmp(snapshot.peer_label.c_str(), "Ada") == 0);
+    assert(std::strcmp(snapshot.status_line.c_str(),
+                       "Enter verification number") == 0);
+
+    auto result = sink.submitNumber(0x1234, 654321);
+    assert(result.ok);
+    assert(mesh.submit_count == 1);
+    assert(mesh.last_submit_peer == 0x1234);
+    assert(mesh.last_nonce == 99);
+    assert(mesh.last_number == 654321);
+    assert(session.prompt == VerificationPromptKind::None);
+
+    source.onNumberInform(0x1234, 100, 123456);
+    assert(source.buildKeyVerificationSnapshot(
+        KeyVerificationRequest{VerificationProtocol::Unknown, 0x1234},
+        snapshot));
+    assert(snapshot.prompt == VerificationPromptKind::ShowNumber);
+    assert(snapshot.can_copy_code);
+    assert(std::strcmp(snapshot.verification_code.c_str(), "123 456") == 0);
+
+    source.onFinal(0x1234, 101, false, "ABCD-1234");
+    assert(source.buildKeyVerificationSnapshot(
+        KeyVerificationRequest{VerificationProtocol::Unknown, 0x1234},
+        snapshot));
+    assert(snapshot.prompt == VerificationPromptKind::CompareCode);
+    assert(snapshot.can_accept);
+    assert(snapshot.can_reject);
+    assert(snapshot.can_copy_code);
+    assert(std::strcmp(snapshot.verification_code.c_str(), "ABCD-1234") == 0);
+
+    result = sink.accept(0x1234);
+    assert(result.ok);
+    assert(session.state == VerificationState::Verified);
+    assert(node_store.entries_[0].key_manually_verified);
+
+    source.onFinal(0x1234, 102, true, "WXYZ-9876");
+    result = sink.copyCode(0x1234);
+    assert(!result.ok);
+    assert(result.failure == ui::UiActionFailure::Unsupported);
+
+    result = sink.reject(0x1234);
+    assert(result.ok);
+    assert(session.state == VerificationState::Rejected);
+
+    result = sink.refresh(0x1234);
+    assert(result.ok);
+    assert(mesh.start_count == 1);
+    assert(mesh.last_start_peer == 0x1234);
+    assert(session.state == VerificationState::Pending);
+
+    source.onPeerKeyMissing(0xBEEF);
+    assert(source.buildKeyVerificationSnapshot(
+        KeyVerificationRequest{VerificationProtocol::Unknown, 0xBEEF},
+        snapshot));
+    assert(snapshot.state == VerificationState::Failed);
+    assert(snapshot.failure == VerificationFailureKind::MissingPeerKey);
+    assert(snapshot.can_refresh);
+
+    ui_key_verification_runtime::KeyVerificationActionSink no_runtime_sink(
+        session,
+        nullptr,
+        nullptr);
+    result = no_runtime_sink.refresh(0xBEEF);
+    assert(!result.ok);
+    assert(result.failure == ui::UiActionFailure::NotReady);
+
+    result = no_runtime_sink.submitNumber(0xBEEF, 1000000);
+    assert(!result.ok);
+    assert(result.failure == ui::UiActionFailure::InvalidInput);
+
+    source.clear();
+    assert(source.buildKeyVerificationSnapshot(
+        KeyVerificationRequest{VerificationProtocol::Meshtastic, 0xBEEF},
+        snapshot));
+    assert(snapshot.state == VerificationState::Idle);
+    assert(snapshot.can_refresh);
+
+    return 0;
+}
diff --git a/modules/ui_legacy_adapters/README.md b/modules/ui_legacy_adapters/README.md
new file mode 100644
index 00000000..e5fa3403
--- /dev/null
+++ b/modules/ui_legacy_adapters/README.md
@@ -0,0 +1,21 @@
+# ui_legacy_adapters
+
+Bounded compatibility adapters and anti-corruption bridges.
+
+May contain:
+
+- legacy source/sink adapters
+- compatibility bridges
+- anti-corruption wrappers around existing runtime APIs
+
+Must not contain:
+
+- new product behavior
+- renderer widgets
+- app composition roots
+- build entrypoints
+- board facts
+
+This module was split from `modules/ui_shared` during the Phase 8 structural
+migration batch. The old `ui/presentation_sources/legacy_*` headers remain
+forwarding headers for migrated adapters.
diff --git a/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h
new file mode 100644
index 00000000..dcdafec1
--- /dev/null
+++ b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "ui_chat_runtime/chat_delivery_action_port_adapter.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyChatDeliveryActionBridge
+    [[deprecated("Use ui_chat_runtime::ChatDeliveryActionPortAdapter")]] =
+        ::ui_chat_runtime::ChatDeliveryActionPortAdapter;
+using ::ui_chat_runtime::toDeliveryRef;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h
new file mode 100644
index 00000000..7c1f1f54
--- /dev/null
+++ b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ui_chat_runtime/chat_delivery_event_projection_adapter.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyChatDeliveryEventBridge
+    [[deprecated("Use ui_chat_runtime::ChatDeliveryEventProjectionAdapter")]] =
+        ::ui_chat_runtime::ChatDeliveryEventProjectionAdapter;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h
new file mode 100644
index 00000000..0fada120
--- /dev/null
+++ b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ui_key_verification_runtime/key_verification_action_sink.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyKeyVerificationActionSink
+    [[deprecated("Use ui_key_verification_runtime::KeyVerificationActionSink")]] =
+        ::ui_key_verification_runtime::KeyVerificationActionSink;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h
new file mode 100644
index 00000000..256dabf1
--- /dev/null
+++ b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ui_key_verification_runtime/key_verification_session_adapter.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyKeyVerificationSession
+    [[deprecated("Use ui_key_verification_runtime::KeyVerificationSessionAdapter")]] =
+        ::ui_key_verification_runtime::KeyVerificationSessionAdapter;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h
new file mode 100644
index 00000000..6504cf29
--- /dev/null
+++ b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ui_key_verification_runtime/key_verification_presentation_source.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyKeyVerificationSource
+    [[deprecated("Use ui_key_verification_runtime::KeyVerificationPresentationSource")]] =
+        ::ui_key_verification_runtime::KeyVerificationPresentationSource;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h
new file mode 100644
index 00000000..d1f9d426
--- /dev/null
+++ b/modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "ui_map_runtime/map_overlay_snapshot_source.h"
+
+namespace ui
+{
+namespace presentation_sources
+{
+
+using IMapOverlayGpsSource = ::ui::map_overlay::IMapOverlayGpsSource;
+using IMapOverlayTeamSource = ::ui::map_overlay::IMapOverlayTeamSource;
+using LegacyMapOverlaySource
+    [[deprecated("Use ui::map_overlay::MapOverlaySnapshotSource")]] =
+        ::ui::map_overlay::MapOverlaySnapshotSource;
+
+} // namespace presentation_sources
+} // namespace ui
diff --git a/modules/ui_legacy_adapters/library.json b/modules/ui_legacy_adapters/library.json
new file mode 100644
index 00000000..380f9d12
--- /dev/null
+++ b/modules/ui_legacy_adapters/library.json
@@ -0,0 +1,35 @@
+{
+  "name": "ui_legacy_adapters",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../../modules/ui_legacy_adapters/include",
+      "-I../../modules/ui_chat_runtime/include",
+      "-I../../modules/ui_key_verification_runtime/include",
+      "-I../../modules/ui_map_runtime/include",
+      "-I../../modules/ui_presentation/include",
+      "-I../../modules/core_chat/include",
+      "-I../../modules/core_sys/include",
+      "-I../../modules/core_team/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_chat"
+    },
+    {
+      "name": "core_sys"
+    },
+    {
+      "name": "core_team"
+    },
+    {
+      "name": "ui_map_runtime"
+    },
+    {
+      "name": "ui_key_verification_runtime"
+    }
+  ]
+}
diff --git a/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp b/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp
new file mode 100644
index 00000000..12a84051
--- /dev/null
+++ b/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp
@@ -0,0 +1,12 @@
+#include "ui_legacy_adapters/legacy_chat_delivery_action_bridge.h"
+
+#include <type_traits>
+
+int main()
+{
+    static_assert(std::is_same<
+                      ui::presentation_sources::LegacyChatDeliveryActionBridge,
+                      ui_chat_runtime::ChatDeliveryActionPortAdapter>::value,
+                  "LegacyChatDeliveryActionBridge must stay an alias only");
+    return 0;
+}
diff --git a/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp b/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp
new file mode 100644
index 00000000..278e0809
--- /dev/null
+++ b/modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp
@@ -0,0 +1,12 @@
+#include "ui_legacy_adapters/legacy_chat_delivery_event_bridge.h"
+
+#include <type_traits>
+
+int main()
+{
+    static_assert(std::is_same<
+                      ui::presentation_sources::LegacyChatDeliveryEventBridge,
+                      ui_chat_runtime::ChatDeliveryEventProjectionAdapter>::value,
+                  "LegacyChatDeliveryEventBridge must stay an alias only");
+    return 0;
+}
diff --git a/modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp b/modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp
new file mode 100644
index 00000000..acba5efe
--- /dev/null
+++ b/modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp
@@ -0,0 +1,22 @@
+#include "ui_legacy_adapters/legacy_key_verification_action_sink.h"
+#include "ui_legacy_adapters/legacy_key_verification_session.h"
+#include "ui_legacy_adapters/legacy_key_verification_source.h"
+
+#include <type_traits>
+
+int main()
+{
+    static_assert(
+        std::is_same<ui::presentation_sources::LegacyKeyVerificationSession,
+                     ui_key_verification_runtime::KeyVerificationSessionAdapter>::value,
+        "LegacyKeyVerificationSession must stay an alias only");
+    static_assert(
+        std::is_same<ui::presentation_sources::LegacyKeyVerificationSource,
+                     ui_key_verification_runtime::KeyVerificationPresentationSource>::value,
+        "LegacyKeyVerificationSource must stay an alias only");
+    static_assert(
+        std::is_same<ui::presentation_sources::LegacyKeyVerificationActionSink,
+                     ui_key_verification_runtime::KeyVerificationActionSink>::value,
+        "LegacyKeyVerificationActionSink must stay an alias only");
+    return 0;
+}
diff --git a/modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp b/modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp
new file mode 100644
index 00000000..2bdcb3ce
--- /dev/null
+++ b/modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp
@@ -0,0 +1,20 @@
+#include "ui_legacy_adapters/legacy_map_overlay_source.h"
+
+#include <type_traits>
+
+int main()
+{
+    static_assert(
+        std::is_same<ui::presentation_sources::IMapOverlayGpsSource,
+                     ui::map_overlay::IMapOverlayGpsSource>::value,
+        "IMapOverlayGpsSource must stay an alias only");
+    static_assert(
+        std::is_same<ui::presentation_sources::IMapOverlayTeamSource,
+                     ui::map_overlay::IMapOverlayTeamSource>::value,
+        "IMapOverlayTeamSource must stay an alias only");
+    static_assert(
+        std::is_same<ui::presentation_sources::LegacyMapOverlaySource,
+                     ui::map_overlay::MapOverlaySnapshotSource>::value,
+        "LegacyMapOverlaySource must stay an alias only");
+    return 0;
+}
diff --git a/modules/ui_lvgl_core/README.md b/modules/ui_lvgl_core/README.md
new file mode 100644
index 00000000..c12abbcf
--- /dev/null
+++ b/modules/ui_lvgl_core/README.md
@@ -0,0 +1,24 @@
+# ui_lvgl_core
+
+LVGL technical primitives.
+
+May contain:
+
+- LVGL themes
+- primitive widgets
+- technical navigation hosts
+- reusable visual components
+- input host primitives
+
+Must not contain:
+
+- target UX feature decisions
+- app shell startup
+- build entrypoints
+- board facts
+- Chat/Map/GPS runtime scheduling
+
+Phase 8 structural migration creates this module as the LVGL core target module.
+This batch only adds the transitional focus-group declaration needed by moved UX
+renderers; the implementation remains in the ui_shared umbrella until the screen
+host/runtime shell migration.
diff --git a/modules/ui_lvgl_core/include/ui_lvgl_core/.gitkeep b/modules/ui_lvgl_core/include/ui_lvgl_core/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/modules/ui_lvgl_core/include/ui_lvgl_core/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/modules/ui_lvgl_core/include/ui_lvgl_core/lvgl_focus_group.h b/modules/ui_lvgl_core/include/ui_lvgl_core/lvgl_focus_group.h
new file mode 100644
index 00000000..d059dd91
--- /dev/null
+++ b/modules/ui_lvgl_core/include/ui_lvgl_core/lvgl_focus_group.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "lvgl.h"
+
+// Transitional LVGL focus-group bridge.
+// The implementation still lives in ui_shared/app_runtime.cpp until the
+// screen host/runtime shell is migrated out of the ui_shared umbrella.
+extern lv_group_t* app_g;
+
+void set_default_group(lv_group_t* group);
diff --git a/modules/ui_lvgl_core/library.json b/modules/ui_lvgl_core/library.json
new file mode 100644
index 00000000..16383bd7
--- /dev/null
+++ b/modules/ui_lvgl_core/library.json
@@ -0,0 +1,16 @@
+{
+  "name": "ui_lvgl_core",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../../modules/ui_lvgl_core/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "lvgl"
+    }
+  ]
+}
diff --git a/modules/ui_lvgl_core/src/.gitkeep b/modules/ui_lvgl_core/src/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/modules/ui_lvgl_core/src/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/modules/ui_lvgl_ux_packs/README.md b/modules/ui_lvgl_ux_packs/README.md
new file mode 100644
index 00000000..c3e71ac2
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/README.md
@@ -0,0 +1,24 @@
+# ui_lvgl_ux_packs
+
+Device-specific LVGL UX pack renderers and common UX-pack widgets.
+
+May contain:
+
+- page sets
+- renderer variants
+- modal variants
+- picker variants
+- input binding sets
+- layout profiles
+- feature-depth decisions
+
+Must not contain:
+
+- board pin facts
+- SDK/HAL calls
+- build entrypoints
+- protocol interpretation
+- direct filesystem tile paths
+
+The Phase 8 structural migration starts this module with the already-extracted
+Team position picker and key verification modal renderer.
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/key_verification_modal_renderer.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/key_verification_modal_renderer.h
new file mode 100644
index 00000000..2b655d97
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/key_verification_modal_renderer.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "lvgl.h"
+#include "ui_presentation/key_verification/key_verification_snapshot.h"
+
+#include <memory>
+
+namespace ui::widgets
+{
+class ImeWidget;
+}
+
+namespace chat::ui
+{
+
+struct KeyVerificationModalRefs
+{
+    lv_obj_t* overlay = nullptr;
+    lv_obj_t* panel = nullptr;
+    lv_obj_t* desc = nullptr;
+    lv_obj_t* textarea = nullptr;
+    lv_obj_t* error_label = nullptr;
+    lv_group_t* group = nullptr;
+    lv_group_t* prev_group = nullptr;
+};
+
+struct KeyVerificationModalCallbacks
+{
+    lv_event_cb_t submit = nullptr;
+    lv_event_cb_t close = nullptr;
+    lv_event_cb_t trust = nullptr;
+    void* user_data = nullptr;
+};
+
+void destroyKeyVerificationModal(
+    KeyVerificationModalRefs& refs,
+    std::unique_ptr<::ui::widgets::ImeWidget>& ime,
+    bool restore_group);
+
+void renderKeyVerificationModal(
+    lv_obj_t* parent,
+    const ::ui::key_verification::KeyVerificationSnapshot& snapshot,
+    const KeyVerificationModalCallbacks& callbacks,
+    KeyVerificationModalRefs& refs,
+    std::unique_ptr<::ui::widgets::ImeWidget>& ime);
+
+void clearKeyVerificationError(const KeyVerificationModalRefs& refs);
+
+} // namespace chat::ui
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/team_position_picker_renderer.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/team_position_picker_renderer.h
new file mode 100644
index 00000000..21491add
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/team_position_picker_renderer.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "lvgl.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace chat
+{
+namespace ui
+{
+
+class TeamPositionPickerRenderer
+{
+  public:
+    struct Callbacks
+    {
+        void (*on_icon_selected)(void* user_data, uint8_t icon_id) = nullptr;
+        void (*on_cancel)(void* user_data) = nullptr;
+        void* user_data = nullptr;
+    };
+
+    TeamPositionPickerRenderer(lv_obj_t* parent, const Callbacks& callbacks);
+    ~TeamPositionPickerRenderer();
+
+    bool open();
+    void close(bool restore_group);
+    bool isOpen() const;
+    void updateHint(uint8_t icon_id);
+
+  private:
+    static constexpr std::size_t kMaxIcons = 8;
+
+    struct IconEventCtx
+    {
+        TeamPositionPickerRenderer* renderer = nullptr;
+        uint8_t icon_id = 0;
+    };
+
+    void handleIconFocused(uint8_t icon_id, lv_obj_t* target);
+    void handleIconSelected(uint8_t icon_id);
+    void handleCancelFocused();
+    void handleCancel();
+    void clearIconContexts();
+
+    static void iconEventCb(lv_event_t* e);
+    static void cancelEventCb(lv_event_t* e);
+
+    lv_obj_t* parent_ = nullptr;
+    Callbacks callbacks_{};
+
+    IconEventCtx icon_ctxs_[kMaxIcons]{};
+    std::size_t icon_ctx_count_ = 0;
+
+    lv_obj_t* overlay_ = nullptr;
+    lv_obj_t* panel_ = nullptr;
+    lv_obj_t* desc_ = nullptr;
+    lv_group_t* group_ = nullptr;
+    lv_group_t* prev_group_ = nullptr;
+};
+
+} // namespace ui
+} // namespace chat
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/compatibility_ux_pack.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/compatibility_ux_pack.h
new file mode 100644
index 00000000..549f1bff
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/compatibility_ux_pack.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/ux/ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+class CompatibilityUxPack final : public IUxPack
+{
+  public:
+    const char* id() const override;
+    const DeviceUxProfile& profile() const override;
+    const UxFeatureSet& features() const override;
+    void buildScreens(ScreenRegistry& out) const override;
+    void buildInputBindings(InputBindingSet& out) const override;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/simulator_full_ux_pack.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/simulator_full_ux_pack.h
new file mode 100644
index 00000000..a7155d78
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/simulator_full_ux_pack.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/ux/ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+class SimulatorFullUxPack final : public IUxPack
+{
+  public:
+    const char* id() const override;
+    const DeviceUxProfile& profile() const override;
+    const UxFeatureSet& features() const override;
+    void buildScreens(ScreenRegistry& out) const override;
+    void buildInputBindings(InputBindingSet& out) const override;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/tiny_node_status_ux_pack.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/tiny_node_status_ux_pack.h
new file mode 100644
index 00000000..1f2bc0d7
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/tiny_node_status_ux_pack.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/ux/ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+class TinyNodeStatusUxPack final : public IUxPack
+{
+  public:
+    const char* id() const override;
+    const DeviceUxProfile& profile() const override;
+    const UxFeatureSet& features() const override;
+    void buildScreens(ScreenRegistry& out) const override;
+    void buildInputBindings(InputBindingSet& out) const override;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/uconsole_desktop_ux_pack.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/uconsole_desktop_ux_pack.h
new file mode 100644
index 00000000..0671fa5c
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/uconsole_desktop_ux_pack.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/ux/ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+class UConsoleDesktopUxPack final : public IUxPack
+{
+  public:
+    const char* id() const override;
+    const DeviceUxProfile& profile() const override;
+    const UxFeatureSet& features() const override;
+    void buildScreens(ScreenRegistry& out) const override;
+    void buildInputBindings(InputBindingSet& out) const override;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h
new file mode 100644
index 00000000..da13cab1
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+#include "ui_presentation/screen/screen_binding_registry.h"
+
+namespace ui_lvgl_ux
+{
+
+struct CompatibilityScreenDescriptor
+{
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    const char* binding_id = nullptr;
+    bool available = false;
+};
+
+class CompatibilityScreenFactory
+{
+  public:
+    bool describe(ui::menu::MenuScreenId screen_id,
+                  CompatibilityScreenDescriptor& out) const;
+    void buildBindingsForMenu(const ui::menu::MenuModel& menu,
+                              ui::screen::ScreenBindingRegistry& out) const;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_menu_model.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_menu_model.h
new file mode 100644
index 00000000..9bf75626
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_menu_model.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cstddef>
+
+namespace ui_lvgl_ux
+{
+
+struct LvglDescriptorMenuItem
+{
+    const char* label = nullptr;
+    const char* binding_id = nullptr;
+    bool enabled = false;
+};
+
+class LvglDescriptorMenuModel
+{
+  public:
+    bool load(const LvglPrimaryScreenGraphRuntime& runtime);
+
+    std::size_t itemCount() const noexcept;
+    const LvglDescriptorMenuItem* items() const noexcept;
+
+  private:
+    LvglDescriptorMenuItem items_[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t item_count_ = 0;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_renderer_probe.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_renderer_probe.h
new file mode 100644
index 00000000..2056fcbc
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_renderer_probe.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/runtime/lvgl_descriptor_menu_model.h"
+
+#include <cstddef>
+
+namespace ui_lvgl_ux
+{
+
+class LvglDescriptorRendererProbe
+{
+  public:
+    bool render(const LvglPrimaryScreenGraphRuntime& runtime);
+    bool load(const LvglPrimaryScreenGraphRuntime& runtime);
+
+    bool ready() const noexcept;
+    bool usingPrimaryScreenGraph() const noexcept;
+    bool usedPrimaryScreenGraph() const noexcept;
+    bool fallbackUsed() const noexcept;
+    bool usedFallback() const noexcept;
+    std::size_t itemCount() const noexcept;
+    const LvglDescriptorMenuItem* items() const noexcept;
+
+  private:
+    bool loadFallback(const LvglPrimaryScreenGraphRuntime& runtime);
+
+  private:
+    LvglDescriptorMenuModel model_{};
+    bool ready_ = false;
+    bool primary_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h
new file mode 100644
index 00000000..45af9fde
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+#include "ui_presentation/screen/screen_route.h"
+
+#include <cstddef>
+
+namespace ui_lvgl_ux
+{
+
+struct LvglMenuEntry
+{
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    ui::screen::ScreenRoute route{};
+    const char* label = nullptr;
+    bool enabled = false;
+};
+
+class LvglMenuRuntimeAdapter
+{
+  public:
+    bool buildEntries(const ui::menu::MenuModel& menu,
+                      LvglMenuEntry* out,
+                      std::size_t capacity,
+                      std::size_t& out_count) const;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h
new file mode 100644
index 00000000..123d82bc
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h"
+
+#include <cstddef>
+
+namespace ui_lvgl_ux
+{
+
+enum class LvglScreenGraphRuntimeSource
+{
+    ScreenGraphAdoption,
+    HardcodedFallback,
+};
+
+class LvglPrimaryScreenGraphRuntime
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    bool ready() const noexcept;
+    bool usingPrimaryScreenGraph() const noexcept;
+    bool fallbackUsed() const noexcept;
+    LvglScreenGraphRuntimeSource runtimeSource() const noexcept;
+
+    std::size_t menuCount() const noexcept;
+    std::size_t screenCount() const noexcept;
+
+    const LvglRuntimeEntryAdoption& adoption() const noexcept;
+
+  private:
+    bool loadFallback(const product_composition::PresentationBundle& presentation);
+
+  private:
+    LvglRuntimeEntryAdoption adoption_{};
+    LvglScreenGraphRuntimeSource source_ =
+        LvglScreenGraphRuntimeSource::HardcodedFallback;
+    bool ready_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_adoption_probe.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_adoption_probe.h
new file mode 100644
index 00000000..b4234805
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_adoption_probe.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h"
+
+#include <cstddef>
+
+namespace ui_lvgl_ux
+{
+
+class LvglRuntimeAdoptionProbe
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    bool ready() const;
+    bool fallbackUsed() const;
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const LvglRuntimeEntryAdoption& adoption() const;
+
+  private:
+    LvglRuntimeEntryAdoption adoption_{};
+    bool ready_ = false;
+    bool fallback_ = true;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h
new file mode 100644
index 00000000..4732f12f
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h"
+
+#include <cstddef>
+
+namespace ui_lvgl_ux
+{
+
+class LvglRuntimeEntryAdoption
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    bool ready() const;
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const LvglRuntimeScreenGraphPresenter& presenter() const;
+
+  private:
+    LvglRuntimeScreenGraphPresenter presenter_{};
+    bool ready_ = false;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h
new file mode 100644
index 00000000..d81a18d3
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h"
+
+#include <cstddef>
+
+namespace ui_lvgl_ux
+{
+
+class LvglRuntimeScreenGraphPresenter
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const LvglMenuEntry* menuEntries() const;
+    const LvglScreenHostEntry* screenEntries() const;
+
+  private:
+    LvglScreenGraphBridge bridge_{};
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h
new file mode 100644
index 00000000..aeee0818
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h"
+
+#include <cstddef>
+
+namespace ui_lvgl_ux
+{
+
+class LvglScreenGraphBridge
+{
+  public:
+    bool load(const product_composition::PresentationBundle& presentation);
+
+    std::size_t menuCount() const;
+    std::size_t screenCount() const;
+
+    const LvglMenuEntry* menuItems() const;
+    const LvglScreenHostEntry* screenItems() const;
+
+  private:
+    LvglMenuRuntimeAdapter menu_adapter_{};
+    LvglScreenHostAdapter screen_host_{};
+    LvglMenuEntry menu_items_[ui::menu::MenuModel::kMaxItems]{};
+    LvglScreenHostEntry screen_items_[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t menu_count_ = 0;
+    std::size_t screen_count_ = 0;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h
new file mode 100644
index 00000000..f1cc997f
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+
+namespace ui_lvgl_ux
+{
+
+struct LvglScreenHostEntry
+{
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    const char* binding_id = nullptr;
+    bool available = false;
+};
+
+class LvglScreenHostAdapter
+{
+  public:
+    bool resolve(ui::menu::MenuScreenId screen_id,
+                 LvglScreenHostEntry& out) const;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/device_ux_profile.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/device_ux_profile.h
new file mode 100644
index 00000000..482ec659
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/device_ux_profile.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include <cstdint>
+
+namespace ui_lvgl_ux
+{
+
+enum class ScreenClass : uint8_t
+{
+    TinyStatus,
+    CompactHandheld,
+    DeckLandscape,
+    TouchTablet,
+    Desktop,
+};
+
+enum class InputModel : uint8_t
+{
+    ButtonsOnly,
+    Keyboard,
+    Touch,
+    RotaryOrTrackball,
+    DesktopKeyboardMouse,
+};
+
+enum class MapMode : uint8_t
+{
+    None,
+    Compact,
+    Full,
+    Desktop,
+};
+
+enum class ChatMode : uint8_t
+{
+    None,
+    StatusOnly,
+    QuickMessage,
+    Full,
+};
+
+struct DeviceUxProfile
+{
+    constexpr DeviceUxProfile() = default;
+
+    constexpr DeviceUxProfile(const char* profile_id,
+                              ScreenClass screen_class_value,
+                              InputModel input_model_value,
+                              MapMode map_mode_value,
+                              ChatMode chat_mode_value,
+                              bool team_actions,
+                              bool gps_page,
+                              bool key_verification_modal,
+                              bool position_picker)
+        : id(profile_id),
+          screen_class(screen_class_value),
+          input_model(input_model_value),
+          map_mode(map_mode_value),
+          chat_mode(chat_mode_value),
+          supports_team_actions(team_actions),
+          supports_gps_page(gps_page),
+          supports_key_verification_modal(key_verification_modal),
+          supports_position_picker(position_picker)
+    {
+    }
+
+    const char* id = nullptr;
+    ScreenClass screen_class = ScreenClass::CompactHandheld;
+    InputModel input_model = InputModel::ButtonsOnly;
+    MapMode map_mode = MapMode::Compact;
+    ChatMode chat_mode = ChatMode::QuickMessage;
+
+    bool supports_team_actions = false;
+    bool supports_gps_page = true;
+    bool supports_key_verification_modal = true;
+    bool supports_position_picker = true;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/input_binding_set.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/input_binding_set.h
new file mode 100644
index 00000000..8eff44a9
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/input_binding_set.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ui_lvgl_ux
+{
+
+enum class InputAction : uint8_t
+{
+    Up,
+    Down,
+    Left,
+    Right,
+    Select,
+    Back,
+    Menu,
+    Compose,
+    MapZoomIn,
+    MapZoomOut,
+};
+
+struct InputBinding
+{
+    constexpr InputBinding() = default;
+
+    constexpr InputBinding(InputAction input_action, const char* input_hint)
+        : action(input_action),
+          hint(input_hint)
+    {
+    }
+
+    InputAction action = InputAction::Select;
+    const char* hint = nullptr;
+};
+
+class InputBindingSet
+{
+  public:
+    static constexpr std::size_t kMaxBindings = 24;
+
+    void clear();
+    bool add(const InputBinding& binding);
+    std::size_t size() const;
+    const InputBinding* items() const;
+
+  private:
+    InputBinding items_[kMaxBindings]{};
+    std::size_t size_ = 0;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/screen_registry.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/screen_registry.h
new file mode 100644
index 00000000..961adaf7
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/screen_registry.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ui_lvgl_ux
+{
+
+enum class ScreenId : uint8_t
+{
+    Dashboard,
+    Chat,
+    Contacts,
+    Map,
+    Gps,
+    Team,
+    Tracker,
+    Settings,
+    WalkieTalkie,
+    Sstv,
+    Extensions,
+};
+
+struct ScreenDescriptor
+{
+    constexpr ScreenDescriptor() = default;
+
+    constexpr ScreenDescriptor(ScreenId screen_id,
+                               const char* screen_label,
+                               bool screen_enabled)
+        : id(screen_id),
+          label(screen_label),
+          enabled(screen_enabled)
+    {
+    }
+
+    ScreenId id = ScreenId::Dashboard;
+    const char* label = nullptr;
+    bool enabled = false;
+};
+
+class ScreenRegistry
+{
+  public:
+    static constexpr std::size_t kMaxScreens = 16;
+
+    void clear();
+    bool add(const ScreenDescriptor& descriptor);
+    std::size_t size() const;
+    const ScreenDescriptor* items() const;
+
+  private:
+    ScreenDescriptor items_[kMaxScreens]{};
+    std::size_t size_ = 0;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_feature_set.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_feature_set.h
new file mode 100644
index 00000000..4dd6e961
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_feature_set.h
@@ -0,0 +1,45 @@
+#pragma once
+
+namespace ui_lvgl_ux
+{
+
+struct UxFeatureSet
+{
+    constexpr UxFeatureSet() = default;
+
+    constexpr UxFeatureSet(bool chat_enabled,
+                           bool contacts_enabled,
+                           bool map_enabled,
+                           bool gps_enabled,
+                           bool team_enabled,
+                           bool tracker_enabled,
+                           bool settings_enabled,
+                           bool walkie_enabled,
+                           bool sstv_enabled,
+                           bool extensions_enabled)
+        : chat(chat_enabled),
+          contacts(contacts_enabled),
+          map(map_enabled),
+          gps(gps_enabled),
+          team(team_enabled),
+          tracker(tracker_enabled),
+          settings(settings_enabled),
+          walkie(walkie_enabled),
+          sstv(sstv_enabled),
+          extensions(extensions_enabled)
+    {
+    }
+
+    bool chat = true;
+    bool contacts = true;
+    bool map = true;
+    bool gps = true;
+    bool team = true;
+    bool tracker = true;
+    bool settings = true;
+    bool walkie = false;
+    bool sstv = false;
+    bool extensions = false;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_model.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_model.h
new file mode 100644
index 00000000..74af90d3
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_model.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+
+namespace ui_lvgl_ux
+{
+
+using UxMenuItem = ::ui::menu::MenuItem;
+using UxMenuModel = ::ui::menu::MenuModel;
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_provider.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_provider.h
new file mode 100644
index 00000000..1bd392e5
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_provider.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+
+namespace ui_lvgl_ux
+{
+
+bool buildMenuForUxPack(const char* ux_pack_id, ui::menu::MenuModel& out);
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack.h
new file mode 100644
index 00000000..ccd4b25a
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/ux/device_ux_profile.h"
+#include "ui_lvgl_ux_packs/ux/input_binding_set.h"
+#include "ui_lvgl_ux_packs/ux/screen_registry.h"
+#include "ui_lvgl_ux_packs/ux/ux_feature_set.h"
+
+namespace ui_lvgl_ux
+{
+
+class IUxPack
+{
+  public:
+    virtual ~IUxPack() = default;
+
+    virtual const char* id() const = 0;
+    virtual const DeviceUxProfile& profile() const = 0;
+    virtual const UxFeatureSet& features() const = 0;
+
+    virtual void buildScreens(ScreenRegistry& out) const = 0;
+    virtual void buildInputBindings(InputBindingSet& out) const = 0;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack_registry.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack_registry.h
new file mode 100644
index 00000000..98895a55
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack_registry.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/ux/ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+const IUxPack* findUxPackById(const char* id);
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h
new file mode 100644
index 00000000..ec6f1eb4
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/ux/screen_registry.h"
+#include "ui_presentation/menu/menu_model.h"
+
+namespace ui_lvgl_ux
+{
+
+class UxScreenMenuAdapter
+{
+  public:
+    void buildMenu(const ScreenRegistry& screens, ui::menu::MenuModel& out) const;
+};
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/library.json b/modules/ui_lvgl_ux_packs/library.json
new file mode 100644
index 00000000..2a798dfa
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/library.json
@@ -0,0 +1,30 @@
+{
+  "name": "ui_lvgl_ux_packs",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../../modules/ui_lvgl_ux_packs/include",
+      "-I../../modules/ui_lvgl_core/include",
+      "-I../../modules/ui_shared/include",
+      "-I../../modules/ui_presentation/include",
+      "-I../../modules/product_composition/include",
+      "-I../../modules/core_team/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "ui_presentation"
+    },
+    {
+      "name": "lvgl"
+    },
+    {
+      "name": "ui_lvgl_core"
+    },
+    {
+      "name": "core_team"
+    }
+  ]
+}
diff --git a/modules/ui_lvgl_ux_packs/src/common/key_verification_modal_renderer.cpp b/modules/ui_lvgl_ux_packs/src/common/key_verification_modal_renderer.cpp
new file mode 100644
index 00000000..df267b5c
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/common/key_verification_modal_renderer.cpp
@@ -0,0 +1,268 @@
+#include "ui_lvgl_ux_packs/common/key_verification_modal_renderer.h"
+
+#include "ui/assets/fonts/font_utils.h"
+#include "ui/localization.h"
+#include "ui/page/page_profile.h"
+#include "ui/widgets/ime/ime_widget.h"
+#include "ui_lvgl_core/lvgl_focus_group.h"
+
+#include <string>
+
+namespace chat::ui
+{
+
+namespace
+{
+
+const char* modalTitle(
+    const ::ui::key_verification::KeyVerificationSnapshot& snapshot)
+{
+    if (snapshot.prompt ==
+        ::ui::key_verification::VerificationPromptKind::ShowNumber)
+    {
+        return "Verification Number";
+    }
+    if (snapshot.prompt ==
+        ::ui::key_verification::VerificationPromptKind::CompareCode)
+    {
+        return "Compare Verification Code";
+    }
+    return "Key Verification";
+}
+
+std::string modalDescription(
+    const ::ui::key_verification::KeyVerificationSnapshot& snapshot)
+{
+    std::string desc = snapshot.peer_label.c_str();
+    if (!desc.empty())
+    {
+        desc += "\n";
+    }
+    desc += snapshot.status_line.c_str();
+    if (!snapshot.verification_code.empty())
+    {
+        desc += "\n";
+        desc += snapshot.verification_code.c_str();
+    }
+    if (snapshot.can_accept)
+    {
+        desc += "\n\n";
+        desc += ::ui::i18n::tr("If it matches, trust the key.");
+    }
+    return desc;
+}
+
+lv_obj_t* createButton(lv_obj_t* parent,
+                       const char* label_text,
+                       lv_coord_t width,
+                       lv_align_t align,
+                       lv_coord_t x,
+                       lv_coord_t y,
+                       lv_event_cb_t callback,
+                       void* user_data)
+{
+    lv_obj_t* button = lv_btn_create(parent);
+    lv_obj_set_size(button, width, ::ui::page_profile::resolve_control_button_height());
+    lv_obj_align(button, align, x, y);
+
+    lv_obj_t* label = lv_label_create(button);
+    ::ui::i18n::set_label_text(label, label_text);
+    lv_obj_center(label);
+
+    if (callback != nullptr)
+    {
+        lv_obj_add_event_cb(button, callback, LV_EVENT_CLICKED, user_data);
+        lv_obj_add_event_cb(button, callback, LV_EVENT_KEY, user_data);
+    }
+    return button;
+}
+
+} // namespace
+
+void destroyKeyVerificationModal(
+    KeyVerificationModalRefs& refs,
+    std::unique_ptr<::ui::widgets::ImeWidget>& ime,
+    bool restore_group)
+{
+    if (ime)
+    {
+        ime->detach();
+        ime.reset();
+    }
+
+    if (refs.group && lv_group_get_default() == refs.group)
+    {
+        if (restore_group)
+        {
+            lv_group_t* restore_target = refs.prev_group ? refs.prev_group : app_g;
+            set_default_group(restore_target);
+        }
+        else
+        {
+            set_default_group(nullptr);
+        }
+    }
+
+    if (refs.overlay && lv_obj_is_valid(refs.overlay))
+    {
+        lv_obj_del(refs.overlay);
+    }
+    if (refs.group)
+    {
+        lv_group_del(refs.group);
+    }
+
+    refs = KeyVerificationModalRefs{};
+}
+
+void clearKeyVerificationError(const KeyVerificationModalRefs& refs)
+{
+    if (refs.error_label)
+    {
+        lv_label_set_text(refs.error_label, "");
+    }
+}
+
+void renderKeyVerificationModal(
+    lv_obj_t* parent,
+    const ::ui::key_verification::KeyVerificationSnapshot& snapshot,
+    const KeyVerificationModalCallbacks& callbacks,
+    KeyVerificationModalRefs& refs,
+    std::unique_ptr<::ui::widgets::ImeWidget>& ime)
+{
+    destroyKeyVerificationModal(refs, ime, false);
+    if (!parent || !snapshot.header.valid || snapshot.peer_id == 0)
+    {
+        return;
+    }
+
+    refs.prev_group = lv_group_get_default();
+    refs.group = lv_group_create();
+    set_default_group(refs.group);
+
+    refs.overlay = lv_obj_create(parent);
+    lv_obj_set_size(refs.overlay, LV_PCT(100), LV_PCT(100));
+    lv_obj_set_style_bg_color(refs.overlay, lv_color_black(), 0);
+    lv_obj_set_style_bg_opa(refs.overlay, LV_OPA_50, 0);
+    lv_obj_set_style_border_width(refs.overlay, 0, 0);
+    lv_obj_set_style_pad_all(refs.overlay, 0, 0);
+    lv_obj_set_style_radius(refs.overlay, 0, 0);
+    lv_obj_clear_flag(refs.overlay, LV_OBJ_FLAG_SCROLLABLE);
+
+    const auto& profile = ::ui::page_profile::current();
+    const bool needs_number = snapshot.requires_number;
+    const auto modal_size = ::ui::page_profile::resolve_modal_size(
+        needs_number ? (profile.large_touch_hitbox ? 560 : 320) : 420,
+        needs_number ? (profile.large_touch_hitbox ? 380 : 220) : 260,
+        refs.overlay);
+
+    refs.panel = lv_obj_create(refs.overlay);
+    lv_obj_set_size(refs.panel, modal_size.width, modal_size.height);
+    lv_obj_center(refs.panel);
+    lv_obj_set_style_bg_color(refs.panel, lv_color_hex(0xFAF0D8), 0);
+    lv_obj_set_style_bg_opa(refs.panel, LV_OPA_COVER, 0);
+    lv_obj_set_style_border_width(refs.panel, 1, 0);
+    lv_obj_set_style_border_color(refs.panel, lv_color_hex(0xE7C98F), 0);
+    lv_obj_set_style_radius(refs.panel, 10, 0);
+    lv_obj_set_style_pad_all(refs.panel, ::ui::page_profile::resolve_modal_pad(), 0);
+    lv_obj_clear_flag(refs.panel, LV_OBJ_FLAG_SCROLLABLE);
+
+    lv_obj_t* title = lv_label_create(refs.panel);
+    ::ui::i18n::set_label_text(title, modalTitle(snapshot));
+    lv_obj_set_style_text_color(title, lv_color_hex(0x6B4A1E), 0);
+    lv_obj_set_style_text_font(
+        title,
+        ::ui::fonts::localized_font(::ui::fonts::ui_chrome_font()),
+        0);
+    lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 0);
+
+    const std::string desc = modalDescription(snapshot);
+    refs.desc = lv_label_create(refs.panel);
+    ::ui::i18n::set_label_text_raw(refs.desc, desc.c_str());
+    lv_obj_set_width(refs.desc, LV_PCT(100));
+    lv_obj_set_style_text_align(refs.desc, LV_TEXT_ALIGN_CENTER, 0);
+    lv_obj_set_style_text_color(refs.desc, lv_color_hex(0x8A6A3A), 0);
+    lv_obj_align(refs.desc,
+                 needs_number ? LV_ALIGN_TOP_MID : LV_ALIGN_CENTER,
+                 0,
+                 needs_number ? 34 : -8);
+
+    if (needs_number)
+    {
+        refs.textarea = lv_textarea_create(refs.panel);
+        lv_obj_set_width(refs.textarea, LV_PCT(100));
+        lv_textarea_set_one_line(refs.textarea, true);
+        lv_textarea_set_placeholder_text(refs.textarea, ::ui::i18n::tr("6 digits"));
+        lv_textarea_set_accepted_chars(refs.textarea, "0123456789");
+        lv_textarea_set_max_length(refs.textarea, 6);
+        lv_obj_align(refs.textarea, LV_ALIGN_TOP_MID, 0, 72);
+
+        refs.error_label = lv_label_create(refs.panel);
+        ::ui::i18n::set_label_text_raw(refs.error_label, "");
+        lv_obj_set_width(refs.error_label, LV_PCT(100));
+        lv_obj_set_style_text_align(refs.error_label, LV_TEXT_ALIGN_CENTER, 0);
+        lv_obj_set_style_text_color(refs.error_label, lv_color_hex(0xB94A2C), 0);
+        lv_obj_align(refs.error_label, LV_ALIGN_TOP_MID, 0, 110);
+
+        lv_obj_t* submit_btn = createButton(refs.panel,
+                                            "Submit",
+                                            LV_PCT(48),
+                                            LV_ALIGN_BOTTOM_LEFT,
+                                            0,
+                                            0,
+                                            callbacks.submit,
+                                            callbacks.user_data);
+        lv_obj_t* cancel_btn = createButton(refs.panel,
+                                            "Cancel",
+                                            LV_PCT(48),
+                                            LV_ALIGN_BOTTOM_RIGHT,
+                                            0,
+                                            0,
+                                            callbacks.close,
+                                            callbacks.user_data);
+
+        lv_group_add_obj(refs.group, refs.textarea);
+        lv_group_add_obj(refs.group, submit_btn);
+        lv_group_add_obj(refs.group, cancel_btn);
+        lv_group_focus_obj(refs.textarea);
+
+        if (::ui::page_profile::current().large_touch_hitbox)
+        {
+            ime.reset(new ::ui::widgets::ImeWidget());
+            ime->init(refs.panel, refs.textarea);
+            ime->setMode(::ui::widgets::ImeWidget::Mode::NUM);
+        }
+    }
+    else
+    {
+        lv_obj_t* primary_btn = nullptr;
+        if (snapshot.can_accept)
+        {
+            primary_btn = createButton(refs.panel,
+                                       "Trust Key",
+                                       LV_PCT(48),
+                                       LV_ALIGN_BOTTOM_LEFT,
+                                       0,
+                                       0,
+                                       callbacks.trust,
+                                       callbacks.user_data);
+            lv_group_add_obj(refs.group, primary_btn);
+        }
+
+        lv_obj_t* close_btn = createButton(
+            refs.panel,
+            snapshot.can_accept ? "Later" : "OK",
+            snapshot.can_accept ? LV_PCT(48) : LV_PCT(100),
+            snapshot.can_accept ? LV_ALIGN_BOTTOM_RIGHT : LV_ALIGN_BOTTOM_MID,
+            0,
+            0,
+            callbacks.close,
+            callbacks.user_data);
+        lv_group_add_obj(refs.group, close_btn);
+        lv_group_focus_obj(primary_btn ? primary_btn : close_btn);
+    }
+
+    lv_obj_move_foreground(refs.overlay);
+}
+
+} // namespace chat::ui
diff --git a/modules/ui_lvgl_ux_packs/src/common/team_position_picker_renderer.cpp b/modules/ui_lvgl_ux_packs/src/common/team_position_picker_renderer.cpp
new file mode 100644
index 00000000..c675330d
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/common/team_position_picker_renderer.cpp
@@ -0,0 +1,414 @@
+#include "ui_lvgl_ux_packs/common/team_position_picker_renderer.h"
+
+#include "team/protocol/team_location_marker.h"
+#include "ui/localization.h"
+#include "ui/page/page_profile.h"
+#include "ui_lvgl_core/lvgl_focus_group.h"
+
+extern "C"
+{
+    extern const lv_image_dsc_t AreaCleared;
+    extern const lv_image_dsc_t BaseCamp;
+    extern const lv_image_dsc_t GoodFind;
+    extern const lv_image_dsc_t rally;
+    extern const lv_image_dsc_t sos;
+}
+
+namespace chat
+{
+namespace ui
+{
+
+namespace
+{
+
+struct TeamPositionIconOption
+{
+    uint8_t icon_id;
+    const char* meaning;
+    const lv_image_dsc_t* image;
+};
+
+const TeamPositionIconOption kTeamPositionIconOptions[] = {
+    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::AreaCleared),
+     "Area Cleared", &AreaCleared},
+    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::BaseCamp),
+     "Base Camp", &BaseCamp},
+    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::GoodFind),
+     "Good Find", &GoodFind},
+    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Rally),
+     "Rally Point", &rally},
+    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Sos),
+     "Emergency SOS", &sos}};
+
+const TeamPositionIconOption* findTeamPositionIconOption(uint8_t icon_id)
+{
+    for (const auto& item : kTeamPositionIconOptions)
+    {
+        if (item.icon_id == icon_id)
+        {
+            return &item;
+        }
+    }
+    return nullptr;
+}
+
+lv_style_selector_t focusedSelector()
+{
+    return static_cast<lv_style_selector_t>(
+        static_cast<unsigned>(LV_PART_MAIN) |
+        static_cast<unsigned>(LV_STATE_FOCUSED));
+}
+
+} // namespace
+
+TeamPositionPickerRenderer::TeamPositionPickerRenderer(
+    lv_obj_t* parent,
+    const Callbacks& callbacks)
+    : parent_(parent), callbacks_(callbacks)
+{
+}
+
+TeamPositionPickerRenderer::~TeamPositionPickerRenderer()
+{
+    close(false);
+}
+
+bool TeamPositionPickerRenderer::isOpen() const
+{
+    return overlay_ != nullptr;
+}
+
+void TeamPositionPickerRenderer::updateHint(uint8_t icon_id)
+{
+    if (!desc_)
+    {
+        return;
+    }
+    if (icon_id == 0)
+    {
+        ::ui::i18n::set_label_text(desc_, "Cancel");
+        return;
+    }
+
+    const TeamPositionIconOption* option = findTeamPositionIconOption(icon_id);
+    if (option)
+    {
+        ::ui::i18n::set_label_text(desc_, option->meaning);
+        return;
+    }
+    ::ui::i18n::set_label_text(desc_, "Select marker");
+}
+
+void TeamPositionPickerRenderer::handleIconFocused(uint8_t icon_id,
+                                                   lv_obj_t* target)
+{
+    updateHint(icon_id);
+    if (target)
+    {
+        lv_obj_scroll_to_view(target, LV_ANIM_ON);
+    }
+}
+
+void TeamPositionPickerRenderer::handleIconSelected(uint8_t icon_id)
+{
+    if (callbacks_.on_icon_selected)
+    {
+        callbacks_.on_icon_selected(callbacks_.user_data, icon_id);
+    }
+}
+
+void TeamPositionPickerRenderer::handleCancelFocused()
+{
+    updateHint(0);
+}
+
+void TeamPositionPickerRenderer::handleCancel()
+{
+    if (callbacks_.on_cancel)
+    {
+        callbacks_.on_cancel(callbacks_.user_data);
+    }
+}
+
+void TeamPositionPickerRenderer::iconEventCb(lv_event_t* e)
+{
+    auto* ctx = static_cast<IconEventCtx*>(lv_event_get_user_data(e));
+    if (!ctx || !ctx->renderer)
+    {
+        return;
+    }
+
+    lv_event_code_t code = lv_event_get_code(e);
+    if (code == LV_EVENT_FOCUSED)
+    {
+        ctx->renderer->handleIconFocused(ctx->icon_id,
+                                         lv_event_get_target_obj(e));
+        return;
+    }
+    if (code == LV_EVENT_KEY)
+    {
+        lv_key_t key = static_cast<lv_key_t>(lv_event_get_key(e));
+        if (key != LV_KEY_ENTER)
+        {
+            return;
+        }
+    }
+    if (code == LV_EVENT_CLICKED || code == LV_EVENT_KEY)
+    {
+        ctx->renderer->handleIconSelected(ctx->icon_id);
+    }
+}
+
+void TeamPositionPickerRenderer::cancelEventCb(lv_event_t* e)
+{
+    auto* renderer =
+        static_cast<TeamPositionPickerRenderer*>(lv_event_get_user_data(e));
+    if (!renderer)
+    {
+        return;
+    }
+
+    lv_event_code_t code = lv_event_get_code(e);
+    if (code == LV_EVENT_FOCUSED)
+    {
+        renderer->handleCancelFocused();
+        return;
+    }
+    if (code == LV_EVENT_KEY)
+    {
+        lv_key_t key = static_cast<lv_key_t>(lv_event_get_key(e));
+        if (key != LV_KEY_ENTER)
+        {
+            return;
+        }
+    }
+    if (code == LV_EVENT_CLICKED || code == LV_EVENT_KEY)
+    {
+        renderer->handleCancel();
+    }
+}
+
+bool TeamPositionPickerRenderer::open()
+{
+    if (!parent_ || isOpen())
+    {
+        return false;
+    }
+
+    prev_group_ = lv_group_get_default();
+    group_ = lv_group_create();
+    set_default_group(group_);
+
+    overlay_ = lv_obj_create(parent_);
+    lv_obj_set_size(overlay_, LV_PCT(100), LV_PCT(100));
+    lv_obj_set_style_bg_color(overlay_, lv_color_black(), 0);
+    lv_obj_set_style_bg_opa(overlay_, LV_OPA_50, 0);
+    lv_obj_set_style_border_width(overlay_, 0, 0);
+    lv_obj_set_style_pad_all(overlay_, 0, 0);
+    lv_obj_set_style_radius(overlay_, 0, 0);
+    lv_obj_clear_flag(overlay_, LV_OBJ_FLAG_SCROLLABLE);
+
+    const auto& profile = ::ui::page_profile::current();
+    const auto modal_size = ::ui::page_profile::resolve_modal_size(
+        profile.large_touch_hitbox ? 560 : 320,
+        profile.large_touch_hitbox ? 320 : 186,
+        overlay_);
+    const lv_coord_t icon_button_size =
+        ::ui::page_profile::resolve_icon_picker_button_size();
+    const lv_coord_t title_bar_height =
+        ::ui::page_profile::resolve_popup_title_height();
+
+    panel_ = lv_obj_create(overlay_);
+    lv_obj_set_size(panel_, modal_size.width, modal_size.height);
+    lv_obj_center(panel_);
+    lv_obj_set_style_bg_color(panel_, lv_color_hex(0xFAF0D8), 0);
+    lv_obj_set_style_bg_opa(panel_, LV_OPA_COVER, 0);
+    lv_obj_set_style_border_width(panel_, 1, 0);
+    lv_obj_set_style_border_color(panel_, lv_color_hex(0xE7C98F), 0);
+    lv_obj_set_style_radius(panel_, 10, 0);
+    lv_obj_set_style_pad_all(
+        panel_,
+        ::ui::page_profile::resolve_modal_pad(),
+        0);
+    lv_obj_clear_flag(panel_, LV_OBJ_FLAG_SCROLLABLE);
+
+    lv_obj_t* title_bar = lv_obj_create(panel_);
+    lv_obj_set_size(title_bar, LV_PCT(100), title_bar_height);
+    lv_obj_set_style_bg_color(title_bar, lv_color_hex(0xEBA341), 0);
+    lv_obj_set_style_bg_opa(title_bar, LV_OPA_COVER, 0);
+    lv_obj_set_style_border_width(title_bar, 0, 0);
+    lv_obj_set_style_radius(title_bar, 6, 0);
+    lv_obj_align(title_bar, LV_ALIGN_TOP_MID, 0, -4);
+    lv_obj_clear_flag(title_bar, LV_OBJ_FLAG_SCROLLABLE);
+
+    lv_obj_t* title = lv_label_create(title_bar);
+    ::ui::i18n::set_label_text(title, "Share Position Marker");
+    lv_obj_set_style_text_color(title, lv_color_hex(0x6B4A1E), 0);
+    lv_obj_center(title);
+
+    lv_obj_t* icon_row = lv_obj_create(panel_);
+    lv_obj_set_size(icon_row,
+                    LV_PCT(100),
+                    profile.large_touch_hitbox ? (icon_button_size + 20) : 72);
+    lv_obj_set_style_bg_opa(icon_row, LV_OPA_TRANSP, 0);
+    lv_obj_set_style_border_width(icon_row, 0, 0);
+    lv_obj_set_style_pad_all(icon_row, 0, 0);
+    lv_obj_set_style_pad_column(icon_row,
+                                profile.large_touch_hitbox ? 12 : 6,
+                                0);
+    lv_obj_set_flex_flow(icon_row, LV_FLEX_FLOW_ROW);
+    lv_obj_set_flex_align(icon_row,
+                          LV_FLEX_ALIGN_CENTER,
+                          LV_FLEX_ALIGN_CENTER,
+                          LV_FLEX_ALIGN_CENTER);
+    lv_obj_align(icon_row,
+                 LV_ALIGN_TOP_MID,
+                 0,
+                 profile.large_touch_hitbox ? (title_bar_height + 8) : 24);
+    lv_obj_set_scroll_dir(icon_row, LV_DIR_HOR);
+    lv_obj_set_scrollbar_mode(icon_row, LV_SCROLLBAR_MODE_OFF);
+
+    clearIconContexts();
+    for (const auto& option : kTeamPositionIconOptions)
+    {
+        if (icon_ctx_count_ >= kMaxIcons)
+        {
+            break;
+        }
+
+        lv_obj_t* btn = lv_btn_create(icon_row);
+        lv_obj_set_size(btn, icon_button_size, icon_button_size);
+        lv_obj_set_style_bg_color(btn, lv_color_hex(0xF6E6C6), LV_PART_MAIN);
+        lv_obj_set_style_bg_opa(btn, LV_OPA_COVER, LV_PART_MAIN);
+        lv_obj_set_style_border_width(btn, 1, LV_PART_MAIN);
+        lv_obj_set_style_border_color(btn, lv_color_hex(0xE7C98F), LV_PART_MAIN);
+        lv_obj_set_style_radius(btn, 8, LV_PART_MAIN);
+        const lv_style_selector_t focused_selector = focusedSelector();
+        lv_obj_set_style_outline_width(btn, 2, focused_selector);
+        lv_obj_set_style_outline_color(btn,
+                                       lv_color_hex(0xC98118),
+                                       focused_selector);
+        lv_obj_clear_flag(btn, LV_OBJ_FLAG_SCROLLABLE);
+
+        lv_obj_t* img = lv_image_create(btn);
+        lv_image_set_src(img, option.image);
+        lv_obj_center(img);
+
+        IconEventCtx& ctx = icon_ctxs_[icon_ctx_count_++];
+        ctx.renderer = this;
+        ctx.icon_id = option.icon_id;
+
+        lv_obj_add_event_cb(btn, iconEventCb, LV_EVENT_CLICKED, &ctx);
+        lv_obj_add_event_cb(btn, iconEventCb, LV_EVENT_KEY, &ctx);
+        lv_obj_add_event_cb(btn, iconEventCb, LV_EVENT_FOCUSED, &ctx);
+
+        lv_group_add_obj(group_, btn);
+    }
+
+    desc_ = lv_label_create(panel_);
+    ::ui::i18n::set_label_text(desc_, "Select marker");
+    lv_obj_set_width(desc_, LV_PCT(100));
+    lv_obj_set_style_text_align(desc_, LV_TEXT_ALIGN_CENTER, 0);
+    lv_obj_set_style_text_color(desc_, lv_color_hex(0x8A6A3A), 0);
+    lv_obj_align(desc_,
+                 LV_ALIGN_TOP_MID,
+                 0,
+                 profile.large_touch_hitbox
+                     ? (title_bar_height + icon_button_size + 28)
+                     : 104);
+
+    lv_obj_t* cancel_btn = lv_btn_create(panel_);
+    lv_obj_set_size(cancel_btn,
+                    ::ui::page_profile::resolve_control_button_min_width(),
+                    ::ui::page_profile::resolve_control_button_height());
+    lv_obj_set_style_bg_color(cancel_btn, lv_color_hex(0xF6E6C6), LV_PART_MAIN);
+    lv_obj_set_style_bg_opa(cancel_btn, LV_OPA_COVER, LV_PART_MAIN);
+    lv_obj_set_style_border_width(cancel_btn, 1, LV_PART_MAIN);
+    lv_obj_set_style_border_color(cancel_btn,
+                                  lv_color_hex(0xE7C98F),
+                                  LV_PART_MAIN);
+    lv_obj_set_style_radius(cancel_btn, 6, LV_PART_MAIN);
+    const lv_style_selector_t focused_selector = focusedSelector();
+    lv_obj_set_style_outline_width(cancel_btn, 2, focused_selector);
+    lv_obj_set_style_outline_color(cancel_btn,
+                                   lv_color_hex(0xC98118),
+                                   focused_selector);
+    lv_obj_align(cancel_btn,
+                 LV_ALIGN_BOTTOM_MID,
+                 0,
+                 profile.large_touch_hitbox ? -12 : -6);
+    lv_obj_clear_flag(cancel_btn, LV_OBJ_FLAG_SCROLLABLE);
+
+    lv_obj_t* cancel_label = lv_label_create(cancel_btn);
+    ::ui::i18n::set_label_text(cancel_label, "Cancel");
+    lv_obj_set_style_text_color(cancel_label, lv_color_hex(0x6B4A1E), 0);
+    lv_obj_center(cancel_label);
+
+    lv_obj_add_event_cb(cancel_btn, cancelEventCb, LV_EVENT_CLICKED, this);
+    lv_obj_add_event_cb(cancel_btn, cancelEventCb, LV_EVENT_KEY, this);
+    lv_obj_add_event_cb(cancel_btn, cancelEventCb, LV_EVENT_FOCUSED, this);
+    lv_group_add_obj(group_, cancel_btn);
+
+    if (icon_ctx_count_ > 0 && group_)
+    {
+        lv_obj_t* first_btn = lv_group_get_focused(group_);
+        if (!first_btn)
+        {
+            first_btn = lv_obj_get_child(icon_row, 0);
+        }
+        if (first_btn)
+        {
+            lv_group_focus_obj(first_btn);
+        }
+        updateHint(icon_ctxs_[0].icon_id);
+    }
+    lv_obj_move_foreground(overlay_);
+    return true;
+}
+
+void TeamPositionPickerRenderer::close(bool restore_group)
+{
+    clearIconContexts();
+
+    if (group_ && lv_group_get_default() == group_)
+    {
+        if (restore_group)
+        {
+            lv_group_t* restore_target = prev_group_ ? prev_group_ : app_g;
+            set_default_group(restore_target);
+        }
+        else
+        {
+            set_default_group(nullptr);
+        }
+    }
+
+    if (overlay_ && lv_obj_is_valid(overlay_))
+    {
+        lv_obj_del(overlay_);
+    }
+
+    if (group_)
+    {
+        lv_group_del(group_);
+    }
+
+    overlay_ = nullptr;
+    panel_ = nullptr;
+    desc_ = nullptr;
+    group_ = nullptr;
+    prev_group_ = nullptr;
+}
+
+void TeamPositionPickerRenderer::clearIconContexts()
+{
+    for (std::size_t i = 0; i < icon_ctx_count_; ++i)
+    {
+        icon_ctxs_[i] = IconEventCtx{};
+    }
+    icon_ctx_count_ = 0;
+}
+
+} // namespace ui
+} // namespace chat
diff --git a/modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp b/modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp
new file mode 100644
index 00000000..47831a1f
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp
@@ -0,0 +1,75 @@
+#include "ui_lvgl_ux_packs/packs/compatibility_ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+const char* CompatibilityUxPack::id() const
+{
+    return "compatibility";
+}
+
+const DeviceUxProfile& CompatibilityUxPack::profile() const
+{
+    static const DeviceUxProfile profile{
+        "compatibility",
+        ScreenClass::CompactHandheld,
+        InputModel::ButtonsOnly,
+        MapMode::Compact,
+        ChatMode::QuickMessage,
+        true,
+        true,
+        true,
+        true,
+    };
+    return profile;
+}
+
+const UxFeatureSet& CompatibilityUxPack::features() const
+{
+    static const UxFeatureSet features{
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+    };
+    return features;
+}
+
+void CompatibilityUxPack::buildScreens(ScreenRegistry& out) const
+{
+    out.clear();
+    (void)out.add({ScreenId::Dashboard, "Dashboard", true});
+    (void)out.add({ScreenId::Chat, "Chat", true});
+    (void)out.add({ScreenId::Contacts, "Contacts", true});
+    (void)out.add({ScreenId::Map, "Map", true});
+    (void)out.add({ScreenId::Gps, "GPS", true});
+    (void)out.add({ScreenId::Team, "Team", true});
+    (void)out.add({ScreenId::Tracker, "Tracker", true});
+    (void)out.add({ScreenId::Settings, "Settings", true});
+    (void)out.add({ScreenId::WalkieTalkie, "Walkie", true});
+    (void)out.add({ScreenId::Sstv, "SSTV", true});
+    (void)out.add({ScreenId::Extensions, "Extensions", true});
+}
+
+void CompatibilityUxPack::buildInputBindings(InputBindingSet& out) const
+{
+    out.clear();
+    (void)out.add({InputAction::Up, "Up"});
+    (void)out.add({InputAction::Down, "Down"});
+    (void)out.add({InputAction::Left, "Left"});
+    (void)out.add({InputAction::Right, "Right"});
+    (void)out.add({InputAction::Select, "Select"});
+    (void)out.add({InputAction::Back, "Back"});
+    (void)out.add({InputAction::Menu, "Menu"});
+    (void)out.add({InputAction::Compose, "Compose"});
+    (void)out.add({InputAction::MapZoomIn, "Map zoom in"});
+    (void)out.add({InputAction::MapZoomOut, "Map zoom out"});
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/packs/simulator_full_ux_pack.cpp b/modules/ui_lvgl_ux_packs/src/packs/simulator_full_ux_pack.cpp
new file mode 100644
index 00000000..33cd8f0e
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/packs/simulator_full_ux_pack.cpp
@@ -0,0 +1,75 @@
+#include "ui_lvgl_ux_packs/packs/simulator_full_ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+const char* SimulatorFullUxPack::id() const
+{
+    return "simulator_full";
+}
+
+const DeviceUxProfile& SimulatorFullUxPack::profile() const
+{
+    static const DeviceUxProfile profile{
+        "simulator_full",
+        ScreenClass::Desktop,
+        InputModel::DesktopKeyboardMouse,
+        MapMode::Full,
+        ChatMode::Full,
+        true,
+        true,
+        true,
+        true,
+    };
+    return profile;
+}
+
+const UxFeatureSet& SimulatorFullUxPack::features() const
+{
+    static const UxFeatureSet features{
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+    };
+    return features;
+}
+
+void SimulatorFullUxPack::buildScreens(ScreenRegistry& out) const
+{
+    out.clear();
+    (void)out.add({ScreenId::Dashboard, "Dashboard", true});
+    (void)out.add({ScreenId::Chat, "Chat", true});
+    (void)out.add({ScreenId::Contacts, "Contacts", true});
+    (void)out.add({ScreenId::Map, "Map", true});
+    (void)out.add({ScreenId::Gps, "GPS", true});
+    (void)out.add({ScreenId::Team, "Team", true});
+    (void)out.add({ScreenId::Tracker, "Tracker", true});
+    (void)out.add({ScreenId::Settings, "Settings", true});
+    (void)out.add({ScreenId::WalkieTalkie, "Walkie", true});
+    (void)out.add({ScreenId::Sstv, "SSTV", true});
+    (void)out.add({ScreenId::Extensions, "Extensions", true});
+}
+
+void SimulatorFullUxPack::buildInputBindings(InputBindingSet& out) const
+{
+    out.clear();
+    (void)out.add({InputAction::Up, "Keyboard up"});
+    (void)out.add({InputAction::Down, "Keyboard down"});
+    (void)out.add({InputAction::Left, "Keyboard left"});
+    (void)out.add({InputAction::Right, "Keyboard right"});
+    (void)out.add({InputAction::Select, "Enter"});
+    (void)out.add({InputAction::Back, "Escape"});
+    (void)out.add({InputAction::Menu, "Menu"});
+    (void)out.add({InputAction::Compose, "Compose"});
+    (void)out.add({InputAction::MapZoomIn, "Zoom in"});
+    (void)out.add({InputAction::MapZoomOut, "Zoom out"});
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/packs/tiny_node_status_ux_pack.cpp b/modules/ui_lvgl_ux_packs/src/packs/tiny_node_status_ux_pack.cpp
new file mode 100644
index 00000000..f163146f
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/packs/tiny_node_status_ux_pack.cpp
@@ -0,0 +1,63 @@
+#include "ui_lvgl_ux_packs/packs/tiny_node_status_ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+const char* TinyNodeStatusUxPack::id() const
+{
+    return "tiny_node_status";
+}
+
+const DeviceUxProfile& TinyNodeStatusUxPack::profile() const
+{
+    static const DeviceUxProfile profile{
+        "tiny_node_status",
+        ScreenClass::TinyStatus,
+        InputModel::ButtonsOnly,
+        MapMode::None,
+        ChatMode::StatusOnly,
+        true,
+        true,
+        false,
+        false,
+    };
+    return profile;
+}
+
+const UxFeatureSet& TinyNodeStatusUxPack::features() const
+{
+    static const UxFeatureSet features{
+        false,
+        false,
+        false,
+        true,
+        true,
+        false,
+        true,
+        false,
+        false,
+        false,
+    };
+    return features;
+}
+
+void TinyNodeStatusUxPack::buildScreens(ScreenRegistry& out) const
+{
+    out.clear();
+    (void)out.add({ScreenId::Dashboard, "Status", true});
+    (void)out.add({ScreenId::Team, "Team", true});
+    (void)out.add({ScreenId::Gps, "GPS", true});
+    (void)out.add({ScreenId::Settings, "Settings", true});
+}
+
+void TinyNodeStatusUxPack::buildInputBindings(InputBindingSet& out) const
+{
+    out.clear();
+    (void)out.add({InputAction::Up, "Previous"});
+    (void)out.add({InputAction::Down, "Next"});
+    (void)out.add({InputAction::Select, "Select"});
+    (void)out.add({InputAction::Back, "Back"});
+    (void)out.add({InputAction::Menu, "Menu"});
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/packs/uconsole_desktop_ux_pack.cpp b/modules/ui_lvgl_ux_packs/src/packs/uconsole_desktop_ux_pack.cpp
new file mode 100644
index 00000000..bae2956e
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/packs/uconsole_desktop_ux_pack.cpp
@@ -0,0 +1,71 @@
+#include "ui_lvgl_ux_packs/packs/uconsole_desktop_ux_pack.h"
+
+namespace ui_lvgl_ux
+{
+
+const char* UConsoleDesktopUxPack::id() const
+{
+    return "uconsole_desktop";
+}
+
+const DeviceUxProfile& UConsoleDesktopUxPack::profile() const
+{
+    static const DeviceUxProfile profile{
+        "uconsole_desktop",
+        ScreenClass::Desktop,
+        InputModel::DesktopKeyboardMouse,
+        MapMode::Desktop,
+        ChatMode::Full,
+        true,
+        true,
+        true,
+        true,
+    };
+    return profile;
+}
+
+const UxFeatureSet& UConsoleDesktopUxPack::features() const
+{
+    static const UxFeatureSet features{
+        true,
+        false,
+        true,
+        true,
+        true,
+        true,
+        true,
+        false,
+        false,
+        false,
+    };
+    return features;
+}
+
+void UConsoleDesktopUxPack::buildScreens(ScreenRegistry& out) const
+{
+    out.clear();
+    (void)out.add({ScreenId::Dashboard, "Dashboard", true});
+    (void)out.add({ScreenId::Chat, "Chat", true});
+    (void)out.add({ScreenId::Map, "Map", true});
+    (void)out.add({ScreenId::Gps, "GPS", true});
+    (void)out.add({ScreenId::Team, "Team", true});
+    (void)out.add({ScreenId::Tracker, "Tracker", true});
+    (void)out.add({ScreenId::Settings, "Settings", true});
+}
+
+void UConsoleDesktopUxPack::buildInputBindings(InputBindingSet& out) const
+{
+    out.clear();
+    (void)out.add({InputAction::Up, "Keyboard up"});
+    (void)out.add({InputAction::Down, "Keyboard down"});
+    (void)out.add({InputAction::Left, "Keyboard left"});
+    (void)out.add({InputAction::Right, "Keyboard right"});
+    (void)out.add({InputAction::Select, "Enter"});
+    (void)out.add({InputAction::Back, "Escape"});
+    (void)out.add({InputAction::Menu, "Menu"});
+    (void)out.add({InputAction::Compose, "Compose"});
+    (void)out.add({InputAction::MapZoomIn, "Zoom in"});
+    (void)out.add({InputAction::MapZoomOut, "Zoom out"});
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp b/modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp
new file mode 100644
index 00000000..e890f2eb
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp
@@ -0,0 +1,80 @@
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+
+namespace ui_lvgl_ux
+{
+namespace
+{
+
+const char* bindingIdForScreen(ui::menu::MenuScreenId screen_id)
+{
+    switch (screen_id)
+    {
+    case ui::menu::MenuScreenId::Dashboard:
+        return "dashboard";
+    case ui::menu::MenuScreenId::Chat:
+        return "chat";
+    case ui::menu::MenuScreenId::Contacts:
+        return "contacts";
+    case ui::menu::MenuScreenId::Map:
+        return "map";
+    case ui::menu::MenuScreenId::Gps:
+        return "gps";
+    case ui::menu::MenuScreenId::Team:
+        return "team";
+    case ui::menu::MenuScreenId::Tracker:
+        return "tracker";
+    case ui::menu::MenuScreenId::Settings:
+        return "settings";
+    case ui::menu::MenuScreenId::WalkieTalkie:
+        return "walkie";
+    case ui::menu::MenuScreenId::Sstv:
+        return "sstv";
+    case ui::menu::MenuScreenId::Extensions:
+        return "extensions";
+    }
+
+    return nullptr;
+}
+
+} // namespace
+
+bool CompatibilityScreenFactory::describe(
+    ui::menu::MenuScreenId screen_id,
+    CompatibilityScreenDescriptor& out) const
+{
+    out.screen_id = screen_id;
+    out.binding_id = bindingIdForScreen(screen_id);
+    out.available = out.binding_id != nullptr;
+    return out.available;
+}
+
+void CompatibilityScreenFactory::buildBindingsForMenu(
+    const ui::menu::MenuModel& menu,
+    ui::screen::ScreenBindingRegistry& out) const
+{
+    out.clear();
+
+    for (std::size_t index = 0; index < menu.size(); ++index)
+    {
+        const ui::menu::MenuItem& item = menu.items()[index];
+        if (!item.enabled)
+        {
+            continue;
+        }
+
+        CompatibilityScreenDescriptor descriptor;
+        if (!describe(item.screen_id, descriptor))
+        {
+            continue;
+        }
+
+        if (!out.add({descriptor.screen_id,
+                      descriptor.binding_id,
+                      descriptor.available}))
+        {
+            return;
+        }
+    }
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_menu_model.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_menu_model.cpp
new file mode 100644
index 00000000..b2e75894
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_menu_model.cpp
@@ -0,0 +1,68 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_descriptor_menu_model.h"
+
+namespace ui_lvgl_ux
+{
+
+namespace
+{
+
+const char* bindingForScreen(const LvglRuntimeScreenGraphPresenter& presenter,
+                             ui::menu::MenuScreenId screen_id)
+{
+    for (std::size_t index = 0; index < presenter.screenCount(); ++index)
+    {
+        const LvglScreenHostEntry& screen = presenter.screenEntries()[index];
+        if (screen.screen_id == screen_id && screen.available &&
+            screen.binding_id != nullptr)
+        {
+            return screen.binding_id;
+        }
+    }
+    return nullptr;
+}
+
+} // namespace
+
+bool LvglDescriptorMenuModel::load(
+    const LvglPrimaryScreenGraphRuntime& runtime)
+{
+    item_count_ = 0;
+    if (!runtime.usingPrimaryScreenGraph())
+    {
+        return false;
+    }
+
+    const LvglRuntimeScreenGraphPresenter& presenter =
+        runtime.adoption().presenter();
+    for (std::size_t index = 0;
+         index < presenter.menuCount() &&
+         item_count_ < ui::menu::MenuModel::kMaxItems;
+         ++index)
+    {
+        const LvglMenuEntry& menu = presenter.menuEntries()[index];
+        const char* binding = bindingForScreen(presenter, menu.screen_id);
+        if (binding == nullptr)
+        {
+            continue;
+        }
+
+        items_[item_count_].label = menu.label;
+        items_[item_count_].binding_id = binding;
+        items_[item_count_].enabled = menu.enabled;
+        ++item_count_;
+    }
+
+    return item_count_ > 0;
+}
+
+std::size_t LvglDescriptorMenuModel::itemCount() const noexcept
+{
+    return item_count_;
+}
+
+const LvglDescriptorMenuItem* LvglDescriptorMenuModel::items() const noexcept
+{
+    return items_;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp
new file mode 100644
index 00000000..18067138
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp
@@ -0,0 +1,82 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_descriptor_renderer_probe.h"
+
+namespace ui_lvgl_ux
+{
+
+bool LvglDescriptorRendererProbe::render(
+    const LvglPrimaryScreenGraphRuntime& runtime)
+{
+    return load(runtime);
+}
+
+bool LvglDescriptorRendererProbe::load(
+    const LvglPrimaryScreenGraphRuntime& runtime)
+{
+    ready_ = false;
+    primary_ = false;
+    fallback_ = true;
+
+    if (runtime.usingPrimaryScreenGraph())
+    {
+        ready_ = model_.load(runtime);
+        primary_ = ready_;
+        fallback_ = !ready_;
+        return ready_;
+    }
+
+    if (runtime.fallbackUsed())
+    {
+        return loadFallback(runtime);
+    }
+
+    return false;
+}
+
+bool LvglDescriptorRendererProbe::loadFallback(
+    const LvglPrimaryScreenGraphRuntime&)
+{
+    // Phase 11 fallback: hardcoded LVGL menu/page rendering remains available
+    // only when descriptor model consumption is unavailable.
+    ready_ = false;
+    primary_ = false;
+    fallback_ = true;
+    return false;
+}
+
+bool LvglDescriptorRendererProbe::ready() const noexcept
+{
+    return ready_;
+}
+
+bool LvglDescriptorRendererProbe::usingPrimaryScreenGraph() const noexcept
+{
+    return primary_;
+}
+
+bool LvglDescriptorRendererProbe::usedPrimaryScreenGraph() const noexcept
+{
+    return primary_;
+}
+
+bool LvglDescriptorRendererProbe::fallbackUsed() const noexcept
+{
+    return fallback_;
+}
+
+bool LvglDescriptorRendererProbe::usedFallback() const noexcept
+{
+    return fallback_;
+}
+
+std::size_t LvglDescriptorRendererProbe::itemCount() const noexcept
+{
+    return ready_ ? model_.itemCount() : 0;
+}
+
+const LvglDescriptorMenuItem* LvglDescriptorRendererProbe::items()
+    const noexcept
+{
+    return ready_ ? model_.items() : nullptr;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp
new file mode 100644
index 00000000..612e81a8
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp
@@ -0,0 +1,46 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h"
+
+namespace ui_lvgl_ux
+{
+
+bool LvglMenuRuntimeAdapter::buildEntries(const ui::menu::MenuModel& menu,
+                                          LvglMenuEntry* out,
+                                          std::size_t capacity,
+                                          std::size_t& out_count) const
+{
+    out_count = 0;
+
+    if (menu.size() == 0)
+    {
+        return true;
+    }
+
+    if (out == nullptr)
+    {
+        return false;
+    }
+
+    for (std::size_t index = 0; index < menu.size(); ++index)
+    {
+        const ui::menu::MenuItem& item = menu.items()[index];
+        if (!item.enabled)
+        {
+            continue;
+        }
+
+        if (out_count >= capacity)
+        {
+            return false;
+        }
+
+        out[out_count].screen_id = item.screen_id;
+        out[out_count].route = ui::screen::routeForMenuScreen(item.screen_id);
+        out[out_count].label = item.label;
+        out[out_count].enabled = item.enabled;
+        ++out_count;
+    }
+
+    return true;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp
new file mode 100644
index 00000000..db93cfd7
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp
@@ -0,0 +1,68 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h"
+
+namespace ui_lvgl_ux
+{
+
+bool LvglPrimaryScreenGraphRuntime::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    ready_ = adoption_.load(presentation);
+    if (ready_)
+    {
+        source_ = LvglScreenGraphRuntimeSource::ScreenGraphAdoption;
+        fallback_ = false;
+        return true;
+    }
+
+    source_ = LvglScreenGraphRuntimeSource::HardcodedFallback;
+    fallback_ = true;
+    return loadFallback(presentation);
+}
+
+bool LvglPrimaryScreenGraphRuntime::loadFallback(
+    const product_composition::PresentationBundle&)
+{
+    // Phase 10 fallback containment: real LVGL menu/page creation remains
+    // available until descriptor consumption becomes the renderer input.
+    return false;
+}
+
+bool LvglPrimaryScreenGraphRuntime::ready() const noexcept
+{
+    return ready_;
+}
+
+bool LvglPrimaryScreenGraphRuntime::usingPrimaryScreenGraph() const noexcept
+{
+    return source_ == LvglScreenGraphRuntimeSource::ScreenGraphAdoption &&
+           ready_ && !fallback_;
+}
+
+bool LvglPrimaryScreenGraphRuntime::fallbackUsed() const noexcept
+{
+    return fallback_;
+}
+
+LvglScreenGraphRuntimeSource
+LvglPrimaryScreenGraphRuntime::runtimeSource() const noexcept
+{
+    return source_;
+}
+
+std::size_t LvglPrimaryScreenGraphRuntime::menuCount() const noexcept
+{
+    return ready_ ? adoption_.menuCount() : 0;
+}
+
+std::size_t LvglPrimaryScreenGraphRuntime::screenCount() const noexcept
+{
+    return ready_ ? adoption_.screenCount() : 0;
+}
+
+const LvglRuntimeEntryAdoption& LvglPrimaryScreenGraphRuntime::adoption()
+    const noexcept
+{
+    return adoption_;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_adoption_probe.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_adoption_probe.cpp
new file mode 100644
index 00000000..5a05a974
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_adoption_probe.cpp
@@ -0,0 +1,41 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_adoption_probe.h"
+
+namespace ui_lvgl_ux
+{
+
+bool LvglRuntimeAdoptionProbe::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    ready_ = adoption_.load(presentation);
+    // Phase 9 fallback: hardcoded LVGL menu/page creation remains until the
+    // compatibility runtime consumes screen graph descriptors as primary input.
+    fallback_ = !ready_;
+    return ready_;
+}
+
+bool LvglRuntimeAdoptionProbe::ready() const
+{
+    return ready_;
+}
+
+bool LvglRuntimeAdoptionProbe::fallbackUsed() const
+{
+    return fallback_;
+}
+
+std::size_t LvglRuntimeAdoptionProbe::menuCount() const
+{
+    return ready_ ? adoption_.menuCount() : 0;
+}
+
+std::size_t LvglRuntimeAdoptionProbe::screenCount() const
+{
+    return ready_ ? adoption_.screenCount() : 0;
+}
+
+const LvglRuntimeEntryAdoption& LvglRuntimeAdoptionProbe::adoption() const
+{
+    return adoption_;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_entry_adoption.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_entry_adoption.cpp
new file mode 100644
index 00000000..57e02f3d
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_entry_adoption.cpp
@@ -0,0 +1,34 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h"
+
+namespace ui_lvgl_ux
+{
+
+bool LvglRuntimeEntryAdoption::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    ready_ = presenter_.load(presentation);
+    return ready_;
+}
+
+bool LvglRuntimeEntryAdoption::ready() const
+{
+    return ready_;
+}
+
+std::size_t LvglRuntimeEntryAdoption::menuCount() const
+{
+    return ready_ ? presenter_.menuCount() : 0;
+}
+
+std::size_t LvglRuntimeEntryAdoption::screenCount() const
+{
+    return ready_ ? presenter_.screenCount() : 0;
+}
+
+const LvglRuntimeScreenGraphPresenter&
+LvglRuntimeEntryAdoption::presenter() const
+{
+    return presenter_;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_screen_graph_presenter.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_screen_graph_presenter.cpp
new file mode 100644
index 00000000..fa180755
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_screen_graph_presenter.cpp
@@ -0,0 +1,38 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h"
+
+namespace ui_lvgl_ux
+{
+
+bool LvglRuntimeScreenGraphPresenter::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    if (!product_composition::hasUxMenu(presentation) ||
+        !product_composition::hasScreenBindings(presentation))
+    {
+        return false;
+    }
+
+    return bridge_.load(presentation);
+}
+
+std::size_t LvglRuntimeScreenGraphPresenter::menuCount() const
+{
+    return bridge_.menuCount();
+}
+
+std::size_t LvglRuntimeScreenGraphPresenter::screenCount() const
+{
+    return bridge_.screenCount();
+}
+
+const LvglMenuEntry* LvglRuntimeScreenGraphPresenter::menuEntries() const
+{
+    return bridge_.menuItems();
+}
+
+const LvglScreenHostEntry* LvglRuntimeScreenGraphPresenter::screenEntries() const
+{
+    return bridge_.screenItems();
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp
new file mode 100644
index 00000000..f1cbcf48
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp
@@ -0,0 +1,80 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h"
+
+namespace ui_lvgl_ux
+{
+namespace
+{
+
+using MenuRuntimeAdapterContract = LvglMenuRuntimeAdapter;
+using ScreenHostAdapterContract = LvglScreenHostAdapter;
+
+} // namespace
+
+bool LvglScreenGraphBridge::load(
+    const product_composition::PresentationBundle& presentation)
+{
+    menu_count_ = 0;
+    screen_count_ = 0;
+
+    if (!product_composition::hasUxMenu(presentation) ||
+        !product_composition::hasScreenBindings(presentation))
+    {
+        return false;
+    }
+
+    if (!menu_adapter_.buildEntries(*presentation.ux_menu,
+                                    menu_items_,
+                                    ui::menu::MenuModel::kMaxItems,
+                                    menu_count_))
+    {
+        menu_count_ = 0;
+        return false;
+    }
+
+    for (std::size_t index = 0; index < menu_count_; ++index)
+    {
+        const LvglMenuEntry& menu_entry = menu_items_[index];
+        if (!menu_entry.route.valid)
+        {
+            continue;
+        }
+
+        LvglScreenHostEntry screen_entry;
+        if (!screen_host_.resolve(menu_entry.screen_id, screen_entry))
+        {
+            continue;
+        }
+
+        if (presentation.screen_bindings->find(screen_entry.screen_id) == nullptr)
+        {
+            continue;
+        }
+
+        screen_items_[screen_count_] = screen_entry;
+        ++screen_count_;
+    }
+
+    return menu_count_ > 0 && screen_count_ > 0;
+}
+
+std::size_t LvglScreenGraphBridge::menuCount() const
+{
+    return menu_count_;
+}
+
+std::size_t LvglScreenGraphBridge::screenCount() const
+{
+    return screen_count_;
+}
+
+const LvglMenuEntry* LvglScreenGraphBridge::menuItems() const
+{
+    return menu_items_;
+}
+
+const LvglScreenHostEntry* LvglScreenGraphBridge::screenItems() const
+{
+    return screen_items_;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp
new file mode 100644
index 00000000..87377fce
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp
@@ -0,0 +1,36 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h"
+
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+
+namespace ui_lvgl_ux
+{
+namespace
+{
+
+void clearEntry(LvglScreenHostEntry& out)
+{
+    out.screen_id = ui::menu::MenuScreenId::Dashboard;
+    out.binding_id = nullptr;
+    out.available = false;
+}
+
+} // namespace
+
+bool LvglScreenHostAdapter::resolve(ui::menu::MenuScreenId screen_id,
+                                    LvglScreenHostEntry& out) const
+{
+    CompatibilityScreenFactory factory;
+    CompatibilityScreenDescriptor descriptor;
+    if (!factory.describe(screen_id, descriptor))
+    {
+        clearEntry(out);
+        return false;
+    }
+
+    out.screen_id = descriptor.screen_id;
+    out.binding_id = descriptor.binding_id;
+    out.available = descriptor.available;
+    return true;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/ux/input_binding_set.cpp b/modules/ui_lvgl_ux_packs/src/ux/input_binding_set.cpp
new file mode 100644
index 00000000..8b1e0655
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/ux/input_binding_set.cpp
@@ -0,0 +1,37 @@
+#include "ui_lvgl_ux_packs/ux/input_binding_set.h"
+
+namespace ui_lvgl_ux
+{
+
+void InputBindingSet::clear()
+{
+    for (std::size_t i = 0; i < kMaxBindings; ++i)
+    {
+        items_[i] = InputBinding{};
+    }
+    size_ = 0;
+}
+
+bool InputBindingSet::add(const InputBinding& binding)
+{
+    if (size_ >= kMaxBindings)
+    {
+        return false;
+    }
+
+    items_[size_] = binding;
+    ++size_;
+    return true;
+}
+
+std::size_t InputBindingSet::size() const
+{
+    return size_;
+}
+
+const InputBinding* InputBindingSet::items() const
+{
+    return items_;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/ux/screen_registry.cpp b/modules/ui_lvgl_ux_packs/src/ux/screen_registry.cpp
new file mode 100644
index 00000000..b25ba7d5
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/ux/screen_registry.cpp
@@ -0,0 +1,37 @@
+#include "ui_lvgl_ux_packs/ux/screen_registry.h"
+
+namespace ui_lvgl_ux
+{
+
+void ScreenRegistry::clear()
+{
+    for (std::size_t i = 0; i < kMaxScreens; ++i)
+    {
+        items_[i] = ScreenDescriptor{};
+    }
+    size_ = 0;
+}
+
+bool ScreenRegistry::add(const ScreenDescriptor& descriptor)
+{
+    if (size_ >= kMaxScreens)
+    {
+        return false;
+    }
+
+    items_[size_] = descriptor;
+    ++size_;
+    return true;
+}
+
+std::size_t ScreenRegistry::size() const
+{
+    return size_;
+}
+
+const ScreenDescriptor* ScreenRegistry::items() const
+{
+    return items_;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp b/modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp
new file mode 100644
index 00000000..a748fa17
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp
@@ -0,0 +1,9 @@
+#include "ui_lvgl_ux_packs/ux/ux_menu_model.h"
+
+namespace ui_lvgl_ux
+{
+
+// Compatibility translation unit for the historical UX-pack menu model path.
+// The implementation now lives in ui_presentation/menu/menu_model.cpp.
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp b/modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp
new file mode 100644
index 00000000..b6e8e586
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp
@@ -0,0 +1,28 @@
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include "ui_lvgl_ux_packs/ux/screen_registry.h"
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+#include "ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h"
+
+namespace ui_lvgl_ux
+{
+
+bool buildMenuForUxPack(const char* ux_pack_id, ui::menu::MenuModel& out)
+{
+    out.clear();
+
+    const IUxPack* pack = findUxPackById(ux_pack_id);
+    if (pack == nullptr)
+    {
+        return false;
+    }
+
+    ScreenRegistry screens;
+    pack->buildScreens(screens);
+
+    UxScreenMenuAdapter adapter;
+    adapter.buildMenu(screens, out);
+    return true;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp b/modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp
new file mode 100644
index 00000000..fa094583
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp
@@ -0,0 +1,43 @@
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+
+#include "ui_lvgl_ux_packs/packs/compatibility_ux_pack.h"
+#include "ui_lvgl_ux_packs/packs/simulator_full_ux_pack.h"
+#include "ui_lvgl_ux_packs/packs/tiny_node_status_ux_pack.h"
+#include "ui_lvgl_ux_packs/packs/uconsole_desktop_ux_pack.h"
+
+#include <cstring>
+
+namespace ui_lvgl_ux
+{
+
+const IUxPack* findUxPackById(const char* id)
+{
+    if (id == nullptr)
+    {
+        return nullptr;
+    }
+
+    static const CompatibilityUxPack compatibility_pack;
+    static const UConsoleDesktopUxPack uconsole_desktop_pack;
+    static const TinyNodeStatusUxPack tiny_node_status_pack;
+    static const SimulatorFullUxPack simulator_full_pack;
+
+    const IUxPack* const packs[] = {
+        &compatibility_pack,
+        &uconsole_desktop_pack,
+        &tiny_node_status_pack,
+        &simulator_full_pack,
+    };
+
+    for (const IUxPack* pack : packs)
+    {
+        if (std::strcmp(pack->id(), id) == 0)
+        {
+            return pack;
+        }
+    }
+
+    return nullptr;
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp b/modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp
new file mode 100644
index 00000000..6a7e2ae6
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp
@@ -0,0 +1,62 @@
+#include "ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h"
+
+namespace ui_lvgl_ux
+{
+namespace
+{
+
+ui::menu::MenuScreenId toMenuScreenId(ScreenId id)
+{
+    switch (id)
+    {
+    case ScreenId::Dashboard:
+        return ui::menu::MenuScreenId::Dashboard;
+    case ScreenId::Chat:
+        return ui::menu::MenuScreenId::Chat;
+    case ScreenId::Contacts:
+        return ui::menu::MenuScreenId::Contacts;
+    case ScreenId::Map:
+        return ui::menu::MenuScreenId::Map;
+    case ScreenId::Gps:
+        return ui::menu::MenuScreenId::Gps;
+    case ScreenId::Team:
+        return ui::menu::MenuScreenId::Team;
+    case ScreenId::Tracker:
+        return ui::menu::MenuScreenId::Tracker;
+    case ScreenId::Settings:
+        return ui::menu::MenuScreenId::Settings;
+    case ScreenId::WalkieTalkie:
+        return ui::menu::MenuScreenId::WalkieTalkie;
+    case ScreenId::Sstv:
+        return ui::menu::MenuScreenId::Sstv;
+    case ScreenId::Extensions:
+        return ui::menu::MenuScreenId::Extensions;
+    }
+
+    return ui::menu::MenuScreenId::Dashboard;
+}
+
+} // namespace
+
+void UxScreenMenuAdapter::buildMenu(const ScreenRegistry& screens,
+                                    ui::menu::MenuModel& out) const
+{
+    out.clear();
+
+    const ScreenDescriptor* items = screens.items();
+    for (std::size_t index = 0; index < screens.size(); ++index)
+    {
+        const ScreenDescriptor& screen = items[index];
+        if (!screen.enabled)
+        {
+            continue;
+        }
+
+        if (!out.add({toMenuScreenId(screen.id), screen.label, true}))
+        {
+            return;
+        }
+    }
+}
+
+} // namespace ui_lvgl_ux
diff --git a/modules/ui_lvgl_ux_packs/tests/test_compatibility_menu_binding.cpp b/modules/ui_lvgl_ux_packs/tests/test_compatibility_menu_binding.cpp
new file mode 100644
index 00000000..6d2bad35
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_compatibility_menu_binding.cpp
@@ -0,0 +1,40 @@
+#include "ui_lvgl_ux_packs/packs/compatibility_ux_pack.h"
+#include "ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cassert>
+
+namespace
+{
+
+bool contains(const ui::menu::MenuModel& menu, ui::menu::MenuScreenId id)
+{
+    for (std::size_t index = 0; index < menu.size(); ++index)
+    {
+        if (menu.items()[index].screen_id == id)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    ui_lvgl_ux::CompatibilityUxPack pack;
+    ui_lvgl_ux::ScreenRegistry screens;
+    ui::menu::MenuModel menu;
+    ui_lvgl_ux::UxScreenMenuAdapter adapter;
+
+    pack.buildScreens(screens);
+    adapter.buildMenu(screens, menu);
+
+    assert(menu.size() == 11);
+    assert(contains(menu, ui::menu::MenuScreenId::Chat));
+    assert(contains(menu, ui::menu::MenuScreenId::Map));
+    assert(contains(menu, ui::menu::MenuScreenId::Gps));
+    assert(contains(menu, ui::menu::MenuScreenId::Settings));
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_compatibility_screen_factory.cpp b/modules/ui_lvgl_ux_packs/tests/test_compatibility_screen_factory.cpp
new file mode 100644
index 00000000..6aa2f33c
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_compatibility_screen_factory.cpp
@@ -0,0 +1,49 @@
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+void expect_binding(ui_lvgl_ux::CompatibilityScreenFactory& factory,
+                    ui::menu::MenuScreenId screen_id,
+                    const char* expected_binding)
+{
+    ui_lvgl_ux::CompatibilityScreenDescriptor descriptor;
+    assert(factory.describe(screen_id, descriptor));
+    assert(descriptor.screen_id == screen_id);
+    assert(descriptor.available);
+    assert(std::strcmp(descriptor.binding_id, expected_binding) == 0);
+}
+
+} // namespace
+
+int main()
+{
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+
+    expect_binding(factory, ui::menu::MenuScreenId::Dashboard, "dashboard");
+    expect_binding(factory, ui::menu::MenuScreenId::Chat, "chat");
+    expect_binding(factory, ui::menu::MenuScreenId::Contacts, "contacts");
+    expect_binding(factory, ui::menu::MenuScreenId::Map, "map");
+    expect_binding(factory, ui::menu::MenuScreenId::Gps, "gps");
+    expect_binding(factory, ui::menu::MenuScreenId::Team, "team");
+    expect_binding(factory, ui::menu::MenuScreenId::Tracker, "tracker");
+    expect_binding(factory, ui::menu::MenuScreenId::Settings, "settings");
+    expect_binding(factory, ui::menu::MenuScreenId::WalkieTalkie, "walkie");
+    expect_binding(factory, ui::menu::MenuScreenId::Sstv, "sstv");
+    expect_binding(factory, ui::menu::MenuScreenId::Extensions, "extensions");
+
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    factory.buildBindingsForMenu(menu, bindings);
+    assert(bindings.size() == menu.size());
+    assert(bindings.find(ui::menu::MenuScreenId::Chat) != nullptr);
+    assert(bindings.find(ui::menu::MenuScreenId::Map) != nullptr);
+    assert(bindings.find(ui::menu::MenuScreenId::Settings) != nullptr);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_compatibility_ux_pack.cpp b/modules/ui_lvgl_ux_packs/tests/test_compatibility_ux_pack.cpp
new file mode 100644
index 00000000..aeae0bc9
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_compatibility_ux_pack.cpp
@@ -0,0 +1,28 @@
+#include "ui_lvgl_ux_packs/packs/compatibility_ux_pack.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui_lvgl_ux::CompatibilityUxPack pack;
+    assert(std::strcmp(pack.id(), "compatibility") == 0);
+    assert(pack.profile().screen_class == ui_lvgl_ux::ScreenClass::CompactHandheld);
+    assert(pack.profile().input_model == ui_lvgl_ux::InputModel::ButtonsOnly);
+    assert(pack.features().chat);
+    assert(pack.features().walkie);
+    assert(pack.features().sstv);
+    assert(pack.features().extensions);
+
+    ui_lvgl_ux::ScreenRegistry screens;
+    pack.buildScreens(screens);
+    assert(screens.size() == 11);
+    assert(screens.items()[0].id == ui_lvgl_ux::ScreenId::Dashboard);
+    assert(screens.items()[1].id == ui_lvgl_ux::ScreenId::Chat);
+    assert(screens.items()[10].id == ui_lvgl_ux::ScreenId::Extensions);
+
+    ui_lvgl_ux::InputBindingSet bindings;
+    pack.buildInputBindings(bindings);
+    assert(bindings.size() >= 8);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_input_binding_set.cpp b/modules/ui_lvgl_ux_packs/tests/test_input_binding_set.cpp
new file mode 100644
index 00000000..61bae68c
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_input_binding_set.cpp
@@ -0,0 +1,22 @@
+#include "ui_lvgl_ux_packs/ux/input_binding_set.h"
+
+#include <cassert>
+
+int main()
+{
+    ui_lvgl_ux::InputBindingSet bindings;
+    assert(bindings.size() == 0);
+
+    for (std::size_t i = 0; i < ui_lvgl_ux::InputBindingSet::kMaxBindings; ++i)
+    {
+        assert(bindings.add({ui_lvgl_ux::InputAction::Select, "Select"}));
+    }
+    assert(bindings.size() == ui_lvgl_ux::InputBindingSet::kMaxBindings);
+    assert(!bindings.add({ui_lvgl_ux::InputAction::Back, "Overflow"}));
+
+    bindings.clear();
+    assert(bindings.size() == 0);
+    assert(bindings.add({ui_lvgl_ux::InputAction::Back, "Back"}));
+    assert(bindings.items()[0].action == ui_lvgl_ux::InputAction::Back);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_menu_model.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_menu_model.cpp
new file mode 100644
index 00000000..b53a1993
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_menu_model.cpp
@@ -0,0 +1,36 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_descriptor_menu_model.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    ui_lvgl_ux::LvglPrimaryScreenGraphRuntime runtime;
+    assert(runtime.load(presentation));
+    assert(runtime.usingPrimaryScreenGraph());
+
+    ui_lvgl_ux::LvglDescriptorMenuModel model;
+    assert(model.load(runtime));
+    assert(model.itemCount() > 0);
+    assert(model.items()[0].binding_id != nullptr);
+
+    ui_lvgl_ux::LvglPrimaryScreenGraphRuntime fallback_runtime;
+    product_composition::PresentationBundle empty;
+    assert(!fallback_runtime.load(empty));
+    assert(!model.load(fallback_runtime));
+    assert(model.itemCount() == 0);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_renderer_probe.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_renderer_probe.cpp
new file mode 100644
index 00000000..72393813
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_renderer_probe.cpp
@@ -0,0 +1,41 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_descriptor_renderer_probe.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    ui_lvgl_ux::LvglPrimaryScreenGraphRuntime runtime;
+    assert(runtime.load(presentation));
+
+    ui_lvgl_ux::LvglDescriptorRendererProbe probe;
+    assert(probe.render(runtime));
+    assert(probe.ready());
+    assert(probe.usingPrimaryScreenGraph());
+    assert(probe.usedPrimaryScreenGraph());
+    assert(!probe.fallbackUsed());
+    assert(!probe.usedFallback());
+    assert(probe.itemCount() > 0);
+    assert(probe.items() != nullptr);
+
+    ui_lvgl_ux::LvglPrimaryScreenGraphRuntime fallback_runtime;
+    product_composition::PresentationBundle empty;
+    assert(!fallback_runtime.load(empty));
+    assert(!probe.render(fallback_runtime));
+    assert(probe.fallbackUsed());
+    assert(probe.usedFallback());
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_menu_runtime_adapter.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_menu_runtime_adapter.cpp
new file mode 100644
index 00000000..aa5b6af2
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_menu_runtime_adapter.cpp
@@ -0,0 +1,34 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui_lvgl_ux::LvglMenuRuntimeAdapter adapter;
+    ui_lvgl_ux::LvglMenuEntry entries[ui::menu::MenuModel::kMaxItems]{};
+    std::size_t count = 0;
+
+    assert(adapter.buildEntries(menu, entries, ui::menu::MenuModel::kMaxItems, count));
+    assert(count > 0);
+    assert(entries[0].enabled);
+    assert(entries[0].route.valid);
+    assert(entries[0].route.screen_id == entries[0].screen_id);
+    assert(entries[0].label != nullptr);
+
+    std::size_t small_count = 0;
+    ui_lvgl_ux::LvglMenuEntry one_entry[1]{};
+    assert(!adapter.buildEntries(menu, one_entry, 1, small_count));
+    assert(small_count == 1);
+
+    ui::menu::MenuModel empty;
+    std::size_t empty_count = 7;
+    assert(adapter.buildEntries(empty, nullptr, 0, empty_count));
+    assert(empty_count == 0);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_primary_screen_graph_runtime.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_primary_screen_graph_runtime.cpp
new file mode 100644
index 00000000..1d9c0490
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_primary_screen_graph_runtime.cpp
@@ -0,0 +1,42 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    ui_lvgl_ux::LvglPrimaryScreenGraphRuntime runtime;
+    assert(runtime.load(presentation));
+    assert(runtime.ready());
+    assert(runtime.usingPrimaryScreenGraph());
+    assert(runtime.runtimeSource() ==
+           ui_lvgl_ux::LvglScreenGraphRuntimeSource::ScreenGraphAdoption);
+    assert(!runtime.fallbackUsed());
+    assert(runtime.menuCount() > 0);
+    assert(runtime.screenCount() > 0);
+    assert(runtime.adoption().presenter().menuEntries()[0].route.valid);
+
+    product_composition::PresentationBundle empty;
+    assert(!runtime.load(empty));
+    assert(!runtime.ready());
+    assert(!runtime.usingPrimaryScreenGraph());
+    assert(runtime.runtimeSource() ==
+           ui_lvgl_ux::LvglScreenGraphRuntimeSource::HardcodedFallback);
+    assert(runtime.fallbackUsed());
+    assert(runtime.menuCount() == 0);
+    assert(runtime.screenCount() == 0);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_adoption_probe.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_adoption_probe.cpp
new file mode 100644
index 00000000..ecdd6d10
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_adoption_probe.cpp
@@ -0,0 +1,37 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_adoption_probe.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    ui_lvgl_ux::LvglRuntimeAdoptionProbe probe;
+    assert(probe.load(presentation));
+    assert(probe.ready());
+    assert(!probe.fallbackUsed());
+    assert(probe.menuCount() > 0);
+    assert(probe.screenCount() > 0);
+    const ui_lvgl_ux::LvglRuntimeEntryAdoption& adoption = probe.adoption();
+    assert(adoption.presenter().menuEntries()[0].route.valid);
+
+    product_composition::PresentationBundle empty;
+    assert(!probe.load(empty));
+    assert(!probe.ready());
+    assert(probe.fallbackUsed());
+    assert(probe.menuCount() == 0);
+    assert(probe.screenCount() == 0);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_entry_adoption.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_entry_adoption.cpp
new file mode 100644
index 00000000..66f5b337
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_entry_adoption.cpp
@@ -0,0 +1,34 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+
+    ui_lvgl_ux::LvglRuntimeEntryAdoption adoption;
+    assert(adoption.load(presentation));
+    assert(adoption.ready());
+    assert(adoption.menuCount() > 0);
+    assert(adoption.screenCount() > 0);
+    assert(adoption.presenter().menuEntries()[0].route.valid);
+
+    product_composition::PresentationBundle empty;
+    assert(!adoption.load(empty));
+    assert(!adoption.ready());
+    assert(adoption.menuCount() == 0);
+    assert(adoption.screenCount() == 0);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_screen_graph_presenter.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_screen_graph_presenter.cpp
new file mode 100644
index 00000000..079a99c2
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_screen_graph_presenter.cpp
@@ -0,0 +1,60 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+
+namespace
+{
+
+bool containsScreen(const ui_lvgl_ux::LvglRuntimeScreenGraphPresenter& presenter,
+                    ui::menu::MenuScreenId screen_id,
+                    const char* binding_id)
+{
+    for (std::size_t index = 0; index < presenter.screenCount(); ++index)
+    {
+        const ui_lvgl_ux::LvglScreenHostEntry& entry =
+            presenter.screenEntries()[index];
+        if (entry.screen_id == screen_id && entry.available &&
+            entry.binding_id != nullptr &&
+            std::strcmp(entry.binding_id, binding_id) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+    assert(product_composition::hasUxMenu(presentation));
+    assert(product_composition::hasScreenBindings(presentation));
+
+    ui_lvgl_ux::LvglRuntimeScreenGraphPresenter presenter;
+    assert(presenter.load(presentation));
+    assert(presenter.menuCount() > 0);
+    assert(presenter.screenCount() > 0);
+    assert(presenter.menuEntries()[0].route.valid);
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Chat, "chat"));
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Map, "map"));
+    assert(containsScreen(presenter, ui::menu::MenuScreenId::Settings, "settings"));
+
+    product_composition::PresentationBundle empty;
+    assert(!presenter.load(empty));
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_graph_bridge.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_graph_bridge.cpp
new file mode 100644
index 00000000..3841fc76
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_graph_bridge.cpp
@@ -0,0 +1,61 @@
+#include "product_composition/presentation_bundle.h"
+#include "ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h"
+#include "ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+
+namespace
+{
+
+bool containsScreen(const ui_lvgl_ux::LvglScreenGraphBridge& bridge,
+                    ui::menu::MenuScreenId screen_id,
+                    const char* binding_id)
+{
+    for (std::size_t index = 0; index < bridge.screenCount(); ++index)
+    {
+        const ui_lvgl_ux::LvglScreenHostEntry& entry =
+            bridge.screenItems()[index];
+        if (entry.screen_id == screen_id && entry.available &&
+            entry.binding_id != nullptr &&
+            std::strcmp(entry.binding_id, binding_id) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    ui::menu::MenuModel menu;
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+
+    ui::screen::ScreenBindingRegistry bindings;
+    ui_lvgl_ux::CompatibilityScreenFactory factory;
+    factory.buildBindingsForMenu(menu, bindings);
+
+    product_composition::PresentationBundle presentation;
+    presentation.ux_menu = &menu;
+    presentation.screen_bindings = &bindings;
+    assert(product_composition::hasUxMenu(presentation));
+    assert(product_composition::hasScreenBindings(presentation));
+
+    ui_lvgl_ux::LvglScreenGraphBridge bridge;
+    assert(bridge.load(presentation));
+    assert(bridge.menuCount() > 0);
+    assert(bridge.screenCount() > 0);
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Chat, "chat"));
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Map, "map"));
+    assert(containsScreen(bridge, ui::menu::MenuScreenId::Settings, "settings"));
+
+    product_composition::PresentationBundle empty;
+    assert(!bridge.load(empty));
+    assert(bridge.menuCount() == 0);
+    assert(bridge.screenCount() == 0);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_host_adapter.cpp b/modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_host_adapter.cpp
new file mode 100644
index 00000000..e6903f47
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_host_adapter.cpp
@@ -0,0 +1,20 @@
+#include "ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui_lvgl_ux::LvglScreenHostAdapter adapter;
+    ui_lvgl_ux::LvglScreenHostEntry entry;
+
+    assert(adapter.resolve(ui::menu::MenuScreenId::Chat, entry));
+    assert(entry.available);
+    assert(entry.screen_id == ui::menu::MenuScreenId::Chat);
+    assert(std::strcmp(entry.binding_id, "chat") == 0);
+
+    assert(adapter.resolve(ui::menu::MenuScreenId::Settings, entry));
+    assert(entry.available);
+    assert(std::strcmp(entry.binding_id, "settings") == 0);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_screen_registry.cpp b/modules/ui_lvgl_ux_packs/tests/test_screen_registry.cpp
new file mode 100644
index 00000000..2f3104a2
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_screen_registry.cpp
@@ -0,0 +1,23 @@
+#include "ui_lvgl_ux_packs/ux/screen_registry.h"
+
+#include <cassert>
+
+int main()
+{
+    ui_lvgl_ux::ScreenRegistry registry;
+    assert(registry.size() == 0);
+
+    for (std::size_t i = 0; i < ui_lvgl_ux::ScreenRegistry::kMaxScreens; ++i)
+    {
+        assert(registry.add({ui_lvgl_ux::ScreenId::Dashboard, "Screen", true}));
+    }
+    assert(registry.size() == ui_lvgl_ux::ScreenRegistry::kMaxScreens);
+    assert(!registry.add({ui_lvgl_ux::ScreenId::Chat, "Overflow", true}));
+
+    registry.clear();
+    assert(registry.size() == 0);
+    assert(registry.add({ui_lvgl_ux::ScreenId::Map, "Map", true}));
+    assert(registry.items()[0].id == ui_lvgl_ux::ScreenId::Map);
+    assert(registry.items()[0].enabled);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_simulator_full_ux_pack.cpp b/modules/ui_lvgl_ux_packs/tests/test_simulator_full_ux_pack.cpp
new file mode 100644
index 00000000..64e21202
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_simulator_full_ux_pack.cpp
@@ -0,0 +1,25 @@
+#include "ui_lvgl_ux_packs/packs/simulator_full_ux_pack.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui_lvgl_ux::SimulatorFullUxPack pack;
+    assert(std::strcmp(pack.id(), "simulator_full") == 0);
+    assert(pack.profile().screen_class == ui_lvgl_ux::ScreenClass::Desktop);
+    assert(pack.profile().input_model ==
+           ui_lvgl_ux::InputModel::DesktopKeyboardMouse);
+    assert(pack.profile().map_mode == ui_lvgl_ux::MapMode::Full);
+    assert(pack.profile().chat_mode == ui_lvgl_ux::ChatMode::Full);
+    assert(pack.features().contacts);
+    assert(pack.features().walkie);
+    assert(pack.features().sstv);
+    assert(pack.features().extensions);
+
+    ui_lvgl_ux::ScreenRegistry screens;
+    pack.buildScreens(screens);
+    assert(screens.size() == 11);
+    assert(screens.items()[10].id == ui_lvgl_ux::ScreenId::Extensions);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_tiny_node_status_ux_pack.cpp b/modules/ui_lvgl_ux_packs/tests/test_tiny_node_status_ux_pack.cpp
new file mode 100644
index 00000000..5425bc79
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_tiny_node_status_ux_pack.cpp
@@ -0,0 +1,24 @@
+#include "ui_lvgl_ux_packs/packs/tiny_node_status_ux_pack.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui_lvgl_ux::TinyNodeStatusUxPack pack;
+    assert(std::strcmp(pack.id(), "tiny_node_status") == 0);
+    assert(pack.profile().screen_class == ui_lvgl_ux::ScreenClass::TinyStatus);
+    assert(pack.profile().input_model == ui_lvgl_ux::InputModel::ButtonsOnly);
+    assert(pack.profile().map_mode == ui_lvgl_ux::MapMode::None);
+    assert(pack.profile().chat_mode == ui_lvgl_ux::ChatMode::StatusOnly);
+    assert(!pack.features().chat);
+    assert(pack.features().team);
+    assert(pack.features().gps);
+
+    ui_lvgl_ux::ScreenRegistry screens;
+    pack.buildScreens(screens);
+    assert(screens.size() == 4);
+    assert(screens.items()[0].id == ui_lvgl_ux::ScreenId::Dashboard);
+    assert(screens.items()[1].id == ui_lvgl_ux::ScreenId::Team);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_uconsole_desktop_ux_pack.cpp b/modules/ui_lvgl_ux_packs/tests/test_uconsole_desktop_ux_pack.cpp
new file mode 100644
index 00000000..ea18d9ed
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_uconsole_desktop_ux_pack.cpp
@@ -0,0 +1,26 @@
+#include "ui_lvgl_ux_packs/packs/uconsole_desktop_ux_pack.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui_lvgl_ux::UConsoleDesktopUxPack pack;
+    assert(std::strcmp(pack.id(), "uconsole_desktop") == 0);
+    assert(pack.profile().screen_class == ui_lvgl_ux::ScreenClass::Desktop);
+    assert(pack.profile().input_model ==
+           ui_lvgl_ux::InputModel::DesktopKeyboardMouse);
+    assert(pack.profile().map_mode == ui_lvgl_ux::MapMode::Desktop);
+    assert(pack.profile().chat_mode == ui_lvgl_ux::ChatMode::Full);
+    assert(pack.features().chat);
+    assert(!pack.features().contacts);
+    assert(!pack.features().walkie);
+
+    ui_lvgl_ux::ScreenRegistry screens;
+    pack.buildScreens(screens);
+    assert(screens.size() == 7);
+    assert(screens.items()[0].id == ui_lvgl_ux::ScreenId::Dashboard);
+    assert(screens.items()[1].id == ui_lvgl_ux::ScreenId::Chat);
+    assert(screens.items()[6].id == ui_lvgl_ux::ScreenId::Settings);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_ux_menu_provider.cpp b/modules/ui_lvgl_ux_packs/tests/test_ux_menu_provider.cpp
new file mode 100644
index 00000000..162125a6
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_ux_menu_provider.cpp
@@ -0,0 +1,46 @@
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+bool contains(const ui::menu::MenuModel& menu, ui::menu::MenuScreenId id)
+{
+    for (std::size_t index = 0; index < menu.size(); ++index)
+    {
+        if (menu.items()[index].screen_id == id)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    ui::menu::MenuModel menu;
+
+    assert(ui_lvgl_ux::buildMenuForUxPack("compatibility", menu));
+    assert(menu.size() >= 8);
+    assert(contains(menu, ui::menu::MenuScreenId::Chat));
+    assert(contains(menu, ui::menu::MenuScreenId::Map));
+    assert(contains(menu, ui::menu::MenuScreenId::Gps));
+    assert(contains(menu, ui::menu::MenuScreenId::Settings));
+
+    assert(ui_lvgl_ux::buildMenuForUxPack("uconsole_desktop", menu));
+    assert(menu.size() == 7);
+    assert(contains(menu, ui::menu::MenuScreenId::Dashboard));
+    assert(contains(menu, ui::menu::MenuScreenId::Chat));
+    assert(contains(menu, ui::menu::MenuScreenId::Settings));
+
+    assert(!ui_lvgl_ux::buildMenuForUxPack("missing", menu));
+    assert(menu.size() == 0);
+    assert(!ui_lvgl_ux::buildMenuForUxPack(nullptr, menu));
+    assert(menu.size() == 0);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_ux_pack_registry.cpp b/modules/ui_lvgl_ux_packs/tests/test_ux_pack_registry.cpp
new file mode 100644
index 00000000..02ea1b5f
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_ux_pack_registry.cpp
@@ -0,0 +1,32 @@
+#include "ui_lvgl_ux_packs/ux/ux_pack_registry.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    const ui_lvgl_ux::IUxPack* compatibility =
+        ui_lvgl_ux::findUxPackById("compatibility");
+    const ui_lvgl_ux::IUxPack* uconsole =
+        ui_lvgl_ux::findUxPackById("uconsole_desktop");
+    const ui_lvgl_ux::IUxPack* tiny =
+        ui_lvgl_ux::findUxPackById("tiny_node_status");
+    const ui_lvgl_ux::IUxPack* simulator =
+        ui_lvgl_ux::findUxPackById("simulator_full");
+
+    assert(compatibility != nullptr);
+    assert(uconsole != nullptr);
+    assert(tiny != nullptr);
+    assert(simulator != nullptr);
+    assert(std::strcmp(compatibility->id(), "compatibility") == 0);
+    assert(std::strcmp(uconsole->id(), "uconsole_desktop") == 0);
+    assert(std::strcmp(tiny->id(), "tiny_node_status") == 0);
+    assert(std::strcmp(simulator->id(), "simulator_full") == 0);
+    assert(ui_lvgl_ux::findUxPackById("missing") == nullptr);
+    assert(ui_lvgl_ux::findUxPackById(nullptr) == nullptr);
+
+    ui_lvgl_ux::ScreenRegistry screens;
+    uconsole->buildScreens(screens);
+    assert(screens.size() == 7);
+    return 0;
+}
diff --git a/modules/ui_lvgl_ux_packs/tests/test_ux_screen_menu_adapter.cpp b/modules/ui_lvgl_ux_packs/tests/test_ux_screen_menu_adapter.cpp
new file mode 100644
index 00000000..c8eaa02c
--- /dev/null
+++ b/modules/ui_lvgl_ux_packs/tests/test_ux_screen_menu_adapter.cpp
@@ -0,0 +1,26 @@
+#include "ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h"
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui_lvgl_ux::ScreenRegistry screens;
+    assert(screens.add({ui_lvgl_ux::ScreenId::Dashboard, "Dashboard", true}));
+    assert(screens.add({ui_lvgl_ux::ScreenId::Chat, "Chat", true}));
+    assert(screens.add({ui_lvgl_ux::ScreenId::Map, "Map", false}));
+    assert(screens.add({ui_lvgl_ux::ScreenId::Settings, "Settings", true}));
+
+    ui::menu::MenuModel menu;
+    ui_lvgl_ux::UxScreenMenuAdapter adapter;
+    adapter.buildMenu(screens, menu);
+
+    assert(menu.size() == 3);
+    assert(menu.items()[0].screen_id == ui::menu::MenuScreenId::Dashboard);
+    assert(menu.items()[1].screen_id == ui::menu::MenuScreenId::Chat);
+    assert(menu.items()[2].screen_id == ui::menu::MenuScreenId::Settings);
+    assert(std::strcmp(menu.items()[1].label, "Chat") == 0);
+    assert(menu.items()[1].enabled);
+    return 0;
+}
diff --git a/modules/ui_map_runtime/README.md b/modules/ui_map_runtime/README.md
new file mode 100644
index 00000000..a8a5a0a0
--- /dev/null
+++ b/modules/ui_map_runtime/README.md
@@ -0,0 +1,23 @@
+# ui_map_runtime
+
+Map runtime helpers.
+
+May contain:
+
+- map tile identity/source/cache ports
+- tile resolver
+- render queue
+- map overlay projectors
+- filesystem tile source adapters
+
+Must not contain:
+
+- LVGL widget tree ownership
+- app shell startup
+- build entrypoints
+- board facts
+- renderer layout policy
+
+This module was split from `modules/ui_shared` during the Phase 8 structural
+migration batch. The old `ui/map_tiles/*` and `ui/map_overlay/*` headers remain
+forwarding headers.
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_overlay/map_overlay_projector.h b/modules/ui_map_runtime/include/ui_map_runtime/map_overlay/map_overlay_projector.h
new file mode 100644
index 00000000..67b2260d
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_overlay/map_overlay_projector.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "ui_presentation/map/map_overlay_snapshot.h"
+
+#include <cstdint>
+
+namespace ui
+{
+namespace map_overlay
+{
+
+class MapOverlayProjector
+{
+  public:
+    bool projectCurrentPosition(double lat,
+                                double lon,
+                                bool valid,
+                                ::ui::map::MapOverlaySnapshot& out) const;
+
+    bool projectTeamMember(uint32_t node_id,
+                           const char* label,
+                           double lat,
+                           double lon,
+                           bool valid,
+                           ::ui::map::MapOverlaySnapshot& out) const;
+
+  private:
+    bool append(::ui::map::MapOverlaySnapshot& out,
+                const ::ui::map::MapOverlayItem& item) const;
+};
+
+} // namespace map_overlay
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h b/modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h
new file mode 100644
index 00000000..07e48360
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "ui_map_runtime/map_overlay/map_overlay_projector.h"
+#include "ui_presentation/map/map_overlay_snapshot.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ui
+{
+namespace map_overlay
+{
+
+class IMapOverlayGpsSource
+{
+  public:
+    virtual ~IMapOverlayGpsSource() = default;
+
+    virtual bool currentFix(double& lat,
+                            double& lon,
+                            bool& valid) const = 0;
+};
+
+class IMapOverlayTeamSource
+{
+  public:
+    struct TeamPoint
+    {
+        uint32_t node_id = 0;
+        const char* label = nullptr;
+        double lat = 0.0;
+        double lon = 0.0;
+        bool valid = false;
+    };
+
+    virtual ~IMapOverlayTeamSource() = default;
+
+    virtual std::size_t latestTeamPoints(TeamPoint* out,
+                                         std::size_t capacity) const = 0;
+};
+
+class MapOverlayProjectionAdapter
+{
+  public:
+    bool project(const IMapOverlayGpsSource* gps,
+                 const IMapOverlayTeamSource* team,
+                 ::ui::map::MapOverlaySnapshot& out) const;
+
+  private:
+    MapOverlayProjector projector_{};
+};
+
+} // namespace map_overlay
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h b/modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h
new file mode 100644
index 00000000..6055f151
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "ui_map_runtime/map_overlay_projection_adapter.h"
+#include "ui_presentation/map/map_overlay_source.h"
+
+namespace ui
+{
+namespace map_overlay
+{
+
+class MapOverlaySnapshotSource final
+    : public ::ui::map::IMapOverlayPresentationSource
+{
+  public:
+    MapOverlaySnapshotSource(IMapOverlayGpsSource* gps,
+                             IMapOverlayTeamSource* team);
+
+    bool buildMapOverlaySnapshot(
+        ::ui::map::MapOverlaySnapshot& out) const override;
+
+  private:
+    IMapOverlayGpsSource* gps_ = nullptr;
+    IMapOverlayTeamSource* team_ = nullptr;
+    MapOverlayProjectionAdapter adapter_{};
+};
+
+} // namespace map_overlay
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h
new file mode 100644
index 00000000..1473daac
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_resolver.h"
+#include "ui_map_runtime/map_tiles/map_tile_source.h"
+
+#include <cstddef>
+
+namespace ui
+{
+namespace map_tiles
+{
+
+class FilesystemMapTileSource final : public IMapTileSource
+{
+  public:
+    FilesystemMapTileSource(IMapTileFileSystem& file_system,
+                            const char* root_prefix = "");
+
+    MapTileLookupResult lookup(const MapTileRef& ref) const override;
+
+    bool read(const MapTileRef& ref,
+              uint8_t* buffer,
+              std::size_t capacity,
+              std::size_t& out_size,
+              MapTileFormat& out_format) const override;
+
+    bool resolvePath(const MapTileRef& ref, char* out_path, std::size_t out_size) const;
+    bool resolveDirectory(MapTileLayer layer, char* out_path, std::size_t out_size) const;
+    bool layerDirectoryAvailable(MapTileLayer layer) const;
+    bool anyContourDirectoryAvailable() const;
+
+  private:
+    IMapTileFileSystem& file_system_;
+    MapTileResolver resolver_;
+};
+
+using LegacyFilesystemMapTileSource [[deprecated("Use FilesystemMapTileSource")]] =
+    FilesystemMapTileSource;
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_cache.h b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_cache.h
new file mode 100644
index 00000000..211c97c8
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_cache.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_types.h"
+
+namespace ui
+{
+namespace map_tiles
+{
+
+class IMapTileCache
+{
+  public:
+    virtual ~IMapTileCache() = default;
+
+    virtual void clear() = 0;
+    virtual bool has(const MapTileRef& ref) const = 0;
+};
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_decoder_cache.h b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_decoder_cache.h
new file mode 100644
index 00000000..1b37c207
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_decoder_cache.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_types.h"
+
+namespace ui
+{
+namespace map_tiles
+{
+
+class IMapTileDecoderCache
+{
+  public:
+    virtual ~IMapTileDecoderCache() = default;
+
+    virtual void clear() = 0;
+    virtual bool hasDecoded(const MapTileRef& ref) const = 0;
+};
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_render_queue.h b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_render_queue.h
new file mode 100644
index 00000000..9bb35dd5
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_render_queue.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_types.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ui
+{
+namespace map_tiles
+{
+
+struct MapTileScreenRect
+{
+    int16_t x = 0;
+    int16_t y = 0;
+    int16_t width = 0;
+    int16_t height = 0;
+};
+
+enum class MapTileRenderState : uint8_t
+{
+    Unknown,
+    Missing,
+    Loading,
+    Ready,
+    Error,
+};
+
+struct MapTileRenderRef
+{
+    MapTileRef tile;
+    MapTileScreenRect rect;
+    MapTileRenderState state = MapTileRenderState::Unknown;
+};
+
+class MapTileRenderQueue
+{
+  public:
+    static constexpr std::size_t kMaxTiles = 64;
+
+    void clear();
+    bool push(const MapTileRenderRef& item);
+    std::size_t size() const;
+    const MapTileRenderRef* items() const;
+
+  private:
+    MapTileRenderRef items_[kMaxTiles]{};
+    std::size_t size_ = 0;
+};
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_resolver.h b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_resolver.h
new file mode 100644
index 00000000..9aef2419
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_resolver.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_types.h"
+
+#include <cstddef>
+
+namespace ui
+{
+namespace map_tiles
+{
+
+class MapTileResolver
+{
+  public:
+    MapTileResolver();
+    explicit MapTileResolver(const char* root_prefix);
+
+    void setRootPrefix(const char* root_prefix);
+    const char* rootPrefix() const;
+
+    bool resolvePath(const MapTileRef& ref, char* out_path, std::size_t out_size) const;
+    bool resolveDirectory(MapTileLayer layer, char* out_path, std::size_t out_size) const;
+
+  private:
+    static constexpr std::size_t kRootPrefixCapacity = 96;
+
+    char root_prefix_[kRootPrefixCapacity]{};
+};
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_source.h b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_source.h
new file mode 100644
index 00000000..610d4fff
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_source.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_types.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ui
+{
+namespace map_tiles
+{
+
+class IMapTileSource
+{
+  public:
+    virtual ~IMapTileSource() = default;
+
+    virtual MapTileLookupResult lookup(const MapTileRef& ref) const = 0;
+
+    virtual bool read(const MapTileRef& ref,
+                      uint8_t* buffer,
+                      std::size_t capacity,
+                      std::size_t& out_size,
+                      MapTileFormat& out_format) const = 0;
+};
+
+class IMapTileFileSystem
+{
+  public:
+    virtual ~IMapTileFileSystem() = default;
+
+    virtual bool exists(const char* path) const = 0;
+    virtual bool isDirectory(const char* path) const = 0;
+    virtual bool readFile(const char* path,
+                          uint8_t* buffer,
+                          std::size_t capacity,
+                          std::size_t& out_size) const = 0;
+};
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_types.h b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_types.h
new file mode 100644
index 00000000..e04e9a3f
--- /dev/null
+++ b/modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_types.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ui
+{
+namespace map_tiles
+{
+
+enum class MapTileLayer : uint8_t
+{
+    Osm,
+    Terrain,
+    Satellite,
+    ContourMajor500,
+    ContourMajor200,
+    ContourMajor100,
+    ContourMajor50,
+    ContourMajor25,
+};
+
+enum class MapTileFormat : uint8_t
+{
+    Unknown,
+    Png,
+    Jpeg,
+};
+
+enum class MapTileStatus : uint8_t
+{
+    Unknown,
+    Available,
+    Missing,
+    Error,
+};
+
+struct MapTileRef
+{
+    MapTileLayer layer = MapTileLayer::Osm;
+    uint8_t z = 0;
+    uint32_t x = 0;
+    uint32_t y = 0;
+};
+
+struct MapTilePayload
+{
+    MapTileRef ref;
+    MapTileFormat format = MapTileFormat::Unknown;
+    const uint8_t* data = nullptr;
+    std::size_t size = 0;
+};
+
+struct MapTileLookupResult
+{
+    MapTileStatus status = MapTileStatus::Unknown;
+    MapTileFormat format = MapTileFormat::Unknown;
+    std::size_t size = 0;
+};
+
+MapTileLayer mapTileLayerFromBaseSource(uint8_t map_source);
+MapTileLayer mapTileContourLayerForZoom(int zoom, bool* out_supported = nullptr);
+MapTileFormat mapTileFormatForLayer(MapTileLayer layer);
+bool mapTileLayerIsContour(MapTileLayer layer);
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/library.json b/modules/ui_map_runtime/library.json
new file mode 100644
index 00000000..e152a067
--- /dev/null
+++ b/modules/ui_map_runtime/library.json
@@ -0,0 +1,12 @@
+{
+  "name": "ui_map_runtime",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-I../../modules/ui_map_runtime/include",
+      "-I../../modules/ui_presentation/include"
+    ]
+  }
+}
diff --git a/modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp b/modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp
new file mode 100644
index 00000000..82370cdb
--- /dev/null
+++ b/modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp
@@ -0,0 +1,125 @@
+#include "ui_map_runtime/map_overlay/map_overlay_projector.h"
+
+#include "ui_presentation/common/fixed_text.h"
+
+#include <cmath>
+#include <cstdio>
+
+namespace ui
+{
+namespace map_overlay
+{
+namespace
+{
+
+bool validCoordinate(double lat, double lon, bool valid)
+{
+    return valid &&
+           std::isfinite(lat) &&
+           std::isfinite(lon) &&
+           lat >= -90.0 &&
+           lat <= 90.0 &&
+           lon >= -180.0 &&
+           lon <= 180.0;
+}
+
+uint32_t stableIdForCurrentPosition()
+{
+    return 0x01U;
+}
+
+uint32_t stableIdForTeamMember(uint32_t node_id)
+{
+    return 0x54000000U ^ node_id;
+}
+
+void copyCoordinateDetail(::ui::map::MapOverlayItem& item)
+{
+    char detail[64]{};
+    std::snprintf(detail,
+                  sizeof(detail),
+                  "%.5f, %.5f",
+                  item.point.lat,
+                  item.point.lon);
+    ui::copyText(item.detail, detail);
+}
+
+} // namespace
+
+bool MapOverlayProjector::append(::ui::map::MapOverlaySnapshot& out,
+                                 const ::ui::map::MapOverlayItem& item) const
+{
+    if (out.item_count >= ::ui::map::MapOverlaySnapshot::kMaxItems)
+    {
+        out.truncated = true;
+        return false;
+    }
+
+    out.items[out.item_count] = item;
+    ++out.item_count;
+    return true;
+}
+
+bool MapOverlayProjector::projectCurrentPosition(
+    double lat,
+    double lon,
+    bool valid,
+    ::ui::map::MapOverlaySnapshot& out) const
+{
+    if (!validCoordinate(lat, lon, valid))
+    {
+        return false;
+    }
+
+    ::ui::map::MapOverlayItem item{};
+    item.kind = ::ui::map::MapOverlayKind::CurrentPosition;
+    item.style = ::ui::map::MapOverlayStyle::OwnPosition;
+    item.point.lat = lat;
+    item.point.lon = lon;
+    item.point.valid = true;
+    item.stable_id = stableIdForCurrentPosition();
+    item.icon = 0;
+    item.visible = true;
+    ui::copyText(item.label, "You");
+    copyCoordinateDetail(item);
+    return append(out, item);
+}
+
+bool MapOverlayProjector::projectTeamMember(
+    uint32_t node_id,
+    const char* label,
+    double lat,
+    double lon,
+    bool valid,
+    ::ui::map::MapOverlaySnapshot& out) const
+{
+    if (node_id == 0 || !validCoordinate(lat, lon, valid))
+    {
+        return false;
+    }
+
+    ::ui::map::MapOverlayItem item{};
+    item.kind = ::ui::map::MapOverlayKind::TeamMember;
+    item.style = ::ui::map::MapOverlayStyle::Team;
+    item.point.lat = lat;
+    item.point.lon = lon;
+    item.point.valid = true;
+    item.stable_id = stableIdForTeamMember(node_id);
+    item.icon = static_cast<uint8_t>(node_id & 0xFFU);
+    item.visible = true;
+    if (label && label[0] != '\0')
+    {
+        ui::copyText(item.label, label);
+    }
+    else
+    {
+        char fallback[32]{};
+        std::snprintf(fallback, sizeof(fallback), "Node %lu", static_cast<unsigned long>(node_id));
+        ui::copyText(item.label, fallback);
+    }
+    copyCoordinateDetail(item);
+    return append(out, item);
+}
+
+} // namespace map_overlay
+} // namespace ui
diff --git a/modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp b/modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp
new file mode 100644
index 00000000..c9325810
--- /dev/null
+++ b/modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp
@@ -0,0 +1,57 @@
+#include "ui_map_runtime/map_overlay_projection_adapter.h"
+
+namespace ui
+{
+namespace map_overlay
+{
+namespace
+{
+
+constexpr std::size_t kMaxTeamPoints = 16;
+
+} // namespace
+
+bool MapOverlayProjectionAdapter::project(
+    const IMapOverlayGpsSource* gps,
+    const IMapOverlayTeamSource* team,
+    ::ui::map::MapOverlaySnapshot& out) const
+{
+    out = ::ui::map::MapOverlaySnapshot{};
+    out.header.valid = true;
+    out.header.version = 1;
+
+    if (gps != nullptr)
+    {
+        double lat = 0.0;
+        double lon = 0.0;
+        bool valid = false;
+        if (gps->currentFix(lat, lon, valid))
+        {
+            (void)projector_.projectCurrentPosition(lat, lon, valid, out);
+        }
+    }
+
+    if (team != nullptr)
+    {
+        IMapOverlayTeamSource::TeamPoint points[kMaxTeamPoints]{};
+        const std::size_t count = team->latestTeamPoints(points, kMaxTeamPoints);
+        for (std::size_t i = 0; i < count && i < kMaxTeamPoints; ++i)
+        {
+            (void)projector_.projectTeamMember(points[i].node_id,
+                                               points[i].label,
+                                               points[i].lat,
+                                               points[i].lon,
+                                               points[i].valid,
+                                               out);
+        }
+        if (count > kMaxTeamPoints)
+        {
+            out.truncated = true;
+        }
+    }
+
+    return true;
+}
+
+} // namespace map_overlay
+} // namespace ui
diff --git a/modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp b/modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp
new file mode 100644
index 00000000..0985a7cd
--- /dev/null
+++ b/modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp
@@ -0,0 +1,22 @@
+#include "ui_map_runtime/map_overlay_snapshot_source.h"
+
+namespace ui
+{
+namespace map_overlay
+{
+
+MapOverlaySnapshotSource::MapOverlaySnapshotSource(IMapOverlayGpsSource* gps,
+                                                   IMapOverlayTeamSource* team)
+    : gps_(gps),
+      team_(team)
+{
+}
+
+bool MapOverlaySnapshotSource::buildMapOverlaySnapshot(
+    ::ui::map::MapOverlaySnapshot& out) const
+{
+    return adapter_.project(gps_, team_, out);
+}
+
+} // namespace map_overlay
+} // namespace ui
diff --git a/modules/ui_map_runtime/src/map_tiles/filesystem_map_tile_source.cpp b/modules/ui_map_runtime/src/map_tiles/filesystem_map_tile_source.cpp
new file mode 100644
index 00000000..081a833c
--- /dev/null
+++ b/modules/ui_map_runtime/src/map_tiles/filesystem_map_tile_source.cpp
@@ -0,0 +1,94 @@
+#include "ui_map_runtime/map_tiles/filesystem_map_tile_source.h"
+
+namespace ui
+{
+namespace map_tiles
+{
+
+FilesystemMapTileSource::FilesystemMapTileSource(
+    IMapTileFileSystem& file_system,
+    const char* root_prefix)
+    : file_system_(file_system),
+      resolver_(root_prefix)
+{
+}
+
+MapTileLookupResult FilesystemMapTileSource::lookup(const MapTileRef& ref) const
+{
+    MapTileLookupResult result{};
+    result.format = mapTileFormatForLayer(ref.layer);
+
+    char path[160]{};
+    if (!resolver_.resolvePath(ref, path, sizeof(path)))
+    {
+        result.status = MapTileStatus::Error;
+        return result;
+    }
+
+    result.status = file_system_.exists(path) ? MapTileStatus::Available
+                                              : MapTileStatus::Missing;
+    return result;
+}
+
+bool FilesystemMapTileSource::read(const MapTileRef& ref,
+                                   uint8_t* buffer,
+                                   std::size_t capacity,
+                                   std::size_t& out_size,
+                                   MapTileFormat& out_format) const
+{
+    out_size = 0;
+    out_format = mapTileFormatForLayer(ref.layer);
+
+    char path[160]{};
+    if (!resolver_.resolvePath(ref, path, sizeof(path)))
+    {
+        out_format = MapTileFormat::Unknown;
+        return false;
+    }
+
+    return file_system_.readFile(path, buffer, capacity, out_size);
+}
+
+bool FilesystemMapTileSource::resolvePath(const MapTileRef& ref,
+                                          char* out_path,
+                                          std::size_t out_size) const
+{
+    return resolver_.resolvePath(ref, out_path, out_size);
+}
+
+bool FilesystemMapTileSource::resolveDirectory(MapTileLayer layer,
+                                               char* out_path,
+                                               std::size_t out_size) const
+{
+    return resolver_.resolveDirectory(layer, out_path, out_size);
+}
+
+bool FilesystemMapTileSource::layerDirectoryAvailable(MapTileLayer layer) const
+{
+    char path[160]{};
+    return resolver_.resolveDirectory(layer, path, sizeof(path)) &&
+           file_system_.isDirectory(path);
+}
+
+bool FilesystemMapTileSource::anyContourDirectoryAvailable() const
+{
+    static const MapTileLayer kContourLayers[] = {
+        MapTileLayer::ContourMajor500,
+        MapTileLayer::ContourMajor200,
+        MapTileLayer::ContourMajor100,
+        MapTileLayer::ContourMajor50,
+        MapTileLayer::ContourMajor25,
+    };
+
+    for (MapTileLayer layer : kContourLayers)
+    {
+        if (layerDirectoryAvailable(layer))
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/src/map_tiles/map_tile_render_queue.cpp b/modules/ui_map_runtime/src/map_tiles/map_tile_render_queue.cpp
new file mode 100644
index 00000000..700510c0
--- /dev/null
+++ b/modules/ui_map_runtime/src/map_tiles/map_tile_render_queue.cpp
@@ -0,0 +1,36 @@
+#include "ui_map_runtime/map_tiles/map_tile_render_queue.h"
+
+namespace ui
+{
+namespace map_tiles
+{
+
+void MapTileRenderQueue::clear()
+{
+    size_ = 0;
+}
+
+bool MapTileRenderQueue::push(const MapTileRenderRef& item)
+{
+    if (size_ >= kMaxTiles)
+    {
+        return false;
+    }
+
+    items_[size_] = item;
+    ++size_;
+    return true;
+}
+
+std::size_t MapTileRenderQueue::size() const
+{
+    return size_;
+}
+
+const MapTileRenderRef* MapTileRenderQueue::items() const
+{
+    return items_;
+}
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/src/map_tiles/map_tile_resolver.cpp b/modules/ui_map_runtime/src/map_tiles/map_tile_resolver.cpp
new file mode 100644
index 00000000..be44f1ec
--- /dev/null
+++ b/modules/ui_map_runtime/src/map_tiles/map_tile_resolver.cpp
@@ -0,0 +1,267 @@
+#include "ui_map_runtime/map_tiles/map_tile_resolver.h"
+
+#include <cstdio>
+#include <cstring>
+
+namespace ui
+{
+namespace map_tiles
+{
+namespace
+{
+
+const char* baseLayerDir(MapTileLayer layer)
+{
+    switch (layer)
+    {
+    case MapTileLayer::Terrain:
+        return "terrain";
+    case MapTileLayer::Satellite:
+        return "satellite";
+    case MapTileLayer::Osm:
+    default:
+        return "osm";
+    }
+}
+
+const char* contourLayerDir(MapTileLayer layer)
+{
+    switch (layer)
+    {
+    case MapTileLayer::ContourMajor500:
+        return "major-500";
+    case MapTileLayer::ContourMajor200:
+        return "major-200";
+    case MapTileLayer::ContourMajor100:
+        return "major-100";
+    case MapTileLayer::ContourMajor50:
+        return "major-50";
+    case MapTileLayer::ContourMajor25:
+        return "major-25";
+    default:
+        return nullptr;
+    }
+}
+
+const char* extensionFor(MapTileLayer layer)
+{
+    return mapTileFormatForLayer(layer) == MapTileFormat::Jpeg ? "jpg" : "png";
+}
+
+bool writePath(char* out_path,
+               std::size_t out_size,
+               const char* root,
+               const char* category,
+               const char* layer,
+               uint8_t z,
+               uint32_t x,
+               uint32_t y,
+               const char* extension)
+{
+    if (!out_path || out_size == 0 || !category || !layer || !extension)
+    {
+        return false;
+    }
+
+    const bool has_root = root && root[0] != '\0';
+    const char* separator = "";
+    if (has_root)
+    {
+        const std::size_t root_len = std::strlen(root);
+        separator = root[root_len - 1] == '/' ? "" : "/";
+    }
+
+    const int written = std::snprintf(out_path,
+                                      out_size,
+                                      "%s%s%s/%s/%u/%lu/%lu.%s",
+                                      has_root ? root : "",
+                                      separator,
+                                      category,
+                                      layer,
+                                      static_cast<unsigned>(z),
+                                      static_cast<unsigned long>(x),
+                                      static_cast<unsigned long>(y),
+                                      extension);
+    if (written < 0 || static_cast<std::size_t>(written) >= out_size)
+    {
+        out_path[0] = '\0';
+        return false;
+    }
+    return true;
+}
+
+bool writeDirectory(char* out_path,
+                    std::size_t out_size,
+                    const char* root,
+                    const char* category,
+                    const char* layer)
+{
+    if (!out_path || out_size == 0 || !category || !layer)
+    {
+        return false;
+    }
+
+    const bool has_root = root && root[0] != '\0';
+    const char* separator = "";
+    if (has_root)
+    {
+        const std::size_t root_len = std::strlen(root);
+        separator = root[root_len - 1] == '/' ? "" : "/";
+    }
+
+    const int written = std::snprintf(out_path,
+                                      out_size,
+                                      "%s%s%s/%s",
+                                      has_root ? root : "",
+                                      separator,
+                                      category,
+                                      layer);
+    if (written < 0 || static_cast<std::size_t>(written) >= out_size)
+    {
+        out_path[0] = '\0';
+        return false;
+    }
+    return true;
+}
+
+} // namespace
+
+MapTileLayer mapTileLayerFromBaseSource(uint8_t map_source)
+{
+    switch (map_source)
+    {
+    case 1:
+        return MapTileLayer::Terrain;
+    case 2:
+        return MapTileLayer::Satellite;
+    case 0:
+    default:
+        return MapTileLayer::Osm;
+    }
+}
+
+MapTileLayer mapTileContourLayerForZoom(int zoom, bool* out_supported)
+{
+    if (out_supported)
+    {
+        *out_supported = zoom > 7;
+    }
+
+    if (zoom <= 7)
+    {
+        return MapTileLayer::ContourMajor100;
+    }
+    if (zoom == 8)
+    {
+        return MapTileLayer::ContourMajor500;
+    }
+    if (zoom == 9)
+    {
+        return MapTileLayer::ContourMajor200;
+    }
+    if (zoom == 10)
+    {
+        return MapTileLayer::ContourMajor500;
+    }
+    if (zoom == 11)
+    {
+        return MapTileLayer::ContourMajor200;
+    }
+    if (zoom <= 14)
+    {
+        return MapTileLayer::ContourMajor100;
+    }
+    if (zoom <= 16)
+    {
+        return MapTileLayer::ContourMajor50;
+    }
+    return MapTileLayer::ContourMajor25;
+}
+
+MapTileFormat mapTileFormatForLayer(MapTileLayer layer)
+{
+    return layer == MapTileLayer::Satellite ? MapTileFormat::Jpeg : MapTileFormat::Png;
+}
+
+bool mapTileLayerIsContour(MapTileLayer layer)
+{
+    return contourLayerDir(layer) != nullptr;
+}
+
+MapTileResolver::MapTileResolver()
+{
+    setRootPrefix("");
+}
+
+MapTileResolver::MapTileResolver(const char* root_prefix)
+{
+    setRootPrefix(root_prefix);
+}
+
+void MapTileResolver::setRootPrefix(const char* root_prefix)
+{
+    if (!root_prefix)
+    {
+        root_prefix_[0] = '\0';
+        return;
+    }
+
+    std::snprintf(root_prefix_, sizeof(root_prefix_), "%s", root_prefix);
+    root_prefix_[sizeof(root_prefix_) - 1] = '\0';
+}
+
+const char* MapTileResolver::rootPrefix() const
+{
+    return root_prefix_;
+}
+
+bool MapTileResolver::resolvePath(const MapTileRef& ref,
+                                  char* out_path,
+                                  std::size_t out_size) const
+{
+    if (mapTileLayerIsContour(ref.layer))
+    {
+        return writePath(out_path,
+                         out_size,
+                         root_prefix_,
+                         "maps/contour",
+                         contourLayerDir(ref.layer),
+                         ref.z,
+                         ref.x,
+                         ref.y,
+                         extensionFor(ref.layer));
+    }
+
+    return writePath(out_path,
+                     out_size,
+                     root_prefix_,
+                     "maps/base",
+                     baseLayerDir(ref.layer),
+                     ref.z,
+                     ref.x,
+                     ref.y,
+                     extensionFor(ref.layer));
+}
+
+bool MapTileResolver::resolveDirectory(MapTileLayer layer,
+                                       char* out_path,
+                                       std::size_t out_size) const
+{
+    if (mapTileLayerIsContour(layer))
+    {
+        return writeDirectory(out_path,
+                              out_size,
+                              root_prefix_,
+                              "maps/contour",
+                              contourLayerDir(layer));
+    }
+
+    return writeDirectory(out_path,
+                          out_size,
+                          root_prefix_,
+                          "maps/base",
+                          baseLayerDir(layer));
+}
+
+} // namespace map_tiles
+} // namespace ui
diff --git a/modules/ui_map_runtime/tests/test_filesystem_map_tile_source.cpp b/modules/ui_map_runtime/tests/test_filesystem_map_tile_source.cpp
new file mode 100644
index 00000000..4a6d38b3
--- /dev/null
+++ b/modules/ui_map_runtime/tests/test_filesystem_map_tile_source.cpp
@@ -0,0 +1,127 @@
+#include "ui_map_runtime/map_tiles/filesystem_map_tile_source.h"
+
+#include <cassert>
+#include <cstring>
+#include <string>
+#include <vector>
+
+namespace
+{
+
+class FakeFileSystem final : public ui::map_tiles::IMapTileFileSystem
+{
+  public:
+    std::vector<std::string> files;
+    std::vector<std::string> dirs;
+
+    bool exists(const char* path) const override
+    {
+        return contains(files, path);
+    }
+
+    bool isDirectory(const char* path) const override
+    {
+        return contains(dirs, path);
+    }
+
+    bool readFile(const char* path,
+                  uint8_t* buffer,
+                  std::size_t capacity,
+                  std::size_t& out_size) const override
+    {
+        out_size = 0;
+        if (!exists(path) || capacity < 3 || buffer == nullptr)
+        {
+            return false;
+        }
+        buffer[0] = 1;
+        buffer[1] = 2;
+        buffer[2] = 3;
+        out_size = 3;
+        return true;
+    }
+
+  private:
+    static bool contains(const std::vector<std::string>& values, const char* path)
+    {
+        if (path == nullptr)
+        {
+            return false;
+        }
+        for (const auto& value : values)
+        {
+            if (value == path)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+void test_lookup_and_read()
+{
+    FakeFileSystem fs;
+    fs.files.push_back("/sd/maps/base/osm/4/8/6.png");
+
+    ui::map_tiles::FilesystemMapTileSource source(fs, "/sd");
+    ui::map_tiles::MapTileRef ref{};
+    ref.layer = ui::map_tiles::MapTileLayer::Osm;
+    ref.z = 4;
+    ref.x = 8;
+    ref.y = 6;
+
+    const auto hit = source.lookup(ref);
+    assert(hit.status == ui::map_tiles::MapTileStatus::Available);
+    assert(hit.format == ui::map_tiles::MapTileFormat::Png);
+
+    uint8_t buffer[4]{};
+    std::size_t out_size = 0;
+    ui::map_tiles::MapTileFormat format = ui::map_tiles::MapTileFormat::Unknown;
+    assert(source.read(ref, buffer, sizeof(buffer), out_size, format));
+    assert(out_size == 3);
+    assert(format == ui::map_tiles::MapTileFormat::Png);
+    assert(buffer[0] == 1 && buffer[1] == 2 && buffer[2] == 3);
+
+    ref.y = 7;
+    const auto miss = source.lookup(ref);
+    assert(miss.status == ui::map_tiles::MapTileStatus::Missing);
+}
+
+void test_directories()
+{
+    FakeFileSystem fs;
+    fs.dirs.push_back("A:/maps/base/terrain");
+    fs.dirs.push_back("A:/maps/contour/major-100");
+
+    ui::map_tiles::FilesystemMapTileSource source(fs, "A:");
+    assert(source.layerDirectoryAvailable(ui::map_tiles::MapTileLayer::Terrain));
+    assert(!source.layerDirectoryAvailable(ui::map_tiles::MapTileLayer::Satellite));
+    assert(source.anyContourDirectoryAvailable());
+}
+
+void test_resolve_path()
+{
+    FakeFileSystem fs;
+    ui::map_tiles::FilesystemMapTileSource source(fs, "A:");
+
+    ui::map_tiles::MapTileRef ref{};
+    ref.layer = ui::map_tiles::MapTileLayer::Satellite;
+    ref.z = 9;
+    ref.x = 82;
+    ref.y = 190;
+
+    char path[160]{};
+    assert(source.resolvePath(ref, path, sizeof(path)));
+    assert(std::strcmp(path, "A:/maps/base/satellite/9/82/190.jpg") == 0);
+}
+
+} // namespace
+
+int main()
+{
+    test_lookup_and_read();
+    test_directories();
+    test_resolve_path();
+    return 0;
+}
diff --git a/modules/ui_map_runtime/tests/test_map_overlay_projector.cpp b/modules/ui_map_runtime/tests/test_map_overlay_projector.cpp
new file mode 100644
index 00000000..386b0b60
--- /dev/null
+++ b/modules/ui_map_runtime/tests/test_map_overlay_projector.cpp
@@ -0,0 +1,83 @@
+#include "ui_map_runtime/map_overlay/map_overlay_projector.h"
+
+#include <cassert>
+#include <cstddef>
+#include <cstring>
+
+namespace
+{
+
+void test_current_position()
+{
+    ui::map_overlay::MapOverlayProjector projector;
+    ui::map::MapOverlaySnapshot snapshot{};
+
+    assert(projector.projectCurrentPosition(31.2304, 121.4737, true, snapshot));
+    assert(snapshot.item_count == 1);
+    const auto& item = snapshot.items[0];
+    assert(item.kind == ui::map::MapOverlayKind::CurrentPosition);
+    assert(item.style == ui::map::MapOverlayStyle::OwnPosition);
+    assert(item.point.valid);
+    assert(item.point.lat == 31.2304);
+    assert(item.point.lon == 121.4737);
+    assert(std::strcmp(item.label.c_str(), "You") == 0);
+    assert(std::strstr(item.detail.c_str(), "31.23040") != nullptr);
+}
+
+void test_team_member()
+{
+    ui::map_overlay::MapOverlayProjector projector;
+    ui::map::MapOverlaySnapshot snapshot{};
+
+    assert(projector.projectTeamMember(42, "Ada", 52.4068, -1.5197, true, snapshot));
+    assert(snapshot.item_count == 1);
+    const auto& item = snapshot.items[0];
+    assert(item.kind == ui::map::MapOverlayKind::TeamMember);
+    assert(item.style == ui::map::MapOverlayStyle::Team);
+    assert(item.stable_id != 0);
+    assert(std::strcmp(item.label.c_str(), "Ada") == 0);
+    assert(std::strstr(item.detail.c_str(), "-1.51970") != nullptr);
+}
+
+void test_invalid_points_are_ignored()
+{
+    ui::map_overlay::MapOverlayProjector projector;
+    ui::map::MapOverlaySnapshot snapshot{};
+
+    assert(!projector.projectCurrentPosition(0.0, 0.0, false, snapshot));
+    assert(!projector.projectCurrentPosition(100.0, 0.0, true, snapshot));
+    assert(!projector.projectTeamMember(0, "bad", 1.0, 2.0, true, snapshot));
+    assert(!projector.projectTeamMember(1, "bad", 1.0, 200.0, true, snapshot));
+    assert(snapshot.item_count == 0);
+    assert(!snapshot.truncated);
+}
+
+void test_capacity_sets_truncated()
+{
+    ui::map_overlay::MapOverlayProjector projector;
+    ui::map::MapOverlaySnapshot snapshot{};
+
+    for (std::size_t i = 0; i < ui::map::MapOverlaySnapshot::kMaxItems; ++i)
+    {
+        assert(projector.projectTeamMember(static_cast<uint32_t>(i + 1),
+                                           "member",
+                                           10.0,
+                                           20.0,
+                                           true,
+                                           snapshot));
+    }
+    assert(snapshot.item_count == ui::map::MapOverlaySnapshot::kMaxItems);
+    assert(!projector.projectTeamMember(99, "overflow", 10.0, 20.0, true, snapshot));
+    assert(snapshot.truncated);
+}
+
+} // namespace
+
+int main()
+{
+    test_current_position();
+    test_team_member();
+    test_invalid_points_are_ignored();
+    test_capacity_sets_truncated();
+    return 0;
+}
diff --git a/modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp b/modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp
new file mode 100644
index 00000000..40cff75c
--- /dev/null
+++ b/modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp
@@ -0,0 +1,100 @@
+#include "ui_map_runtime/map_overlay_snapshot_source.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+class FakeGpsSource final : public ui::map_overlay::IMapOverlayGpsSource
+{
+  public:
+    bool currentFix(double& out_lat, double& out_lon, bool& out_valid) const override
+    {
+        ++calls;
+        if (!available)
+        {
+            return false;
+        }
+        out_lat = lat;
+        out_lon = lon;
+        out_valid = valid;
+        return true;
+    }
+
+    mutable int calls = 0;
+    bool available = true;
+    double lat = 31.2304;
+    double lon = 121.4737;
+    bool valid = true;
+};
+
+class FakeTeamSource final : public ui::map_overlay::IMapOverlayTeamSource
+{
+  public:
+    std::size_t latestTeamPoints(TeamPoint* out, std::size_t capacity) const override
+    {
+        ++calls;
+        if (!available || capacity == 0)
+        {
+            return 0;
+        }
+
+        if (capacity >= 1)
+        {
+            out[0].node_id = 7;
+            out[0].label = "Grace";
+            out[0].lat = 52.4068;
+            out[0].lon = -1.5197;
+            out[0].valid = true;
+        }
+        if (capacity >= 2 && include_invalid)
+        {
+            out[1].node_id = 8;
+            out[1].label = "Invalid";
+            out[1].lat = 120.0;
+            out[1].lon = 0.0;
+            out[1].valid = true;
+            return 2;
+        }
+        return 1;
+    }
+
+    mutable int calls = 0;
+    bool available = true;
+    bool include_invalid = false;
+};
+
+} // namespace
+
+int main()
+{
+    FakeGpsSource gps;
+    FakeTeamSource team;
+    ui::map_overlay::MapOverlaySnapshotSource source(&gps, &team);
+
+    ui::map::MapOverlaySnapshot snapshot;
+    assert(source.buildMapOverlaySnapshot(snapshot));
+    assert(snapshot.header.valid);
+    assert(snapshot.header.version == 1);
+    assert(snapshot.item_count == 2);
+    assert(snapshot.items[0].kind == ui::map::MapOverlayKind::CurrentPosition);
+    assert(snapshot.items[1].kind == ui::map::MapOverlayKind::TeamMember);
+    assert(std::strcmp(snapshot.items[1].label.c_str(), "Grace") == 0);
+    assert(gps.calls == 1);
+    assert(team.calls == 1);
+
+    gps.valid = false;
+    team.include_invalid = true;
+    assert(source.buildMapOverlaySnapshot(snapshot));
+    assert(snapshot.item_count == 1);
+    assert(snapshot.items[0].kind == ui::map::MapOverlayKind::TeamMember);
+
+    gps.available = false;
+    team.available = false;
+    assert(source.buildMapOverlaySnapshot(snapshot));
+    assert(snapshot.header.valid);
+    assert(snapshot.item_count == 0);
+
+    return 0;
+}
diff --git a/modules/ui_map_runtime/tests/test_map_tile_render_queue.cpp b/modules/ui_map_runtime/tests/test_map_tile_render_queue.cpp
new file mode 100644
index 00000000..5893c49c
--- /dev/null
+++ b/modules/ui_map_runtime/tests/test_map_tile_render_queue.cpp
@@ -0,0 +1,64 @@
+#include "ui_map_runtime/map_tiles/map_tile_render_queue.h"
+
+#include <cassert>
+
+namespace
+{
+
+ui::map_tiles::MapTileRenderRef make_item(uint32_t x)
+{
+    ui::map_tiles::MapTileRenderRef item{};
+    item.tile.layer = ui::map_tiles::MapTileLayer::Osm;
+    item.tile.z = 12;
+    item.tile.x = x;
+    item.tile.y = x + 1;
+    item.rect.x = static_cast<int16_t>(x);
+    item.rect.y = static_cast<int16_t>(x + 2);
+    item.rect.width = 256;
+    item.rect.height = 256;
+    item.state = ui::map_tiles::MapTileRenderState::Loading;
+    return item;
+}
+
+void test_push_and_read()
+{
+    ui::map_tiles::MapTileRenderQueue queue;
+    assert(queue.size() == 0);
+    assert(queue.push(make_item(4)));
+    assert(queue.size() == 1);
+    assert(queue.items()[0].tile.x == 4);
+    assert(queue.items()[0].rect.width == 256);
+    assert(queue.items()[0].state == ui::map_tiles::MapTileRenderState::Loading);
+}
+
+void test_clear()
+{
+    ui::map_tiles::MapTileRenderQueue queue;
+    assert(queue.push(make_item(1)));
+    queue.clear();
+    assert(queue.size() == 0);
+    assert(queue.push(make_item(2)));
+    assert(queue.size() == 1);
+    assert(queue.items()[0].tile.x == 2);
+}
+
+void test_capacity()
+{
+    ui::map_tiles::MapTileRenderQueue queue;
+    for (std::size_t i = 0; i < ui::map_tiles::MapTileRenderQueue::kMaxTiles; ++i)
+    {
+        assert(queue.push(make_item(static_cast<uint32_t>(i))));
+    }
+    assert(queue.size() == ui::map_tiles::MapTileRenderQueue::kMaxTiles);
+    assert(!queue.push(make_item(99)));
+}
+
+} // namespace
+
+int main()
+{
+    test_push_and_read();
+    test_clear();
+    test_capacity();
+    return 0;
+}
diff --git a/modules/ui_map_runtime/tests/test_map_tile_resolver.cpp b/modules/ui_map_runtime/tests/test_map_tile_resolver.cpp
new file mode 100644
index 00000000..6eae9a19
--- /dev/null
+++ b/modules/ui_map_runtime/tests/test_map_tile_resolver.cpp
@@ -0,0 +1,73 @@
+#include "ui_map_runtime/map_tiles/map_tile_resolver.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+void test_base_paths()
+{
+    ui::map_tiles::MapTileResolver resolver("/sd");
+    char path[160]{};
+
+    ui::map_tiles::MapTileRef ref{};
+    ref.layer = ui::map_tiles::MapTileLayer::Osm;
+    ref.z = 12;
+    ref.x = 656;
+    ref.y = 1582;
+    assert(resolver.resolvePath(ref, path, sizeof(path)));
+    assert(std::strcmp(path, "/sd/maps/base/osm/12/656/1582.png") == 0);
+
+    ref.layer = ui::map_tiles::MapTileLayer::Satellite;
+    assert(resolver.resolvePath(ref, path, sizeof(path)));
+    assert(std::strcmp(path, "/sd/maps/base/satellite/12/656/1582.jpg") == 0);
+}
+
+void test_contour_paths()
+{
+    ui::map_tiles::MapTileResolver resolver("A:");
+    char path[160]{};
+    char dir[160]{};
+
+    ui::map_tiles::MapTileRef ref{};
+    ref.layer = ui::map_tiles::MapTileLayer::ContourMajor50;
+    ref.z = 16;
+    ref.x = 10495;
+    ref.y = 25312;
+    assert(resolver.resolvePath(ref, path, sizeof(path)));
+    assert(std::strcmp(path, "A:/maps/contour/major-50/16/10495/25312.png") == 0);
+
+    assert(resolver.resolveDirectory(ref.layer, dir, sizeof(dir)));
+    assert(std::strcmp(dir, "A:/maps/contour/major-50") == 0);
+}
+
+void test_layer_helpers()
+{
+    assert(ui::map_tiles::mapTileLayerFromBaseSource(0) ==
+           ui::map_tiles::MapTileLayer::Osm);
+    assert(ui::map_tiles::mapTileLayerFromBaseSource(1) ==
+           ui::map_tiles::MapTileLayer::Terrain);
+    assert(ui::map_tiles::mapTileLayerFromBaseSource(2) ==
+           ui::map_tiles::MapTileLayer::Satellite);
+
+    bool supported = false;
+    assert(ui::map_tiles::mapTileContourLayerForZoom(8, &supported) ==
+           ui::map_tiles::MapTileLayer::ContourMajor500);
+    assert(supported);
+    assert(ui::map_tiles::mapTileContourLayerForZoom(16, &supported) ==
+           ui::map_tiles::MapTileLayer::ContourMajor50);
+    assert(supported);
+    (void)ui::map_tiles::mapTileContourLayerForZoom(7, &supported);
+    assert(!supported);
+}
+
+} // namespace
+
+int main()
+{
+    test_base_paths();
+    test_contour_paths();
+    test_layer_helpers();
+    return 0;
+}
diff --git a/modules/ui_mono_128x64/library.json b/modules/ui_mono_128x64/library.json
new file mode 100644
index 00000000..e21ebf82
--- /dev/null
+++ b/modules/ui_mono_128x64/library.json
@@ -0,0 +1,29 @@
+{
+  "name": "ui_mono_128x64",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src",
+    "flags": [
+      "-std=gnu++17",
+      "-Iinclude",
+      "-I../core_chat/include",
+      "-I../core_chat/generated",
+      "-I../core_chat/third_party/nanopb",
+      "-I../core_sys/include",
+      "-I../core_gps/include",
+      "-I../../platform/shared/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_chat"
+    },
+    {
+      "name": "core_sys"
+    },
+    {
+      "name": "core_gps"
+    }
+  ]
+}
diff --git a/modules/ui_mono_128x64/src/runtime.cpp b/modules/ui_mono_128x64/src/runtime.cpp
index 6682f951..59eef305 100644
--- a/modules/ui_mono_128x64/src/runtime.cpp
+++ b/modules/ui_mono_128x64/src/runtime.cpp
@@ -972,6 +972,16 @@ const char* radioRegionLabel(const app::AppConfig& cfg)
     return preset ? preset->title : "Custom";
 }
 
+void applyMeshCoreRegionPreset(chat::MeshConfig& config, const chat::meshcore::RegionPreset& preset)
+{
+    config.meshcore_region_preset = preset.id;
+    config.meshcore_freq_mhz = preset.freq_mhz;
+    config.meshcore_bw_khz = preset.bw_khz;
+    config.meshcore_sf = preset.sf;
+    config.meshcore_cr = preset.cr;
+    config.tx_power = preset.tx_power_dbm;
+}
+
 const char* gpsSatMaskLabel(uint8_t mask)
 {
     switch (mask)
@@ -2374,7 +2384,7 @@ void Runtime::renderNodeCompass()
     constexpr int kInfoRightX = 127;
     constexpr int kInfoW = 58;
     constexpr int kInfoMinX = kInfoRightX - kInfoW + 1;
-    auto drawInfoRight = [this](int y, const char* text)
+    auto drawInfoRight = [this, kInfoRightX, kInfoW, kInfoMinX](int y, const char* text)
     {
         if (!text || text[0] == '\0')
         {
@@ -4191,7 +4201,7 @@ void Runtime::adjustSettingPopup(int delta)
                         }
                     }
                     index = clampValue(index + delta, 0, static_cast<int>(count) - 1);
-                    cfg.meshcore_config.meshcore_region_preset = table[index].id;
+                    applyMeshCoreRegionPreset(cfg.meshcore_config, table[index]);
                 }
             }
             break;
@@ -4226,11 +4236,7 @@ void Runtime::adjustSettingPopup(int delta)
                         }
                     }
                     index = clampValue(index + delta, 0, static_cast<int>(count) - 1);
-                    cfg.meshcore_config.meshcore_region_preset = table[index].id;
-                    cfg.meshcore_config.meshcore_freq_mhz = table[index].freq_mhz;
-                    cfg.meshcore_config.meshcore_bw_khz = table[index].bw_khz;
-                    cfg.meshcore_config.meshcore_sf = table[index].sf;
-                    cfg.meshcore_config.meshcore_cr = table[index].cr;
+                    applyMeshCoreRegionPreset(cfg.meshcore_config, table[index]);
                 }
             }
             break;
diff --git a/modules/ui_presentation/include/ui_presentation/chat/chat_action_sink.h b/modules/ui_presentation/include/ui_presentation/chat/chat_action_sink.h
new file mode 100644
index 00000000..566bf9ec
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/chat/chat_action_sink.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "ui_presentation/chat/chat_identity.h"
+#include "ui_presentation/chat/chat_workspace_snapshot.h"
+#include "ui_presentation/common/ui_action_result.h"
+
+namespace ui::chat
+{
+
+class IChatActionSink
+{
+  public:
+    virtual ~IChatActionSink() = default;
+
+    virtual ui::UiActionResult selectConversation(ConversationId id) = 0;
+    virtual ui::UiActionResult sendMessage(const SendMessageView& message) = 0;
+    virtual ui::UiActionResult markRead(ConversationId id) = 0;
+};
+
+} // namespace ui::chat
diff --git a/modules/ui_presentation/include/ui_presentation/chat/chat_identity.h b/modules/ui_presentation/include/ui_presentation/chat/chat_identity.h
new file mode 100644
index 00000000..8b970a8c
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/chat/chat_identity.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace ui::chat
+{
+
+enum class ConversationKind : uint8_t
+{
+    None = 0,
+    DirectPeer,
+    Channel,
+    Team,
+    Broadcast,
+    System,
+};
+
+enum class ChatProtocolKind : uint8_t
+{
+    None = 0,
+    Meshtastic,
+    MeshCore,
+    RNode,
+    LXMF,
+    TrailMate,
+    Mixed,
+};
+
+struct ConversationId
+{
+    ConversationKind kind = ConversationKind::None;
+    ChatProtocolKind protocol = ChatProtocolKind::None;
+
+    // DirectPeer: primary = node id, secondary = channel id / slot.
+    // Channel: primary = channel id / slot, secondary = 0.
+    // Team: primary = team id / slot, secondary = optional member/group scope.
+    // Broadcast: primary = channel id / slot, secondary = 0.
+    // System: primary = system row id, secondary = 0.
+    uint32_t primary = 0;
+    uint32_t secondary = 0;
+
+    bool isValid() const
+    {
+        return kind != ConversationKind::None;
+    }
+
+    bool operator==(const ConversationId& other) const
+    {
+        return kind == other.kind &&
+               protocol == other.protocol &&
+               primary == other.primary &&
+               secondary == other.secondary;
+    }
+
+    bool operator!=(const ConversationId& other) const
+    {
+        return !(*this == other);
+    }
+};
+
+} // namespace ui::chat
diff --git a/modules/ui_presentation/include/ui_presentation/chat/chat_message_ref.h b/modules/ui_presentation/include/ui_presentation/chat/chat_message_ref.h
new file mode 100644
index 00000000..682c3947
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/chat/chat_message_ref.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace ui::chat
+{
+
+enum class MessageOrigin : uint8_t
+{
+    LocalDraft,
+    LocalPending,
+    LocalStored,
+    RemoteStored,
+    SystemGenerated,
+};
+
+struct MessageRef
+{
+    MessageOrigin origin = MessageOrigin::SystemGenerated;
+
+    uint64_t local_id = 0;
+    uint32_t protocol_id = 0;
+    uint32_t nonce_or_seq = 0;
+
+    bool isValid() const
+    {
+        return local_id != 0 || protocol_id != 0 || nonce_or_seq != 0;
+    }
+};
+
+enum class MessageDeliveryState : uint8_t
+{
+    Draft,
+    Queued,
+    Sending,
+    Sent,
+    Delivered,
+    Failed,
+    Received,
+    Unknown,
+};
+
+enum class MessageFailureKind : uint8_t
+{
+    None,
+    PeerKeyMissing,
+    LocalIdentityMissing,
+    RadioSendFailed,
+    AckTimeout,
+    UnsupportedProtocol,
+    Rejected,
+    Unknown,
+};
+
+} // namespace ui::chat
diff --git a/modules/ui_presentation/include/ui_presentation/chat/chat_presentation_source.h b/modules/ui_presentation/include/ui_presentation/chat/chat_presentation_source.h
new file mode 100644
index 00000000..515306f9
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/chat/chat_presentation_source.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "ui_presentation/chat/chat_identity.h"
+#include "ui_presentation/chat/chat_workspace_snapshot.h"
+
+#include <stdint.h>
+
+namespace ui::chat
+{
+
+struct ChatWorkspaceRequest
+{
+    ConversationId selected;
+    uint16_t conversation_offset = 0;
+    uint16_t message_offset = 0;
+};
+
+class IChatPresentationSource
+{
+  public:
+    virtual ~IChatPresentationSource() = default;
+
+    virtual bool buildChatWorkspaceSnapshot(
+        const ChatWorkspaceRequest& request,
+        ChatWorkspaceSnapshot& out) const = 0;
+};
+
+} // namespace ui::chat
diff --git a/modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h b/modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h
new file mode 100644
index 00000000..54fd1e23
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "ui_presentation/chat/chat_action_sink.h"
+#include "ui_presentation/chat/chat_presentation_source.h"
+
+#include <stdint.h>
+
+namespace ui::chat
+{
+
+class ChatWorkspaceModel
+{
+  public:
+    ChatWorkspaceModel(IChatPresentationSource& source, IChatActionSink& sink);
+
+    bool buildSnapshot(ChatWorkspaceSnapshot& out) const;
+    ChatWorkspaceSnapshot snapshot() const;
+
+    ui::UiActionResult selectConversation(ConversationId id);
+    ui::UiActionResult sendMessage(const char* text);
+    ui::UiActionResult markRead(ConversationId id);
+
+    ConversationId selectedConversation() const;
+
+    void setConversationOffset(uint16_t offset);
+    void setMessageOffset(uint16_t offset);
+
+    uint16_t conversationOffset() const;
+    uint16_t messageOffset() const;
+
+  private:
+    IChatPresentationSource& source_;
+    IChatActionSink& sink_;
+
+    ConversationId selected_{};
+    uint16_t conversation_offset_ = 0;
+    uint16_t message_offset_ = 0;
+};
+
+} // namespace ui::chat
diff --git a/modules/ui_presentation/include/ui_presentation/chat/chat_workspace_snapshot.h b/modules/ui_presentation/include/ui_presentation/chat/chat_workspace_snapshot.h
new file mode 100644
index 00000000..c9de0b02
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/chat/chat_workspace_snapshot.h
@@ -0,0 +1,121 @@
+#pragma once
+
+#include "ui_presentation/chat/chat_identity.h"
+#include "ui_presentation/chat/chat_message_ref.h"
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/snapshot_header.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace ui::chat
+{
+
+struct ConversationRow
+{
+    ConversationId id;
+
+    ui::FixedText<32> title;
+    ui::FixedText<64> subtitle;
+
+    uint16_t unread_count = 0;
+    bool selected = false;
+    bool muted = false;
+
+    ConversationKind kind = ConversationKind::None;
+    ChatProtocolKind protocol = ChatProtocolKind::None;
+
+    MessageDeliveryState last_delivery = MessageDeliveryState::Unknown;
+};
+
+struct MessageRow
+{
+    MessageRef ref;
+    ConversationId conversation;
+
+    bool outgoing = false;
+    MessageDeliveryState delivery = MessageDeliveryState::Unknown;
+    MessageFailureKind failure = MessageFailureKind::None;
+
+    uint32_t sender_node_id = 0;
+    ui::FixedText<160> text;
+    ui::FixedText<24> time_label;
+    ui::FixedText<32> sender_label;
+};
+
+struct ChatWorkspaceSnapshot
+{
+    ui::SnapshotHeader header;
+
+    ConversationRow conversations[16]{};
+    size_t conversation_count = 0;
+
+    MessageRow messages[24]{};
+    size_t message_count = 0;
+
+    ConversationId selected_conversation;
+
+    bool can_send = false;
+    bool composer_enabled = false;
+
+    ui::FixedText<64> composer_placeholder;
+    ui::FixedText<64> workspace_title;
+};
+
+struct SendMessageView
+{
+    ConversationId conversation;
+    const char* text = nullptr;
+    size_t text_len = 0;
+};
+
+inline void resetConversationRow(ConversationRow& row)
+{
+    row.id = ConversationId{};
+    row.title.clear();
+    row.subtitle.clear();
+    row.unread_count = 0;
+    row.selected = false;
+    row.muted = false;
+    row.kind = ConversationKind::None;
+    row.protocol = ChatProtocolKind::None;
+    row.last_delivery = MessageDeliveryState::Unknown;
+}
+
+inline void resetMessageRow(MessageRow& row)
+{
+    row.ref = MessageRef{};
+    row.conversation = ConversationId{};
+    row.outgoing = false;
+    row.delivery = MessageDeliveryState::Unknown;
+    row.failure = MessageFailureKind::None;
+    row.sender_node_id = 0;
+    row.text.clear();
+    row.time_label.clear();
+    row.sender_label.clear();
+}
+
+inline void resetChatWorkspaceSnapshot(ChatWorkspaceSnapshot& out)
+{
+    out.header = ui::SnapshotHeader{};
+
+    for (size_t i = 0; i < 16; ++i)
+    {
+        resetConversationRow(out.conversations[i]);
+    }
+    out.conversation_count = 0;
+
+    for (size_t i = 0; i < 24; ++i)
+    {
+        resetMessageRow(out.messages[i]);
+    }
+    out.message_count = 0;
+
+    out.selected_conversation = ConversationId{};
+    out.can_send = false;
+    out.composer_enabled = false;
+    out.composer_placeholder.clear();
+    out.workspace_title.clear();
+}
+
+} // namespace ui::chat
diff --git a/modules/ui_presentation/include/ui_presentation/common/fixed_text.h b/modules/ui_presentation/include/ui_presentation/common/fixed_text.h
new file mode 100644
index 00000000..d5b8c274
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/common/fixed_text.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace ui
+{
+
+template <size_t N>
+struct FixedText
+{
+    char data[N]{};
+
+    const char* c_str() const
+    {
+        return data;
+    }
+
+    void clear()
+    {
+        data[0] = '\0';
+    }
+
+    bool empty() const
+    {
+        return data[0] == '\0';
+    }
+};
+
+template <size_t N>
+inline void copyText(FixedText<N>& out, const char* src)
+{
+    if (!src)
+    {
+        out.clear();
+        return;
+    }
+
+    size_t index = 0;
+    for (; index + 1 < N && src[index] != '\0'; ++index)
+    {
+        out.data[index] = src[index];
+    }
+    out.data[index] = '\0';
+}
+
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/common/presentation_profile.h b/modules/ui_presentation/include/ui_presentation/common/presentation_profile.h
new file mode 100644
index 00000000..062e2574
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/common/presentation_profile.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace ui
+{
+
+enum class PresentationProfileKind : uint8_t
+{
+    CompactHandheld,
+    Watch,
+    TerminalPanel,
+    DesktopWorkbench,
+    Headless,
+};
+
+struct PresentationProfile
+{
+    PresentationProfileKind kind = PresentationProfileKind::CompactHandheld;
+    uint16_t width = 0;
+    uint16_t height = 0;
+    bool color = true;
+    bool rich_text = false;
+    bool pointer_input = false;
+    bool keyboard_input = false;
+};
+
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/common/snapshot_header.h b/modules/ui_presentation/include/ui_presentation/common/snapshot_header.h
new file mode 100644
index 00000000..36c354ae
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/common/snapshot_header.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace ui
+{
+
+struct SnapshotHeader
+{
+    bool valid = false;
+    uint32_t version = 0;
+    uint32_t generated_at_ms = 0;
+};
+
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/common/ui_action.h b/modules/ui_presentation/include/ui_presentation/common/ui_action.h
new file mode 100644
index 00000000..b2b236f4
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/common/ui_action.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace ui
+{
+
+enum class UiActionKind : uint8_t
+{
+    None = 0,
+    Refresh,
+    Select,
+    Apply,
+    Send,
+    Back,
+};
+
+struct UiAction
+{
+    UiActionKind kind = UiActionKind::None;
+    uint32_t target = 0;
+    uint32_t value = 0;
+};
+
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/common/ui_action_result.h b/modules/ui_presentation/include/ui_presentation/common/ui_action_result.h
new file mode 100644
index 00000000..3a70817d
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/common/ui_action_result.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace ui
+{
+
+enum class UiActionFailure : uint8_t
+{
+    None = 0,
+    InvalidInput,
+    Rejected,
+    NotReady,
+    Unsupported,
+    Busy,
+    StorageError,
+};
+
+struct UiActionResult
+{
+    bool ok = false;
+    UiActionFailure failure = UiActionFailure::None;
+
+    static UiActionResult success()
+    {
+        UiActionResult result;
+        result.ok = true;
+        result.failure = UiActionFailure::None;
+        return result;
+    }
+
+    static UiActionResult fail(UiActionFailure failure)
+    {
+        UiActionResult result;
+        result.ok = false;
+        result.failure = failure;
+        return result;
+    }
+};
+
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/device/device_status_model.h b/modules/ui_presentation/include/ui_presentation/device/device_status_model.h
new file mode 100644
index 00000000..afd5b2db
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/device/device_status_model.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "ui_presentation/device/device_status_source.h"
+
+namespace ui::device
+{
+
+class DeviceStatusModel
+{
+  public:
+    explicit DeviceStatusModel(IDeviceStatusSource& source);
+
+    DeviceStatusSnapshot snapshot() const;
+
+  private:
+    IDeviceStatusSource& source_;
+};
+
+} // namespace ui::device
diff --git a/modules/ui_presentation/include/ui_presentation/device/device_status_snapshot.h b/modules/ui_presentation/include/ui_presentation/device/device_status_snapshot.h
new file mode 100644
index 00000000..dd57bc96
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/device/device_status_snapshot.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/snapshot_header.h"
+
+#include <stdint.h>
+
+namespace ui::device
+{
+
+enum class CapabilityDisplayState : uint8_t
+{
+    Unsupported,
+    Off,
+    Starting,
+    Ready,
+    Degraded,
+    Error,
+    Simulated,
+};
+
+struct DeviceStatusSnapshot
+{
+    ui::SnapshotHeader header;
+
+    CapabilityDisplayState lora = CapabilityDisplayState::Unsupported;
+    CapabilityDisplayState gps = CapabilityDisplayState::Unsupported;
+    CapabilityDisplayState ble = CapabilityDisplayState::Unsupported;
+    CapabilityDisplayState storage = CapabilityDisplayState::Unsupported;
+    CapabilityDisplayState battery = CapabilityDisplayState::Unsupported;
+
+    bool time_synced = false;
+    uint64_t epoch_seconds = 0;
+
+    ui::FixedText<32> active_protocol;
+    ui::FixedText<32> region;
+    ui::FixedText<32> modem_preset;
+
+    ui::FixedText<64> status_line;
+};
+
+} // namespace ui::device
diff --git a/modules/ui_presentation/include/ui_presentation/device/device_status_source.h b/modules/ui_presentation/include/ui_presentation/device/device_status_source.h
new file mode 100644
index 00000000..90263557
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/device/device_status_source.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/device/device_status_snapshot.h"
+
+namespace ui::device
+{
+
+class IDeviceStatusSource
+{
+  public:
+    virtual ~IDeviceStatusSource() = default;
+
+    virtual bool buildDeviceStatusSnapshot(DeviceStatusSnapshot& out) const = 0;
+};
+
+} // namespace ui::device
diff --git a/modules/ui_presentation/include/ui_presentation/gps/gps_status_model.h b/modules/ui_presentation/include/ui_presentation/gps/gps_status_model.h
new file mode 100644
index 00000000..cd6d98df
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/gps/gps_status_model.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "ui_presentation/gps/gps_status_source.h"
+
+namespace ui::gps
+{
+
+class GpsStatusModel
+{
+  public:
+    explicit GpsStatusModel(IGpsStatusSource& source);
+
+    GpsStatusSnapshot snapshot() const;
+
+  private:
+    IGpsStatusSource& source_;
+};
+
+} // namespace ui::gps
diff --git a/modules/ui_presentation/include/ui_presentation/gps/gps_status_snapshot.h b/modules/ui_presentation/include/ui_presentation/gps/gps_status_snapshot.h
new file mode 100644
index 00000000..8e82f3d0
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/gps/gps_status_snapshot.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/snapshot_header.h"
+
+#include <stdint.h>
+
+namespace ui::gps
+{
+
+struct GpsStatusSnapshot
+{
+    ui::SnapshotHeader header;
+
+    bool receiver_enabled = false;
+    bool receiver_powered = false;
+
+    bool fix_valid = false;
+    double latitude = 0.0;
+    double longitude = 0.0;
+    float altitude_m = 0.0f;
+    float speed_mps = 0.0f;
+    float course_deg = 0.0f;
+
+    uint8_t satellites = 0;
+    float hdop = 0.0f;
+
+    bool time_synced = false;
+    uint64_t epoch_seconds = 0;
+
+    ui::FixedText<32> fix_label;
+    ui::FixedText<32> coordinate_label;
+    ui::FixedText<32> satellite_label;
+    ui::FixedText<32> time_label;
+};
+
+} // namespace ui::gps
diff --git a/modules/ui_presentation/include/ui_presentation/gps/gps_status_source.h b/modules/ui_presentation/include/ui_presentation/gps/gps_status_source.h
new file mode 100644
index 00000000..e9830b02
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/gps/gps_status_source.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/gps/gps_status_snapshot.h"
+
+namespace ui::gps
+{
+
+class IGpsStatusSource
+{
+  public:
+    virtual ~IGpsStatusSource() = default;
+
+    virtual bool buildGpsStatusSnapshot(GpsStatusSnapshot& out) const = 0;
+};
+
+} // namespace ui::gps
diff --git a/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_action_sink.h b/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_action_sink.h
new file mode 100644
index 00000000..551cf643
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_action_sink.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "ui_presentation/common/ui_action_result.h"
+
+#include <stdint.h>
+
+namespace ui::key_verification
+{
+
+class IKeyVerificationActionSink
+{
+  public:
+    virtual ~IKeyVerificationActionSink() = default;
+
+    virtual ui::UiActionResult accept(uint32_t peer_id) = 0;
+    virtual ui::UiActionResult reject(uint32_t peer_id) = 0;
+    virtual ui::UiActionResult refresh(uint32_t peer_id) = 0;
+    virtual ui::UiActionResult copyCode(uint32_t peer_id) = 0;
+    virtual ui::UiActionResult submitNumber(uint32_t peer_id,
+                                            uint32_t number) = 0;
+};
+
+} // namespace ui::key_verification
diff --git a/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_model.h b/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_model.h
new file mode 100644
index 00000000..878484cd
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_model.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "ui_presentation/key_verification/key_verification_action_sink.h"
+#include "ui_presentation/key_verification/key_verification_source.h"
+
+namespace ui::key_verification
+{
+
+class KeyVerificationModel
+{
+  public:
+    KeyVerificationModel(IKeyVerificationPresentationSource& source,
+                         IKeyVerificationActionSink& sink);
+
+    void selectPeer(VerificationProtocol protocol, uint32_t peer_id);
+    void clearSelection();
+
+    KeyVerificationRequest request() const;
+    KeyVerificationSnapshot snapshot() const;
+
+    ui::UiActionResult accept();
+    ui::UiActionResult reject();
+    ui::UiActionResult refresh();
+    ui::UiActionResult copyCode();
+    ui::UiActionResult submitNumber(uint32_t number);
+
+  private:
+    ui::UiActionResult requireSelected() const;
+
+    IKeyVerificationPresentationSource& source_;
+    IKeyVerificationActionSink& sink_;
+
+    VerificationProtocol protocol_ = VerificationProtocol::Unknown;
+    uint32_t peer_id_ = 0;
+};
+
+} // namespace ui::key_verification
diff --git a/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_snapshot.h b/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_snapshot.h
new file mode 100644
index 00000000..39de0bdf
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_snapshot.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/snapshot_header.h"
+
+#include <stdint.h>
+
+namespace ui::key_verification
+{
+
+enum class VerificationProtocol : uint8_t
+{
+    Unknown,
+    Meshtastic,
+    MeshCore,
+};
+
+enum class VerificationState : uint8_t
+{
+    Idle,
+    Pending,
+    Verified,
+    Rejected,
+    Failed,
+};
+
+enum class VerificationFailureKind : uint8_t
+{
+    None,
+    MissingPeerKey,
+    MissingLocalIdentity,
+    CodeMismatch,
+    UnsupportedProtocol,
+    RuntimeUnavailable,
+    Unknown,
+};
+
+enum class VerificationPromptKind : uint8_t
+{
+    None,
+    EnterNumber,
+    ShowNumber,
+    CompareCode,
+};
+
+struct KeyVerificationSnapshot
+{
+    ui::SnapshotHeader header;
+
+    VerificationProtocol protocol = VerificationProtocol::Unknown;
+    VerificationState state = VerificationState::Idle;
+    VerificationFailureKind failure = VerificationFailureKind::None;
+    VerificationPromptKind prompt = VerificationPromptKind::None;
+
+    uint32_t peer_id = 0;
+
+    ui::FixedText<48> peer_label;
+    ui::FixedText<32> verification_code;
+    ui::FixedText<96> status_line;
+
+    bool can_accept = false;
+    bool can_reject = false;
+    bool can_refresh = false;
+    bool can_copy_code = false;
+    bool requires_number = false;
+};
+
+} // namespace ui::key_verification
diff --git a/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_source.h b/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_source.h
new file mode 100644
index 00000000..7a711abf
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/key_verification/key_verification_source.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "ui_presentation/key_verification/key_verification_snapshot.h"
+
+namespace ui::key_verification
+{
+
+struct KeyVerificationRequest
+{
+    VerificationProtocol protocol = VerificationProtocol::Unknown;
+    uint32_t peer_id = 0;
+
+    bool isValid() const
+    {
+        return peer_id != 0;
+    }
+};
+
+class IKeyVerificationPresentationSource
+{
+  public:
+    virtual ~IKeyVerificationPresentationSource() = default;
+
+    virtual bool buildKeyVerificationSnapshot(
+        const KeyVerificationRequest& request,
+        KeyVerificationSnapshot& out) const = 0;
+};
+
+} // namespace ui::key_verification
diff --git a/modules/ui_presentation/include/ui_presentation/layout/layout_profile.h b/modules/ui_presentation/include/ui_presentation/layout/layout_profile.h
new file mode 100644
index 00000000..b69dc246
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/layout/layout_profile.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <cstddef>
+
+namespace ui::presentation
+{
+
+struct LayoutProfile
+{
+    const char* layout_profile_id;
+    int screen_width;
+    int screen_height;
+    bool use_large_touch_targets;
+    bool use_compact_rows;
+    bool use_icon_only_nav;
+    bool use_bottom_nav;
+    bool use_side_nav;
+    bool use_watch_cards;
+    bool use_keyboard_shortcuts;
+    int max_visible_menu_items;
+    int primary_font_size;
+    int secondary_font_size;
+};
+
+const LayoutProfile* findLayoutProfile(const char* layout_profile_id);
+const LayoutProfile* allLayoutProfiles(std::size_t* count);
+
+} // namespace ui::presentation
diff --git a/modules/ui_presentation/include/ui_presentation/map/map_action_sink.h b/modules/ui_presentation/include/ui_presentation/map/map_action_sink.h
new file mode 100644
index 00000000..3a97a520
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/map/map_action_sink.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "ui_presentation/common/ui_action_result.h"
+#include "ui_presentation/map/map_workspace_snapshot.h"
+
+namespace ui::map
+{
+
+class IMapActionSink
+{
+  public:
+    virtual ~IMapActionSink() = default;
+
+    virtual ui::UiActionResult centerOnSelf() = 0;
+    virtual ui::UiActionResult setViewport(const MapViewport& viewport) = 0;
+    virtual ui::UiActionResult setLayer(MapLayerKind layer, bool enabled) = 0;
+    virtual ui::UiActionResult setActiveTool(MapToolKind tool) = 0;
+    virtual ui::UiActionResult clearMeasurement() = 0;
+};
+
+} // namespace ui::map
diff --git a/modules/ui_presentation/include/ui_presentation/map/map_overlay_snapshot.h b/modules/ui_presentation/include/ui_presentation/map/map_overlay_snapshot.h
new file mode 100644
index 00000000..2d72fb88
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/map/map_overlay_snapshot.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/snapshot_header.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ui
+{
+namespace map
+{
+
+enum class MapOverlayKind : uint8_t
+{
+    CurrentPosition,
+    TeamMember,
+    RoutePoint,
+    TrackPoint,
+    MeasurementPoint,
+    SelectedTarget,
+    Warning,
+};
+
+enum class MapOverlayStyle : uint8_t
+{
+    Default,
+    OwnPosition,
+    Team,
+    Route,
+    Track,
+    Warning,
+};
+
+struct MapGeoPoint
+{
+    double lat = 0.0;
+    double lon = 0.0;
+    bool valid = false;
+};
+
+struct MapOverlayItem
+{
+    MapOverlayKind kind = MapOverlayKind::CurrentPosition;
+    MapOverlayStyle style = MapOverlayStyle::Default;
+
+    MapGeoPoint point;
+
+    ui::FixedText<32> label;
+    ui::FixedText<64> detail;
+
+    uint32_t stable_id = 0;
+    uint8_t icon = 0;
+    bool selected = false;
+    bool visible = true;
+};
+
+struct MapOverlaySnapshot
+{
+    ui::SnapshotHeader header;
+
+    static constexpr std::size_t kMaxItems = 64;
+    MapOverlayItem items[kMaxItems]{};
+    std::size_t item_count = 0;
+
+    bool truncated = false;
+};
+
+} // namespace map
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/map/map_overlay_source.h b/modules/ui_presentation/include/ui_presentation/map/map_overlay_source.h
new file mode 100644
index 00000000..a0271c88
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/map/map_overlay_source.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "ui_presentation/map/map_overlay_snapshot.h"
+
+namespace ui
+{
+namespace map
+{
+
+class IMapOverlayPresentationSource
+{
+  public:
+    virtual ~IMapOverlayPresentationSource() = default;
+
+    virtual bool buildMapOverlaySnapshot(MapOverlaySnapshot& out) const = 0;
+};
+
+} // namespace map
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/map/map_presentation_source.h b/modules/ui_presentation/include/ui_presentation/map/map_presentation_source.h
new file mode 100644
index 00000000..bb0254f4
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/map/map_presentation_source.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "ui_presentation/map/map_workspace_snapshot.h"
+
+namespace ui::map
+{
+
+struct MapWorkspaceRequest
+{
+    MapViewport requested_viewport;
+    MapToolKind active_tool = MapToolKind::Pan;
+};
+
+class IMapPresentationSource
+{
+  public:
+    virtual ~IMapPresentationSource() = default;
+
+    virtual bool buildMapWorkspaceSnapshot(const MapWorkspaceRequest& request,
+                                           MapWorkspaceSnapshot& out) const = 0;
+};
+
+} // namespace ui::map
diff --git a/modules/ui_presentation/include/ui_presentation/map/map_workspace_model.h b/modules/ui_presentation/include/ui_presentation/map/map_workspace_model.h
new file mode 100644
index 00000000..ea628b27
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/map/map_workspace_model.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "ui_presentation/map/map_action_sink.h"
+#include "ui_presentation/map/map_presentation_source.h"
+
+namespace ui::map
+{
+
+class MapWorkspaceModel
+{
+  public:
+    MapWorkspaceModel(IMapPresentationSource& source, IMapActionSink& sink);
+
+    MapWorkspaceSnapshot snapshot() const;
+
+    ui::UiActionResult centerOnSelf();
+    ui::UiActionResult setViewport(const MapViewport& viewport);
+    ui::UiActionResult setLayer(MapLayerKind layer, bool enabled);
+    ui::UiActionResult setActiveTool(MapToolKind tool);
+    ui::UiActionResult clearMeasurement();
+
+    MapViewport viewport() const;
+    MapToolKind activeTool() const;
+
+  private:
+    IMapPresentationSource& source_;
+    IMapActionSink& sink_;
+
+    MapViewport viewport_{};
+    MapToolKind active_tool_ = MapToolKind::Pan;
+};
+
+} // namespace ui::map
diff --git a/modules/ui_presentation/include/ui_presentation/map/map_workspace_snapshot.h b/modules/ui_presentation/include/ui_presentation/map/map_workspace_snapshot.h
new file mode 100644
index 00000000..e7ae1382
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/map/map_workspace_snapshot.h
@@ -0,0 +1,88 @@
+#pragma once
+
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/snapshot_header.h"
+
+#include <stdint.h>
+
+namespace ui::map
+{
+
+enum class MapLayerKind : uint8_t
+{
+    Osm,
+    Terrain,
+    Satellite,
+    Contour,
+};
+
+enum class MapToolKind : uint8_t
+{
+    None,
+    Pan,
+    CenterOnSelf,
+    MeasureDistance,
+};
+
+struct MapViewport
+{
+    double center_lat = 0.0;
+    double center_lon = 0.0;
+    uint8_t zoom = 0;
+};
+
+struct SelfLocationOverlay
+{
+    bool valid = false;
+    double lat = 0.0;
+    double lon = 0.0;
+    float course_deg = 0.0f;
+    float accuracy_m = 0.0f;
+};
+
+struct MapLayerState
+{
+    bool osm = true;
+    bool terrain = false;
+    bool satellite = false;
+    bool contour = false;
+};
+
+struct TeamOverlaySummary
+{
+    bool available = false;
+    uint16_t visible_members = 0;
+    uint16_t stale_members = 0;
+};
+
+struct MeasurementState
+{
+    bool active = false;
+    double start_lat = 0.0;
+    double start_lon = 0.0;
+    double end_lat = 0.0;
+    double end_lon = 0.0;
+    float distance_m = 0.0f;
+};
+
+struct MapWorkspaceSnapshot
+{
+    ui::SnapshotHeader header;
+
+    MapViewport viewport;
+    SelfLocationOverlay self;
+    MapLayerState layers;
+    TeamOverlaySummary team;
+    MeasurementState measurement;
+
+    MapToolKind active_tool = MapToolKind::Pan;
+
+    bool can_center_on_self = false;
+    bool can_zoom_in = false;
+    bool can_zoom_out = false;
+    bool can_toggle_layers = false;
+
+    ui::FixedText<64> status_line;
+};
+
+} // namespace ui::map
diff --git a/modules/ui_presentation/include/ui_presentation/menu/menu_model.h b/modules/ui_presentation/include/ui_presentation/menu/menu_model.h
new file mode 100644
index 00000000..aabace0a
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/menu/menu_model.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+namespace ui
+{
+namespace menu
+{
+
+enum class MenuScreenId : uint8_t
+{
+    Dashboard,
+    Chat,
+    Contacts,
+    Map,
+    Gps,
+    Team,
+    Tracker,
+    Settings,
+    WalkieTalkie,
+    Sstv,
+    Extensions,
+};
+
+struct MenuItem
+{
+    constexpr MenuItem() = default;
+    constexpr MenuItem(MenuScreenId screen_id, const char* label, bool enabled)
+        : screen_id(screen_id), label(label), enabled(enabled)
+    {
+    }
+
+    MenuScreenId screen_id = MenuScreenId::Dashboard;
+    const char* label = nullptr;
+    bool enabled = false;
+};
+
+class MenuModel
+{
+  public:
+    static constexpr std::size_t kMaxItems = 16;
+
+    void clear();
+    bool add(const MenuItem& item);
+    std::size_t size() const;
+    const MenuItem* items() const;
+
+  private:
+    MenuItem items_[kMaxItems]{};
+    std::size_t size_ = 0;
+};
+
+} // namespace menu
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_model.h b/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_model.h
new file mode 100644
index 00000000..e69af537
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_model.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "ui_presentation/mesh/mesh_status_source.h"
+
+namespace ui::mesh
+{
+
+class MeshStatusModel
+{
+  public:
+    explicit MeshStatusModel(IMeshStatusSource& source);
+
+    MeshStatusSnapshot snapshot() const;
+
+  private:
+    IMeshStatusSource& source_;
+};
+
+} // namespace ui::mesh
diff --git a/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_snapshot.h b/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_snapshot.h
new file mode 100644
index 00000000..6dea9fb5
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_snapshot.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/snapshot_header.h"
+
+#include <stdint.h>
+
+namespace ui::mesh
+{
+
+enum class MeshDisplayState : uint8_t
+{
+    Off,
+    Starting,
+    Ready,
+    Degraded,
+    Error,
+};
+
+struct MeshStatusSnapshot
+{
+    ui::SnapshotHeader header;
+
+    MeshDisplayState state = MeshDisplayState::Off;
+
+    bool radio_ready = false;
+    bool tx_busy = false;
+    bool has_peer_key = false;
+    bool team_linked = false;
+
+    uint32_t known_nodes = 0;
+    uint32_t unread_messages = 0;
+
+    int16_t last_rssi = 0;
+    int8_t last_snr = 0;
+
+    ui::FixedText<32> protocol_label;
+    ui::FixedText<32> radio_label;
+    ui::FixedText<64> status_line;
+};
+
+} // namespace ui::mesh
diff --git a/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_source.h b/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_source.h
new file mode 100644
index 00000000..9cfd4723
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/mesh/mesh_status_source.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/mesh/mesh_status_snapshot.h"
+
+namespace ui::mesh
+{
+
+class IMeshStatusSource
+{
+  public:
+    virtual ~IMeshStatusSource() = default;
+
+    virtual bool buildMeshStatusSnapshot(MeshStatusSnapshot& out) const = 0;
+};
+
+} // namespace ui::mesh
diff --git a/modules/ui_presentation/include/ui_presentation/page/page_manifest.h b/modules/ui_presentation/include/ui_presentation/page/page_manifest.h
new file mode 100644
index 00000000..2bb4400a
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/page/page_manifest.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <cstddef>
+
+namespace ui::presentation
+{
+
+enum class PageId
+{
+    Dashboard,
+    Chat,
+    Map,
+    Gps,
+    Contacts,
+    Team,
+    Tracker,
+    Settings,
+    WalkieTalkie,
+    Sstv,
+    Extensions,
+    NodeStatus,
+    Diagnostics,
+};
+
+struct PageManifestItem
+{
+    PageId page_id;
+    const char* binding_id;
+    bool enabled;
+    bool visible_in_menu;
+};
+
+struct PageManifest
+{
+    const char* manifest_id;
+    const PageManifestItem* items;
+    std::size_t item_count;
+};
+
+const PageManifest* findPageManifest(const char* manifest_id);
+
+} // namespace ui::presentation
diff --git a/modules/ui_presentation/include/ui_presentation/screen/screen_binding_registry.h b/modules/ui_presentation/include/ui_presentation/screen/screen_binding_registry.h
new file mode 100644
index 00000000..0df066fb
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/screen/screen_binding_registry.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cstddef>
+
+namespace ui
+{
+namespace screen
+{
+
+struct ScreenBinding
+{
+    constexpr ScreenBinding() = default;
+    constexpr ScreenBinding(ui::menu::MenuScreenId screen_id,
+                            const char* binding_id,
+                            bool available)
+        : screen_id(screen_id), binding_id(binding_id), available(available)
+    {
+    }
+
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    const char* binding_id = nullptr;
+    bool available = false;
+};
+
+class ScreenBindingRegistry
+{
+  public:
+    static constexpr std::size_t kMaxBindings = 16;
+
+    void clear();
+    bool add(const ScreenBinding& binding);
+    const ScreenBinding* find(ui::menu::MenuScreenId screen_id) const;
+    std::size_t size() const;
+    const ScreenBinding* items() const;
+
+  private:
+    ScreenBinding items_[kMaxBindings]{};
+    std::size_t size_ = 0;
+};
+
+} // namespace screen
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/screen/screen_route.h b/modules/ui_presentation/include/ui_presentation/screen/screen_route.h
new file mode 100644
index 00000000..2e0c9cfc
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/screen/screen_route.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "ui_presentation/menu/menu_model.h"
+
+#include <cstdint>
+
+namespace ui
+{
+namespace screen
+{
+
+enum class ScreenOpenMode : uint8_t
+{
+    Replace,
+    Push,
+    Modal,
+};
+
+struct ScreenRoute
+{
+    ui::menu::MenuScreenId screen_id = ui::menu::MenuScreenId::Dashboard;
+    ScreenOpenMode open_mode = ScreenOpenMode::Replace;
+    bool valid = false;
+};
+
+inline ScreenRoute routeForMenuScreen(ui::menu::MenuScreenId id)
+{
+    ScreenRoute route;
+    route.screen_id = id;
+    route.open_mode = ScreenOpenMode::Replace;
+    route.valid = true;
+    return route;
+}
+
+} // namespace screen
+} // namespace ui
diff --git a/modules/ui_presentation/include/ui_presentation/settings/settings_action_sink.h b/modules/ui_presentation/include/ui_presentation/settings/settings_action_sink.h
new file mode 100644
index 00000000..a85bc771
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/settings/settings_action_sink.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "ui_presentation/common/ui_action_result.h"
+#include "ui_presentation/settings/settings_snapshot.h"
+
+namespace ui::settings
+{
+
+class ISettingsActionSink
+{
+  public:
+    virtual ~ISettingsActionSink() = default;
+
+    virtual ui::UiActionResult applySetting(const SettingsPatchView& patch) = 0;
+};
+
+} // namespace ui::settings
diff --git a/modules/ui_presentation/include/ui_presentation/settings/settings_model.h b/modules/ui_presentation/include/ui_presentation/settings/settings_model.h
new file mode 100644
index 00000000..a6925e9e
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/settings/settings_model.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "ui_presentation/settings/settings_action_sink.h"
+#include "ui_presentation/settings/settings_source.h"
+
+namespace ui::settings
+{
+
+class SettingsModel
+{
+  public:
+    SettingsModel(ISettingsSource& source, ISettingsActionSink& sink);
+
+    SettingsSnapshot snapshot() const;
+    ui::UiActionResult apply(const SettingsPatchView& patch);
+
+  private:
+    ISettingsSource& source_;
+    ISettingsActionSink& sink_;
+};
+
+} // namespace ui::settings
diff --git a/modules/ui_presentation/include/ui_presentation/settings/settings_snapshot.h b/modules/ui_presentation/include/ui_presentation/settings/settings_snapshot.h
new file mode 100644
index 00000000..3509822e
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/settings/settings_snapshot.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/snapshot_header.h"
+#include "ui_presentation/common/ui_action_result.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace ui::settings
+{
+
+enum class SettingControlKind : uint8_t
+{
+    Toggle,
+    Choice,
+    Number,
+    Text,
+    Action,
+};
+
+struct SettingsOption
+{
+    ui::FixedText<32> key;
+    ui::FixedText<48> label;
+    ui::FixedText<48> value_label;
+    SettingControlKind control = SettingControlKind::Action;
+    bool enabled = true;
+};
+
+struct SettingsSection
+{
+    ui::FixedText<32> title;
+    SettingsOption options[12]{};
+    size_t option_count = 0;
+};
+
+struct SettingsSnapshot
+{
+    ui::SnapshotHeader header;
+    SettingsSection sections[8]{};
+    size_t section_count = 0;
+};
+
+struct SettingsPatchView
+{
+    ui::FixedText<32> key;
+    ui::FixedText<64> value;
+};
+
+} // namespace ui::settings
diff --git a/modules/ui_presentation/include/ui_presentation/settings/settings_source.h b/modules/ui_presentation/include/ui_presentation/settings/settings_source.h
new file mode 100644
index 00000000..21ef0e68
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/settings/settings_source.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/settings/settings_snapshot.h"
+
+namespace ui::settings
+{
+
+class ISettingsSource
+{
+  public:
+    virtual ~ISettingsSource() = default;
+
+    virtual bool buildSettingsSnapshot(SettingsSnapshot& out) const = 0;
+};
+
+} // namespace ui::settings
diff --git a/modules/ui_presentation/include/ui_presentation/target_ui_profile.h b/modules/ui_presentation/include/ui_presentation/target_ui_profile.h
new file mode 100644
index 00000000..fc142a81
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/target_ui_profile.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <cstddef>
+
+namespace ui::presentation
+{
+
+enum class DisplayClass
+{
+    SmallPortrait,
+    SmallLandscape,
+    WideLandscape,
+    SquareWatch,
+    LargeTouch,
+    Desktop,
+    Headless,
+};
+
+enum class InputClass
+{
+    ButtonsOnly,
+    TouchOnly,
+    Keyboard,
+    KeyboardTrackball,
+    RotaryOrCrown,
+    DesktopMouseKeyboard,
+    Headless,
+};
+
+enum class LayoutClass
+{
+    PagerCompact,
+    DeckWide,
+    WatchCompact,
+    TouchLarge,
+    DesktopGtk,
+    CardputerCompact,
+    HeadlessNode,
+};
+
+struct TargetUiProfile
+{
+    const char* ui_profile_id;
+    const char* target_family_id;
+    int screen_width;
+    int screen_height;
+    DisplayClass display_class;
+    InputClass input_class;
+    LayoutClass layout_class;
+    bool has_status_bar;
+    bool has_bottom_nav;
+    bool has_side_nav;
+    bool has_soft_keyboard;
+    bool has_pointer;
+    bool has_touch;
+    bool has_physical_keyboard;
+    bool has_trackball;
+    const char* page_manifest_id;
+    const char* layout_profile_id;
+};
+
+const TargetUiProfile* findTargetUiProfile(const char* ui_profile_id);
+const TargetUiProfile* allTargetUiProfiles(std::size_t* count);
+
+} // namespace ui::presentation
diff --git a/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace.h b/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace.h
new file mode 100644
index 00000000..ee477a14
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "ui_presentation/chat/chat_workspace_model.h"
+#include "ui_presentation/device/device_status_model.h"
+#include "ui_presentation/gps/gps_status_model.h"
+#include "ui_presentation/map/map_workspace_model.h"
+#include "ui_presentation/mesh/mesh_status_model.h"
+#include "ui_presentation/settings/settings_model.h"
+
+namespace ui::workspace
+{
+
+// PresentationWorkspace is a typed graph of already-constructed presentation
+// models. Target composition owns model/source/sink lifetimes.
+struct PresentationWorkspace
+{
+    ui::device::DeviceStatusModel* device = nullptr;
+    ui::gps::GpsStatusModel* gps = nullptr;
+    ui::mesh::MeshStatusModel* mesh = nullptr;
+    ui::settings::SettingsModel* settings = nullptr;
+    ui::chat::ChatWorkspaceModel* chat = nullptr;
+    ui::chat::ChatWorkspaceModel* team_chat = nullptr;
+    ui::map::MapWorkspaceModel* map = nullptr;
+
+    bool hasDevice() const { return device != nullptr; }
+    bool hasGps() const { return gps != nullptr; }
+    bool hasMesh() const { return mesh != nullptr; }
+    bool hasSettings() const { return settings != nullptr; }
+    bool hasChat() const { return chat != nullptr; }
+    bool hasTeamChat() const { return team_chat != nullptr; }
+    bool hasMap() const { return map != nullptr; }
+};
+
+inline bool hasCoreStatusModels(const PresentationWorkspace& workspace)
+{
+    return workspace.device != nullptr &&
+           workspace.gps != nullptr &&
+           workspace.mesh != nullptr;
+}
+
+inline bool hasInteractiveWorkspaceModels(
+    const PresentationWorkspace& workspace)
+{
+    return workspace.settings != nullptr ||
+           workspace.chat != nullptr ||
+           workspace.team_chat != nullptr ||
+           workspace.map != nullptr;
+}
+
+} // namespace ui::workspace
diff --git a/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_probe.h b/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_probe.h
new file mode 100644
index 00000000..d589ab5d
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_probe.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/workspace/presentation_workspace.h"
+#include "ui_presentation/workspace/presentation_workspace_snapshot.h"
+
+namespace ui::workspace
+{
+
+class PresentationWorkspaceProbe
+{
+  public:
+    static PresentationWorkspaceSnapshot snapshot(
+        PresentationWorkspace& workspace);
+};
+
+} // namespace ui::workspace
diff --git a/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_snapshot.h b/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_snapshot.h
new file mode 100644
index 00000000..0516cbf2
--- /dev/null
+++ b/modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_snapshot.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "ui_presentation/common/snapshot_header.h"
+#include "ui_presentation/device/device_status_snapshot.h"
+#include "ui_presentation/gps/gps_status_snapshot.h"
+#include "ui_presentation/map/map_workspace_snapshot.h"
+#include "ui_presentation/mesh/mesh_status_snapshot.h"
+
+namespace ui::workspace
+{
+
+struct PresentationWorkspaceSnapshot
+{
+    ui::SnapshotHeader header;
+
+    bool has_device = false;
+    bool has_gps = false;
+    bool has_mesh = false;
+    bool has_settings = false;
+    bool has_chat = false;
+    bool has_team_chat = false;
+    bool has_map = false;
+
+    ui::device::DeviceStatusSnapshot device;
+    ui::gps::GpsStatusSnapshot gps;
+    ui::mesh::MeshStatusSnapshot mesh;
+    ui::map::MapWorkspaceSnapshot map;
+};
+
+} // namespace ui::workspace
diff --git a/modules/ui_presentation/library.json b/modules/ui_presentation/library.json
new file mode 100644
index 00000000..c4a8da30
--- /dev/null
+++ b/modules/ui_presentation/library.json
@@ -0,0 +1,8 @@
+{
+  "name": "ui_presentation",
+  "version": "0.1.0",
+  "build": {
+    "includeDir": "include",
+    "srcDir": "src"
+  }
+}
diff --git a/modules/ui_presentation/src/chat/chat_workspace_model.cpp b/modules/ui_presentation/src/chat/chat_workspace_model.cpp
new file mode 100644
index 00000000..c4772129
--- /dev/null
+++ b/modules/ui_presentation/src/chat/chat_workspace_model.cpp
@@ -0,0 +1,98 @@
+#include "ui_presentation/chat/chat_workspace_model.h"
+
+#include <cstring>
+
+namespace ui::chat
+{
+
+ChatWorkspaceModel::ChatWorkspaceModel(IChatPresentationSource& source,
+                                       IChatActionSink& sink)
+    : source_(source),
+      sink_(sink)
+{
+}
+
+bool ChatWorkspaceModel::buildSnapshot(ChatWorkspaceSnapshot& out) const
+{
+    ChatWorkspaceRequest request;
+    request.selected = selected_;
+    request.conversation_offset = conversation_offset_;
+    request.message_offset = message_offset_;
+
+    if (!source_.buildChatWorkspaceSnapshot(request, out))
+    {
+        resetChatWorkspaceSnapshot(out);
+        out.header.valid = false;
+        return false;
+    }
+    return out.header.valid;
+}
+
+ChatWorkspaceSnapshot ChatWorkspaceModel::snapshot() const
+{
+    ChatWorkspaceSnapshot out{};
+    (void)buildSnapshot(out);
+    return out;
+}
+
+ui::UiActionResult ChatWorkspaceModel::selectConversation(ConversationId id)
+{
+    if (!id.isValid())
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+
+    selected_ = id;
+    message_offset_ = 0;
+    return sink_.selectConversation(id);
+}
+
+ui::UiActionResult ChatWorkspaceModel::sendMessage(const char* text)
+{
+    if (!selected_.isValid() || text == nullptr || text[0] == '\0')
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+
+    SendMessageView message;
+    message.conversation = selected_;
+    message.text = text;
+    message.text_len = std::strlen(text);
+    return sink_.sendMessage(message);
+}
+
+ui::UiActionResult ChatWorkspaceModel::markRead(ConversationId id)
+{
+    if (!id.isValid())
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+    return sink_.markRead(id);
+}
+
+ConversationId ChatWorkspaceModel::selectedConversation() const
+{
+    return selected_;
+}
+
+void ChatWorkspaceModel::setConversationOffset(uint16_t offset)
+{
+    conversation_offset_ = offset;
+}
+
+void ChatWorkspaceModel::setMessageOffset(uint16_t offset)
+{
+    message_offset_ = offset;
+}
+
+uint16_t ChatWorkspaceModel::conversationOffset() const
+{
+    return conversation_offset_;
+}
+
+uint16_t ChatWorkspaceModel::messageOffset() const
+{
+    return message_offset_;
+}
+
+} // namespace ui::chat
diff --git a/modules/ui_presentation/src/device/device_status_model.cpp b/modules/ui_presentation/src/device/device_status_model.cpp
new file mode 100644
index 00000000..e75d2e51
--- /dev/null
+++ b/modules/ui_presentation/src/device/device_status_model.cpp
@@ -0,0 +1,21 @@
+#include "ui_presentation/device/device_status_model.h"
+
+namespace ui::device
+{
+
+DeviceStatusModel::DeviceStatusModel(IDeviceStatusSource& source)
+    : source_(source)
+{
+}
+
+DeviceStatusSnapshot DeviceStatusModel::snapshot() const
+{
+    DeviceStatusSnapshot out{};
+    if (!source_.buildDeviceStatusSnapshot(out))
+    {
+        out.header.valid = false;
+    }
+    return out;
+}
+
+} // namespace ui::device
diff --git a/modules/ui_presentation/src/gps/gps_status_model.cpp b/modules/ui_presentation/src/gps/gps_status_model.cpp
new file mode 100644
index 00000000..b63d3e52
--- /dev/null
+++ b/modules/ui_presentation/src/gps/gps_status_model.cpp
@@ -0,0 +1,21 @@
+#include "ui_presentation/gps/gps_status_model.h"
+
+namespace ui::gps
+{
+
+GpsStatusModel::GpsStatusModel(IGpsStatusSource& source)
+    : source_(source)
+{
+}
+
+GpsStatusSnapshot GpsStatusModel::snapshot() const
+{
+    GpsStatusSnapshot out{};
+    if (!source_.buildGpsStatusSnapshot(out))
+    {
+        out.header.valid = false;
+    }
+    return out;
+}
+
+} // namespace ui::gps
diff --git a/modules/ui_presentation/src/key_verification/key_verification_model.cpp b/modules/ui_presentation/src/key_verification/key_verification_model.cpp
new file mode 100644
index 00000000..245e202b
--- /dev/null
+++ b/modules/ui_presentation/src/key_verification/key_verification_model.cpp
@@ -0,0 +1,121 @@
+#include "ui_presentation/key_verification/key_verification_model.h"
+
+namespace ui::key_verification
+{
+
+KeyVerificationModel::KeyVerificationModel(
+    IKeyVerificationPresentationSource& source,
+    IKeyVerificationActionSink& sink)
+    : source_(source),
+      sink_(sink)
+{
+}
+
+void KeyVerificationModel::selectPeer(VerificationProtocol protocol,
+                                      uint32_t peer_id)
+{
+    protocol_ = protocol;
+    peer_id_ = peer_id;
+}
+
+void KeyVerificationModel::clearSelection()
+{
+    protocol_ = VerificationProtocol::Unknown;
+    peer_id_ = 0;
+}
+
+KeyVerificationRequest KeyVerificationModel::request() const
+{
+    KeyVerificationRequest out{};
+    out.protocol = protocol_;
+    out.peer_id = peer_id_;
+    return out;
+}
+
+KeyVerificationSnapshot KeyVerificationModel::snapshot() const
+{
+    KeyVerificationSnapshot out{};
+    if (peer_id_ == 0)
+    {
+        out.header.valid = true;
+        out.state = VerificationState::Idle;
+        out.prompt = VerificationPromptKind::None;
+        return out;
+    }
+
+    if (!source_.buildKeyVerificationSnapshot(request(), out))
+    {
+        out = {};
+        out.header.valid = false;
+        out.peer_id = peer_id_;
+        out.protocol = protocol_;
+        out.state = VerificationState::Failed;
+        out.failure = VerificationFailureKind::RuntimeUnavailable;
+    }
+    return out;
+}
+
+ui::UiActionResult KeyVerificationModel::accept()
+{
+    const auto selected = requireSelected();
+    if (!selected.ok)
+    {
+        return selected;
+    }
+    return sink_.accept(peer_id_);
+}
+
+ui::UiActionResult KeyVerificationModel::reject()
+{
+    const auto selected = requireSelected();
+    if (!selected.ok)
+    {
+        return selected;
+    }
+    return sink_.reject(peer_id_);
+}
+
+ui::UiActionResult KeyVerificationModel::refresh()
+{
+    const auto selected = requireSelected();
+    if (!selected.ok)
+    {
+        return selected;
+    }
+    return sink_.refresh(peer_id_);
+}
+
+ui::UiActionResult KeyVerificationModel::copyCode()
+{
+    const auto selected = requireSelected();
+    if (!selected.ok)
+    {
+        return selected;
+    }
+    return sink_.copyCode(peer_id_);
+}
+
+ui::UiActionResult KeyVerificationModel::submitNumber(uint32_t number)
+{
+    const auto selected = requireSelected();
+    if (!selected.ok)
+    {
+        return selected;
+    }
+    if (number > 999999U)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+    return sink_.submitNumber(peer_id_, number);
+}
+
+ui::UiActionResult KeyVerificationModel::requireSelected() const
+{
+    if (peer_id_ == 0)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+    return ui::UiActionResult::success();
+}
+
+} // namespace ui::key_verification
diff --git a/modules/ui_presentation/src/layout/layout_profile.cpp b/modules/ui_presentation/src/layout/layout_profile.cpp
new file mode 100644
index 00000000..5192c0b5
--- /dev/null
+++ b/modules/ui_presentation/src/layout/layout_profile.cpp
@@ -0,0 +1,49 @@
+#include "ui_presentation/layout/layout_profile.h"
+
+#include <cstring>
+
+namespace ui::presentation
+{
+namespace
+{
+
+constexpr LayoutProfile kLayoutProfiles[] = {
+    {"tab5_large_touch", 0, 0, true, false, false, true, false, false, false, 8, 18, 14},
+    {"tdisplayp4_touch", 0, 0, true, false, false, true, false, false, false, 7, 18, 14},
+    {"pager_compact", 480, 222, false, true, true, false, false, false, true, 6, 14, 11},
+    {"deck_wide", 320, 240, false, true, false, false, false, false, true, 8, 14, 11},
+    {"watch_compact", 240, 240, false, true, true, false, false, true, false, 5, 13, 10},
+    {"uconsole_desktop", 0, 0, false, false, false, false, true, false, true, 8, 15, 12},
+    {"cardputer_compact", 320, 170, false, true, false, false, false, false, true, 6, 13, 10},
+    {"headless_node", 0, 0, false, false, false, false, false, false, false, 0, 0, 0},
+};
+
+} // namespace
+
+const LayoutProfile* findLayoutProfile(const char* layout_profile_id)
+{
+    if (layout_profile_id == nullptr)
+    {
+        return nullptr;
+    }
+
+    for (const auto& profile : kLayoutProfiles)
+    {
+        if (std::strcmp(profile.layout_profile_id, layout_profile_id) == 0)
+        {
+            return &profile;
+        }
+    }
+    return nullptr;
+}
+
+const LayoutProfile* allLayoutProfiles(std::size_t* count)
+{
+    if (count != nullptr)
+    {
+        *count = sizeof(kLayoutProfiles) / sizeof(kLayoutProfiles[0]);
+    }
+    return kLayoutProfiles;
+}
+
+} // namespace ui::presentation
diff --git a/modules/ui_presentation/src/map/map_workspace_model.cpp b/modules/ui_presentation/src/map/map_workspace_model.cpp
new file mode 100644
index 00000000..d7b4222b
--- /dev/null
+++ b/modules/ui_presentation/src/map/map_workspace_model.cpp
@@ -0,0 +1,74 @@
+#include "ui_presentation/map/map_workspace_model.h"
+
+namespace ui::map
+{
+
+MapWorkspaceModel::MapWorkspaceModel(IMapPresentationSource& source,
+                                     IMapActionSink& sink)
+    : source_(source),
+      sink_(sink)
+{
+}
+
+MapWorkspaceSnapshot MapWorkspaceModel::snapshot() const
+{
+    MapWorkspaceRequest request;
+    request.requested_viewport = viewport_;
+    request.active_tool = active_tool_;
+
+    MapWorkspaceSnapshot out{};
+    if (!source_.buildMapWorkspaceSnapshot(request, out))
+    {
+        out.header.valid = false;
+    }
+    return out;
+}
+
+ui::UiActionResult MapWorkspaceModel::centerOnSelf()
+{
+    const auto result = sink_.centerOnSelf();
+    if (result.ok)
+    {
+        const auto snap = snapshot();
+        if (snap.self.valid)
+        {
+            viewport_.center_lat = snap.self.lat;
+            viewport_.center_lon = snap.self.lon;
+        }
+    }
+    return result;
+}
+
+ui::UiActionResult MapWorkspaceModel::setViewport(const MapViewport& viewport)
+{
+    viewport_ = viewport;
+    return sink_.setViewport(viewport);
+}
+
+ui::UiActionResult MapWorkspaceModel::setLayer(MapLayerKind layer, bool enabled)
+{
+    return sink_.setLayer(layer, enabled);
+}
+
+ui::UiActionResult MapWorkspaceModel::setActiveTool(MapToolKind tool)
+{
+    active_tool_ = tool;
+    return sink_.setActiveTool(tool);
+}
+
+ui::UiActionResult MapWorkspaceModel::clearMeasurement()
+{
+    return sink_.clearMeasurement();
+}
+
+MapViewport MapWorkspaceModel::viewport() const
+{
+    return viewport_;
+}
+
+MapToolKind MapWorkspaceModel::activeTool() const
+{
+    return active_tool_;
+}
+
+} // namespace ui::map
diff --git a/modules/ui_presentation/src/menu/menu_model.cpp b/modules/ui_presentation/src/menu/menu_model.cpp
new file mode 100644
index 00000000..8c571937
--- /dev/null
+++ b/modules/ui_presentation/src/menu/menu_model.cpp
@@ -0,0 +1,36 @@
+#include "ui_presentation/menu/menu_model.h"
+
+namespace ui
+{
+namespace menu
+{
+
+void MenuModel::clear()
+{
+    size_ = 0;
+}
+
+bool MenuModel::add(const MenuItem& item)
+{
+    if (size_ >= kMaxItems)
+    {
+        return false;
+    }
+
+    items_[size_] = item;
+    ++size_;
+    return true;
+}
+
+std::size_t MenuModel::size() const
+{
+    return size_;
+}
+
+const MenuItem* MenuModel::items() const
+{
+    return items_;
+}
+
+} // namespace menu
+} // namespace ui
diff --git a/modules/ui_presentation/src/mesh/mesh_status_model.cpp b/modules/ui_presentation/src/mesh/mesh_status_model.cpp
new file mode 100644
index 00000000..7d38a80c
--- /dev/null
+++ b/modules/ui_presentation/src/mesh/mesh_status_model.cpp
@@ -0,0 +1,21 @@
+#include "ui_presentation/mesh/mesh_status_model.h"
+
+namespace ui::mesh
+{
+
+MeshStatusModel::MeshStatusModel(IMeshStatusSource& source)
+    : source_(source)
+{
+}
+
+MeshStatusSnapshot MeshStatusModel::snapshot() const
+{
+    MeshStatusSnapshot out{};
+    if (!source_.buildMeshStatusSnapshot(out))
+    {
+        out.header.valid = false;
+    }
+    return out;
+}
+
+} // namespace ui::mesh
diff --git a/modules/ui_presentation/src/page/page_manifest.cpp b/modules/ui_presentation/src/page/page_manifest.cpp
new file mode 100644
index 00000000..10b8e589
--- /dev/null
+++ b/modules/ui_presentation/src/page/page_manifest.cpp
@@ -0,0 +1,115 @@
+#include "ui_presentation/page/page_manifest.h"
+
+#include <cstring>
+
+namespace ui::presentation
+{
+namespace
+{
+
+constexpr PageManifestItem kTab5TouchItems[] = {
+    {PageId::Dashboard, "dashboard", true, true},
+    {PageId::Map, "map", true, true},
+    {PageId::Gps, "gps", true, true},
+    {PageId::Chat, "chat", true, true},
+    {PageId::Team, "team", true, true},
+    {PageId::Tracker, "tracker", true, true},
+    {PageId::Contacts, "contacts", true, true},
+    {PageId::Settings, "settings", true, true},
+};
+
+constexpr PageManifestItem kTDisplayP4TouchItems[] = {
+    {PageId::Dashboard, "dashboard", true, true},
+    {PageId::Map, "map", true, true},
+    {PageId::Gps, "gps", true, true},
+    {PageId::Chat, "chat", true, true},
+    {PageId::Team, "team", true, true},
+    {PageId::Tracker, "tracker", true, true},
+    {PageId::Settings, "settings", true, true},
+};
+
+constexpr PageManifestItem kPagerCompactItems[] = {
+    {PageId::Dashboard, "dashboard", true, true},
+    {PageId::Chat, "chat", true, true},
+    {PageId::Gps, "gps", true, true},
+    {PageId::Map, "map", true, true},
+    {PageId::Team, "team", true, true},
+    {PageId::Settings, "settings", true, true},
+};
+
+constexpr PageManifestItem kDeckFullItems[] = {
+    {PageId::Dashboard, "dashboard", true, true},
+    {PageId::Chat, "chat", true, true},
+    {PageId::Team, "team", true, true},
+    {PageId::Map, "map", true, true},
+    {PageId::Gps, "gps", true, true},
+    {PageId::Tracker, "tracker", true, true},
+    {PageId::Contacts, "contacts", true, true},
+    {PageId::Extensions, "extensions", true, true},
+    {PageId::Settings, "settings", true, true},
+};
+
+constexpr PageManifestItem kWatchCompactItems[] = {
+    {PageId::Dashboard, "dashboard", true, true},
+    {PageId::Chat, "chat", true, true},
+    {PageId::Gps, "gps", true, true},
+    {PageId::Team, "team", true, true},
+    {PageId::Settings, "settings", true, true},
+};
+
+constexpr PageManifestItem kUConsoleDesktopItems[] = {
+    {PageId::Dashboard, "dashboard", true, true},
+    {PageId::Chat, "chat", true, true},
+    {PageId::Map, "map", true, true},
+    {PageId::Team, "team", true, true},
+    {PageId::Gps, "gps", true, true},
+    {PageId::Tracker, "tracker", true, true},
+    {PageId::Settings, "settings", true, true},
+    {PageId::Diagnostics, "diagnostics", true, true},
+};
+
+constexpr PageManifestItem kCardputerCompactItems[] = {
+    {PageId::Dashboard, "dashboard", true, true},
+    {PageId::Chat, "chat", true, true},
+    {PageId::Map, "map", true, true},
+    {PageId::Gps, "gps", true, true},
+    {PageId::Team, "team", true, true},
+    {PageId::Settings, "settings", true, true},
+};
+
+constexpr PageManifestItem kNodeHeadlessItems[] = {
+    {PageId::NodeStatus, "node_status", true, false},
+    {PageId::Diagnostics, "diagnostics", true, false},
+};
+
+constexpr PageManifest kManifests[] = {
+    {"tab5_touch_manifest", kTab5TouchItems, sizeof(kTab5TouchItems) / sizeof(kTab5TouchItems[0])},
+    {"tdisplayp4_touch_manifest", kTDisplayP4TouchItems, sizeof(kTDisplayP4TouchItems) / sizeof(kTDisplayP4TouchItems[0])},
+    {"pager_compact_manifest", kPagerCompactItems, sizeof(kPagerCompactItems) / sizeof(kPagerCompactItems[0])},
+    {"deck_full_manifest", kDeckFullItems, sizeof(kDeckFullItems) / sizeof(kDeckFullItems[0])},
+    {"watch_compact_manifest", kWatchCompactItems, sizeof(kWatchCompactItems) / sizeof(kWatchCompactItems[0])},
+    {"uconsole_desktop_manifest", kUConsoleDesktopItems, sizeof(kUConsoleDesktopItems) / sizeof(kUConsoleDesktopItems[0])},
+    {"cardputer_compact_manifest", kCardputerCompactItems, sizeof(kCardputerCompactItems) / sizeof(kCardputerCompactItems[0])},
+    {"node_headless_manifest", kNodeHeadlessItems, sizeof(kNodeHeadlessItems) / sizeof(kNodeHeadlessItems[0])},
+};
+
+} // namespace
+
+const PageManifest* findPageManifest(const char* manifest_id)
+{
+    if (manifest_id == nullptr)
+    {
+        return nullptr;
+    }
+
+    for (const auto& manifest : kManifests)
+    {
+        if (std::strcmp(manifest.manifest_id, manifest_id) == 0)
+        {
+            return &manifest;
+        }
+    }
+    return nullptr;
+}
+
+} // namespace ui::presentation
diff --git a/modules/ui_presentation/src/screen/screen_binding_registry.cpp b/modules/ui_presentation/src/screen/screen_binding_registry.cpp
new file mode 100644
index 00000000..1fd6901c
--- /dev/null
+++ b/modules/ui_presentation/src/screen/screen_binding_registry.cpp
@@ -0,0 +1,50 @@
+#include "ui_presentation/screen/screen_binding_registry.h"
+
+namespace ui
+{
+namespace screen
+{
+
+void ScreenBindingRegistry::clear()
+{
+    size_ = 0;
+}
+
+bool ScreenBindingRegistry::add(const ScreenBinding& binding)
+{
+    if (size_ >= kMaxBindings)
+    {
+        return false;
+    }
+
+    items_[size_] = binding;
+    ++size_;
+    return true;
+}
+
+const ScreenBinding* ScreenBindingRegistry::find(
+    ui::menu::MenuScreenId screen_id) const
+{
+    for (std::size_t index = 0; index < size_; ++index)
+    {
+        if (items_[index].screen_id == screen_id)
+        {
+            return &items_[index];
+        }
+    }
+
+    return nullptr;
+}
+
+std::size_t ScreenBindingRegistry::size() const
+{
+    return size_;
+}
+
+const ScreenBinding* ScreenBindingRegistry::items() const
+{
+    return items_;
+}
+
+} // namespace screen
+} // namespace ui
diff --git a/modules/ui_presentation/src/settings/settings_model.cpp b/modules/ui_presentation/src/settings/settings_model.cpp
new file mode 100644
index 00000000..56e5226c
--- /dev/null
+++ b/modules/ui_presentation/src/settings/settings_model.cpp
@@ -0,0 +1,27 @@
+#include "ui_presentation/settings/settings_model.h"
+
+namespace ui::settings
+{
+
+SettingsModel::SettingsModel(ISettingsSource& source, ISettingsActionSink& sink)
+    : source_(source),
+      sink_(sink)
+{
+}
+
+SettingsSnapshot SettingsModel::snapshot() const
+{
+    SettingsSnapshot out{};
+    if (!source_.buildSettingsSnapshot(out))
+    {
+        out.header.valid = false;
+    }
+    return out;
+}
+
+ui::UiActionResult SettingsModel::apply(const SettingsPatchView& patch)
+{
+    return sink_.applySetting(patch);
+}
+
+} // namespace ui::settings
diff --git a/modules/ui_presentation/src/target_ui_profile.cpp b/modules/ui_presentation/src/target_ui_profile.cpp
new file mode 100644
index 00000000..f872eb11
--- /dev/null
+++ b/modules/ui_presentation/src/target_ui_profile.cpp
@@ -0,0 +1,177 @@
+#include "ui_presentation/target_ui_profile.h"
+
+#include <cstring>
+
+namespace ui::presentation
+{
+namespace
+{
+
+constexpr TargetUiProfile kTargetUiProfiles[] = {
+    {"tab5_touch_ui",
+     "tab5",
+     0,
+     0,
+     DisplayClass::LargeTouch,
+     InputClass::TouchOnly,
+     LayoutClass::TouchLarge,
+     true,
+     true,
+     false,
+     true,
+     false,
+     true,
+     false,
+     false,
+     "tab5_touch_manifest",
+     "tab5_large_touch"},
+    {"tdisplayp4_touch_ui",
+     "tdisplayp4",
+     0,
+     0,
+     DisplayClass::LargeTouch,
+     InputClass::TouchOnly,
+     LayoutClass::TouchLarge,
+     true,
+     true,
+     false,
+     true,
+     false,
+     true,
+     false,
+     false,
+     "tdisplayp4_touch_manifest",
+     "tdisplayp4_touch"},
+    {"pager_compact_ui",
+     "tlora_pager",
+     480,
+     222,
+     DisplayClass::SmallLandscape,
+     InputClass::Keyboard,
+     LayoutClass::PagerCompact,
+     true,
+     false,
+     false,
+     false,
+     false,
+     false,
+     true,
+     false,
+     "pager_compact_manifest",
+     "pager_compact"},
+    {"deck_wide_ui",
+     "tdeck",
+     320,
+     240,
+     DisplayClass::WideLandscape,
+     InputClass::KeyboardTrackball,
+     LayoutClass::DeckWide,
+     true,
+     false,
+     false,
+     false,
+     false,
+     true,
+     true,
+     true,
+     "deck_full_manifest",
+     "deck_wide"},
+    {"watch_compact_ui",
+     "twatch",
+     240,
+     240,
+     DisplayClass::SquareWatch,
+     InputClass::TouchOnly,
+     LayoutClass::WatchCompact,
+     true,
+     false,
+     false,
+     false,
+     false,
+     true,
+     false,
+     false,
+     "watch_compact_manifest",
+     "watch_compact"},
+    {"uconsole_desktop_ui",
+     "uconsole",
+     0,
+     0,
+     DisplayClass::Desktop,
+     InputClass::DesktopMouseKeyboard,
+     LayoutClass::DesktopGtk,
+     true,
+     false,
+     true,
+     false,
+     true,
+     false,
+     true,
+     false,
+     "uconsole_desktop_manifest",
+     "uconsole_desktop"},
+    {"cardputer_compact_ui",
+     "cardputerzero",
+     320,
+     170,
+     DisplayClass::WideLandscape,
+     InputClass::Keyboard,
+     LayoutClass::CardputerCompact,
+     true,
+     false,
+     false,
+     false,
+     false,
+     false,
+     true,
+     false,
+     "cardputer_compact_manifest",
+     "cardputer_compact"},
+    {"node_headless_ui",
+     "gat562_mesh_evb_pro",
+     0,
+     0,
+     DisplayClass::Headless,
+     InputClass::Headless,
+     LayoutClass::HeadlessNode,
+     false,
+     false,
+     false,
+     false,
+     false,
+     false,
+     false,
+     false,
+     "node_headless_manifest",
+     "headless_node"},
+};
+
+} // namespace
+
+const TargetUiProfile* findTargetUiProfile(const char* ui_profile_id)
+{
+    if (ui_profile_id == nullptr)
+    {
+        return nullptr;
+    }
+
+    for (const auto& profile : kTargetUiProfiles)
+    {
+        if (std::strcmp(profile.ui_profile_id, ui_profile_id) == 0)
+        {
+            return &profile;
+        }
+    }
+    return nullptr;
+}
+
+const TargetUiProfile* allTargetUiProfiles(std::size_t* count)
+{
+    if (count != nullptr)
+    {
+        *count = sizeof(kTargetUiProfiles) / sizeof(kTargetUiProfiles[0]);
+    }
+    return kTargetUiProfiles;
+}
+
+} // namespace ui::presentation
diff --git a/modules/ui_presentation/src/workspace/presentation_workspace_probe.cpp b/modules/ui_presentation/src/workspace/presentation_workspace_probe.cpp
new file mode 100644
index 00000000..f0c983cd
--- /dev/null
+++ b/modules/ui_presentation/src/workspace/presentation_workspace_probe.cpp
@@ -0,0 +1,55 @@
+#include "ui_presentation/workspace/presentation_workspace_probe.h"
+
+namespace ui::workspace
+{
+
+PresentationWorkspaceSnapshot PresentationWorkspaceProbe::snapshot(
+    PresentationWorkspace& workspace)
+{
+    PresentationWorkspaceSnapshot out{};
+    out.header.valid = true;
+    out.header.version = 1;
+
+    if (workspace.device != nullptr)
+    {
+        out.has_device = true;
+        out.device = workspace.device->snapshot();
+    }
+
+    if (workspace.gps != nullptr)
+    {
+        out.has_gps = true;
+        out.gps = workspace.gps->snapshot();
+    }
+
+    if (workspace.mesh != nullptr)
+    {
+        out.has_mesh = true;
+        out.mesh = workspace.mesh->snapshot();
+    }
+
+    if (workspace.settings != nullptr)
+    {
+        out.has_settings = true;
+    }
+
+    if (workspace.chat != nullptr)
+    {
+        out.has_chat = true;
+    }
+
+    if (workspace.team_chat != nullptr)
+    {
+        out.has_team_chat = true;
+    }
+
+    if (workspace.map != nullptr)
+    {
+        out.has_map = true;
+        out.map = workspace.map->snapshot();
+    }
+
+    return out;
+}
+
+} // namespace ui::workspace
diff --git a/modules/ui_presentation/tests/fake/fake_chat_action_sink.h b/modules/ui_presentation/tests/fake/fake_chat_action_sink.h
new file mode 100644
index 00000000..79c8df2a
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_chat_action_sink.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "ui_presentation/chat/chat_action_sink.h"
+
+namespace ui::tests
+{
+
+class FakeChatActionSink final : public ui::chat::IChatActionSink
+{
+  public:
+    ui::UiActionResult selectConversation(ui::chat::ConversationId id) override
+    {
+        ++select_count;
+        last_selected = id;
+        return select_result;
+    }
+
+    ui::UiActionResult sendMessage(const ui::chat::SendMessageView& message) override
+    {
+        ++send_count;
+        last_message = message;
+        return send_result;
+    }
+
+    ui::UiActionResult markRead(ui::chat::ConversationId id) override
+    {
+        ++mark_read_count;
+        last_mark_read = id;
+        return mark_read_result;
+    }
+
+    int select_count = 0;
+    int send_count = 0;
+    int mark_read_count = 0;
+
+    ui::chat::ConversationId last_selected{};
+    ui::chat::SendMessageView last_message{};
+    ui::chat::ConversationId last_mark_read{};
+
+    ui::UiActionResult select_result = ui::UiActionResult::success();
+    ui::UiActionResult send_result = ui::UiActionResult::success();
+    ui::UiActionResult mark_read_result = ui::UiActionResult::success();
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/fake/fake_chat_presentation_source.h b/modules/ui_presentation/tests/fake/fake_chat_presentation_source.h
new file mode 100644
index 00000000..fd96acaa
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_chat_presentation_source.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "ui_presentation/chat/chat_presentation_source.h"
+
+namespace ui::tests
+{
+
+class FakeChatPresentationSource final : public ui::chat::IChatPresentationSource
+{
+  public:
+    bool buildChatWorkspaceSnapshot(
+        const ui::chat::ChatWorkspaceRequest& request,
+        ui::chat::ChatWorkspaceSnapshot& out) const override
+    {
+        ++build_count;
+        last_request = request;
+
+        if (!available)
+        {
+            return false;
+        }
+
+        out = snapshot_value;
+        out.selected_conversation = request.selected;
+        return true;
+    }
+
+    bool available = true;
+    ui::chat::ChatWorkspaceSnapshot snapshot_value{};
+
+    mutable int build_count = 0;
+    mutable ui::chat::ChatWorkspaceRequest last_request{};
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/fake/fake_device_status_source.h b/modules/ui_presentation/tests/fake/fake_device_status_source.h
new file mode 100644
index 00000000..ab32c15b
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_device_status_source.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "ui_presentation/device/device_status_source.h"
+
+namespace ui::tests
+{
+
+class FakeDeviceStatusSource final : public ui::device::IDeviceStatusSource
+{
+  public:
+    bool buildDeviceStatusSnapshot(ui::device::DeviceStatusSnapshot& out) const override
+    {
+        if (!available)
+        {
+            return false;
+        }
+        out = snapshot_value;
+        return true;
+    }
+
+    bool available = true;
+    ui::device::DeviceStatusSnapshot snapshot_value{};
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/fake/fake_gps_status_source.h b/modules/ui_presentation/tests/fake/fake_gps_status_source.h
new file mode 100644
index 00000000..40cdde10
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_gps_status_source.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "ui_presentation/gps/gps_status_source.h"
+
+namespace ui::tests
+{
+
+class FakeGpsStatusSource final : public ui::gps::IGpsStatusSource
+{
+  public:
+    bool buildGpsStatusSnapshot(ui::gps::GpsStatusSnapshot& out) const override
+    {
+        if (!available)
+        {
+            return false;
+        }
+        out = snapshot_value;
+        return true;
+    }
+
+    bool available = true;
+    ui::gps::GpsStatusSnapshot snapshot_value{};
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/fake/fake_map_action_sink.h b/modules/ui_presentation/tests/fake/fake_map_action_sink.h
new file mode 100644
index 00000000..947ba20c
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_map_action_sink.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include "ui_presentation/map/map_action_sink.h"
+
+namespace ui::tests
+{
+
+class FakeMapActionSink final : public ui::map::IMapActionSink
+{
+  public:
+    ui::UiActionResult centerOnSelf() override
+    {
+        ++center_on_self_count;
+        return center_on_self_result;
+    }
+
+    ui::UiActionResult setViewport(
+        const ui::map::MapViewport& viewport) override
+    {
+        ++set_viewport_count;
+        last_viewport = viewport;
+        return set_viewport_result;
+    }
+
+    ui::UiActionResult setLayer(ui::map::MapLayerKind layer,
+                                bool enabled) override
+    {
+        ++set_layer_count;
+        last_layer = layer;
+        last_layer_enabled = enabled;
+        return set_layer_result;
+    }
+
+    ui::UiActionResult setActiveTool(ui::map::MapToolKind tool) override
+    {
+        ++set_active_tool_count;
+        last_tool = tool;
+        return set_active_tool_result;
+    }
+
+    ui::UiActionResult clearMeasurement() override
+    {
+        ++clear_measurement_count;
+        return clear_measurement_result;
+    }
+
+    int center_on_self_count = 0;
+    int set_viewport_count = 0;
+    int set_layer_count = 0;
+    int set_active_tool_count = 0;
+    int clear_measurement_count = 0;
+
+    ui::map::MapViewport last_viewport{};
+    ui::map::MapLayerKind last_layer = ui::map::MapLayerKind::Osm;
+    bool last_layer_enabled = false;
+    ui::map::MapToolKind last_tool = ui::map::MapToolKind::Pan;
+
+    ui::UiActionResult center_on_self_result = ui::UiActionResult::success();
+    ui::UiActionResult set_viewport_result = ui::UiActionResult::success();
+    ui::UiActionResult set_layer_result = ui::UiActionResult::success();
+    ui::UiActionResult set_active_tool_result = ui::UiActionResult::success();
+    ui::UiActionResult clear_measurement_result = ui::UiActionResult::success();
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/fake/fake_map_presentation_source.h b/modules/ui_presentation/tests/fake/fake_map_presentation_source.h
new file mode 100644
index 00000000..b61d4f92
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_map_presentation_source.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "ui_presentation/map/map_presentation_source.h"
+
+namespace ui::tests
+{
+
+class FakeMapPresentationSource final : public ui::map::IMapPresentationSource
+{
+  public:
+    bool buildMapWorkspaceSnapshot(
+        const ui::map::MapWorkspaceRequest& request,
+        ui::map::MapWorkspaceSnapshot& out) const override
+    {
+        ++build_count;
+        last_request = request;
+
+        if (!available)
+        {
+            return false;
+        }
+
+        out = snapshot_value;
+        out.viewport = request.requested_viewport;
+        out.active_tool = request.active_tool;
+        return true;
+    }
+
+    bool available = true;
+    ui::map::MapWorkspaceSnapshot snapshot_value{};
+
+    mutable int build_count = 0;
+    mutable ui::map::MapWorkspaceRequest last_request{};
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/fake/fake_mesh_status_source.h b/modules/ui_presentation/tests/fake/fake_mesh_status_source.h
new file mode 100644
index 00000000..a97d48cd
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_mesh_status_source.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "ui_presentation/mesh/mesh_status_source.h"
+
+namespace ui::tests
+{
+
+class FakeMeshStatusSource final : public ui::mesh::IMeshStatusSource
+{
+  public:
+    bool buildMeshStatusSnapshot(ui::mesh::MeshStatusSnapshot& out) const override
+    {
+        if (!available)
+        {
+            return false;
+        }
+        out = snapshot_value;
+        return true;
+    }
+
+    bool available = true;
+    ui::mesh::MeshStatusSnapshot snapshot_value{};
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/fake/fake_settings_action_sink.h b/modules/ui_presentation/tests/fake/fake_settings_action_sink.h
new file mode 100644
index 00000000..95a671d1
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_settings_action_sink.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "ui_presentation/settings/settings_action_sink.h"
+
+namespace ui::tests
+{
+
+class FakeSettingsActionSink final : public ui::settings::ISettingsActionSink
+{
+  public:
+    ui::UiActionResult applySetting(const ui::settings::SettingsPatchView& patch) override
+    {
+        ++apply_count;
+        last_patch = patch;
+        return result;
+    }
+
+    int apply_count = 0;
+    ui::settings::SettingsPatchView last_patch{};
+    ui::UiActionResult result = ui::UiActionResult::success();
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/fake/fake_settings_source.h b/modules/ui_presentation/tests/fake/fake_settings_source.h
new file mode 100644
index 00000000..1dc1ae7a
--- /dev/null
+++ b/modules/ui_presentation/tests/fake/fake_settings_source.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "ui_presentation/settings/settings_source.h"
+
+namespace ui::tests
+{
+
+class FakeSettingsSource final : public ui::settings::ISettingsSource
+{
+  public:
+    bool buildSettingsSnapshot(ui::settings::SettingsSnapshot& out) const override
+    {
+        if (!available)
+        {
+            return false;
+        }
+        out = snapshot_value;
+        return true;
+    }
+
+    bool available = true;
+    ui::settings::SettingsSnapshot snapshot_value{};
+};
+
+} // namespace ui::tests
diff --git a/modules/ui_presentation/tests/test_chat_presentation_identity.cpp b/modules/ui_presentation/tests/test_chat_presentation_identity.cpp
new file mode 100644
index 00000000..91dd7450
--- /dev/null
+++ b/modules/ui_presentation/tests/test_chat_presentation_identity.cpp
@@ -0,0 +1,88 @@
+#include "ui_presentation/chat/chat_workspace_snapshot.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+void directPeerAndTeamAreDifferent()
+{
+    ui::chat::ConversationId direct;
+    direct.kind = ui::chat::ConversationKind::DirectPeer;
+    direct.protocol = ui::chat::ChatProtocolKind::Meshtastic;
+    direct.primary = 1234;
+    direct.secondary = 0;
+
+    ui::chat::ConversationId team;
+    team.kind = ui::chat::ConversationKind::Team;
+    team.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    team.primary = 1234;
+    team.secondary = 0;
+
+    assert(direct.isValid());
+    assert(team.isValid());
+    assert(direct != team);
+}
+
+void workspaceSnapshotUsesPresentationIds()
+{
+    ui::chat::ChatWorkspaceSnapshot snapshot;
+    snapshot.header.valid = true;
+    snapshot.conversation_count = 2;
+    snapshot.conversations[0].id.kind = ui::chat::ConversationKind::DirectPeer;
+    snapshot.conversations[0].id.protocol = ui::chat::ChatProtocolKind::MeshCore;
+    snapshot.conversations[0].id.primary = 42;
+    snapshot.conversations[0].id.secondary = 1;
+    snapshot.conversations[0].kind = snapshot.conversations[0].id.kind;
+    snapshot.conversations[0].protocol = snapshot.conversations[0].id.protocol;
+    ui::copyText(snapshot.conversations[0].title, "Node 42");
+
+    snapshot.conversations[1].id.kind = ui::chat::ConversationKind::System;
+    snapshot.conversations[1].id.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    snapshot.conversations[1].id.primary = 7;
+    snapshot.conversations[1].kind = snapshot.conversations[1].id.kind;
+    snapshot.conversations[1].protocol = snapshot.conversations[1].id.protocol;
+    ui::copyText(snapshot.conversations[1].title, "Diagnostics");
+
+    snapshot.selected_conversation = snapshot.conversations[0].id;
+    snapshot.message_count = 1;
+    snapshot.messages[0].conversation = snapshot.conversations[0].id;
+    snapshot.messages[0].ref.origin = ui::chat::MessageOrigin::LocalStored;
+    snapshot.messages[0].ref.local_id = 99;
+    snapshot.messages[0].delivery = ui::chat::MessageDeliveryState::Sent;
+    ui::copyText(snapshot.messages[0].text, "hello");
+
+    assert(snapshot.header.valid);
+    assert(snapshot.conversations[0].id.isValid());
+    assert(snapshot.conversations[1].id.isValid());
+    assert(snapshot.conversations[0].id != snapshot.conversations[1].id);
+    assert(snapshot.messages[0].ref.isValid());
+    assert(snapshot.selected_conversation == snapshot.conversations[0].id);
+    assert(std::strcmp(snapshot.conversations[0].title.c_str(), "Node 42") == 0);
+    assert(std::strcmp(snapshot.messages[0].text.c_str(), "hello") == 0);
+}
+
+void sendViewUsesConversationToken()
+{
+    ui::chat::SendMessageView view;
+    view.conversation.kind = ui::chat::ConversationKind::Channel;
+    view.conversation.protocol = ui::chat::ChatProtocolKind::Meshtastic;
+    view.conversation.primary = 0;
+    view.text = "broadcast";
+    view.text_len = 9;
+
+    assert(view.conversation.isValid());
+    assert(view.conversation.kind == ui::chat::ConversationKind::Channel);
+    assert(view.text_len == 9);
+}
+
+} // namespace
+
+int main()
+{
+    directPeerAndTeamAreDifferent();
+    workspaceSnapshotUsesPresentationIds();
+    sendViewUsesConversationToken();
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_chat_workspace_model.cpp b/modules/ui_presentation/tests/test_chat_workspace_model.cpp
new file mode 100644
index 00000000..4c3a1f40
--- /dev/null
+++ b/modules/ui_presentation/tests/test_chat_workspace_model.cpp
@@ -0,0 +1,169 @@
+#include "fake/fake_chat_action_sink.h"
+#include "fake/fake_chat_presentation_source.h"
+#include "ui_presentation/chat/chat_workspace_model.h"
+#include "ui_presentation/common/fixed_text.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+ui::chat::ConversationId directPeer(uint32_t peer, uint32_t channel)
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::DirectPeer;
+    id.protocol = ui::chat::ChatProtocolKind::Meshtastic;
+    id.primary = peer;
+    id.secondary = channel;
+    return id;
+}
+
+ui::chat::ConversationId team(uint32_t team_id)
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::Team;
+    id.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    id.primary = team_id;
+    return id;
+}
+
+} // namespace
+
+int main()
+{
+    ui::chat::ChatWorkspaceSnapshot reset_probe;
+    reset_probe.header.valid = true;
+    reset_probe.conversation_count = 1;
+    reset_probe.conversations[0].last_delivery =
+        ui::chat::MessageDeliveryState::Delivered;
+    reset_probe.message_count = 1;
+    reset_probe.messages[0].ref.origin = ui::chat::MessageOrigin::RemoteStored;
+    reset_probe.messages[0].delivery = ui::chat::MessageDeliveryState::Delivered;
+    ui::copyText(reset_probe.messages[0].text, "stale");
+    ui::chat::resetChatWorkspaceSnapshot(reset_probe);
+    assert(!reset_probe.header.valid);
+    assert(reset_probe.conversation_count == 0);
+    assert(reset_probe.conversations[0].last_delivery ==
+           ui::chat::MessageDeliveryState::Unknown);
+    assert(reset_probe.message_count == 0);
+    assert(reset_probe.messages[0].ref.origin ==
+           ui::chat::MessageOrigin::SystemGenerated);
+    assert(reset_probe.messages[0].delivery ==
+           ui::chat::MessageDeliveryState::Unknown);
+    assert(reset_probe.messages[0].text.empty());
+
+    ui::tests::FakeChatPresentationSource source;
+    source.snapshot_value.header.valid = true;
+    source.snapshot_value.header.version = 6;
+    source.snapshot_value.conversation_count = 2;
+    source.snapshot_value.conversations[0].id = directPeer(1234, 0);
+    source.snapshot_value.conversations[0].kind =
+        ui::chat::ConversationKind::DirectPeer;
+    source.snapshot_value.conversations[0].protocol =
+        ui::chat::ChatProtocolKind::Meshtastic;
+    ui::copyText(source.snapshot_value.conversations[0].title, "Ada");
+    source.snapshot_value.conversations[1].id = team(1234);
+    source.snapshot_value.conversations[1].kind = ui::chat::ConversationKind::Team;
+    source.snapshot_value.conversations[1].protocol =
+        ui::chat::ChatProtocolKind::TrailMate;
+    ui::copyText(source.snapshot_value.conversations[1].title, "Field Team");
+    source.snapshot_value.message_count = 1;
+    source.snapshot_value.messages[0].conversation = directPeer(1234, 0);
+    source.snapshot_value.messages[0].ref.origin =
+        ui::chat::MessageOrigin::RemoteStored;
+    source.snapshot_value.messages[0].ref.local_id = 42;
+    ui::copyText(source.snapshot_value.messages[0].text, "hello");
+    ui::copyText(source.snapshot_value.workspace_title, "Chat");
+
+    ui::tests::FakeChatActionSink sink;
+    ui::chat::ChatWorkspaceModel model(source, sink);
+
+    model.setConversationOffset(3);
+    model.setMessageOffset(5);
+
+    const auto initial = model.snapshot();
+    assert(initial.header.valid);
+    assert(initial.header.version == 6);
+    assert(initial.conversation_count == 2);
+    assert(initial.conversations[0].id != initial.conversations[1].id);
+    assert(std::strcmp(initial.conversations[0].title.c_str(), "Ada") == 0);
+    assert(std::strcmp(initial.messages[0].text.c_str(), "hello") == 0);
+    assert(source.build_count == 1);
+    assert(source.last_request.conversation_offset == 3);
+    assert(source.last_request.message_offset == 5);
+
+    ui::chat::ChatWorkspaceSnapshot reusable_snapshot;
+    assert(model.buildSnapshot(reusable_snapshot));
+    assert(reusable_snapshot.header.valid);
+    assert(reusable_snapshot.header.version == 6);
+    assert(reusable_snapshot.conversation_count == 2);
+    assert(source.build_count == 2);
+
+    const auto ada = directPeer(1234, 0);
+    const auto selected = model.selectConversation(ada);
+    assert(selected.ok);
+    assert(sink.select_count == 1);
+    assert(sink.last_selected == ada);
+    assert(model.selectedConversation() == ada);
+    assert(model.messageOffset() == 0);
+
+    const auto selected_snapshot = model.snapshot();
+    assert(selected_snapshot.header.valid);
+    assert(selected_snapshot.selected_conversation == ada);
+    assert(source.last_request.selected == ada);
+
+    const auto sent = model.sendMessage("on my way");
+    assert(sent.ok);
+    assert(sink.send_count == 1);
+    assert(sink.last_message.conversation == ada);
+    assert(std::strcmp(sink.last_message.text, "on my way") == 0);
+    assert(sink.last_message.text_len == 9);
+
+    const auto marked = model.markRead(ada);
+    assert(marked.ok);
+    assert(sink.mark_read_count == 1);
+    assert(sink.last_mark_read == ada);
+
+    const auto team_id = team(1234);
+    assert(ada != team_id);
+    const auto team_selected = model.selectConversation(team_id);
+    assert(team_selected.ok);
+    assert(model.selectedConversation() == team_id);
+    assert(model.selectedConversation() != ada);
+
+    ui::chat::ChatWorkspaceModel empty_model(source, sink);
+    const auto no_selection_send = empty_model.sendMessage("nope");
+    assert(!no_selection_send.ok);
+    assert(no_selection_send.failure == ui::UiActionFailure::InvalidInput);
+
+    const auto empty_text = model.sendMessage("");
+    assert(!empty_text.ok);
+    assert(empty_text.failure == ui::UiActionFailure::InvalidInput);
+
+    const auto invalid_select = model.selectConversation({});
+    assert(!invalid_select.ok);
+    assert(invalid_select.failure == ui::UiActionFailure::InvalidInput);
+
+    const auto invalid_mark = model.markRead({});
+    assert(!invalid_mark.ok);
+    assert(invalid_mark.failure == ui::UiActionFailure::InvalidInput);
+
+    const auto before_rejected = model.selectedConversation();
+    sink.select_result = ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    const auto rejected = model.selectConversation(ada);
+    assert(!rejected.ok);
+    assert(rejected.failure == ui::UiActionFailure::Rejected);
+    assert(model.selectedConversation() == ada);
+    assert(model.selectedConversation() != before_rejected);
+
+    source.available = false;
+    const auto invalid_snapshot = model.snapshot();
+    assert(!invalid_snapshot.header.valid);
+
+    reusable_snapshot.header.valid = true;
+    assert(!model.buildSnapshot(reusable_snapshot));
+    assert(!reusable_snapshot.header.valid);
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_device_status_model.cpp b/modules/ui_presentation/tests/test_device_status_model.cpp
new file mode 100644
index 00000000..9c62edef
--- /dev/null
+++ b/modules/ui_presentation/tests/test_device_status_model.cpp
@@ -0,0 +1,39 @@
+#include "fake/fake_device_status_source.h"
+#include "ui_presentation/device/device_status_model.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui::tests::FakeDeviceStatusSource source;
+    source.snapshot_value.header.valid = true;
+    source.snapshot_value.header.version = 7;
+    source.snapshot_value.lora = ui::device::CapabilityDisplayState::Ready;
+    source.snapshot_value.gps = ui::device::CapabilityDisplayState::Degraded;
+    source.snapshot_value.time_synced = true;
+    source.snapshot_value.epoch_seconds = 1700000000ULL;
+    ui::copyText(source.snapshot_value.active_protocol, "Meshtastic");
+    ui::copyText(source.snapshot_value.region, "915.000MHz");
+    ui::copyText(source.snapshot_value.modem_preset, "BW125k SF11 CR5");
+    ui::copyText(source.snapshot_value.status_line, "Meshtastic  915.000MHz");
+
+    ui::device::DeviceStatusModel model(source);
+    auto snapshot = model.snapshot();
+    assert(snapshot.header.valid);
+    assert(snapshot.header.version == 7);
+    assert(snapshot.lora == ui::device::CapabilityDisplayState::Ready);
+    assert(snapshot.gps == ui::device::CapabilityDisplayState::Degraded);
+    assert(snapshot.time_synced);
+    assert(snapshot.epoch_seconds == 1700000000ULL);
+    assert(std::strcmp(snapshot.active_protocol.c_str(), "Meshtastic") == 0);
+    assert(std::strcmp(snapshot.region.c_str(), "915.000MHz") == 0);
+    assert(std::strcmp(snapshot.modem_preset.c_str(), "BW125k SF11 CR5") == 0);
+    assert(std::strcmp(snapshot.status_line.c_str(), "Meshtastic  915.000MHz") == 0);
+
+    source.available = false;
+    auto invalid = model.snapshot();
+    assert(!invalid.header.valid);
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_fixed_text.cpp b/modules/ui_presentation/tests/test_fixed_text.cpp
new file mode 100644
index 00000000..bea1a19f
--- /dev/null
+++ b/modules/ui_presentation/tests/test_fixed_text.cpp
@@ -0,0 +1,59 @@
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/common/presentation_profile.h"
+#include "ui_presentation/common/snapshot_header.h"
+#include "ui_presentation/common/ui_action.h"
+#include "ui_presentation/common/ui_action_result.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui::FixedText<8> text;
+    assert(text.empty());
+
+    ui::copyText(text, "trail");
+    assert(!text.empty());
+    assert(std::strcmp(text.c_str(), "trail") == 0);
+
+    ui::copyText(text, "trail-mate");
+    assert(std::strcmp(text.c_str(), "trail-m") == 0);
+
+    ui::copyText(text, nullptr);
+    assert(text.empty());
+
+    ui::SnapshotHeader header{};
+    assert(!header.valid);
+    header.valid = true;
+    header.version = 4;
+    header.generated_at_ms = 50;
+    assert(header.valid);
+    assert(header.version == 4);
+    assert(header.generated_at_ms == 50);
+
+    auto ok = ui::UiActionResult::success();
+    assert(ok.ok);
+    assert(ok.failure == ui::UiActionFailure::None);
+
+    auto failed = ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+    assert(!failed.ok);
+    assert(failed.failure == ui::UiActionFailure::Unsupported);
+
+    ui::UiAction action{};
+    action.kind = ui::UiActionKind::Refresh;
+    action.target = 2;
+    assert(action.kind == ui::UiActionKind::Refresh);
+    assert(action.target == 2);
+
+    ui::PresentationProfile profile{};
+    profile.kind = ui::PresentationProfileKind::TerminalPanel;
+    profile.width = 80;
+    profile.height = 24;
+    profile.keyboard_input = true;
+    assert(profile.kind == ui::PresentationProfileKind::TerminalPanel);
+    assert(profile.width == 80);
+    assert(profile.height == 24);
+    assert(profile.keyboard_input);
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_gps_status_model.cpp b/modules/ui_presentation/tests/test_gps_status_model.cpp
new file mode 100644
index 00000000..9ccf058d
--- /dev/null
+++ b/modules/ui_presentation/tests/test_gps_status_model.cpp
@@ -0,0 +1,51 @@
+#include "fake/fake_gps_status_source.h"
+#include "ui_presentation/gps/gps_status_model.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui::tests::FakeGpsStatusSource source;
+    source.snapshot_value.header.valid = true;
+    source.snapshot_value.header.version = 3;
+    source.snapshot_value.receiver_enabled = true;
+    source.snapshot_value.receiver_powered = true;
+    source.snapshot_value.fix_valid = true;
+    source.snapshot_value.latitude = 31.2304;
+    source.snapshot_value.longitude = 121.4737;
+    source.snapshot_value.altitude_m = 12.5f;
+    source.snapshot_value.speed_mps = 1.25f;
+    source.snapshot_value.course_deg = 48.0f;
+    source.snapshot_value.satellites = 8;
+    source.snapshot_value.hdop = 0.9f;
+    source.snapshot_value.time_synced = true;
+    source.snapshot_value.epoch_seconds = 1700000000ULL;
+    ui::copyText(source.snapshot_value.fix_label, "FIX");
+    ui::copyText(source.snapshot_value.coordinate_label, "31.23040, 121.47370");
+    ui::copyText(source.snapshot_value.satellite_label, "8 SAT");
+    ui::copyText(source.snapshot_value.time_label, "SYNCED");
+
+    ui::gps::GpsStatusModel model(source);
+    const auto snapshot = model.snapshot();
+    assert(snapshot.header.valid);
+    assert(snapshot.header.version == 3);
+    assert(snapshot.receiver_enabled);
+    assert(snapshot.receiver_powered);
+    assert(snapshot.fix_valid);
+    assert(snapshot.latitude == 31.2304);
+    assert(snapshot.longitude == 121.4737);
+    assert(snapshot.satellites == 8);
+    assert(snapshot.time_synced);
+    assert(snapshot.epoch_seconds == 1700000000ULL);
+    assert(std::strcmp(snapshot.fix_label.c_str(), "FIX") == 0);
+    assert(std::strcmp(snapshot.coordinate_label.c_str(), "31.23040, 121.47370") == 0);
+    assert(std::strcmp(snapshot.satellite_label.c_str(), "8 SAT") == 0);
+    assert(std::strcmp(snapshot.time_label.c_str(), "SYNCED") == 0);
+
+    source.available = false;
+    const auto invalid = model.snapshot();
+    assert(!invalid.header.valid);
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_key_verification_model.cpp b/modules/ui_presentation/tests/test_key_verification_model.cpp
new file mode 100644
index 00000000..2547a5e5
--- /dev/null
+++ b/modules/ui_presentation/tests/test_key_verification_model.cpp
@@ -0,0 +1,177 @@
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/key_verification/key_verification_model.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+class FakeKeyVerificationSource final
+    : public ui::key_verification::IKeyVerificationPresentationSource
+{
+  public:
+    bool buildKeyVerificationSnapshot(
+        const ui::key_verification::KeyVerificationRequest& request,
+        ui::key_verification::KeyVerificationSnapshot& out) const override
+    {
+        ++build_count;
+        last_request = request;
+        if (!available)
+        {
+            return false;
+        }
+
+        out = snapshot;
+        out.header.valid = true;
+        out.protocol = request.protocol;
+        out.peer_id = request.peer_id;
+        return true;
+    }
+
+    mutable int build_count = 0;
+    mutable ui::key_verification::KeyVerificationRequest last_request{};
+    bool available = true;
+    ui::key_verification::KeyVerificationSnapshot snapshot{};
+};
+
+class FakeKeyVerificationSink final
+    : public ui::key_verification::IKeyVerificationActionSink
+{
+  public:
+    ui::UiActionResult accept(uint32_t peer_id) override
+    {
+        ++accept_count;
+        last_peer_id = peer_id;
+        return accept_result;
+    }
+
+    ui::UiActionResult reject(uint32_t peer_id) override
+    {
+        ++reject_count;
+        last_peer_id = peer_id;
+        return reject_result;
+    }
+
+    ui::UiActionResult refresh(uint32_t peer_id) override
+    {
+        ++refresh_count;
+        last_peer_id = peer_id;
+        return refresh_result;
+    }
+
+    ui::UiActionResult copyCode(uint32_t peer_id) override
+    {
+        ++copy_count;
+        last_peer_id = peer_id;
+        return copy_result;
+    }
+
+    ui::UiActionResult submitNumber(uint32_t peer_id,
+                                    uint32_t number) override
+    {
+        ++submit_count;
+        last_peer_id = peer_id;
+        last_number = number;
+        return submit_result;
+    }
+
+    int accept_count = 0;
+    int reject_count = 0;
+    int refresh_count = 0;
+    int copy_count = 0;
+    int submit_count = 0;
+    uint32_t last_peer_id = 0;
+    uint32_t last_number = 0;
+    ui::UiActionResult accept_result = ui::UiActionResult::success();
+    ui::UiActionResult reject_result = ui::UiActionResult::success();
+    ui::UiActionResult refresh_result = ui::UiActionResult::success();
+    ui::UiActionResult copy_result = ui::UiActionResult::success();
+    ui::UiActionResult submit_result = ui::UiActionResult::success();
+};
+
+} // namespace
+
+int main()
+{
+    using namespace ui::key_verification;
+
+    FakeKeyVerificationSource source;
+    source.snapshot.state = VerificationState::Pending;
+    source.snapshot.prompt = VerificationPromptKind::CompareCode;
+    source.snapshot.can_accept = true;
+    ui::copyText(source.snapshot.peer_label, "Ada");
+    ui::copyText(source.snapshot.verification_code, "ABCD-1234");
+    ui::copyText(source.snapshot.status_line, "Compare verification code");
+
+    FakeKeyVerificationSink sink;
+    KeyVerificationModel model(source, sink);
+
+    auto idle = model.snapshot();
+    assert(idle.header.valid);
+    assert(idle.state == VerificationState::Idle);
+    assert(idle.prompt == VerificationPromptKind::None);
+    assert(source.build_count == 0);
+
+    auto result = model.accept();
+    assert(!result.ok);
+    assert(result.failure == ui::UiActionFailure::InvalidInput);
+    assert(sink.accept_count == 0);
+
+    model.selectPeer(VerificationProtocol::Meshtastic, 0x1234);
+    const auto selected_request = model.request();
+    assert(selected_request.isValid());
+    assert(selected_request.protocol == VerificationProtocol::Meshtastic);
+    assert(selected_request.peer_id == 0x1234);
+
+    const auto snapshot = model.snapshot();
+    assert(snapshot.header.valid);
+    assert(snapshot.peer_id == 0x1234);
+    assert(snapshot.protocol == VerificationProtocol::Meshtastic);
+    assert(snapshot.state == VerificationState::Pending);
+    assert(snapshot.prompt == VerificationPromptKind::CompareCode);
+    assert(snapshot.can_accept);
+    assert(std::strcmp(snapshot.peer_label.c_str(), "Ada") == 0);
+    assert(std::strcmp(snapshot.verification_code.c_str(), "ABCD-1234") == 0);
+    assert(source.build_count == 1);
+    assert(source.last_request.peer_id == 0x1234);
+
+    result = model.accept();
+    assert(result.ok);
+    assert(sink.accept_count == 1);
+    assert(sink.last_peer_id == 0x1234);
+
+    result = model.reject();
+    assert(result.ok);
+    assert(sink.reject_count == 1);
+    result = model.refresh();
+    assert(result.ok);
+    assert(sink.refresh_count == 1);
+    result = model.copyCode();
+    assert(result.ok);
+    assert(sink.copy_count == 1);
+    result = model.submitNumber(123456);
+    assert(result.ok);
+    assert(sink.submit_count == 1);
+    assert(sink.last_number == 123456);
+
+    result = model.submitNumber(1000000);
+    assert(!result.ok);
+    assert(result.failure == ui::UiActionFailure::InvalidInput);
+    assert(sink.submit_count == 1);
+
+    source.available = false;
+    const auto unavailable = model.snapshot();
+    assert(!unavailable.header.valid);
+    assert(unavailable.peer_id == 0x1234);
+    assert(unavailable.state == VerificationState::Failed);
+    assert(unavailable.failure ==
+           VerificationFailureKind::RuntimeUnavailable);
+
+    model.clearSelection();
+    idle = model.snapshot();
+    assert(idle.header.valid);
+    assert(idle.state == VerificationState::Idle);
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_layout_profile.cpp b/modules/ui_presentation/tests/test_layout_profile.cpp
new file mode 100644
index 00000000..db8e63ac
--- /dev/null
+++ b/modules/ui_presentation/tests/test_layout_profile.cpp
@@ -0,0 +1,35 @@
+#include "ui_presentation/layout/layout_profile.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    std::size_t count = 0;
+    const auto* profiles = ui::presentation::allLayoutProfiles(&count);
+    assert(profiles != nullptr);
+    assert(count == 8);
+
+    const auto* pager = ui::presentation::findLayoutProfile("pager_compact");
+    assert(pager != nullptr);
+    assert(pager->screen_width == 480);
+    assert(pager->screen_height == 222);
+    assert(pager->use_compact_rows);
+    assert(pager->use_keyboard_shortcuts);
+
+    const auto* watch = ui::presentation::findLayoutProfile("watch_compact");
+    assert(watch != nullptr);
+    assert(watch->use_watch_cards);
+
+    const auto* desktop = ui::presentation::findLayoutProfile("uconsole_desktop");
+    assert(desktop != nullptr);
+    assert(desktop->use_side_nav);
+    assert(desktop->use_keyboard_shortcuts);
+
+    const auto* headless = ui::presentation::findLayoutProfile("headless_node");
+    assert(headless != nullptr);
+    assert(headless->max_visible_menu_items == 0);
+
+    assert(ui::presentation::findLayoutProfile("unknown") == nullptr);
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_map_workspace_model.cpp b/modules/ui_presentation/tests/test_map_workspace_model.cpp
new file mode 100644
index 00000000..d1f4050b
--- /dev/null
+++ b/modules/ui_presentation/tests/test_map_workspace_model.cpp
@@ -0,0 +1,125 @@
+#include "fake/fake_map_action_sink.h"
+#include "fake/fake_map_presentation_source.h"
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/map/map_workspace_model.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+ui::map::MapViewport viewport(double lat, double lon, uint8_t zoom)
+{
+    ui::map::MapViewport value;
+    value.center_lat = lat;
+    value.center_lon = lon;
+    value.zoom = zoom;
+    return value;
+}
+
+void assertViewport(const ui::map::MapViewport& actual,
+                    const ui::map::MapViewport& expected)
+{
+    assert(actual.center_lat == expected.center_lat);
+    assert(actual.center_lon == expected.center_lon);
+    assert(actual.zoom == expected.zoom);
+}
+
+} // namespace
+
+int main()
+{
+    ui::tests::FakeMapPresentationSource source;
+    source.snapshot_value.header.valid = true;
+    source.snapshot_value.header.version = 7;
+    source.snapshot_value.self.valid = true;
+    source.snapshot_value.self.lat = 52.4068;
+    source.snapshot_value.self.lon = -1.5197;
+    source.snapshot_value.self.accuracy_m = 3.5f;
+    source.snapshot_value.layers.osm = true;
+    source.snapshot_value.layers.contour = true;
+    source.snapshot_value.team.available = true;
+    source.snapshot_value.team.visible_members = 3;
+    source.snapshot_value.team.stale_members = 1;
+    source.snapshot_value.can_center_on_self = true;
+    source.snapshot_value.can_zoom_in = true;
+    source.snapshot_value.can_zoom_out = true;
+    source.snapshot_value.can_toggle_layers = true;
+    ui::copyText(source.snapshot_value.status_line, "GPS fix");
+
+    ui::tests::FakeMapActionSink sink;
+    ui::map::MapWorkspaceModel model(source, sink);
+
+    const auto initial_viewport = viewport(52.0, -1.0, 12);
+    const auto set_view = model.setViewport(initial_viewport);
+    assert(set_view.ok);
+    assert(sink.set_viewport_count == 1);
+    assertViewport(sink.last_viewport, initial_viewport);
+    assertViewport(model.viewport(), initial_viewport);
+
+    const auto tool_result =
+        model.setActiveTool(ui::map::MapToolKind::MeasureDistance);
+    assert(tool_result.ok);
+    assert(sink.set_active_tool_count == 1);
+    assert(sink.last_tool == ui::map::MapToolKind::MeasureDistance);
+    assert(model.activeTool() == ui::map::MapToolKind::MeasureDistance);
+
+    const auto snap = model.snapshot();
+    assert(snap.header.valid);
+    assert(snap.header.version == 7);
+    assert(snap.active_tool == ui::map::MapToolKind::MeasureDistance);
+    assertViewport(snap.viewport, initial_viewport);
+    assert(source.build_count == 1);
+    assertViewport(source.last_request.requested_viewport, initial_viewport);
+    assert(source.last_request.active_tool ==
+           ui::map::MapToolKind::MeasureDistance);
+    assert(snap.self.valid);
+    assert(snap.self.lat == 52.4068);
+    assert(snap.self.lon == -1.5197);
+    assert(snap.layers.contour);
+    assert(snap.team.available);
+    assert(snap.team.visible_members == 3);
+    assert(std::strcmp(snap.status_line.c_str(), "GPS fix") == 0);
+
+    const auto layer_result =
+        model.setLayer(ui::map::MapLayerKind::Terrain, true);
+    assert(layer_result.ok);
+    assert(sink.set_layer_count == 1);
+    assert(sink.last_layer == ui::map::MapLayerKind::Terrain);
+    assert(sink.last_layer_enabled);
+
+    const auto clear_result = model.clearMeasurement();
+    assert(clear_result.ok);
+    assert(sink.clear_measurement_count == 1);
+
+    const auto centered = model.centerOnSelf();
+    assert(centered.ok);
+    assert(sink.center_on_self_count == 1);
+    assert(model.viewport().center_lat == 52.4068);
+    assert(model.viewport().center_lon == -1.5197);
+    assert(model.viewport().zoom == 12);
+
+    const auto before_rejected = model.viewport();
+    source.snapshot_value.self.lat = 10.0;
+    source.snapshot_value.self.lon = 20.0;
+    sink.center_on_self_result =
+        ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    const auto rejected = model.centerOnSelf();
+    assert(!rejected.ok);
+    assert(rejected.failure == ui::UiActionFailure::Rejected);
+    assertViewport(model.viewport(), before_rejected);
+
+    sink.center_on_self_result = ui::UiActionResult::success();
+    source.snapshot_value.self.valid = false;
+    const auto no_fix_before = model.viewport();
+    const auto no_fix = model.centerOnSelf();
+    assert(no_fix.ok);
+    assertViewport(model.viewport(), no_fix_before);
+
+    source.available = false;
+    const auto invalid_snapshot = model.snapshot();
+    assert(!invalid_snapshot.header.valid);
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_mesh_status_model.cpp b/modules/ui_presentation/tests/test_mesh_status_model.cpp
new file mode 100644
index 00000000..25d94738
--- /dev/null
+++ b/modules/ui_presentation/tests/test_mesh_status_model.cpp
@@ -0,0 +1,45 @@
+#include "fake/fake_mesh_status_source.h"
+#include "ui_presentation/mesh/mesh_status_model.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui::tests::FakeMeshStatusSource source;
+    source.snapshot_value.header.valid = true;
+    source.snapshot_value.header.version = 5;
+    source.snapshot_value.state = ui::mesh::MeshDisplayState::Ready;
+    source.snapshot_value.radio_ready = true;
+    source.snapshot_value.has_peer_key = true;
+    source.snapshot_value.team_linked = true;
+    source.snapshot_value.known_nodes = 4;
+    source.snapshot_value.unread_messages = 2;
+    source.snapshot_value.last_rssi = -72;
+    source.snapshot_value.last_snr = 9;
+    ui::copyText(source.snapshot_value.protocol_label, "Meshtastic");
+    ui::copyText(source.snapshot_value.radio_label, "LoRa direct path");
+    ui::copyText(source.snapshot_value.status_line, "LoRa direct path  |  new activity");
+
+    ui::mesh::MeshStatusModel model(source);
+    const auto snapshot = model.snapshot();
+    assert(snapshot.header.valid);
+    assert(snapshot.header.version == 5);
+    assert(snapshot.state == ui::mesh::MeshDisplayState::Ready);
+    assert(snapshot.radio_ready);
+    assert(snapshot.has_peer_key);
+    assert(snapshot.team_linked);
+    assert(snapshot.known_nodes == 4);
+    assert(snapshot.unread_messages == 2);
+    assert(snapshot.last_rssi == -72);
+    assert(snapshot.last_snr == 9);
+    assert(std::strcmp(snapshot.protocol_label.c_str(), "Meshtastic") == 0);
+    assert(std::strcmp(snapshot.radio_label.c_str(), "LoRa direct path") == 0);
+    assert(std::strcmp(snapshot.status_line.c_str(), "LoRa direct path  |  new activity") == 0);
+
+    source.available = false;
+    const auto invalid = model.snapshot();
+    assert(!invalid.header.valid);
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_page_manifest.cpp b/modules/ui_presentation/tests/test_page_manifest.cpp
new file mode 100644
index 00000000..e4db999e
--- /dev/null
+++ b/modules/ui_presentation/tests/test_page_manifest.cpp
@@ -0,0 +1,49 @@
+#include "ui_presentation/page/page_manifest.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+bool contains(const ui::presentation::PageManifest& manifest,
+              ui::presentation::PageId page_id)
+{
+    for (std::size_t index = 0; index < manifest.item_count; ++index)
+    {
+        if (manifest.items[index].page_id == page_id)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace
+
+int main()
+{
+    const auto* tab5 = ui::presentation::findPageManifest("tab5_touch_manifest");
+    assert(tab5 != nullptr);
+    assert(tab5->item_count >= 8);
+    assert(contains(*tab5, ui::presentation::PageId::Map));
+    assert(contains(*tab5, ui::presentation::PageId::Contacts));
+
+    const auto* watch = ui::presentation::findPageManifest("watch_compact_manifest");
+    assert(watch != nullptr);
+    assert(contains(*watch, ui::presentation::PageId::Gps));
+    assert(!contains(*watch, ui::presentation::PageId::Extensions));
+
+    const auto* uconsole = ui::presentation::findPageManifest("uconsole_desktop_manifest");
+    assert(uconsole != nullptr);
+    assert(contains(*uconsole, ui::presentation::PageId::Diagnostics));
+
+    const auto* node = ui::presentation::findPageManifest("node_headless_manifest");
+    assert(node != nullptr);
+    assert(node->item_count == 2);
+    assert(contains(*node, ui::presentation::PageId::NodeStatus));
+    assert(!node->items[0].visible_in_menu);
+
+    assert(ui::presentation::findPageManifest("unknown") == nullptr);
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_presentation_workspace.cpp b/modules/ui_presentation/tests/test_presentation_workspace.cpp
new file mode 100644
index 00000000..6775121d
--- /dev/null
+++ b/modules/ui_presentation/tests/test_presentation_workspace.cpp
@@ -0,0 +1,80 @@
+#include "fake/fake_chat_action_sink.h"
+#include "fake/fake_chat_presentation_source.h"
+#include "fake/fake_device_status_source.h"
+#include "fake/fake_gps_status_source.h"
+#include "fake/fake_map_action_sink.h"
+#include "fake/fake_map_presentation_source.h"
+#include "fake/fake_mesh_status_source.h"
+#include "fake/fake_settings_action_sink.h"
+#include "fake/fake_settings_source.h"
+
+#include "ui_presentation/workspace/presentation_workspace.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::tests::FakeDeviceStatusSource device_source;
+    ui::device::DeviceStatusModel device(device_source);
+
+    ui::tests::FakeGpsStatusSource gps_source;
+    ui::gps::GpsStatusModel gps(gps_source);
+
+    ui::tests::FakeMeshStatusSource mesh_source;
+    ui::mesh::MeshStatusModel mesh(mesh_source);
+
+    ui::tests::FakeSettingsSource settings_source;
+    ui::tests::FakeSettingsActionSink settings_sink;
+    ui::settings::SettingsModel settings(settings_source, settings_sink);
+
+    ui::tests::FakeChatPresentationSource chat_source;
+    ui::tests::FakeChatActionSink chat_sink;
+    ui::chat::ChatWorkspaceModel chat(chat_source, chat_sink);
+
+    ui::tests::FakeChatPresentationSource team_chat_source;
+    ui::tests::FakeChatActionSink team_chat_sink;
+    ui::chat::ChatWorkspaceModel team_chat(team_chat_source, team_chat_sink);
+
+    ui::tests::FakeMapPresentationSource map_source;
+    ui::tests::FakeMapActionSink map_sink;
+    ui::map::MapWorkspaceModel map(map_source, map_sink);
+
+    ui::workspace::PresentationWorkspace empty;
+    assert(!empty.hasDevice());
+    assert(!empty.hasGps());
+    assert(!empty.hasMesh());
+    assert(!empty.hasSettings());
+    assert(!empty.hasChat());
+    assert(!empty.hasTeamChat());
+    assert(!empty.hasMap());
+    assert(!ui::workspace::hasCoreStatusModels(empty));
+    assert(!ui::workspace::hasInteractiveWorkspaceModels(empty));
+
+    ui::workspace::PresentationWorkspace workspace;
+    workspace.device = &device;
+    workspace.gps = &gps;
+    workspace.mesh = &mesh;
+    workspace.settings = &settings;
+    workspace.chat = &chat;
+    workspace.team_chat = &team_chat;
+    workspace.map = &map;
+
+    assert(workspace.hasDevice());
+    assert(workspace.hasGps());
+    assert(workspace.hasMesh());
+    assert(workspace.hasSettings());
+    assert(workspace.hasChat());
+    assert(workspace.hasTeamChat());
+    assert(workspace.hasMap());
+    assert(ui::workspace::hasCoreStatusModels(workspace));
+    assert(ui::workspace::hasInteractiveWorkspaceModels(workspace));
+
+    ui::workspace::PresentationWorkspace status_only;
+    status_only.device = &device;
+    status_only.gps = &gps;
+    status_only.mesh = &mesh;
+    assert(ui::workspace::hasCoreStatusModels(status_only));
+    assert(!ui::workspace::hasInteractiveWorkspaceModels(status_only));
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_presentation_workspace_probe.cpp b/modules/ui_presentation/tests/test_presentation_workspace_probe.cpp
new file mode 100644
index 00000000..3e8440bc
--- /dev/null
+++ b/modules/ui_presentation/tests/test_presentation_workspace_probe.cpp
@@ -0,0 +1,125 @@
+#include "fake/fake_chat_action_sink.h"
+#include "fake/fake_chat_presentation_source.h"
+#include "fake/fake_device_status_source.h"
+#include "fake/fake_gps_status_source.h"
+#include "fake/fake_map_action_sink.h"
+#include "fake/fake_map_presentation_source.h"
+#include "fake/fake_mesh_status_source.h"
+#include "fake/fake_settings_action_sink.h"
+#include "fake/fake_settings_source.h"
+
+#include "ui_presentation/common/fixed_text.h"
+#include "ui_presentation/workspace/presentation_workspace.h"
+#include "ui_presentation/workspace/presentation_workspace_probe.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+void test_empty_workspace_is_valid_empty_summary()
+{
+    ui::workspace::PresentationWorkspace workspace;
+
+    const auto snapshot =
+        ui::workspace::PresentationWorkspaceProbe::snapshot(workspace);
+
+    assert(snapshot.header.valid);
+    assert(snapshot.header.version == 1);
+    assert(!snapshot.has_device);
+    assert(!snapshot.has_gps);
+    assert(!snapshot.has_mesh);
+    assert(!snapshot.has_settings);
+    assert(!snapshot.has_chat);
+    assert(!snapshot.has_team_chat);
+    assert(!snapshot.has_map);
+}
+
+void test_probe_reads_small_status_and_map_snapshots()
+{
+    ui::tests::FakeDeviceStatusSource device_source;
+    device_source.snapshot_value.header.valid = true;
+    ui::copyText(device_source.snapshot_value.status_line, "Device ready");
+    ui::device::DeviceStatusModel device(device_source);
+
+    ui::tests::FakeGpsStatusSource gps_source;
+    gps_source.snapshot_value.header.valid = true;
+    gps_source.snapshot_value.fix_valid = true;
+    gps_source.snapshot_value.satellites = 8;
+    ui::copyText(gps_source.snapshot_value.fix_label, "FIX");
+    ui::gps::GpsStatusModel gps(gps_source);
+
+    ui::tests::FakeMeshStatusSource mesh_source;
+    mesh_source.snapshot_value.header.valid = true;
+    mesh_source.snapshot_value.known_nodes = 4;
+    ui::copyText(mesh_source.snapshot_value.status_line, "Mesh ready");
+    ui::mesh::MeshStatusModel mesh(mesh_source);
+
+    ui::tests::FakeSettingsSource settings_source;
+    ui::tests::FakeSettingsActionSink settings_sink;
+    ui::settings::SettingsModel settings(settings_source, settings_sink);
+
+    ui::tests::FakeChatPresentationSource chat_source;
+    chat_source.available = false;
+    ui::tests::FakeChatActionSink chat_sink;
+    ui::chat::ChatWorkspaceModel chat(chat_source, chat_sink);
+
+    ui::tests::FakeChatPresentationSource team_chat_source;
+    team_chat_source.available = false;
+    ui::tests::FakeChatActionSink team_chat_sink;
+    ui::chat::ChatWorkspaceModel team_chat(team_chat_source, team_chat_sink);
+
+    ui::tests::FakeMapPresentationSource map_source;
+    map_source.snapshot_value.header.valid = true;
+    map_source.snapshot_value.self.valid = true;
+    map_source.snapshot_value.self.lat = 52.4068;
+    map_source.snapshot_value.self.lon = -1.5197;
+    ui::copyText(map_source.snapshot_value.status_line, "GPS fix");
+    ui::tests::FakeMapActionSink map_sink;
+    ui::map::MapWorkspaceModel map(map_source, map_sink);
+
+    ui::workspace::PresentationWorkspace workspace;
+    workspace.device = &device;
+    workspace.gps = &gps;
+    workspace.mesh = &mesh;
+    workspace.settings = &settings;
+    workspace.chat = &chat;
+    workspace.team_chat = &team_chat;
+    workspace.map = &map;
+
+    const auto snapshot =
+        ui::workspace::PresentationWorkspaceProbe::snapshot(workspace);
+
+    assert(snapshot.header.valid);
+    assert(snapshot.has_device);
+    assert(snapshot.has_gps);
+    assert(snapshot.has_mesh);
+    assert(snapshot.has_settings);
+    assert(snapshot.has_chat);
+    assert(snapshot.has_team_chat);
+    assert(snapshot.has_map);
+
+    assert(std::strcmp(snapshot.device.status_line.c_str(), "Device ready") == 0);
+    assert(snapshot.gps.fix_valid);
+    assert(snapshot.gps.satellites == 8);
+    assert(std::strcmp(snapshot.gps.fix_label.c_str(), "FIX") == 0);
+    assert(snapshot.mesh.known_nodes == 4);
+    assert(std::strcmp(snapshot.mesh.status_line.c_str(), "Mesh ready") == 0);
+    assert(snapshot.map.self.valid);
+    assert(snapshot.map.self.lat == 52.4068);
+    assert(snapshot.map.self.lon == -1.5197);
+    assert(std::strcmp(snapshot.map.status_line.c_str(), "GPS fix") == 0);
+
+    assert(chat_source.build_count == 0);
+    assert(team_chat_source.build_count == 0);
+}
+
+} // namespace
+
+int main()
+{
+    test_empty_workspace_is_valid_empty_summary();
+    test_probe_reads_small_status_and_map_snapshots();
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_screen_binding_registry.cpp b/modules/ui_presentation/tests/test_screen_binding_registry.cpp
new file mode 100644
index 00000000..4dc60dde
--- /dev/null
+++ b/modules/ui_presentation/tests/test_screen_binding_registry.cpp
@@ -0,0 +1,34 @@
+#include "ui_presentation/screen/screen_binding_registry.h"
+#include "ui_presentation/screen/screen_route.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    const ui::screen::ScreenRoute route =
+        ui::screen::routeForMenuScreen(ui::menu::MenuScreenId::Chat);
+    assert(route.valid);
+    assert(route.open_mode == ui::screen::ScreenOpenMode::Replace);
+    assert(route.screen_id == ui::menu::MenuScreenId::Chat);
+
+    ui::screen::ScreenBindingRegistry registry;
+    assert(registry.size() == 0);
+    assert(registry.find(ui::menu::MenuScreenId::Chat) == nullptr);
+
+    assert(registry.add({ui::menu::MenuScreenId::Chat, "chat", true}));
+    assert(registry.add({ui::menu::MenuScreenId::Map, "map", true}));
+    assert(registry.size() == 2);
+
+    const ui::screen::ScreenBinding* chat =
+        registry.find(ui::menu::MenuScreenId::Chat);
+    assert(chat != nullptr);
+    assert(chat->available);
+    assert(std::strcmp(chat->binding_id, "chat") == 0);
+
+    assert(registry.find(ui::menu::MenuScreenId::Settings) == nullptr);
+
+    registry.clear();
+    assert(registry.size() == 0);
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_settings_model.cpp b/modules/ui_presentation/tests/test_settings_model.cpp
new file mode 100644
index 00000000..d4f22555
--- /dev/null
+++ b/modules/ui_presentation/tests/test_settings_model.cpp
@@ -0,0 +1,53 @@
+#include "fake/fake_settings_action_sink.h"
+#include "fake/fake_settings_source.h"
+#include "ui_presentation/settings/settings_model.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    ui::tests::FakeSettingsSource source;
+    source.snapshot_value.header.valid = true;
+    source.snapshot_value.header.version = 9;
+    source.snapshot_value.section_count = 1;
+    ui::copyText(source.snapshot_value.sections[0].title, "GPS");
+    source.snapshot_value.sections[0].option_count = 1;
+    ui::copyText(source.snapshot_value.sections[0].options[0].key, "gps_enabled");
+    ui::copyText(source.snapshot_value.sections[0].options[0].label, "GPS Enabled");
+    ui::copyText(source.snapshot_value.sections[0].options[0].value_label, "ON");
+    source.snapshot_value.sections[0].options[0].control =
+        ui::settings::SettingControlKind::Toggle;
+
+    ui::tests::FakeSettingsActionSink sink;
+    ui::settings::SettingsModel model(source, sink);
+
+    const auto snapshot = model.snapshot();
+    assert(snapshot.header.valid);
+    assert(snapshot.header.version == 9);
+    assert(snapshot.section_count == 1);
+    assert(std::strcmp(snapshot.sections[0].title.c_str(), "GPS") == 0);
+    assert(snapshot.sections[0].option_count == 1);
+    assert(std::strcmp(snapshot.sections[0].options[0].key.c_str(), "gps_enabled") == 0);
+
+    ui::settings::SettingsPatchView patch;
+    ui::copyText(patch.key, "gps_enabled");
+    ui::copyText(patch.value, "1");
+
+    const auto result = model.apply(patch);
+    assert(result.ok);
+    assert(sink.apply_count == 1);
+    assert(std::strcmp(sink.last_patch.key.c_str(), "gps_enabled") == 0);
+    assert(std::strcmp(sink.last_patch.value.c_str(), "1") == 0);
+
+    source.available = false;
+    const auto invalid = model.snapshot();
+    assert(!invalid.header.valid);
+
+    sink.result = ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    const auto rejected = model.apply(patch);
+    assert(!rejected.ok);
+    assert(rejected.failure == ui::UiActionFailure::Rejected);
+
+    return 0;
+}
diff --git a/modules/ui_presentation/tests/test_target_ui_profile.cpp b/modules/ui_presentation/tests/test_target_ui_profile.cpp
new file mode 100644
index 00000000..787fc3d2
--- /dev/null
+++ b/modules/ui_presentation/tests/test_target_ui_profile.cpp
@@ -0,0 +1,36 @@
+#include "ui_presentation/target_ui_profile.h"
+
+#include <cassert>
+#include <cstring>
+
+int main()
+{
+    std::size_t count = 0;
+    const auto* profiles = ui::presentation::allTargetUiProfiles(&count);
+    assert(profiles != nullptr);
+    assert(count == 8);
+
+    const auto* tab5 = ui::presentation::findTargetUiProfile("tab5_touch_ui");
+    assert(tab5 != nullptr);
+    assert(tab5->display_class == ui::presentation::DisplayClass::LargeTouch);
+    assert(tab5->input_class == ui::presentation::InputClass::TouchOnly);
+    assert(std::strcmp(tab5->page_manifest_id, "tab5_touch_manifest") == 0);
+
+    const auto* deck = ui::presentation::findTargetUiProfile("deck_wide_ui");
+    assert(deck != nullptr);
+    assert(deck->has_physical_keyboard);
+    assert(deck->has_trackball);
+
+    const auto* uconsole = ui::presentation::findTargetUiProfile("uconsole_desktop_ui");
+    assert(uconsole != nullptr);
+    assert(uconsole->has_pointer);
+    assert(uconsole->has_side_nav);
+
+    const auto* node = ui::presentation::findTargetUiProfile("node_headless_ui");
+    assert(node != nullptr);
+    assert(node->display_class == ui::presentation::DisplayClass::Headless);
+    assert(node->layout_class == ui::presentation::LayoutClass::HeadlessNode);
+
+    assert(ui::presentation::findTargetUiProfile("unknown") == nullptr);
+    return 0;
+}
diff --git a/modules/ui_shared/include/ui/assets/fonts/font_utils.h b/modules/ui_shared/include/ui/assets/fonts/font_utils.h
index cdc1a30e..8ec5a6a6 100644
--- a/modules/ui_shared/include/ui/assets/fonts/font_utils.h
+++ b/modules/ui_shared/include/ui/assets/fonts/font_utils.h
@@ -250,11 +250,8 @@ inline void apply_font(lv_obj_t* label, const lv_font_t* font)
 {
     if (label && font)
     {
-        if (lv_obj_get_style_text_font(label, LV_PART_MAIN) == font)
-        {
-            return;
-        }
         lv_obj_set_style_text_font(label, font, 0);
+        lv_obj_invalidate(label);
     }
 }
 
diff --git a/modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h b/modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h
new file mode 100644
index 00000000..4ec7aad5
--- /dev/null
+++ b/modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_map_runtime/map_overlay/map_overlay_projector.h"
diff --git a/modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h b/modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h
new file mode 100644
index 00000000..eb12f903
--- /dev/null
+++ b/modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/filesystem_map_tile_source.h"
diff --git a/modules/ui_shared/include/ui/map_tiles/map_tile_cache.h b/modules/ui_shared/include/ui/map_tiles/map_tile_cache.h
new file mode 100644
index 00000000..44d7b125
--- /dev/null
+++ b/modules/ui_shared/include/ui/map_tiles/map_tile_cache.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_cache.h"
diff --git a/modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h b/modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h
new file mode 100644
index 00000000..5e088490
--- /dev/null
+++ b/modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_decoder_cache.h"
diff --git a/modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h b/modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h
new file mode 100644
index 00000000..2e114fb3
--- /dev/null
+++ b/modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_render_queue.h"
diff --git a/modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h b/modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h
new file mode 100644
index 00000000..78dc45f5
--- /dev/null
+++ b/modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_resolver.h"
diff --git a/modules/ui_shared/include/ui/map_tiles/map_tile_source.h b/modules/ui_shared/include/ui/map_tiles/map_tile_source.h
new file mode 100644
index 00000000..752fd14a
--- /dev/null
+++ b/modules/ui_shared/include/ui/map_tiles/map_tile_source.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_source.h"
diff --git a/modules/ui_shared/include/ui/map_tiles/map_tile_types.h b/modules/ui_shared/include/ui/map_tiles/map_tile_types.h
new file mode 100644
index 00000000..5085519e
--- /dev/null
+++ b/modules/ui_shared/include/ui/map_tiles/map_tile_types.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_map_runtime/map_tiles/map_tile_types.h"
diff --git a/modules/ui_shared/include/ui/menu/menu_layout.h b/modules/ui_shared/include/ui/menu/menu_layout.h
index 46bb3b8e..4104ffdf 100644
--- a/modules/ui_shared/include/ui/menu/menu_layout.h
+++ b/modules/ui_shared/include/ui/menu/menu_layout.h
@@ -4,6 +4,7 @@
 
 #include "app/app_facades.h"
 #include "ui/app_catalog.h"
+#include "ui_presentation/menu/menu_model.h"
 
 namespace ui
 {
@@ -14,6 +15,7 @@ struct InitOptions
 {
     app::IAppMessagingFacade* messaging = nullptr;
     AppCatalog apps{};
+    const ui::menu::MenuModel* ux_menu = nullptr;
 };
 
 void init(const InitOptions& options);
diff --git a/modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h b/modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h
new file mode 100644
index 00000000..bcce520f
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "chat/delivery/chat_delivery_read_model.h"
+#include "chat/usecase/chat_service.h"
+#include "chat/usecase/contact_service.h"
+#include "ui_presentation/chat/chat_presentation_source.h"
+
+namespace ui::presentation_sources
+{
+
+// ChatPresentationSource is the product chat read projection adapter.
+//
+// Pattern:
+//   CQRS read model / projection / anti-corruption adapter.
+//
+// It may read ChatService and ContactService, and may use
+// chat_presentation_adapters to map core chat types into ui_presentation rows.
+//
+// It must not:
+//   - send messages
+//   - mark conversations read
+//   - mutate ChatService
+//   - access LVGL widgets
+//   - access radio, mesh adapter, PKI, or packet builders
+class ChatPresentationSource final : public ui::chat::IChatPresentationSource
+{
+  public:
+    ChatPresentationSource(::chat::ChatService& chat_service,
+                           ::chat::contacts::ContactService* contact_service = nullptr,
+                           const ::chat::delivery::ChatDeliveryReadModel*
+                               delivery_read_model = nullptr);
+
+    bool buildChatWorkspaceSnapshot(
+        const ui::chat::ChatWorkspaceRequest& request,
+        ui::chat::ChatWorkspaceSnapshot& out) const override;
+
+  private:
+    ::chat::ChatService& chat_service_;
+    ::chat::contacts::ContactService* contact_service_ = nullptr;
+    const ::chat::delivery::ChatDeliveryReadModel* delivery_read_model_ = nullptr;
+};
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_air_device_status_source.h b/modules/ui_shared/include/ui/presentation_sources/legacy_air_device_status_source.h
new file mode 100644
index 00000000..8194a56c
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_air_device_status_source.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/device/device_status_source.h"
+
+namespace ui::presentation_sources
+{
+
+class LegacyAirDeviceStatusSource final : public ui::device::IDeviceStatusSource
+{
+  public:
+    bool buildDeviceStatusSnapshot(ui::device::DeviceStatusSnapshot& out) const override;
+};
+
+LegacyAirDeviceStatusSource& legacy_air_device_status_source();
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_chat_action_sink.h b/modules/ui_shared/include/ui/presentation_sources/legacy_chat_action_sink.h
new file mode 100644
index 00000000..8d9b3e44
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_chat_action_sink.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "chat/usecase/chat_service.h"
+#include "ui_presentation/chat/chat_action_sink.h"
+
+namespace ui::presentation_sources
+{
+
+// LegacyChatActionSink is a Phase 5.6 compatibility command adapter.
+//
+// Pattern:
+//   Command Sink / anti-corruption adapter.
+//
+// It may translate UI actions into ChatService commands.
+//
+// It must not:
+//   - build ChatWorkspaceSnapshot
+//   - format UI labels
+//   - access LVGL widgets
+//   - inspect renderer state
+//   - build radio packets or perform PKI logic
+class LegacyChatActionSink final : public ui::chat::IChatActionSink
+{
+  public:
+    explicit LegacyChatActionSink(::chat::ChatService& chat_service);
+
+    ui::UiActionResult selectConversation(ui::chat::ConversationId id) override;
+    ui::UiActionResult sendMessage(const ui::chat::SendMessageView& message) override;
+    ui::UiActionResult markRead(ui::chat::ConversationId id) override;
+
+  private:
+    ::chat::ChatService& chat_service_;
+};
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h b/modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h
new file mode 100644
index 00000000..dcdafec1
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "ui_chat_runtime/chat_delivery_action_port_adapter.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyChatDeliveryActionBridge
+    [[deprecated("Use ui_chat_runtime::ChatDeliveryActionPortAdapter")]] =
+        ::ui_chat_runtime::ChatDeliveryActionPortAdapter;
+using ::ui_chat_runtime::toDeliveryRef;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h b/modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h
new file mode 100644
index 00000000..7c1f1f54
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ui_chat_runtime/chat_delivery_event_projection_adapter.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyChatDeliveryEventBridge
+    [[deprecated("Use ui_chat_runtime::ChatDeliveryEventProjectionAdapter")]] =
+        ::ui_chat_runtime::ChatDeliveryEventProjectionAdapter;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_gps_status_source.h b/modules/ui_shared/include/ui/presentation_sources/legacy_gps_status_source.h
new file mode 100644
index 00000000..172cd769
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_gps_status_source.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/gps/gps_status_source.h"
+
+namespace ui::presentation_sources
+{
+
+class LegacyGpsStatusSource final : public ui::gps::IGpsStatusSource
+{
+  public:
+    bool buildGpsStatusSnapshot(ui::gps::GpsStatusSnapshot& out) const override;
+};
+
+LegacyGpsStatusSource& legacy_gps_status_source();
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h b/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h
new file mode 100644
index 00000000..0fada120
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ui_key_verification_runtime/key_verification_action_sink.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyKeyVerificationActionSink
+    [[deprecated("Use ui_key_verification_runtime::KeyVerificationActionSink")]] =
+        ::ui_key_verification_runtime::KeyVerificationActionSink;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h b/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h
new file mode 100644
index 00000000..256dabf1
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ui_key_verification_runtime/key_verification_session_adapter.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyKeyVerificationSession
+    [[deprecated("Use ui_key_verification_runtime::KeyVerificationSessionAdapter")]] =
+        ::ui_key_verification_runtime::KeyVerificationSessionAdapter;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h b/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h
new file mode 100644
index 00000000..6504cf29
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "ui_key_verification_runtime/key_verification_presentation_source.h"
+
+namespace ui::presentation_sources
+{
+
+using LegacyKeyVerificationSource
+    [[deprecated("Use ui_key_verification_runtime::KeyVerificationPresentationSource")]] =
+        ::ui_key_verification_runtime::KeyVerificationPresentationSource;
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h b/modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h
new file mode 100644
index 00000000..f5fbd156
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "ui/presentation_sources/legacy_map_presentation_state.h"
+#include "ui_presentation/gps/gps_status_source.h"
+#include "ui_presentation/map/map_action_sink.h"
+
+namespace ui::presentation_sources
+{
+
+// LegacyMapActionSink is a Phase 5.7 compatibility command adapter.
+//
+// Pattern:
+//   Command Sink / anti-corruption adapter.
+//
+// It translates presentation-level map actions into compatibility state while
+// tile rendering, GPS runtime, and rich overlay ownership remain legacy.
+//
+// It must not:
+//   - build MapWorkspaceSnapshot
+//   - touch LVGL widgets
+//   - load tile images
+//   - parse GPS data
+//   - write map storage directly
+//   - perform route planning or packet/radio work
+class LegacyMapActionSink final : public ui::map::IMapActionSink
+{
+  public:
+    LegacyMapActionSink(ui::gps::IGpsStatusSource& gps_source,
+                        LegacyMapPresentationState& state);
+
+    ui::UiActionResult centerOnSelf() override;
+    ui::UiActionResult setViewport(const ui::map::MapViewport& viewport) override;
+    ui::UiActionResult setLayer(ui::map::MapLayerKind layer,
+                                bool enabled) override;
+    ui::UiActionResult setActiveTool(ui::map::MapToolKind tool) override;
+    ui::UiActionResult clearMeasurement() override;
+
+  private:
+    ui::gps::IGpsStatusSource& gps_source_;
+    LegacyMapPresentationState& state_;
+};
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h b/modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h
new file mode 100644
index 00000000..d1f9d426
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "ui_map_runtime/map_overlay_snapshot_source.h"
+
+namespace ui
+{
+namespace presentation_sources
+{
+
+using IMapOverlayGpsSource = ::ui::map_overlay::IMapOverlayGpsSource;
+using IMapOverlayTeamSource = ::ui::map_overlay::IMapOverlayTeamSource;
+using LegacyMapOverlaySource
+    [[deprecated("Use ui::map_overlay::MapOverlaySnapshotSource")]] =
+        ::ui::map_overlay::MapOverlaySnapshotSource;
+
+} // namespace presentation_sources
+} // namespace ui
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h b/modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h
new file mode 100644
index 00000000..153d36a7
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "platform/ui/team_ui_store_runtime.h"
+#include "ui/presentation_sources/legacy_map_presentation_state.h"
+#include "ui_presentation/gps/gps_status_source.h"
+#include "ui_presentation/map/map_presentation_source.h"
+
+namespace ui::presentation_sources
+{
+
+// LegacyMapPresentationSource is a Phase 5.7 compatibility read adapter.
+//
+// Pattern:
+//   CQRS read model / projection / anti-corruption adapter.
+//
+// It may read legacy GPS and Team UI compatibility surfaces and project them
+// into ui_presentation::map snapshots.
+//
+// It must not:
+//   - load map tiles
+//   - mutate viewport state
+//   - access LVGL widgets
+//   - open SD card tile paths
+//   - perform route planning
+//   - expose Team raw payloads or rich marker objects
+class LegacyMapPresentationSource final : public ui::map::IMapPresentationSource
+{
+  public:
+    LegacyMapPresentationSource(ui::gps::IGpsStatusSource& gps_source,
+                                const LegacyMapPresentationState& state,
+                                team::ui::ITeamUiStore* team_store = nullptr);
+
+    bool buildMapWorkspaceSnapshot(
+        const ui::map::MapWorkspaceRequest& request,
+        ui::map::MapWorkspaceSnapshot& out) const override;
+
+  private:
+    ui::gps::IGpsStatusSource& gps_source_;
+    const LegacyMapPresentationState& state_;
+    team::ui::ITeamUiStore* team_store_ = nullptr;
+};
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_state.h b/modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_state.h
new file mode 100644
index 00000000..264b6f66
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_state.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "ui_presentation/map/map_workspace_snapshot.h"
+
+namespace ui::presentation_sources
+{
+
+// LegacyMapPresentationState is adapter-local compatibility state for Phase 5.7.
+//
+// It is not a map engine, tile cache, settings store, or GPS runtime. It only
+// carries presentation-level toggles that the Phase 5.7 legacy source/sink pair
+// share while map renderer/runtime ownership remains legacy.
+struct LegacyMapPresentationState
+{
+    ui::map::MapLayerState layers{};
+    ui::map::MeasurementState measurement{};
+    ui::map::MapViewport last_viewport{};
+    ui::map::MapToolKind active_tool = ui::map::MapToolKind::Pan;
+
+    bool has_viewport = false;
+    bool can_zoom_in = true;
+    bool can_zoom_out = true;
+    bool can_toggle_layers = true;
+};
+
+LegacyMapPresentationState& legacy_map_presentation_state();
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_mesh_status_source.h b/modules/ui_shared/include/ui/presentation_sources/legacy_mesh_status_source.h
new file mode 100644
index 00000000..00a30554
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_mesh_status_source.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/mesh/mesh_status_source.h"
+
+namespace ui::presentation_sources
+{
+
+class LegacyMeshStatusSource final : public ui::mesh::IMeshStatusSource
+{
+  public:
+    bool buildMeshStatusSnapshot(ui::mesh::MeshStatusSnapshot& out) const override;
+};
+
+LegacyMeshStatusSource& legacy_mesh_status_source();
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_settings_action_sink.h b/modules/ui_shared/include/ui/presentation_sources/legacy_settings_action_sink.h
new file mode 100644
index 00000000..35e88abc
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_settings_action_sink.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/settings/settings_action_sink.h"
+
+namespace ui::presentation_sources
+{
+
+class LegacySettingsActionSink final : public ui::settings::ISettingsActionSink
+{
+  public:
+    ui::UiActionResult applySetting(const ui::settings::SettingsPatchView& patch) override;
+};
+
+LegacySettingsActionSink& legacy_settings_action_sink();
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/legacy_settings_source.h b/modules/ui_shared/include/ui/presentation_sources/legacy_settings_source.h
new file mode 100644
index 00000000..f2be570b
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/legacy_settings_source.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ui_presentation/settings/settings_source.h"
+
+namespace ui::presentation_sources
+{
+
+class LegacySettingsSource final : public ui::settings::ISettingsSource
+{
+  public:
+    bool buildSettingsSnapshot(ui::settings::SettingsSnapshot& out) const override;
+};
+
+LegacySettingsSource& legacy_settings_source();
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h b/modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h
new file mode 100644
index 00000000..ea33a8a6
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include "team/domain/team_types.h"
+#include "team/protocol/team_chat.h"
+#include "ui_presentation/chat/chat_action_sink.h"
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace team
+{
+namespace ui
+{
+class ITeamUiStore;
+}
+} // namespace team
+
+namespace ui::presentation_sources
+{
+
+class ITeamChatCommandPort
+{
+  public:
+    virtual ~ITeamChatCommandPort() = default;
+
+    virtual bool setKeysFromPsk(const ::team::TeamId& team_id,
+                                uint32_t key_id,
+                                const uint8_t* psk,
+                                size_t psk_len) = 0;
+    virtual bool sendTeamChat(const ::team::proto::TeamChatMessage& message,
+                              uint8_t team_channel_raw) = 0;
+};
+
+// TeamChatActionSink is the Phase 5.6-f command adapter for team chat.
+//
+// Pattern:
+//   Command Sink / Bounded Presentation Context.
+//
+// It handles ConversationKind::Team actions only. It must not send Team
+// through LegacyChatActionSink or core chat direct/channel send paths.
+class TeamChatActionSink final : public ui::chat::IChatActionSink
+{
+  public:
+    TeamChatActionSink(::team::ui::ITeamUiStore& team_store,
+                       ITeamChatCommandPort* command_port,
+                       uint8_t team_channel_raw = 2);
+
+    ui::UiActionResult selectConversation(ui::chat::ConversationId id) override;
+    ui::UiActionResult sendMessage(const ui::chat::SendMessageView& message) override;
+    ui::UiActionResult markRead(ui::chat::ConversationId id) override;
+
+  private:
+    ::team::ui::ITeamUiStore& team_store_;
+    ITeamChatCommandPort* command_port_ = nullptr;
+    uint8_t team_channel_raw_ = 2;
+    uint32_t next_message_id_ = 1;
+};
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h b/modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h
new file mode 100644
index 00000000..905cc68b
--- /dev/null
+++ b/modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "ui_presentation/chat/chat_presentation_source.h"
+
+namespace team
+{
+namespace ui
+{
+class ITeamUiStore;
+}
+} // namespace team
+
+namespace ui::presentation_sources
+{
+
+// TeamChatPresentationSource is the Phase 5.6-f read adapter for team-scoped
+// chat presentation.
+//
+// Pattern:
+//   Bounded Presentation Context / Projection / Anti-Corruption Adapter.
+//
+// It projects TeamUiStore/TeamUiSnapshot/TeamChatLogEntry state into
+// ui_presentation chat rows using ConversationKind::Team.
+//
+// It must not:
+//   - map Team into chat::ConversationId
+//   - use toCoreConversationId
+//   - send team messages
+//   - access LVGL widgets
+//   - build radio packets or direct messages
+class TeamChatPresentationSource final : public ui::chat::IChatPresentationSource
+{
+  public:
+    explicit TeamChatPresentationSource(::team::ui::ITeamUiStore& team_store);
+
+    bool buildChatWorkspaceSnapshot(
+        const ui::chat::ChatWorkspaceRequest& request,
+        ui::chat::ChatWorkspaceSnapshot& out) const override;
+
+  private:
+    ::team::ui::ITeamUiStore& team_store_;
+};
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/include/ui/screens/chat/chat_conversation_components.h b/modules/ui_shared/include/ui/screens/chat/chat_conversation_components.h
index 568319b7..47e9f255 100644
--- a/modules/ui_shared/include/ui/screens/chat/chat_conversation_components.h
+++ b/modules/ui_shared/include/ui/screens/chat/chat_conversation_components.h
@@ -12,8 +12,14 @@
 #include "chat_conversation_input.h"
 #include "lvgl.h"
 #include "ui/widgets/top_bar.h"
+#include "ui_presentation/chat/chat_message_ref.h"
 #include <vector>
 
+namespace ui::chat
+{
+struct MessageRow;
+}
+
 namespace chat
 {
 namespace ui
@@ -30,7 +36,7 @@ class ChatConversationScreen
     ChatConversationScreen(lv_obj_t* parent, chat::ConversationId conv);
     ~ChatConversationScreen();
 
-    void addMessage(const chat::ChatMessage& msg);
+    void addMessage(const ::ui::chat::MessageRow& row);
     void clearMessages();
     void scrollToBottom();
     bool updateMessageStatus(chat::MessageId msg_id, chat::MessageStatus status);
@@ -107,7 +113,9 @@ class ChatConversationScreen
 
     struct MessageItem
     {
-        chat::ChatMessage msg;
+        ::ui::chat::MessageRef ref;
+        ::ui::chat::MessageDeliveryState delivery =
+            ::ui::chat::MessageDeliveryState::Unknown;
         lv_obj_t* container = nullptr;    // row
         lv_obj_t* text_label = nullptr;   // inside bubble
         lv_obj_t* time_label = nullptr;   // reserved (not used)
@@ -123,7 +131,7 @@ class ChatConversationScreen
     ActionContext reply_ctx_{};
     bool reply_enabled_ = true;
 
-    void createMessageItem(const chat::ChatMessage& msg);
+    void createMessageItem(const ::ui::chat::MessageRow& row);
 
     static void action_event_cb(lv_event_t* e);
     static void async_action_cb(void* user_data);
diff --git a/modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h b/modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h
new file mode 100644
index 00000000..d363436f
--- /dev/null
+++ b/modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_chat_runtime/chat_page_runtime_event_pump.h"
diff --git a/modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h b/modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h
index 00217f14..206a3fb0 100644
--- a/modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h
+++ b/modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h
@@ -13,18 +13,40 @@
 #include "ui/screens/chat/chat_compose_components.h"
 #include "ui/screens/chat/chat_conversation_components.h"
 #include "ui/screens/chat/chat_message_list_components.h"
+#include "ui/team_actions/team_action_sink.h"
 #include "ui/widgets/ime/ime_widget.h"
+#include "ui_chat_runtime/chat_ui_refresh_sink.h"
+#include "ui_lvgl_ux_packs/common/key_verification_modal_renderer.h"
+#include "ui_lvgl_ux_packs/common/team_position_picker_renderer.h"
+#include "ui_presentation/chat/chat_workspace_model.h"
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
+namespace ui::key_verification
+{
+class KeyVerificationModel;
+struct KeyVerificationSnapshot;
+} // namespace ui::key_verification
+
 namespace chat
 {
 namespace ui
 {
 
-class UiController : public IChatUiRuntime
+// Phase 5.6 note:
+//
+// UiController is still a legacy application controller. It has started
+// consuming ChatWorkspaceModel for the non-team direct/channel chat path and a
+// dedicated Team ChatWorkspaceModel for team text projection/send, but it still
+// owns legacy responsibilities such as event handling, Team location/command
+// flows, key verification, conversation cache, and ChatService lifecycle calls.
+//
+// Do not add new direct ChatService rendering logic here unless it is
+// documented as legacy ownership. New non-team chat presentation should flow
+// through ChatWorkspaceModel.
+class UiController : public IChatUiRefreshSink
 {
   public:
     using State = ChatUiState;
@@ -32,34 +54,53 @@ class UiController : public IChatUiRuntime
 
     UiController(lv_obj_t* parent,
                  chat::ChatService& service,
+                 ::ui::chat::ChatWorkspaceModel& chat_model,
+                 ::ui::chat::ChatWorkspaceModel& team_chat_model,
+                 ::ui::team_actions::ITeamActionSink* team_action_sink = nullptr,
+                 ::ui::key_verification::KeyVerificationModel*
+                     key_verification_model = nullptr,
                  chat::ChannelId initial_channel = chat::ChannelId::PRIMARY,
                  ExitRequestCallback exit_request = nullptr,
                  void* exit_request_user_data = nullptr);
     ~UiController();
 
     void init();
-    void update() override;
+    void update();
     void onInput(const sys::InputEvent& event);
-    void onChatEvent(sys::Event* event) override;
     void backToList();
     void handleConversationAction(ChatConversationScreen::ActionIntent intent);
     void handleComposeAction(ChatComposeScreen::ActionIntent intent);
     void exitToMenu();
 
-    State getState() const override { return state_; }
-    bool isTeamConversationActive() const override { return team_conv_active_; }
+    State getState() const { return state_; }
+    bool isTeamConversationActive() const { return team_conv_active_; }
     lv_obj_t* getParent() const { return parent_; }
     void onChannelClicked(chat::ConversationId conv);
+    void onRuntimeMessageArrived(chat::MessageId msg_id) override;
+    void onRuntimeSendResult(chat::MessageId msg_id) override;
+    void onRuntimeUnreadChanged() override;
+    void showKeyVerification(
+        const ::ui::key_verification::KeyVerificationSnapshot& snapshot) override;
 
   private:
     lv_obj_t* parent_;
+    // Legacy ownership:
+    // ChatService is still required here for event processing, team legacy
+    // path, key verification, and compatibility refresh flows. Non-team
+    // presentation should migrate toward ChatWorkspaceModel.
     chat::ChatService& service_;
+    ::ui::chat::ChatWorkspaceModel& chat_model_;
+    ::ui::chat::ChatWorkspaceModel& team_chat_model_;
+    ::ui::team_actions::ITeamActionSink* team_action_sink_ = nullptr;
+    ::ui::key_verification::KeyVerificationModel* key_verification_model_ =
+        nullptr;
     State state_;
 
     std::unique_ptr<ChatMessageListScreen> channel_list_;
     std::unique_ptr<ChatConversationScreen> conversation_;
     std::unique_ptr<ChatComposeScreen> compose_;
     std::unique_ptr<::ui::widgets::ImeWidget> compose_ime_;
+    std::unique_ptr<TeamPositionPickerRenderer> team_position_picker_;
 
     chat::ChannelId current_channel_;
     chat::ConversationId current_conv_;
@@ -80,6 +121,8 @@ class UiController : public IChatUiRuntime
     void refreshUnreadCounts(bool force_reload);
     void cleanupComposeIme();
     bool isTeamConversation(const chat::ConversationId& conv) const;
+    bool loadChatSnapshot();
+    bool loadTeamChatSnapshot();
     void syncConversationListFromStore();
     void normalizeConversationNames(std::vector<chat::ConversationMeta>& convs) const;
     std::string resolveConversationDisplayName(const chat::ConversationId& conv) const;
@@ -87,9 +130,14 @@ class UiController : public IChatUiRuntime
     void updateConversationMetaForMessage(const chat::ChatMessage& msg, bool increment_unread);
     bool updateConversationViewForIncoming(const chat::ChatMessage& msg);
     void reloadConversationView();
+    // Phase 5.6-f: Team text projection now flows through team_chat_model_.
+    // Team location and command rendering remain a bounded legacy path until
+    // their richer presentation shape is defined.
     void refreshTeamConversation();
     void startTeamConversationTimer();
     void stopTeamConversationTimer();
+    // Phase 7.2: Team location/command sends flow through Team action sinks.
+    // Rich Team payload rendering remains bounded legacy.
     bool sendTeamLocationWithIcon(uint8_t icon_id);
     void openTeamPositionPicker();
     void closeTeamPositionPicker(bool restore_group);
@@ -98,44 +146,23 @@ class UiController : public IChatUiRuntime
     void onTeamPositionCancel();
     bool isTeamPositionPickerOpen() const;
     bool isKeyVerificationModalOpen() const;
-    void openKeyVerificationNumberModal(chat::NodeId node_id, uint64_t nonce);
-    void openKeyVerificationInfoModal(chat::NodeId node_id, uint32_t number);
-    void openKeyVerificationFinalModal(chat::NodeId node_id, const char* code, bool is_sender);
+    void destroyKeyVerificationModal(bool restore_group);
+    void renderKeyVerificationModal(
+        const ::ui::key_verification::KeyVerificationSnapshot& snapshot);
     void closeKeyVerificationModal(bool restore_group);
-    void submitKeyVerificationNumber();
+    void submitKeyVerificationInput();
     void trustKeyFromVerificationModal();
     void clearKeyVerificationError();
 
-    struct TeamPositionIconEventCtx
-    {
-        UiController* controller = nullptr;
-        uint8_t icon_id = 0;
-    };
-
-    std::vector<TeamPositionIconEventCtx*> team_position_icon_ctxs_;
-    lv_obj_t* team_position_picker_overlay_ = nullptr;
-    lv_obj_t* team_position_picker_panel_ = nullptr;
-    lv_obj_t* team_position_picker_desc_ = nullptr;
-    lv_group_t* team_position_picker_group_ = nullptr;
-    lv_group_t* team_position_prev_group_ = nullptr;
-
-    lv_obj_t* key_verify_overlay_ = nullptr;
-    lv_obj_t* key_verify_panel_ = nullptr;
-    lv_obj_t* key_verify_desc_ = nullptr;
-    lv_obj_t* key_verify_textarea_ = nullptr;
-    lv_obj_t* key_verify_error_label_ = nullptr;
-    lv_group_t* key_verify_group_ = nullptr;
-    lv_group_t* key_verify_prev_group_ = nullptr;
+    KeyVerificationModalRefs key_verify_modal_;
     std::unique_ptr<::ui::widgets::ImeWidget> key_verify_ime_;
-    chat::NodeId key_verify_node_id_ = 0;
-    uint64_t key_verify_nonce_ = 0;
-    bool key_verify_expects_number_ = false;
-    bool key_verify_can_trust_ = false;
     std::vector<chat::ConversationMeta> cached_conversations_;
+    // Chat snapshots are large enough to overflow ESP loopTask when copied on
+    // the stack during page entry. Reuse controller-owned buffers instead.
+    ::ui::chat::ChatWorkspaceSnapshot chat_snapshot_buffer_{};
+    ::ui::chat::ChatWorkspaceSnapshot team_chat_snapshot_buffer_{};
     bool conversation_list_dirty_ = true;
 
-    static void team_position_icon_event_cb(lv_event_t* e);
-    static void team_position_cancel_event_cb(lv_event_t* e);
     static void key_verify_submit_event_cb(lv_event_t* e);
     static void key_verify_close_event_cb(lv_event_t* e);
     static void key_verify_trust_event_cb(lv_event_t* e);
diff --git a/modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h b/modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h
new file mode 100644
index 00000000..8c902e9d
--- /dev/null
+++ b/modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_chat_runtime/chat_ui_refresh_sink.h"
diff --git a/modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h b/modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h
new file mode 100644
index 00000000..09475850
--- /dev/null
+++ b/modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/common/key_verification_modal_renderer.h"
diff --git a/modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h b/modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h
new file mode 100644
index 00000000..79ad9857
--- /dev/null
+++ b/modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_lvgl_ux_packs/common/team_position_picker_renderer.h"
diff --git a/modules/ui_shared/include/ui/screens/chat_watch/chat_conversation_components_watch.h b/modules/ui_shared/include/ui/screens/chat_watch/chat_conversation_components_watch.h
index 7f8aed17..8515e8ed 100644
--- a/modules/ui_shared/include/ui/screens/chat_watch/chat_conversation_components_watch.h
+++ b/modules/ui_shared/include/ui/screens/chat_watch/chat_conversation_components_watch.h
@@ -2,8 +2,14 @@
 
 #include "chat/domain/chat_types.h"
 #include "lvgl.h"
+#include "ui_presentation/chat/chat_message_ref.h"
 #include <vector>
 
+namespace ui::chat
+{
+struct MessageRow;
+}
+
 namespace chat::ui
 {
 
@@ -18,7 +24,7 @@ class ChatConversationScreen
     ChatConversationScreen(lv_obj_t* parent, chat::ConversationId conv);
     ~ChatConversationScreen();
 
-    void addMessage(const chat::ChatMessage& msg);
+    void addMessage(const ::ui::chat::MessageRow& row);
     void clearMessages();
     void scrollToBottom();
     bool updateMessageStatus(chat::MessageId msg_id, chat::MessageStatus status);
@@ -62,7 +68,9 @@ class ChatConversationScreen
 
     struct MessageItem
     {
-        chat::ChatMessage msg;
+        ::ui::chat::MessageRef ref;
+        ::ui::chat::MessageDeliveryState delivery =
+            ::ui::chat::MessageDeliveryState::Unknown;
         lv_obj_t* container = nullptr;
         lv_obj_t* text_label = nullptr;
     };
@@ -86,6 +94,8 @@ class ChatConversationScreen
     LifetimeGuard* guard_ = nullptr;
     bool reply_enabled_ = true;
 
+    void createMessageItem(const ::ui::chat::MessageRow& row);
+
     void schedule_action_async(ActionIntent intent);
     void schedule_back_async();
 
diff --git a/modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h b/modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h
new file mode 100644
index 00000000..9f255fa9
--- /dev/null
+++ b/modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_gps_runtime/gps_page_runtime_pump.h"
diff --git a/modules/ui_shared/include/ui/screens/gps/gps_state.h b/modules/ui_shared/include/ui/screens/gps/gps_state.h
index a815bc60..f4ae508c 100644
--- a/modules/ui_shared/include/ui/screens/gps/gps_state.h
+++ b/modules/ui_shared/include/ui/screens/gps/gps_state.h
@@ -69,6 +69,7 @@ struct GPSPageState
 
     MapAnchor anchor = {0};
     std::vector<MapTile> tiles;
+    ui::map_tiles::MapTileRenderQueue tile_render_queue;
     TileContext tile_ctx;
 
     uint32_t initial_load_ms = 0;
diff --git a/modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h b/modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h
new file mode 100644
index 00000000..48a8f7c3
--- /dev/null
+++ b/modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "ui_gps_runtime/gps_ui_refresh_sink.h"
diff --git a/modules/ui_shared/include/ui/screens/node_info/node_info_page_components.h b/modules/ui_shared/include/ui/screens/node_info/node_info_page_components.h
index afdbe5af..be296240 100644
--- a/modules/ui_shared/include/ui/screens/node_info/node_info_page_components.h
+++ b/modules/ui_shared/include/ui/screens/node_info/node_info_page_components.h
@@ -32,6 +32,7 @@ struct NodeInfoWidgets
     lv_obj_t* map_stage = nullptr;
     lv_obj_t* tile_layer = nullptr;
     lv_obj_t* map_overlay_layer = nullptr;
+    lv_obj_t* node_overlay_layer = nullptr;
     lv_obj_t* map_gesture_surface = nullptr;
 
     lv_obj_t* id_label = nullptr;
diff --git a/modules/ui_shared/include/ui/screens/settings/settings_state.h b/modules/ui_shared/include/ui/screens/settings/settings_state.h
index 754404d5..f91b8ec7 100644
--- a/modules/ui_shared/include/ui/screens/settings/settings_state.h
+++ b/modules/ui_shared/include/ui/screens/settings/settings_state.h
@@ -72,7 +72,9 @@ struct SettingsData
     int chat_protocol = 1;
     int chat_region = 0;
     int chat_channel = 0;
-    char chat_psk[33] = {};
+    char chat_psk[65] = {};
+    int chat_message_alerts = 1;
+    int chat_contact_alerts = 1;
 
     // Network
     int net_use_preset = 1;
@@ -136,6 +138,7 @@ struct SettingsData
     char fw_current_version[24] = "";
     char fw_latest_version[24] = "";
     char fw_update_status[96] = "";
+    char settings_backup_status[96] = "";
     bool advanced_debug_logs = false;
 };
 
diff --git a/modules/ui_shared/include/ui/startup_shell.h b/modules/ui_shared/include/ui/startup_shell.h
index 65d60181..3b002ed4 100644
--- a/modules/ui_shared/include/ui/startup_shell.h
+++ b/modules/ui_shared/include/ui/startup_shell.h
@@ -14,6 +14,7 @@ struct Hooks
 {
     app::IAppMessagingFacade* messaging = nullptr;
     AppCatalog apps{};
+    const char* ux_pack_id = nullptr;
     menu_runtime::Hooks::WatchFaceHooks watch_face{};
     void (*set_max_brightness)() = nullptr;
     void (*show_main_menu)() = nullptr;
diff --git a/modules/ui_shared/include/ui/startup_ui_shell.h b/modules/ui_shared/include/ui/startup_ui_shell.h
index ce73b47f..461cbc5d 100644
--- a/modules/ui_shared/include/ui/startup_ui_shell.h
+++ b/modules/ui_shared/include/ui/startup_ui_shell.h
@@ -10,6 +10,7 @@ namespace ui::startup_ui_shell
 struct Hooks
 {
     AppCatalog apps{};
+    const char* ux_pack_id = nullptr;
     bool (*lock_ui)(uint32_t timeout_ms) = nullptr;
     void (*unlock_ui)() = nullptr;
     uint32_t lock_timeout_ms = 1000;
diff --git a/modules/ui_shared/include/ui/support/lvgl_fs_utils.h b/modules/ui_shared/include/ui/support/lvgl_fs_utils.h
index 8fc27529..5d21ef3d 100644
--- a/modules/ui_shared/include/ui/support/lvgl_fs_utils.h
+++ b/modules/ui_shared/include/ui/support/lvgl_fs_utils.h
@@ -4,9 +4,10 @@
 
 #include <string>
 
-#if defined(ARDUINO_ARCH_ESP32) && __has_include(<FFat.h>)
+#if (defined(ARDUINO_ARCH_ESP32) || defined(ESP_PLATFORM) || defined(ARDUINO)) && __has_include(<FFat.h>)
 #include <FFat.h>
 #include <cstdio>
+#include <sys/stat.h>
 #define UI_FS_HAS_FLASH_PACK_STORAGE 1
 #else
 #define UI_FS_HAS_FLASH_PACK_STORAGE 0
@@ -22,6 +23,15 @@ inline bool ensure_flash_storage_ready(bool allow_format_on_fail = false)
     static bool mount_attempted = false;
     static bool format_mount_attempted = false;
 
+    struct stat st
+    {
+    };
+    if (::stat("/fs", &st) == 0 && S_ISDIR(st.st_mode))
+    {
+        mounted = true;
+        return true;
+    }
+
     if (mounted)
     {
         return true;
@@ -70,14 +80,15 @@ inline std::string normalize_path(const char* path)
         return std::string(path);
     }
 
-#if UI_FS_HAS_FLASH_PACK_STORAGE
     if ((path[0] == '/' && path[1] == 'f' && path[2] == 's' &&
          (path[3] == '\0' || path[3] == '/')))
     {
+#if UI_FS_HAS_FLASH_PACK_STORAGE
         if (!ensure_flash_storage_ready(false))
         {
             return {};
         }
+#endif
 
         const char* relative = path + 3;
         if (*relative == '\0')
@@ -86,7 +97,6 @@ inline std::string normalize_path(const char* path)
         }
         return std::string("F:") + relative;
     }
-#endif
 
     if (path[0] == '/')
     {
diff --git a/modules/ui_shared/include/ui/team_actions/legacy_team_action_bridge.h b/modules/ui_shared/include/ui/team_actions/legacy_team_action_bridge.h
new file mode 100644
index 00000000..eb99ea85
--- /dev/null
+++ b/modules/ui_shared/include/ui/team_actions/legacy_team_action_bridge.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "platform/ui/team_ui_store_runtime.h"
+#include "ui/presentation_sources/team_chat_action_sink.h"
+#include "ui/team_actions/team_action_sink.h"
+
+#include <stdint.h>
+
+namespace ui::team_actions
+{
+
+// LegacyTeamActionBridge is a Phase 7.2 anti-corruption bridge.
+//
+// Pattern:
+//   Command Sink / Anti-Corruption Adapter / Strangler Fig.
+//
+// It translates presentation-level Team actions into existing Team runtime
+// helpers.
+//
+// It must not:
+//   - build ChatWorkspaceSnapshot
+//   - access LVGL widgets
+//   - map Team to DirectPeer/Channel
+//   - use LegacyChatActionSink
+//   - expose raw packet encoding to ChatUiController
+class LegacyTeamActionBridge final : public ITeamActionSink
+{
+  public:
+    LegacyTeamActionBridge(
+        ::team::ui::ITeamUiStore& team_store,
+        ::ui::presentation_sources::ITeamChatCommandPort* command_port,
+        ITeamLocationSource* location_source = nullptr,
+        uint8_t team_channel_raw = 2);
+
+    ui::UiActionResult sendTeamAction(
+        const TeamActionRequest& request) override;
+
+  private:
+    ui::UiActionResult sendText(const TeamActionRequest& request);
+    ui::UiActionResult sendLocationMarker(const TeamActionRequest& request);
+    ui::UiActionResult sendCommand(const TeamActionRequest& request);
+
+    ::team::ui::ITeamUiStore& team_store_;
+    ::ui::presentation_sources::ITeamChatCommandPort* command_port_ = nullptr;
+    ITeamLocationSource* location_source_ = nullptr;
+    uint8_t team_channel_raw_ = 2;
+    uint32_t next_message_id_ = 1;
+};
+
+} // namespace ui::team_actions
diff --git a/modules/ui_shared/include/ui/team_actions/team_action_sink.h b/modules/ui_shared/include/ui/team_actions/team_action_sink.h
new file mode 100644
index 00000000..67c03023
--- /dev/null
+++ b/modules/ui_shared/include/ui/team_actions/team_action_sink.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "ui/team_actions/team_action_types.h"
+#include "ui_presentation/common/ui_action_result.h"
+
+namespace ui::team_actions
+{
+
+class ITeamActionSink
+{
+  public:
+    virtual ~ITeamActionSink() = default;
+
+    virtual ui::UiActionResult sendTeamAction(
+        const TeamActionRequest& request) = 0;
+};
+
+class ITeamLocationSource
+{
+  public:
+    virtual ~ITeamLocationSource() = default;
+
+    virtual bool currentTeamLocation(TeamLocationSnapshot& out) = 0;
+};
+
+} // namespace ui::team_actions
diff --git a/modules/ui_shared/include/ui/team_actions/team_action_types.h b/modules/ui_shared/include/ui/team_actions/team_action_types.h
new file mode 100644
index 00000000..f4b900af
--- /dev/null
+++ b/modules/ui_shared/include/ui/team_actions/team_action_types.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace ui::team_actions
+{
+
+enum class TeamActionKind : uint8_t
+{
+    Text,
+    LocationMarker,
+    Command,
+};
+
+enum class TeamCommandKind : uint8_t
+{
+    Unknown,
+    RallyPoint,
+    MoveTo,
+    Hold,
+    Custom,
+};
+
+struct TeamLocationMarkerRequest
+{
+    bool use_current_location = false;
+    double lat = 0.0;
+    double lon = 0.0;
+    bool has_altitude = false;
+    double altitude_m = 0.0;
+    float accuracy_m = 0.0f;
+    uint32_t timestamp = 0;
+    uint8_t marker_icon = 0;
+    const char* label = nullptr;
+};
+
+struct TeamLocationSnapshot
+{
+    bool valid = false;
+    double lat = 0.0;
+    double lon = 0.0;
+    bool has_altitude = false;
+    double altitude_m = 0.0;
+    float accuracy_m = 0.0f;
+    uint32_t timestamp = 0;
+};
+
+struct TeamCommandRequest
+{
+    TeamCommandKind kind = TeamCommandKind::Unknown;
+    double lat = 0.0;
+    double lon = 0.0;
+    uint16_t radius_m = 0;
+    uint8_t priority = 0;
+    const char* payload = nullptr;
+};
+
+struct TeamActionRequest
+{
+    TeamActionKind kind = TeamActionKind::Text;
+    const char* text = nullptr;
+    TeamLocationMarkerRequest location;
+    TeamCommandRequest command;
+};
+
+} // namespace ui::team_actions
diff --git a/modules/ui_shared/include/ui/team_presentation/team_rich_payload_display.h b/modules/ui_shared/include/ui/team_presentation/team_rich_payload_display.h
new file mode 100644
index 00000000..984ca8c3
--- /dev/null
+++ b/modules/ui_shared/include/ui/team_presentation/team_rich_payload_display.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "ui_presentation/common/fixed_text.h"
+
+#include <stdint.h>
+
+namespace ui::team_presentation
+{
+
+enum class TeamRichPayloadKind : uint8_t
+{
+    None,
+    Text,
+    Location,
+    Command,
+    Unsupported,
+};
+
+enum class TeamCommandDisplayKind : uint8_t
+{
+    Unknown,
+    MoveTo,
+    RallyPoint,
+    Hold,
+    Help,
+    CheckIn,
+    Custom,
+};
+
+struct TeamLocationDisplay
+{
+    double lat = 0.0;
+    double lon = 0.0;
+    bool has_altitude = false;
+    float altitude_m = 0.0f;
+    uint8_t marker_icon = 0;
+};
+
+struct TeamCommandDisplay
+{
+    TeamCommandDisplayKind kind = TeamCommandDisplayKind::Unknown;
+    double lat = 0.0;
+    double lon = 0.0;
+    float radius_m = 0.0f;
+    uint8_t priority = 0;
+};
+
+struct TeamRichPayloadDisplay
+{
+    TeamRichPayloadKind kind = TeamRichPayloadKind::None;
+
+    ui::FixedText<32> title;
+    ui::FixedText<96> summary;
+    ui::FixedText<32> badge;
+
+    TeamLocationDisplay location;
+    TeamCommandDisplay command;
+};
+
+} // namespace ui::team_presentation
diff --git a/modules/ui_shared/include/ui/team_presentation/team_rich_payload_projector.h b/modules/ui_shared/include/ui/team_presentation/team_rich_payload_projector.h
new file mode 100644
index 00000000..c4bd298f
--- /dev/null
+++ b/modules/ui_shared/include/ui/team_presentation/team_rich_payload_projector.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "platform/ui/team_ui_store_runtime.h"
+#include "ui/team_presentation/team_rich_payload_display.h"
+
+namespace ui::team_presentation
+{
+
+class TeamRichPayloadProjector
+{
+  public:
+    bool project(const ::team::ui::TeamChatLogEntry& entry,
+                 TeamRichPayloadDisplay& out) const;
+};
+
+} // namespace ui::team_presentation
diff --git a/modules/ui_shared/include/ui/widgets/map/map_viewport.h b/modules/ui_shared/include/ui/widgets/map/map_viewport.h
index 99e5d697..01e23504 100644
--- a/modules/ui_shared/include/ui/widgets/map/map_viewport.h
+++ b/modules/ui_shared/include/ui/widgets/map/map_viewport.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "lvgl.h"
+#include "ui_presentation/map/map_overlay_snapshot.h"
 
 #include <cstdint>
 #include <string>
@@ -116,6 +117,7 @@ class Runtime
     friend const Widgets& widgets(const Runtime& runtime);
     friend void set_size(Runtime& runtime, lv_coord_t width, lv_coord_t height);
     friend void apply_model(Runtime& runtime, const Model& model);
+    friend void apply_overlay(Runtime& runtime, const ui::map::MapOverlaySnapshot& overlay);
     friend void clear(Runtime& runtime);
     friend bool project_point(const Runtime& runtime, const GeoPoint& point, lv_point_t& out_screen_point);
     friend Status status(const Runtime& runtime);
@@ -129,6 +131,7 @@ void destroy(Runtime& runtime);
 const Widgets& widgets(const Runtime& runtime);
 void set_size(Runtime& runtime, lv_coord_t width, lv_coord_t height);
 void apply_model(Runtime& runtime, const Model& model);
+void apply_overlay(Runtime& runtime, const ui::map::MapOverlaySnapshot& overlay);
 void clear(Runtime& runtime);
 bool project_point(const Runtime& runtime, const GeoPoint& point, lv_point_t& out_screen_point);
 bool preview_project_point(lv_obj_t* viewport_root, const Model& model, const GeoPoint& point, lv_point_t& out_screen_point);
diff --git a/modules/ui_shared/library.json b/modules/ui_shared/library.json
index 4499d513..dd21fea8 100644
--- a/modules/ui_shared/library.json
+++ b/modules/ui_shared/library.json
@@ -10,7 +10,39 @@
                                 "-I../../modules/core_chat/include",
                                 "-I../../modules/core_gps/include",
                                 "-I../../modules/core_hostlink/include",
-                                "-I../../modules/core_team/include"
+                                "-I../../modules/core_team/include",
+                                "-I../../modules/ui_presentation/include",
+                                "-I../../modules/chat_presentation_adapters/include",
+                                "-I../../modules/ui_chat_runtime/include",
+                                "-I../../modules/ui_map_runtime/include",
+                                "-I../../modules/ui_gps_runtime/include",
+                                "-I../../modules/ui_key_verification_runtime/include",
+                                "-I../../modules/ui_legacy_adapters/include",
+                                "-I../../modules/ui_lvgl_core/include",
+                                "-I../../modules/ui_lvgl_ux_packs/include"
                             ]
-              }
+              },
+    "dependencies":  [
+                         {
+                             "name":  "chat_presentation_adapters"
+                         },
+                         {
+                             "name":  "ui_chat_runtime"
+                         },
+                         {
+                             "name":  "ui_map_runtime"
+                         },
+                         {
+                             "name":  "ui_gps_runtime"
+                         },
+                         {
+                             "name":  "ui_key_verification_runtime"
+                         },
+                         {
+                             "name":  "ui_legacy_adapters"
+                         },
+                         {
+                             "name":  "ui_lvgl_ux_packs"
+                         }
+                     ]
 }
diff --git a/modules/ui_shared/src/ui/assets/fonts/font_utils.cpp b/modules/ui_shared/src/ui/assets/fonts/font_utils.cpp
index bf782423..36d4c21f 100644
--- a/modules/ui_shared/src/ui/assets/fonts/font_utils.cpp
+++ b/modules/ui_shared/src/ui/assets/fonts/font_utils.cpp
@@ -5,7 +5,7 @@ namespace ui::fonts
 namespace
 {
 
-constexpr std::size_t kMaxLocalizedFontBindings = 32;
+constexpr std::size_t kMaxLocalizedFontBindings = 128;
 LocalizedFontBinding s_localized_font_bindings[kMaxLocalizedFontBindings]{};
 
 } // namespace
diff --git a/modules/ui_shared/src/ui/components/air_status_footer.cpp b/modules/ui_shared/src/ui/components/air_status_footer.cpp
index f99e5c02..01ced1db 100644
--- a/modules/ui_shared/src/ui/components/air_status_footer.cpp
+++ b/modules/ui_shared/src/ui/components/air_status_footer.cpp
@@ -1,19 +1,12 @@
 #include "ui/components/air_status_footer.h"
 
-#include "app/app_config.h"
-#include "app/app_facade_access.h"
-#include "chat/infra/mesh_protocol_utils.h"
-#include "chat/infra/meshcore/mc_region_presets.h"
-#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "ui/assets/fonts/font_utils.h"
 #include "ui/components/two_pane_layout.h"
 #include "ui/components/two_pane_styles.h"
 #include "ui/localization.h"
 #include "ui/page/page_profile.h"
-
-#include <cmath>
-#include <cstdio>
-#include <string>
+#include "ui/presentation_sources/legacy_air_device_status_source.h"
+#include "ui_presentation/device/device_status_model.h"
 
 namespace ui::components::air_status_footer
 {
@@ -23,111 +16,11 @@ namespace
 constexpr lv_coord_t kFooterHeightCompact = 36;
 constexpr lv_coord_t kFooterHeightLarge = 44;
 
-void format_bw_text(float bw_khz, char* out, size_t out_len)
+::ui::device::DeviceStatusModel& deviceStatusModel()
 {
-    if (!out || out_len == 0)
-    {
-        return;
-    }
-
-    if (!std::isfinite(bw_khz) || bw_khz <= 0.0f)
-    {
-        std::snprintf(out, out_len, "BW-");
-        return;
-    }
-
-    const float rounded = std::round(bw_khz);
-    if (std::fabs(bw_khz - rounded) < 0.05f)
-    {
-        std::snprintf(out, out_len, "BW%.0fk", static_cast<double>(bw_khz));
-    }
-    else
-    {
-        std::snprintf(out, out_len, "BW%.1fk", static_cast<double>(bw_khz));
-    }
-}
-
-void format_summary_and_detail(char* summary,
-                               size_t summary_len,
-                               char* detail,
-                               size_t detail_len)
-{
-    if (!summary || summary_len == 0 || !detail || detail_len == 0)
-    {
-        return;
-    }
-
-    summary[0] = '\0';
-    detail[0] = '\0';
-
-    const app::AppConfig& cfg = app::configFacade().getConfig();
-    const chat::MeshProtocol protocol = cfg.mesh_protocol;
-    const char* protocol_name = chat::infra::meshProtocolName(protocol);
-
-    float freq_mhz = 0.0f;
-    float bw_khz = 0.0f;
-    uint8_t sf = 0;
-    uint8_t cr = 0;
-
-    if (protocol == chat::MeshProtocol::Meshtastic)
-    {
-        const chat::meshtastic::RadioConfig radio =
-            chat::meshtastic::deriveRadioConfig(cfg.meshtastic_config);
-        freq_mhz = radio.freq_mhz;
-        bw_khz = radio.bw_khz;
-        sf = radio.sf;
-        cr = radio.cr_denom;
-    }
-    else if (protocol == chat::MeshProtocol::MeshCore)
-    {
-        const chat::MeshConfig& mesh = cfg.meshcore_config;
-        freq_mhz = mesh.meshcore_freq_mhz;
-        bw_khz = mesh.meshcore_bw_khz;
-        sf = mesh.meshcore_sf;
-        cr = mesh.meshcore_cr;
-
-        if (mesh.meshcore_region_preset > 0)
-        {
-            if (const chat::meshcore::RegionPreset* preset =
-                    chat::meshcore::findRegionPresetById(mesh.meshcore_region_preset))
-            {
-                freq_mhz = preset->freq_mhz;
-                bw_khz = preset->bw_khz;
-                sf = preset->sf;
-                cr = preset->cr;
-            }
-        }
-    }
-    else
-    {
-        const chat::MeshConfig& mesh = cfg.rnode_config;
-        freq_mhz = mesh.override_frequency_mhz;
-        bw_khz = mesh.bandwidth_khz;
-        sf = mesh.spread_factor;
-        cr = mesh.coding_rate;
-    }
-
-    if (freq_mhz > 0.0f)
-    {
-        std::snprintf(summary,
-                      summary_len,
-                      "%s  %.3fMHz",
-                      protocol_name ? protocol_name : "-",
-                      static_cast<double>(freq_mhz));
-    }
-    else
-    {
-        std::snprintf(summary, summary_len, "%s", protocol_name ? protocol_name : "-");
-    }
-
-    char bw_text[24];
-    format_bw_text(bw_khz, bw_text, sizeof(bw_text));
-    std::snprintf(detail,
-                  detail_len,
-                  "%s  SF%u  CR%u",
-                  bw_text,
-                  static_cast<unsigned>(sf),
-                  static_cast<unsigned>(cr));
+    static ::ui::device::DeviceStatusModel model(
+        ::ui::presentation_sources::legacy_air_device_status_source());
+    return model;
 }
 
 } // namespace
@@ -188,9 +81,9 @@ void refresh(Footer& footer)
         return;
     }
 
-    char summary[64];
-    char detail[48];
-    format_summary_and_detail(summary, sizeof(summary), detail, sizeof(detail));
+    const auto snapshot = deviceStatusModel().snapshot();
+    const char* summary = snapshot.header.valid ? snapshot.status_line.c_str() : "-";
+    const char* detail = snapshot.header.valid ? snapshot.modem_preset.c_str() : "-";
 
     ::ui::i18n::set_label_text_raw(footer.summary_label, summary);
     ::ui::i18n::set_label_text_raw(footer.detail_label, detail);
diff --git a/modules/ui_shared/src/ui/i18n/resource_pack_registry.cpp b/modules/ui_shared/src/ui/i18n/resource_pack_registry.cpp
index da39d841..af729bb7 100644
--- a/modules/ui_shared/src/ui/i18n/resource_pack_registry.cpp
+++ b/modules/ui_shared/src/ui/i18n/resource_pack_registry.cpp
@@ -39,7 +39,7 @@ constexpr const char* kLegacyDisplayLanguageKey = "display_language";
 constexpr const char* kDefaultLocaleId = "en";
 constexpr const char* kBuiltinEnglishName = "English";
 constexpr const char* kBuiltinLatinFontPackId = "builtin-latin-ui";
-#if defined(ARDUINO_ARCH_ESP32)
+#if UI_FS_HAS_FLASH_PACK_STORAGE
 constexpr const char* kFlashPackRoot = "/fs/trailmate/packs";
 constexpr const char* kFlashFontPackRoot = "/fs/trailmate/packs/fonts";
 constexpr const char* kFlashLocalePackRoot = "/fs/trailmate/packs/locales";
@@ -51,6 +51,19 @@ constexpr const char* kLocalePackRoot = "/trailmate/packs/locales";
 constexpr const char* kImePackRoot = "/trailmate/packs/ime";
 constexpr const char* kDisabledImeSentinel = "__none__";
 constexpr std::size_t kFontLoadOverlayThresholdBytes = 64U * 1024U;
+constexpr unsigned kMaxMissingFontDiagnostics = 20;
+
+#if defined(LV_USE_FS_POSIX) && LV_USE_FS_POSIX
+constexpr bool kLvFsPosixEnabled = true;
+#else
+constexpr bool kLvFsPosixEnabled = false;
+#endif
+
+#if UI_FS_HAS_FLASH_PACK_STORAGE
+constexpr bool kFlashPackStorageEnabled = true;
+#else
+constexpr bool kFlashPackStorageEnabled = false;
+#endif
 
 enum class FontPackUsage : uint8_t
 {
@@ -133,6 +146,7 @@ FontChainState s_content_font_chain;
 std::vector<FontPackRecord*> s_content_supplement_packs;
 
 bool s_registry_ready = false;
+unsigned s_missing_content_font_diagnostics = 0;
 
 class ScopedFontLoadOverlay
 {
@@ -193,7 +207,7 @@ const char* usage_name(FontPackUsage usage)
 
 bool external_pack_scan_enabled()
 {
-#if defined(LV_USE_FS_POSIX) && LV_USE_FS_POSIX
+#if (defined(LV_USE_FS_POSIX) && LV_USE_FS_POSIX) || UI_FS_HAS_FLASH_PACK_STORAGE
     return true;
 #else
     return false;
@@ -434,16 +448,22 @@ bool list_directory_entries(const char* path, std::vector<std::string>& out)
         return false;
     }
 
-#if defined(LV_USE_FS_POSIX) && LV_USE_FS_POSIX
     const std::string normalized = ::ui::fs::normalize_path(path);
     if (normalized.empty())
     {
+        std::printf("%s external pack scan skip path=%s reason=normalize_failed\n",
+                    kLogTag,
+                    safe_text(path));
         return false;
     }
 
     lv_fs_dir_t dir;
     if (lv_fs_dir_open(&dir, normalized.c_str()) != LV_FS_RES_OK)
     {
+        std::printf("%s external pack scan skip path=%s normalized=%s reason=open_failed\n",
+                    kLogTag,
+                    safe_text(path),
+                    normalized.c_str());
         return false;
     }
 
@@ -471,11 +491,12 @@ bool list_directory_entries(const char* path, std::vector<std::string>& out)
 
     lv_fs_dir_close(&dir);
     std::sort(out.begin(), out.end());
+    std::printf("%s external pack scan path=%s normalized=%s entries=%lu\n",
+                kLogTag,
+                safe_text(path),
+                normalized.c_str(),
+                static_cast<unsigned long>(out.size()));
     return true;
-#else
-    (void)path;
-    return false;
-#endif
 }
 
 template <typename TPack>
@@ -571,9 +592,16 @@ bool parse_codepoint_token(const std::string& token, uint32_t& out_codepoint)
         return false;
     }
 
+    const char* start = token.c_str();
+    int base = 16;
+    if ((start[0] == 'U' || start[0] == 'u') && start[1] == '+')
+    {
+        start += 2;
+    }
+
     char* end = nullptr;
-    const unsigned long value = std::strtoul(token.c_str(), &end, 0);
-    if (end == token.c_str() || (end && *end != '\0') || value > 0x10FFFFUL)
+    const unsigned long value = std::strtoul(start, &end, base);
+    if (end == start || (end && *end != '\0') || value > 0x10FFFFUL)
     {
         return false;
     }
@@ -635,6 +663,11 @@ bool parse_ranges_file(const std::string& path, std::vector<CodepointRange>& out
         std::string token = contents.substr(
             token_start,
             token_end == std::string::npos ? std::string::npos : (token_end - token_start));
+        const std::size_t comment = token.find('#');
+        if (comment != std::string::npos)
+        {
+            token.resize(comment);
+        }
         trim_in_place(token);
         if (!token.empty())
         {
@@ -746,7 +779,7 @@ const lv_font_t* resolved_font(const FontPackRecord* pack)
 
 bool is_font_runtime_loaded(const FontPackRecord& pack)
 {
-    return resolved_font(&pack) != nullptr;
+    return pack.builtin || resolved_font(&pack) != nullptr;
 }
 
 bool font_pack_covers_codepoint(const FontPackRecord& pack, uint32_t codepoint)
@@ -1147,6 +1180,41 @@ bool ensure_active_content_pack_loaded()
         rebuild_runtime_font_chains();
     }
 
+    static std::string s_last_logged_ui_pack;
+    static std::string s_last_logged_content_pack;
+    static bool s_last_logged_ui_loaded = false;
+    static bool s_last_logged_content_loaded = false;
+    static bool s_logged_once = false;
+
+    const std::string ui_pack_id = s_active_ui_font_pack ? s_active_ui_font_pack->id : std::string{};
+    const std::string content_pack_id =
+        s_active_content_font_pack ? s_active_content_font_pack->id : std::string{};
+    const bool ui_loaded =
+        s_active_ui_font_pack && is_font_runtime_loaded(*s_active_ui_font_pack);
+    const bool content_loaded =
+        s_active_content_font_pack && is_font_runtime_loaded(*s_active_content_font_pack);
+    const bool should_log = changed || !s_logged_once ||
+                            ui_pack_id != s_last_logged_ui_pack ||
+                            content_pack_id != s_last_logged_content_pack ||
+                            ui_loaded != s_last_logged_ui_loaded ||
+                            content_loaded != s_last_logged_content_loaded;
+
+    if (should_log && (s_active_content_font_pack != nullptr || s_active_ui_font_pack != nullptr))
+    {
+        std::printf("%s ensure active fonts ui=%s loaded=%d content=%s loaded=%d changed=%d\n",
+                    kLogTag,
+                    ui_pack_id.empty() ? "<none>" : ui_pack_id.c_str(),
+                    ui_loaded ? 1 : 0,
+                    content_pack_id.empty() ? "<none>" : content_pack_id.c_str(),
+                    content_loaded ? 1 : 0,
+                    changed ? 1 : 0);
+        s_last_logged_ui_pack = ui_pack_id;
+        s_last_logged_content_pack = content_pack_id;
+        s_last_logged_ui_loaded = ui_loaded;
+        s_last_logged_content_loaded = content_loaded;
+        s_logged_once = true;
+    }
+
     return true;
 }
 
@@ -1747,33 +1815,113 @@ void scan_pack_group(const char* root_path, bool (*loader)(const std::string&))
     }
 }
 
+void scan_pack_group(const char* root_path, const char* label, bool (*loader)(const std::string&))
+{
+    std::vector<std::string> entries;
+    if (!list_directory_entries(root_path, entries))
+    {
+        std::printf("%s external pack group unavailable label=%s root=%s\n",
+                    kLogTag,
+                    safe_text(label),
+                    safe_text(root_path));
+        return;
+    }
+
+    std::size_t directories = 0;
+    std::size_t loaded = 0;
+    for (const auto& entry : entries)
+    {
+        const std::string pack_dir = join_path(root_path, entry);
+        if (!::ui::fs::dir_exists(pack_dir.c_str()))
+        {
+            continue;
+        }
+
+        ++directories;
+        if (loader(pack_dir))
+        {
+            ++loaded;
+        }
+    }
+
+    std::printf("%s external pack group scan label=%s root=%s entries=%lu dirs=%lu loaded=%lu\n",
+                kLogTag,
+                safe_text(label),
+                safe_text(root_path),
+                static_cast<unsigned long>(entries.size()),
+                static_cast<unsigned long>(directories),
+                static_cast<unsigned long>(loaded));
+}
+
+void log_pack_root_probe(const char* pack_root,
+                         const char* font_root,
+                         const char* ime_root,
+                         const char* locale_root)
+{
+    std::printf("%s external pack root probe pack=%s exists=%d fonts=%s exists=%d ime=%s exists=%d locales=%s exists=%d\n",
+                kLogTag,
+                safe_text(pack_root),
+                pack_root && ::ui::fs::dir_exists(pack_root) ? 1 : 0,
+                safe_text(font_root),
+                font_root && ::ui::fs::dir_exists(font_root) ? 1 : 0,
+                safe_text(ime_root),
+                ime_root && ::ui::fs::dir_exists(ime_root) ? 1 : 0,
+                safe_text(locale_root),
+                locale_root && ::ui::fs::dir_exists(locale_root) ? 1 : 0);
+}
+
 void catalog_external_packs_from_root(const char* pack_root,
                                       const char* font_root,
                                       const char* ime_root,
                                       const char* locale_root)
 {
+    log_pack_root_probe(pack_root, font_root, ime_root, locale_root);
     if (!pack_root || !::ui::fs::dir_exists(pack_root))
     {
+        std::printf("%s external pack root unavailable path=%s\n", kLogTag, safe_text(pack_root));
         return;
     }
 
-    scan_pack_group(font_root, catalog_external_font_pack);
-    scan_pack_group(ime_root, catalog_external_ime_pack);
-    scan_pack_group(locale_root, catalog_external_locale_pack);
+    const std::size_t fonts_before = s_font_packs.size();
+    const std::size_t imes_before = s_ime_packs.size();
+    const std::size_t locales_before = s_locale_packs.size();
+
+    std::printf("%s external pack root scan path=%s\n", kLogTag, pack_root);
+    scan_pack_group(font_root, "fonts", catalog_external_font_pack);
+    scan_pack_group(ime_root, "ime", catalog_external_ime_pack);
+    scan_pack_group(locale_root, "locales", catalog_external_locale_pack);
+
+    std::printf("%s external pack root result path=%s added_fonts=%lu added_ime=%lu added_locales=%lu\n",
+                kLogTag,
+                pack_root,
+                static_cast<unsigned long>(s_font_packs.size() - fonts_before),
+                static_cast<unsigned long>(s_ime_packs.size() - imes_before),
+                static_cast<unsigned long>(s_locale_packs.size() - locales_before));
 }
 
 void catalog_external_packs()
 {
+    std::printf("%s external pack scan begin enabled=%d lv_fs_posix=%d flash_storage=%d\n",
+                kLogTag,
+                external_pack_scan_enabled() ? 1 : 0,
+                kLvFsPosixEnabled ? 1 : 0,
+                kFlashPackStorageEnabled ? 1 : 0);
     if (!external_pack_scan_enabled())
     {
+        std::printf("%s external pack scan disabled\n", kLogTag);
         return;
     }
 
-#if defined(ARDUINO_ARCH_ESP32)
+#if UI_FS_HAS_FLASH_PACK_STORAGE
     catalog_external_packs_from_root(
         kFlashPackRoot, kFlashFontPackRoot, kFlashImePackRoot, kFlashLocalePackRoot);
 #endif
     catalog_external_packs_from_root(kPackRoot, kFontPackRoot, kImePackRoot, kLocalePackRoot);
+    std::printf("%s external pack scan end fonts=%lu ime=%lu locales=%lu\n",
+                kLogTag,
+                static_cast<unsigned long>(s_font_packs.size()),
+                static_cast<unsigned long>(s_ime_packs.size()),
+                static_cast<unsigned long>(s_locale_packs.size()));
 }
 
 bool locale_dependencies_resolved(const LocalePackRecord& locale)
@@ -1868,6 +2016,7 @@ bool locale_dependencies_resolved(const LocalePackRecord& locale)
 
 void prune_unresolved_locales()
 {
+    const std::size_t before = s_locale_packs.size();
     s_locale_packs.erase(
         std::remove_if(
             s_locale_packs.begin(),
@@ -1877,6 +2026,11 @@ void prune_unresolved_locales()
                 return !locale_dependencies_resolved(locale);
             }),
         s_locale_packs.end());
+    std::printf("%s locale dependency prune before=%lu after=%lu removed=%lu\n",
+                kLogTag,
+                static_cast<unsigned long>(before),
+                static_cast<unsigned long>(s_locale_packs.size()),
+                static_cast<unsigned long>(before - s_locale_packs.size()));
 }
 
 ImePackRecord* resolve_enabled_ime_pack()
@@ -1968,6 +2122,9 @@ std::string migrate_legacy_locale_if_needed()
     if (::platform::ui::settings_store::get_string(kSettingsNamespace, kDisplayLocaleKey, locale_id) &&
         !locale_id.empty())
     {
+        std::printf("%s preferred locale source=settings display_locale=%s\n",
+                    kLogTag,
+                    locale_id.c_str());
         return locale_id;
     }
 
@@ -1975,6 +2132,7 @@ std::string migrate_legacy_locale_if_needed()
         ::platform::ui::settings_store::get_int(kSettingsNamespace, kLegacyDisplayLanguageKey, -1);
     if (legacy_value < 0)
     {
+        std::printf("%s preferred locale source=default display_locale=<none>\n", kLogTag);
         return {};
     }
 
@@ -1996,15 +2154,25 @@ LocalePackRecord* resolve_active_locale(const std::string& preferred_id)
     {
         if (LocalePackRecord* preferred = find_pack_by_id(s_locale_packs, preferred_id.c_str()))
         {
+            std::printf("%s resolve active locale preferred=%s result=preferred\n",
+                        kLogTag,
+                        preferred_id.c_str());
             return preferred;
         }
+        std::printf("%s resolve active locale preferred=%s result=missing fallback=en\n",
+                    kLogTag,
+                    preferred_id.c_str());
     }
 
     if (LocalePackRecord* english = find_pack_by_id(s_locale_packs, kDefaultLocaleId))
     {
+        std::printf("%s resolve active locale result=en\n", kLogTag);
         return english;
     }
 
+    std::printf("%s resolve active locale result=%s\n",
+                kLogTag,
+                s_locale_packs.empty() ? "<none>" : s_locale_packs.front().id.c_str());
     return s_locale_packs.empty() ? nullptr : &s_locale_packs.front();
 }
 
@@ -2095,10 +2263,17 @@ bool activate_locale(LocalePackRecord* locale)
 
 void rebuild_registry()
 {
+    std::printf("%s registry rebuild begin ready=%d\n", kLogTag, s_registry_ready ? 1 : 0);
+    s_missing_content_font_diagnostics = 0;
     clear_registry();
     add_builtin_font_packs();
     add_builtin_locale_packs();
     catalog_external_packs();
+    std::printf("%s registry cataloged before_prune fonts=%lu ime=%lu locales=%lu\n",
+                kLogTag,
+                static_cast<unsigned long>(s_font_packs.size()),
+                static_cast<unsigned long>(s_ime_packs.size()),
+                static_cast<unsigned long>(s_locale_packs.size()));
     prune_unresolved_locales();
     rebuild_locale_views();
     rebuild_ime_views();
@@ -2107,6 +2282,15 @@ void rebuild_registry()
 
     const std::string preferred_locale = migrate_legacy_locale_if_needed();
     (void)activate_locale(resolve_active_locale(preferred_locale));
+    std::printf("%s registry rebuild end active_locale=%s locale_count=%lu ime_count=%lu enabled_ime=%lu active_ime=%s ui_chain=%s content_chain=%s\n",
+                kLogTag,
+                s_active_locale ? s_active_locale->id.c_str() : "<none>",
+                static_cast<unsigned long>(s_locale_views.size()),
+                static_cast<unsigned long>(s_ime_views.size()),
+                static_cast<unsigned long>(s_enabled_ime_ids.size()),
+                active_ime_pack_id() ? active_ime_pack_id() : "<none>",
+                s_ui_font_chain.desc.empty() ? "<none>" : s_ui_font_chain.desc.c_str(),
+                s_content_font_chain.desc.empty() ? "<none>" : s_content_font_chain.desc.c_str());
 }
 
 void ensure_registry()
@@ -2145,6 +2329,7 @@ const char* lookup_translation(const LocalePackRecord& locale, const char* engli
 
 void reload_language()
 {
+    std::printf("%s reload_language requested\n", kLogTag);
     rebuild_registry();
 }
 
@@ -2216,6 +2401,9 @@ bool set_locale(const char* locale_id, bool persist)
     LocalePackRecord* next_locale = find_pack_by_id(s_locale_packs, locale_id);
     if (next_locale == nullptr)
     {
+        std::printf("%s set_locale failed requested=%s reason=not_cataloged\n",
+                    kLogTag,
+                    safe_text(locale_id));
         return false;
     }
 
@@ -2229,6 +2417,14 @@ bool set_locale(const char* locale_id, bool persist)
         remove_legacy_locale_key();
     }
 
+    std::printf("%s set_locale requested=%s active=%s changed=%d persist=%d ui_chain=%s content_chain=%s\n",
+                kLogTag,
+                safe_text(locale_id),
+                s_active_locale ? s_active_locale->id.c_str() : "<none>",
+                previous_locale != s_active_locale ? 1 : 0,
+                persist ? 1 : 0,
+                s_ui_font_chain.desc.empty() ? "<none>" : s_ui_font_chain.desc.c_str(),
+                s_content_font_chain.desc.empty() ? "<none>" : s_content_font_chain.desc.c_str());
     return previous_locale != s_active_locale;
 }
 
@@ -2312,6 +2508,18 @@ bool ensure_content_font_for_text(const char* text)
         rebuild_runtime_font_chains();
     }
 
+    if (!missing.empty() && s_missing_content_font_diagnostics < kMaxMissingFontDiagnostics)
+    {
+        std::printf("%s content font missing count=%lu first=U+%04lX active_locale=%s content_chain=%s text_sample='%.32s'\n",
+                    kLogTag,
+                    static_cast<unsigned long>(missing.size()),
+                    static_cast<unsigned long>(missing.front()),
+                    s_active_locale ? s_active_locale->id.c_str() : "<none>",
+                    s_content_font_chain.desc.empty() ? "<none>" : s_content_font_chain.desc.c_str(),
+                    text);
+        ++s_missing_content_font_diagnostics;
+    }
+
     return missing.empty();
 }
 
diff --git a/modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp b/modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp
index 70a7282f..854cfbea 100644
--- a/modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp
+++ b/modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp
@@ -10,13 +10,22 @@
 #include "sys/clock.h"
 #include "ui/localization.h"
 #include "ui/menu/dashboard/dashboard_state.h"
+#include "ui/presentation_sources/legacy_gps_status_source.h"
+#include "ui_presentation/gps/gps_status_model.h"
 
 namespace ui::menu::dashboard
 {
 namespace
 {
 
-void logDashboardGpsFlow(bool has_snapshot, std::size_t sat_count, const gps::GnssStatus& gnss, bool fix)
+::ui::gps::GpsStatusModel& dashboard_gps_status_model()
+{
+    static ::ui::gps::GpsStatusModel model(
+        ::ui::presentation_sources::legacy_gps_status_source());
+    return model;
+}
+
+void logDashboardGpsFlow(bool has_snapshot, std::size_t sat_count, const ::gps::GnssStatus& gnss, bool fix)
 {
     static bool s_last_has_snapshot = false;
     static bool s_last_fix = false;
@@ -29,7 +38,7 @@ void logDashboardGpsFlow(bool has_snapshot, std::size_t sat_count, const gps::Gn
     const bool changed = (has_snapshot != s_last_has_snapshot) || (fix != s_last_fix) || (sat_count != s_last_sat_count) ||
                          (gnss.sats_in_view != s_last_sats_in_view) || (gnss.sats_in_use != s_last_sats_in_use);
     const bool suspicious_full_scale =
-        has_snapshot && sat_count == gps::kMaxGnssSats && gnss.sats_in_view != static_cast<uint8_t>(sat_count);
+        has_snapshot && sat_count == ::gps::kMaxGnssSats && gnss.sats_in_view != static_cast<uint8_t>(sat_count);
     if (!changed && !suspicious_full_scale && (now_ms - s_last_log_ms) < 2000U)
     {
         return;
@@ -78,37 +87,37 @@ void set_label_text_if_changed(lv_obj_t* label, const char* english)
     }
 }
 
-lv_color_t satellite_color(gps::GnssSystem sys)
+lv_color_t satellite_color(::gps::GnssSystem sys)
 {
     switch (sys)
     {
-    case gps::GnssSystem::GPS:
+    case ::gps::GnssSystem::GPS:
         return color_amber_dark();
-    case gps::GnssSystem::GLN:
+    case ::gps::GnssSystem::GLN:
         return color_info();
-    case gps::GnssSystem::GAL:
+    case ::gps::GnssSystem::GAL:
         return color_ok();
-    case gps::GnssSystem::BD:
+    case ::gps::GnssSystem::BD:
         return color_warn();
     default:
         return color_text_dim();
     }
 }
 
-int sat_rank(const gps::GnssSatInfo& sat)
+int sat_rank(const ::gps::GnssSatInfo& sat)
 {
     const int used_bonus = sat.used ? 1000 : 0;
     const int snr_score = std::max(0, static_cast<int>(sat.snr)) * 10;
     return used_bonus + snr_score + sat.elevation;
 }
 
-const char* fix_text(gps::GnssFix fix)
+const char* fix_text(::gps::GnssFix fix)
 {
     switch (fix)
     {
-    case gps::GnssFix::FIX3D:
+    case ::gps::GnssFix::FIX3D:
         return "3D FIX";
-    case gps::GnssFix::FIX2D:
+    case ::gps::GnssFix::FIX2D:
         return "2D FIX";
     default:
         return "NO FIX";
@@ -229,39 +238,49 @@ void refresh_gps_widget()
         return;
     }
 
-    gps::GnssSatInfo sats[gps::kMaxGnssSats];
+    ::gps::GnssSatInfo sats[::gps::kMaxGnssSats];
     std::size_t sat_count = 0;
-    gps::GnssStatus gnss{};
-    const bool has_snapshot = platform::ui::gps::get_gnss_snapshot(sats, gps::kMaxGnssSats, &sat_count, &gnss);
-    const auto state = platform::ui::gps::get_data();
-    const bool fix = state.valid || (has_snapshot && gnss.fix != gps::GnssFix::NOFIX);
+    ::gps::GnssStatus gnss{};
+    const bool has_snapshot =
+        platform::ui::gps::get_gnss_snapshot(sats, ::gps::kMaxGnssSats, &sat_count, &gnss);
+    const auto status_snapshot = dashboard_gps_status_model().snapshot();
+    const bool fix = status_snapshot.header.valid
+                         ? status_snapshot.fix_valid
+                         : (has_snapshot && gnss.fix != ::gps::GnssFix::NOFIX);
+    const unsigned visible_sats = status_snapshot.header.valid
+                                      ? static_cast<unsigned>(status_snapshot.satellites)
+                                      : static_cast<unsigned>(has_snapshot ? sat_count : 0);
     logDashboardGpsFlow(has_snapshot, sat_count, gnss, fix);
 
+    const char* status_label = status_snapshot.header.valid
+                                   ? status_snapshot.fix_label.c_str()
+                                   : fix_text(gnss.fix);
+
     set_status_chip(gps_ui.chrome,
-                    fix_text(gnss.fix),
+                    status_label,
                     fix ? color_soft_green() : color_soft_warn(),
                     fix ? color_ok() : color_warn());
 
-    set_label_text_if_changed(gps_ui.stat_values[0], fix_text(gnss.fix));
+    set_label_text_if_changed_raw(gps_ui.stat_values[0], status_label);
 
     char used_buf[16];
     std::snprintf(used_buf, sizeof(used_buf), "%u/%u",
                   static_cast<unsigned>(has_snapshot ? gnss.sats_in_use : 0),
-                  static_cast<unsigned>(has_snapshot ? sat_count : 0));
+                  visible_sats);
     set_label_text_if_changed_raw(gps_ui.stat_values[1], used_buf);
 
     char hdop_buf[16];
     std::snprintf(hdop_buf, sizeof(hdop_buf), "%.1f", has_snapshot ? gnss.hdop : 0.0f);
     set_label_text_if_changed_raw(gps_ui.stat_values[2], hdop_buf);
 
-    std::array<gps::GnssSatInfo, gps::kMaxGnssSats> ranked{};
+    std::array<::gps::GnssSatInfo, ::gps::kMaxGnssSats> ranked{};
     for (size_t i = 0; i < sat_count && i < ranked.size(); ++i)
     {
         ranked[i] = sats[i];
     }
     std::sort(ranked.begin(),
               ranked.begin() + static_cast<std::ptrdiff_t>(std::min(sat_count, ranked.size())),
-              [](const gps::GnssSatInfo& lhs, const gps::GnssSatInfo& rhs)
+              [](const ::gps::GnssSatInfo& lhs, const ::gps::GnssSatInfo& rhs)
               {
                   const int lhs_rank = sat_rank(lhs);
                   const int rhs_rank = sat_rank(rhs);
@@ -325,7 +344,7 @@ void refresh_gps_widget()
                   "%s",
                   ::ui::i18n::format(
                       fix ? "position stream active  |  %u in view" : "waiting for better sky view  |  %u in view",
-                      static_cast<unsigned>(has_snapshot ? sat_count : 0))
+                      visible_sats)
                       .c_str());
     set_label_text_if_changed_raw(gps_ui.footer_label, footer);
 }
diff --git a/modules/ui_shared/src/ui/menu/dashboard/dashboard_mesh_widget.cpp b/modules/ui_shared/src/ui/menu/dashboard/dashboard_mesh_widget.cpp
index e6031d59..77cd284a 100644
--- a/modules/ui_shared/src/ui/menu/dashboard/dashboard_mesh_widget.cpp
+++ b/modules/ui_shared/src/ui/menu/dashboard/dashboard_mesh_widget.cpp
@@ -4,13 +4,11 @@
 #include <cstdio>
 #include <cstring>
 
-#include "app/app_facade_access.h"
-#include "ble/ble_manager.h"
 #include "platform/ui/device_runtime.h"
-#include "platform/ui/team_ui_store_runtime.h"
 #include "ui/localization.h"
 #include "ui/menu/dashboard/dashboard_state.h"
-#include "ui/ui_status.h"
+#include "ui/presentation_sources/legacy_mesh_status_source.h"
+#include "ui_presentation/mesh/mesh_status_model.h"
 
 namespace ui::menu::dashboard
 {
@@ -70,6 +68,13 @@ void create_stat_column(MeshWidgetUi& mesh, lv_obj_t* parent, lv_coord_t x, lv_c
     }
 }
 
+::ui::mesh::MeshStatusModel& meshStatusModel()
+{
+    static ::ui::mesh::MeshStatusModel model(
+        ::ui::presentation_sources::legacy_mesh_status_source());
+    return model;
+}
+
 } // namespace
 
 void create_mesh_widget(lv_obj_t* parent, lv_coord_t card_w, lv_coord_t card_h)
@@ -142,9 +147,9 @@ void refresh_mesh_widget()
         return;
     }
 
-    team::ui::TeamUiSnapshot team_snap;
-    const bool has_team = team::ui::team_ui_get_store().load(team_snap) && team_snap.in_team;
-    const int unread = ui::status::get_total_unread();
+    const auto status = meshStatusModel().snapshot();
+    const bool has_team = status.header.valid && status.team_linked;
+    const int unread = status.header.valid ? static_cast<int>(status.unread_messages) : 0;
     const auto battery = platform::ui::device::battery_info();
 
     char power_buf[16];
@@ -170,7 +175,10 @@ void refresh_mesh_widget()
     set_label_text_if_changed(mesh.hero_caption, unread > 0 ? "traffic active" : "standing by");
 
     char team_buf[16];
-    std::snprintf(team_buf, sizeof(team_buf), "%u", has_team ? static_cast<unsigned>(team_snap.members.size()) : 0U);
+    std::snprintf(team_buf,
+                  sizeof(team_buf),
+                  "%u",
+                  status.header.valid ? static_cast<unsigned>(status.known_nodes) : 0U);
     set_label_text_if_changed_raw(mesh.stat_values[0], team_buf);
 
     char unread_buf[16];
@@ -181,27 +189,8 @@ void refresh_mesh_widget()
     set_label_text_if_changed_raw(mesh.stat_values[2], power_buf);
     lv_obj_set_style_text_color(mesh.stat_values[2], battery.charging ? color_info() : color_text(), 0);
 
-    char footer[64];
-    bool ble_active = false;
-    bool ble_linked = false;
-    if (auto* ble = app::runtimeFacade().getBleManager())
-    {
-        ble_active = ble->isEnabled();
-        ble::BlePairingStatus ble_status{};
-        if (ble->getPairingStatus(&ble_status))
-        {
-            ble_linked = ble_status.is_connected;
-        }
-    }
-    std::snprintf(footer,
-                  sizeof(footer),
-                  "%s",
-                  ::ui::i18n::format(
-                      ble_linked ? "BLE linked  |  %s"
-                                 : (ble_active ? "BLE bridge ready  |  %s" : "LoRa direct path  |  %s"),
-                      unread > 0 ? ::ui::i18n::tr("new activity") : ::ui::i18n::tr("quiet net"))
-                      .c_str());
-    set_label_text_if_changed_raw(mesh.footer_label, footer);
+    set_label_text_if_changed_raw(mesh.footer_label,
+                                  status.header.valid ? status.status_line.c_str() : "-");
 
     lv_obj_set_style_border_opa(mesh.orbit_outer, LV_OPA_60, 0);
     lv_obj_set_style_border_opa(mesh.orbit_mid, LV_OPA_COVER, 0);
diff --git a/modules/ui_shared/src/ui/menu/menu_layout.cpp b/modules/ui_shared/src/ui/menu/menu_layout.cpp
index 080b760c..64f80e45 100644
--- a/modules/ui_shared/src/ui/menu/menu_layout.cpp
+++ b/modules/ui_shared/src/ui/menu/menu_layout.cpp
@@ -693,6 +693,121 @@ void createAppButton(lv_obj_t* parent, AppScreen* app, size_t idx)
     lv_obj_add_event_cb(btn, menuButtonClickCallback, LV_EVENT_CLICKED, app);
 }
 
+const char* stableIdForScreenId(ui::menu::MenuScreenId screen_id)
+{
+    switch (screen_id)
+    {
+    case ui::menu::MenuScreenId::Chat:
+        return "chat";
+    case ui::menu::MenuScreenId::Contacts:
+        return "contacts";
+    case ui::menu::MenuScreenId::Map:
+    case ui::menu::MenuScreenId::Gps:
+        return "map";
+    case ui::menu::MenuScreenId::Team:
+        return "team";
+    case ui::menu::MenuScreenId::Tracker:
+        return "tracker";
+    case ui::menu::MenuScreenId::Settings:
+        return "settings";
+    case ui::menu::MenuScreenId::WalkieTalkie:
+        return "walkie_talkie";
+    case ui::menu::MenuScreenId::Sstv:
+        return "sstv";
+    case ui::menu::MenuScreenId::Extensions:
+        return "extensions";
+    case ui::menu::MenuScreenId::Dashboard:
+    default:
+        return nullptr;
+    }
+}
+
+bool appAlreadyAdded(AppScreen* app, size_t count)
+{
+    if (app == nullptr)
+    {
+        return false;
+    }
+
+    for (size_t index = 0; index < count && index < kMaxMenuApps; ++index)
+    {
+        if (s_menu_apps[index].app == app)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+AppScreen* findCatalogAppByStableId(const char* stable_id)
+{
+    if (stable_id == nullptr)
+    {
+        return nullptr;
+    }
+
+    const size_t app_count = ui::catalogCount(s_init_options.apps);
+    for (size_t index = 0; index < app_count; ++index)
+    {
+        AppScreen* app = ui::catalogAt(s_init_options.apps, index);
+        if (app == nullptr || app->stable_id() == nullptr)
+        {
+            continue;
+        }
+        if (std::strcmp(app->stable_id(), stable_id) == 0)
+        {
+            return app;
+        }
+    }
+    return nullptr;
+}
+
+bool createAppButtonsFromUxMenu(lv_obj_t* panel)
+{
+    const ui::menu::MenuModel* ux_menu = s_init_options.ux_menu;
+    if (ux_menu == nullptr || ux_menu->size() == 0)
+    {
+        return false;
+    }
+
+    size_t created_count = 0;
+    for (size_t index = 0; index < ux_menu->size() && created_count < kMaxMenuApps; ++index)
+    {
+        const ui::menu::MenuItem& item = ux_menu->items()[index];
+        if (!item.enabled)
+        {
+            continue;
+        }
+
+        AppScreen* app = findCatalogAppByStableId(stableIdForScreenId(item.screen_id));
+        if (app == nullptr || appAlreadyAdded(app, created_count))
+        {
+            continue;
+        }
+
+        createAppButton(panel, app, created_count);
+        lv_group_add_obj(menu_g, lv_obj_get_child(panel, static_cast<int32_t>(created_count)));
+        ++created_count;
+    }
+
+    MENU_LAYOUT_DIAG("createAppGrid ux_menu_items=%u matched_apps=%u\n",
+                     static_cast<unsigned>(ux_menu->size()),
+                     static_cast<unsigned>(created_count));
+    return created_count > 0;
+}
+
+void createAppButtonsFromCatalog(lv_obj_t* panel)
+{
+    const size_t app_count = ui::catalogCount(s_init_options.apps);
+    MENU_LAYOUT_DIAG("createAppGrid app_count=%u\n", static_cast<unsigned>(app_count));
+    for (size_t index = 0; index < app_count && index < kMaxMenuApps; ++index)
+    {
+        AppScreen* app = ui::catalogAt(s_init_options.apps, index);
+        createAppButton(panel, app, index);
+        lv_group_add_obj(menu_g, lv_obj_get_child(panel, static_cast<int32_t>(index)));
+    }
+}
+
 BottomBarChipUi createBottomBarChip(lv_obj_t* parent,
                                     const ui::menu_profile::MenuLayoutProfile& profile,
                                     lv_color_t bg_color,
@@ -888,13 +1003,9 @@ void createAppGrid()
     }
     lv_obj_add_style(panel, &frameless_style, 0);
 
-    const size_t app_count = ui::catalogCount(s_init_options.apps);
-    MENU_LAYOUT_DIAG("createAppGrid app_count=%u\n", static_cast<unsigned>(app_count));
-    for (size_t index = 0; index < app_count && index < kMaxMenuApps; ++index)
+    if (!createAppButtonsFromUxMenu(panel))
     {
-        AppScreen* app = ui::catalogAt(s_init_options.apps, index);
-        createAppButton(panel, app, index);
-        lv_group_add_obj(menu_g, lv_obj_get_child(panel, static_cast<int32_t>(index)));
+        createAppButtonsFromCatalog(panel);
     }
 
     s_desc_label = lv_label_create(s_menu_panel);
diff --git a/modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp b/modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp
new file mode 100644
index 00000000..df531808
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp
@@ -0,0 +1,223 @@
+#include "ui/presentation_sources/chat_presentation_source.h"
+
+#include "chat/delivery/legacy_chat_delivery_bridge.h"
+#include "chat_presentation_adapters/chat_conversation_mapper.h"
+#include "chat_presentation_adapters/chat_message_mapper.h"
+#include "ui_presentation/common/fixed_text.h"
+
+#include <cstddef>
+#include <cstdio>
+
+namespace ui::presentation_sources
+{
+namespace
+{
+
+constexpr std::size_t kMaxConversationRows = 16;
+constexpr std::size_t kMaxMessageRows = 24;
+
+template <std::size_t N>
+void copyString(ui::FixedText<N>& out, const std::string& text)
+{
+    ui::copyText(out, text.c_str());
+}
+
+void copyNodeLabel(ui::FixedText<32>& out, ::chat::NodeId node_id)
+{
+    if (node_id == 0)
+    {
+        ui::copyText(out, "Me");
+        return;
+    }
+
+    char buffer[16]{};
+    std::snprintf(buffer, sizeof(buffer), "%04lX",
+                  static_cast<unsigned long>(node_id & 0xFFFFU));
+    ui::copyText(out, buffer);
+}
+
+void copyTimeLabel(ui::FixedText<24>& out, uint32_t timestamp)
+{
+    if (timestamp == 0)
+    {
+        out.clear();
+        return;
+    }
+
+    char buffer[24]{};
+    std::snprintf(buffer, sizeof(buffer), "%lu",
+                  static_cast<unsigned long>(timestamp));
+    ui::copyText(out, buffer);
+}
+
+ui::chat::MessageDeliveryState mapDeliveryState(
+    ::chat::delivery::DeliveryState state)
+{
+    switch (state)
+    {
+    case ::chat::delivery::DeliveryState::Queued:
+        return ui::chat::MessageDeliveryState::Queued;
+    case ::chat::delivery::DeliveryState::Sending:
+        return ui::chat::MessageDeliveryState::Sending;
+    case ::chat::delivery::DeliveryState::Sent:
+        return ui::chat::MessageDeliveryState::Sent;
+    case ::chat::delivery::DeliveryState::Delivered:
+        return ui::chat::MessageDeliveryState::Delivered;
+    case ::chat::delivery::DeliveryState::Failed:
+        return ui::chat::MessageDeliveryState::Failed;
+    case ::chat::delivery::DeliveryState::Received:
+        return ui::chat::MessageDeliveryState::Received;
+    case ::chat::delivery::DeliveryState::Unknown:
+        return ui::chat::MessageDeliveryState::Unknown;
+    }
+    return ui::chat::MessageDeliveryState::Unknown;
+}
+
+ui::chat::MessageFailureKind mapDeliveryFailure(
+    ::chat::delivery::DeliveryFailureKind failure)
+{
+    switch (failure)
+    {
+    case ::chat::delivery::DeliveryFailureKind::None:
+        return ui::chat::MessageFailureKind::None;
+    case ::chat::delivery::DeliveryFailureKind::PeerKeyMissing:
+        return ui::chat::MessageFailureKind::PeerKeyMissing;
+    case ::chat::delivery::DeliveryFailureKind::LocalIdentityMissing:
+        return ui::chat::MessageFailureKind::LocalIdentityMissing;
+    case ::chat::delivery::DeliveryFailureKind::RadioSendFailed:
+        return ui::chat::MessageFailureKind::RadioSendFailed;
+    case ::chat::delivery::DeliveryFailureKind::AckTimeout:
+        return ui::chat::MessageFailureKind::AckTimeout;
+    case ::chat::delivery::DeliveryFailureKind::UnsupportedProtocol:
+        return ui::chat::MessageFailureKind::UnsupportedProtocol;
+    case ::chat::delivery::DeliveryFailureKind::Rejected:
+        return ui::chat::MessageFailureKind::Rejected;
+    case ::chat::delivery::DeliveryFailureKind::Unknown:
+        return ui::chat::MessageFailureKind::Unknown;
+    }
+    return ui::chat::MessageFailureKind::Unknown;
+}
+
+} // namespace
+
+ChatPresentationSource::ChatPresentationSource(
+    ::chat::ChatService& chat_service,
+    ::chat::contacts::ContactService* contact_service,
+    const ::chat::delivery::ChatDeliveryReadModel* delivery_read_model)
+    : chat_service_(chat_service),
+      contact_service_(contact_service),
+      delivery_read_model_(delivery_read_model)
+{
+}
+
+bool ChatPresentationSource::buildChatWorkspaceSnapshot(
+    const ui::chat::ChatWorkspaceRequest& request,
+    ui::chat::ChatWorkspaceSnapshot& out) const
+{
+    // Message paging is deferred until ChatService exposes a stable
+    // presentation-safe paging API.
+    (void)request.message_offset;
+
+    ui::chat::resetChatWorkspaceSnapshot(out);
+    out.header.valid = true;
+    out.header.version = 1;
+    ui::copyText(out.workspace_title, "Chat");
+    ui::copyText(out.composer_placeholder, "Message");
+
+    std::size_t total = 0;
+    const auto conversations = chat_service_.getConversations(
+        request.conversation_offset,
+        kMaxConversationRows,
+        &total);
+
+    out.conversation_count = conversations.size() < kMaxConversationRows
+                                 ? conversations.size()
+                                 : kMaxConversationRows;
+    for (std::size_t i = 0; i < out.conversation_count; ++i)
+    {
+        const ::chat::ConversationMeta& meta = conversations[i];
+        ui::chat::ConversationRow& row = out.conversations[i];
+        row.id = chat_presentation_adapters::toUiConversationId(meta.id);
+        row.kind = row.id.kind;
+        row.protocol = row.id.protocol;
+        row.unread_count = meta.unread < 0 ? 0U : static_cast<uint16_t>(meta.unread);
+        row.selected = row.id == request.selected;
+        copyString(row.title, meta.name);
+        copyString(row.subtitle, meta.preview);
+    }
+
+    out.selected_conversation = request.selected;
+
+    ::chat::ConversationId core_selected;
+    if (chat_presentation_adapters::toCoreConversationId(request.selected,
+                                                         core_selected))
+    {
+        const auto messages =
+            chat_service_.getRecentMessages(core_selected, kMaxMessageRows);
+        out.message_count = messages.size() < kMaxMessageRows
+                                ? messages.size()
+                                : kMaxMessageRows;
+        for (std::size_t i = 0; i < out.message_count; ++i)
+        {
+            const ::chat::ChatMessage& message = messages[i];
+            ui::chat::MessageRow& row = out.messages[i];
+            const ::chat::ConversationId core_conversation(
+                message.channel,
+                message.peer,
+                message.protocol);
+            row.conversation =
+                chat_presentation_adapters::toUiConversationId(core_conversation);
+            row.ref = chat_presentation_adapters::toUiMessageRef(message);
+            row.delivery =
+                chat_presentation_adapters::mapMessageStatus(message.status);
+            row.failure =
+                chat_presentation_adapters::mapMessageFailure(message.status);
+            if (delivery_read_model_ != nullptr)
+            {
+                ::chat::delivery::ChatDeliveryRecord delivery{};
+                if (delivery_read_model_->find(
+                        ::chat::delivery::toDeliveryRef(message),
+                        delivery))
+                {
+                    row.delivery = mapDeliveryState(delivery.state);
+                    row.failure = mapDeliveryFailure(delivery.failure);
+                }
+            }
+            row.outgoing = message.status != ::chat::MessageStatus::Incoming;
+            row.sender_node_id = row.outgoing ? 0 : message.from;
+            copyString(row.text, message.text);
+            copyTimeLabel(row.time_label, message.timestamp);
+
+            if (row.outgoing)
+            {
+                ui::copyText(row.sender_label, "Me");
+            }
+            else if (contact_service_ != nullptr)
+            {
+                const std::string contact =
+                    contact_service_->getContactName(message.from);
+                if (!contact.empty())
+                {
+                    ui::copyText(row.sender_label, contact.c_str());
+                }
+                else
+                {
+                    copyNodeLabel(row.sender_label, message.from);
+                }
+            }
+            else
+            {
+                copyNodeLabel(row.sender_label, message.from);
+            }
+        }
+    }
+
+    const bool selected_supported =
+        request.selected.kind == ui::chat::ConversationKind::DirectPeer ||
+        request.selected.kind == ui::chat::ConversationKind::Channel;
+    out.can_send = request.selected.isValid() && selected_supported;
+    out.composer_enabled = out.can_send;
+    return true;
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/legacy_air_device_status_source.cpp b/modules/ui_shared/src/ui/presentation_sources/legacy_air_device_status_source.cpp
new file mode 100644
index 00000000..44a1d77b
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/legacy_air_device_status_source.cpp
@@ -0,0 +1,162 @@
+#include "ui/presentation_sources/legacy_air_device_status_source.h"
+
+#include "app/app_config.h"
+#include "app/app_facade_access.h"
+#include "chat/infra/mesh_protocol_utils.h"
+#include "chat/infra/meshcore/mc_region_presets.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
+
+#include <cmath>
+#include <cstddef>
+#include <cstdio>
+
+namespace ui::presentation_sources
+{
+namespace
+{
+
+void formatBandwidth(float bandwidth_khz, char* out, size_t out_len)
+{
+    if (!out || out_len == 0)
+    {
+        return;
+    }
+
+    if (!std::isfinite(bandwidth_khz) || bandwidth_khz <= 0.0f)
+    {
+        std::snprintf(out, out_len, "BW-");
+        return;
+    }
+
+    const float rounded = std::round(bandwidth_khz);
+    if (std::fabs(bandwidth_khz - rounded) < 0.05f)
+    {
+        std::snprintf(out, out_len, "BW%.0fk", static_cast<double>(bandwidth_khz));
+    }
+    else
+    {
+        std::snprintf(out, out_len, "BW%.1fk", static_cast<double>(bandwidth_khz));
+    }
+}
+
+void copyRadioProjection(ui::device::DeviceStatusSnapshot& out,
+                         const char* protocol_name,
+                         float frequency_mhz,
+                         float bandwidth_khz,
+                         uint8_t spreading_factor,
+                         uint8_t coding_rate)
+{
+    ui::copyText(out.active_protocol, protocol_name ? protocol_name : "-");
+
+    char region[32];
+    if (frequency_mhz > 0.0f)
+    {
+        std::snprintf(region, sizeof(region), "%.3fMHz", static_cast<double>(frequency_mhz));
+    }
+    else
+    {
+        std::snprintf(region, sizeof(region), "-");
+    }
+    ui::copyText(out.region, region);
+
+    char bandwidth[24];
+    formatBandwidth(bandwidth_khz, bandwidth, sizeof(bandwidth));
+
+    char modem[32];
+    std::snprintf(modem,
+                  sizeof(modem),
+                  "%s  SF%u  CR%u",
+                  bandwidth,
+                  static_cast<unsigned>(spreading_factor),
+                  static_cast<unsigned>(coding_rate));
+    ui::copyText(out.modem_preset, modem);
+
+    char status[64];
+    if (frequency_mhz > 0.0f)
+    {
+        std::snprintf(status,
+                      sizeof(status),
+                      "%s  %.3fMHz",
+                      protocol_name ? protocol_name : "-",
+                      static_cast<double>(frequency_mhz));
+    }
+    else
+    {
+        std::snprintf(status, sizeof(status), "%s", protocol_name ? protocol_name : "-");
+    }
+    ui::copyText(out.status_line, status);
+}
+
+} // namespace
+
+bool LegacyAirDeviceStatusSource::buildDeviceStatusSnapshot(ui::device::DeviceStatusSnapshot& out) const
+{
+    out = ui::device::DeviceStatusSnapshot{};
+    out.header.valid = true;
+    out.header.version = 1;
+    out.lora = ui::device::CapabilityDisplayState::Ready;
+    out.storage = ui::device::CapabilityDisplayState::Ready;
+
+    const app::AppConfig& config = app::configFacade().getConfig();
+    const chat::MeshProtocol protocol = config.mesh_protocol;
+    const char* protocol_name = chat::infra::meshProtocolName(protocol);
+
+    float frequency_mhz = 0.0f;
+    float bandwidth_khz = 0.0f;
+    uint8_t spreading_factor = 0;
+    uint8_t coding_rate = 0;
+
+    if (protocol == chat::MeshProtocol::Meshtastic)
+    {
+        const chat::meshtastic::RadioConfig radio =
+            chat::meshtastic::deriveRadioConfig(config.meshtastic_config);
+        frequency_mhz = radio.freq_mhz;
+        bandwidth_khz = radio.bw_khz;
+        spreading_factor = radio.sf;
+        coding_rate = radio.cr_denom;
+    }
+    else if (protocol == chat::MeshProtocol::MeshCore)
+    {
+        const chat::MeshConfig& mesh = config.meshcore_config;
+        frequency_mhz = mesh.meshcore_freq_mhz;
+        bandwidth_khz = mesh.meshcore_bw_khz;
+        spreading_factor = mesh.meshcore_sf;
+        coding_rate = mesh.meshcore_cr;
+
+        if (mesh.meshcore_region_preset > 0)
+        {
+            if (const chat::meshcore::RegionPreset* preset =
+                    chat::meshcore::findRegionPresetById(mesh.meshcore_region_preset))
+            {
+                frequency_mhz = preset->freq_mhz;
+                bandwidth_khz = preset->bw_khz;
+                spreading_factor = preset->sf;
+                coding_rate = preset->cr;
+            }
+        }
+    }
+    else
+    {
+        const chat::MeshConfig& mesh = config.rnode_config;
+        frequency_mhz = mesh.override_frequency_mhz;
+        bandwidth_khz = mesh.bandwidth_khz;
+        spreading_factor = mesh.spread_factor;
+        coding_rate = mesh.coding_rate;
+    }
+
+    copyRadioProjection(out,
+                        protocol_name,
+                        frequency_mhz,
+                        bandwidth_khz,
+                        spreading_factor,
+                        coding_rate);
+    return true;
+}
+
+LegacyAirDeviceStatusSource& legacy_air_device_status_source()
+{
+    static LegacyAirDeviceStatusSource source;
+    return source;
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/legacy_chat_action_sink.cpp b/modules/ui_shared/src/ui/presentation_sources/legacy_chat_action_sink.cpp
new file mode 100644
index 00000000..9ef91d00
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/legacy_chat_action_sink.cpp
@@ -0,0 +1,71 @@
+#include "ui/presentation_sources/legacy_chat_action_sink.h"
+
+#include "chat_presentation_adapters/chat_conversation_mapper.h"
+
+#include <string>
+
+namespace ui::presentation_sources
+{
+
+LegacyChatActionSink::LegacyChatActionSink(::chat::ChatService& chat_service)
+    : chat_service_(chat_service)
+{
+}
+
+ui::UiActionResult LegacyChatActionSink::selectConversation(
+    ui::chat::ConversationId id)
+{
+    ::chat::ConversationId core_id;
+    if (!chat_presentation_adapters::toCoreConversationId(id, core_id))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+    }
+
+    chat_service_.switchChannel(core_id.channel);
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult LegacyChatActionSink::sendMessage(
+    const ui::chat::SendMessageView& message)
+{
+    if (message.text == nullptr || message.text_len == 0)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+
+    ::chat::ConversationId core_id;
+    if (!chat_presentation_adapters::toCoreConversationId(message.conversation,
+                                                          core_id))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+    }
+
+    const std::string text(message.text, message.text_len);
+    const ::chat::MessageId msg_id =
+        chat_service_.sendText(core_id.channel, text, core_id.peer);
+    if (msg_id == 0)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    }
+
+    const ::chat::ChatMessage* sent = chat_service_.getMessage(msg_id);
+    if (sent != nullptr && sent->status == ::chat::MessageStatus::Failed)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    }
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult LegacyChatActionSink::markRead(ui::chat::ConversationId id)
+{
+    ::chat::ConversationId core_id;
+    if (!chat_presentation_adapters::toCoreConversationId(id, core_id))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+    }
+
+    chat_service_.markConversationRead(core_id);
+    return ui::UiActionResult::success();
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/legacy_gps_status_source.cpp b/modules/ui_shared/src/ui/presentation_sources/legacy_gps_status_source.cpp
new file mode 100644
index 00000000..c2dffb9b
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/legacy_gps_status_source.cpp
@@ -0,0 +1,88 @@
+#include "ui/presentation_sources/legacy_gps_status_source.h"
+
+#include "platform/ui/gps_runtime.h"
+#include "sys/clock.h"
+
+#include <cstdio>
+
+namespace ui::presentation_sources
+{
+namespace
+{
+
+void copyCoordinateLabel(ui::gps::GpsStatusSnapshot& out)
+{
+    if (!out.fix_valid)
+    {
+        ui::copyText(out.coordinate_label, "--");
+        return;
+    }
+
+    char label[32];
+    std::snprintf(label,
+                  sizeof(label),
+                  "%.5f, %.5f",
+                  out.latitude,
+                  out.longitude);
+    ui::copyText(out.coordinate_label, label);
+}
+
+void copySatelliteLabel(ui::gps::GpsStatusSnapshot& out)
+{
+    char label[32];
+    std::snprintf(label, sizeof(label), "%u SAT", static_cast<unsigned>(out.satellites));
+    ui::copyText(out.satellite_label, label);
+}
+
+} // namespace
+
+bool LegacyGpsStatusSource::buildGpsStatusSnapshot(ui::gps::GpsStatusSnapshot& out) const
+{
+    out = ui::gps::GpsStatusSnapshot{};
+    out.header.valid = true;
+    out.header.version = 1;
+    out.header.generated_at_ms = sys::millis_now();
+
+    out.receiver_enabled = ::platform::ui::gps::is_enabled();
+    out.receiver_powered = ::platform::ui::gps::is_powered();
+
+    const auto diagnostics = ::platform::ui::gps::diagnostics();
+    const auto state = ::platform::ui::gps::get_data();
+
+    out.fix_valid = state.valid || diagnostics.has_fix;
+    out.latitude = state.lat;
+    out.longitude = state.lng;
+    out.altitude_m = static_cast<float>(state.alt_m);
+    out.speed_mps = static_cast<float>(state.speed_mps);
+    out.course_deg = static_cast<float>(state.course_deg);
+    out.satellites = diagnostics.sats_in_view > 0 ? diagnostics.sats_in_view : state.satellites;
+    out.hdop = 0.0f;
+    out.time_synced = out.fix_valid;
+    out.epoch_seconds = out.time_synced ? static_cast<uint64_t>(sys::epoch_seconds_now()) : 0ULL;
+
+    if (!out.receiver_enabled)
+    {
+        ui::copyText(out.fix_label, "GPS OFF");
+    }
+    else if (!out.receiver_powered)
+    {
+        ui::copyText(out.fix_label, "GPS POWER");
+    }
+    else
+    {
+        ui::copyText(out.fix_label, out.fix_valid ? "FIX" : "NO FIX");
+    }
+
+    copyCoordinateLabel(out);
+    copySatelliteLabel(out);
+    ui::copyText(out.time_label, out.time_synced ? "SYNCED" : "UNSYNCED");
+    return true;
+}
+
+LegacyGpsStatusSource& legacy_gps_status_source()
+{
+    static LegacyGpsStatusSource source;
+    return source;
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp b/modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp
new file mode 100644
index 00000000..7d67af74
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp
@@ -0,0 +1,67 @@
+#include "ui/presentation_sources/legacy_map_action_sink.h"
+
+namespace ui::presentation_sources
+{
+
+LegacyMapActionSink::LegacyMapActionSink(ui::gps::IGpsStatusSource& gps_source,
+                                         LegacyMapPresentationState& state)
+    : gps_source_(gps_source),
+      state_(state)
+{
+}
+
+ui::UiActionResult LegacyMapActionSink::centerOnSelf()
+{
+    ui::gps::GpsStatusSnapshot gps;
+    if (!gps_source_.buildGpsStatusSnapshot(gps) || !gps.header.valid ||
+        !gps.fix_valid)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult LegacyMapActionSink::setViewport(
+    const ui::map::MapViewport& viewport)
+{
+    state_.last_viewport = viewport;
+    state_.has_viewport = true;
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult LegacyMapActionSink::setLayer(ui::map::MapLayerKind layer,
+                                                 bool enabled)
+{
+    switch (layer)
+    {
+    case ui::map::MapLayerKind::Osm:
+        state_.layers.osm = enabled;
+        return ui::UiActionResult::success();
+    case ui::map::MapLayerKind::Terrain:
+        state_.layers.terrain = enabled;
+        return ui::UiActionResult::success();
+    case ui::map::MapLayerKind::Satellite:
+        state_.layers.satellite = enabled;
+        return ui::UiActionResult::success();
+    case ui::map::MapLayerKind::Contour:
+        state_.layers.contour = enabled;
+        return ui::UiActionResult::success();
+    default:
+        return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+    }
+}
+
+ui::UiActionResult LegacyMapActionSink::setActiveTool(ui::map::MapToolKind tool)
+{
+    state_.active_tool = tool;
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult LegacyMapActionSink::clearMeasurement()
+{
+    state_.measurement = ui::map::MeasurementState{};
+    return ui::UiActionResult::success();
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp b/modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp
new file mode 100644
index 00000000..6bda5ddc
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp
@@ -0,0 +1,114 @@
+#include "ui/presentation_sources/legacy_map_presentation_source.h"
+
+#include "ui_presentation/common/fixed_text.h"
+
+namespace ui::presentation_sources
+{
+namespace
+{
+
+void copyStatusLine(const ui::gps::GpsStatusSnapshot& gps,
+                    ui::map::MapWorkspaceSnapshot& out)
+{
+    if (!gps.header.valid)
+    {
+        ui::copyText(out.status_line, "GPS unavailable");
+        return;
+    }
+
+    if (!gps.receiver_enabled)
+    {
+        ui::copyText(out.status_line, "GPS off");
+        return;
+    }
+
+    if (!gps.receiver_powered)
+    {
+        ui::copyText(out.status_line, "GPS power");
+        return;
+    }
+
+    ui::copyText(out.status_line, gps.fix_valid ? "GPS fix" : "No GPS fix");
+}
+
+void projectTeamSummary(team::ui::ITeamUiStore* store,
+                        ui::map::TeamOverlaySummary& out)
+{
+    out = ui::map::TeamOverlaySummary{};
+    if (store == nullptr)
+    {
+        return;
+    }
+
+    team::ui::TeamUiSnapshot snapshot;
+    if (!store->load(snapshot) || !snapshot.in_team || !snapshot.has_team_id)
+    {
+        return;
+    }
+
+    out.available = true;
+    for (const auto& member : snapshot.members)
+    {
+        ++out.visible_members;
+        if (!member.online)
+        {
+            ++out.stale_members;
+        }
+    }
+}
+
+} // namespace
+
+LegacyMapPresentationSource::LegacyMapPresentationSource(
+    ui::gps::IGpsStatusSource& gps_source,
+    const LegacyMapPresentationState& state,
+    team::ui::ITeamUiStore* team_store)
+    : gps_source_(gps_source),
+      state_(state),
+      team_store_(team_store)
+{
+}
+
+bool LegacyMapPresentationSource::buildMapWorkspaceSnapshot(
+    const ui::map::MapWorkspaceRequest& request,
+    ui::map::MapWorkspaceSnapshot& out) const
+{
+    out = ui::map::MapWorkspaceSnapshot{};
+    out.header.valid = true;
+    out.header.version = 1;
+
+    out.viewport = request.requested_viewport;
+    out.layers = state_.layers;
+    out.measurement = state_.measurement;
+    out.active_tool = request.active_tool;
+    out.can_zoom_in = state_.can_zoom_in;
+    out.can_zoom_out = state_.can_zoom_out;
+    out.can_toggle_layers = state_.can_toggle_layers;
+
+    ui::gps::GpsStatusSnapshot gps;
+    if (gps_source_.buildGpsStatusSnapshot(gps))
+    {
+        out.self.valid = gps.fix_valid;
+        out.self.lat = gps.latitude;
+        out.self.lon = gps.longitude;
+        out.self.course_deg = gps.course_deg;
+        out.self.accuracy_m = gps.hdop;
+        out.can_center_on_self = gps.fix_valid;
+        copyStatusLine(gps, out);
+    }
+    else
+    {
+        ui::copyText(out.status_line, "GPS unavailable");
+    }
+
+    projectTeamSummary(team_store_, out.team);
+    return true;
+}
+
+LegacyMapPresentationState& legacy_map_presentation_state()
+{
+    static LegacyMapPresentationState state;
+    return state;
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/legacy_mesh_status_source.cpp b/modules/ui_shared/src/ui/presentation_sources/legacy_mesh_status_source.cpp
new file mode 100644
index 00000000..bb3bebcd
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/legacy_mesh_status_source.cpp
@@ -0,0 +1,78 @@
+#include "ui/presentation_sources/legacy_mesh_status_source.h"
+
+#include "app/app_config.h"
+#include "app/app_facade_access.h"
+#include "chat/infra/mesh_protocol_utils.h"
+#include "chat/usecase/chat_service.h"
+#include "platform/ui/team_ui_store_runtime.h"
+#include "sys/clock.h"
+
+#include <cstdio>
+
+#if __has_include("ble/ble_manager.h")
+#include "ble/ble_manager.h"
+#define TRAIL_MATE_UI_PRESENTATION_HAS_BLE_MANAGER_HEADER 1
+#else
+#define TRAIL_MATE_UI_PRESENTATION_HAS_BLE_MANAGER_HEADER 0
+#endif
+
+namespace ui::presentation_sources
+{
+
+bool LegacyMeshStatusSource::buildMeshStatusSnapshot(ui::mesh::MeshStatusSnapshot& out) const
+{
+    out = ui::mesh::MeshStatusSnapshot{};
+    out.header.valid = true;
+    out.header.version = 1;
+    out.header.generated_at_ms = sys::millis_now();
+    out.state = ui::mesh::MeshDisplayState::Ready;
+    out.radio_ready = true;
+
+    team::ui::TeamUiSnapshot team_snapshot;
+    const bool has_team = team::ui::team_ui_get_store().load(team_snapshot) && team_snapshot.in_team;
+    const uint32_t team_unread = has_team ? team_snapshot.team_chat_unread : 0U;
+    const uint32_t chat_unread =
+        static_cast<uint32_t>(app::messagingFacade().getChatService().getTotalUnread());
+    const uint32_t unread = chat_unread + team_unread;
+
+    bool ble_active = app::runtimeFacade().isBleEnabled();
+    bool ble_linked = false;
+#if TRAIL_MATE_UI_PRESENTATION_HAS_BLE_MANAGER_HEADER
+    if (auto* ble = app::runtimeFacade().getBleManager())
+    {
+        ble_active = ble->isEnabled();
+        ble::BlePairingStatus ble_status{};
+        if (ble->getPairingStatus(&ble_status))
+        {
+            ble_linked = ble_status.is_connected;
+        }
+    }
+#endif
+
+    out.team_linked = has_team;
+    out.known_nodes = has_team ? static_cast<uint32_t>(team_snapshot.members.size()) : 0U;
+    out.unread_messages = unread;
+
+    ui::copyText(out.protocol_label,
+                 chat::infra::meshProtocolName(app::configFacade().getConfig().mesh_protocol));
+    ui::copyText(out.radio_label,
+                 ble_linked ? "BLE linked"
+                            : (ble_active ? "BLE bridge ready" : "LoRa direct path"));
+
+    char status[64];
+    std::snprintf(status,
+                  sizeof(status),
+                  "%s  |  %s",
+                  out.radio_label.c_str(),
+                  unread > 0 ? "new activity" : "quiet net");
+    ui::copyText(out.status_line, status);
+    return true;
+}
+
+LegacyMeshStatusSource& legacy_mesh_status_source()
+{
+    static LegacyMeshStatusSource source;
+    return source;
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/legacy_settings_action_sink.cpp b/modules/ui_shared/src/ui/presentation_sources/legacy_settings_action_sink.cpp
new file mode 100644
index 00000000..8cee4065
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/legacy_settings_action_sink.cpp
@@ -0,0 +1,71 @@
+#include "ui/presentation_sources/legacy_settings_action_sink.h"
+
+#include "app/app_config.h"
+#include "app/app_facade_access.h"
+#include "platform/ui/gps_runtime.h"
+
+#include <cstring>
+
+namespace ui::presentation_sources
+{
+namespace
+{
+
+bool keyEquals(const ui::settings::SettingsPatchView& patch, const char* key)
+{
+    return std::strcmp(patch.key.c_str(), key) == 0;
+}
+
+bool parseBool(const char* text, bool& out)
+{
+    if (!text)
+    {
+        return false;
+    }
+    if (std::strcmp(text, "1") == 0 || std::strcmp(text, "true") == 0 ||
+        std::strcmp(text, "TRUE") == 0 || std::strcmp(text, "on") == 0 ||
+        std::strcmp(text, "ON") == 0)
+    {
+        out = true;
+        return true;
+    }
+    if (std::strcmp(text, "0") == 0 || std::strcmp(text, "false") == 0 ||
+        std::strcmp(text, "FALSE") == 0 || std::strcmp(text, "off") == 0 ||
+        std::strcmp(text, "OFF") == 0)
+    {
+        out = false;
+        return true;
+    }
+    return false;
+}
+
+} // namespace
+
+ui::UiActionResult LegacySettingsActionSink::applySetting(
+    const ui::settings::SettingsPatchView& patch)
+{
+    if (keyEquals(patch, "gps_enabled") || keyEquals(patch, "gps.enabled"))
+    {
+        bool enabled = false;
+        if (!parseBool(patch.value.c_str(), enabled))
+        {
+            return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+        }
+
+        app::IAppFacade& app_ctx = app::appFacade();
+        app_ctx.getConfig().gps_enabled = enabled;
+        app_ctx.saveConfig();
+        ::platform::ui::gps::set_enabled(enabled);
+        return ui::UiActionResult::success();
+    }
+
+    return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+}
+
+LegacySettingsActionSink& legacy_settings_action_sink()
+{
+    static LegacySettingsActionSink sink;
+    return sink;
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/legacy_settings_source.cpp b/modules/ui_shared/src/ui/presentation_sources/legacy_settings_source.cpp
new file mode 100644
index 00000000..a10a4fa9
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/legacy_settings_source.cpp
@@ -0,0 +1,34 @@
+#include "ui/presentation_sources/legacy_settings_source.h"
+
+#include "app/app_config.h"
+#include "app/app_facade_access.h"
+#include "sys/clock.h"
+
+namespace ui::presentation_sources
+{
+
+bool LegacySettingsSource::buildSettingsSnapshot(ui::settings::SettingsSnapshot& out) const
+{
+    out = ui::settings::SettingsSnapshot{};
+    out.header.valid = true;
+    out.header.version = 1;
+    out.header.generated_at_ms = sys::millis_now();
+
+    out.section_count = 1;
+    ui::copyText(out.sections[0].title, "GPS");
+    out.sections[0].option_count = 1;
+    ui::copyText(out.sections[0].options[0].key, "gps_enabled");
+    ui::copyText(out.sections[0].options[0].label, "GPS Enabled");
+    ui::copyText(out.sections[0].options[0].value_label,
+                 app::configFacade().getConfig().gps_enabled ? "ON" : "OFF");
+    out.sections[0].options[0].control = ui::settings::SettingControlKind::Toggle;
+    return true;
+}
+
+LegacySettingsSource& legacy_settings_source()
+{
+    static LegacySettingsSource source;
+    return source;
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/team_chat_action_sink.cpp b/modules/ui_shared/src/ui/presentation_sources/team_chat_action_sink.cpp
new file mode 100644
index 00000000..af777edf
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/team_chat_action_sink.cpp
@@ -0,0 +1,139 @@
+#include "ui/presentation_sources/team_chat_action_sink.h"
+
+#include "platform/ui/team_ui_store_runtime.h"
+#include "sys/clock.h"
+#include "team/protocol/team_chat.h"
+
+#include <string>
+
+namespace ui::presentation_sources
+{
+namespace
+{
+
+constexpr uint32_t kMinValidEpochSeconds = 1577836800U; // 2020-01-01
+constexpr uint32_t kTeamComposeMsgIdStart = 1U;
+
+bool isTeamConversation(ui::chat::ConversationId id)
+{
+    return id.isValid() && id.kind == ui::chat::ConversationKind::Team;
+}
+
+uint32_t currentTimestamp()
+{
+    uint32_t ts = sys::epoch_seconds_now();
+    if (ts < kMinValidEpochSeconds)
+    {
+        ts = static_cast<uint32_t>(sys::millis_now() / 1000U);
+    }
+    return ts;
+}
+
+} // namespace
+
+TeamChatActionSink::TeamChatActionSink(::team::ui::ITeamUiStore& team_store,
+                                       ITeamChatCommandPort* command_port,
+                                       uint8_t team_channel_raw)
+    : team_store_(team_store),
+      command_port_(command_port),
+      team_channel_raw_(team_channel_raw)
+{
+}
+
+ui::UiActionResult TeamChatActionSink::selectConversation(
+    ui::chat::ConversationId id)
+{
+    if (!id.isValid())
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+    if (!isTeamConversation(id))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+    }
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult TeamChatActionSink::sendMessage(
+    const ui::chat::SendMessageView& message)
+{
+    if (!isTeamConversation(message.conversation))
+    {
+        return message.conversation.isValid()
+                   ? ui::UiActionResult::fail(ui::UiActionFailure::Unsupported)
+                   : ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+    if (message.text == nullptr || message.text_len == 0)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+
+    ::team::ui::TeamUiSnapshot snap;
+    if (!team_store_.load(snap) || !snap.has_team_id)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+    if (command_port_ == nullptr || !snap.has_team_psk)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+    if (!command_port_->setKeysFromPsk(snap.team_id,
+                                       snap.security_round,
+                                       snap.team_psk.data(),
+                                       snap.team_psk.size()))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+
+    const uint32_t ts = currentTimestamp();
+    const std::string text(message.text, message.text_len);
+
+    team::proto::TeamChatMessage team_message;
+    team_message.header.type = team::proto::TeamChatType::Text;
+    team_message.header.ts = ts;
+    team_message.header.msg_id = next_message_id_++;
+    if (next_message_id_ == 0)
+    {
+        next_message_id_ = kTeamComposeMsgIdStart;
+    }
+    team_message.payload.assign(text.begin(), text.end());
+
+    const bool sent = command_port_->sendTeamChat(team_message,
+                                                  team_channel_raw_);
+    if (!sent)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    }
+
+    (void)team::ui::team_ui_chatlog_append_structured(snap.team_id,
+                                                      0,
+                                                      false,
+                                                      ts,
+                                                      team::proto::TeamChatType::Text,
+                                                      team_message.payload);
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult TeamChatActionSink::markRead(ui::chat::ConversationId id)
+{
+    if (!id.isValid())
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+    if (!isTeamConversation(id))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+    }
+
+    ::team::ui::TeamUiSnapshot snap;
+    if (!team_store_.load(snap) || !snap.has_team_id)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+
+    snap.team_chat_unread = 0;
+    team_store_.save(snap);
+    return ui::UiActionResult::success();
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp b/modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp
new file mode 100644
index 00000000..4198b6b7
--- /dev/null
+++ b/modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp
@@ -0,0 +1,190 @@
+#include "ui/presentation_sources/team_chat_presentation_source.h"
+
+#include "platform/ui/team_ui_store_runtime.h"
+#include "ui/team_presentation/team_rich_payload_projector.h"
+#include "ui_presentation/common/fixed_text.h"
+
+#include <cstddef>
+#include <cstdio>
+#include <string>
+#include <vector>
+
+namespace ui::presentation_sources
+{
+namespace
+{
+
+constexpr std::size_t kMaxMessageRows = 24;
+
+uint32_t foldTeamId(const ::team::TeamId& team_id)
+{
+    uint32_t hash = 2166136261UL;
+    for (const uint8_t byte : team_id)
+    {
+        hash ^= byte;
+        hash *= 16777619UL;
+    }
+    return hash == 0 ? 1U : hash;
+}
+
+ui::chat::ConversationId teamConversationId(const ::team::ui::TeamUiSnapshot& snap)
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::Team;
+    id.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    id.primary = snap.has_team_id ? foldTeamId(snap.team_id) : 1U;
+    id.secondary = 0;
+    return id;
+}
+
+std::string teamTitle(const ::team::ui::TeamUiSnapshot& snap)
+{
+    return snap.team_name.empty() ? "Team" : snap.team_name;
+}
+
+void copyTimeLabel(ui::FixedText<24>& out, uint32_t timestamp)
+{
+    if (timestamp == 0)
+    {
+        out.clear();
+        return;
+    }
+
+    char buffer[24]{};
+    std::snprintf(buffer, sizeof(buffer), "%lu",
+                  static_cast<unsigned long>(timestamp));
+    ui::copyText(out, buffer);
+}
+
+void copySenderLabel(ui::FixedText<32>& out,
+                     const ::team::ui::TeamUiSnapshot& snap,
+                     const ::team::ui::TeamChatLogEntry& entry)
+{
+    if (!entry.incoming)
+    {
+        ui::copyText(out, "Me");
+        return;
+    }
+
+    for (const auto& member : snap.members)
+    {
+        if (member.node_id == entry.peer_id && !member.name.empty())
+        {
+            ui::copyText(out, member.name.c_str());
+            return;
+        }
+    }
+
+    char buffer[16]{};
+    std::snprintf(buffer,
+                  sizeof(buffer),
+                  "%04lX",
+                  static_cast<unsigned long>(entry.peer_id & 0xFFFFU));
+    ui::copyText(out, buffer);
+}
+
+uint64_t messageLocalId(const ::team::ui::TeamChatLogEntry& entry,
+                        std::size_t index)
+{
+    uint64_t id = 1469598103934665603ULL;
+    id ^= entry.ts;
+    id *= 1099511628211ULL;
+    id ^= entry.peer_id;
+    id *= 1099511628211ULL;
+    id ^= static_cast<uint64_t>(index + 1U);
+    id *= 1099511628211ULL;
+    return id == 0 ? static_cast<uint64_t>(index + 1U) : id;
+}
+
+} // namespace
+
+TeamChatPresentationSource::TeamChatPresentationSource(
+    ::team::ui::ITeamUiStore& team_store)
+    : team_store_(team_store)
+{
+}
+
+bool TeamChatPresentationSource::buildChatWorkspaceSnapshot(
+    const ui::chat::ChatWorkspaceRequest& request,
+    ui::chat::ChatWorkspaceSnapshot& out) const
+{
+    (void)request.conversation_offset;
+    (void)request.message_offset;
+
+    ui::chat::resetChatWorkspaceSnapshot(out);
+    out.header.valid = true;
+    out.header.version = 1;
+    ui::copyText(out.workspace_title, "Team");
+    ui::copyText(out.composer_placeholder, "Team message");
+
+    ::team::ui::TeamUiSnapshot snap;
+    if (!team_store_.load(snap) || !snap.has_team_id)
+    {
+        return true;
+    }
+
+    const ui::chat::ConversationId team_id = teamConversationId(snap);
+    out.selected_conversation = request.selected;
+
+    out.conversation_count = 1;
+    ui::chat::ConversationRow& conversation = out.conversations[0];
+    conversation.id = team_id;
+    conversation.kind = ui::chat::ConversationKind::Team;
+    conversation.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    conversation.unread_count = static_cast<uint16_t>(
+        snap.team_chat_unread > 0xFFFFU ? 0xFFFFU : snap.team_chat_unread);
+    conversation.selected = request.selected == team_id;
+    ui::copyText(conversation.title, teamTitle(snap).c_str());
+    ui::copyText(conversation.subtitle, "No messages");
+
+    std::vector<::team::ui::TeamChatLogEntry> entries;
+    if (team::ui::team_ui_chatlog_load_recent(snap.team_id,
+                                              kMaxMessageRows,
+                                              entries) &&
+        !entries.empty())
+    {
+        ::ui::team_presentation::TeamRichPayloadProjector projector;
+        ::ui::team_presentation::TeamRichPayloadDisplay display;
+        (void)projector.project(entries.back(), display);
+        ui::copyText(conversation.subtitle,
+                     display.summary.c_str());
+        conversation.last_delivery = entries.back().incoming
+                                         ? ui::chat::MessageDeliveryState::Received
+                                         : ui::chat::MessageDeliveryState::Sent;
+    }
+
+    if (request.selected != team_id)
+    {
+        return true;
+    }
+
+    out.can_send = snap.has_team_psk;
+    out.composer_enabled = out.can_send;
+    out.message_count =
+        entries.size() < kMaxMessageRows ? entries.size() : kMaxMessageRows;
+
+    ::ui::team_presentation::TeamRichPayloadProjector projector;
+    for (std::size_t i = 0; i < out.message_count; ++i)
+    {
+        const ::team::ui::TeamChatLogEntry& entry = entries[i];
+        ::ui::team_presentation::TeamRichPayloadDisplay display;
+        (void)projector.project(entry, display);
+        ui::chat::MessageRow& row = out.messages[i];
+        row.conversation = team_id;
+        row.outgoing = !entry.incoming;
+        row.sender_node_id = entry.incoming ? entry.peer_id : 0;
+        row.delivery = entry.incoming ? ui::chat::MessageDeliveryState::Received
+                                      : ui::chat::MessageDeliveryState::Sent;
+        row.failure = ui::chat::MessageFailureKind::None;
+        row.ref.origin = entry.incoming ? ui::chat::MessageOrigin::RemoteStored
+                                        : ui::chat::MessageOrigin::LocalStored;
+        row.ref.local_id = messageLocalId(entry, i);
+        ui::copyText(row.text, display.summary.c_str());
+        copyTimeLabel(row.time_label, entry.ts);
+        copySenderLabel(row.sender_label, snap, entry);
+    }
+
+    return true;
+}
+
+} // namespace ui::presentation_sources
diff --git a/modules/ui_shared/src/ui/runtime/memory_profile.cpp b/modules/ui_shared/src/ui/runtime/memory_profile.cpp
index ab63834b..9ddefbff 100644
--- a/modules/ui_shared/src/ui/runtime/memory_profile.cpp
+++ b/modules/ui_shared/src/ui/runtime/memory_profile.cpp
@@ -52,7 +52,9 @@ const MemoryProfile& current_memory_profile()
     {
 #if defined(TRAIL_MATE_ESP_BOARD_TAB5) || defined(TRAIL_MATE_ESP_BOARD_T_DISPLAY_P4)
         return make_extended_profile();
-#elif defined(ARDUINO_T_DECK) || defined(ARDUINO_T_DECK_PRO)
+#elif defined(ARDUINO_T_DECK) || defined(ARDUINO_T_DECK_PRO) ||                  \
+    defined(ARDUINO_LILYGO_LORA_SX1262) || defined(ARDUINO_LILYGO_T_WATCH_S3) || \
+    defined(BOARD_HAS_PSRAM) || defined(HAS_PSRAM)
         return make_standard_profile();
 #else
         return make_constrained_profile();
diff --git a/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp b/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp
index cbcee536..9492abd2 100644
--- a/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp
+++ b/modules/ui_shared/src/ui/screens/chat/chat_conversation_components.cpp
@@ -14,13 +14,14 @@
 #include "ui/screens/chat/chat_conversation_layout.h"
 #include "ui/screens/chat/chat_conversation_styles.h"
 #include "ui/ui_common.h"
+#include "ui_presentation/chat/chat_workspace_snapshot.h"
 
 #include "sys/clock.h"
-#include "team/protocol/team_location_marker.h"
 
 #include <algorithm>
 #include <cctype>
 #include <cstdio>
+#include <cstdlib>
 #include <ctime>
 
 #ifndef CHAT_CONVERSATION_LOG_ENABLE
@@ -33,15 +34,6 @@
 #define CHAT_CONVERSATION_LOG(...)
 #endif
 
-extern "C"
-{
-    extern const lv_image_dsc_t AreaCleared;
-    extern const lv_image_dsc_t BaseCamp;
-    extern const lv_image_dsc_t GoodFind;
-    extern const lv_image_dsc_t rally;
-    extern const lv_image_dsc_t sos;
-}
-
 namespace chat
 {
 namespace ui
@@ -52,33 +44,57 @@ namespace
 {
 constexpr lv_coord_t kBubbleMaxWidth = 322; // same as original
 constexpr lv_coord_t kBubblePadX = 10;      // keep in sync with styles.cpp
-constexpr lv_coord_t kTeamLocationIconSize = 24;
 constexpr uint32_t kSecondsPerDay = 24U * 60U * 60U;
 constexpr uint32_t kSecondsPerMonth = 30U * kSecondsPerDay;
 constexpr uint32_t kSecondsPerYear = 365U * kSecondsPerDay;
 constexpr uint32_t kMinValidEpochSeconds = 1577836800U; // 2020-01-01
 constexpr size_t kMaxPrefixedSenderLen = 20;
-} // namespace
 
-static const lv_image_dsc_t* team_location_icon_src(uint8_t icon_id)
+::ui::chat::MessageDeliveryState delivery_from_message_status(
+    chat::MessageStatus status)
 {
-    switch (static_cast<team::proto::TeamLocationMarkerIcon>(icon_id))
+    switch (status)
     {
-    case team::proto::TeamLocationMarkerIcon::AreaCleared:
-        return &AreaCleared;
-    case team::proto::TeamLocationMarkerIcon::BaseCamp:
-        return &BaseCamp;
-    case team::proto::TeamLocationMarkerIcon::GoodFind:
-        return &GoodFind;
-    case team::proto::TeamLocationMarkerIcon::Rally:
-        return &rally;
-    case team::proto::TeamLocationMarkerIcon::Sos:
-        return &sos;
-    default:
-        return nullptr;
+    case chat::MessageStatus::Incoming:
+        return ::ui::chat::MessageDeliveryState::Received;
+    case chat::MessageStatus::Queued:
+        return ::ui::chat::MessageDeliveryState::Queued;
+    case chat::MessageStatus::Sent:
+        return ::ui::chat::MessageDeliveryState::Sent;
+    case chat::MessageStatus::Failed:
+        return ::ui::chat::MessageDeliveryState::Failed;
     }
+    return ::ui::chat::MessageDeliveryState::Unknown;
 }
 
+bool message_ref_matches_id(const ::ui::chat::MessageRef& ref,
+                            chat::MessageId msg_id)
+{
+    if (ref.protocol_id != 0)
+    {
+        return ref.protocol_id == msg_id;
+    }
+    return ref.local_id == static_cast<uint64_t>(msg_id);
+}
+
+uint32_t timestamp_from_presentation_label(const ::ui::FixedText<24>& label)
+{
+    const char* text = label.c_str();
+    if (!text || text[0] == '\0')
+    {
+        return 0;
+    }
+
+    char* end = nullptr;
+    const unsigned long value = std::strtoul(text, &end, 10);
+    if (end == text || (end && *end != '\0'))
+    {
+        return 0;
+    }
+    return static_cast<uint32_t>(value);
+}
+} // namespace
+
 static bool is_valid_epoch_ts(uint32_t ts)
 {
     return ts >= kMinValidEpochSeconds;
@@ -301,7 +317,7 @@ ChatConversationScreen::~ChatConversationScreen()
     }
 }
 
-void ChatConversationScreen::addMessage(const chat::ChatMessage& msg)
+void ChatConversationScreen::addMessage(const ::ui::chat::MessageRow& row)
 {
     if (!guard_ || !guard_->alive || !msg_list_ || !lv_obj_is_valid(msg_list_))
     {
@@ -317,7 +333,7 @@ void ChatConversationScreen::addMessage(const chat::ChatMessage& msg)
         messages_.erase(messages_.begin());
     }
 
-    createMessageItem(msg);
+    createMessageItem(row);
     scrollToBottom();
 }
 
@@ -355,11 +371,11 @@ bool ChatConversationScreen::updateMessageStatus(const chat::MessageId msg_id,
 
     for (auto& item : messages_)
     {
-        if (item.msg.msg_id != msg_id)
+        if (!message_ref_matches_id(item.ref, msg_id))
         {
             continue;
         }
-        item.msg.status = status;
+        item.delivery = delivery_from_message_status(status);
         if (!item.status_label)
         {
             return true;
@@ -444,30 +460,31 @@ void ChatConversationScreen::setReplyEnabled(bool enabled)
     }
 }
 
-void ChatConversationScreen::createMessageItem(const chat::ChatMessage& msg)
+void ChatConversationScreen::createMessageItem(const ::ui::chat::MessageRow& row)
 {
     if (!guard_ || !guard_->alive || !msg_list_)
     {
         return;
     }
     MessageItem item;
-    item.msg = msg;
+    item.ref = row.ref;
+    item.delivery = row.delivery;
 
     // ----- Layout: row + bubble + time + text + status -----
     item.container = chat::ui::layout::create_message_row(msg_list_);
     chat::ui::conversation::styles::apply_message_row(item.container);
 
-    const bool is_self = (msg.status != MessageStatus::Incoming);
-    std::string display_text = msg.text;
+    const bool is_self = row.outgoing;
+    std::string display_text = row.text.c_str();
     std::string inferred_sender;
     if (!is_self &&
-        msg.protocol == chat::MeshProtocol::MeshCore &&
+        conv_.protocol == chat::MeshProtocol::MeshCore &&
         conv_.peer == 0 &&
-        msg.from == 0)
+        row.sender_node_id == 0)
     {
         std::string parsed_sender;
         std::string parsed_body;
-        if (split_prefixed_sender_text(msg.text, &parsed_sender, &parsed_body))
+        if (split_prefixed_sender_text(display_text, &parsed_sender, &parsed_body))
         {
             inferred_sender = parsed_sender;
             display_text = parsed_body;
@@ -496,26 +513,42 @@ void ChatConversationScreen::createMessageItem(const chat::ChatMessage& msg)
     item.time_label = chat::ui::layout::create_bubble_time(bubble);
     chat::ui::conversation::styles::apply_bubble_time(item.time_label);
     char time_buf[16];
-    format_message_time(time_buf, sizeof(time_buf), msg.timestamp);
+    format_message_time(
+        time_buf,
+        sizeof(time_buf),
+        timestamp_from_presentation_label(row.time_label));
     if (conv_.peer == 0)
     {
         std::string sender;
         if (is_self)
         {
             sender = app::configFacade().getConfig().short_name;
+            if (sender.empty() && !row.sender_label.empty())
+            {
+                sender = row.sender_label.c_str();
+            }
+            if (sender.empty())
+            {
+                sender = "Me";
+            }
         }
-        else if (msg.from == 0)
+        else if (!row.sender_label.empty())
+        {
+            sender = row.sender_label.c_str();
+        }
+        else if (row.sender_node_id == 0)
         {
             sender = inferred_sender.empty() ? ::ui::i18n::tr("Unknown") : inferred_sender;
         }
         else
         {
-            sender = app::messagingFacade().getContactService().getContactName(msg.from);
+            sender = app::messagingFacade().getContactService().getContactName(
+                row.sender_node_id);
             if (sender.empty())
             {
                 char buf[16];
                 snprintf(buf, sizeof(buf), "%04lX",
-                         static_cast<unsigned long>(msg.from & 0xFFFF));
+                         static_cast<unsigned long>(row.sender_node_id & 0xFFFF));
                 sender = buf;
             }
         }
@@ -529,19 +562,6 @@ void ChatConversationScreen::createMessageItem(const chat::ChatMessage& msg)
             item.time_label, lv_label_get_text(item.time_label), ::ui::fonts::ui_chrome_font());
     }
 
-    if (team::proto::team_location_marker_icon_is_valid(msg.team_location_icon))
-    {
-        const lv_image_dsc_t* icon = team_location_icon_src(msg.team_location_icon);
-        if (icon)
-        {
-            lv_obj_t* marker_icon = lv_image_create(bubble);
-            lv_image_set_src(marker_icon, icon);
-            lv_obj_set_size(marker_icon, kTeamLocationIconSize, kTeamLocationIconSize);
-            lv_image_set_inner_align(marker_icon, LV_IMAGE_ALIGN_CONTAIN);
-            lv_obj_set_style_pad_bottom(marker_icon, 2, 0);
-        }
-    }
-
     item.text_label = chat::ui::layout::create_bubble_text(bubble);
     chat::ui::conversation::styles::apply_bubble_text(item.text_label);
     lv_label_set_text(item.text_label, display_text.c_str());
@@ -561,7 +581,7 @@ void ChatConversationScreen::createMessageItem(const chat::ChatMessage& msg)
 
     item.status_label = chat::ui::layout::create_bubble_status(bubble);
     chat::ui::conversation::styles::apply_bubble_status(item.status_label);
-    if (msg.status == MessageStatus::Failed)
+    if (row.delivery == ::ui::chat::MessageDeliveryState::Failed)
     {
         ::ui::i18n::set_label_text(item.status_label, "Failed");
         ::ui::fonts::apply_localized_font(
diff --git a/modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp b/modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp
index 61c34f27..d20db9b9 100644
--- a/modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp
+++ b/modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp
@@ -2,9 +2,27 @@
 
 #include "app/app_config.h"
 #include "app/app_facade_access.h"
+#include "chat/delivery/chat_delivery_action_service.h"
+#include "chat/delivery/chat_delivery_event_port.h"
+#include "platform/ui/gps_runtime.h"
+#include "platform/ui/team_ui_store_runtime.h"
+#include "team/usecase/team_controller.h"
 #include "ui/app_runtime.h"
+#include "ui/presentation_sources/chat_presentation_source.h"
+#include "ui/presentation_sources/legacy_chat_action_sink.h"
+#include "ui/presentation_sources/team_chat_action_sink.h"
+#include "ui/presentation_sources/team_chat_presentation_source.h"
 #include "ui/screens/chat/chat_ui_controller.h"
+#include "ui/team_actions/legacy_team_action_bridge.h"
 #include "ui/ui_common.h"
+#include "ui_chat_runtime/chat_delivery_action_port_adapter.h"
+#include "ui_chat_runtime/chat_delivery_event_projection_adapter.h"
+#include "ui_chat_runtime/chat_page_runtime_event_pump.h"
+#include "ui_key_verification_runtime/key_verification_action_sink.h"
+#include "ui_key_verification_runtime/key_verification_presentation_source.h"
+#include "ui_key_verification_runtime/key_verification_session_adapter.h"
+#include "ui_presentation/chat/chat_workspace_model.h"
+#include "ui_presentation/key_verification/key_verification_model.h"
 
 #include <memory>
 
@@ -13,7 +31,116 @@ namespace
 
 const chat::ui::shell::Host* s_host = nullptr;
 lv_obj_t* s_chat_container = nullptr;
+std::unique_ptr<::ui::presentation_sources::ChatPresentationSource> s_chat_source = nullptr;
+std::unique_ptr<::ui::presentation_sources::LegacyChatActionSink> s_chat_sink = nullptr;
+std::unique_ptr<::ui::chat::ChatWorkspaceModel> s_chat_model = nullptr;
+std::unique_ptr<::chat::delivery::ChatDeliveryReadModel> s_delivery_read_model = nullptr;
+std::unique_ptr<::chat::delivery::ChatDeliveryEventProjector> s_delivery_projector = nullptr;
+std::unique_ptr<::chat::delivery::ProjectingChatDeliveryEventPort> s_delivery_event_port = nullptr;
+std::unique_ptr<::ui_chat_runtime::ChatDeliveryEventProjectionAdapter> s_delivery_event_adapter = nullptr;
+std::unique_ptr<::chat::delivery::ChatDeliveryActionService> s_delivery_action_service = nullptr;
+std::unique_ptr<::ui_chat_runtime::ChatDeliveryActionPortAdapter> s_delivery_action_adapter = nullptr;
+std::unique_ptr<::ui_key_verification_runtime::KeyVerificationSessionAdapter> s_key_verification_session = nullptr;
+std::unique_ptr<::ui_key_verification_runtime::KeyVerificationPresentationSource> s_key_verification_source = nullptr;
+std::unique_ptr<::ui_key_verification_runtime::KeyVerificationActionSink> s_key_verification_sink = nullptr;
+std::unique_ptr<::ui::key_verification::KeyVerificationModel> s_key_verification_model = nullptr;
+std::unique_ptr<::ui::presentation_sources::TeamChatPresentationSource> s_team_chat_source = nullptr;
+std::unique_ptr<::ui::presentation_sources::ITeamChatCommandPort> s_team_chat_command_port = nullptr;
+std::unique_ptr<::ui::presentation_sources::TeamChatActionSink> s_team_chat_sink = nullptr;
+std::unique_ptr<::ui::chat::ChatWorkspaceModel> s_team_chat_model = nullptr;
+std::unique_ptr<::ui::team_actions::ITeamLocationSource> s_team_location_source = nullptr;
+std::unique_ptr<::ui::team_actions::LegacyTeamActionBridge> s_team_action_sink = nullptr;
 std::unique_ptr<chat::ui::UiController> s_ui_controller = nullptr;
+std::unique_ptr<chat::ui::ChatPageRuntimeEventPump> s_event_pump = nullptr;
+std::unique_ptr<chat::ui::IChatUiRuntime> s_runtime_facade = nullptr;
+
+class ChatPageRuntimeFacade final : public chat::ui::IChatUiRuntime
+{
+  public:
+    ChatPageRuntimeFacade(chat::ui::ChatPageRuntimeEventPump& event_pump,
+                          chat::ui::UiController& controller)
+        : event_pump_(event_pump), controller_(controller)
+    {
+    }
+
+    void update() override
+    {
+        event_pump_.update();
+        controller_.update();
+    }
+
+    void onChatEvent(sys::Event* event) override
+    {
+        event_pump_.handleEvent(event);
+    }
+
+    chat::ui::ChatUiState getState() const override
+    {
+        return controller_.getState();
+    }
+
+    bool isTeamConversationActive() const override
+    {
+        return controller_.isTeamConversationActive();
+    }
+
+  private:
+    chat::ui::ChatPageRuntimeEventPump& event_pump_;
+    chat::ui::UiController& controller_;
+};
+
+class TeamControllerChatCommandPort final
+    : public ::ui::presentation_sources::ITeamChatCommandPort
+{
+  public:
+    explicit TeamControllerChatCommandPort(::team::TeamController& controller)
+        : controller_(controller)
+    {
+    }
+
+    bool setKeysFromPsk(const ::team::TeamId& team_id,
+                        uint32_t key_id,
+                        const uint8_t* psk,
+                        size_t psk_len) override
+    {
+        return controller_.setKeysFromPsk(team_id, key_id, psk, psk_len);
+    }
+
+    bool sendTeamChat(const ::team::proto::TeamChatMessage& message,
+                      uint8_t team_channel_raw) override
+    {
+        return controller_.onChat(
+            message,
+            static_cast<::chat::ChannelId>(team_channel_raw));
+    }
+
+  private:
+    ::team::TeamController& controller_;
+};
+
+class GpsTeamLocationSource final
+    : public ::ui::team_actions::ITeamLocationSource
+{
+  public:
+    bool currentTeamLocation(::ui::team_actions::TeamLocationSnapshot& out) override
+    {
+        const auto gps_state = platform::ui::gps::get_data();
+        if (!gps_state.valid)
+        {
+            out = {};
+            return false;
+        }
+
+        out.valid = true;
+        out.lat = gps_state.lat;
+        out.lon = gps_state.lng;
+        out.has_altitude = gps_state.has_alt;
+        out.altitude_m = gps_state.alt_m;
+        out.accuracy_m = 0.0f;
+        out.timestamp = 0;
+        return true;
+    }
+};
 
 void request_shell_exit(void*)
 {
@@ -54,7 +181,28 @@ void enter(const shell::Host* host, lv_obj_t* parent)
         lv_obj_del(s_chat_container);
     }
     s_chat_container = nullptr;
+    s_runtime_facade.reset();
+    s_event_pump.reset();
     s_ui_controller.reset();
+    s_team_action_sink.reset();
+    s_team_location_source.reset();
+    s_team_chat_model.reset();
+    s_team_chat_sink.reset();
+    s_team_chat_command_port.reset();
+    s_team_chat_source.reset();
+    s_chat_model.reset();
+    s_chat_sink.reset();
+    s_chat_source.reset();
+    s_key_verification_model.reset();
+    s_key_verification_sink.reset();
+    s_key_verification_source.reset();
+    s_key_verification_session.reset();
+    s_delivery_action_adapter.reset();
+    s_delivery_action_service.reset();
+    s_delivery_event_adapter.reset();
+    s_delivery_event_port.reset();
+    s_delivery_projector.reset();
+    s_delivery_read_model.reset();
 
     lv_group_t* prev_group = lv_group_get_default();
     set_default_group(nullptr);
@@ -79,15 +227,111 @@ void enter(const shell::Host* host, lv_obj_t* parent)
     chat::ChannelId default_channel = (app::configFacade().getConfig().chat_channel == 1)
                                           ? chat::ChannelId::SECONDARY
                                           : chat::ChannelId::PRIMARY;
+    auto& chat_service = app::messagingFacade().getChatService();
+    s_delivery_read_model =
+        std::unique_ptr<::chat::delivery::ChatDeliveryReadModel>(
+            new ::chat::delivery::ChatDeliveryReadModel());
+    s_delivery_projector =
+        std::unique_ptr<::chat::delivery::ChatDeliveryEventProjector>(
+            new ::chat::delivery::ChatDeliveryEventProjector(
+                *s_delivery_read_model));
+    s_delivery_event_port =
+        std::unique_ptr<::chat::delivery::ProjectingChatDeliveryEventPort>(
+            new ::chat::delivery::ProjectingChatDeliveryEventPort(
+                *s_delivery_projector));
+    s_delivery_event_adapter =
+        std::unique_ptr<::ui_chat_runtime::ChatDeliveryEventProjectionAdapter>(
+            new ::ui_chat_runtime::ChatDeliveryEventProjectionAdapter(
+                chat_service,
+                *s_delivery_event_port));
+    s_delivery_action_service =
+        std::unique_ptr<::chat::delivery::ChatDeliveryActionService>(
+            new ::chat::delivery::ChatDeliveryActionService(
+                *s_delivery_read_model));
+    s_delivery_action_adapter =
+        std::unique_ptr<::ui_chat_runtime::ChatDeliveryActionPortAdapter>(
+            new ::ui_chat_runtime::ChatDeliveryActionPortAdapter(
+                *s_delivery_action_service));
+    s_chat_source = std::unique_ptr<::ui::presentation_sources::ChatPresentationSource>(
+        new ::ui::presentation_sources::ChatPresentationSource(
+            chat_service,
+            &app::messagingFacade().getContactService(),
+            s_delivery_read_model.get()));
+    s_chat_sink = std::unique_ptr<::ui::presentation_sources::LegacyChatActionSink>(
+        new ::ui::presentation_sources::LegacyChatActionSink(chat_service));
+    s_chat_model = std::unique_ptr<::ui::chat::ChatWorkspaceModel>(
+        new ::ui::chat::ChatWorkspaceModel(*s_chat_source, *s_chat_sink));
+    s_key_verification_session =
+        std::unique_ptr<::ui_key_verification_runtime::KeyVerificationSessionAdapter>(
+            new ::ui_key_verification_runtime::KeyVerificationSessionAdapter());
+    s_key_verification_source =
+        std::unique_ptr<::ui_key_verification_runtime::KeyVerificationPresentationSource>(
+            new ::ui_key_verification_runtime::KeyVerificationPresentationSource(
+                *s_key_verification_session,
+                &app::messagingFacade().getContactService(),
+                app::messagingFacade().getMeshAdapter()));
+    s_key_verification_sink =
+        std::unique_ptr<::ui_key_verification_runtime::KeyVerificationActionSink>(
+            new ::ui_key_verification_runtime::KeyVerificationActionSink(
+                *s_key_verification_session,
+                app::messagingFacade().getMeshAdapter(),
+                &app::messagingFacade().getContactService()));
+    s_key_verification_model =
+        std::unique_ptr<::ui::key_verification::KeyVerificationModel>(
+            new ::ui::key_verification::KeyVerificationModel(
+                *s_key_verification_source,
+                *s_key_verification_sink));
+    s_team_chat_source =
+        std::unique_ptr<::ui::presentation_sources::TeamChatPresentationSource>(
+            new ::ui::presentation_sources::TeamChatPresentationSource(
+                team::ui::team_ui_get_store()));
+    if (auto* team_controller = app::teamFacade().getTeamController())
+    {
+        s_team_chat_command_port =
+            std::unique_ptr<::ui::presentation_sources::ITeamChatCommandPort>(
+                new TeamControllerChatCommandPort(*team_controller));
+    }
+    s_team_chat_sink =
+        std::unique_ptr<::ui::presentation_sources::TeamChatActionSink>(
+            new ::ui::presentation_sources::TeamChatActionSink(
+                team::ui::team_ui_get_store(),
+                s_team_chat_command_port.get()));
+    s_team_chat_model = std::unique_ptr<::ui::chat::ChatWorkspaceModel>(
+        new ::ui::chat::ChatWorkspaceModel(*s_team_chat_source, *s_team_chat_sink));
+    s_team_location_source =
+        std::unique_ptr<::ui::team_actions::ITeamLocationSource>(
+            new GpsTeamLocationSource());
+    s_team_action_sink =
+        std::unique_ptr<::ui::team_actions::LegacyTeamActionBridge>(
+            new ::ui::team_actions::LegacyTeamActionBridge(
+                team::ui::team_ui_get_store(),
+                s_team_chat_command_port.get(),
+                s_team_location_source.get()));
+
     s_ui_controller = std::unique_ptr<chat::ui::UiController>(
         new chat::ui::UiController(s_chat_container,
-                                   app::messagingFacade().getChatService(),
+                                   chat_service,
+                                   *s_chat_model,
+                                   *s_team_chat_model,
+                                   s_team_action_sink.get(),
+                                   s_key_verification_model.get(),
                                    default_channel,
                                    request_shell_exit,
                                    nullptr));
     s_ui_controller->init();
+    s_event_pump =
+        std::unique_ptr<chat::ui::ChatPageRuntimeEventPump>(
+            new chat::ui::ChatPageRuntimeEventPump(
+                chat_service,
+                s_delivery_event_adapter.get(),
+                s_key_verification_source.get(),
+                s_key_verification_model.get(),
+                s_ui_controller.get()));
+    s_runtime_facade =
+        std::unique_ptr<chat::ui::IChatUiRuntime>(
+            new ChatPageRuntimeFacade(*s_event_pump, *s_ui_controller));
 
-    app::runtimeFacade().setChatUiRuntime(s_ui_controller.get());
+    app::runtimeFacade().setChatUiRuntime(s_runtime_facade.get());
 }
 
 void exit(lv_obj_t* parent)
@@ -101,7 +345,28 @@ void exit(lv_obj_t* parent)
     }
 
     app::runtimeFacade().setChatUiRuntime(nullptr);
+    s_runtime_facade.reset();
+    s_event_pump.reset();
     s_ui_controller.reset();
+    s_team_action_sink.reset();
+    s_team_location_source.reset();
+    s_team_chat_model.reset();
+    s_team_chat_sink.reset();
+    s_team_chat_command_port.reset();
+    s_team_chat_source.reset();
+    s_chat_model.reset();
+    s_chat_sink.reset();
+    s_chat_source.reset();
+    s_key_verification_model.reset();
+    s_key_verification_sink.reset();
+    s_key_verification_source.reset();
+    s_key_verification_session.reset();
+    s_delivery_action_adapter.reset();
+    s_delivery_action_service.reset();
+    s_delivery_event_adapter.reset();
+    s_delivery_event_port.reset();
+    s_delivery_projector.reset();
+    s_delivery_read_model.reset();
 
     if (s_chat_container && !lv_obj_is_valid(s_chat_container))
     {
diff --git a/modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp b/modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp
index e5052a20..a1f7f9ba 100644
--- a/modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp
+++ b/modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp
@@ -7,26 +7,23 @@
 #include "app/app_config.h"
 #include "app/app_facade_access.h"
 #include "chat/infra/mesh_protocol_utils.h"
-#include "chat/ports/i_mesh_adapter.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/usecase/contact_service.h"
-#include "platform/ui/gps_runtime.h"
+#include "chat_presentation_adapters/chat_conversation_mapper.h"
 #include "platform/ui/screen_runtime.h"
-#include "platform/ui/team_ui_store_runtime.h"
-#include "sys/clock.h"
 #include "sys/event_bus.h"
 #include "team/protocol/team_location_marker.h"
-#include "team/usecase/team_controller.h"
 #include "ui/app_runtime.h"
 #include "ui/assets/fonts/font_utils.h"
-#include "ui/formatters.h"
 #include "ui/localization.h"
-#include "ui/page/page_profile.h"
 #include "ui/screens/chat/chat_protocol_support.h"
-#include "ui/screens/chat/chat_send_flow.h"
+#include "ui/team_actions/team_action_sink.h"
 #include "ui/ui_common.h"
 #include "ui/widgets/ime/ime_widget.h"
 #include "ui/widgets/system_notification.h"
-#include <cmath>
+#include "ui_lvgl_ux_packs/common/key_verification_modal_renderer.h"
+#include "ui_lvgl_ux_packs/common/team_position_picker_renderer.h"
+#include "ui_presentation/key_verification/key_verification_model.h"
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -42,15 +39,6 @@
 #define CHAT_UI_LOG(...)
 #endif
 
-extern "C"
-{
-    extern const lv_image_dsc_t AreaCleared;
-    extern const lv_image_dsc_t BaseCamp;
-    extern const lv_image_dsc_t GoodFind;
-    extern const lv_image_dsc_t rally;
-    extern const lv_image_dsc_t sos;
-}
-
 namespace chat
 {
 namespace ui
@@ -63,48 +51,19 @@ namespace chat_support = chat::ui::support;
 constexpr uint8_t kTeamChatChannelRaw = 2;
 constexpr chat::ChannelId kTeamChatChannel =
     static_cast<chat::ChannelId>(kTeamChatChannelRaw);
-constexpr uint32_t kTeamComposeMsgIdStart = 1;
-uint32_t s_team_msg_id = kTeamComposeMsgIdStart;
-constexpr uint32_t kMinValidEpochSeconds = 1577836800U; // 2020-01-01
-
-struct TeamPositionIconOption
-{
-    uint8_t icon_id;
-    const char* meaning;
-    const lv_image_dsc_t* image;
-};
-
-const TeamPositionIconOption kTeamPositionIconOptions[] = {
-    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::AreaCleared),
-     "Area Cleared", &AreaCleared},
-    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::BaseCamp),
-     "Base Camp", &BaseCamp},
-    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::GoodFind),
-     "Good Find", &GoodFind},
-    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Rally),
-     "Rally Point", &rally},
-    {static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Sos),
-     "Emergency SOS", &sos}};
-
-const TeamPositionIconOption* find_team_position_icon_option(uint8_t icon_id)
-{
-    for (const auto& item : kTeamPositionIconOptions)
-    {
-        if (item.icon_id == icon_id)
-        {
-            return &item;
-        }
-    }
-    return nullptr;
-}
 
 const char* protocol_short_label(chat::MeshProtocol protocol)
 {
     return chat::infra::meshProtocolShortName(protocol);
 }
 
-const char* channel_display_name(chat::ChannelId channel)
+const char* channel_display_name(chat::MeshProtocol protocol, chat::ChannelId channel)
 {
+    if (protocol == chat::MeshProtocol::Meshtastic)
+    {
+        return chat::meshtastic::channelName(app::configFacade().getConfig().meshtastic_config,
+                                             channel);
+    }
     switch (channel)
     {
     case chat::ChannelId::SECONDARY:
@@ -143,172 +102,142 @@ bool isTeamConversationId(const chat::ConversationId& conv)
     return conv.channel == kTeamChatChannel && conv.peer == 0;
 }
 
-const char* team_command_name(team::proto::TeamCommandType type)
+chat::ConversationMeta legacyConversationMetaFromRow(
+    const ::ui::chat::ConversationRow& row)
 {
-    switch (type)
+    chat::ConversationMeta meta;
+    if (!chat_presentation_adapters::toCoreConversationId(row.id, meta.id))
     {
-    case team::proto::TeamCommandType::RallyTo:
-        return "RallyTo";
-    case team::proto::TeamCommandType::MoveTo:
-        return "MoveTo";
-    case team::proto::TeamCommandType::Hold:
-        return "Hold";
-    default:
-        return "Command";
+        return meta;
+    }
+    meta.name = row.title.c_str();
+    meta.preview = row.subtitle.c_str();
+    meta.unread = static_cast<int>(row.unread_count);
+    meta.last_timestamp = 0;
+    return meta;
+}
+
+void appendSnapshotConversationsToLegacy(const ::ui::chat::ChatWorkspaceSnapshot& snapshot,
+                                         std::vector<chat::ConversationMeta>& out)
+{
+    for (size_t i = 0; i < snapshot.conversation_count; ++i)
+    {
+        chat::ConversationId core_id;
+        if (!chat_presentation_adapters::toCoreConversationId(snapshot.conversations[i].id, core_id))
+        {
+            continue;
+        }
+        chat::ConversationMeta meta = legacyConversationMetaFromRow(snapshot.conversations[i]);
+        meta.id = core_id;
+        out.push_back(meta);
     }
 }
 
-std::string truncate_text(const std::string& text, size_t max_len)
+bool legacyTeamConversationMetaFromSnapshot(
+    const ::ui::chat::ChatWorkspaceSnapshot& snapshot,
+    chat::ConversationMeta& out)
 {
-    if (text.size() <= max_len)
+    if (!snapshot.header.valid)
     {
-        return text;
-    }
-    if (max_len <= 3)
-    {
-        return text.substr(0, max_len);
+        return false;
     }
 
-    auto utf8_char_bytes = [](unsigned char lead) -> size_t
+    for (size_t i = 0; i < snapshot.conversation_count; ++i)
     {
-        if ((lead & 0x80U) == 0)
+        const auto& row = snapshot.conversations[i];
+        if (row.id.kind != ::ui::chat::ConversationKind::Team)
         {
-            return 1;
+            continue;
         }
-        if ((lead & 0xE0U) == 0xC0U)
-        {
-            return 2;
-        }
-        if ((lead & 0xF0U) == 0xE0U)
-        {
-            return 3;
-        }
-        if ((lead & 0xF8U) == 0xF0U)
-        {
-            return 4;
-        }
-        return 1;
-    };
 
-    const size_t target_len = max_len - 3;
-    size_t safe_len = 0;
-    while (safe_len < text.size())
-    {
-        const size_t next = utf8_char_bytes(static_cast<unsigned char>(text[safe_len]));
-        if (safe_len + next > target_len)
-        {
-            break;
-        }
-        safe_len += next;
-    }
-    if (safe_len == 0)
-    {
-        safe_len = target_len;
+        out = chat::ConversationMeta{};
+        out.id = teamConversationId();
+        out.name = row.title.c_str();
+        out.preview = row.subtitle.c_str();
+        out.unread = static_cast<int>(row.unread_count);
+        out.last_timestamp = 0;
+        return true;
     }
 
-    return text.substr(0, safe_len) + "...";
+    return false;
 }
 
-std::string resolve_contact_name(chat::NodeId node_id)
+void applySnapshotMessagesToConversation(
+    const ::ui::chat::ChatWorkspaceSnapshot& snapshot,
+    ChatConversationScreen& conversation)
 {
-    std::string name = app::messagingFacade().getContactService().getContactName(node_id);
-    if (!name.empty())
+    conversation.clearMessages();
+    for (size_t i = 0; i < snapshot.message_count; ++i)
     {
-        return name;
+        conversation.addMessage(snapshot.messages[i]);
     }
-    char fallback[16] = {};
-    std::snprintf(fallback, sizeof(fallback), "%08lX", static_cast<unsigned long>(node_id));
-    return fallback;
+    conversation.scrollToBottom();
 }
 
-std::string format_team_chat_entry(const team::ui::TeamChatLogEntry& entry)
+bool buildSelectedTeamSnapshot(::ui::chat::ChatWorkspaceModel& model,
+                               ::ui::chat::ChatWorkspaceSnapshot& out)
 {
-    if (entry.type == team::proto::TeamChatType::Text)
+    if (!model.buildSnapshot(out) || out.conversation_count == 0)
     {
-        std::string text(entry.payload.begin(), entry.payload.end());
-        return truncate_text(text, 160);
+        return false;
     }
-    if (entry.type == team::proto::TeamChatType::Location)
-    {
-        team::proto::TeamChatLocation loc;
-        if (team::proto::decodeTeamChatLocation(entry.payload.data(),
-                                                entry.payload.size(),
-                                                &loc))
-        {
-            double lat = static_cast<double>(loc.lat_e7) / 1e7;
-            double lon = static_cast<double>(loc.lon_e7) / 1e7;
-            char buf[128];
-            char coord_buf[64];
-            uint8_t coord_fmt = app::configFacade().getConfig().gps_coord_format;
-            ui_format_coords(lat, lon, coord_fmt, coord_buf, sizeof(coord_buf));
-            const bool has_marker_icon = team::proto::team_location_marker_icon_is_valid(loc.source);
-            const char* marker_name = team::proto::team_location_marker_icon_name(loc.source);
-            if (has_marker_icon)
-            {
-                snprintf(buf, sizeof(buf), "%s: %s", marker_name, coord_buf);
-            }
-            else if (!loc.label.empty())
-            {
-                snprintf(buf, sizeof(buf), "Location: %s %s",
-                         loc.label.c_str(), coord_buf);
-            }
-            else
-            {
-                snprintf(buf, sizeof(buf), "Location: %s", coord_buf);
-            }
-            return std::string(buf);
-        }
-        return "Location";
-    }
-    if (entry.type == team::proto::TeamChatType::Command)
-    {
-        team::proto::TeamChatCommand cmd;
-        if (team::proto::decodeTeamChatCommand(entry.payload.data(),
-                                               entry.payload.size(),
-                                               &cmd))
-        {
-            const char* name = team_command_name(cmd.cmd_type);
-            double lat = static_cast<double>(cmd.lat_e7) / 1e7;
-            double lon = static_cast<double>(cmd.lon_e7) / 1e7;
-            char buf[160];
-            char coord_buf[64];
-            uint8_t coord_fmt = app::configFacade().getConfig().gps_coord_format;
-            ui_format_coords(lat, lon, coord_fmt, coord_buf, sizeof(coord_buf));
-            if (cmd.lat_e7 != 0 || cmd.lon_e7 != 0)
-            {
-                if (!cmd.note.empty())
-                {
-                    snprintf(buf, sizeof(buf), "Command: %s %s %s",
-                             name, coord_buf, cmd.note.c_str());
-                }
-                else
-                {
-                    snprintf(buf, sizeof(buf), "Command: %s %s",
-                             name, coord_buf);
-                }
-            }
-            else if (!cmd.note.empty())
-            {
-                snprintf(buf, sizeof(buf), "Command: %s %s", name, cmd.note.c_str());
-            }
-            else
-            {
-                snprintf(buf, sizeof(buf), "Command: %s", name);
-            }
-            return std::string(buf);
-        }
-        return "Command";
-    }
-    return "Message";
+
+    (void)model.selectConversation(out.conversations[0].id);
+    (void)model.buildSnapshot(out);
+    return out.header.valid && out.conversation_count > 0;
 }
 
-std::string team_title_from_snapshot(const team::ui::TeamUiSnapshot& snap)
+void showTeamSendFailure(::ui::UiActionResult result)
 {
-    if (!snap.team_name.empty())
+    const char* message = "Team chat send failed";
+    if (result.failure == ::ui::UiActionFailure::NotReady)
     {
-        return snap.team_name;
+        message = "Team keys not ready";
     }
-    return ::ui::i18n::tr("Team");
+    else if (result.failure == ::ui::UiActionFailure::Unsupported)
+    {
+        message = "Team chat unsupported";
+    }
+    else if (result.failure == ::ui::UiActionFailure::InvalidInput)
+    {
+        message = "Message unavailable";
+    }
+    ::ui::SystemNotification::show(message, 2000);
+}
+
+void showTeamLocationSendFailure(::ui::UiActionResult result)
+{
+    const char* message = "Team location send failed";
+    if (result.failure == ::ui::UiActionFailure::NotReady)
+    {
+        message = "Team location not ready";
+    }
+    else if (result.failure == ::ui::UiActionFailure::Unsupported)
+    {
+        message = "Team location unsupported";
+    }
+    else if (result.failure == ::ui::UiActionFailure::InvalidInput)
+    {
+        message = "Invalid marker";
+    }
+    ::ui::SystemNotification::show(message, 2000);
+}
+
+const char* key_verification_action_failure_message(::ui::UiActionResult result)
+{
+    if (result.failure == ::ui::UiActionFailure::NotReady)
+    {
+        return "Key verification unavailable";
+    }
+    if (result.failure == ::ui::UiActionFailure::Unsupported)
+    {
+        return "Key verification unsupported";
+    }
+    if (result.failure == ::ui::UiActionFailure::InvalidInput)
+    {
+        return "Key verification unavailable";
+    }
+    return "Key verification failed";
 }
 
 void handle_message_list_action(chat::ui::ChatMessageListScreen::ActionIntent intent,
@@ -368,8 +297,21 @@ void handle_conversation_back(void* user_data)
 }
 } // namespace
 
-UiController::UiController(lv_obj_t* parent, chat::ChatService& service, chat::ChannelId initial_channel, ExitRequestCallback exit_request, void* exit_request_user_data)
-    : parent_(parent), service_(service), state_(State::ChannelList),
+UiController::UiController(lv_obj_t* parent,
+                           chat::ChatService& service,
+                           ::ui::chat::ChatWorkspaceModel& chat_model,
+                           ::ui::chat::ChatWorkspaceModel& team_chat_model,
+                           ::ui::team_actions::ITeamActionSink* team_action_sink,
+                           ::ui::key_verification::KeyVerificationModel*
+                               key_verification_model,
+                           chat::ChannelId initial_channel,
+                           ExitRequestCallback exit_request,
+                           void* exit_request_user_data)
+    : parent_(parent), service_(service), chat_model_(chat_model),
+      team_chat_model_(team_chat_model),
+      team_action_sink_(team_action_sink),
+      key_verification_model_(key_verification_model),
+      state_(State::ChannelList),
       current_channel_(initial_channel),
       current_conv_(chat::ConversationId(initial_channel, 0, chat_support::active_mesh_protocol())),
       exit_request_(exit_request), exit_request_user_data_(exit_request_user_data)
@@ -379,6 +321,7 @@ UiController::UiController(lv_obj_t* parent, chat::ChatService& service, chat::C
 UiController::~UiController()
 {
     closeTeamPositionPicker(false);
+    team_position_picker_.reset();
     closeKeyVerificationModal(false);
     stopTeamConversationTimer();
     service_.setModelEnabled(false);
@@ -399,15 +342,31 @@ void UiController::cleanupComposeIme()
 
 void UiController::init()
 {
+    TeamPositionPickerRenderer::Callbacks callbacks;
+    callbacks.on_icon_selected = [](void* user_data, uint8_t icon_id)
+    {
+        auto* controller = static_cast<UiController*>(user_data);
+        if (controller)
+        {
+            controller->onTeamPositionIconSelected(icon_id);
+        }
+    };
+    callbacks.on_cancel = [](void* user_data)
+    {
+        auto* controller = static_cast<UiController*>(user_data);
+        if (controller)
+        {
+            controller->onTeamPositionCancel();
+        }
+    };
+    callbacks.user_data = this;
+    team_position_picker_.reset(
+        new TeamPositionPickerRenderer(parent_, callbacks));
     switchToChannelList();
 }
 
 void UiController::update()
 {
-    // Process incoming messages
-    service_.processIncoming();
-    service_.flushStore();
-
     // Refresh UI only when an event marks the conversation list dirty.
     refreshUnreadCounts(false);
 }
@@ -473,80 +432,57 @@ void UiController::onInput(const sys::InputEvent& event)
     }
 }
 
-void UiController::onChatEvent(sys::Event* event)
+void UiController::onRuntimeMessageArrived(chat::MessageId msg_id)
 {
-    if (!event)
-    {
-        return;
-    }
+    CHAT_UI_LOG("[UiController::onRuntimeMessageArrived] msg_id=%lu, state=%d, current_channel=%d\n",
+                static_cast<unsigned long>(msg_id), (int)state_, (int)current_channel_);
 
-    switch (event->type)
+    const ChatMessage* latest = service_.getMessage(msg_id);
+    if (latest)
     {
-    case sys::EventType::ChatNewMessage:
-    {
-        sys::ChatNewMessageEvent* msg_event = (sys::ChatNewMessageEvent*)event;
-        CHAT_UI_LOG("[UiController::onChatEvent] ChatNewMessage received: channel=%d, state=%d, current_channel=%d\n",
-                    msg_event->channel, (int)state_, (int)current_channel_);
-
-        // Note: Haptic feedback is now handled by the app runtime event pump
-        // No need to call vibrator() here
-
-        const ChatMessage* latest = service_.getMessage(msg_event->msg_id);
-        if (latest)
+        const bool is_current_conversation =
+            (state_ == State::Conversation) &&
+            (current_conv_ == chat::ConversationId(latest->channel,
+                                                   latest->peer,
+                                                   latest->protocol));
+        updateConversationMetaForMessage(*latest, !is_current_conversation);
+        if (is_current_conversation)
         {
-            const bool is_current_conversation =
-                (state_ == State::Conversation) && (current_conv_ == chat::ConversationId(latest->channel,
-                                                                                          latest->peer,
-                                                                                          latest->protocol));
-            updateConversationMetaForMessage(*latest, !is_current_conversation);
-            if (is_current_conversation)
-            {
-                (void)updateConversationViewForIncoming(*latest);
-                reloadConversationView();
-                service_.markConversationRead(current_conv_);
-            }
-            else
-            {
-                conversation_list_dirty_ = true;
-            }
+            (void)updateConversationViewForIncoming(*latest);
+            reloadConversationView();
+            (void)chat_model_.markRead(
+                chat_presentation_adapters::toUiConversationId(current_conv_));
         }
-        refreshUnreadCounts(false);
-        break;
-    }
-
-    case sys::EventType::ChatSendResult:
-    {
-        sys::ChatSendResultEvent* result_event = (sys::ChatSendResultEvent*)event;
-        if (state_ == State::Conversation && conversation_)
+        else
         {
-            const ChatMessage* msg = service_.getMessage(result_event->msg_id);
-            if (!msg || !conversation_->updateMessageStatus(result_event->msg_id, msg->status))
-            {
-                reloadConversationView();
-            }
+            conversation_list_dirty_ = true;
         }
-        (void)result_event;
-        break;
     }
+    refreshUnreadCounts(false);
+}
 
-    case sys::EventType::ChatUnreadChanged:
+void UiController::onRuntimeSendResult(chat::MessageId msg_id)
+{
+    if (state_ == State::Conversation && conversation_)
     {
-        conversation_list_dirty_ = true;
-        refreshUnreadCounts(false);
-        break;
+        const ChatMessage* msg = service_.getMessage(msg_id);
+        if (!msg || !conversation_->updateMessageStatus(msg_id, msg->status))
+        {
+            reloadConversationView();
+        }
     }
-    case sys::EventType::KeyVerificationNumberRequest:
-        break;
-    case sys::EventType::KeyVerificationNumberInform:
-        break;
-    case sys::EventType::KeyVerificationFinal:
-        break;
+}
 
-    default:
-        break;
-    }
+void UiController::onRuntimeUnreadChanged()
+{
+    conversation_list_dirty_ = true;
+    refreshUnreadCounts(false);
+}
 
-    delete event;
+void UiController::showKeyVerification(
+    const ::ui::key_verification::KeyVerificationSnapshot& snapshot)
+{
+    renderKeyVerificationModal(snapshot);
 }
 
 void UiController::switchToChannelList()
@@ -646,26 +582,35 @@ void UiController::switchToConversation(chat::ConversationId conv)
 
     if (team_conv_active_)
     {
-        team::ui::TeamUiSnapshot snap;
-        std::string title = "Team";
-        bool loaded = team::ui::team_ui_get_store().load(snap);
-        if (loaded)
-        {
-            title = team_title_from_snapshot(snap);
-        }
+        const bool loaded =
+            buildSelectedTeamSnapshot(team_chat_model_, team_chat_snapshot_buffer_);
+        std::string title = loaded && team_chat_snapshot_buffer_.conversation_count > 0
+                                ? team_chat_snapshot_buffer_.conversations[0].title.c_str()
+                                : "Team";
+        const uint16_t unread = loaded && team_chat_snapshot_buffer_.conversation_count > 0
+                                    ? team_chat_snapshot_buffer_.conversations[0].unread_count
+                                    : 0;
         conversation_->setHeaderText(title.c_str(), nullptr);
         conversation_->updateBatteryFromBoard();
-        refreshTeamConversation();
-        startTeamConversationTimer();
-        if (loaded && snap.team_chat_unread != 0)
+        if (loaded)
         {
-            snap.team_chat_unread = 0;
-            team::ui::team_ui_get_store().save(snap);
-            sys::EventBus::publish(new sys::ChatUnreadChangedEvent(kTeamChatChannelRaw, 0), 0);
+            applySnapshotMessagesToConversation(team_chat_snapshot_buffer_, *conversation_);
+        }
+        startTeamConversationTimer();
+        if (loaded && unread != 0)
+        {
+            (void)team_chat_model_.markRead(
+                team_chat_snapshot_buffer_.conversations[0].id);
+            sys::EventBus::publish(
+                new sys::ChatUnreadChangedEvent(kTeamChatChannelRaw, 0), 0);
         }
         return;
     }
 
+    const ::ui::chat::ConversationId ui_conv =
+        chat_presentation_adapters::toUiConversationId(conv);
+    (void)chat_model_.selectConversation(ui_conv);
+
     // Update header (prefer contact name, else short_name)
     std::string title = resolveConversationDisplayName(conv);
     if (conv.peer != 0)
@@ -693,14 +638,11 @@ void UiController::switchToConversation(chat::ConversationId conv)
     std::string header = "[" + std::string(protocol_short_label(conv.protocol)) + "] " + title;
     conversation_->setHeaderText(header.c_str(), nullptr);
 
-    auto messages = service_.getRecentMessages(conv, 50);
-    conversation_->clearMessages();
-    for (const auto& msg : messages)
+    if (loadChatSnapshot())
     {
-        conversation_->addMessage(msg);
+        applySnapshotMessagesToConversation(chat_snapshot_buffer_, *conversation_);
     }
-    conversation_->scrollToBottom();
-    service_.markConversationRead(conv);
+    (void)chat_model_.markRead(ui_conv);
 }
 
 void UiController::switchToCompose(chat::ConversationId conv)
@@ -728,6 +670,12 @@ void UiController::switchToCompose(chat::ConversationId conv)
     current_conv_ = conv;
     team_conv_active_ = is_team_conv;
 
+    if (!is_team_conv)
+    {
+        (void)chat_model_.selectConversation(
+            chat_presentation_adapters::toUiConversationId(conv));
+    }
+
     stopTeamConversationTimer();
     CHAT_UI_LOG("[UiController] switchToCompose: parent=%p active=%p sleeping=%d conv_peer=%08lX\n",
                 parent_, lv_screen_active(), platform::ui::screen::is_sleeping() ? 1 : 0,
@@ -782,10 +730,10 @@ void UiController::switchToCompose(chat::ConversationId conv)
     std::string title = resolveConversationDisplayName(conv);
     if (team_conv_active_)
     {
-        team::ui::TeamUiSnapshot snap;
-        if (team::ui::team_ui_get_store().load(snap))
+        if (buildSelectedTeamSnapshot(team_chat_model_, team_chat_snapshot_buffer_) &&
+            team_chat_snapshot_buffer_.conversation_count > 0)
         {
-            title = team_title_from_snapshot(snap);
+            title = team_chat_snapshot_buffer_.conversations[0].title.c_str();
         }
         else
         {
@@ -826,10 +774,6 @@ void UiController::switchToCompose(chat::ConversationId conv)
 void UiController::handleChannelSelected(const chat::ConversationId& conv)
 {
     switchToConversation(conv);
-    if (!isTeamConversation(conv))
-    {
-        service_.switchChannel(conv.channel);
-    }
 }
 
 void UiController::handleSendMessage(const std::string& text)
@@ -840,6 +784,13 @@ void UiController::handleSendMessage(const std::string& text)
     }
     if (team_conv_active_)
     {
+        const ::ui::UiActionResult result =
+            team_chat_model_.sendMessage(text.c_str());
+        if (!result.ok)
+        {
+            showTeamSendFailure(result);
+        }
+        handleComposeSendDone(result.ok, false);
         return;
     }
     if (!chat_support::supports_local_text_chat())
@@ -847,12 +798,21 @@ void UiController::handleSendMessage(const std::string& text)
         ::ui::SystemNotification::show(chat_support::local_text_chat_unavailable_message(), 2200);
         return;
     }
-    chat::ui::send_flow::begin_local_text_send(compose_.get(),
-                                               &service_,
-                                               current_conv_,
-                                               text,
-                                               UiController::handleComposeSendDoneCallback,
-                                               this);
+    const ::ui::UiActionResult result = chat_model_.sendMessage(text.c_str());
+    if (!result.ok)
+    {
+        const char* message = "Send failed";
+        if (result.failure == ::ui::UiActionFailure::Unsupported)
+        {
+            message = "Conversation unsupported";
+        }
+        else if (result.failure == ::ui::UiActionFailure::InvalidInput)
+        {
+            message = "Message unavailable";
+        }
+        ::ui::SystemNotification::show(message, 2000);
+    }
+    handleComposeSendDone(result.ok, false);
 }
 
 void UiController::handleComposeSendDone(bool ok, bool timeout)
@@ -895,31 +855,18 @@ void UiController::refreshUnreadCounts(const bool force_reload)
 
 void UiController::syncConversationListFromStore()
 {
-    size_t total = 0;
-    cached_conversations_ = service_.getConversations(0, 0, &total);
+    cached_conversations_.clear();
+    if (loadChatSnapshot())
+    {
+        appendSnapshotConversationsToLegacy(chat_snapshot_buffer_,
+                                            cached_conversations_);
+    }
     normalizeConversationNames(cached_conversations_);
 
-    team::ui::TeamUiSnapshot team_snap;
-    if (team::ui::team_ui_get_store().load(team_snap) && team_snap.has_team_id)
+    chat::ConversationMeta team_conv;
+    if (loadTeamChatSnapshot() &&
+        legacyTeamConversationMetaFromSnapshot(team_chat_snapshot_buffer_, team_conv))
     {
-        chat::ConversationMeta team_conv;
-        team_conv.id = teamConversationId();
-        team_conv.name = team_title_from_snapshot(team_snap);
-        team_conv.preview.clear();
-        team_conv.last_timestamp = 0;
-        team_conv.unread = static_cast<int>(team_snap.team_chat_unread);
-
-        std::vector<team::ui::TeamChatLogEntry> entries;
-        if (team::ui::team_ui_chatlog_load_recent(team_snap.team_id, 1, entries))
-        {
-            const auto& entry = entries.back();
-            team_conv.preview = format_team_chat_entry(entry);
-            team_conv.last_timestamp = entry.ts;
-        }
-        if (team_conv.preview.empty())
-        {
-            team_conv.preview = "No messages";
-        }
         cached_conversations_.insert(cached_conversations_.begin(), team_conv);
     }
 
@@ -966,7 +913,7 @@ void UiController::normalizeConversationNames(std::vector<chat::ConversationMeta
         if (channel_variant_count > 1)
         {
             conv.name += " (";
-            conv.name += channel_display_name(conv.id.channel);
+            conv.name += channel_display_name(conv.id.protocol, conv.id.channel);
             conv.name += ")";
         }
     }
@@ -1050,7 +997,7 @@ bool UiController::updateConversationViewForIncoming(const chat::ChatMessage& ms
         return false;
     }
 
-    conversation_->addMessage(msg);
+    reloadConversationView();
     return true;
 }
 
@@ -1061,13 +1008,11 @@ void UiController::reloadConversationView()
         return;
     }
 
-    auto messages = service_.getRecentMessages(current_conv_, 50);
-    conversation_->clearMessages();
-    for (const auto& msg : messages)
+    if (!loadChatSnapshot())
     {
-        conversation_->addMessage(msg);
+        return;
     }
-    conversation_->scrollToBottom();
+    applySnapshotMessagesToConversation(chat_snapshot_buffer_, *conversation_);
 }
 
 bool UiController::isTeamConversation(const chat::ConversationId& conv) const
@@ -1075,52 +1020,27 @@ bool UiController::isTeamConversation(const chat::ConversationId& conv) const
     return isTeamConversationId(conv);
 }
 
+bool UiController::loadChatSnapshot()
+{
+    return chat_model_.buildSnapshot(chat_snapshot_buffer_);
+}
+
+bool UiController::loadTeamChatSnapshot()
+{
+    return team_chat_model_.buildSnapshot(team_chat_snapshot_buffer_);
+}
+
 void UiController::refreshTeamConversation()
 {
     if (!conversation_ || !team_conv_active_)
     {
         return;
     }
-    team::ui::TeamUiSnapshot snap;
-    if (!team::ui::team_ui_get_store().load(snap) || !snap.has_team_id)
-    {
-        return;
-    }
-    conversation_->clearMessages();
 
-    std::vector<team::ui::TeamChatLogEntry> entries;
-    if (team::ui::team_ui_chatlog_load_recent(snap.team_id, 50, entries))
+    if (loadTeamChatSnapshot())
     {
-        for (const auto& entry : entries)
-        {
-            chat::ChatMessage msg;
-            msg.protocol = chat_support::active_mesh_protocol();
-            msg.channel = chat::ChannelId::PRIMARY;
-            msg.peer = 0;
-            msg.from = entry.incoming ? entry.peer_id : 0;
-            msg.timestamp = entry.ts;
-            msg.text = format_team_chat_entry(entry);
-            if (entry.type == team::proto::TeamChatType::Location)
-            {
-                team::proto::TeamChatLocation loc;
-                if (team::proto::decodeTeamChatLocation(entry.payload.data(),
-                                                        entry.payload.size(),
-                                                        &loc))
-                {
-                    if (team::proto::team_location_marker_icon_is_valid(loc.source))
-                    {
-                        msg.team_location_icon = loc.source;
-                    }
-                    msg.has_geo = true;
-                    msg.geo_lat_e7 = loc.lat_e7;
-                    msg.geo_lon_e7 = loc.lon_e7;
-                }
-            }
-            msg.status = entry.incoming ? chat::MessageStatus::Incoming : chat::MessageStatus::Sent;
-            conversation_->addMessage(msg);
-        }
+        applySnapshotMessagesToConversation(team_chat_snapshot_buffer_, *conversation_);
     }
-    conversation_->scrollToBottom();
 }
 
 void UiController::startTeamConversationTimer()
@@ -1156,275 +1076,46 @@ void UiController::stopTeamConversationTimer()
 
 bool UiController::isTeamPositionPickerOpen() const
 {
-    return team_position_picker_overlay_ != nullptr;
+    return team_position_picker_ && team_position_picker_->isOpen();
 }
 
 void UiController::updateTeamPositionPickerHint(uint8_t icon_id)
 {
-    if (!team_position_picker_desc_)
+    if (team_position_picker_)
     {
-        return;
-    }
-    if (icon_id == 0)
-    {
-        ::ui::i18n::set_label_text(team_position_picker_desc_, "Cancel");
-        return;
-    }
-    const TeamPositionIconOption* option = find_team_position_icon_option(icon_id);
-    if (option)
-    {
-        ::ui::i18n::set_label_text(team_position_picker_desc_, option->meaning);
-    }
-    else
-    {
-        ::ui::i18n::set_label_text(team_position_picker_desc_, "Select marker");
-    }
-}
-
-void UiController::team_position_icon_event_cb(lv_event_t* e)
-{
-    auto* ctx = static_cast<TeamPositionIconEventCtx*>(lv_event_get_user_data(e));
-    if (!ctx || !ctx->controller)
-    {
-        return;
-    }
-    UiController* controller = ctx->controller;
-    lv_event_code_t code = lv_event_get_code(e);
-    if (code == LV_EVENT_FOCUSED)
-    {
-        controller->updateTeamPositionPickerHint(ctx->icon_id);
-        lv_obj_scroll_to_view(lv_event_get_target_obj(e), LV_ANIM_ON);
-        return;
-    }
-    if (code == LV_EVENT_KEY)
-    {
-        lv_key_t key = static_cast<lv_key_t>(lv_event_get_key(e));
-        if (key != LV_KEY_ENTER)
-        {
-            return;
-        }
-    }
-    if (code == LV_EVENT_CLICKED || code == LV_EVENT_KEY)
-    {
-        controller->onTeamPositionIconSelected(ctx->icon_id);
-    }
-}
-
-void UiController::team_position_cancel_event_cb(lv_event_t* e)
-{
-    auto* controller = static_cast<UiController*>(lv_event_get_user_data(e));
-    if (!controller)
-    {
-        return;
-    }
-    lv_event_code_t code = lv_event_get_code(e);
-    if (code == LV_EVENT_FOCUSED)
-    {
-        controller->updateTeamPositionPickerHint(0);
-        return;
-    }
-    if (code == LV_EVENT_KEY)
-    {
-        lv_key_t key = static_cast<lv_key_t>(lv_event_get_key(e));
-        if (key != LV_KEY_ENTER)
-        {
-            return;
-        }
-    }
-    if (code == LV_EVENT_CLICKED || code == LV_EVENT_KEY)
-    {
-        controller->onTeamPositionCancel();
+        team_position_picker_->updateHint(icon_id);
     }
 }
 
 void UiController::openTeamPositionPicker()
 {
-    if (!team_conv_active_ || !compose_ || isTeamPositionPickerOpen() || !parent_)
+    if (!team_conv_active_ || !compose_ || !parent_)
     {
         return;
     }
-
-    team_position_prev_group_ = lv_group_get_default();
-    team_position_picker_group_ = lv_group_create();
-    set_default_group(team_position_picker_group_);
-
-    team_position_picker_overlay_ = lv_obj_create(parent_);
-    lv_obj_set_size(team_position_picker_overlay_, LV_PCT(100), LV_PCT(100));
-    lv_obj_set_style_bg_color(team_position_picker_overlay_, lv_color_black(), 0);
-    lv_obj_set_style_bg_opa(team_position_picker_overlay_, LV_OPA_50, 0);
-    lv_obj_set_style_border_width(team_position_picker_overlay_, 0, 0);
-    lv_obj_set_style_pad_all(team_position_picker_overlay_, 0, 0);
-    lv_obj_set_style_radius(team_position_picker_overlay_, 0, 0);
-    lv_obj_clear_flag(team_position_picker_overlay_, LV_OBJ_FLAG_SCROLLABLE);
-
-    const auto& profile = ::ui::page_profile::current();
-    const auto modal_size = ::ui::page_profile::resolve_modal_size(
-        profile.large_touch_hitbox ? 560 : 320,
-        profile.large_touch_hitbox ? 320 : 186,
-        team_position_picker_overlay_);
-    const lv_coord_t icon_button_size = ::ui::page_profile::resolve_icon_picker_button_size();
-    const lv_coord_t title_bar_height = ::ui::page_profile::resolve_popup_title_height();
-
-    team_position_picker_panel_ = lv_obj_create(team_position_picker_overlay_);
-    lv_obj_set_size(team_position_picker_panel_, modal_size.width, modal_size.height);
-    lv_obj_center(team_position_picker_panel_);
-    lv_obj_set_style_bg_color(team_position_picker_panel_, lv_color_hex(0xFAF0D8), 0);
-    lv_obj_set_style_bg_opa(team_position_picker_panel_, LV_OPA_COVER, 0);
-    lv_obj_set_style_border_width(team_position_picker_panel_, 1, 0);
-    lv_obj_set_style_border_color(team_position_picker_panel_, lv_color_hex(0xE7C98F), 0);
-    lv_obj_set_style_radius(team_position_picker_panel_, 10, 0);
-    lv_obj_set_style_pad_all(team_position_picker_panel_, ::ui::page_profile::resolve_modal_pad(), 0);
-    lv_obj_clear_flag(team_position_picker_panel_, LV_OBJ_FLAG_SCROLLABLE);
-
-    lv_obj_t* title_bar = lv_obj_create(team_position_picker_panel_);
-    lv_obj_set_size(title_bar, LV_PCT(100), title_bar_height);
-    lv_obj_set_style_bg_color(title_bar, lv_color_hex(0xEBA341), 0);
-    lv_obj_set_style_bg_opa(title_bar, LV_OPA_COVER, 0);
-    lv_obj_set_style_border_width(title_bar, 0, 0);
-    lv_obj_set_style_radius(title_bar, 6, 0);
-    lv_obj_align(title_bar, LV_ALIGN_TOP_MID, 0, -4);
-    lv_obj_clear_flag(title_bar, LV_OBJ_FLAG_SCROLLABLE);
-
-    lv_obj_t* title = lv_label_create(title_bar);
-    ::ui::i18n::set_label_text(title, "Share Position Marker");
-    lv_obj_set_style_text_color(title, lv_color_hex(0x6B4A1E), 0);
-    lv_obj_center(title);
-
-    lv_obj_t* icon_row = lv_obj_create(team_position_picker_panel_);
-    lv_obj_set_size(icon_row, LV_PCT(100), profile.large_touch_hitbox ? (icon_button_size + 20) : 72);
-    lv_obj_set_style_bg_opa(icon_row, LV_OPA_TRANSP, 0);
-    lv_obj_set_style_border_width(icon_row, 0, 0);
-    lv_obj_set_style_pad_all(icon_row, 0, 0);
-    lv_obj_set_style_pad_column(icon_row, profile.large_touch_hitbox ? 12 : 6, 0);
-    lv_obj_set_flex_flow(icon_row, LV_FLEX_FLOW_ROW);
-    lv_obj_set_flex_align(icon_row, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
-    lv_obj_align(icon_row, LV_ALIGN_TOP_MID, 0, profile.large_touch_hitbox ? (title_bar_height + 8) : 24);
-    lv_obj_set_scroll_dir(icon_row, LV_DIR_HOR);
-    lv_obj_set_scrollbar_mode(icon_row, LV_SCROLLBAR_MODE_OFF);
-
-    for (const auto& option : kTeamPositionIconOptions)
+    if (!team_position_picker_)
     {
-        lv_obj_t* btn = lv_btn_create(icon_row);
-        lv_obj_set_size(btn, icon_button_size, icon_button_size);
-        lv_obj_set_style_bg_color(btn, lv_color_hex(0xF6E6C6), LV_PART_MAIN);
-        lv_obj_set_style_bg_opa(btn, LV_OPA_COVER, LV_PART_MAIN);
-        lv_obj_set_style_border_width(btn, 1, LV_PART_MAIN);
-        lv_obj_set_style_border_color(btn, lv_color_hex(0xE7C98F), LV_PART_MAIN);
-        lv_obj_set_style_radius(btn, 8, LV_PART_MAIN);
-        lv_obj_set_style_outline_width(btn, 2, LV_PART_MAIN | LV_STATE_FOCUSED);
-        lv_obj_set_style_outline_color(btn, lv_color_hex(0xC98118), LV_PART_MAIN | LV_STATE_FOCUSED);
-        lv_obj_clear_flag(btn, LV_OBJ_FLAG_SCROLLABLE);
-
-        lv_obj_t* img = lv_image_create(btn);
-        lv_image_set_src(img, option.image);
-        lv_obj_center(img);
-
-        auto* ctx = new TeamPositionIconEventCtx();
-        ctx->controller = this;
-        ctx->icon_id = option.icon_id;
-        team_position_icon_ctxs_.push_back(ctx);
-
-        lv_obj_add_event_cb(btn, team_position_icon_event_cb, LV_EVENT_CLICKED, ctx);
-        lv_obj_add_event_cb(btn, team_position_icon_event_cb, LV_EVENT_KEY, ctx);
-        lv_obj_add_event_cb(btn, team_position_icon_event_cb, LV_EVENT_FOCUSED, ctx);
-
-        lv_group_add_obj(team_position_picker_group_, btn);
+        return;
     }
-
-    team_position_picker_desc_ = lv_label_create(team_position_picker_panel_);
-    ::ui::i18n::set_label_text(team_position_picker_desc_, "Select marker");
-    lv_obj_set_width(team_position_picker_desc_, LV_PCT(100));
-    lv_obj_set_style_text_align(team_position_picker_desc_, LV_TEXT_ALIGN_CENTER, 0);
-    lv_obj_set_style_text_color(team_position_picker_desc_, lv_color_hex(0x8A6A3A), 0);
-    lv_obj_align(team_position_picker_desc_, LV_ALIGN_TOP_MID, 0, profile.large_touch_hitbox ? (title_bar_height + icon_button_size + 28) : 104);
-
-    lv_obj_t* cancel_btn = lv_btn_create(team_position_picker_panel_);
-    lv_obj_set_size(cancel_btn, ::ui::page_profile::resolve_control_button_min_width(), ::ui::page_profile::resolve_control_button_height());
-    lv_obj_set_style_bg_color(cancel_btn, lv_color_hex(0xF6E6C6), LV_PART_MAIN);
-    lv_obj_set_style_bg_opa(cancel_btn, LV_OPA_COVER, LV_PART_MAIN);
-    lv_obj_set_style_border_width(cancel_btn, 1, LV_PART_MAIN);
-    lv_obj_set_style_border_color(cancel_btn, lv_color_hex(0xE7C98F), LV_PART_MAIN);
-    lv_obj_set_style_radius(cancel_btn, 6, LV_PART_MAIN);
-    lv_obj_set_style_outline_width(cancel_btn, 2, LV_PART_MAIN | LV_STATE_FOCUSED);
-    lv_obj_set_style_outline_color(cancel_btn, lv_color_hex(0xC98118), LV_PART_MAIN | LV_STATE_FOCUSED);
-    lv_obj_align(cancel_btn, LV_ALIGN_BOTTOM_MID, 0, profile.large_touch_hitbox ? -12 : -6);
-    lv_obj_clear_flag(cancel_btn, LV_OBJ_FLAG_SCROLLABLE);
-
-    lv_obj_t* cancel_label = lv_label_create(cancel_btn);
-    ::ui::i18n::set_label_text(cancel_label, "Cancel");
-    lv_obj_set_style_text_color(cancel_label, lv_color_hex(0x6B4A1E), 0);
-    lv_obj_center(cancel_label);
-
-    lv_obj_add_event_cb(cancel_btn, team_position_cancel_event_cb, LV_EVENT_CLICKED, this);
-    lv_obj_add_event_cb(cancel_btn, team_position_cancel_event_cb, LV_EVENT_KEY, this);
-    lv_obj_add_event_cb(cancel_btn, team_position_cancel_event_cb, LV_EVENT_FOCUSED, this);
-    lv_group_add_obj(team_position_picker_group_, cancel_btn);
-
-    if (!team_position_icon_ctxs_.empty() && team_position_picker_group_)
-    {
-        lv_obj_t* first_btn = lv_group_get_focused(team_position_picker_group_);
-        if (!first_btn)
-        {
-            first_btn = lv_obj_get_child(icon_row, 0);
-        }
-        if (first_btn)
-        {
-            lv_group_focus_obj(first_btn);
-        }
-        updateTeamPositionPickerHint(team_position_icon_ctxs_.front()->icon_id);
-    }
-    lv_obj_move_foreground(team_position_picker_overlay_);
+    (void)team_position_picker_->open();
 }
 
 void UiController::closeTeamPositionPicker(bool restore_group)
 {
-    for (auto* ctx : team_position_icon_ctxs_)
+    if (team_position_picker_)
     {
-        delete ctx;
+        team_position_picker_->close(restore_group);
     }
-    team_position_icon_ctxs_.clear();
-
-    if (team_position_picker_group_ && lv_group_get_default() == team_position_picker_group_)
-    {
-        if (restore_group)
-        {
-            lv_group_t* restore_target = team_position_prev_group_ ? team_position_prev_group_ : app_g;
-            set_default_group(restore_target);
-        }
-        else
-        {
-            set_default_group(nullptr);
-        }
-    }
-
-    if (team_position_picker_overlay_ && lv_obj_is_valid(team_position_picker_overlay_))
-    {
-        lv_obj_del(team_position_picker_overlay_);
-    }
-
-    if (team_position_picker_group_)
-    {
-        lv_group_del(team_position_picker_group_);
-    }
-
-    team_position_picker_overlay_ = nullptr;
-    team_position_picker_panel_ = nullptr;
-    team_position_picker_desc_ = nullptr;
-    team_position_picker_group_ = nullptr;
-    team_position_prev_group_ = nullptr;
 }
 
 bool UiController::isKeyVerificationModalOpen() const
 {
-    return key_verify_overlay_ != nullptr;
+    return key_verify_modal_.overlay != nullptr;
 }
 
 void UiController::clearKeyVerificationError()
 {
-    if (key_verify_error_label_)
-    {
-        lv_label_set_text(key_verify_error_label_, "");
-    }
+    chat::ui::clearKeyVerificationError(key_verify_modal_);
 }
 
 void UiController::key_verify_submit_event_cb(lv_event_t* e)
@@ -1445,7 +1136,7 @@ void UiController::key_verify_submit_event_cb(lv_event_t* e)
     }
     if (code == LV_EVENT_CLICKED || code == LV_EVENT_KEY)
     {
-        controller->submitKeyVerificationNumber();
+        controller->submitKeyVerificationInput();
     }
 }
 
@@ -1493,300 +1184,55 @@ void UiController::key_verify_trust_event_cb(lv_event_t* e)
     }
 }
 
+void UiController::destroyKeyVerificationModal(bool restore_group)
+{
+    chat::ui::destroyKeyVerificationModal(
+        key_verify_modal_,
+        key_verify_ime_,
+        restore_group);
+}
+
+void UiController::renderKeyVerificationModal(
+    const ::ui::key_verification::KeyVerificationSnapshot& snapshot)
+{
+    KeyVerificationModalCallbacks callbacks;
+    callbacks.submit = key_verify_submit_event_cb;
+    callbacks.close = key_verify_close_event_cb;
+    callbacks.trust = key_verify_trust_event_cb;
+    callbacks.user_data = this;
+    chat::ui::renderKeyVerificationModal(
+        parent_,
+        snapshot,
+        callbacks,
+        key_verify_modal_,
+        key_verify_ime_);
+}
+
 void UiController::closeKeyVerificationModal(bool restore_group)
 {
-    if (key_verify_ime_)
+    destroyKeyVerificationModal(restore_group);
+    if (key_verification_model_ != nullptr)
     {
-        key_verify_ime_->detach();
-        key_verify_ime_.reset();
+        key_verification_model_->clearSelection();
     }
-
-    if (key_verify_group_ && lv_group_get_default() == key_verify_group_)
-    {
-        if (restore_group)
-        {
-            lv_group_t* restore_target = key_verify_prev_group_ ? key_verify_prev_group_ : app_g;
-            set_default_group(restore_target);
-        }
-        else
-        {
-            set_default_group(nullptr);
-        }
-    }
-
-    if (key_verify_overlay_ && lv_obj_is_valid(key_verify_overlay_))
-    {
-        lv_obj_del(key_verify_overlay_);
-    }
-    if (key_verify_group_)
-    {
-        lv_group_del(key_verify_group_);
-    }
-
-    key_verify_overlay_ = nullptr;
-    key_verify_panel_ = nullptr;
-    key_verify_desc_ = nullptr;
-    key_verify_textarea_ = nullptr;
-    key_verify_error_label_ = nullptr;
-    key_verify_group_ = nullptr;
-    key_verify_prev_group_ = nullptr;
-    key_verify_node_id_ = 0;
-    key_verify_nonce_ = 0;
-    key_verify_expects_number_ = false;
-    key_verify_can_trust_ = false;
 }
 
-void UiController::openKeyVerificationNumberModal(chat::NodeId node_id, uint64_t nonce)
+void UiController::submitKeyVerificationInput()
 {
-    closeKeyVerificationModal(false);
-    if (!parent_)
-    {
-        return;
-    }
-
-    key_verify_node_id_ = node_id;
-    key_verify_nonce_ = nonce;
-    key_verify_expects_number_ = true;
-    key_verify_can_trust_ = false;
-
-    key_verify_prev_group_ = lv_group_get_default();
-    key_verify_group_ = lv_group_create();
-    set_default_group(key_verify_group_);
-
-    key_verify_overlay_ = lv_obj_create(parent_);
-    lv_obj_set_size(key_verify_overlay_, LV_PCT(100), LV_PCT(100));
-    lv_obj_set_style_bg_color(key_verify_overlay_, lv_color_black(), 0);
-    lv_obj_set_style_bg_opa(key_verify_overlay_, LV_OPA_50, 0);
-    lv_obj_set_style_border_width(key_verify_overlay_, 0, 0);
-    lv_obj_set_style_pad_all(key_verify_overlay_, 0, 0);
-    lv_obj_set_style_radius(key_verify_overlay_, 0, 0);
-    lv_obj_clear_flag(key_verify_overlay_, LV_OBJ_FLAG_SCROLLABLE);
-
-    const auto& profile = ::ui::page_profile::current();
-    const auto modal_size = ::ui::page_profile::resolve_modal_size(
-        profile.large_touch_hitbox ? 560 : 320,
-        profile.large_touch_hitbox ? 380 : 220,
-        key_verify_overlay_);
-
-    key_verify_panel_ = lv_obj_create(key_verify_overlay_);
-    lv_obj_set_size(key_verify_panel_, modal_size.width, modal_size.height);
-    lv_obj_center(key_verify_panel_);
-    lv_obj_set_style_bg_color(key_verify_panel_, lv_color_hex(0xFAF0D8), 0);
-    lv_obj_set_style_bg_opa(key_verify_panel_, LV_OPA_COVER, 0);
-    lv_obj_set_style_border_width(key_verify_panel_, 1, 0);
-    lv_obj_set_style_border_color(key_verify_panel_, lv_color_hex(0xE7C98F), 0);
-    lv_obj_set_style_radius(key_verify_panel_, 10, 0);
-    lv_obj_set_style_pad_all(key_verify_panel_, ::ui::page_profile::resolve_modal_pad(), 0);
-    lv_obj_clear_flag(key_verify_panel_, LV_OBJ_FLAG_SCROLLABLE);
-
-    lv_obj_t* title = lv_label_create(key_verify_panel_);
-    ::ui::i18n::set_label_text(title, "Key Verification");
-    lv_obj_set_style_text_color(title, lv_color_hex(0x6B4A1E), 0);
-    lv_obj_set_style_text_font(title, ::ui::fonts::localized_font(::ui::fonts::ui_chrome_font()), 0);
-    lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 0);
-
-    std::string desc = ::ui::i18n::format("Enter number for %s", resolve_contact_name(node_id).c_str());
-    key_verify_desc_ = lv_label_create(key_verify_panel_);
-    ::ui::i18n::set_label_text_raw(key_verify_desc_, desc.c_str());
-    lv_obj_set_width(key_verify_desc_, LV_PCT(100));
-    lv_obj_set_style_text_align(key_verify_desc_, LV_TEXT_ALIGN_CENTER, 0);
-    lv_obj_set_style_text_color(key_verify_desc_, lv_color_hex(0x8A6A3A), 0);
-    lv_obj_align(key_verify_desc_, LV_ALIGN_TOP_MID, 0, 34);
-
-    key_verify_textarea_ = lv_textarea_create(key_verify_panel_);
-    lv_obj_set_width(key_verify_textarea_, LV_PCT(100));
-    lv_textarea_set_one_line(key_verify_textarea_, true);
-    lv_textarea_set_placeholder_text(key_verify_textarea_, ::ui::i18n::tr("6 digits"));
-    lv_textarea_set_accepted_chars(key_verify_textarea_, "0123456789");
-    lv_textarea_set_max_length(key_verify_textarea_, 6);
-    lv_obj_align(key_verify_textarea_, LV_ALIGN_TOP_MID, 0, 72);
-
-    key_verify_error_label_ = lv_label_create(key_verify_panel_);
-    ::ui::i18n::set_label_text_raw(key_verify_error_label_, "");
-    lv_obj_set_width(key_verify_error_label_, LV_PCT(100));
-    lv_obj_set_style_text_align(key_verify_error_label_, LV_TEXT_ALIGN_CENTER, 0);
-    lv_obj_set_style_text_color(key_verify_error_label_, lv_color_hex(0xB94A2C), 0);
-    lv_obj_align(key_verify_error_label_, LV_ALIGN_TOP_MID, 0, 110);
-
-    lv_obj_t* submit_btn = lv_btn_create(key_verify_panel_);
-    lv_obj_set_size(submit_btn, LV_PCT(48), ::ui::page_profile::resolve_control_button_height());
-    lv_obj_align(submit_btn, LV_ALIGN_BOTTOM_LEFT, 0, 0);
-    lv_obj_t* submit_label = lv_label_create(submit_btn);
-    ::ui::i18n::set_label_text(submit_label, "Submit");
-    lv_obj_center(submit_label);
-
-    lv_obj_t* cancel_btn = lv_btn_create(key_verify_panel_);
-    lv_obj_set_size(cancel_btn, LV_PCT(48), ::ui::page_profile::resolve_control_button_height());
-    lv_obj_align(cancel_btn, LV_ALIGN_BOTTOM_RIGHT, 0, 0);
-    lv_obj_t* cancel_label = lv_label_create(cancel_btn);
-    ::ui::i18n::set_label_text(cancel_label, "Cancel");
-    lv_obj_center(cancel_label);
-
-    lv_obj_add_event_cb(submit_btn, key_verify_submit_event_cb, LV_EVENT_CLICKED, this);
-    lv_obj_add_event_cb(submit_btn, key_verify_submit_event_cb, LV_EVENT_KEY, this);
-    lv_obj_add_event_cb(cancel_btn, key_verify_close_event_cb, LV_EVENT_CLICKED, this);
-    lv_obj_add_event_cb(cancel_btn, key_verify_close_event_cb, LV_EVENT_KEY, this);
-
-    lv_group_add_obj(key_verify_group_, key_verify_textarea_);
-    lv_group_add_obj(key_verify_group_, submit_btn);
-    lv_group_add_obj(key_verify_group_, cancel_btn);
-    lv_group_focus_obj(key_verify_textarea_);
-
-    if (::ui::page_profile::current().large_touch_hitbox)
-    {
-        key_verify_ime_.reset(new ::ui::widgets::ImeWidget());
-        key_verify_ime_->init(key_verify_panel_, key_verify_textarea_);
-        key_verify_ime_->setMode(::ui::widgets::ImeWidget::Mode::NUM);
-    }
-
-    lv_obj_move_foreground(key_verify_overlay_);
-}
-
-void UiController::openKeyVerificationInfoModal(chat::NodeId node_id, uint32_t number)
-{
-    closeKeyVerificationModal(false);
-    if (!parent_)
-    {
-        return;
-    }
-
-    key_verify_node_id_ = node_id;
-    key_verify_expects_number_ = false;
-    key_verify_can_trust_ = false;
-
-    key_verify_prev_group_ = lv_group_get_default();
-    key_verify_group_ = lv_group_create();
-    set_default_group(key_verify_group_);
-
-    key_verify_overlay_ = lv_obj_create(parent_);
-    lv_obj_set_size(key_verify_overlay_, LV_PCT(100), LV_PCT(100));
-    lv_obj_set_style_bg_color(key_verify_overlay_, lv_color_black(), 0);
-    lv_obj_set_style_bg_opa(key_verify_overlay_, LV_OPA_50, 0);
-    lv_obj_set_style_border_width(key_verify_overlay_, 0, 0);
-    lv_obj_set_style_pad_all(key_verify_overlay_, 0, 0);
-    lv_obj_set_style_radius(key_verify_overlay_, 0, 0);
-    lv_obj_clear_flag(key_verify_overlay_, LV_OBJ_FLAG_SCROLLABLE);
-
-    const auto modal_size = ::ui::page_profile::resolve_modal_size(360, 220, key_verify_overlay_);
-    key_verify_panel_ = lv_obj_create(key_verify_overlay_);
-    lv_obj_set_size(key_verify_panel_, modal_size.width, modal_size.height);
-    lv_obj_center(key_verify_panel_);
-
-    lv_obj_t* title = lv_label_create(key_verify_panel_);
-    ::ui::i18n::set_label_text(title, "Verification Number");
-    lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 0);
-
-    char num_buf[24] = {};
-    std::snprintf(num_buf,
-                  sizeof(num_buf),
-                  "%03u %03u",
-                  static_cast<unsigned>(number / 1000U),
-                  static_cast<unsigned>(number % 1000U));
-    key_verify_desc_ = lv_label_create(key_verify_panel_);
-    std::string desc = resolve_contact_name(node_id) + "\n" + ::ui::i18n::tr("Share this number:\n");
-    desc += num_buf;
-    ::ui::i18n::set_label_text_raw(key_verify_desc_, desc.c_str());
-    lv_obj_set_width(key_verify_desc_, LV_PCT(100));
-    lv_obj_set_style_text_align(key_verify_desc_, LV_TEXT_ALIGN_CENTER, 0);
-    lv_obj_align(key_verify_desc_, LV_ALIGN_CENTER, 0, -12);
-
-    lv_obj_t* close_btn = lv_btn_create(key_verify_panel_);
-    lv_obj_set_size(close_btn, LV_PCT(100), ::ui::page_profile::resolve_control_button_height());
-    lv_obj_align(close_btn, LV_ALIGN_BOTTOM_MID, 0, 0);
-    lv_obj_t* close_label = lv_label_create(close_btn);
-    ::ui::i18n::set_label_text(close_label, "OK");
-    lv_obj_center(close_label);
-    lv_obj_add_event_cb(close_btn, key_verify_close_event_cb, LV_EVENT_CLICKED, this);
-    lv_obj_add_event_cb(close_btn, key_verify_close_event_cb, LV_EVENT_KEY, this);
-    lv_group_add_obj(key_verify_group_, close_btn);
-    lv_group_focus_obj(close_btn);
-    lv_obj_move_foreground(key_verify_overlay_);
-}
-
-void UiController::openKeyVerificationFinalModal(chat::NodeId node_id, const char* code, bool is_sender)
-{
-    closeKeyVerificationModal(false);
-    if (!parent_)
-    {
-        return;
-    }
-
-    key_verify_node_id_ = node_id;
-    key_verify_expects_number_ = false;
-    key_verify_can_trust_ = true;
-
-    key_verify_prev_group_ = lv_group_get_default();
-    key_verify_group_ = lv_group_create();
-    set_default_group(key_verify_group_);
-
-    key_verify_overlay_ = lv_obj_create(parent_);
-    lv_obj_set_size(key_verify_overlay_, LV_PCT(100), LV_PCT(100));
-    lv_obj_set_style_bg_color(key_verify_overlay_, lv_color_black(), 0);
-    lv_obj_set_style_bg_opa(key_verify_overlay_, LV_OPA_50, 0);
-    lv_obj_set_style_border_width(key_verify_overlay_, 0, 0);
-    lv_obj_set_style_pad_all(key_verify_overlay_, 0, 0);
-    lv_obj_set_style_radius(key_verify_overlay_, 0, 0);
-    lv_obj_clear_flag(key_verify_overlay_, LV_OBJ_FLAG_SCROLLABLE);
-
-    const auto modal_size = ::ui::page_profile::resolve_modal_size(420, 260, key_verify_overlay_);
-    key_verify_panel_ = lv_obj_create(key_verify_overlay_);
-    lv_obj_set_size(key_verify_panel_, modal_size.width, modal_size.height);
-    lv_obj_center(key_verify_panel_);
-
-    lv_obj_t* title = lv_label_create(key_verify_panel_);
-    ::ui::i18n::set_label_text(title, "Compare Verification Code");
-    lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 0);
-
-    std::string desc = resolve_contact_name(node_id);
-    desc += "\n";
-    desc += is_sender ? ::ui::i18n::tr("Send this code and compare:\n") : ::ui::i18n::tr("Confirm received code:\n");
-    desc += (code && code[0] != '\0') ? code : "--------";
-    desc += "\n\n";
-    desc += ::ui::i18n::tr("If it matches, trust the key.");
-    key_verify_desc_ = lv_label_create(key_verify_panel_);
-    ::ui::i18n::set_label_text_raw(key_verify_desc_, desc.c_str());
-    lv_obj_set_width(key_verify_desc_, LV_PCT(100));
-    lv_obj_set_style_text_align(key_verify_desc_, LV_TEXT_ALIGN_CENTER, 0);
-    lv_obj_align(key_verify_desc_, LV_ALIGN_CENTER, 0, -8);
-
-    lv_obj_t* trust_btn = lv_btn_create(key_verify_panel_);
-    lv_obj_set_size(trust_btn, LV_PCT(48), ::ui::page_profile::resolve_control_button_height());
-    lv_obj_align(trust_btn, LV_ALIGN_BOTTOM_LEFT, 0, 0);
-    lv_obj_t* trust_label = lv_label_create(trust_btn);
-    ::ui::i18n::set_label_text(trust_label, "Trust Key");
-    lv_obj_center(trust_label);
-
-    lv_obj_t* close_btn = lv_btn_create(key_verify_panel_);
-    lv_obj_set_size(close_btn, LV_PCT(48), ::ui::page_profile::resolve_control_button_height());
-    lv_obj_align(close_btn, LV_ALIGN_BOTTOM_RIGHT, 0, 0);
-    lv_obj_t* close_label = lv_label_create(close_btn);
-    ::ui::i18n::set_label_text(close_label, "Later");
-    lv_obj_center(close_label);
-
-    lv_obj_add_event_cb(trust_btn, key_verify_trust_event_cb, LV_EVENT_CLICKED, this);
-    lv_obj_add_event_cb(trust_btn, key_verify_trust_event_cb, LV_EVENT_KEY, this);
-    lv_obj_add_event_cb(close_btn, key_verify_close_event_cb, LV_EVENT_CLICKED, this);
-    lv_obj_add_event_cb(close_btn, key_verify_close_event_cb, LV_EVENT_KEY, this);
-    lv_group_add_obj(key_verify_group_, trust_btn);
-    lv_group_add_obj(key_verify_group_, close_btn);
-    lv_group_focus_obj(trust_btn);
-    lv_obj_move_foreground(key_verify_overlay_);
-}
-
-void UiController::submitKeyVerificationNumber()
-{
-    if (!key_verify_expects_number_ || !key_verify_textarea_)
+    if (!key_verify_modal_.textarea || key_verification_model_ == nullptr)
     {
         return;
     }
 
     clearKeyVerificationError();
-    const char* text = lv_textarea_get_text(key_verify_textarea_);
+    const char* text = lv_textarea_get_text(key_verify_modal_.textarea);
     if (!text || text[0] == '\0')
     {
-        if (key_verify_error_label_)
+        if (key_verify_modal_.error_label)
         {
-            ::ui::i18n::set_label_text(key_verify_error_label_, "Enter the 6-digit number");
+            ::ui::i18n::set_label_text(
+                key_verify_modal_.error_label,
+                "Enter the 6-digit number");
         }
         return;
     }
@@ -1795,30 +1241,24 @@ void UiController::submitKeyVerificationNumber()
     unsigned long parsed = std::strtoul(text, &end_ptr, 10);
     if (!end_ptr || *end_ptr != '\0' || parsed > 999999UL)
     {
-        if (key_verify_error_label_)
+        if (key_verify_modal_.error_label)
         {
-            ::ui::i18n::set_label_text(key_verify_error_label_, "Invalid number");
+            ::ui::i18n::set_label_text(
+                key_verify_modal_.error_label,
+                "Invalid number");
         }
         return;
     }
 
-    chat::IMeshAdapter* mesh = app::messagingFacade().getMeshAdapter();
-    if (!mesh)
+    const auto result = key_verification_model_->submitNumber(
+        static_cast<uint32_t>(parsed));
+    if (!result.ok)
     {
-        if (key_verify_error_label_)
+        if (key_verify_modal_.error_label)
         {
-            ::ui::i18n::set_label_text(key_verify_error_label_, "Mesh unavailable");
-        }
-        return;
-    }
-
-    const bool ok = mesh->submitKeyVerificationNumber(key_verify_node_id_, key_verify_nonce_,
-                                                      static_cast<uint32_t>(parsed));
-    if (!ok)
-    {
-        if (key_verify_error_label_)
-        {
-            ::ui::i18n::set_label_text(key_verify_error_label_, "Submit failed");
+            ::ui::i18n::set_label_text_raw(
+                key_verify_modal_.error_label,
+                key_verification_action_failure_message(result));
         }
         return;
     }
@@ -1829,14 +1269,17 @@ void UiController::submitKeyVerificationNumber()
 
 void UiController::trustKeyFromVerificationModal()
 {
-    if (!key_verify_can_trust_ || key_verify_node_id_ == 0)
+    if (key_verification_model_ == nullptr)
     {
         closeKeyVerificationModal(true);
         return;
     }
 
-    bool ok = app::messagingFacade().getContactService().setNodeKeyManuallyVerified(key_verify_node_id_, true);
-    ::ui::SystemNotification::show(ok ? "Key marked trusted" : "Key trust failed", 2000);
+    const auto result = key_verification_model_->accept();
+    ::ui::SystemNotification::show(
+        result.ok ? "Key marked trusted"
+                  : key_verification_action_failure_message(result),
+        2000);
     closeKeyVerificationModal(true);
 }
 
@@ -1853,91 +1296,24 @@ bool UiController::sendTeamLocationWithIcon(uint8_t icon_id)
         return false;
     }
 
-    team::ui::TeamUiSnapshot snap;
-    if (!team::ui::team_ui_get_store().load(snap) || !snap.has_team_id)
+    if (team_action_sink_ == nullptr)
     {
         ::ui::SystemNotification::show("Team chat send failed", 2000);
         return false;
     }
-    team::TeamController* controller = app::teamFacade().getTeamController();
-    if (!controller)
-    {
-        ::ui::SystemNotification::show("Team chat send failed", 2000);
-        return false;
-    }
-    if (!snap.has_team_psk)
-    {
-        ::ui::SystemNotification::show("Team keys not ready", 2000);
-        return false;
-    }
-    if (!controller->setKeysFromPsk(snap.team_id,
-                                    snap.security_round,
-                                    snap.team_psk.data(),
-                                    snap.team_psk.size()))
-    {
-        ::ui::SystemNotification::show("Team keys not ready", 2000);
-        return false;
-    }
 
-    ::gps::GpsState gps_state = platform::ui::gps::get_data();
-    if (!gps_state.valid)
-    {
-        ::ui::SystemNotification::show("No GPS fix", 2000);
-        return false;
-    }
+    ::ui::team_actions::TeamActionRequest request;
+    request.kind = ::ui::team_actions::TeamActionKind::LocationMarker;
+    request.location.use_current_location = true;
+    request.location.marker_icon = icon_id;
+    request.location.label = team::proto::team_location_marker_icon_name(icon_id);
 
-    uint32_t ts = sys::epoch_seconds_now();
-    if (ts < kMinValidEpochSeconds)
+    const auto result = team_action_sink_->sendTeamAction(request);
+    if (!result.ok)
     {
-        ts = static_cast<uint32_t>(sys::millis_now() / 1000U);
+        showTeamLocationSendFailure(result);
     }
-
-    team::proto::TeamChatLocation loc;
-    loc.lat_e7 = static_cast<int32_t>(gps_state.lat * 1e7);
-    loc.lon_e7 = static_cast<int32_t>(gps_state.lng * 1e7);
-    if (gps_state.has_alt)
-    {
-        double alt = gps_state.alt_m;
-        if (alt > 32767.0) alt = 32767.0;
-        if (alt < -32768.0) alt = -32768.0;
-        loc.alt_m = static_cast<int16_t>(lround(alt));
-    }
-    loc.ts = ts;
-    loc.source = icon_id;
-    loc.label = team::proto::team_location_marker_icon_name(icon_id);
-
-    std::vector<uint8_t> payload;
-    if (!team::proto::encodeTeamChatLocation(loc, payload))
-    {
-        ::ui::SystemNotification::show("Team location encode failed", 2000);
-        return false;
-    }
-
-    team::proto::TeamChatMessage msg;
-    msg.header.type = team::proto::TeamChatType::Location;
-    msg.header.ts = ts;
-    msg.header.msg_id = s_team_msg_id++;
-    if (s_team_msg_id == 0)
-    {
-        s_team_msg_id = kTeamComposeMsgIdStart;
-    }
-    msg.payload = payload;
-
-    bool ok = controller->onChat(msg, chat::ChannelId::PRIMARY);
-    if (ok)
-    {
-        team::ui::team_ui_chatlog_append_structured(snap.team_id,
-                                                    0,
-                                                    false,
-                                                    ts,
-                                                    team::proto::TeamChatType::Location,
-                                                    payload);
-    }
-    else
-    {
-        ::ui::SystemNotification::show("Team chat send failed", 2000);
-    }
-    return ok;
+    return result.ok;
 }
 
 void UiController::onTeamPositionIconSelected(uint8_t icon_id)
@@ -1992,77 +1368,23 @@ void UiController::handleComposeAction(ChatComposeScreen::ActionIntent intent)
 
     if (team_conv_active_)
     {
-        team::ui::TeamUiSnapshot snap;
-        if (!team::ui::team_ui_get_store().load(snap) || !snap.has_team_id)
-        {
-            ::ui::SystemNotification::show("Team chat send failed", 2000);
-            switchToConversation(current_conv_);
-            return;
-        }
-        team::TeamController* controller = app::teamFacade().getTeamController();
-        if (!controller)
-        {
-            ::ui::SystemNotification::show("Team chat send failed", 2000);
-            switchToConversation(current_conv_);
-            return;
-        }
-        if (!snap.has_team_psk)
-        {
-            ::ui::SystemNotification::show("Team keys not ready", 2000);
-            switchToConversation(current_conv_);
-            return;
-        }
-        if (!controller->setKeysFromPsk(snap.team_id,
-                                        snap.security_round,
-                                        snap.team_psk.data(),
-                                        snap.team_psk.size()))
-        {
-            ::ui::SystemNotification::show("Team keys not ready", 2000);
-            switchToConversation(current_conv_);
-            return;
-        }
-
         if (intent == ChatComposeScreen::ActionIntent::Position)
         {
             openTeamPositionPicker();
             return;
         }
 
-        uint32_t ts = sys::epoch_seconds_now();
-        if (ts < kMinValidEpochSeconds)
-        {
-            ts = static_cast<uint32_t>(sys::millis_now() / 1000U);
-        }
-
         std::string text = compose_->getText();
         if (text.empty())
         {
             switchToConversation(current_conv_);
             return;
         }
-        team::proto::TeamChatMessage msg;
-        msg.header.type = team::proto::TeamChatType::Text;
-        msg.header.ts = ts;
-        msg.header.msg_id = s_team_msg_id++;
-        if (s_team_msg_id == 0)
+        const ::ui::UiActionResult result =
+            team_chat_model_.sendMessage(text.c_str());
+        if (!result.ok)
         {
-            s_team_msg_id = kTeamComposeMsgIdStart;
-        }
-        msg.payload.assign(text.begin(), text.end());
-
-        bool ok = controller->onChat(msg, chat::ChannelId::PRIMARY);
-        if (ok)
-        {
-            team::ui::team_ui_chatlog_append_structured(snap.team_id,
-                                                        0,
-                                                        false,
-                                                        ts,
-                                                        team::proto::TeamChatType::Text,
-                                                        msg.payload);
-        }
-        else
-        {
-            ::ui::SystemNotification::show("Team chat send failed", 2000);
+            showTeamSendFailure(result);
         }
         switchToConversation(current_conv_);
         return;
diff --git a/modules/ui_shared/src/ui/screens/chat_watch/chat_conversation_components_watch.cpp b/modules/ui_shared/src/ui/screens/chat_watch/chat_conversation_components_watch.cpp
index a3d1d809..1b30d593 100644
--- a/modules/ui_shared/src/ui/screens/chat_watch/chat_conversation_components_watch.cpp
+++ b/modules/ui_shared/src/ui/screens/chat_watch/chat_conversation_components_watch.cpp
@@ -4,11 +4,41 @@
 
 #include "ui/localization.h"
 #include "ui/ui_theme.h"
+#include "ui_presentation/chat/chat_workspace_snapshot.h"
+
+#include <string>
 
 namespace
 {
 constexpr lv_coord_t kActionBarHeight = 36;
 constexpr lv_coord_t kActionButtonHeight = 26;
+
+::ui::chat::MessageDeliveryState delivery_from_message_status(
+    chat::MessageStatus status)
+{
+    switch (status)
+    {
+    case chat::MessageStatus::Incoming:
+        return ::ui::chat::MessageDeliveryState::Received;
+    case chat::MessageStatus::Queued:
+        return ::ui::chat::MessageDeliveryState::Queued;
+    case chat::MessageStatus::Sent:
+        return ::ui::chat::MessageDeliveryState::Sent;
+    case chat::MessageStatus::Failed:
+        return ::ui::chat::MessageDeliveryState::Failed;
+    }
+    return ::ui::chat::MessageDeliveryState::Unknown;
+}
+
+bool message_ref_matches_id(const ::ui::chat::MessageRef& ref,
+                            chat::MessageId msg_id)
+{
+    if (ref.protocol_id != 0)
+    {
+        return ref.protocol_id == msg_id;
+    }
+    return ref.local_id == static_cast<uint64_t>(msg_id);
+}
 } // namespace
 
 namespace chat::ui
@@ -93,7 +123,7 @@ ChatConversationScreen::~ChatConversationScreen()
     guard_ = nullptr;
 }
 
-void ChatConversationScreen::addMessage(const chat::ChatMessage& msg)
+void ChatConversationScreen::createMessageItem(const ::ui::chat::MessageRow& row)
 {
     if (!msg_list_)
     {
@@ -111,7 +141,8 @@ void ChatConversationScreen::addMessage(const chat::ChatMessage& msg)
     }
 
     MessageItem item{};
-    item.msg = msg;
+    item.ref = row.ref;
+    item.delivery = row.delivery;
     item.container = lv_obj_create(msg_list_);
     lv_obj_set_width(item.container, LV_PCT(100));
     lv_obj_set_style_bg_opa(item.container, LV_OPA_TRANSP, 0);
@@ -119,16 +150,28 @@ void ChatConversationScreen::addMessage(const chat::ChatMessage& msg)
     lv_obj_set_style_pad_top(item.container, 2, 0);
     lv_obj_set_style_pad_bottom(item.container, 2, 0);
     lv_obj_set_flex_flow(item.container, LV_FLEX_FLOW_ROW);
-    bool is_self = msg.status != chat::MessageStatus::Incoming;
+    bool is_self = row.outgoing;
     lv_obj_set_flex_align(item.container,
                           is_self ? LV_FLEX_ALIGN_END : LV_FLEX_ALIGN_START,
                           LV_FLEX_ALIGN_START,
                           LV_FLEX_ALIGN_START);
 
+    std::string display_text;
+    if (!row.outgoing && !row.sender_label.empty())
+    {
+        display_text = row.sender_label.c_str();
+        display_text += ": ";
+        display_text += row.text.c_str();
+    }
+    else
+    {
+        display_text = row.text.c_str();
+    }
+
     item.text_label = lv_label_create(item.container);
     lv_label_set_long_mode(item.text_label, LV_LABEL_LONG_WRAP);
     lv_obj_set_width(item.text_label, LV_PCT(80));
-    lv_label_set_text(item.text_label, msg.text.c_str());
+    lv_label_set_text(item.text_label, display_text.c_str());
     lv_obj_set_style_text_color(item.text_label, ::ui::theme::text(), 0);
     lv_obj_set_style_bg_color(item.text_label,
                               is_self ? ::ui::theme::surface_alt() : ::ui::theme::surface(),
@@ -140,6 +183,11 @@ void ChatConversationScreen::addMessage(const chat::ChatMessage& msg)
     messages_.push_back(item);
 }
 
+void ChatConversationScreen::addMessage(const ::ui::chat::MessageRow& row)
+{
+    createMessageItem(row);
+}
+
 void ChatConversationScreen::clearMessages()
 {
     if (msg_list_)
@@ -168,11 +216,11 @@ bool ChatConversationScreen::updateMessageStatus(const chat::MessageId msg_id,
 
     for (auto& item : messages_)
     {
-        if (item.msg.msg_id != msg_id)
+        if (!message_ref_matches_id(item.ref, msg_id))
         {
             continue;
         }
-        item.msg.status = status;
+        item.delivery = delivery_from_message_status(status);
         return true;
     }
 
diff --git a/modules/ui_shared/src/ui/screens/contacts/contacts_page_components.cpp b/modules/ui_shared/src/ui/screens/contacts/contacts_page_components.cpp
index a5c49a46..37d0b149 100644
--- a/modules/ui_shared/src/ui/screens/contacts/contacts_page_components.cpp
+++ b/modules/ui_shared/src/ui/screens/contacts/contacts_page_components.cpp
@@ -7,6 +7,7 @@
 #include "app/app_config.h"
 #include "app/app_facade_access.h"
 #include "chat/infra/mesh_protocol_utils.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/ports/i_mesh_adapter.h"
 #include "chat/usecase/chat_service.h"
 #include "chat/usecase/contact_service.h"
@@ -35,6 +36,7 @@
 #include "ui/ui_common.h"
 #include "ui/widgets/ime/ime_widget.h"
 #include "ui/widgets/system_notification.h"
+#include "ui_presentation/chat/chat_workspace_snapshot.h"
 
 #include <cmath>
 #include <cstdint>
@@ -471,7 +473,8 @@ static std::string format_broadcast_target_label(const BroadcastTargetSpec& spec
     if (spec.protocol == chat::MeshProtocol::Meshtastic)
     {
         return std::string("[MT] ") +
-               ::ui::i18n::format("Slot %u", static_cast<unsigned>(spec.channel_index));
+               chat::meshtastic::channelName(app::appFacade().getConfig().meshtastic_config,
+                                             spec.channel);
     }
     if (spec.protocol == chat::MeshProtocol::RNode)
     {
@@ -495,7 +498,8 @@ static std::string format_broadcast_target_status(const BroadcastTargetSpec& spe
         }
         if (spec.channel_index == 1)
         {
-            return ::ui::i18n::tr("Secondary");
+            return chat::meshtastic::channelName(app::appFacade().getConfig().meshtastic_config,
+                                                 spec.channel);
         }
         return spec.chat_supported ? ::ui::i18n::tr("Ready") : ::ui::i18n::tr("Slot");
     }
@@ -628,6 +632,58 @@ static std::string format_team_chat_entry(const team::ui::TeamChatLogEntry& entr
     return ::ui::i18n::tr("Message");
 }
 
+static void copy_team_chat_time_label(::ui::FixedText<24>& out, uint32_t timestamp)
+{
+    if (timestamp == 0)
+    {
+        out.clear();
+        return;
+    }
+
+    char buffer[24]{};
+    snprintf(buffer, sizeof(buffer), "%lu", static_cast<unsigned long>(timestamp));
+    ::ui::copyText(out, buffer);
+}
+
+static void copy_team_chat_sender_label(::ui::FixedText<32>& out,
+                                        const team::ui::TeamChatLogEntry& entry)
+{
+    if (!entry.incoming)
+    {
+        ::ui::copyText(out, "Me");
+        return;
+    }
+
+    for (const auto& member : team::ui::g_team_state.members)
+    {
+        if (member.node_id == entry.peer_id && !member.name.empty())
+        {
+            ::ui::copyText(out, member.name.c_str());
+            return;
+        }
+    }
+
+    char buffer[16]{};
+    snprintf(buffer,
+             sizeof(buffer),
+             "%04lX",
+             static_cast<unsigned long>(entry.peer_id & 0xFFFFU));
+    ::ui::copyText(out, buffer);
+}
+
+static uint64_t team_chat_message_local_id(const team::ui::TeamChatLogEntry& entry,
+                                           size_t index)
+{
+    uint64_t id = 1469598103934665603ULL;
+    id ^= entry.ts;
+    id *= 1099511628211ULL;
+    id ^= entry.peer_id;
+    id *= 1099511628211ULL;
+    id ^= static_cast<uint64_t>(index + 1U);
+    id *= 1099511628211ULL;
+    return id == 0 ? static_cast<uint64_t>(index + 1U) : id;
+}
+
 static void refresh_team_state_from_store()
 {
     if (team::ui::g_team_state.in_team && team::ui::g_team_state.has_team_id)
@@ -1734,17 +1790,25 @@ static void refresh_team_conversation()
     std::vector<team::ui::TeamChatLogEntry> entries;
     if (team::ui::team_ui_chatlog_load_recent(team::ui::g_team_state.team_id, 50, entries))
     {
-        for (const auto& entry : entries)
+        for (size_t index = 0; index < entries.size(); ++index)
         {
-            chat::ChatMessage msg;
-            msg.protocol = app::appFacade().getConfig().mesh_protocol;
-            msg.channel = chat::ChannelId::PRIMARY;
-            msg.peer = 0;
-            msg.from = entry.incoming ? entry.peer_id : 0;
-            msg.timestamp = entry.ts;
-            msg.text = format_team_chat_entry(entry);
-            msg.status = entry.incoming ? chat::MessageStatus::Incoming : chat::MessageStatus::Sent;
-            g_contacts_state.conversation_screen->addMessage(msg);
+            const auto& entry = entries[index];
+            ::ui::chat::MessageRow row;
+            row.conversation.kind = ::ui::chat::ConversationKind::Team;
+            row.conversation.protocol = ::ui::chat::ChatProtocolKind::TrailMate;
+            row.conversation.primary = 1;
+            row.outgoing = !entry.incoming;
+            row.delivery = entry.incoming ? ::ui::chat::MessageDeliveryState::Received
+                                          : ::ui::chat::MessageDeliveryState::Sent;
+            row.failure = ::ui::chat::MessageFailureKind::None;
+            row.sender_node_id = entry.incoming ? entry.peer_id : 0;
+            row.ref.origin = entry.incoming ? ::ui::chat::MessageOrigin::RemoteStored
+                                            : ::ui::chat::MessageOrigin::LocalStored;
+            row.ref.local_id = team_chat_message_local_id(entry, index);
+            ::ui::copyText(row.text, format_team_chat_entry(entry).c_str());
+            copy_team_chat_time_label(row.time_label, entry.ts);
+            copy_team_chat_sender_label(row.sender_label, entry);
+            g_contacts_state.conversation_screen->addMessage(row);
         }
     }
     g_contacts_state.conversation_screen->scrollToBottom();
diff --git a/modules/ui_shared/src/ui/screens/extensions/extensions_page_runtime.cpp b/modules/ui_shared/src/ui/screens/extensions/extensions_page_runtime.cpp
index 06c3c535..d70f96dd 100644
--- a/modules/ui_shared/src/ui/screens/extensions/extensions_page_runtime.cpp
+++ b/modules/ui_shared/src/ui/screens/extensions/extensions_page_runtime.cpp
@@ -558,6 +558,7 @@ void on_primary_action_clicked(lv_event_t* event)
     s_runtime.selected_package_id = package_id;
     s_runtime.view = MainView::Detail;
     refresh_catalog_and_render();
+    ui_request_rebuild_active_app();
 }
 
 void on_uninstall_clicked(lv_event_t* event)
@@ -588,6 +589,7 @@ void on_uninstall_clicked(lv_event_t* event)
     s_runtime.selected_package_id = package.id;
     s_runtime.view = MainView::Detail;
     refresh_catalog_and_render();
+    ui_request_rebuild_active_app();
 }
 
 lv_obj_t* create_action_button(lv_obj_t* parent,
diff --git a/modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp b/modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp
index 2487799c..fe17d143 100644
--- a/modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp
+++ b/modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp
@@ -6,6 +6,7 @@ using Host = gps::ui::shell::Host;
 #include "app/app_facade_access.h"
 #include "platform/ui/device_runtime.h"
 #include "platform/ui/gps_runtime.h"
+#include "sys/clock.h"
 #include "ui/localization.h"
 #include "ui/page/page_profile.h"
 #include "ui/screens/gps/gps_constants.h"
@@ -21,6 +22,7 @@ using Host = gps::ui::shell::Host;
 #include "ui/screens/gps/gps_tracker_overlay.h"
 #include "ui/ui_common.h"
 #include "ui/widgets/map/map_tiles.h"
+#include "ui_gps_runtime/gps_page_runtime_pump.h"
 
 #include <cmath>
 #include <cstdio>
@@ -243,6 +245,90 @@ static void title_update_timer_cb(lv_timer_t* timer)
     update_title_and_status();
 }
 
+namespace
+{
+
+class EspGpsRuntimeRefreshModel final : public ::ui::screens::gps::IGpsStatusRefreshModel
+{
+  public:
+    void refresh() override
+    {
+        // If there's no GPS fix and nothing explicitly requested a refresh,
+        // avoid driving full UI/map updates on every runtime cadence tick.
+        GPSData gps_data = platform::ui::gps::get_data();
+        const bool has_fix_now = gps_data.valid || g_gps_state.has_fix;
+
+        if (g_gps_state.pending_refresh)
+        {
+            GPS_FLOW_LOG("[GPS][MAP][flow] pending_refresh consume zoom=%d fix=%d pan=%d,%d\n",
+                         g_gps_state.zoom_level,
+                         g_gps_state.has_fix,
+                         g_gps_state.pan_x,
+                         g_gps_state.pan_y);
+            g_gps_state.pending_refresh = false;
+            update_map_tiles(false);
+            log_map_tile_state("pending_refresh");
+        }
+
+        refresh_member_panel(false);
+        refresh_team_markers_from_posring();
+        refresh_team_signal_markers_from_chatlog();
+
+        if (g_gps_state.zoom_modal.is_open())
+        {
+            tick_gps_update(false);
+            return;
+        }
+
+        if (modal_is_open(g_gps_state.tracker_modal))
+        {
+            tick_gps_update(false);
+            return;
+        }
+        if (modal_is_open(g_gps_state.layer_modal))
+        {
+            tick_gps_update(false);
+            return;
+        }
+
+        if (!has_fix_now && !g_gps_state.pending_refresh)
+        {
+            return;
+        }
+
+        tick_gps_update(true);
+    }
+};
+
+class EspGpsUiRefreshSink final : public ::ui::screens::gps::IGpsUiRefreshSink
+{
+  public:
+    void onGpsRuntimeUpdated() override {}
+};
+
+EspGpsRuntimeRefreshModel& gps_runtime_refresh_model()
+{
+    static EspGpsRuntimeRefreshModel model;
+    return model;
+}
+
+EspGpsUiRefreshSink& gps_runtime_refresh_sink()
+{
+    static EspGpsUiRefreshSink sink;
+    return sink;
+}
+
+::ui::screens::gps::GpsPageRuntimePump& gps_runtime_pump()
+{
+    static ::ui::screens::gps::GpsPageRuntimePump pump(
+        gps_runtime_refresh_model(),
+        &gps_runtime_refresh_sink(),
+        500);
+    return pump;
+}
+
+} // namespace
+
 static void gps_update_timer_cb(lv_timer_t* timer)
 {
     (void)timer;
@@ -251,50 +337,7 @@ static void gps_update_timer_cb(lv_timer_t* timer)
         return;
     }
 
-    // If there's no GPS fix and nothing explicitly requested a refresh,
-    // avoid driving full UI/map updates on every tick.
-    GPSData gps_data = platform::ui::gps::get_data();
-    const bool has_fix_now = gps_data.valid || g_gps_state.has_fix;
-
-    if (g_gps_state.pending_refresh)
-    {
-        GPS_FLOW_LOG("[GPS][MAP][flow] pending_refresh consume zoom=%d fix=%d pan=%d,%d\n",
-                     g_gps_state.zoom_level,
-                     g_gps_state.has_fix,
-                     g_gps_state.pan_x,
-                     g_gps_state.pan_y);
-        g_gps_state.pending_refresh = false;
-        update_map_tiles(false);
-        log_map_tile_state("pending_refresh");
-    }
-
-    refresh_member_panel(false);
-    refresh_team_markers_from_posring();
-    refresh_team_signal_markers_from_chatlog();
-
-    if (g_gps_state.zoom_modal.is_open())
-    {
-        tick_gps_update(false);
-        return;
-    }
-
-    if (modal_is_open(g_gps_state.tracker_modal))
-    {
-        tick_gps_update(false);
-        return;
-    }
-    if (modal_is_open(g_gps_state.layer_modal))
-    {
-        tick_gps_update(false);
-        return;
-    }
-
-    if (!has_fix_now && !g_gps_state.pending_refresh)
-    {
-        return;
-    }
-
-    tick_gps_update(true);
+    gps_runtime_pump().update(sys::millis_now());
 }
 
 static void gps_loader_timer_cb(lv_timer_t* timer)
@@ -382,6 +425,7 @@ void enter(const shell::Host* host, lv_obj_t* parent)
                         nullptr,
                         &g_gps_state.anchor,
                         &g_gps_state.tiles,
+                        &g_gps_state.tile_render_queue,
                         &g_gps_state.has_map_data,
                         &g_gps_state.has_visible_map_data);
     g_gps_state.tile_ctx.map_container = g_gps_state.map;
@@ -484,6 +528,7 @@ void enter(const shell::Host* host, lv_obj_t* parent)
     }
 
     // Split timers: fast tile loading + slower GPS refresh.
+    gps_runtime_pump().setActive(true);
     g_gps_state.loader_timer = gps::ui::lifetime::add_timer(gps_loader_timer_cb, 200, NULL);
     g_gps_state.timer = gps::ui::lifetime::add_timer(gps_update_timer_cb, 500, NULL);
     g_gps_state.title_timer = gps::ui::lifetime::add_timer(title_update_timer_cb, 30000, NULL);
@@ -503,6 +548,7 @@ void exit(lv_obj_t* parent)
 
     // Prevent re-entrant exit.
     g_gps_state.exiting = true;
+    gps_runtime_pump().setActive(false);
 
     // Mirror Contacts cleanup order: stop inputs/timers, close modals, delete root, reset state.
 #ifdef USING_INPUT_DEV_TOUCHPAD
@@ -606,16 +652,25 @@ using Host = gps::ui::shell::Host;
 #include "app/app_config.h"
 #include "app/app_facade_access.h"
 #include "platform/ui/device_runtime.h"
-#include "platform/ui/gps_runtime.h"
+#include "platform/ui/team_ui_store_runtime.h"
+#include "sys/clock.h"
 #include "ui/app_runtime.h"
 #include "ui/localization.h"
+#include "ui/presentation_sources/legacy_gps_status_source.h"
+#include "ui/presentation_sources/legacy_map_action_sink.h"
+#include "ui/presentation_sources/legacy_map_presentation_source.h"
 #include "ui/screens/gps/gps_constants.h"
 #include "ui/ui_common.h"
 #include "ui/widgets/map/map_viewport.h"
 #include "ui/widgets/top_bar.h"
+#include "ui_gps_runtime/gps_page_runtime_pump.h"
+#include "ui_map_runtime/map_overlay_snapshot_source.h"
+#include "ui_presentation/map/map_overlay_snapshot.h"
+#include "ui_presentation/map/map_workspace_model.h"
 
 #include <algorithm>
 #include <cstdio>
+#include <vector>
 
 #if !defined(LV_FONT_MONTSERRAT_12) || !LV_FONT_MONTSERRAT_12
 #define lv_font_montserrat_12 lv_font_montserrat_14
@@ -638,6 +693,7 @@ lv_timer_t* s_timer = nullptr;
 int s_map_zoom = kCardputerZeroMapDefaultZoom;
 int s_map_pan_x = 0;
 int s_map_pan_y = 0;
+::ui::map::MapOverlaySnapshot s_overlay_snapshot;
 
 void request_exit()
 {
@@ -649,19 +705,151 @@ void request_exit()
     ui_request_exit_to_menu();
 }
 
-::ui::widgets::map::Model build_map_model(const platform::ui::gps::GpsState& gps_data)
+::ui::map::MapWorkspaceModel& map_workspace_model()
+{
+    static ::ui::presentation_sources::LegacyMapPresentationSource source(
+        ::ui::presentation_sources::legacy_gps_status_source(),
+        ::ui::presentation_sources::legacy_map_presentation_state(),
+        &::team::ui::team_ui_get_store());
+    static ::ui::presentation_sources::LegacyMapActionSink sink(
+        ::ui::presentation_sources::legacy_gps_status_source(),
+        ::ui::presentation_sources::legacy_map_presentation_state());
+    static ::ui::map::MapWorkspaceModel model(source, sink);
+    return model;
+}
+
+class LinuxMapOverlayGpsSource final : public ::ui::map_overlay::IMapOverlayGpsSource
+{
+  public:
+    bool currentFix(double& lat, double& lon, bool& valid) const override
+    {
+        ::ui::gps::GpsStatusSnapshot gps;
+        if (!::ui::presentation_sources::legacy_gps_status_source().buildGpsStatusSnapshot(gps))
+        {
+            return false;
+        }
+
+        lat = gps.latitude;
+        lon = gps.longitude;
+        valid = gps.header.valid && gps.fix_valid;
+        return true;
+    }
+};
+
+class LinuxMapOverlayTeamSource final : public ::ui::map_overlay::IMapOverlayTeamSource
+{
+  public:
+    std::size_t latestTeamPoints(TeamPoint* out, std::size_t capacity) const override
+    {
+        if (out == nullptr || capacity == 0)
+        {
+            return 0;
+        }
+
+        ::team::ui::TeamUiSnapshot team_snapshot;
+        if (!::team::ui::team_ui_get_store().load(team_snapshot) ||
+            !team_snapshot.in_team ||
+            !team_snapshot.has_team_id)
+        {
+            return 0;
+        }
+
+        std::vector<::team::ui::TeamPosSample> samples;
+        if (!::team::ui::team_ui_posring_load_latest(team_snapshot.team_id, samples))
+        {
+            return 0;
+        }
+
+        std::size_t count = 0;
+        for (const auto& sample : samples)
+        {
+            if (count >= capacity)
+            {
+                break;
+            }
+
+            out[count].node_id = sample.member_id;
+            out[count].label = labelForMember(team_snapshot, sample.member_id, count);
+            out[count].lat = static_cast<double>(sample.lat_e7) / 10000000.0;
+            out[count].lon = static_cast<double>(sample.lon_e7) / 10000000.0;
+            out[count].valid = sample.lat_e7 != 0 || sample.lon_e7 != 0;
+            ++count;
+        }
+        return count;
+    }
+
+  private:
+    static const char* labelForMember(const ::team::ui::TeamUiSnapshot& snapshot,
+                                      uint32_t node_id,
+                                      std::size_t index)
+    {
+        static char labels[::ui::map::MapOverlaySnapshot::kMaxItems][32]{};
+        if (index >= ::ui::map::MapOverlaySnapshot::kMaxItems)
+        {
+            return nullptr;
+        }
+
+        for (const auto& member : snapshot.members)
+        {
+            if (member.node_id == node_id && !member.name.empty())
+            {
+                std::snprintf(labels[index], sizeof(labels[index]), "%s", member.name.c_str());
+                return labels[index];
+            }
+        }
+        return nullptr;
+    }
+};
+
+::ui::map::IMapOverlayPresentationSource& map_overlay_source()
+{
+    static LinuxMapOverlayGpsSource gps;
+    static LinuxMapOverlayTeamSource team;
+    static ::ui::map_overlay::MapOverlaySnapshotSource source(&gps, &team);
+    return source;
+}
+
+uint8_t current_map_zoom()
+{
+    return static_cast<uint8_t>(
+        std::clamp(s_map_zoom,
+                   ::ui::widgets::map::kMinZoom,
+                   ::ui::widgets::map::kMaxZoom));
+}
+
+void sync_workspace_layers_from_legacy_renderer()
+{
+    auto& state = ::ui::presentation_sources::legacy_map_presentation_state();
+    const auto layers = ::ui::widgets::map::current_layer_state();
+    state.layers.osm = layers.map_source == 0;
+    state.layers.terrain = layers.map_source == 1;
+    state.layers.satellite = layers.map_source == 2;
+    state.layers.contour = layers.contour_enabled;
+}
+
+void sync_workspace_viewport_from_legacy_renderer()
+{
+    auto& model = map_workspace_model();
+    auto viewport = model.viewport();
+    viewport.zoom = current_map_zoom();
+    (void)model.setViewport(viewport);
+    (void)model.setActiveTool(::ui::map::MapToolKind::Pan);
+}
+
+::ui::widgets::map::Model build_map_model(
+    const ::ui::map::MapWorkspaceSnapshot& snapshot)
 {
     const auto& config = app::configFacade().getConfig();
 
     ::ui::widgets::map::Model model{};
-    model.focus_point.valid = gps_data.valid;
-    model.focus_point.lat = gps_data.lat;
-    model.focus_point.lon = gps_data.lng;
-    model.zoom = s_map_zoom;
+    model.focus_point.valid = snapshot.self.valid;
+    model.focus_point.lat = snapshot.self.lat;
+    model.focus_point.lon = snapshot.self.lon;
+    model.zoom = snapshot.viewport.zoom == 0 ? s_map_zoom : snapshot.viewport.zoom;
     model.pan_x = s_map_pan_x;
     model.pan_y = s_map_pan_y;
     model.map_source = config.map_source;
-    model.contour_enabled = config.map_contour_enabled;
+    model.contour_enabled = snapshot.layers.contour;
     model.coord_system = config.map_coord_system;
     return model;
 }
@@ -713,11 +901,14 @@ void refresh_view()
     ui_update_top_bar_battery(s_top_bar);
     apply_compact_top_bar_style(s_top_bar);
 
-    const platform::ui::gps::GpsState gps_data = platform::ui::gps::get_data();
+    sync_workspace_layers_from_legacy_renderer();
+    const auto snapshot = map_workspace_model().snapshot();
+    (void)map_overlay_source().buildMapOverlaySnapshot(s_overlay_snapshot);
 
-    if (gps_data.valid)
+    if (snapshot.header.valid && snapshot.self.valid)
     {
-        ::ui::widgets::map::apply_model(s_map_runtime, build_map_model(gps_data));
+        ::ui::widgets::map::apply_model(s_map_runtime, build_map_model(snapshot));
+        ::ui::widgets::map::apply_overlay(s_map_runtime, s_overlay_snapshot);
     }
     else
     {
@@ -725,10 +916,46 @@ void refresh_view()
     }
 }
 
+class LinuxGpsRuntimeRefreshModel final : public ::ui::screens::gps::IGpsStatusRefreshModel
+{
+  public:
+    void refresh() override {}
+};
+
+class LinuxGpsUiRefreshSink final : public ::ui::screens::gps::IGpsUiRefreshSink
+{
+  public:
+    void onGpsRuntimeUpdated() override
+    {
+        refresh_view();
+    }
+};
+
+LinuxGpsRuntimeRefreshModel& gps_runtime_refresh_model()
+{
+    static LinuxGpsRuntimeRefreshModel model;
+    return model;
+}
+
+LinuxGpsUiRefreshSink& gps_runtime_refresh_sink()
+{
+    static LinuxGpsUiRefreshSink sink;
+    return sink;
+}
+
+::ui::screens::gps::GpsPageRuntimePump& gps_runtime_pump()
+{
+    static ::ui::screens::gps::GpsPageRuntimePump pump(
+        gps_runtime_refresh_model(),
+        &gps_runtime_refresh_sink(),
+        750);
+    return pump;
+}
+
 void refresh_timer_cb(lv_timer_t* timer)
 {
     (void)timer;
-    refresh_view();
+    gps_runtime_pump().update(sys::millis_now());
 }
 
 void consume_key_event(lv_event_t* e)
@@ -770,10 +997,19 @@ bool handle_map_key(uint32_t key, lv_event_t* e)
     case '_':
         s_map_zoom = std::max(s_map_zoom - 1, ::ui::widgets::map::kMinZoom);
         break;
+    case 'c':
+    case 'C':
+        if (map_workspace_model().centerOnSelf().ok)
+        {
+            s_map_pan_x = 0;
+            s_map_pan_y = 0;
+        }
+        break;
     default:
         return false;
     }
 
+    sync_workspace_viewport_from_legacy_renderer();
     refresh_view();
     consume_key_event(e);
     return true;
@@ -814,6 +1050,7 @@ void enter(const shell::Host* host, lv_obj_t* parent)
     s_map_zoom = kCardputerZeroMapDefaultZoom;
     s_map_pan_x = 0;
     s_map_pan_y = 0;
+    sync_workspace_viewport_from_legacy_renderer();
 
     lv_group_t* prev_group = lv_group_get_default();
     set_default_group(nullptr);
@@ -886,6 +1123,7 @@ void enter(const shell::Host* host, lv_obj_t* parent)
     }
 
     refresh_view();
+    gps_runtime_pump().setActive(true);
     if (!s_timer)
     {
         s_timer = lv_timer_create(refresh_timer_cb, 750, nullptr);
@@ -901,6 +1139,7 @@ void exit(lv_obj_t* parent)
         lv_timer_del(s_timer);
         s_timer = nullptr;
     }
+    gps_runtime_pump().setActive(false);
     ::ui::widgets::map::destroy(s_map_runtime);
     if (s_root)
     {
diff --git a/modules/ui_shared/src/ui/screens/node_info/node_info_page_components.cpp b/modules/ui_shared/src/ui/screens/node_info/node_info_page_components.cpp
index 73f09606..deab9624 100644
--- a/modules/ui_shared/src/ui/screens/node_info/node_info_page_components.cpp
+++ b/modules/ui_shared/src/ui/screens/node_info/node_info_page_components.cpp
@@ -148,16 +148,21 @@ static const lv_color_t kColorReadoutSnr = lv_color_hex(kHexReadoutGreen);
 static const lv_color_t kColorReadoutSeen = lv_color_hex(kHexReadoutLight);
 static const lv_color_t kColorReadoutZoom = lv_color_hex(kHexReadoutLightStrong);
 
+bool valid_obj(lv_obj_t* obj)
+{
+    return obj && lv_obj_is_valid(obj);
+}
+
 bool is_hidden(lv_obj_t* obj)
 {
-    return obj ? lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN) : true;
+    return valid_obj(obj) ? lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN) : true;
 }
 
 void log_widget_box(const char* stage, const char* name, lv_obj_t* obj)
 {
-    if (!obj)
+    if (!valid_obj(obj))
     {
-        NODE_INFO_LOG("%s %s=<null>\n", stage, name);
+        NODE_INFO_LOG("%s %s=%s\n", stage, name, obj ? "<invalid>" : "<null>");
         return;
     }
 
@@ -214,6 +219,7 @@ void log_scene_widgets(const char* stage)
     log_widget_box(stage, "map_stage", s_widgets.map_stage);
     log_widget_box(stage, "tile_layer", s_widgets.tile_layer);
     log_widget_box(stage, "map_overlay_layer", s_widgets.map_overlay_layer);
+    log_widget_box(stage, "node_overlay_layer", s_widgets.node_overlay_layer);
     log_widget_box(stage, "map_gesture_surface", s_widgets.map_gesture_surface);
     log_widget_box(stage, "back_btn", s_widgets.back_btn);
     log_widget_box(stage, "title_label", s_widgets.title_label);
@@ -352,6 +358,11 @@ double clamp_double(double value, double min_value, double max_value)
 
 void make_plain(lv_obj_t* obj)
 {
+    if (!valid_obj(obj))
+    {
+        return;
+    }
+
     lv_obj_clear_flag(obj, LV_OBJ_FLAG_SCROLLABLE);
     lv_obj_set_scrollbar_mode(obj, LV_SCROLLBAR_MODE_OFF);
     lv_obj_set_style_pad_all(obj, 0, 0);
@@ -361,7 +372,7 @@ void make_plain(lv_obj_t* obj)
 
 void set_label_text(lv_obj_t* label, const char* text)
 {
-    if (!label || !text)
+    if (!valid_obj(label) || !text)
     {
         return;
     }
@@ -385,7 +396,7 @@ lv_obj_t* create_label(lv_obj_t* parent,
 
 void apply_info_panel_style(lv_obj_t* panel)
 {
-    if (!panel)
+    if (!valid_obj(panel))
     {
         return;
     }
@@ -402,7 +413,7 @@ void apply_info_panel_style(lv_obj_t* panel)
 
 void apply_zoom_button_style(lv_obj_t* button, lv_obj_t* label)
 {
-    if (!button)
+    if (!valid_obj(button))
     {
         return;
     }
@@ -426,7 +437,7 @@ void apply_zoom_button_style(lv_obj_t* button, lv_obj_t* label)
     lv_obj_clear_flag(button, LV_OBJ_FLAG_SCROLLABLE);
     lv_obj_set_scrollbar_mode(button, LV_SCROLLBAR_MODE_OFF);
 
-    if (label)
+    if (valid_obj(label))
     {
         lv_obj_set_style_text_font(label, font_montserrat_22_safe(), 0);
         lv_obj_set_style_text_color(label, kColorTextPrimary, 0);
@@ -436,7 +447,7 @@ void apply_zoom_button_style(lv_obj_t* button, lv_obj_t* label)
 
 void apply_layer_button_style(lv_obj_t* button, lv_obj_t* label, bool compact)
 {
-    if (!button)
+    if (!valid_obj(button))
     {
         return;
     }
@@ -457,7 +468,7 @@ void apply_layer_button_style(lv_obj_t* button, lv_obj_t* label, bool compact)
     lv_obj_clear_flag(button, LV_OBJ_FLAG_SCROLLABLE);
     lv_obj_set_scrollbar_mode(button, LV_SCROLLBAR_MODE_OFF);
 
-    if (label)
+    if (valid_obj(label))
     {
         const lv_font_t* font = compact ? font_montserrat_12_safe() : font_montserrat_14_safe();
         lv_obj_set_style_text_font(label, font, 0);
@@ -468,7 +479,7 @@ void apply_layer_button_style(lv_obj_t* button, lv_obj_t* label, bool compact)
 
 void update_layer_popup_button_selected(lv_obj_t* btn, bool selected)
 {
-    if (!btn)
+    if (!valid_obj(btn))
     {
         return;
     }
@@ -481,7 +492,8 @@ void update_layer_popup_button_selected(lv_obj_t* btn, bool selected)
     lv_obj_set_style_outline_color(btn, lv_color_hex(kHexAmberDark), 0);
     lv_obj_set_style_outline_pad(btn, 0, 0);
 
-    if (lv_obj_t* label = lv_obj_get_child(btn, 0))
+    lv_obj_t* label = lv_obj_get_child(btn, 0);
+    if (valid_obj(label))
     {
         lv_obj_set_style_text_color(label, kColorTextPrimary, 0);
     }
@@ -896,7 +908,7 @@ void on_layer_button_clicked(lv_event_t* e)
 
 void apply_marker_style(lv_obj_t* obj, lv_coord_t size, lv_color_t color, bool filled)
 {
-    if (!obj)
+    if (!valid_obj(obj))
     {
         return;
     }
@@ -916,13 +928,13 @@ ViewMetrics view_metrics()
     ViewMetrics metrics{};
     const auto& profile = ::ui::page_profile::current();
 
-    metrics.width = s_widgets.content ? lv_obj_get_width(s_widgets.content) : 0;
-    metrics.height = s_widgets.content ? lv_obj_get_height(s_widgets.content) : 0;
-    if (metrics.width <= 0 && s_widgets.root)
+    metrics.width = valid_obj(s_widgets.content) ? lv_obj_get_width(s_widgets.content) : 0;
+    metrics.height = valid_obj(s_widgets.content) ? lv_obj_get_height(s_widgets.content) : 0;
+    if (metrics.width <= 0 && valid_obj(s_widgets.root))
     {
         metrics.width = lv_obj_get_width(s_widgets.root);
     }
-    if (metrics.height <= 0 && s_widgets.root)
+    if (metrics.height <= 0 && valid_obj(s_widgets.root))
     {
         metrics.height = lv_obj_get_height(s_widgets.root) - profile.top_bar_height;
     }
@@ -1114,7 +1126,7 @@ int select_zoom_after_delta(int current_zoom, int delta)
 
 void set_hidden(lv_obj_t* obj, bool hidden)
 {
-    if (!obj)
+    if (!valid_obj(obj))
     {
         return;
     }
@@ -1235,7 +1247,7 @@ std::string preferred_node_title(const chat::contacts::NodeInfo& node)
 
 void set_top_bar_title(const chat::contacts::NodeInfo& node)
 {
-    if (!s_top_bar.container)
+    if (!valid_obj(s_top_bar.container))
     {
         return;
     }
@@ -1260,9 +1272,18 @@ bool append_info_line(std::size_t& count, const char* text, lv_color_t color)
         return false;
     }
 
-    set_label_text(s_widgets.info_labels[count], text);
-    lv_obj_set_style_text_color(s_widgets.info_labels[count], color, 0);
-    set_hidden(s_widgets.info_labels[count], false);
+    lv_obj_t* label = s_widgets.info_labels[count];
+    if (!valid_obj(label))
+    {
+        NODE_INFO_LOG("append_info_line skipped invalid label index=%u text='%s'\n",
+                      static_cast<unsigned>(count),
+                      text);
+        return false;
+    }
+
+    set_label_text(label, text);
+    lv_obj_set_style_text_color(label, color, 0);
+    set_hidden(label, false);
     NODE_INFO_LOG("append_info_line index=%u text='%s'\n",
                   static_cast<unsigned>(count),
                   text);
@@ -1315,7 +1336,7 @@ bool build_seen_line(const chat::contacts::NodeInfo& node, char* out, size_t out
 
 void update_zoom_status_label(bool visible)
 {
-    if (!s_widgets.zoom_status_label)
+    if (!valid_obj(s_widgets.zoom_status_label))
     {
         return;
     }
@@ -1398,16 +1419,16 @@ void update_overlay_text()
     update_zoom_status_label(node_point.valid);
     NODE_INFO_LOG("update_overlay_text done line_count=%u title='%s' id='%s' lon='%s' lat='%s'\n",
                   static_cast<unsigned>(line_count),
-                  s_widgets.title_label ? lv_label_get_text(s_widgets.title_label) : "<null>",
-                  s_widgets.id_label ? lv_label_get_text(s_widgets.id_label) : "<null>",
-                  s_widgets.lon_label ? lv_label_get_text(s_widgets.lon_label) : "<null>",
-                  s_widgets.lat_label ? lv_label_get_text(s_widgets.lat_label) : "<null>");
+                  valid_obj(s_widgets.title_label) ? lv_label_get_text(s_widgets.title_label) : "<invalid>",
+                  valid_obj(s_widgets.id_label) ? lv_label_get_text(s_widgets.id_label) : "<invalid>",
+                  valid_obj(s_widgets.lon_label) ? lv_label_get_text(s_widgets.lon_label) : "<invalid>",
+                  valid_obj(s_widgets.lat_label) ? lv_label_get_text(s_widgets.lat_label) : "<invalid>");
 }
 
 void position_overlay_widgets()
 {
     const ViewMetrics metrics = view_metrics();
-    if (!s_widgets.map_stage)
+    if (!valid_obj(s_widgets.map_stage))
     {
         NODE_INFO_LOG("position_overlay_widgets skipped: map_stage missing\n");
         return;
@@ -1416,20 +1437,34 @@ void position_overlay_widgets()
     log_view_metrics("position_overlay_widgets", metrics);
 
     map_viewport::set_size(s_state.viewport, metrics.width, metrics.height);
+    if (valid_obj(s_widgets.node_overlay_layer))
+    {
+        lv_obj_set_size(s_widgets.node_overlay_layer, metrics.width, metrics.height);
+        lv_obj_set_pos(s_widgets.node_overlay_layer, 0, 0);
+    }
 
-    lv_obj_set_pos(s_widgets.id_label, metrics.pad, metrics.pad);
-    lv_obj_set_size(s_widgets.id_label, metrics.left_w, LV_SIZE_CONTENT);
+    if (valid_obj(s_widgets.id_label))
+    {
+        lv_obj_set_pos(s_widgets.id_label, metrics.pad, metrics.pad);
+        lv_obj_set_size(s_widgets.id_label, metrics.left_w, LV_SIZE_CONTENT);
+    }
 
     const lv_coord_t layer_x = (metrics.width - metrics.layer_w) / 2;
     const lv_coord_t layer_y = metrics.height - metrics.pad - metrics.layer_h;
     const lv_coord_t coord_label_w =
         clamp_coord(layer_x - metrics.pad - 10, 92, metrics.left_w);
 
-    lv_obj_set_pos(s_widgets.lon_label, metrics.pad, metrics.height - metrics.pad - 28);
-    lv_obj_set_size(s_widgets.lon_label, coord_label_w, LV_SIZE_CONTENT);
+    if (valid_obj(s_widgets.lon_label))
+    {
+        lv_obj_set_pos(s_widgets.lon_label, metrics.pad, metrics.height - metrics.pad - 28);
+        lv_obj_set_size(s_widgets.lon_label, coord_label_w, LV_SIZE_CONTENT);
+    }
 
-    lv_obj_set_pos(s_widgets.lat_label, metrics.pad, metrics.height - metrics.pad - 14);
-    lv_obj_set_size(s_widgets.lat_label, coord_label_w, LV_SIZE_CONTENT);
+    if (valid_obj(s_widgets.lat_label))
+    {
+        lv_obj_set_pos(s_widgets.lat_label, metrics.pad, metrics.height - metrics.pad - 14);
+        lv_obj_set_size(s_widgets.lat_label, coord_label_w, LV_SIZE_CONTENT);
+    }
 
     lv_obj_t* info_items[kNodeInfoInfoLineCount + 1]{};
     lv_coord_t info_item_widths[kNodeInfoInfoLineCount + 1]{};
@@ -1437,7 +1472,7 @@ void position_overlay_widgets()
     std::size_t visible_info_items = 0;
     auto collect_info_item = [&](lv_obj_t* item)
     {
-        if (!item || is_hidden(item))
+        if (!valid_obj(item) || is_hidden(item))
         {
             return;
         }
@@ -1464,7 +1499,7 @@ void position_overlay_widgets()
     }
     collect_info_item(s_widgets.zoom_status_label);
 
-    if (s_widgets.info_panel)
+    if (valid_obj(s_widgets.info_panel))
     {
         if (visible_info_items == 0)
         {
@@ -1514,35 +1549,56 @@ void position_overlay_widgets()
         }
     }
 
-    lv_obj_set_pos(s_widgets.no_position_label, metrics.pad, 0);
-    lv_obj_set_size(s_widgets.no_position_label, metrics.left_w, LV_SIZE_CONTENT);
-    lv_obj_update_layout(s_widgets.no_position_label);
-    const lv_coord_t no_pos_w = lv_obj_get_width(s_widgets.no_position_label);
-    const lv_coord_t no_pos_h = lv_obj_get_height(s_widgets.no_position_label);
-    lv_obj_set_pos(s_widgets.no_position_label,
-                   metrics.pad + ((metrics.left_w - no_pos_w) / 2),
-                   (metrics.height - no_pos_h) / 2);
+    if (valid_obj(s_widgets.no_position_label))
+    {
+        lv_obj_set_pos(s_widgets.no_position_label, metrics.pad, 0);
+        lv_obj_set_size(s_widgets.no_position_label, metrics.left_w, LV_SIZE_CONTENT);
+        lv_obj_update_layout(s_widgets.no_position_label);
+        const lv_coord_t no_pos_w = lv_obj_get_width(s_widgets.no_position_label);
+        const lv_coord_t no_pos_h = lv_obj_get_height(s_widgets.no_position_label);
+        lv_obj_set_pos(s_widgets.no_position_label,
+                       metrics.pad + ((metrics.left_w - no_pos_w) / 2),
+                       (metrics.height - no_pos_h) / 2);
+    }
 
     const lv_coord_t zoom_x = metrics.width - metrics.pad - metrics.zoom_size;
     const lv_coord_t zoom_out_y = metrics.height - metrics.pad - metrics.zoom_size;
     const lv_coord_t zoom_in_y = zoom_out_y - metrics.zoom_size - metrics.zoom_gap;
-    lv_obj_set_size(s_widgets.zoom_in_btn, metrics.zoom_size, metrics.zoom_size);
-    lv_obj_set_size(s_widgets.zoom_out_btn, metrics.zoom_size, metrics.zoom_size);
-    lv_obj_set_pos(s_widgets.zoom_in_btn, zoom_x, zoom_in_y);
-    lv_obj_set_pos(s_widgets.zoom_out_btn, zoom_x, zoom_out_y);
-    lv_obj_center(s_widgets.zoom_in_label);
-    lv_obj_center(s_widgets.zoom_out_label);
+    if (valid_obj(s_widgets.zoom_in_btn))
+    {
+        lv_obj_set_size(s_widgets.zoom_in_btn, metrics.zoom_size, metrics.zoom_size);
+        lv_obj_set_pos(s_widgets.zoom_in_btn, zoom_x, zoom_in_y);
+    }
+    if (valid_obj(s_widgets.zoom_out_btn))
+    {
+        lv_obj_set_size(s_widgets.zoom_out_btn, metrics.zoom_size, metrics.zoom_size);
+        lv_obj_set_pos(s_widgets.zoom_out_btn, zoom_x, zoom_out_y);
+    }
+    if (valid_obj(s_widgets.zoom_in_label))
+    {
+        lv_obj_center(s_widgets.zoom_in_label);
+    }
+    if (valid_obj(s_widgets.zoom_out_label))
+    {
+        lv_obj_center(s_widgets.zoom_out_label);
+    }
 
     apply_layer_button_style(s_widgets.layer_btn, s_widgets.layer_label, metrics.compact);
-    lv_obj_set_size(s_widgets.layer_btn, metrics.layer_w, metrics.layer_h);
-    lv_obj_set_pos(s_widgets.layer_btn, layer_x, layer_y);
-    lv_obj_center(s_widgets.layer_label);
+    if (valid_obj(s_widgets.layer_btn))
+    {
+        lv_obj_set_size(s_widgets.layer_btn, metrics.layer_w, metrics.layer_h);
+        lv_obj_set_pos(s_widgets.layer_btn, layer_x, layer_y);
+    }
+    if (valid_obj(s_widgets.layer_label))
+    {
+        lv_obj_center(s_widgets.layer_label);
+    }
     log_scene_widgets("position_overlay_widgets");
 }
 
 void position_circle_center(lv_obj_t* obj, lv_coord_t center_x, lv_coord_t center_y)
 {
-    if (!obj)
+    if (!valid_obj(obj))
     {
         return;
     }
@@ -1566,31 +1622,41 @@ void apply_current_map_view(const map_viewport::GeoPoint& node_point, const View
     render_connection_and_markers(node_point, metrics);
 }
 
+void hide_connection_and_markers()
+{
+    set_hidden(s_widgets.connection_line, true);
+    set_hidden(s_widgets.marker_node_ring, true);
+    set_hidden(s_widgets.marker_node_dot, true);
+    set_hidden(s_widgets.marker_self_ring, true);
+    set_hidden(s_widgets.marker_self_dot, true);
+    set_hidden(s_widgets.distance_label, true);
+}
+
 void render_connection_and_markers(const map_viewport::GeoPoint& node_point, const ViewMetrics& metrics)
 {
     if (!node_point.valid)
     {
         NODE_INFO_LOG("render_connection_and_markers: node invalid -> hide all markers\n");
-        set_hidden(s_widgets.connection_line, true);
-        set_hidden(s_widgets.marker_node_ring, true);
-        set_hidden(s_widgets.marker_node_dot, true);
-        set_hidden(s_widgets.marker_self_ring, true);
-        set_hidden(s_widgets.marker_self_dot, true);
-        set_hidden(s_widgets.distance_label, true);
+        hide_connection_and_markers();
+        return;
+    }
+
+    if (!valid_obj(s_widgets.map_stage) ||
+        !valid_obj(s_widgets.marker_node_ring) ||
+        !valid_obj(s_widgets.marker_node_dot) ||
+        !valid_obj(s_widgets.distance_label))
+    {
+        NODE_INFO_LOG("render_connection_and_markers skipped: marker widgets invalid\n");
+        hide_connection_and_markers();
         return;
     }
 
     lv_point_t node_screen{};
     if (!map_viewport::project_point(s_state.viewport, node_point, node_screen))
     {
-        NODE_INFO_LOG("render_connection_and_markers: node projection failed\n");
-        set_hidden(s_widgets.connection_line, true);
-        set_hidden(s_widgets.marker_node_ring, true);
-        set_hidden(s_widgets.marker_node_dot, true);
-        set_hidden(s_widgets.marker_self_ring, true);
-        set_hidden(s_widgets.marker_self_dot, true);
-        set_hidden(s_widgets.distance_label, true);
-        return;
+        node_screen.x = metrics.focus_x;
+        node_screen.y = metrics.focus_y;
+        NODE_INFO_LOG("render_connection_and_markers: node projection unavailable -> focus fallback\n");
     }
 
     position_circle_center(s_widgets.marker_node_ring, node_screen.x, node_screen.y);
@@ -1632,9 +1698,12 @@ void render_connection_and_markers(const map_viewport::GeoPoint& node_point, con
     s_state.link_points[0].y = static_cast<float>(node_screen.y);
     s_state.link_points[1].x = static_cast<float>(draw_x);
     s_state.link_points[1].y = static_cast<float>(draw_y);
-    lv_line_set_points(s_widgets.connection_line, s_state.link_points, 2);
-    lv_obj_set_pos(s_widgets.connection_line, 0, 0);
-    set_hidden(s_widgets.connection_line, false);
+    if (valid_obj(s_widgets.connection_line))
+    {
+        lv_line_set_points(s_widgets.connection_line, s_state.link_points, 2);
+        lv_obj_set_pos(s_widgets.connection_line, 0, 0);
+        set_hidden(s_widgets.connection_line, false);
+    }
 
     position_circle_center(s_widgets.marker_self_ring, draw_x, draw_y);
     position_circle_center(s_widgets.marker_self_dot, draw_x, draw_y);
@@ -1655,6 +1724,10 @@ void render_connection_and_markers(const map_viewport::GeoPoint& node_point, con
                   distance_buf,
                   dashboard::compass_rose(bearing));
     set_label_text(s_widgets.distance_label, distance_text);
+    if (!valid_obj(s_widgets.distance_label))
+    {
+        return;
+    }
     lv_obj_update_layout(s_widgets.distance_label);
 
     lv_coord_t label_x = static_cast<lv_coord_t>((node_screen.x + draw_x) / 2);
@@ -1675,7 +1748,7 @@ void render_connection_and_markers(const map_viewport::GeoPoint& node_point, con
                   static_cast<int>(node_screen.y),
                   static_cast<int>(draw_x),
                   static_cast<int>(draw_y),
-                  s_widgets.distance_label ? lv_label_get_text(s_widgets.distance_label) : "<null>",
+                  valid_obj(s_widgets.distance_label) ? lv_label_get_text(s_widgets.distance_label) : "<invalid>",
                   static_cast<int>(label_x),
                   static_cast<int>(label_y));
 }
@@ -1754,7 +1827,7 @@ void on_map_gesture(const map_viewport::GestureEvent& event, void* /*user_data*/
 
 void update_zoom_button_state(bool enabled)
 {
-    if (!s_widgets.zoom_in_btn || !s_widgets.zoom_out_btn)
+    if (!valid_obj(s_widgets.zoom_in_btn) || !valid_obj(s_widgets.zoom_out_btn))
     {
         NODE_INFO_LOG("update_zoom_button_state skipped: buttons missing\n");
         return;
@@ -1956,16 +2029,24 @@ NodeInfoWidgets create(lv_obj_t* parent)
     map_viewport::set_gesture_callback(s_state.viewport, on_map_gesture, nullptr);
     map_viewport::set_gesture_enabled(s_state.viewport, false);
 
-    s_widgets.connection_line = lv_line_create(s_widgets.map_overlay_layer);
+    // MapViewport owns and clears map_overlay_layer during apply/clear; NodeInfo markers live here.
+    s_widgets.node_overlay_layer = lv_obj_create(s_widgets.map_stage);
+    lv_obj_set_size(s_widgets.node_overlay_layer, LV_PCT(100), LV_PCT(100));
+    lv_obj_set_pos(s_widgets.node_overlay_layer, 0, 0);
+    make_plain(s_widgets.node_overlay_layer);
+    lv_obj_set_style_bg_opa(s_widgets.node_overlay_layer, LV_OPA_TRANSP, 0);
+    lv_obj_clear_flag(s_widgets.node_overlay_layer, LV_OBJ_FLAG_CLICKABLE);
+
+    s_widgets.connection_line = lv_line_create(s_widgets.node_overlay_layer);
     lv_obj_set_style_line_color(s_widgets.connection_line, kColorLink, 0);
     lv_obj_set_style_line_width(s_widgets.connection_line, 2, 0);
     lv_obj_set_style_line_rounded(s_widgets.connection_line, true, 0);
     set_hidden(s_widgets.connection_line, true);
 
-    s_widgets.marker_node_ring = lv_obj_create(s_widgets.map_overlay_layer);
-    s_widgets.marker_node_dot = lv_obj_create(s_widgets.map_overlay_layer);
-    s_widgets.marker_self_ring = lv_obj_create(s_widgets.map_overlay_layer);
-    s_widgets.marker_self_dot = lv_obj_create(s_widgets.map_overlay_layer);
+    s_widgets.marker_node_ring = lv_obj_create(s_widgets.node_overlay_layer);
+    s_widgets.marker_node_dot = lv_obj_create(s_widgets.node_overlay_layer);
+    s_widgets.marker_self_ring = lv_obj_create(s_widgets.node_overlay_layer);
+    s_widgets.marker_self_dot = lv_obj_create(s_widgets.node_overlay_layer);
     apply_marker_style(s_widgets.marker_node_ring, 22, kColorNodeMarker, false);
     apply_marker_style(s_widgets.marker_node_dot, 10, kColorNodeMarker, true);
     apply_marker_style(s_widgets.marker_self_ring, 18, kColorSelfMarker, false);
@@ -1989,10 +2070,10 @@ NodeInfoWidgets create(lv_obj_t* parent)
     set_hidden(s_widgets.no_position_label, true);
 
     s_widgets.distance_label =
-        create_label(s_widgets.map_overlay_layer, "", font_montserrat_12_safe(), kColorDistance);
+        create_label(s_widgets.node_overlay_layer, "", font_montserrat_12_safe(), kColorDistance);
     set_hidden(s_widgets.distance_label, true);
 
-    s_widgets.info_panel = lv_obj_create(s_widgets.map_overlay_layer);
+    s_widgets.info_panel = lv_obj_create(s_widgets.node_overlay_layer);
     apply_info_panel_style(s_widgets.info_panel);
     set_hidden(s_widgets.info_panel, true);
 
diff --git a/modules/ui_shared/src/ui/screens/settings/settings_page_components.cpp b/modules/ui_shared/src/ui/screens/settings/settings_page_components.cpp
index 64d96070..94627088 100644
--- a/modules/ui_shared/src/ui/screens/settings/settings_page_components.cpp
+++ b/modules/ui_shared/src/ui/screens/settings/settings_page_components.cpp
@@ -21,6 +21,7 @@
 #include "platform/ui/firmware_update_runtime.h"
 #include "platform/ui/gps_runtime.h"
 #include "platform/ui/screen_runtime.h"
+#include "platform/ui/settings_backup_runtime.h"
 #include "platform/ui/settings_store.h"
 #include "platform/ui/team_ui_store_runtime.h"
 #include "platform/ui/time_runtime.h"
@@ -32,6 +33,8 @@
 #include "ui/localization.h"
 #include "ui/menu/menu_layout.h"
 #include "ui/page/page_profile.h"
+#include "ui/presentation_sources/legacy_settings_action_sink.h"
+#include "ui/presentation_sources/legacy_settings_source.h"
 #include "ui/screens/settings/settings_page_components.h"
 #include "ui/screens/settings/settings_page_input.h"
 #include "ui/screens/settings/settings_page_layout.h"
@@ -41,6 +44,7 @@
 #include "ui/widgets/busy_overlay.h"
 #include "ui/widgets/system_notification.h"
 #include "ui/widgets/top_bar.h"
+#include "ui_presentation/settings/settings_model.h"
 
 #if defined(ESP_PLATFORM)
 #include "esp_log.h"
@@ -60,6 +64,7 @@ namespace device_runtime = ::platform::ui::device;
 namespace firmware_update_runtime = ::platform::ui::firmware_update;
 namespace gps_runtime = ::platform::ui::gps;
 namespace screen_runtime = ::platform::ui::screen;
+namespace settings_backup_runtime = ::platform::ui::settings_backup;
 namespace settings_store = ::platform::ui::settings_store;
 namespace tracker_runtime = ::platform::ui::tracker;
 namespace wifi_runtime = ::platform::ui::wifi;
@@ -68,6 +73,9 @@ constexpr size_t kMaxItems = 32;
 constexpr size_t kMaxOptions = 40;
 constexpr size_t kMaxWifiNetworks = 24;
 constexpr const char* kPrefsNs = "settings";
+constexpr int kChatContactAlertsNone = 0;
+constexpr int kChatContactAlertsContacts = 1;
+constexpr int kChatContactAlertsAll = 2;
 constexpr int kNetTxPowerMin = app::AppConfig::kTxPowerMinDbm;
 constexpr int kNetTxPowerMax = app::AppConfig::kTxPowerMaxDbm;
 constexpr int kGpsInitProbeMinMs = 250;
@@ -135,13 +143,31 @@ static firmware_update_runtime::Phase s_last_firmware_phase = firmware_update_ru
 static bool s_last_firmware_busy = false;
 static lv_obj_t* s_gps_diagnostics_label = nullptr;
 
+static ::ui::settings::SettingsModel& settings_model()
+{
+    static ::ui::settings::SettingsModel model(
+        ::ui::presentation_sources::legacy_settings_source(),
+        ::ui::presentation_sources::legacy_settings_action_sink());
+    return model;
+}
+
+static bool apply_settings_bool_patch(const char* key, bool value)
+{
+    ::ui::settings::SettingsPatchView patch;
+    ::ui::copyText(patch.key, key);
+    ::ui::copyText(patch.value, value ? "1" : "0");
+    return settings_model().apply(patch).ok;
+}
+
 static void update_item_value(settings::ui::ItemWidget& widget);
 static void open_factory_reset_modal();
+static void open_settings_restore_modal();
 static void open_gps_diagnostics_modal();
 static void open_enabled_imes_modal(settings::ui::ItemWidget& widget);
 static bool option_labels_are_translated(const settings::ui::SettingItem& item);
 static bool option_labels_use_content_font(const settings::ui::SettingItem& item);
 static void apply_locale_preview_font(lv_obj_t* label, const settings::ui::SettingItem& item, int value);
+static void refresh_language_pack_options();
 
 static void copy_bounded(char* out, size_t out_len, const char* text)
 {
@@ -290,6 +316,17 @@ static void refresh_firmware_update_state_from_runtime()
     firmware_status_summary(status, g_settings.fw_update_status, sizeof(g_settings.fw_update_status));
 }
 
+static void refresh_settings_backup_state_from_runtime()
+{
+    const settings_backup_runtime::Status status = settings_backup_runtime::status();
+    const char* message = status.message[0] != '\0'
+                              ? status.message
+                              : (status.supported ? "No backup found" : "Backup unsupported");
+    copy_bounded(g_settings.settings_backup_status,
+                 sizeof(g_settings.settings_backup_status),
+                 ::ui::i18n::tr(message));
+}
+
 static void refresh_visible_item_values()
 {
     for (size_t index = 0; index < g_state.item_count; ++index)
@@ -522,7 +559,9 @@ static bool is_settings_store_owned_enum_setting(const char* key)
         return false;
     }
     return strcmp(key, "screen_brightness") == 0 ||
-           strcmp(key, "speaker_volume") == 0;
+           strcmp(key, "speaker_volume") == 0 ||
+           strcmp(key, "chat_message_alerts") == 0 ||
+           strcmp(key, "chat_contact_alerts") == 0;
 }
 
 static bool is_settings_store_owned_toggle_setting(const char* key)
@@ -652,21 +691,26 @@ static bool parse_hex_char(char c, uint8_t& out)
     return false;
 }
 
-static bool parse_psk(const char* text, uint8_t* out, size_t out_len)
+static bool parse_psk(const char* text, uint8_t* out, size_t out_len, size_t* parsed_len = nullptr)
 {
     if (!out || out_len == 0)
     {
         return false;
     }
+    if (parsed_len)
+    {
+        *parsed_len = 0;
+    }
     if (!text || text[0] == '\0')
     {
         memset(out, 0, out_len);
         return true;
     }
     size_t len = strlen(text);
-    if (len == 32)
+    if ((len == 32 || len == 64) && out_len >= len / 2)
     {
-        for (size_t i = 0; i < 16; ++i)
+        const size_t byte_len = len / 2;
+        for (size_t i = 0; i < byte_len; ++i)
         {
             uint8_t hi = 0;
             uint8_t lo = 0;
@@ -676,11 +720,19 @@ static bool parse_psk(const char* text, uint8_t* out, size_t out_len)
             }
             out[i] = static_cast<uint8_t>((hi << 4) | lo);
         }
+        if (parsed_len)
+        {
+            *parsed_len = byte_len;
+        }
         return true;
     }
-    if (len == 16)
+    if ((len == 16 || len == 32) && out_len >= len)
     {
-        memcpy(out, text, 16);
+        memcpy(out, text, len);
+        if (parsed_len)
+        {
+            *parsed_len = len;
+        }
         return true;
     }
     return false;
@@ -900,26 +952,7 @@ static void settings_load()
         }
     }
 
-    kLocaleOptionCount = 0;
-    const size_t locale_limit = sizeof(kLocaleOptions) / sizeof(kLocaleOptions[0]);
-    for (size_t index = 0; index < ::ui::i18n::locale_count() && kLocaleOptionCount < locale_limit; ++index)
-    {
-        const ::ui::i18n::LocaleInfo* locale = ::ui::i18n::locale_at(index);
-        if (!locale)
-        {
-            continue;
-        }
-
-        const char* display_name =
-            (locale->native_name && locale->native_name[0] != '\0') ? locale->native_name : locale->display_name;
-        std::snprintf(kLocaleOptionLabels[kLocaleOptionCount],
-                      sizeof(kLocaleOptionLabels[kLocaleOptionCount]),
-                      "%s",
-                      display_name ? display_name : "");
-        kLocaleOptions[kLocaleOptionCount].label = kLocaleOptionLabels[kLocaleOptionCount];
-        kLocaleOptions[kLocaleOptionCount].value = static_cast<int>(index);
-        ++kLocaleOptionCount;
-    }
+    refresh_language_pack_options();
 
     app_ctx.getEffectiveUserInfo(g_settings.user_name,
                                  sizeof(g_settings.user_name),
@@ -964,23 +997,35 @@ static void settings_load()
 
     g_settings.chat_region = mt_cfg.region;
     g_settings.chat_channel = cfg.chat_channel;
+    g_settings.chat_message_alerts = prefs_get_int("chat_message_alerts", 1) ? 1 : 0;
+    g_settings.chat_contact_alerts = prefs_get_int("chat_contact_alerts", kChatContactAlertsContacts);
+    if (g_settings.chat_contact_alerts < kChatContactAlertsNone ||
+        g_settings.chat_contact_alerts > kChatContactAlertsAll)
+    {
+        g_settings.chat_contact_alerts = kChatContactAlertsContacts;
+    }
     const uint8_t* active_psk = nullptr;
+    size_t active_psk_len = 0;
     if (cfg.mesh_protocol == chat::MeshProtocol::MeshCore)
     {
         active_psk = mc_cfg.secondary_key;
+        active_psk_len = chat::kMeshCoreChannelKeyLen;
     }
     else if (cfg.mesh_protocol == chat::MeshProtocol::Meshtastic)
     {
         active_psk = mt_cfg.secondary_key;
+        active_psk_len = chat::normalizeMeshtasticChannelKeyLen(mt_cfg.secondary_key,
+                                                                sizeof(mt_cfg.secondary_key),
+                                                                mt_cfg.secondary_key_len);
     }
-    if (!active_psk || is_zero_key(active_psk, sizeof(mt_cfg.secondary_key)))
+    if (!active_psk || active_psk_len == 0 || is_zero_key(active_psk, active_psk_len))
     {
         g_settings.chat_psk[0] = '\0';
     }
     else
     {
         bytes_to_hex(active_psk,
-                     sizeof(mt_cfg.secondary_key),
+                     active_psk_len,
                      g_settings.chat_psk,
                      sizeof(g_settings.chat_psk));
     }
@@ -1044,13 +1089,13 @@ static void settings_load()
     g_settings.mc_channel_slot = mc_cfg.meshcore_channel_slot;
     strncpy(g_settings.mc_channel_name, mc_cfg.meshcore_channel_name, sizeof(g_settings.mc_channel_name) - 1);
     g_settings.mc_channel_name[sizeof(g_settings.mc_channel_name) - 1] = '\0';
-    if (is_zero_key(mc_cfg.secondary_key, sizeof(mc_cfg.secondary_key)))
+    if (is_zero_key(mc_cfg.secondary_key, chat::kMeshCoreChannelKeyLen))
     {
         g_settings.mc_channel_key[0] = '\0';
     }
     else
     {
-        bytes_to_hex(mc_cfg.secondary_key, sizeof(mc_cfg.secondary_key),
+        bytes_to_hex(mc_cfg.secondary_key, chat::kMeshCoreChannelKeyLen,
                      g_settings.mc_channel_key, sizeof(g_settings.mc_channel_key));
     }
 
@@ -1077,6 +1122,7 @@ static void settings_load()
     g_settings.vibration_enabled = prefs_get_bool("vibration_enabled", true);
     refresh_wifi_state_from_runtime();
     refresh_firmware_update_state_from_runtime();
+    refresh_settings_backup_state_from_runtime();
 
     g_settings.advanced_debug_logs = prefs_get_bool("adv_debug", false);
 
@@ -1104,6 +1150,31 @@ static void settings_load()
 #endif
 }
 
+static void refresh_language_pack_options()
+{
+    kLocaleOptionCount = 0;
+    const size_t locale_limit = sizeof(kLocaleOptions) / sizeof(kLocaleOptions[0]);
+    for (size_t index = 0; index < ::ui::i18n::locale_count() && kLocaleOptionCount < locale_limit; ++index)
+    {
+        const ::ui::i18n::LocaleInfo* locale = ::ui::i18n::locale_at(index);
+        if (!locale)
+        {
+            continue;
+        }
+
+        const char* display_name =
+            (locale->native_name && locale->native_name[0] != '\0') ? locale->native_name : locale->display_name;
+        std::snprintf(kLocaleOptionLabels[kLocaleOptionCount],
+                      sizeof(kLocaleOptionLabels[kLocaleOptionCount]),
+                      "%s",
+                      display_name ? display_name : "");
+        kLocaleOptions[kLocaleOptionCount].label = kLocaleOptionLabels[kLocaleOptionCount];
+        kLocaleOptions[kLocaleOptionCount].value = static_cast<int>(index);
+        ++kLocaleOptionCount;
+    }
+    g_settings.display_locale_index = ::ui::i18n::current_locale_index();
+}
+
 static void format_value(const settings::ui::SettingItem& item, char* out, size_t out_len)
 {
     if (!out || out_len == 0)
@@ -1309,20 +1380,33 @@ static void on_text_save_clicked(lv_event_t* e)
         if (g_state.editing_item->pref_key && strcmp(g_state.editing_item->pref_key, "chat_psk") == 0)
         {
             app::IAppFacade& app_ctx = app::appFacade();
-            uint8_t key[16] = {};
-            if (!parse_psk(g_state.editing_item->text_value, key, sizeof(key)))
+            uint8_t key[chat::kMeshtasticChannelKeyMaxLen] = {};
+            size_t parsed_key_len = 0;
+            const size_t key_capacity =
+                (app_ctx.getConfig().mesh_protocol == chat::MeshProtocol::MeshCore)
+                    ? chat::kMeshCoreChannelKeyLen
+                    : chat::kMeshtasticChannelKeyMaxLen;
+            if (!parse_psk(g_state.editing_item->text_value, key, key_capacity, &parsed_key_len))
             {
-                ::ui::SystemNotification::show(::ui::i18n::tr("PSK must be 32 hex or 16 chars"), 4000);
+                ::ui::SystemNotification::show(::ui::i18n::tr("PSK must be 32/64 hex or 16/32 chars"), 4000);
                 modal_close();
                 return;
             }
             if (app_ctx.getConfig().mesh_protocol == chat::MeshProtocol::MeshCore)
             {
-                memcpy(app_ctx.getConfig().meshcore_config.secondary_key, key, sizeof(key));
+                memset(app_ctx.getConfig().meshcore_config.secondary_key, 0,
+                       sizeof(app_ctx.getConfig().meshcore_config.secondary_key));
+                memcpy(app_ctx.getConfig().meshcore_config.secondary_key, key, chat::kMeshCoreChannelKeyLen);
             }
             else
             {
-                memcpy(app_ctx.getConfig().meshtastic_config.secondary_key, key, sizeof(key));
+                auto& mesh = app_ctx.getConfig().meshtastic_config;
+                memset(mesh.secondary_key, 0, sizeof(mesh.secondary_key));
+                memcpy(mesh.secondary_key, key, parsed_key_len);
+                mesh.secondary_key_len =
+                    chat::normalizeMeshtasticChannelKeyLen(mesh.secondary_key,
+                                                           sizeof(mesh.secondary_key),
+                                                           static_cast<uint8_t>(parsed_key_len));
             }
             app_ctx.saveConfig();
             app_ctx.applyMeshConfig();
@@ -1929,10 +2013,12 @@ static void on_option_clicked(lv_event_t* e)
                 mc_cfg.meshcore_bw_khz = preset->bw_khz;
                 mc_cfg.meshcore_sf = preset->sf;
                 mc_cfg.meshcore_cr = preset->cr;
+                mc_cfg.tx_power = preset->tx_power_dbm;
                 float_to_text(mc_cfg.meshcore_freq_mhz, g_settings.mc_freq, sizeof(g_settings.mc_freq), 3);
                 float_to_text(mc_cfg.meshcore_bw_khz, g_settings.mc_bw, sizeof(g_settings.mc_bw), 3);
                 g_settings.mc_sf = mc_cfg.meshcore_sf;
                 g_settings.mc_cr = mc_cfg.meshcore_cr;
+                g_settings.mc_tx_power = mc_cfg.tx_power;
             }
         }
         app_ctx.saveConfig();
@@ -1961,6 +2047,8 @@ static void on_option_clicked(lv_event_t* e)
     {
         app::IAppFacade& app_ctx = app::appFacade();
         app_ctx.getConfig().meshcore_config.tx_power = static_cast<int8_t>(payload->value);
+        app_ctx.getConfig().meshcore_config.meshcore_region_preset = 0;
+        g_settings.mc_region_preset = 0;
         app_ctx.saveConfig();
         app_ctx.applyMeshConfig();
     }
@@ -2048,6 +2136,87 @@ static void on_factory_reset_cancel_clicked(lv_event_t* e)
     modal_close();
 }
 
+static void on_settings_restore_confirm_clicked(lv_event_t* e)
+{
+    (void)e;
+    modal_close();
+    if (!settings_backup_runtime::restore())
+    {
+        refresh_settings_backup_state_from_runtime();
+        ::ui::SystemNotification::show(::ui::i18n::tr("Restore failed"), 3500);
+        refresh_visible_item_values();
+        return;
+    }
+    ::ui::SystemNotification::show(::ui::i18n::tr("Settings restored. Restarting..."), 1500);
+    platform_delay_ms(300);
+    platform_restart();
+}
+
+static void on_settings_restore_cancel_clicked(lv_event_t* e)
+{
+    (void)e;
+    modal_close();
+}
+
+static void open_settings_restore_modal()
+{
+    if (g_state.modal_root)
+    {
+        return;
+    }
+
+    modal_prepare_group();
+    g_state.modal_root = create_modal_root(300, 180);
+    lv_obj_t* win = lv_obj_get_child(g_state.modal_root, 0);
+
+    lv_obj_t* title = lv_label_create(win);
+    ::ui::i18n::set_label_text(title, "Restore Settings");
+    style::apply_label_primary(title);
+    lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 0);
+
+    lv_obj_t* body = lv_label_create(win);
+    lv_obj_set_width(body, LV_PCT(100));
+    ::ui::i18n::set_label_text(body, "Overwrite current settings and restart?");
+    style::apply_label_muted(body);
+    lv_obj_set_style_text_align(body, LV_TEXT_ALIGN_CENTER, 0);
+    lv_obj_align(body, LV_ALIGN_CENTER, 0, -8);
+
+    lv_obj_t* btn_row = lv_obj_create(win);
+    lv_obj_set_size(btn_row, LV_PCT(100), LV_SIZE_CONTENT);
+    lv_obj_align(btn_row, LV_ALIGN_BOTTOM_MID, 0, 0);
+    lv_obj_set_flex_flow(btn_row, LV_FLEX_FLOW_ROW);
+    lv_obj_set_flex_align(btn_row,
+                          LV_FLEX_ALIGN_SPACE_EVENLY,
+                          LV_FLEX_ALIGN_CENTER,
+                          LV_FLEX_ALIGN_CENTER);
+    lv_obj_set_style_pad_all(btn_row, 0, LV_PART_MAIN);
+    lv_obj_set_style_bg_opa(btn_row, LV_OPA_TRANSP, LV_PART_MAIN);
+    lv_obj_set_style_border_width(btn_row, 0, LV_PART_MAIN);
+    lv_obj_clear_flag(btn_row, LV_OBJ_FLAG_SCROLLABLE);
+
+    lv_obj_t* cancel_btn = lv_btn_create(btn_row);
+    lv_obj_set_size(cancel_btn,
+                    ::ui::page_profile::resolve_control_button_min_width(),
+                    ::ui::page_profile::resolve_control_button_height());
+    lv_obj_t* cancel_label = lv_label_create(cancel_btn);
+    ::ui::i18n::set_label_text(cancel_label, "Cancel");
+    lv_obj_center(cancel_label);
+    lv_obj_add_event_cb(cancel_btn, on_settings_restore_cancel_clicked, LV_EVENT_CLICKED, nullptr);
+
+    lv_obj_t* confirm_btn = lv_btn_create(btn_row);
+    lv_obj_set_size(confirm_btn,
+                    ::ui::page_profile::resolve_control_button_min_width(),
+                    ::ui::page_profile::resolve_control_button_height());
+    lv_obj_t* confirm_label = lv_label_create(confirm_btn);
+    ::ui::i18n::set_label_text(confirm_label, "Restore");
+    lv_obj_center(confirm_label);
+    lv_obj_add_event_cb(confirm_btn, on_settings_restore_confirm_clicked, LV_EVENT_CLICKED, nullptr);
+
+    lv_group_add_obj(g_state.modal_group, cancel_btn);
+    lv_group_add_obj(g_state.modal_group, confirm_btn);
+    lv_group_focus_obj(cancel_btn);
+}
+
 static void open_factory_reset_modal()
 {
     if (g_state.modal_root)
@@ -2303,6 +2472,9 @@ static void open_enabled_imes_modal(settings::ui::ItemWidget& widget)
         return;
     }
 
+    refresh_language_pack_options();
+    update_item_value(widget);
+
     const std::size_t ime_total = ::ui::i18n::ime_count();
     if (ime_total == 0)
     {
@@ -2419,6 +2591,11 @@ static void open_option_modal(const settings::ui::SettingItem& item, settings::u
     {
         return;
     }
+    if (item.pref_key && std::strcmp(item.pref_key, "display_locale") == 0)
+    {
+        refresh_language_pack_options();
+        update_item_value(widget);
+    }
     modal_prepare_group();
 
     // Overlay only below top bar; list starts 3px under top bar, no title
@@ -2625,6 +2802,11 @@ static const settings::ui::SettingOption kBoolOptions[] = {
     {"OFF", 0},
     {"ON", 1},
 };
+static const settings::ui::SettingOption kChatContactAlertOptions[] = {
+    {"OFF", kChatContactAlertsNone},
+    {"Contacts Only", kChatContactAlertsContacts},
+    {"All", kChatContactAlertsAll},
+};
 static const settings::ui::SettingOption kNetManualBwOptions[] = {
     {"125 kHz", 125},
     {"250 kHz", 250},
@@ -2816,6 +2998,8 @@ static settings::ui::SettingItem kChatItems[] = {
     {"Channel", settings::ui::SettingType::Enum, kChatChannelOptions, 2, &g_settings.chat_channel, nullptr, nullptr, 0, false, "chat_channel"},
     {"Channel Key / PSK", settings::ui::SettingType::Text, nullptr, 0, nullptr, nullptr, g_settings.chat_psk, sizeof(g_settings.chat_psk), true, "chat_psk"},
     {"Encryption Mode", settings::ui::SettingType::Enum, kPrivacyEncryptOptions, 3, &g_settings.privacy_encrypt_mode, nullptr, nullptr, 0, false, "privacy_encrypt"},
+    {"Message Alerts", settings::ui::SettingType::Enum, kBoolOptions, sizeof(kBoolOptions) / sizeof(kBoolOptions[0]), &g_settings.chat_message_alerts, nullptr, nullptr, 0, false, "chat_message_alerts"},
+    {"Contact Alerts", settings::ui::SettingType::Enum, kChatContactAlertOptions, sizeof(kChatContactAlertOptions) / sizeof(kChatContactAlertOptions[0]), &g_settings.chat_contact_alerts, nullptr, nullptr, 0, false, "chat_contact_alerts"},
     {"Reset Mesh Profiles", settings::ui::SettingType::Action, nullptr, 0, nullptr, nullptr, nullptr, 0, false, "chat_reset_mesh"},
     {"Reset Node DB", settings::ui::SettingType::Action, nullptr, 0, nullptr, nullptr, nullptr, 0, false, "chat_reset_nodes"},
     {"Clear Message DB", settings::ui::SettingType::Action, nullptr, 0, nullptr, nullptr, nullptr, 0, false, "chat_clear_messages"},
@@ -2890,6 +3074,9 @@ static settings::ui::SettingItem kAdvancedItems[] = {
     {"OTA Status", settings::ui::SettingType::Info, nullptr, 0, nullptr, nullptr, g_settings.fw_update_status, sizeof(g_settings.fw_update_status), false, "fw_status"},
     {"Check for Updates", settings::ui::SettingType::Action, nullptr, 0, nullptr, nullptr, nullptr, 0, false, "fw_check"},
     {"Install Update", settings::ui::SettingType::Action, nullptr, 0, nullptr, nullptr, nullptr, 0, false, "fw_install"},
+    {"Backup Status", settings::ui::SettingType::Info, nullptr, 0, nullptr, nullptr, g_settings.settings_backup_status, sizeof(g_settings.settings_backup_status), false, "settings_backup_status"},
+    {"Backup Settings", settings::ui::SettingType::Action, nullptr, 0, nullptr, nullptr, nullptr, 0, false, "settings_backup"},
+    {"Restore Settings", settings::ui::SettingType::Action, nullptr, 0, nullptr, nullptr, nullptr, 0, false, "settings_restore"},
     {"Debug Logs", settings::ui::SettingType::Toggle, nullptr, 0, nullptr, &g_settings.advanced_debug_logs, nullptr, 0, false, "adv_debug"},
 };
 
@@ -3046,6 +3233,13 @@ static bool should_show_item(const settings::ui::SettingItem& item)
     {
         return false;
     }
+    if ((has_pref_key(item, "settings_backup_status") ||
+         has_pref_key(item, "settings_backup") ||
+         has_pref_key(item, "settings_restore")) &&
+        !settings_backup_runtime::is_supported())
+    {
+        return false;
+    }
 
     const bool meshcore = is_meshcore_protocol_selected();
     const bool rnode = is_rnode_protocol_selected();
@@ -3307,10 +3501,10 @@ static bool activate_item_widget(settings::ui::ItemWidget& widget)
             }
             if (item.pref_key && strcmp(item.pref_key, "gps_enabled") == 0)
             {
-                app::IAppFacade& app_ctx = app::appFacade();
-                app_ctx.getConfig().gps_enabled = *item.bool_value;
-                app_ctx.saveConfig();
-                gps_runtime::set_enabled(*item.bool_value);
+                if (!apply_settings_bool_patch("gps_enabled", *item.bool_value))
+                {
+                    ::ui::SystemNotification::show(::ui::i18n::tr("Unable to apply GPS setting"), 3000);
+                }
             }
             if (item.pref_key && strcmp(item.pref_key, "net_duty_cycle") == 0)
             {
@@ -3394,6 +3588,11 @@ static bool activate_item_widget(settings::ui::ItemWidget& widget)
     }
     if (item.type == settings::ui::SettingType::Enum)
     {
+        if (item.pref_key && strcmp(item.pref_key, "display_locale") == 0)
+        {
+            refresh_language_pack_options();
+            update_item_value(widget);
+        }
         open_option_modal(item, widget);
         return true;
     }
@@ -3406,6 +3605,8 @@ static bool activate_item_widget(settings::ui::ItemWidget& widget)
     {
         if (item.pref_key && strcmp(item.pref_key, "enabled_imes") == 0)
         {
+            refresh_language_pack_options();
+            update_item_value(widget);
             open_enabled_imes_modal(widget);
         }
         else if (item.pref_key && strcmp(item.pref_key, "gps_diagnostics") == 0)
@@ -3526,6 +3727,43 @@ static bool activate_item_widget(settings::ui::ItemWidget& widget)
                 sync_firmware_update_ui(false);
             }
         }
+        else if (item.pref_key && strcmp(item.pref_key, "settings_backup") == 0)
+        {
+            const settings_backup_runtime::Status before = settings_backup_runtime::status();
+            if (!before.sd_present)
+            {
+                ::ui::SystemNotification::show(::ui::i18n::tr("Insert SD card to backup settings"), 3000);
+            }
+            else if (!settings_backup_runtime::backup())
+            {
+                refresh_settings_backup_state_from_runtime();
+                ::ui::SystemNotification::show(::ui::i18n::tr("Backup failed"), 3000);
+            }
+            else
+            {
+                refresh_settings_backup_state_from_runtime();
+                ::ui::SystemNotification::show(::ui::i18n::tr("Settings backup saved to SD"), 2500);
+            }
+            refresh_visible_item_values();
+        }
+        else if (item.pref_key && strcmp(item.pref_key, "settings_restore") == 0)
+        {
+            const settings_backup_runtime::Status status = settings_backup_runtime::status();
+            if (!status.sd_present)
+            {
+                ::ui::SystemNotification::show(::ui::i18n::tr("Insert SD card to restore settings"), 3000);
+            }
+            else if (!status.has_backup)
+            {
+                ::ui::SystemNotification::show(::ui::i18n::tr("No settings backup found"), 3000);
+            }
+            else
+            {
+                open_settings_restore_modal();
+            }
+            refresh_settings_backup_state_from_runtime();
+            refresh_visible_item_values();
+        }
         return true;
     }
 
diff --git a/modules/ui_shared/src/ui/startup_shell.cpp b/modules/ui_shared/src/ui/startup_shell.cpp
index 9d0d0de0..03158289 100644
--- a/modules/ui_shared/src/ui/startup_shell.cpp
+++ b/modules/ui_shared/src/ui/startup_shell.cpp
@@ -14,12 +14,15 @@
 #include "ui/ui_status.h"
 #include "ui/watch_face.h"
 #include "ui/widgets/system_notification.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
 
 namespace ui::startup_shell
 {
 namespace
 {
 
+ui::menu::MenuModel s_ux_menu_model;
+
 bool resolve_display_time(struct tm* out_tm)
 {
     if (!out_tm)
@@ -152,6 +155,11 @@ void initializeShell(const Hooks& hooks)
     ui::menu_layout::InitOptions menu_options{};
     menu_options.messaging = hooks.messaging;
     menu_options.apps = hooks.apps;
+    if (hooks.ux_pack_id != nullptr &&
+        ui_lvgl_ux::buildMenuForUxPack(hooks.ux_pack_id, s_ux_menu_model))
+    {
+        menu_options.ux_menu = &s_ux_menu_model;
+    }
     ui::menu_layout::init(menu_options);
 
     ui::menu_runtime::init(
diff --git a/modules/ui_shared/src/ui/startup_ui_shell.cpp b/modules/ui_shared/src/ui/startup_ui_shell.cpp
index 254eefa2..e45291da 100644
--- a/modules/ui_shared/src/ui/startup_ui_shell.cpp
+++ b/modules/ui_shared/src/ui/startup_ui_shell.cpp
@@ -10,6 +10,7 @@
 #include "ui/menu/menu_runtime.h"
 #include "ui/ui_boot.h"
 #include "ui/widgets/system_notification.h"
+#include "ui_lvgl_ux_packs/ux/ux_menu_provider.h"
 
 namespace ui::startup_ui_shell
 {
@@ -17,6 +18,7 @@ namespace
 {
 
 bool s_shell_initialized = false;
+ui::menu::MenuModel s_ux_menu_model;
 
 void present_boot_overlay_now()
 {
@@ -131,6 +133,11 @@ bool initializeMenuSkeleton(const Hooks& hooks)
 
     ui::menu_layout::InitOptions options{};
     options.apps = hooks.apps;
+    if (hooks.ux_pack_id != nullptr &&
+        ui_lvgl_ux::buildMenuForUxPack(hooks.ux_pack_id, s_ux_menu_model))
+    {
+        options.ux_menu = &s_ux_menu_model;
+    }
     ui::menu_layout::init(options);
     ui::menu_runtime::init(
         lv_screen_active(), main_screen, ui::menu_layout::menuPanel(), build_menu_runtime_hooks());
diff --git a/modules/ui_shared/src/ui/team_actions/legacy_team_action_bridge.cpp b/modules/ui_shared/src/ui/team_actions/legacy_team_action_bridge.cpp
new file mode 100644
index 00000000..2b18821d
--- /dev/null
+++ b/modules/ui_shared/src/ui/team_actions/legacy_team_action_bridge.cpp
@@ -0,0 +1,342 @@
+#include "ui/team_actions/legacy_team_action_bridge.h"
+
+#include "sys/clock.h"
+#include "team/protocol/team_chat.h"
+#include "team/protocol/team_location_marker.h"
+
+#include <cmath>
+#include <string>
+#include <vector>
+
+namespace ui::team_actions
+{
+namespace
+{
+
+constexpr uint32_t kMinValidEpochSeconds = 1577836800U; // 2020-01-01
+constexpr uint32_t kTeamComposeMsgIdStart = 1U;
+
+uint32_t currentTimestamp()
+{
+    uint32_t ts = sys::epoch_seconds_now();
+    if (ts < kMinValidEpochSeconds)
+    {
+        ts = static_cast<uint32_t>(sys::millis_now() / 1000U);
+    }
+    return ts;
+}
+
+bool validCoordinate(double lat, double lon)
+{
+    return std::isfinite(lat) && std::isfinite(lon) &&
+           lat >= -90.0 && lat <= 90.0 &&
+           lon >= -180.0 && lon <= 180.0;
+}
+
+int32_t coordinateToE7(double coordinate)
+{
+    return static_cast<int32_t>(std::lround(coordinate * 1e7));
+}
+
+int16_t clampAltitude(double altitude_m)
+{
+    if (altitude_m > 32767.0)
+    {
+        return 32767;
+    }
+    if (altitude_m < -32768.0)
+    {
+        return -32768;
+    }
+    return static_cast<int16_t>(std::lround(altitude_m));
+}
+
+uint16_t clampAccuracy(float accuracy_m)
+{
+    if (!std::isfinite(accuracy_m) || accuracy_m <= 0.0f)
+    {
+        return 0;
+    }
+    if (accuracy_m > 65535.0f)
+    {
+        return 65535;
+    }
+    return static_cast<uint16_t>(std::lround(accuracy_m));
+}
+
+team::proto::TeamCommandType toProtoCommand(TeamCommandKind kind)
+{
+    switch (kind)
+    {
+    case TeamCommandKind::RallyPoint:
+        return team::proto::TeamCommandType::RallyTo;
+    case TeamCommandKind::MoveTo:
+        return team::proto::TeamCommandType::MoveTo;
+    case TeamCommandKind::Hold:
+        return team::proto::TeamCommandType::Hold;
+    case TeamCommandKind::Custom:
+    case TeamCommandKind::Unknown:
+        break;
+    }
+    return team::proto::TeamCommandType::RallyTo;
+}
+
+} // namespace
+
+LegacyTeamActionBridge::LegacyTeamActionBridge(
+    ::team::ui::ITeamUiStore& team_store,
+    ::ui::presentation_sources::ITeamChatCommandPort* command_port,
+    ITeamLocationSource* location_source,
+    uint8_t team_channel_raw)
+    : team_store_(team_store),
+      command_port_(command_port),
+      location_source_(location_source),
+      team_channel_raw_(team_channel_raw)
+{
+}
+
+ui::UiActionResult LegacyTeamActionBridge::sendTeamAction(
+    const TeamActionRequest& request)
+{
+    switch (request.kind)
+    {
+    case TeamActionKind::Text:
+        return sendText(request);
+    case TeamActionKind::LocationMarker:
+        return sendLocationMarker(request);
+    case TeamActionKind::Command:
+        return sendCommand(request);
+    }
+    return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+}
+
+ui::UiActionResult LegacyTeamActionBridge::sendText(
+    const TeamActionRequest& request)
+{
+    if (request.text == nullptr || request.text[0] == '\0')
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+
+    ::team::ui::TeamUiSnapshot snap;
+    if (!team_store_.load(snap) || !snap.has_team_id || !snap.has_team_psk ||
+        command_port_ == nullptr)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+    if (!command_port_->setKeysFromPsk(snap.team_id,
+                                       snap.security_round,
+                                       snap.team_psk.data(),
+                                       snap.team_psk.size()))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+
+    const uint32_t ts = currentTimestamp();
+    const std::string text(request.text);
+
+    team::proto::TeamChatMessage message;
+    message.header.type = team::proto::TeamChatType::Text;
+    message.header.ts = ts;
+    message.header.msg_id = next_message_id_++;
+    if (next_message_id_ == 0)
+    {
+        next_message_id_ = kTeamComposeMsgIdStart;
+    }
+    message.payload.assign(text.begin(), text.end());
+
+    if (!command_port_->sendTeamChat(message, team_channel_raw_))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    }
+
+    (void)::team::ui::team_ui_chatlog_append_structured(
+        snap.team_id,
+        0,
+        false,
+        ts,
+        team::proto::TeamChatType::Text,
+        message.payload);
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult LegacyTeamActionBridge::sendLocationMarker(
+    const TeamActionRequest& request)
+{
+    TeamLocationMarkerRequest location = request.location;
+    if (!team::proto::team_location_marker_icon_is_valid(location.marker_icon))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+
+    if (location.use_current_location)
+    {
+        if (location_source_ == nullptr)
+        {
+            return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+        }
+
+        TeamLocationSnapshot snapshot;
+        if (!location_source_->currentTeamLocation(snapshot) || !snapshot.valid)
+        {
+            return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+        }
+
+        location.lat = snapshot.lat;
+        location.lon = snapshot.lon;
+        location.has_altitude = snapshot.has_altitude;
+        location.altitude_m = snapshot.altitude_m;
+        if (location.accuracy_m <= 0.0f)
+        {
+            location.accuracy_m = snapshot.accuracy_m;
+        }
+        if (location.timestamp == 0)
+        {
+            location.timestamp = snapshot.timestamp;
+        }
+    }
+
+    if (!validCoordinate(location.lat, location.lon))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+
+    ::team::ui::TeamUiSnapshot snap;
+    if (!team_store_.load(snap) || !snap.has_team_id || !snap.has_team_psk ||
+        command_port_ == nullptr)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+    if (!command_port_->setKeysFromPsk(snap.team_id,
+                                       snap.security_round,
+                                       snap.team_psk.data(),
+                                       snap.team_psk.size()))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+
+    uint32_t ts = location.timestamp;
+    if (ts == 0)
+    {
+        ts = currentTimestamp();
+    }
+
+    team::proto::TeamChatLocation loc;
+    loc.lat_e7 = coordinateToE7(location.lat);
+    loc.lon_e7 = coordinateToE7(location.lon);
+    loc.alt_m = location.has_altitude ? clampAltitude(location.altitude_m) : 0;
+    loc.acc_m = clampAccuracy(location.accuracy_m);
+    loc.ts = ts;
+    loc.source = location.marker_icon;
+    loc.label = location.label != nullptr
+                    ? std::string(location.label)
+                    : std::string(team::proto::team_location_marker_icon_name(
+                          location.marker_icon));
+
+    std::vector<uint8_t> payload;
+    if (!team::proto::encodeTeamChatLocation(loc, payload))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    }
+
+    team::proto::TeamChatMessage message;
+    message.header.type = team::proto::TeamChatType::Location;
+    message.header.ts = ts;
+    message.header.msg_id = next_message_id_++;
+    if (next_message_id_ == 0)
+    {
+        next_message_id_ = kTeamComposeMsgIdStart;
+    }
+    message.payload = payload;
+
+    if (!command_port_->sendTeamChat(message, team_channel_raw_))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    }
+
+    (void)::team::ui::team_ui_chatlog_append_structured(
+        snap.team_id,
+        0,
+        false,
+        ts,
+        team::proto::TeamChatType::Location,
+        payload);
+    return ui::UiActionResult::success();
+}
+
+ui::UiActionResult LegacyTeamActionBridge::sendCommand(
+    const TeamActionRequest& request)
+{
+    const auto& command = request.command;
+    if (command.kind == TeamCommandKind::Unknown)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+    if (command.kind == TeamCommandKind::Custom)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Unsupported);
+    }
+    if (!validCoordinate(command.lat, command.lon))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::InvalidInput);
+    }
+
+    ::team::ui::TeamUiSnapshot snap;
+    if (!team_store_.load(snap) || !snap.has_team_id || !snap.has_team_psk ||
+        command_port_ == nullptr)
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+    if (!command_port_->setKeysFromPsk(snap.team_id,
+                                       snap.security_round,
+                                       snap.team_psk.data(),
+                                       snap.team_psk.size()))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::NotReady);
+    }
+
+    const uint32_t ts = currentTimestamp();
+
+    team::proto::TeamChatCommand cmd;
+    cmd.cmd_type = toProtoCommand(command.kind);
+    cmd.lat_e7 = coordinateToE7(command.lat);
+    cmd.lon_e7 = coordinateToE7(command.lon);
+    cmd.radius_m = command.radius_m;
+    cmd.priority = command.priority;
+    if (command.payload != nullptr)
+    {
+        cmd.note = command.payload;
+    }
+
+    std::vector<uint8_t> payload;
+    if (!team::proto::encodeTeamChatCommand(cmd, payload))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    }
+
+    team::proto::TeamChatMessage message;
+    message.header.type = team::proto::TeamChatType::Command;
+    message.header.ts = ts;
+    message.header.msg_id = next_message_id_++;
+    if (next_message_id_ == 0)
+    {
+        next_message_id_ = kTeamComposeMsgIdStart;
+    }
+    message.payload = payload;
+
+    if (!command_port_->sendTeamChat(message, team_channel_raw_))
+    {
+        return ui::UiActionResult::fail(ui::UiActionFailure::Rejected);
+    }
+
+    (void)::team::ui::team_ui_chatlog_append_structured(
+        snap.team_id,
+        0,
+        false,
+        ts,
+        team::proto::TeamChatType::Command,
+        payload);
+    return ui::UiActionResult::success();
+}
+
+} // namespace ui::team_actions
diff --git a/modules/ui_shared/src/ui/team_presentation/team_rich_payload_projector.cpp b/modules/ui_shared/src/ui/team_presentation/team_rich_payload_projector.cpp
new file mode 100644
index 00000000..169ca7a8
--- /dev/null
+++ b/modules/ui_shared/src/ui/team_presentation/team_rich_payload_projector.cpp
@@ -0,0 +1,242 @@
+#include "ui/team_presentation/team_rich_payload_projector.h"
+
+#include "team/protocol/team_chat.h"
+#include "team/protocol/team_location_marker.h"
+
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+
+namespace ui::team_presentation
+{
+
+namespace
+{
+
+void copyTextPayloadSummary(TeamRichPayloadDisplay& out,
+                            const uint8_t* data,
+                            std::size_t size)
+{
+    char buffer[96]{};
+    if (data == nullptr || size == 0)
+    {
+        ui::copyText(out.summary, "");
+        return;
+    }
+
+    const std::size_t max_copy = sizeof(buffer) - 1U;
+    const bool truncated = size > max_copy;
+    std::size_t copy_len = truncated ? sizeof(buffer) - 4U : size;
+    if (copy_len > 0)
+    {
+        std::memcpy(buffer, data, copy_len);
+    }
+    if (truncated)
+    {
+        buffer[copy_len] = '.';
+        buffer[copy_len + 1U] = '.';
+        buffer[copy_len + 2U] = '.';
+        buffer[copy_len + 3U] = '\0';
+    }
+    else
+    {
+        buffer[copy_len] = '\0';
+    }
+    ui::copyText(out.summary, buffer);
+}
+
+const char* teamCommandName(team::proto::TeamCommandType type)
+{
+    switch (type)
+    {
+    case team::proto::TeamCommandType::RallyTo:
+        return "RallyTo";
+    case team::proto::TeamCommandType::MoveTo:
+        return "MoveTo";
+    case team::proto::TeamCommandType::Hold:
+        return "Hold";
+    }
+    return "Command";
+}
+
+TeamCommandDisplayKind toDisplayKind(team::proto::TeamCommandType type)
+{
+    switch (type)
+    {
+    case team::proto::TeamCommandType::RallyTo:
+        return TeamCommandDisplayKind::RallyPoint;
+    case team::proto::TeamCommandType::MoveTo:
+        return TeamCommandDisplayKind::MoveTo;
+    case team::proto::TeamCommandType::Hold:
+        return TeamCommandDisplayKind::Hold;
+    }
+    return TeamCommandDisplayKind::Unknown;
+}
+
+void formatCoordinate(char* out, std::size_t out_len, double lat, double lon)
+{
+    if (out == nullptr || out_len == 0)
+    {
+        return;
+    }
+    std::snprintf(out, out_len, "%.5f, %.5f", lat, lon);
+}
+
+void copySummary(TeamRichPayloadDisplay& out, const char* value)
+{
+    ui::copyText(out.summary, value);
+}
+
+} // namespace
+
+bool TeamRichPayloadProjector::project(
+    const ::team::ui::TeamChatLogEntry& entry,
+    TeamRichPayloadDisplay& out) const
+{
+    out = TeamRichPayloadDisplay{};
+
+    if (entry.type == team::proto::TeamChatType::Text)
+    {
+        out.kind = TeamRichPayloadKind::Text;
+        ui::copyText(out.title, "Message");
+        ui::copyText(out.badge, "Text");
+        copyTextPayloadSummary(out,
+                               entry.payload.empty() ? nullptr
+                                                     : entry.payload.data(),
+                               entry.payload.size());
+        return true;
+    }
+
+    if (entry.type == team::proto::TeamChatType::Location)
+    {
+        team::proto::TeamChatLocation loc;
+        out.kind = TeamRichPayloadKind::Location;
+        ui::copyText(out.title, "Location");
+        ui::copyText(out.badge, "Location");
+
+        if (!team::proto::decodeTeamChatLocation(entry.payload.data(),
+                                                 entry.payload.size(),
+                                                 &loc))
+        {
+            copySummary(out, "Location");
+            return false;
+        }
+
+        out.location.lat = static_cast<double>(loc.lat_e7) / 10000000.0;
+        out.location.lon = static_cast<double>(loc.lon_e7) / 10000000.0;
+        out.location.has_altitude = loc.alt_m != 0;
+        out.location.altitude_m = static_cast<float>(loc.alt_m);
+        out.location.marker_icon = loc.source;
+
+        char coord[64]{};
+        formatCoordinate(coord,
+                         sizeof(coord),
+                         out.location.lat,
+                         out.location.lon);
+        const bool marker =
+            team::proto::team_location_marker_icon_is_valid(loc.source);
+        const char* marker_name =
+            team::proto::team_location_marker_icon_name(loc.source);
+
+        char buffer[160]{};
+        if (marker)
+        {
+            ui::copyText(out.title, marker_name);
+            ui::copyText(out.badge, "Marker");
+            std::snprintf(buffer,
+                          sizeof(buffer),
+                          "%s: %s",
+                          marker_name,
+                          coord);
+        }
+        else if (!loc.label.empty())
+        {
+            std::snprintf(buffer,
+                          sizeof(buffer),
+                          "Location: %s %s",
+                          loc.label.c_str(),
+                          coord);
+        }
+        else
+        {
+            std::snprintf(buffer,
+                          sizeof(buffer),
+                          "Location: %s",
+                          coord);
+        }
+        copySummary(out, buffer);
+        return true;
+    }
+
+    if (entry.type == team::proto::TeamChatType::Command)
+    {
+        team::proto::TeamChatCommand command;
+        out.kind = TeamRichPayloadKind::Command;
+        ui::copyText(out.title, "Command");
+        ui::copyText(out.badge, "Command");
+
+        if (!team::proto::decodeTeamChatCommand(entry.payload.data(),
+                                                entry.payload.size(),
+                                                &command))
+        {
+            copySummary(out, "Command");
+            return false;
+        }
+
+        const char* name = teamCommandName(command.cmd_type);
+        out.command.kind = toDisplayKind(command.cmd_type);
+        out.command.lat = static_cast<double>(command.lat_e7) / 10000000.0;
+        out.command.lon = static_cast<double>(command.lon_e7) / 10000000.0;
+        out.command.radius_m = static_cast<float>(command.radius_m);
+        out.command.priority = command.priority;
+
+        char buffer[160]{};
+        if (command.lat_e7 != 0 || command.lon_e7 != 0)
+        {
+            char coord[64]{};
+            formatCoordinate(coord,
+                             sizeof(coord),
+                             out.command.lat,
+                             out.command.lon);
+            if (!command.note.empty())
+            {
+                std::snprintf(buffer,
+                              sizeof(buffer),
+                              "Command: %s %s %s",
+                              name,
+                              coord,
+                              command.note.c_str());
+            }
+            else
+            {
+                std::snprintf(buffer,
+                              sizeof(buffer),
+                              "Command: %s %s",
+                              name,
+                              coord);
+            }
+        }
+        else if (!command.note.empty())
+        {
+            std::snprintf(buffer,
+                          sizeof(buffer),
+                          "Command: %s %s",
+                          name,
+                          command.note.c_str());
+        }
+        else
+        {
+            std::snprintf(buffer, sizeof(buffer), "Command: %s", name);
+        }
+        copySummary(out, buffer);
+        return true;
+    }
+
+    out.kind = TeamRichPayloadKind::Unsupported;
+    ui::copyText(out.title, "Unsupported");
+    ui::copyText(out.badge, "Unsupported");
+    copySummary(out, "Unsupported team payload");
+    return false;
+}
+
+} // namespace ui::team_presentation
diff --git a/modules/ui_shared/src/ui/ui_status.cpp b/modules/ui_shared/src/ui/ui_status.cpp
index c59ef06f..54d9e592 100644
--- a/modules/ui_shared/src/ui/ui_status.cpp
+++ b/modules/ui_shared/src/ui/ui_status.cpp
@@ -9,13 +9,14 @@
 #include "app/app_facade_access.h"
 #include "ble/ble_manager.h"
 #include "chat/usecase/chat_service.h"
-#include "platform/ui/gps_runtime.h"
 #include "platform/ui/tracker_runtime.h"
 #include "platform/ui/wifi_runtime.h"
 #include "sys/clock.h"
 #if !defined(GAT562_NO_TEAM) || !GAT562_NO_TEAM
 #include "platform/ui/team_ui_store_runtime.h"
 #endif
+#include "ui/presentation_sources/legacy_gps_status_source.h"
+#include "ui_presentation/gps/gps_status_model.h"
 
 #include <cstdio>
 
@@ -73,6 +74,13 @@ TeamSnapshotCache s_team_cache;
 constexpr uint32_t kTeamSnapshotRefreshMs = 5000;
 bool s_menu_active = true;
 
+::ui::gps::GpsStatusModel& gpsStatusModel()
+{
+    static ::ui::gps::GpsStatusModel model(
+        ::ui::presentation_sources::legacy_gps_status_source());
+    return model;
+}
+
 bool obj_valid(lv_obj_t* obj)
 {
     return obj && lv_obj_is_valid(obj);
@@ -117,7 +125,8 @@ StatusSnapshot collect_status()
 
     snap.route_active = cfg.route_enabled && (cfg.route_path[0] != '\0');
     snap.track_recording = platform::ui::tracker::is_recording();
-    snap.gps_enabled = platform::ui::gps::is_enabled();
+    const auto gps = gpsStatusModel().snapshot();
+    snap.gps_enabled = gps.header.valid && gps.receiver_enabled;
     snap.wifi_enabled = platform::ui::wifi::status().enabled;
     if (auto* ble = app::runtimeFacade().getBleManager())
     {
diff --git a/modules/ui_shared/src/ui/widgets/ime/ime_widget.cpp b/modules/ui_shared/src/ui/widgets/ime/ime_widget.cpp
index 8e62a977..4ebd04b6 100644
--- a/modules/ui_shared/src/ui/widgets/ime/ime_widget.cpp
+++ b/modules/ui_shared/src/ui/widgets/ime/ime_widget.cpp
@@ -29,7 +29,7 @@ static constexpr lv_coord_t kCompactImeControlHeight = 18;
 
 bool script_input_available()
 {
-    return ::ui::i18n::active_locale_supports_script_input();
+    return ::ui::i18n::any_enabled_script_input();
 }
 
 #if UI_SHARED_TOUCH_IME_ENABLED
@@ -343,7 +343,7 @@ void ImeWidget::init_touch_ui(lv_obj_t* parent)
 
     toggle_label_ = lv_label_create(toggle_btn_);
     lv_label_set_text(toggle_label_, "EN");
-    lv_obj_set_style_text_font(toggle_label_, ::ui::fonts::ui_chrome_font(), 0);
+    lv_obj_set_style_text_font(toggle_label_, ::ui::fonts::localized_font(::ui::fonts::ui_chrome_font()), 0);
     lv_obj_set_style_text_color(toggle_label_, lv_color_hex(0x3A2A1A), 0);
     lv_obj_center(toggle_label_);
 
@@ -411,7 +411,8 @@ void ImeWidget::init_touch_ui(lv_obj_t* parent)
     lv_obj_set_style_pad_all(keyboard_matrix_, 6, LV_PART_MAIN);
     lv_obj_set_style_pad_row(keyboard_matrix_, 6, LV_PART_ITEMS);
     lv_obj_set_style_pad_column(keyboard_matrix_, 6, LV_PART_ITEMS);
-    lv_obj_set_style_text_font(keyboard_matrix_, ::ui::fonts::ui_chrome_font(), LV_PART_ITEMS);
+    lv_obj_set_style_text_font(
+        keyboard_matrix_, ::ui::fonts::localized_font(::ui::fonts::ui_chrome_font()), LV_PART_ITEMS);
     lv_obj_set_style_text_color(keyboard_matrix_, lv_color_hex(0x3A2A1A), LV_PART_ITEMS);
     lv_obj_set_style_bg_color(keyboard_matrix_, lv_color_hex(0xFFF7E9), LV_PART_ITEMS);
     lv_obj_set_style_bg_opa(keyboard_matrix_, LV_OPA_COVER, LV_PART_ITEMS);
diff --git a/modules/ui_shared/src/ui/widgets/map/map_viewport.cpp b/modules/ui_shared/src/ui/widgets/map/map_viewport.cpp
index 3a450a98..64eae405 100644
--- a/modules/ui_shared/src/ui/widgets/map/map_viewport.cpp
+++ b/modules/ui_shared/src/ui/widgets/map/map_viewport.cpp
@@ -24,8 +24,10 @@ struct RuntimeImpl
 {
     Widgets widgets{};
     Model model{};
+    ui::map::MapOverlaySnapshot overlay{};
     MapAnchor anchor{};
     std::vector<MapTile> tiles{};
+    ui::map_tiles::MapTileRenderQueue render_queue{};
     TileContext tile_ctx{};
     lv_timer_t* loader_timer = nullptr;
     uint32_t loader_interval_ms = 200;
@@ -396,6 +398,113 @@ void refresh_tiles(RuntimeImpl& impl, const char* reason)
                      impl.has_visible_map_data ? 1 : 0);
 }
 
+lv_color_t overlay_color(::ui::map::MapOverlayStyle style)
+{
+    switch (style)
+    {
+    case ::ui::map::MapOverlayStyle::OwnPosition:
+        return lv_color_hex(0x2563EB);
+    case ::ui::map::MapOverlayStyle::Team:
+        return lv_color_hex(0x16A34A);
+    case ::ui::map::MapOverlayStyle::Route:
+        return lv_color_hex(0xF59E0B);
+    case ::ui::map::MapOverlayStyle::Track:
+        return lv_color_hex(0x7C3AED);
+    case ::ui::map::MapOverlayStyle::Warning:
+        return lv_color_hex(0xDC2626);
+    case ::ui::map::MapOverlayStyle::Default:
+    default:
+        return lv_color_hex(0x111827);
+    }
+}
+
+void clear_overlay_layer(RuntimeImpl& impl)
+{
+    if (impl.widgets.overlay_layer && lv_obj_is_valid(impl.widgets.overlay_layer))
+    {
+        lv_obj_clean(impl.widgets.overlay_layer);
+    }
+}
+
+bool project_geo_point(const RuntimeImpl& impl, const GeoPoint& point, lv_point_t& out_screen_point)
+{
+    if (!is_runtime_alive(impl) || !impl.anchor.valid || !point.valid)
+    {
+        return false;
+    }
+
+    GeoPoint transformed{};
+    if (!transform_geo_point(point, impl.model.coord_system, transformed) || !transformed.valid)
+    {
+        return false;
+    }
+
+    int screen_x = 0;
+    int screen_y = 0;
+    if (!gps_screen_pos(impl.tile_ctx, transformed.lat, transformed.lon, screen_x, screen_y))
+    {
+        return false;
+    }
+
+    out_screen_point.x = static_cast<lv_coord_t>(screen_x);
+    out_screen_point.y = static_cast<lv_coord_t>(screen_y);
+    return true;
+}
+
+void render_overlay(RuntimeImpl& impl)
+{
+    if (!is_runtime_alive(impl) ||
+        !impl.widgets.overlay_layer ||
+        !lv_obj_is_valid(impl.widgets.overlay_layer))
+    {
+        return;
+    }
+
+    clear_overlay_layer(impl);
+    if (!impl.overlay.header.valid)
+    {
+        return;
+    }
+
+    for (std::size_t i = 0; i < impl.overlay.item_count; ++i)
+    {
+        const auto& item = impl.overlay.items[i];
+        if (!item.visible || !item.point.valid)
+        {
+            continue;
+        }
+
+        lv_point_t point{};
+        GeoPoint geo{item.point.valid, item.point.lat, item.point.lon};
+        if (!project_geo_point(impl, geo, point))
+        {
+            continue;
+        }
+
+        lv_obj_t* marker = lv_obj_create(impl.widgets.overlay_layer);
+        make_plain(marker);
+        lv_obj_set_size(marker, 8, 8);
+        lv_obj_set_style_radius(marker, LV_RADIUS_CIRCLE, 0);
+        lv_obj_set_style_bg_opa(marker, LV_OPA_COVER, 0);
+        lv_obj_set_style_bg_color(marker, overlay_color(item.style), 0);
+        lv_obj_set_style_border_width(marker, 1, 0);
+        lv_obj_set_style_border_color(marker, lv_color_hex(0xFFFFFF), 0);
+        lv_obj_set_pos(marker,
+                       static_cast<lv_coord_t>(point.x - 4),
+                       static_cast<lv_coord_t>(point.y - 4));
+
+        if (!item.label.empty())
+        {
+            lv_obj_t* label = lv_label_create(impl.widgets.overlay_layer);
+            lv_label_set_text(label, item.label.c_str());
+            lv_obj_set_style_text_color(label, overlay_color(item.style), 0);
+            lv_obj_set_pos(label,
+                           static_cast<lv_coord_t>(point.x + 6),
+                           static_cast<lv_coord_t>(point.y - 8));
+        }
+    }
+}
+
 void loader_timer_cb(lv_timer_t* timer)
 {
     auto* impl = static_cast<RuntimeImpl*>(lv_timer_get_user_data(timer));
@@ -512,6 +621,7 @@ Widgets create(Runtime& runtime, lv_obj_t* parent, uint32_t loader_interval_ms)
                       impl->widgets.tile_layer,
                       &impl->anchor,
                       &impl->tiles,
+                      &impl->render_queue,
                       &impl->has_map_data,
                       &impl->has_visible_map_data);
 
@@ -609,6 +719,19 @@ void apply_model(Runtime& runtime, const Model& model)
                      impl->model.contour_enabled ? 1 : 0,
                      static_cast<unsigned>(impl->model.coord_system));
     refresh_tiles(*impl, "apply_model");
+    render_overlay(*impl);
+}
+
+void apply_overlay(Runtime& runtime, const ui::map::MapOverlaySnapshot& overlay)
+{
+    if (!runtime.impl_)
+    {
+        runtime.impl_ = new RuntimeImpl();
+        runtime.impl_->tiles.reserve(TILE_RECORD_LIMIT);
+    }
+    RuntimeImpl* impl = runtime.impl_;
+    impl->overlay = overlay;
+    render_overlay(*impl);
 }
 
 void clear(Runtime& runtime)
@@ -620,6 +743,8 @@ void clear(Runtime& runtime)
     }
 
     impl->model.focus_point = GeoPoint{};
+    impl->overlay = ui::map::MapOverlaySnapshot{};
+    clear_overlay_layer(*impl);
     cleanup_tiles(impl->tile_ctx);
     impl->anchor.valid = false;
     reset_gesture_state(*impl);
@@ -629,27 +754,7 @@ void clear(Runtime& runtime)
 bool project_point(const Runtime& runtime, const GeoPoint& point, lv_point_t& out_screen_point)
 {
     const RuntimeImpl* impl = runtime.impl_;
-    if (!impl || !is_runtime_alive(*impl) || !impl->anchor.valid || !point.valid)
-    {
-        return false;
-    }
-
-    GeoPoint transformed{};
-    if (!transform_geo_point(point, impl->model.coord_system, transformed) || !transformed.valid)
-    {
-        return false;
-    }
-
-    int screen_x = 0;
-    int screen_y = 0;
-    if (!gps_screen_pos(impl->tile_ctx, transformed.lat, transformed.lon, screen_x, screen_y))
-    {
-        return false;
-    }
-
-    out_screen_point.x = static_cast<lv_coord_t>(screen_x);
-    out_screen_point.y = static_cast<lv_coord_t>(screen_y);
-    return true;
+    return impl != nullptr && project_geo_point(*impl, point, out_screen_point);
 }
 
 bool preview_project_point(lv_obj_t* viewport_root, const Model& model, const GeoPoint& point, lv_point_t& out_screen_point)
diff --git a/modules/ui_shared/tests/test_chat_presentation_source.cpp b/modules/ui_shared/tests/test_chat_presentation_source.cpp
new file mode 100644
index 00000000..0ab95333
--- /dev/null
+++ b/modules/ui_shared/tests/test_chat_presentation_source.cpp
@@ -0,0 +1,220 @@
+#include "chat/delivery/chat_delivery_read_model.h"
+#include "chat/delivery/legacy_chat_delivery_bridge.h"
+#include "chat/domain/chat_model.h"
+#include "chat/infra/store/ram_store.h"
+#include "chat/ports/i_mesh_adapter.h"
+#include "chat/usecase/chat_service.h"
+#include "ui/presentation_sources/chat_presentation_source.h"
+#include "ui/presentation_sources/legacy_chat_action_sink.h"
+
+#include <cassert>
+#include <cstring>
+#include <deque>
+#include <string>
+
+namespace
+{
+
+class FakeMeshAdapter final : public ::chat::IMeshAdapter
+{
+  public:
+    bool sendText(::chat::ChannelId channel,
+                  const std::string& text,
+                  ::chat::MessageId* out_msg_id,
+                  ::chat::NodeId peer = 0) override
+    {
+        ++send_count;
+        last_channel = channel;
+        last_text = text;
+        last_peer = peer;
+        if (out_msg_id)
+        {
+            *out_msg_id = next_id++;
+        }
+        return send_ok;
+    }
+
+    bool pollIncomingText(::chat::MeshIncomingText* out) override
+    {
+        if (!out || incoming.empty())
+        {
+            return false;
+        }
+        *out = incoming.front();
+        incoming.pop_front();
+        return true;
+    }
+    bool sendAppData(::chat::ChannelId,
+                     uint32_t,
+                     const uint8_t*,
+                     size_t,
+                     ::chat::NodeId = 0,
+                     bool = false,
+                     ::chat::MessageId = 0,
+                     bool = false) override
+    {
+        return false;
+    }
+    bool pollIncomingData(::chat::MeshIncomingData*) override { return false; }
+    void applyConfig(const ::chat::MeshConfig&) override {}
+    bool isReady() const override { return true; }
+    bool pollIncomingRawPacket(uint8_t*, size_t&, size_t) override { return false; }
+
+    int send_count = 0;
+    bool send_ok = true;
+    ::chat::MessageId next_id = 100;
+    ::chat::ChannelId last_channel = ::chat::ChannelId::PRIMARY;
+    std::string last_text;
+    ::chat::NodeId last_peer = 0;
+    std::deque<::chat::MeshIncomingText> incoming;
+};
+
+ui::chat::ConversationId directPeer(uint32_t peer)
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::DirectPeer;
+    id.protocol = ui::chat::ChatProtocolKind::Meshtastic;
+    id.primary = peer;
+    id.secondary = static_cast<uint32_t>(::chat::ChannelId::PRIMARY);
+    return id;
+}
+
+ui::chat::ConversationId teamConversation()
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::Team;
+    id.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    id.primary = 7;
+    return id;
+}
+
+ui::chat::ConversationId broadcastConversation()
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::Channel;
+    id.protocol = ui::chat::ChatProtocolKind::Meshtastic;
+    id.primary = static_cast<uint32_t>(::chat::ChannelId::PRIMARY);
+    return id;
+}
+
+ui::chat::ConversationId systemConversation()
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::System;
+    id.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    id.primary = 1;
+    return id;
+}
+
+} // namespace
+
+int main()
+{
+    ::chat::ChatModel model;
+    FakeMeshAdapter mesh;
+    ::chat::RamStore store;
+    ::chat::ChatService service(model, mesh, store);
+    ::chat::delivery::ChatDeliveryReadModel delivery_read_model;
+
+    ui::presentation_sources::LegacyChatActionSink sink(service);
+    ui::presentation_sources::ChatPresentationSource source(
+        service, nullptr, &delivery_read_model);
+
+    const ui::chat::ConversationId ada = directPeer(1234);
+    ui::chat::SendMessageView send;
+    send.conversation = ada;
+    send.text = "hello";
+    send.text_len = 5;
+
+    const auto send_result = sink.sendMessage(send);
+    assert(send_result.ok);
+    assert(mesh.send_count == 1);
+    assert(mesh.last_peer == 1234);
+    assert(mesh.last_text == "hello");
+
+    ::chat::delivery::ChatDeliveryRecord delivered{};
+    delivered.ref.protocol_id = 100;
+    delivered.state = ::chat::delivery::DeliveryState::Delivered;
+    delivered.failure = ::chat::delivery::DeliveryFailureKind::None;
+    assert(delivery_read_model.upsert(delivered));
+
+    ui::chat::ChatWorkspaceRequest request;
+    request.selected = ada;
+    ui::chat::ChatWorkspaceSnapshot snapshot;
+    assert(source.buildChatWorkspaceSnapshot(request, snapshot));
+    assert(snapshot.header.valid);
+    assert(snapshot.conversation_count == 1);
+    assert(snapshot.conversations[0].id == ada);
+    assert(snapshot.conversations[0].selected);
+    assert(std::strcmp(snapshot.conversations[0].title.c_str(), "04D2") == 0);
+    assert(snapshot.message_count == 1);
+    assert(snapshot.messages[0].conversation == ada);
+    assert(snapshot.messages[0].outgoing);
+    assert(snapshot.messages[0].delivery ==
+           ui::chat::MessageDeliveryState::Delivered);
+    assert(snapshot.messages[0].failure == ui::chat::MessageFailureKind::None);
+    assert(std::strcmp(snapshot.messages[0].text.c_str(), "hello") == 0);
+    assert(snapshot.can_send);
+    assert(snapshot.composer_enabled);
+
+    mesh.send_ok = false;
+    const ui::chat::SendMessageView failed_send{ada, "fail", 4};
+    const auto rejected_send = sink.sendMessage(failed_send);
+    assert(!rejected_send.ok);
+    assert(rejected_send.failure == ui::UiActionFailure::Rejected);
+    assert(delivery_read_model.upsert(::chat::delivery::toFailedDeliveryRecord(
+        ::chat::delivery::ChatDeliveryRef{0, 101, 0},
+        ::chat::delivery::SendFailureKind::PeerKeyMissing)));
+    assert(source.buildChatWorkspaceSnapshot(request, snapshot));
+    assert(snapshot.message_count == 2);
+    assert(snapshot.messages[1].delivery == ui::chat::MessageDeliveryState::Failed);
+    assert(snapshot.messages[1].failure ==
+           ui::chat::MessageFailureKind::PeerKeyMissing);
+
+    assert(sink.markRead(ada).ok);
+
+    ::chat::MeshIncomingText incoming{};
+    incoming.channel = ::chat::ChannelId::PRIMARY;
+    incoming.from = 0x648144D4;
+    incoming.to = 0xFFFFFFFFUL;
+    incoming.msg_id = 900;
+    incoming.text = "broadcast hello";
+    mesh.incoming.push_back(incoming);
+    service.processIncoming();
+
+    const ui::chat::ConversationId broadcast = broadcastConversation();
+    request.selected = broadcast;
+    assert(source.buildChatWorkspaceSnapshot(request, snapshot));
+    assert(snapshot.header.valid);
+    assert(snapshot.message_count == 1);
+    assert(snapshot.messages[0].conversation == broadcast);
+    assert(!snapshot.messages[0].outgoing);
+    assert(snapshot.messages[0].sender_node_id == 0x648144D4);
+    assert(std::strcmp(snapshot.messages[0].sender_label.c_str(), "44D4") == 0);
+
+    const ui::chat::ConversationId team = teamConversation();
+    assert(!sink.selectConversation(team).ok);
+    assert(!sink.markRead(team).ok);
+    send.conversation = team;
+    const auto team_send = sink.sendMessage(send);
+    assert(!team_send.ok);
+    assert(team_send.failure == ui::UiActionFailure::Unsupported);
+
+    request.selected = team;
+    assert(source.buildChatWorkspaceSnapshot(request, snapshot));
+    assert(!snapshot.can_send);
+    assert(!snapshot.composer_enabled);
+
+    send.conversation = broadcast;
+    mesh.send_ok = true;
+    const auto broadcast_send = sink.sendMessage(send);
+    assert(broadcast_send.ok);
+
+    const ui::chat::ConversationId system = systemConversation();
+    send.conversation = system;
+    const auto system_send = sink.sendMessage(send);
+    assert(!system_send.ok);
+    assert(system_send.failure == ui::UiActionFailure::Unsupported);
+
+    return 0;
+}
diff --git a/modules/ui_shared/tests/test_legacy_map_presentation_adapters.cpp b/modules/ui_shared/tests/test_legacy_map_presentation_adapters.cpp
new file mode 100644
index 00000000..854a845b
--- /dev/null
+++ b/modules/ui_shared/tests/test_legacy_map_presentation_adapters.cpp
@@ -0,0 +1,183 @@
+#include "platform/ui/team_ui_store_runtime.h"
+#include "ui/presentation_sources/legacy_map_action_sink.h"
+#include "ui/presentation_sources/legacy_map_presentation_source.h"
+#include "ui_presentation/common/fixed_text.h"
+
+#include <cassert>
+#include <cstring>
+
+namespace
+{
+
+class FakeGpsStatusSource final : public ui::gps::IGpsStatusSource
+{
+  public:
+    bool buildGpsStatusSnapshot(ui::gps::GpsStatusSnapshot& out) const override
+    {
+        ++build_count;
+        if (!available)
+        {
+            return false;
+        }
+
+        out = snapshot;
+        return true;
+    }
+
+    mutable int build_count = 0;
+    bool available = true;
+    ui::gps::GpsStatusSnapshot snapshot{};
+};
+
+class FakeTeamStore final : public team::ui::ITeamUiStore
+{
+  public:
+    bool load(team::ui::TeamUiSnapshot& out) override
+    {
+        ++load_count;
+        if (!available)
+        {
+            return false;
+        }
+
+        out = snapshot;
+        return true;
+    }
+
+    void save(const team::ui::TeamUiSnapshot& in) override
+    {
+        snapshot = in;
+        available = true;
+    }
+
+    void clear() override
+    {
+        snapshot = team::ui::TeamUiSnapshot{};
+        available = false;
+    }
+
+    int load_count = 0;
+    bool available = true;
+    team::ui::TeamUiSnapshot snapshot{};
+};
+
+ui::map::MapViewport viewport(double lat, double lon, uint8_t zoom)
+{
+    ui::map::MapViewport value;
+    value.center_lat = lat;
+    value.center_lon = lon;
+    value.zoom = zoom;
+    return value;
+}
+
+void assertViewport(const ui::map::MapViewport& actual,
+                    const ui::map::MapViewport& expected)
+{
+    assert(actual.center_lat == expected.center_lat);
+    assert(actual.center_lon == expected.center_lon);
+    assert(actual.zoom == expected.zoom);
+}
+
+} // namespace
+
+int main()
+{
+    FakeGpsStatusSource gps;
+    gps.snapshot.header.valid = true;
+    gps.snapshot.receiver_enabled = true;
+    gps.snapshot.receiver_powered = true;
+    gps.snapshot.fix_valid = true;
+    gps.snapshot.latitude = 52.4068;
+    gps.snapshot.longitude = -1.5197;
+    gps.snapshot.course_deg = 180.0f;
+    gps.snapshot.hdop = 2.25f;
+    ui::copyText(gps.snapshot.fix_label, "FIX");
+
+    FakeTeamStore team_store;
+    team_store.snapshot.in_team = true;
+    team_store.snapshot.has_team_id = true;
+    team::ui::TeamMemberUi ada;
+    ada.node_id = 1;
+    ada.name = "Ada";
+    ada.online = true;
+    team::ui::TeamMemberUi grace;
+    grace.node_id = 2;
+    grace.name = "Grace";
+    grace.online = false;
+    team_store.snapshot.members.push_back(ada);
+    team_store.snapshot.members.push_back(grace);
+
+    ui::presentation_sources::LegacyMapPresentationState state;
+    state.layers.osm = true;
+    state.layers.contour = true;
+    state.measurement.active = true;
+    state.measurement.distance_m = 42.0f;
+
+    ui::presentation_sources::LegacyMapPresentationSource source(gps,
+                                                                 state,
+                                                                 &team_store);
+    ui::presentation_sources::LegacyMapActionSink sink(gps, state);
+
+    ui::map::MapWorkspaceRequest request;
+    request.requested_viewport = viewport(52.0, -1.0, 12);
+    request.active_tool = ui::map::MapToolKind::MeasureDistance;
+
+    ui::map::MapWorkspaceSnapshot snapshot;
+    assert(source.buildMapWorkspaceSnapshot(request, snapshot));
+    assert(snapshot.header.valid);
+    assert(snapshot.header.version == 1);
+    assertViewport(snapshot.viewport, request.requested_viewport);
+    assert(snapshot.active_tool == ui::map::MapToolKind::MeasureDistance);
+    assert(snapshot.layers.osm);
+    assert(snapshot.layers.contour);
+    assert(snapshot.measurement.active);
+    assert(snapshot.measurement.distance_m == 42.0f);
+    assert(snapshot.self.valid);
+    assert(snapshot.self.lat == 52.4068);
+    assert(snapshot.self.lon == -1.5197);
+    assert(snapshot.self.course_deg == 180.0f);
+    assert(snapshot.self.accuracy_m == 2.25f);
+    assert(snapshot.can_center_on_self);
+    assert(snapshot.team.available);
+    assert(snapshot.team.visible_members == 2);
+    assert(snapshot.team.stale_members == 1);
+    assert(std::strcmp(snapshot.status_line.c_str(), "GPS fix") == 0);
+
+    const auto center = sink.centerOnSelf();
+    assert(center.ok);
+
+    const auto updated_viewport = viewport(53.0, -2.0, 10);
+    assert(sink.setViewport(updated_viewport).ok);
+    assert(state.has_viewport);
+    assertViewport(state.last_viewport, updated_viewport);
+
+    assert(sink.setLayer(ui::map::MapLayerKind::Terrain, true).ok);
+    assert(state.layers.terrain);
+    assert(sink.setLayer(ui::map::MapLayerKind::Contour, false).ok);
+    assert(!state.layers.contour);
+
+    assert(sink.setActiveTool(ui::map::MapToolKind::Pan).ok);
+    assert(state.active_tool == ui::map::MapToolKind::Pan);
+
+    assert(sink.clearMeasurement().ok);
+    assert(!state.measurement.active);
+
+    gps.snapshot.fix_valid = false;
+    const auto no_fix_center = sink.centerOnSelf();
+    assert(!no_fix_center.ok);
+    assert(no_fix_center.failure == ui::UiActionFailure::NotReady);
+
+    gps.available = false;
+    assert(source.buildMapWorkspaceSnapshot(request, snapshot));
+    assert(snapshot.header.valid);
+    assert(!snapshot.self.valid);
+    assert(!snapshot.can_center_on_self);
+    assert(std::strcmp(snapshot.status_line.c_str(), "GPS unavailable") == 0);
+
+    team_store.available = false;
+    gps.available = true;
+    assert(source.buildMapWorkspaceSnapshot(request, snapshot));
+    assert(!snapshot.team.available);
+
+    return 0;
+}
diff --git a/modules/ui_shared/tests/test_legacy_team_action_bridge.cpp b/modules/ui_shared/tests/test_legacy_team_action_bridge.cpp
new file mode 100644
index 00000000..e040918e
--- /dev/null
+++ b/modules/ui_shared/tests/test_legacy_team_action_bridge.cpp
@@ -0,0 +1,207 @@
+#include "ui/team_actions/legacy_team_action_bridge.h"
+
+#include "team/protocol/team_chat.h"
+#include "team/protocol/team_location_marker.h"
+
+#include <cassert>
+#include <vector>
+
+namespace
+{
+
+class FakeTeamCommandPort final
+    : public ui::presentation_sources::ITeamChatCommandPort
+{
+  public:
+    bool setKeysFromPsk(const ::team::TeamId& team_id,
+                        uint32_t key_id,
+                        const uint8_t* psk,
+                        size_t psk_len) override
+    {
+        ++set_keys_count;
+        last_team_id = team_id;
+        last_key_id = key_id;
+        last_psk_len = psk_len;
+        return set_keys_ok && psk != nullptr && psk_len > 0;
+    }
+
+    bool sendTeamChat(const ::team::proto::TeamChatMessage& message,
+                      uint8_t team_channel_raw) override
+    {
+        ++send_count;
+        last_message = message;
+        last_channel_raw = team_channel_raw;
+        return send_ok;
+    }
+
+    int set_keys_count = 0;
+    int send_count = 0;
+    bool set_keys_ok = true;
+    bool send_ok = true;
+    ::team::TeamId last_team_id{};
+    uint32_t last_key_id = 0;
+    size_t last_psk_len = 0;
+    uint8_t last_channel_raw = 0;
+    ::team::proto::TeamChatMessage last_message{};
+};
+
+class FakeTeamLocationSource final : public ui::team_actions::ITeamLocationSource
+{
+  public:
+    bool currentTeamLocation(ui::team_actions::TeamLocationSnapshot& out) override
+    {
+        ++read_count;
+        out = snapshot;
+        return read_ok;
+    }
+
+    int read_count = 0;
+    bool read_ok = true;
+    ui::team_actions::TeamLocationSnapshot snapshot{};
+};
+
+team::ui::TeamUiSnapshot readySnapshot()
+{
+    team::ui::TeamUiSnapshot snapshot;
+    snapshot.in_team = true;
+    snapshot.team_id = {1, 2, 3, 4, 5, 6, 7, 8};
+    snapshot.has_team_id = true;
+    snapshot.security_round = 42;
+    snapshot.has_team_psk = true;
+    for (size_t i = 0; i < snapshot.team_psk.size(); ++i)
+    {
+        snapshot.team_psk[i] = static_cast<uint8_t>(i + 1);
+    }
+    return snapshot;
+}
+
+} // namespace
+
+int main()
+{
+    team::ui::TeamUiMemoryStore store;
+    team::ui::team_ui_set_store(&store);
+    store.clear();
+
+    FakeTeamCommandPort port;
+    FakeTeamLocationSource location_source;
+    location_source.snapshot.valid = true;
+    location_source.snapshot.lat = 30.2672;
+    location_source.snapshot.lon = -97.7431;
+    location_source.snapshot.has_altitude = true;
+    location_source.snapshot.altitude_m = 153.2;
+    location_source.snapshot.accuracy_m = 6.0f;
+    location_source.snapshot.timestamp = 12345;
+
+    ui::team_actions::LegacyTeamActionBridge bridge(store,
+                                                    &port,
+                                                    &location_source);
+
+    ui::team_actions::TeamActionRequest location;
+    location.kind = ui::team_actions::TeamActionKind::LocationMarker;
+    location.location.lat = 31.2304;
+    location.location.lon = 121.4737;
+    location.location.marker_icon =
+        static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Rally);
+    assert(bridge.sendTeamAction(location).failure == ui::UiActionFailure::NotReady);
+
+    store.save(readySnapshot());
+
+    location.location.marker_icon = 99;
+    assert(bridge.sendTeamAction(location).failure ==
+           ui::UiActionFailure::InvalidInput);
+
+    location.location.marker_icon =
+        static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Rally);
+    location.location.has_altitude = true;
+    location.location.altitude_m = 123.4;
+    location.location.accuracy_m = 7.0f;
+    const auto location_result = bridge.sendTeamAction(location);
+    assert(location_result.ok);
+    assert(port.set_keys_count == 1);
+    assert(port.send_count == 1);
+    assert(port.last_message.header.type == team::proto::TeamChatType::Location);
+    assert(port.last_channel_raw == 2);
+
+    team::proto::TeamChatLocation decoded_location;
+    assert(team::proto::decodeTeamChatLocation(
+        port.last_message.payload.data(),
+        port.last_message.payload.size(),
+        &decoded_location));
+    assert(decoded_location.source == location.location.marker_icon);
+    assert(decoded_location.lat_e7 == 312304000);
+    assert(decoded_location.lon_e7 == 1214737000);
+    assert(decoded_location.alt_m == 123);
+    assert(decoded_location.acc_m == 7);
+
+    ui::team_actions::TeamActionRequest current_location;
+    current_location.kind = ui::team_actions::TeamActionKind::LocationMarker;
+    current_location.location.use_current_location = true;
+    current_location.location.marker_icon =
+        static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::GoodFind);
+    const auto current_location_result = bridge.sendTeamAction(current_location);
+    assert(current_location_result.ok);
+    assert(location_source.read_count == 1);
+    assert(port.last_message.header.type == team::proto::TeamChatType::Location);
+    assert(team::proto::decodeTeamChatLocation(
+        port.last_message.payload.data(),
+        port.last_message.payload.size(),
+        &decoded_location));
+    assert(decoded_location.lat_e7 == 302672000);
+    assert(decoded_location.lon_e7 == -977431000);
+    assert(decoded_location.alt_m == 153);
+    assert(decoded_location.acc_m == 6);
+    assert(decoded_location.ts == 12345);
+
+    location_source.snapshot.valid = false;
+    assert(bridge.sendTeamAction(current_location).failure ==
+           ui::UiActionFailure::NotReady);
+    location_source.snapshot.valid = true;
+
+    ui::team_actions::LegacyTeamActionBridge bridge_without_location_source(
+        store,
+        &port);
+    assert(bridge_without_location_source.sendTeamAction(current_location).failure ==
+           ui::UiActionFailure::NotReady);
+
+    std::vector<team::ui::TeamChatLogEntry> log;
+    assert(team::ui::team_ui_chatlog_load_recent(readySnapshot().team_id, 4, log));
+    assert(!log.empty());
+    assert(log.back().type == team::proto::TeamChatType::Location);
+
+    ui::team_actions::TeamActionRequest text;
+    text.kind = ui::team_actions::TeamActionKind::Text;
+    text.text = "team hello";
+    const auto text_result = bridge.sendTeamAction(text);
+    assert(text_result.ok);
+    assert(port.last_message.header.type == team::proto::TeamChatType::Text);
+
+    ui::team_actions::TeamActionRequest command;
+    command.kind = ui::team_actions::TeamActionKind::Command;
+    assert(bridge.sendTeamAction(command).failure ==
+           ui::UiActionFailure::InvalidInput);
+
+    command.command.kind = ui::team_actions::TeamCommandKind::Custom;
+    assert(bridge.sendTeamAction(command).failure ==
+           ui::UiActionFailure::Unsupported);
+
+    command.command.kind = ui::team_actions::TeamCommandKind::MoveTo;
+    command.command.lat = 31.2304;
+    command.command.lon = 121.4737;
+    command.command.payload = "move";
+    const auto command_result = bridge.sendTeamAction(command);
+    assert(command_result.ok);
+    assert(port.last_message.header.type == team::proto::TeamChatType::Command);
+
+    team::proto::TeamChatCommand decoded_command;
+    assert(team::proto::decodeTeamChatCommand(
+        port.last_message.payload.data(),
+        port.last_message.payload.size(),
+        &decoded_command));
+    assert(decoded_command.cmd_type == team::proto::TeamCommandType::MoveTo);
+    assert(decoded_command.note == "move");
+
+    store.clear();
+    team::ui::team_ui_set_store(nullptr);
+    return 0;
+}
diff --git a/modules/ui_shared/tests/test_team_action_types.cpp b/modules/ui_shared/tests/test_team_action_types.cpp
new file mode 100644
index 00000000..bc45ffa4
--- /dev/null
+++ b/modules/ui_shared/tests/test_team_action_types.cpp
@@ -0,0 +1,34 @@
+#include "ui/team_actions/team_action_types.h"
+
+#include <cassert>
+
+int main()
+{
+    ui::team_actions::TeamActionRequest action;
+    assert(action.kind == ui::team_actions::TeamActionKind::Text);
+    assert(action.text == nullptr);
+    assert(action.location.marker_icon == 0);
+    assert(action.command.kind == ui::team_actions::TeamCommandKind::Unknown);
+
+    action.kind = ui::team_actions::TeamActionKind::LocationMarker;
+    action.location.lat = 31.2304;
+    action.location.lon = 121.4737;
+    action.location.marker_icon = 4;
+    assert(action.location.lat > 31.0);
+    assert(action.location.marker_icon == 4);
+
+    action.location.use_current_location = true;
+    ui::team_actions::TeamLocationSnapshot location_snapshot;
+    location_snapshot.valid = true;
+    location_snapshot.lat = 31.2304;
+    location_snapshot.lon = 121.4737;
+    assert(action.location.use_current_location);
+    assert(location_snapshot.valid);
+
+    action.kind = ui::team_actions::TeamActionKind::Command;
+    action.command.kind = ui::team_actions::TeamCommandKind::RallyPoint;
+    action.command.payload = "rally";
+    assert(action.command.kind == ui::team_actions::TeamCommandKind::RallyPoint);
+    assert(action.command.payload != nullptr);
+    return 0;
+}
diff --git a/modules/ui_shared/tests/test_team_chat_action_sink.cpp b/modules/ui_shared/tests/test_team_chat_action_sink.cpp
new file mode 100644
index 00000000..fda5b97d
--- /dev/null
+++ b/modules/ui_shared/tests/test_team_chat_action_sink.cpp
@@ -0,0 +1,191 @@
+#include "platform/ui/team_ui_store_runtime.h"
+#include "ui/presentation_sources/team_chat_action_sink.h"
+
+#include <cassert>
+#include <cstring>
+#include <string>
+#include <vector>
+
+namespace
+{
+
+class FakeTeamChatCommandPort final
+    : public ui::presentation_sources::ITeamChatCommandPort
+{
+  public:
+    bool setKeysFromPsk(const ::team::TeamId& team_id,
+                        uint32_t key_id,
+                        const uint8_t* psk,
+                        size_t psk_len) override
+    {
+        ++set_keys_count;
+        last_team_id = team_id;
+        last_key_id = key_id;
+        last_psk_len = psk_len;
+        return psk != nullptr && set_keys_ok;
+    }
+
+    bool sendTeamChat(const ::team::proto::TeamChatMessage& message,
+                      uint8_t team_channel_raw) override
+    {
+        ++send_count;
+        last_message = message;
+        last_channel_raw = team_channel_raw;
+        return send_ok;
+    }
+
+    bool set_keys_ok = true;
+    bool send_ok = true;
+    int set_keys_count = 0;
+    int send_count = 0;
+    ::team::TeamId last_team_id{};
+    uint32_t last_key_id = 0;
+    size_t last_psk_len = 0;
+    ::team::proto::TeamChatMessage last_message;
+    uint8_t last_channel_raw = 0;
+};
+
+team::TeamId testTeamId()
+{
+    team::TeamId id{};
+    id[0] = 0x42;
+    id[1] = 0x43;
+    id[2] = 0x44;
+    id[3] = 0x45;
+    return id;
+}
+
+team::ui::TeamUiSnapshot makeSnapshot(bool has_psk = true)
+{
+    team::ui::TeamUiSnapshot snap;
+    snap.has_team_id = true;
+    snap.team_id = testTeamId();
+    snap.team_name = "Bravo";
+    snap.security_round = 9;
+    snap.has_team_psk = has_psk;
+    snap.team_chat_unread = 4;
+    for (size_t i = 0; i < snap.team_psk.size(); ++i)
+    {
+        snap.team_psk[i] = static_cast<uint8_t>(i + 1U);
+    }
+    return snap;
+}
+
+ui::chat::ConversationId teamConversation()
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::Team;
+    id.protocol = ui::chat::ChatProtocolKind::TrailMate;
+    id.primary = 1;
+    return id;
+}
+
+ui::chat::ConversationId directConversation()
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::DirectPeer;
+    id.protocol = ui::chat::ChatProtocolKind::Meshtastic;
+    id.primary = 1234;
+    return id;
+}
+
+ui::chat::ConversationId channelConversation()
+{
+    ui::chat::ConversationId id;
+    id.kind = ui::chat::ConversationKind::Channel;
+    id.protocol = ui::chat::ChatProtocolKind::Meshtastic;
+    id.primary = 1;
+    return id;
+}
+
+ui::chat::SendMessageView sendView(ui::chat::ConversationId id,
+                                   const char* text)
+{
+    ui::chat::SendMessageView view;
+    view.conversation = id;
+    view.text = text;
+    view.text_len = text == nullptr ? 0U : std::strlen(text);
+    return view;
+}
+
+} // namespace
+
+int main()
+{
+    team::ui::ITeamUiStore& store = team::ui::team_ui_get_store();
+    store.clear();
+    store.save(makeSnapshot());
+
+    FakeTeamChatCommandPort fake_port;
+    ui::presentation_sources::TeamChatActionSink sink(store, &fake_port, 7);
+
+    assert(sink.selectConversation(teamConversation()).ok);
+    const auto direct_select = sink.selectConversation(directConversation());
+    assert(!direct_select.ok);
+    assert(direct_select.failure == ui::UiActionFailure::Unsupported);
+
+    const auto direct_send = sink.sendMessage(sendView(directConversation(), "x"));
+    assert(!direct_send.ok);
+    assert(direct_send.failure == ui::UiActionFailure::Unsupported);
+
+    const auto channel_send = sink.sendMessage(sendView(channelConversation(), "x"));
+    assert(!channel_send.ok);
+    assert(channel_send.failure == ui::UiActionFailure::Unsupported);
+
+    const auto empty_send = sink.sendMessage(sendView(teamConversation(), ""));
+    assert(!empty_send.ok);
+    assert(empty_send.failure == ui::UiActionFailure::InvalidInput);
+
+    ui::presentation_sources::TeamChatActionSink no_port_sink(store, nullptr);
+    const auto no_port_send =
+        no_port_sink.sendMessage(sendView(teamConversation(), "no controller"));
+    assert(!no_port_send.ok);
+    assert(no_port_send.failure == ui::UiActionFailure::NotReady);
+
+    store.save(makeSnapshot(false));
+    const auto no_psk_send =
+        sink.sendMessage(sendView(teamConversation(), "no psk"));
+    assert(!no_psk_send.ok);
+    assert(no_psk_send.failure == ui::UiActionFailure::NotReady);
+
+    store.save(makeSnapshot());
+    const auto sent = sink.sendMessage(sendView(teamConversation(), "team hello"));
+    assert(sent.ok);
+    assert(fake_port.set_keys_count == 1);
+    assert(fake_port.last_team_id == testTeamId());
+    assert(fake_port.last_key_id == 9);
+    assert(fake_port.last_psk_len == team::proto::kTeamChannelPskSize);
+    assert(fake_port.send_count == 1);
+    assert(fake_port.last_channel_raw == 7);
+    assert(fake_port.last_message.header.type ==
+           team::proto::TeamChatType::Text);
+    assert(std::string(fake_port.last_message.payload.begin(),
+                       fake_port.last_message.payload.end()) == "team hello");
+
+    std::vector<team::ui::TeamChatLogEntry> entries;
+    assert(team::ui::team_ui_chatlog_load_recent(testTeamId(), 4, entries));
+    assert(entries.size() == 1);
+    assert(!entries[0].incoming);
+    assert(entries[0].type == team::proto::TeamChatType::Text);
+    assert(std::string(entries[0].payload.begin(), entries[0].payload.end()) ==
+           "team hello");
+
+    team::ui::TeamUiSnapshot snap;
+    assert(store.load(snap));
+    assert(snap.team_chat_unread == 4);
+    assert(sink.markRead(teamConversation()).ok);
+    assert(store.load(snap));
+    assert(snap.team_chat_unread == 0);
+
+    const auto mark_direct = sink.markRead(directConversation());
+    assert(!mark_direct.ok);
+    assert(mark_direct.failure == ui::UiActionFailure::Unsupported);
+
+    fake_port.send_ok = false;
+    const auto rejected = sink.sendMessage(sendView(teamConversation(), "reject"));
+    assert(!rejected.ok);
+    assert(rejected.failure == ui::UiActionFailure::Rejected);
+
+    store.clear();
+    return 0;
+}
diff --git a/modules/ui_shared/tests/test_team_chat_presentation_source.cpp b/modules/ui_shared/tests/test_team_chat_presentation_source.cpp
new file mode 100644
index 00000000..dcf9645d
--- /dev/null
+++ b/modules/ui_shared/tests/test_team_chat_presentation_source.cpp
@@ -0,0 +1,142 @@
+#include "platform/ui/team_ui_store_runtime.h"
+#include "team/protocol/team_chat.h"
+#include "team/protocol/team_location_marker.h"
+#include "ui/presentation_sources/team_chat_presentation_source.h"
+
+#include <cassert>
+#include <cstring>
+#include <vector>
+
+namespace
+{
+
+team::TeamId testTeamId()
+{
+    team::TeamId id{};
+    id[0] = 0xA1;
+    id[1] = 0xB2;
+    id[2] = 0xC3;
+    id[3] = 0xD4;
+    return id;
+}
+
+team::ui::TeamUiSnapshot makeSnapshot()
+{
+    team::ui::TeamUiSnapshot snap;
+    snap.has_team_id = true;
+    snap.team_id = testTeamId();
+    snap.team_name = "Alpha";
+    snap.has_team_psk = true;
+    snap.team_chat_unread = 2;
+
+    team::ui::TeamMemberUi member;
+    member.node_id = 0x12345678;
+    member.name = "Ada";
+    snap.members.push_back(member);
+    return snap;
+}
+
+ui::chat::ChatWorkspaceSnapshot buildSnapshot(
+    ui::presentation_sources::TeamChatPresentationSource& source,
+    ui::chat::ConversationId selected = {})
+{
+    ui::chat::ChatWorkspaceRequest request;
+    request.selected = selected;
+
+    ui::chat::ChatWorkspaceSnapshot snapshot;
+    assert(source.buildChatWorkspaceSnapshot(request, snapshot));
+    assert(snapshot.header.valid);
+    return snapshot;
+}
+
+bool contains(const ui::FixedText<160>& text, const char* needle)
+{
+    return std::strstr(text.c_str(), needle) != nullptr;
+}
+
+} // namespace
+
+int main()
+{
+    team::ui::ITeamUiStore& store = team::ui::team_ui_get_store();
+    store.clear();
+
+    const team::ui::TeamUiSnapshot snap = makeSnapshot();
+    store.save(snap);
+
+    assert(team::ui::team_ui_chatlog_append(
+        snap.team_id, 0x12345678, true, 100, "hello team"));
+
+    team::proto::TeamChatLocation loc;
+    loc.lat_e7 = 312345678;
+    loc.lon_e7 = 1219876543;
+    loc.source = static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Rally);
+    std::vector<uint8_t> location_payload;
+    assert(team::proto::encodeTeamChatLocation(loc, location_payload));
+    assert(team::ui::team_ui_chatlog_append_structured(
+        snap.team_id,
+        0,
+        false,
+        101,
+        team::proto::TeamChatType::Location,
+        location_payload));
+
+    team::proto::TeamChatCommand command;
+    command.cmd_type = team::proto::TeamCommandType::Hold;
+    command.note = "wait";
+    std::vector<uint8_t> command_payload;
+    assert(team::proto::encodeTeamChatCommand(command, command_payload));
+    assert(team::ui::team_ui_chatlog_append_structured(
+        snap.team_id,
+        0x12345678,
+        true,
+        102,
+        team::proto::TeamChatType::Command,
+        command_payload));
+
+    ui::presentation_sources::TeamChatPresentationSource source(store);
+
+    ui::chat::ChatWorkspaceSnapshot overview = buildSnapshot(source);
+    assert(overview.conversation_count == 1);
+    assert(overview.conversations[0].kind == ui::chat::ConversationKind::Team);
+    assert(overview.conversations[0].protocol ==
+           ui::chat::ChatProtocolKind::TrailMate);
+    assert(std::strcmp(overview.conversations[0].title.c_str(), "Alpha") == 0);
+    assert(overview.conversations[0].unread_count == 2);
+    assert(overview.message_count == 0);
+
+    const ui::chat::ConversationId team_id = overview.conversations[0].id;
+    ui::chat::ChatWorkspaceSnapshot selected = buildSnapshot(source, team_id);
+    assert(selected.selected_conversation == team_id);
+    assert(selected.conversation_count == 1);
+    assert(selected.conversations[0].selected);
+    assert(selected.message_count == 3);
+    assert(selected.can_send);
+    assert(selected.composer_enabled);
+
+    assert(selected.messages[0].conversation.kind ==
+           ui::chat::ConversationKind::Team);
+    assert(selected.messages[0].delivery ==
+           ui::chat::MessageDeliveryState::Received);
+    assert(selected.messages[0].ref.origin ==
+           ui::chat::MessageOrigin::RemoteStored);
+    assert(selected.messages[0].sender_node_id == 0x12345678);
+    assert(std::strcmp(selected.messages[0].sender_label.c_str(), "Ada") == 0);
+    assert(std::strcmp(selected.messages[0].text.c_str(), "hello team") == 0);
+
+    assert(selected.messages[1].outgoing);
+    assert(selected.messages[1].sender_node_id == 0);
+    assert(selected.messages[1].delivery ==
+           ui::chat::MessageDeliveryState::Sent);
+    assert(selected.messages[1].ref.origin ==
+           ui::chat::MessageOrigin::LocalStored);
+    assert(contains(selected.messages[1].text, "Rally"));
+    assert(contains(selected.messages[1].text, "31.23457"));
+
+    assert(!selected.messages[2].outgoing);
+    assert(contains(selected.messages[2].text, "Command: Hold"));
+    assert(contains(selected.messages[2].text, "wait"));
+
+    store.clear();
+    return 0;
+}
diff --git a/modules/ui_shared/tests/test_team_rich_payload_projector.cpp b/modules/ui_shared/tests/test_team_rich_payload_projector.cpp
new file mode 100644
index 00000000..c3c43795
--- /dev/null
+++ b/modules/ui_shared/tests/test_team_rich_payload_projector.cpp
@@ -0,0 +1,127 @@
+#include "platform/ui/team_ui_store_runtime.h"
+#include "team/protocol/team_chat.h"
+#include "team/protocol/team_location_marker.h"
+#include "ui/team_presentation/team_rich_payload_projector.h"
+
+#include <cassert>
+#include <cstring>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace
+{
+
+team::ui::TeamChatLogEntry makeEntry(team::proto::TeamChatType type,
+                                     std::vector<uint8_t> payload)
+{
+    team::ui::TeamChatLogEntry entry;
+    entry.type = type;
+    entry.payload = std::move(payload);
+    return entry;
+}
+
+bool contains(const ui::FixedText<96>& text, const char* needle)
+{
+    return std::strstr(text.c_str(), needle) != nullptr;
+}
+
+} // namespace
+
+int main()
+{
+    ui::team_presentation::TeamRichPayloadProjector projector;
+    ui::team_presentation::TeamRichPayloadDisplay display;
+
+    std::vector<uint8_t> text_payload(180, 'a');
+    assert(projector.project(makeEntry(team::proto::TeamChatType::Text,
+                                       text_payload),
+                             display));
+    assert(display.kind == ui::team_presentation::TeamRichPayloadKind::Text);
+    assert(std::strcmp(display.badge.c_str(), "Text") == 0);
+    assert(std::strlen(display.summary.c_str()) == 95);
+
+    team::proto::TeamChatLocation loc;
+    loc.lat_e7 = 312345678;
+    loc.lon_e7 = 1219876543;
+    loc.alt_m = 42;
+    loc.source = static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Rally);
+    std::vector<uint8_t> location_payload;
+    assert(team::proto::encodeTeamChatLocation(loc, location_payload));
+    assert(projector.project(makeEntry(team::proto::TeamChatType::Location,
+                                       location_payload),
+                             display));
+    assert(display.kind == ui::team_presentation::TeamRichPayloadKind::Location);
+    assert(std::strcmp(display.badge.c_str(), "Marker") == 0);
+    assert(contains(display.summary, "Rally"));
+    assert(contains(display.summary, "31.23457"));
+    assert(display.location.has_altitude);
+    assert(display.location.marker_icon ==
+           static_cast<uint8_t>(team::proto::TeamLocationMarkerIcon::Rally));
+
+    loc = team::proto::TeamChatLocation{};
+    loc.lat_e7 = -123456789;
+    loc.lon_e7 = 987654321;
+    loc.label = "Trailhead";
+    location_payload.clear();
+    assert(team::proto::encodeTeamChatLocation(loc, location_payload));
+    assert(projector.project(makeEntry(team::proto::TeamChatType::Location,
+                                       location_payload),
+                             display));
+    assert(display.kind == ui::team_presentation::TeamRichPayloadKind::Location);
+    assert(std::strcmp(display.badge.c_str(), "Location") == 0);
+    assert(contains(display.summary, "Trailhead"));
+    assert(contains(display.summary, "-12.34568"));
+
+    team::proto::TeamChatCommand command;
+    command.cmd_type = team::proto::TeamCommandType::Hold;
+    command.note = "wait";
+    std::vector<uint8_t> command_payload;
+    assert(team::proto::encodeTeamChatCommand(command, command_payload));
+    assert(projector.project(makeEntry(team::proto::TeamChatType::Command,
+                                       command_payload),
+                             display));
+    assert(display.kind == ui::team_presentation::TeamRichPayloadKind::Command);
+    assert(display.command.kind == ui::team_presentation::TeamCommandDisplayKind::Hold);
+    assert(contains(display.summary, "Command: Hold"));
+    assert(contains(display.summary, "wait"));
+
+    command = team::proto::TeamChatCommand{};
+    command.cmd_type = team::proto::TeamCommandType::MoveTo;
+    command.lat_e7 = 111111111;
+    command.lon_e7 = -222222222;
+    command.radius_m = 25;
+    command.priority = 3;
+    command_payload.clear();
+    assert(team::proto::encodeTeamChatCommand(command, command_payload));
+    assert(projector.project(makeEntry(team::proto::TeamChatType::Command,
+                                       command_payload),
+                             display));
+    assert(display.command.kind == ui::team_presentation::TeamCommandDisplayKind::MoveTo);
+    assert(display.command.radius_m == 25.0f);
+    assert(display.command.priority == 3);
+    assert(contains(display.summary, "11.11111"));
+    assert(contains(display.summary, "-22.22222"));
+
+    assert(!projector.project(makeEntry(team::proto::TeamChatType::Location,
+                                        {0x01, 0x02}),
+                              display));
+    assert(display.kind == ui::team_presentation::TeamRichPayloadKind::Location);
+    assert(std::strcmp(display.summary.c_str(), "Location") == 0);
+
+    assert(!projector.project(makeEntry(team::proto::TeamChatType::Command,
+                                        {0x03}),
+                              display));
+    assert(display.kind == ui::team_presentation::TeamRichPayloadKind::Command);
+    assert(std::strcmp(display.summary.c_str(), "Command") == 0);
+
+    assert(!projector.project(makeEntry(
+                                  static_cast<team::proto::TeamChatType>(99),
+                                  {}),
+                              display));
+    assert(display.kind == ui::team_presentation::TeamRichPayloadKind::Unsupported);
+    assert(std::strcmp(display.summary.c_str(),
+                       "Unsupported team payload") == 0);
+
+    return 0;
+}
diff --git a/packs/ar/locales/ar/strings.tsv b/packs/ar/locales/ar/strings.tsv
index 4bb59dc3..145dbe3b 100644
--- a/packs/ar/locales/ar/strings.tsv
+++ b/packs/ar/locales/ar/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	الفاصل الزمني للتحديث
 Use Preset	استخدم الإعداد المسبق
 Wi-Fi Enabled	Wi-Fi ممكّن
 Wi-Fi start failed	Wi-Fi فشل البدء
+All	الكل
+Contact Alerts	تنبيهات جهات الاتصال
+Contacts Only	جهات الاتصال فقط
+Message Alerts	تنبيهات الرسائل
+Backup Status	حالة النسخ الاحتياطي
+Backup Settings	نسخ الإعدادات احتياطيًا
+Restore Settings	استعادة الإعدادات
+No backup found	لم يتم العثور على نسخة احتياطية
+Backup unsupported	النسخ الاحتياطي غير مدعوم
+SD not detected	لم يتم اكتشاف بطاقة SD
+Backup found	تم العثور على نسخة احتياطية
+Insert SD card to backup settings	أدخل بطاقة SD لنسخ الإعدادات احتياطيًا
+Backup failed	فشل النسخ الاحتياطي
+Settings backup saved to SD	تم حفظ نسخة الإعدادات على بطاقة SD
+Insert SD card to restore settings	أدخل بطاقة SD لاستعادة الإعدادات
+No settings backup found	لم يتم العثور على نسخة إعدادات احتياطية
+Restore failed	فشلت الاستعادة
+Settings restored. Restarting...	تمت استعادة الإعدادات. جارٍ إعادة التشغيل...
+Overwrite current settings and restart?	هل تريد استبدال الإعدادات الحالية وإعادة التشغيل؟
+Restore	استعادة
diff --git a/packs/ar/package.ini b/packs/ar/package.ini
index e6f017ac..5ebf0d2c 100644
--- a/packs/ar/package.ini
+++ b/packs/ar/package.ini
@@ -1,7 +1,7 @@
 kind=package
 id=ar
 package_type=locale-bundle
-version=1.1.0
+version=1.1.1
 display_name=Arabic
 summary=Arabic review locale bundle with Naskh font coverage for RTL UI text and mixed-script content rendering; display-only until Arabic input is implemented.
 description=DESCRIPTION.txt
diff --git a/packs/europe-cyrillic-ext/README.md b/packs/europe-cyrillic-ext/README.md
index 57c1d2de..514b5eb7 100644
--- a/packs/europe-cyrillic-ext/README.md
+++ b/packs/europe-cyrillic-ext/README.md
@@ -75,7 +75,7 @@ Notes:
 
 `python scripts/build_pack_repository.py --pack-root packs --site-root site` produces:
 
-- `site/assets/packs/europe-cyrillic-ext-1.1.0.zip`
+- `site/assets/packs/europe-cyrillic-ext-1.1.1.zip`
 - `site/data/packs.json`
 
 The zip is the bundle artifact for a future Extensions downloader. Its `payload/` directory unpacks into `/trailmate/packs/...`.
diff --git a/packs/europe-cyrillic-ext/locales/ru/strings.tsv b/packs/europe-cyrillic-ext/locales/ru/strings.tsv
index ae2a84f7..abc36c3a 100644
--- a/packs/europe-cyrillic-ext/locales/ru/strings.tsv
+++ b/packs/europe-cyrillic-ext/locales/ru/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	Интервал обновления
 Use Preset	Использовать предустановку
 Wi-Fi Enabled	Wi-Fi Включено
 Wi-Fi start failed	Wi-Fi не удалось запустить
+All	Все
+Contact Alerts	Оповещения контактов
+Contacts Only	Только контакты
+Message Alerts	Оповещения сообщений
+Backup Status	Статус резервной копии
+Backup Settings	Сохранить настройки
+Restore Settings	Восстановить настройки
+No backup found	Резервная копия не найдена
+Backup unsupported	Резервное копирование не поддерживается
+SD not detected	SD-карта не обнаружена
+Backup found	Резервная копия найдена
+Insert SD card to backup settings	Вставьте SD-карту для сохранения настроек
+Backup failed	Не удалось создать резервную копию
+Settings backup saved to SD	Резервная копия настроек сохранена на SD
+Insert SD card to restore settings	Вставьте SD-карту для восстановления настроек
+No settings backup found	Резервная копия настроек не найдена
+Restore failed	Восстановление не удалось
+Settings restored. Restarting...	Настройки восстановлены. Перезапуск...
+Overwrite current settings and restart?	Перезаписать текущие настройки и перезапустить?
+Restore	Восстановить
diff --git a/packs/europe-cyrillic-ext/package.ini b/packs/europe-cyrillic-ext/package.ini
index a243d807..647744a6 100644
--- a/packs/europe-cyrillic-ext/package.ini
+++ b/packs/europe-cyrillic-ext/package.ini
@@ -1,7 +1,7 @@
 kind=package
 id=europe-cyrillic-ext
 package_type=locale-bundle
-version=1.1.0
+version=1.1.1
 display_name=European Cyrillic Extended
 summary=Shared Cyrillic font coverage plus a Russian review locale pack; display-only until native review is complete.
 description=DESCRIPTION.txt
diff --git a/packs/europe-latin-ext/README.md b/packs/europe-latin-ext/README.md
index 86d58c15..216b068c 100644
--- a/packs/europe-latin-ext/README.md
+++ b/packs/europe-latin-ext/README.md
@@ -70,7 +70,7 @@ Notes:
 
 `python scripts/build_pack_repository.py --pack-root packs --site-root site` produces:
 
-- `site/assets/packs/europe-latin-ext-1.1.0.zip`
+- `site/assets/packs/europe-latin-ext-1.1.1.zip`
 - `site/data/packs.json`
 
 The zip is the bundle artifact for a future Extensions downloader. Its `payload/` directory unpacks into `/trailmate/packs/...`.
diff --git a/packs/europe-latin-ext/locales/de/strings.tsv b/packs/europe-latin-ext/locales/de/strings.tsv
index d4d30ede..ae7f0abb 100644
--- a/packs/europe-latin-ext/locales/de/strings.tsv
+++ b/packs/europe-latin-ext/locales/de/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	Aktualisierungsintervall
 Use Preset	Voreinstellung verwenden
 Wi-Fi Enabled	Wi-Fi Aktiviert
 Wi-Fi start failed	Wi-Fi Start fehlgeschlagen
+All	Alle
+Contact Alerts	Kontakthinweise
+Contacts Only	Nur Kontakte
+Message Alerts	Nachrichtenhinweise
+Backup Status	Backup-Status
+Backup Settings	Einstellungen sichern
+Restore Settings	Einstellungen wiederherstellen
+No backup found	Kein Backup gefunden
+Backup unsupported	Backup nicht unterstützt
+SD not detected	SD-Karte nicht erkannt
+Backup found	Backup gefunden
+Insert SD card to backup settings	SD-Karte einlegen, um Einstellungen zu sichern
+Backup failed	Backup fehlgeschlagen
+Settings backup saved to SD	Einstellungs-Backup auf SD gespeichert
+Insert SD card to restore settings	SD-Karte einlegen, um Einstellungen wiederherzustellen
+No settings backup found	Kein Einstellungs-Backup gefunden
+Restore failed	Wiederherstellung fehlgeschlagen
+Settings restored. Restarting...	Einstellungen wiederhergestellt. Neustart...
+Overwrite current settings and restart?	Aktuelle Einstellungen überschreiben und neu starten?
+Restore	Wiederherstellen
diff --git a/packs/europe-latin-ext/locales/es/strings.tsv b/packs/europe-latin-ext/locales/es/strings.tsv
index 03c3b705..04094aa1 100644
--- a/packs/europe-latin-ext/locales/es/strings.tsv
+++ b/packs/europe-latin-ext/locales/es/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	Intervalo de actualización
 Use Preset	Usar preajuste
 Wi-Fi Enabled	Wi-Fi Habilitado
 Wi-Fi start failed	Wi-Fi inicio fallido
+All	Todos
+Contact Alerts	Alertas de contactos
+Contacts Only	Solo contactos
+Message Alerts	Alertas de mensajes
+Backup Status	Estado de copia
+Backup Settings	Respaldar ajustes
+Restore Settings	Restaurar ajustes
+No backup found	No se encontró copia
+Backup unsupported	Copia no compatible
+SD not detected	No se detectó tarjeta SD
+Backup found	Copia encontrada
+Insert SD card to backup settings	Inserta una tarjeta SD para respaldar ajustes
+Backup failed	Error al respaldar
+Settings backup saved to SD	Copia de ajustes guardada en SD
+Insert SD card to restore settings	Inserta una tarjeta SD para restaurar ajustes
+No settings backup found	No se encontró copia de ajustes
+Restore failed	Error al restaurar
+Settings restored. Restarting...	Ajustes restaurados. Reiniciando...
+Overwrite current settings and restart?	¿Sobrescribir los ajustes actuales y reiniciar?
+Restore	Restaurar
diff --git a/packs/europe-latin-ext/locales/fr/strings.tsv b/packs/europe-latin-ext/locales/fr/strings.tsv
index 3a6bd26d..048d2153 100644
--- a/packs/europe-latin-ext/locales/fr/strings.tsv
+++ b/packs/europe-latin-ext/locales/fr/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	Intervalle de mise à jour
 Use Preset	Utiliser le préréglage
 Wi-Fi Enabled	Wi-Fi Activé
 Wi-Fi start failed	Wi-Fi échec du démarrage
+All	Tous
+Contact Alerts	Alertes contacts
+Contacts Only	Contacts uniquement
+Message Alerts	Alertes messages
+Backup Status	État de sauvegarde
+Backup Settings	Sauvegarder les réglages
+Restore Settings	Restaurer les réglages
+No backup found	Aucune sauvegarde trouvée
+Backup unsupported	Sauvegarde non prise en charge
+SD not detected	Carte SD non détectée
+Backup found	Sauvegarde trouvée
+Insert SD card to backup settings	Insérez une carte SD pour sauvegarder les réglages
+Backup failed	Échec de la sauvegarde
+Settings backup saved to SD	Sauvegarde des réglages enregistrée sur SD
+Insert SD card to restore settings	Insérez une carte SD pour restaurer les réglages
+No settings backup found	Aucune sauvegarde de réglages trouvée
+Restore failed	Échec de la restauration
+Settings restored. Restarting...	Réglages restaurés. Redémarrage...
+Overwrite current settings and restart?	Remplacer les réglages actuels et redémarrer ?
+Restore	Restaurer
diff --git a/packs/europe-latin-ext/locales/it/strings.tsv b/packs/europe-latin-ext/locales/it/strings.tsv
index f65e9f0a..66fc2ac0 100644
--- a/packs/europe-latin-ext/locales/it/strings.tsv
+++ b/packs/europe-latin-ext/locales/it/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	Intervallo di aggiornamento
 Use Preset	Usa preimpostazione
 Wi-Fi Enabled	Wi-Fi Abilitato
 Wi-Fi start failed	Wi-Fi avvio non riuscito
+All	Tutti
+Contact Alerts	Avvisi contatti
+Contacts Only	Solo contatti
+Message Alerts	Avvisi messaggi
+Backup Status	Stato backup
+Backup Settings	Backup impostazioni
+Restore Settings	Ripristina impostazioni
+No backup found	Nessun backup trovato
+Backup unsupported	Backup non supportato
+SD not detected	Scheda SD non rilevata
+Backup found	Backup trovato
+Insert SD card to backup settings	Inserisci una scheda SD per salvare le impostazioni
+Backup failed	Backup non riuscito
+Settings backup saved to SD	Backup impostazioni salvato su SD
+Insert SD card to restore settings	Inserisci una scheda SD per ripristinare le impostazioni
+No settings backup found	Nessun backup impostazioni trovato
+Restore failed	Ripristino non riuscito
+Settings restored. Restarting...	Impostazioni ripristinate. Riavvio...
+Overwrite current settings and restart?	Sovrascrivere le impostazioni correnti e riavviare?
+Restore	Ripristina
diff --git a/packs/europe-latin-ext/locales/nl/strings.tsv b/packs/europe-latin-ext/locales/nl/strings.tsv
index 19fda9cf..cef2cb1f 100644
--- a/packs/europe-latin-ext/locales/nl/strings.tsv
+++ b/packs/europe-latin-ext/locales/nl/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	Update-interval
 Use Preset	Voorinstelling gebruiken
 Wi-Fi Enabled	Wi-Fi Ingeschakeld
 Wi-Fi start failed	Wi-Fi starten mislukt
+All	Alles
+Contact Alerts	Contactmeldingen
+Contacts Only	Alleen contacten
+Message Alerts	Berichtmeldingen
+Backup Status	Back-upstatus
+Backup Settings	Instellingen back-uppen
+Restore Settings	Instellingen herstellen
+No backup found	Geen back-up gevonden
+Backup unsupported	Back-up niet ondersteund
+SD not detected	SD-kaart niet gedetecteerd
+Backup found	Back-up gevonden
+Insert SD card to backup settings	Plaats een SD-kaart om instellingen te back-uppen
+Backup failed	Back-up mislukt
+Settings backup saved to SD	Instellingenback-up opgeslagen op SD
+Insert SD card to restore settings	Plaats een SD-kaart om instellingen te herstellen
+No settings backup found	Geen instellingenback-up gevonden
+Restore failed	Herstellen mislukt
+Settings restored. Restarting...	Instellingen hersteld. Opnieuw starten...
+Overwrite current settings and restart?	Huidige instellingen overschrijven en opnieuw starten?
+Restore	Herstellen
diff --git a/packs/europe-latin-ext/locales/pl/strings.tsv b/packs/europe-latin-ext/locales/pl/strings.tsv
index 2f9beee0..e4aab3c8 100644
--- a/packs/europe-latin-ext/locales/pl/strings.tsv
+++ b/packs/europe-latin-ext/locales/pl/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	Interwał aktualizacji
 Use Preset	Użyj ustawienia wstępnego
 Wi-Fi Enabled	Wi-Fi Włączone
 Wi-Fi start failed	Wi-Fi uruchomienie nie powiodło się
+All	Wszystkie
+Contact Alerts	Alerty kontaktów
+Contacts Only	Tylko kontakty
+Message Alerts	Alerty wiadomości
+Backup Status	Stan kopii
+Backup Settings	Kopia ustawień
+Restore Settings	Przywróć ustawienia
+No backup found	Nie znaleziono kopii
+Backup unsupported	Kopia nieobsługiwana
+SD not detected	Nie wykryto karty SD
+Backup found	Znaleziono kopię
+Insert SD card to backup settings	Włóż kartę SD, aby zapisać ustawienia
+Backup failed	Tworzenie kopii nie powiodło się
+Settings backup saved to SD	Kopia ustawień zapisana na SD
+Insert SD card to restore settings	Włóż kartę SD, aby przywrócić ustawienia
+No settings backup found	Nie znaleziono kopii ustawień
+Restore failed	Przywracanie nie powiodło się
+Settings restored. Restarting...	Ustawienia przywrócone. Restart...
+Overwrite current settings and restart?	Nadpisać bieżące ustawienia i uruchomić ponownie?
+Restore	Przywróć
diff --git a/packs/europe-latin-ext/locales/pt-PT/strings.tsv b/packs/europe-latin-ext/locales/pt-PT/strings.tsv
index 569237b7..3932db58 100644
--- a/packs/europe-latin-ext/locales/pt-PT/strings.tsv
+++ b/packs/europe-latin-ext/locales/pt-PT/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	Intervalo de atualização
 Use Preset	Usar predefinição
 Wi-Fi Enabled	Wi-Fi Ativado
 Wi-Fi start failed	Wi-Fi falha na inicialização
+All	Todos
+Contact Alerts	Alertas de contactos
+Contacts Only	Só contactos
+Message Alerts	Alertas de mensagens
+Backup Status	Estado da cópia
+Backup Settings	Guardar definições
+Restore Settings	Restaurar definições
+No backup found	Nenhuma cópia encontrada
+Backup unsupported	Cópia não suportada
+SD not detected	Cartão SD não detetado
+Backup found	Cópia encontrada
+Insert SD card to backup settings	Insira um cartão SD para guardar definições
+Backup failed	Falha ao guardar cópia
+Settings backup saved to SD	Cópia das definições guardada no SD
+Insert SD card to restore settings	Insira um cartão SD para restaurar definições
+No settings backup found	Nenhuma cópia de definições encontrada
+Restore failed	Falha ao restaurar
+Settings restored. Restarting...	Definições restauradas. A reiniciar...
+Overwrite current settings and restart?	Substituir as definições atuais e reiniciar?
+Restore	Restaurar
diff --git a/packs/europe-latin-ext/package.ini b/packs/europe-latin-ext/package.ini
index e18ec3f8..32a0185d 100644
--- a/packs/europe-latin-ext/package.ini
+++ b/packs/europe-latin-ext/package.ini
@@ -1,7 +1,7 @@
 kind=package
 id=europe-latin-ext
 package_type=locale-bundle
-version=1.1.0
+version=1.1.1
 display_name=European Latin Extended
 summary=Shared Latin-Extended font coverage plus German, Spanish, French, Italian, Dutch, Polish, and Portuguese review locale packs.
 description=DESCRIPTION.txt
diff --git a/packs/ja/README.md b/packs/ja/README.md
index 3ebbea53..6202a01d 100644
--- a/packs/ja/README.md
+++ b/packs/ja/README.md
@@ -65,7 +65,7 @@ Notes:
 
 `python scripts/build_pack_repository.py --pack-root packs --site-root site` produces:
 
-- `site/assets/packs/ja-1.1.0.zip`
+- `site/assets/packs/ja-1.1.1.zip`
 - `site/data/packs.json`
 
 The zip is the bundle artifact for a future Extensions downloader. Its `payload/` directory unpacks into `/trailmate/packs/...`.
diff --git a/packs/ja/locales/ja/strings.tsv b/packs/ja/locales/ja/strings.tsv
index a0f5c1e6..197097bb 100644
--- a/packs/ja/locales/ja/strings.tsv
+++ b/packs/ja/locales/ja/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	更新間隔
 Use Preset	プリセットを使用する
 Wi-Fi Enabled	Wi-Fi 有効
 Wi-Fi start failed	Wi-Fi の開始に失敗しました
+All	すべて
+Contact Alerts	連絡先通知
+Contacts Only	連絡先のみ
+Message Alerts	メッセージ通知
+Backup Status	バックアップ状態
+Backup Settings	設定をバックアップ
+Restore Settings	設定を復元
+No backup found	バックアップが見つかりません
+Backup unsupported	バックアップは未対応です
+SD not detected	SDカードが検出されません
+Backup found	バックアップが見つかりました
+Insert SD card to backup settings	設定をバックアップするにはSDカードを挿入してください
+Backup failed	バックアップに失敗しました
+Settings backup saved to SD	設定バックアップをSDに保存しました
+Insert SD card to restore settings	設定を復元するにはSDカードを挿入してください
+No settings backup found	設定バックアップが見つかりません
+Restore failed	復元に失敗しました
+Settings restored. Restarting...	設定を復元しました。再起動中...
+Overwrite current settings and restart?	現在の設定を上書きして再起動しますか？
+Restore	復元
diff --git a/packs/ja/package.ini b/packs/ja/package.ini
index 06e4eee6..cd887e50 100644
--- a/packs/ja/package.ini
+++ b/packs/ja/package.ini
@@ -1,7 +1,7 @@
 kind=package
 id=ja
 package_type=locale-bundle
-version=1.1.0
+version=1.1.1
 display_name=Japanese
 summary=Japanese review locale bundle with external CJK font coverage for UI text and mixed-language content; display-only until Japanese input is implemented.
 description=DESCRIPTION.txt
diff --git a/packs/ko/README.md b/packs/ko/README.md
index 6f75f258..fd93790c 100644
--- a/packs/ko/README.md
+++ b/packs/ko/README.md
@@ -65,7 +65,7 @@ Notes:
 
 `python scripts/build_pack_repository.py --pack-root packs --site-root site` produces:
 
-- `site/assets/packs/ko-1.1.0.zip`
+- `site/assets/packs/ko-1.1.1.zip`
 - `site/data/packs.json`
 
 The zip is the bundle artifact for a future Extensions downloader. Its `payload/` directory unpacks into `/trailmate/packs/...`.
diff --git a/packs/ko/locales/ko/strings.tsv b/packs/ko/locales/ko/strings.tsv
index dbe2654f..d2bc5a8e 100644
--- a/packs/ko/locales/ko/strings.tsv
+++ b/packs/ko/locales/ko/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	업데이트 간격
 Use Preset	프리셋 사용
 Wi-Fi Enabled	Wi-Fi 활성화됨
 Wi-Fi start failed	Wi-Fi 시작 실패
+All	전체
+Contact Alerts	연락처 알림
+Contacts Only	연락처만
+Message Alerts	메시지 알림
+Backup Status	백업 상태
+Backup Settings	설정 백업
+Restore Settings	설정 복원
+No backup found	백업을 찾을 수 없음
+Backup unsupported	백업을 지원하지 않음
+SD not detected	SD 카드가 감지되지 않음
+Backup found	백업을 찾음
+Insert SD card to backup settings	설정을 백업하려면 SD 카드를 넣으세요
+Backup failed	백업 실패
+Settings backup saved to SD	설정 백업이 SD에 저장됨
+Insert SD card to restore settings	설정을 복원하려면 SD 카드를 넣으세요
+No settings backup found	설정 백업을 찾을 수 없음
+Restore failed	복원 실패
+Settings restored. Restarting...	설정이 복원되었습니다. 다시 시작 중...
+Overwrite current settings and restart?	현재 설정을 덮어쓰고 다시 시작할까요?
+Restore	복원
diff --git a/packs/ko/package.ini b/packs/ko/package.ini
index 9a548ec4..828a58cf 100644
--- a/packs/ko/package.ini
+++ b/packs/ko/package.ini
@@ -1,7 +1,7 @@
 kind=package
 id=ko
 package_type=locale-bundle
-version=1.1.0
+version=1.1.1
 display_name=Korean
 summary=Korean review locale bundle with external CJK font coverage for UI text and mixed-language content; display-only until Korean input is implemented.
 description=DESCRIPTION.txt
diff --git a/packs/zh-Hans/README.md b/packs/zh-Hans/README.md
index b0b17de8..fe366ee2 100644
--- a/packs/zh-Hans/README.md
+++ b/packs/zh-Hans/README.md
@@ -125,7 +125,7 @@ Notes:
 
 `python scripts/build_pack_repository.py --pack-root packs --site-root site` produces:
 
-- `site/assets/packs/zh-Hans-1.1.0.zip`
+- `site/assets/packs/zh-Hans-1.1.1.zip`
 - `site/data/packs.json`
 
 The zip is the bundle artifact used by the Extensions downloader. Its `payload/`
diff --git a/packs/zh-Hans/locales/zh-Hans/strings.tsv b/packs/zh-Hans/locales/zh-Hans/strings.tsv
index 097690ae..bcd7105e 100644
--- a/packs/zh-Hans/locales/zh-Hans/strings.tsv
+++ b/packs/zh-Hans/locales/zh-Hans/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	更新间隔
 Use Preset	使用预设
 Wi-Fi Enabled	启用 Wi-Fi
 Wi-Fi start failed	Wi-Fi 启动失败
+All	全部
+Contact Alerts	联系人提示
+Contacts Only	仅联系人
+Message Alerts	消息提示
+Backup Status	备份状态
+Backup Settings	备份设置
+Restore Settings	还原设置
+No backup found	未找到备份
+Backup unsupported	不支持备份
+SD not detected	未检测到 SD 卡
+Backup found	已找到备份
+Insert SD card to backup settings	插入 SD 卡后再备份设置
+Backup failed	备份失败
+Settings backup saved to SD	设置备份已保存到 SD 卡
+Insert SD card to restore settings	插入 SD 卡后再还原设置
+No settings backup found	未找到设置备份
+Restore failed	还原失败
+Settings restored. Restarting...	设置已还原，正在重启...
+Overwrite current settings and restart?	覆盖当前设置并重启?
+Restore	还原
diff --git a/packs/zh-Hans/package.ini b/packs/zh-Hans/package.ini
index 278f8f8c..e5aac508 100644
--- a/packs/zh-Hans/package.ini
+++ b/packs/zh-Hans/package.ini
@@ -1,7 +1,7 @@
 kind=package
 id=zh-Hans
 package_type=locale-bundle
-version=1.1.0
+version=1.1.1
 display_name=Simplified Chinese
 summary=Tiered Simplified Chinese locale bundle with a fast core font, an on-demand extension font, and the built-in Pinyin IME backend.
 description=DESCRIPTION.txt
diff --git a/packs/zh-Hant/README.md b/packs/zh-Hant/README.md
index 7f5396c4..3db79006 100644
--- a/packs/zh-Hant/README.md
+++ b/packs/zh-Hant/README.md
@@ -65,7 +65,7 @@ Notes:
 
 `python scripts/build_pack_repository.py --pack-root packs --site-root site` produces:
 
-- `site/assets/packs/zh-Hant-1.1.0.zip`
+- `site/assets/packs/zh-Hant-1.1.1.zip`
 - `site/data/packs.json`
 
 The zip is the bundle artifact for a future Extensions downloader. Its `payload/` directory unpacks into `/trailmate/packs/...`.
diff --git a/packs/zh-Hant/locales/zh-Hant/strings.tsv b/packs/zh-Hant/locales/zh-Hant/strings.tsv
index ec839521..d94504f3 100644
--- a/packs/zh-Hant/locales/zh-Hant/strings.tsv
+++ b/packs/zh-Hant/locales/zh-Hant/strings.tsv
@@ -616,3 +616,23 @@ Update Interval	更新間隔
 Use Preset	使用預設
 Wi-Fi Enabled	啟用 Wi-Fi
 Wi-Fi start failed	Wi-Fi 啟動失敗
+All	全部
+Contact Alerts	聯絡人提示
+Contacts Only	僅聯絡人
+Message Alerts	訊息提示
+Backup Status	備份狀態
+Backup Settings	備份設定
+Restore Settings	還原設定
+No backup found	未找到備份
+Backup unsupported	不支援備份
+SD not detected	未偵測到 SD 卡
+Backup found	已找到備份
+Insert SD card to backup settings	插入 SD 卡後再備份設定
+Backup failed	備份失敗
+Settings backup saved to SD	設定備份已儲存到 SD 卡
+Insert SD card to restore settings	插入 SD 卡後再還原設定
+No settings backup found	未找到設定備份
+Restore failed	還原失敗
+Settings restored. Restarting...	設定已還原，正在重新啟動...
+Overwrite current settings and restart?	覆蓋目前設定並重新啟動？
+Restore	還原
diff --git a/packs/zh-Hant/package.ini b/packs/zh-Hant/package.ini
index 344b6876..f128ec8f 100644
--- a/packs/zh-Hant/package.ini
+++ b/packs/zh-Hant/package.ini
@@ -1,7 +1,7 @@
 kind=package
 id=zh-Hant
 package_type=locale-bundle
-version=1.1.0
+version=1.1.1
 display_name=Traditional Chinese (Taiwan)
 summary=Traditional Chinese (Taiwan) review locale bundle with CJK font coverage; display-only until native review and a real Zhuyin-focused IME are available.
 description=DESCRIPTION.txt
diff --git a/apps/esp_pio/include/apps/esp_pio/app_context.h b/platform/esp/arduino_common/include/app/app_context.h
similarity index 93%
rename from apps/esp_pio/include/apps/esp_pio/app_context.h
rename to platform/esp/arduino_common/include/app/app_context.h
index 52ffda8d..16e5e5d3 100644
--- a/apps/esp_pio/include/apps/esp_pio/app_context.h
+++ b/platform/esp/arduino_common/include/app/app_context.h
@@ -1,6 +1,6 @@
 /**
  * @file app_context.h
- * @brief Application context (dependency injection)
+ * @brief ESP Arduino application context implementation.
  */
 
 #pragma once
@@ -9,6 +9,7 @@
 #include "app/app_context_platform_bindings.h"
 #include "app/app_event_runtime.h"
 #include "app/app_facades.h"
+
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -59,10 +60,6 @@ class ITeamPairingEventSink;
 namespace app
 {
 
-/**
- * @brief Application context
- * Manages all dependencies and provides singleton access
- */
 class AppContext final : public IAppBleFacade
 {
   public:
@@ -80,8 +77,8 @@ class AppContext final : public IAppBleFacade
     {
         return *contact_service_;
     }
-    chat::ui::IChatUiRuntime* getChatUiRuntime() override;
 
+    chat::ui::IChatUiRuntime* getChatUiRuntime() override;
     void setChatUiRuntime(chat::ui::IChatUiRuntime* runtime) override;
 
     team::TeamController* getTeamController() override
@@ -133,9 +130,7 @@ class AppContext final : public IAppBleFacade
     }
 
     chat::NodeId getSelfNodeId() const override;
-
     chat::IMeshAdapter* getMeshAdapter() override;
-
     const chat::IMeshAdapter* getMeshAdapter() const override;
 
     LoraBoard* getLoraBoard()
@@ -186,24 +181,12 @@ class AppContext final : public IAppBleFacade
 
     void applyMeshConfig() override;
     void applyUserInfo() override;
-
-    /** Apply position/GPS config to GpsService (interval, GNSS mode). Call after changing config_.gps_* */
     void applyPositionConfig() override;
-
     void broadcastNodeInfo() override;
-
     void getEffectiveUserInfo(char* out_long, size_t long_len,
                               char* out_short, size_t short_len) const override;
-
     void applyNetworkLimits() override;
     void applyPrivacyConfig() override;
-
-    /**
-     * @brief Switch active mesh protocol backend at runtime
-     * @param protocol Target protocol backend
-     * @param persist Save config to NVS if true
-     * @return true on success
-     */
     bool switchMeshProtocol(chat::MeshProtocol protocol, bool persist = true) override;
 
     void applyChatDefaults() override
@@ -216,9 +199,6 @@ class AppContext final : public IAppBleFacade
         }
     }
 
-    /**
-     * @brief Reset mesh config to defaults and apply
-     */
     void resetMeshConfig() override
     {
         if (config_.mesh_protocol == chat::MeshProtocol::MeshCore)
@@ -261,7 +241,6 @@ class AppContext final : public IAppBleFacade
     }
 
     void attachBleManager(std::unique_ptr<ble::BleManager> ble_manager);
-
     void setBleEnabled(bool enabled) override;
     bool isBleEnabled() const override;
 
diff --git a/platform/esp/arduino_common/include/ble/app_phone_facade.h b/platform/esp/arduino_common/include/ble/app_phone_facade.h
new file mode 100644
index 00000000..91df13f7
--- /dev/null
+++ b/platform/esp/arduino_common/include/ble/app_phone_facade.h
@@ -0,0 +1,147 @@
+#pragma once
+
+#include "app/app_facades.h"
+#include "phone/common/phone_app_facade.h"
+#include "phone/meshcore/meshcore_phone_core.h"
+#include "phone/meshtastic/meshtastic_phone_core.h"
+#include "platform/shared/ble/phone_ble_runtime.h"
+
+#include <cstddef>
+#include <string>
+
+namespace chat::meshcore
+{
+class IMeshCoreBleBackend;
+}
+
+namespace ble
+{
+
+class AppPhoneFacade final : public phone::IPhoneAppFacade,
+                             public phone::meshtastic::MeshtasticPhoneBluetoothConfigHooks,
+                             public phone::meshtastic::MeshtasticPhoneModuleConfigHooks,
+                             public phone::meshtastic::MeshtasticPhoneConfigLifecycleHooks,
+                             public phone::meshtastic::MeshtasticPhoneStatusHooks,
+                             public phone::meshtastic::MeshtasticPhoneMqttHooks,
+                             public phone::meshtastic::MeshtasticPhoneDeviceRuntimeHooks,
+                             public phone::meshcore::MeshCorePhoneHooks
+{
+  public:
+    AppPhoneFacade(app::IAppBleFacade& app,
+                   meshtastic_Config_BluetoothConfig& bluetooth_config,
+                   meshtastic_LocalModuleConfig& module_config,
+                   platform::shared::ble_bridge::IPhoneBleRuntime* ble_runtime = nullptr);
+
+    void setBleRuntime(platform::shared::ble_bridge::IPhoneBleRuntime* runtime);
+    void syncMeshtasticMqttProxySettings(const meshtastic_LocalModuleConfig& module_config);
+
+    phone::MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const override;
+    void setMeshtasticPhoneConfig(const phone::MeshtasticPhoneConfigSnapshot& config) override;
+    phone::MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const override;
+    void setMeshCorePhoneConfig(const phone::MeshCorePhoneConfigSnapshot& config) override;
+    void saveConfig() override;
+    void applyMeshConfig() override;
+    void applyUserInfo() override;
+    void applyPositionConfig() override;
+    void getEffectiveUserInfo(char* out_long,
+                              std::size_t long_len,
+                              char* out_short,
+                              std::size_t short_len) const override;
+    chat::NodeId getSelfNodeId() const override;
+    bool sendPhoneText(chat::ChannelId channel,
+                       const std::string& text,
+                       chat::MessageId forced_msg_id,
+                       chat::NodeId peer,
+                       chat::MessageId& out_msg_id) override;
+    bool sendPhoneAppData(chat::ChannelId channel,
+                          uint32_t portnum,
+                          const uint8_t* payload,
+                          std::size_t len,
+                          chat::NodeId dest,
+                          bool want_ack,
+                          chat::MessageId packet_id,
+                          bool want_response) override;
+    bool pollIncomingPhoneData(chat::MeshIncomingData& out) override;
+    std::size_t phoneNodeCount() const override;
+    bool getPhoneNodeByIndex(std::size_t index, phone::PhoneNodeView& out) const override;
+    bool findPhoneNode(chat::NodeId node_id, phone::PhoneNodeView& out) const override;
+    bool isMeshPkiReady() const override;
+    bool isBleEnabled() const override;
+    void setBleEnabled(bool enabled) override;
+    bool getDeviceMacAddress(uint8_t out_mac[6]) const override;
+    bool syncCurrentEpochSeconds(uint32_t epoch_seconds) override;
+    void resetMeshConfig() override;
+    void clearNodeDb() override;
+    void clearMessageDb() override;
+    void restartDevice() override;
+
+    bool loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const override;
+    void saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config) override;
+    bool loadModuleConfig(meshtastic_LocalModuleConfig* out) const override;
+    void saveModuleConfig(const meshtastic_LocalModuleConfig& config) override;
+    void onConfigStart() override;
+    void onConfigComplete() override;
+    bool loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const override;
+    bool handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg) override;
+    bool pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out) override;
+    bool loadTimezoneTzdef(char* out, size_t out_len) const override;
+    void saveTimezoneTzdef(const char* tzdef) override;
+    int getTimezoneOffsetMinutes() const override;
+    void setTimezoneOffsetMinutes(int offset_min) override;
+    bool getGpsFix(phone::meshtastic::MeshtasticGpsFix* out) const override;
+
+    phone::meshcore::MeshCorePhoneBatteryInfo getBatteryInfo() const override;
+    bool getCustomVars(std::string* out) const override;
+    bool setCustomVar(const char* key, const char* value) override;
+    bool setTuningParams(const phone::meshcore::MeshCorePhoneTuningParams& params) override;
+    bool getTuningParams(phone::meshcore::MeshCorePhoneTuningParams* out) const override;
+    bool meshCoreExportIdentityPublicKey(uint8_t* out_pubkey, std::size_t len) override;
+    bool meshCoreExportIdentityPrivateKey(uint8_t* out_priv, std::size_t len) override;
+    bool meshCoreImportIdentityPrivateKey(const uint8_t* in_priv, std::size_t len) override;
+    bool meshCoreSignPayload(const uint8_t* data, std::size_t len, uint8_t* out_sig, std::size_t out_len) override;
+    bool meshCoreSendSelfAdvert(bool broadcast) override;
+    bool meshCoreSendPeerRequestType(const uint8_t* pubkey,
+                                     std::size_t len,
+                                     uint8_t req_type,
+                                     uint32_t* out_tag,
+                                     uint32_t* out_est_timeout,
+                                     bool* out_sent_flood) override;
+    bool meshCoreSendPeerRequestPayload(const uint8_t* pubkey,
+                                        std::size_t len,
+                                        const uint8_t* payload,
+                                        std::size_t payload_len,
+                                        bool force_flood,
+                                        uint32_t* out_tag,
+                                        uint32_t* out_est_timeout,
+                                        bool* out_sent_flood) override;
+    bool meshCoreSendAnonRequestPayload(const uint8_t* pubkey,
+                                        std::size_t len,
+                                        const uint8_t* payload,
+                                        std::size_t payload_len,
+                                        uint32_t* out_est_timeout,
+                                        bool* out_sent_flood) override;
+    bool meshCoreSendTracePath(const uint8_t* path,
+                               std::size_t path_len,
+                               uint32_t tag,
+                               uint32_t auth,
+                               uint8_t flags,
+                               uint32_t* out_est_timeout) override;
+    bool meshCoreSendControlData(const uint8_t* payload, std::size_t payload_len) override;
+    bool meshCoreSendRawData(const uint8_t* path,
+                             std::size_t path_len,
+                             const uint8_t* payload,
+                             std::size_t payload_len,
+                             uint32_t* out_est_timeout) override;
+    void meshCoreSetFloodScopeKey(const uint8_t* key, std::size_t len) override;
+
+  private:
+    chat::meshcore::IMeshCoreBleBackend* meshCoreBackend();
+    const chat::meshcore::IMeshCoreBleBackend* meshCoreBackend() const;
+
+    app::IAppBleFacade& app_;
+    meshtastic_Config_BluetoothConfig& bluetooth_config_;
+    meshtastic_LocalModuleConfig& module_config_;
+    platform::shared::ble_bridge::IPhoneBleRuntime* ble_runtime_ = nullptr;
+};
+
+} // namespace ble
diff --git a/platform/esp/arduino_common/include/ble/meshcore_ble.h b/platform/esp/arduino_common/include/ble/meshcore_ble.h
index e027e338..c753ecf9 100644
--- a/platform/esp/arduino_common/include/ble/meshcore_ble.h
+++ b/platform/esp/arduino_common/include/ble/meshcore_ble.h
@@ -1,10 +1,12 @@
 #pragma once
 
 #include "app/app_facades.h"
+#include "ble/app_phone_facade.h"
 #include "ble/ble_manager.h"
-#include "chat/ble/meshcore_phone_core.h"
 #include "chat/ports/i_node_store.h"
 #include "chat/usecase/chat_service.h"
+#include "phone/meshcore/meshcore_phone_core.h"
+#include "phone/meshtastic/meshtastic_phone_core.h"
 #include "platform/esp/arduino_common/chat/infra/meshcore/meshcore_adapter.h"
 #include "team/usecase/team_service.h"
 #include <NimBLEDevice.h>
@@ -19,10 +21,9 @@ namespace ble
 {
 
 class MeshCoreBleService : public BleService,
-                           public MeshCorePhoneHooks,
+                           public phone::meshcore::MeshCorePhoneHooks,
                            public chat::ChatService::IncomingTextObserver,
-                           public team::TeamService::IncomingDataObserver,
-                           public IPhoneRuntimeContext
+                           public team::TeamService::IncomingDataObserver
 {
   public:
     MeshCoreBleService(app::IAppBleFacade& ctx, const std::string& device_name);
@@ -61,6 +62,9 @@ class MeshCoreBleService : public BleService,
     } __attribute__((packed));
 
     app::IAppBleFacade& ctx_;
+    meshtastic_Config_BluetoothConfig phone_ble_config_ = meshtastic_Config_BluetoothConfig_init_zero;
+    meshtastic_LocalModuleConfig phone_module_config_ = meshtastic_LocalModuleConfig_init_zero;
+    AppPhoneFacade phone_facade_;
     std::string device_name_;
     NimBLEServer* server_ = nullptr;
     NimBLEService* service_ = nullptr;
@@ -125,7 +129,7 @@ class MeshCoreBleService : public BleService,
         uint16_t keep_alive_secs = 0;
     };
     std::vector<ConnectionEntry> connections_;
-    std::unique_ptr<MeshCorePhoneCore> shared_core_;
+    std::unique_ptr<phone::meshcore::MeshCorePhoneCore> shared_core_;
 
     void setupService();
     void startAdvertising();
@@ -173,8 +177,8 @@ class MeshCoreBleService : public BleService,
     uint32_t deriveNodeIdFromPubkey(const uint8_t* pubkey, size_t len) const;
     bool shouldUseSharedCore(uint8_t cmd) const;
     bool handleViaSharedCore(size_t len);
-    MeshCorePhoneBatteryInfo getBatteryInfo() const override;
-    MeshCorePhoneLocation getAdvertLocation() const override;
+    phone::meshcore::MeshCorePhoneBatteryInfo getBatteryInfo() const override;
+    phone::meshcore::MeshCorePhoneLocation getAdvertLocation() const override;
     uint32_t getReportedBlePin() const override;
     uint8_t getAdvertLocationPolicy() const override;
     uint8_t getTelemetryModeBits() const override;
@@ -189,8 +193,8 @@ class MeshCoreBleService : public BleService,
                           uint32_t* out_ts, uint8_t* out_path, size_t* inout_len) const override;
     bool hasActiveConnection(const uint8_t* prefix, size_t len) const override;
     void logoutActiveConnection(const uint8_t* prefix, size_t len) override;
-    bool getRadioStats(MeshCorePhoneRadioStats* out) const override;
-    bool getPacketStats(MeshCorePhonePacketStats* out) const override;
+    bool getRadioStats(phone::meshcore::MeshCorePhoneRadioStats* out) const override;
+    bool getPacketStats(phone::meshcore::MeshCorePhonePacketStats* out) const override;
     bool setAdvertLocation(int32_t lat, int32_t lon) override;
     bool upsertContactFromFrame(const uint8_t* frame, size_t len) override;
     bool removeContact(const uint8_t* pubkey, size_t len) override;
@@ -198,47 +202,14 @@ class MeshCoreBleService : public BleService,
     bool importContact(const uint8_t* frame, size_t len) override;
     bool shareContact(const uint8_t* pubkey, size_t len) override;
     bool popOfflineMessage(uint8_t* out, size_t* out_len) override;
-    bool setTuningParams(const MeshCorePhoneTuningParams& params) override;
-    bool getTuningParams(MeshCorePhoneTuningParams* out) const override;
+    bool setTuningParams(const phone::meshcore::MeshCorePhoneTuningParams& params) override;
+    bool getTuningParams(phone::meshcore::MeshCorePhoneTuningParams* out) const override;
     bool setOtherParams(uint8_t manual_add_contacts, uint8_t telemetry_bits,
                         bool has_multi_acks, uint8_t advert_loc_policy, uint8_t multi_acks) override;
     bool setDevicePin(uint32_t pin) override;
     bool getCustomVars(std::string* out) const override;
     bool setCustomVar(const char* key, const char* value) override;
     void onFactoryReset() override;
-    MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const override;
-    void setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config) override;
-    MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const override;
-    void setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config) override;
-    void saveConfig() override { ctx_.saveConfig(); }
-    void applyMeshConfig() override { ctx_.applyMeshConfig(); }
-    void applyUserInfo() override { ctx_.applyUserInfo(); }
-    void applyPositionConfig() override { ctx_.applyPositionConfig(); }
-    void getEffectiveUserInfo(char* out_long,
-                              std::size_t long_len,
-                              char* out_short,
-                              std::size_t short_len) const override
-    {
-        ctx_.getEffectiveUserInfo(out_long, long_len, out_short, short_len);
-    }
-    chat::ChatService& getChatService() override { return ctx_.getChatService(); }
-    chat::contacts::ContactService& getContactService() override { return ctx_.getContactService(); }
-    chat::IMeshAdapter* getMeshAdapter() override { return ctx_.getMeshAdapter(); }
-    const chat::IMeshAdapter* getMeshAdapter() const override { return ctx_.getMeshAdapter(); }
-    chat::contacts::INodeStore* getNodeStore() override { return ctx_.getNodeStore(); }
-    const chat::contacts::INodeStore* getNodeStore() const override { return ctx_.getNodeStore(); }
-    chat::NodeId getSelfNodeId() const override { return ctx_.getSelfNodeId(); }
-    bool isBleEnabled() const override { return ctx_.isBleEnabled(); }
-    void setBleEnabled(bool enabled) override { ctx_.setBleEnabled(enabled); }
-    bool getDeviceMacAddress(uint8_t out_mac[6]) const override { return ctx_.getDeviceMacAddress(out_mac); }
-    bool syncCurrentEpochSeconds(uint32_t epoch_seconds) override
-    {
-        return ctx_.syncCurrentEpochSeconds(epoch_seconds);
-    }
-    void resetMeshConfig() override { ctx_.resetMeshConfig(); }
-    void clearNodeDb() override { ctx_.clearNodeDb(); }
-    void clearMessageDb() override { ctx_.clearMessageDb(); }
-    void restartDevice() override { ctx_.restartDevice(); }
 };
 
 } // namespace ble
diff --git a/platform/esp/arduino_common/include/ble/meshtastic_ble.h b/platform/esp/arduino_common/include/ble/meshtastic_ble.h
index 3942b7d7..aed2e390 100644
--- a/platform/esp/arduino_common/include/ble/meshtastic_ble.h
+++ b/platform/esp/arduino_common/include/ble/meshtastic_ble.h
@@ -1,11 +1,10 @@
 #pragma once
 
 #include "app/app_facades.h"
+#include "ble/app_phone_facade.h"
 #include "ble/ble_manager.h"
-#include "chat/ble/meshtastic_phone_session.h"
+#include "chat/domain/chat_types.h"
 #include "chat/infra/meshtastic/mt_codec_pb.h"
-#include "chat/ports/i_node_store.h"
-#include "chat/usecase/chat_service.h"
 #include "meshtastic/admin.pb.h"
 #include "meshtastic/channel.pb.h"
 #include "meshtastic/config.pb.h"
@@ -13,29 +12,24 @@
 #include "meshtastic/localonly.pb.h"
 #include "meshtastic/mesh.pb.h"
 #include "meshtastic/module_config.pb.h"
-#include "team/usecase/team_service.h"
+#include "phone/meshtastic/meshtastic_phone_session.h"
+#include "platform/shared/ble/phone_ble_runtime.h"
 #include <NimBLEDevice.h>
 #include <array>
 #include <atomic>
 #include <deque>
+#include <memory>
 #include <string>
 #include <vector>
 
 namespace ble
 {
 
+class MeshtasticBleObserverBridge;
+
 class MeshtasticBleService : public BleService,
-                             public chat::ChatService::IncomingTextObserver,
-                             public chat::ChatService::OutgoingTextObserver,
-                             public team::TeamService::IncomingDataObserver,
-                             public MeshtasticPhoneTransport,
-                             public MeshtasticPhoneBluetoothConfigHooks,
-                             public MeshtasticPhoneModuleConfigHooks,
-                             public MeshtasticPhoneConfigLifecycleHooks,
-                             public MeshtasticPhoneStatusHooks,
-                             public MeshtasticPhoneMqttHooks,
-                             public MeshtasticPhoneDeviceRuntimeHooks,
-                             public IPhoneRuntimeContext
+                             public phone::meshtastic::MeshtasticPhoneTransport,
+                             public platform::shared::ble_bridge::IPhoneBleRuntime
 {
   public:
     MeshtasticBleService(app::IAppBleFacade& ctx, const std::string& device_name);
@@ -45,61 +39,23 @@ class MeshtasticBleService : public BleService,
     void stop() override;
     void update() override;
 
-    void onIncomingText(const chat::MeshIncomingText& msg) override;
-    void onOutgoingText(const chat::MeshIncomingText& msg) override;
-    void onIncomingData(const chat::MeshIncomingData& msg) override;
+    void handleIncomingTextFromApp(const chat::MeshIncomingText& msg);
+    void handleOutgoingTextFromApp(const chat::MeshIncomingText& msg);
+    void handleIncomingDataFromApp(const chat::MeshIncomingData& msg);
     bool isBleConnected() const override;
     void notifyFromNum(uint32_t value) override;
-    bool loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const override;
-    void saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config) override;
-    bool loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const override;
-    bool loadModuleConfig(meshtastic_LocalModuleConfig* out) const override;
-    void saveModuleConfig(const meshtastic_LocalModuleConfig& config) override;
-    bool loadTimezoneTzdef(char* out, size_t out_len) const override;
-    void saveTimezoneTzdef(const char* tzdef) override;
-    int getTimezoneOffsetMinutes() const override;
-    void setTimezoneOffsetMinutes(int offset_min) override;
-    bool getGpsFix(MeshtasticGpsFix* out) const override;
-    MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const override;
-    void setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config) override;
-    MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const override;
-    void setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config) override;
-    void saveConfig() override { ctx_.saveConfig(); }
-    void applyMeshConfig() override { ctx_.applyMeshConfig(); }
-    void applyUserInfo() override { ctx_.applyUserInfo(); }
-    void applyPositionConfig() override { ctx_.applyPositionConfig(); }
-    void getEffectiveUserInfo(char* out_long,
-                              std::size_t long_len,
-                              char* out_short,
-                              std::size_t short_len) const override
-    {
-        ctx_.getEffectiveUserInfo(out_long, long_len, out_short, short_len);
-    }
-    chat::ChatService& getChatService() override { return ctx_.getChatService(); }
-    chat::contacts::ContactService& getContactService() override { return ctx_.getContactService(); }
-    chat::IMeshAdapter* getMeshAdapter() override { return ctx_.getMeshAdapter(); }
-    const chat::IMeshAdapter* getMeshAdapter() const override { return ctx_.getMeshAdapter(); }
-    chat::contacts::INodeStore* getNodeStore() override { return ctx_.getNodeStore(); }
-    const chat::contacts::INodeStore* getNodeStore() const override { return ctx_.getNodeStore(); }
-    chat::NodeId getSelfNodeId() const override { return ctx_.getSelfNodeId(); }
-    bool isBleEnabled() const override { return ctx_.isBleEnabled(); }
-    void setBleEnabled(bool enabled) override { ctx_.setBleEnabled(enabled); }
-    bool getDeviceMacAddress(uint8_t out_mac[6]) const override { return ctx_.getDeviceMacAddress(out_mac); }
-    bool syncCurrentEpochSeconds(uint32_t epoch_seconds) override
-    {
-        return ctx_.syncCurrentEpochSeconds(epoch_seconds);
-    }
-    void resetMeshConfig() override { ctx_.resetMeshConfig(); }
-    void clearNodeDb() override { ctx_.clearNodeDb(); }
-    void clearMessageDb() override { ctx_.clearMessageDb(); }
-    void restartDevice() override { ctx_.restartDevice(); }
-    bool handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg) override;
-    bool pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out) override;
-    void onConfigStart() override;
-    void onConfigComplete() override;
+    bool isPhoneBleConnected() const override;
+    uint32_t pendingPhoneBlePasskey() const override;
+    void requestPhoneHighThroughputConnection() override;
+    void requestPhoneLowerPowerConnection() override;
+    void onPhoneBluetoothConfigChanged() override;
+    void onPhoneModuleConfigChanged() override;
 
   private:
-    app::IAppBleFacade& ctx_;
+    meshtastic_Config_BluetoothConfig ble_config_ = meshtastic_Config_BluetoothConfig_init_zero;
+    meshtastic_LocalModuleConfig module_config_ = meshtastic_LocalModuleConfig_init_zero;
+    AppPhoneFacade phone_facade_;
+    std::unique_ptr<MeshtasticBleObserverBridge> observer_bridge_;
     std::string device_name_;
     NimBLEServer* server_ = nullptr;
     NimBLEService* service_ = nullptr;
@@ -119,10 +75,7 @@ class MeshtasticBleService : public BleService,
     std::atomic<uint32_t> pending_passkey_{0};
     int last_battery_level_ = -2;
 
-    meshtastic_Config_BluetoothConfig ble_config_ = meshtastic_Config_BluetoothConfig_init_zero;
-    meshtastic_LocalModuleConfig module_config_ = meshtastic_LocalModuleConfig_init_zero;
-
-    std::unique_ptr<MeshtasticPhoneSession> phone_session_;
+    std::unique_ptr<phone::meshtastic::MeshtasticPhoneSession> phone_session_;
 
     struct Frame
     {
diff --git a/platform/esp/arduino_common/include/ble/meshtastic_ble_observer_bridge.h b/platform/esp/arduino_common/include/ble/meshtastic_ble_observer_bridge.h
new file mode 100644
index 00000000..313f9282
--- /dev/null
+++ b/platform/esp/arduino_common/include/ble/meshtastic_ble_observer_bridge.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "app/app_facades.h"
+#include "chat/usecase/chat_service.h"
+#include "team/usecase/team_service.h"
+
+namespace ble
+{
+
+class MeshtasticBleService;
+
+class MeshtasticBleObserverBridge final : public chat::ChatService::IncomingTextObserver,
+                                          public chat::ChatService::OutgoingTextObserver,
+                                          public team::TeamService::IncomingDataObserver
+{
+  public:
+    MeshtasticBleObserverBridge(app::IAppBleFacade& app, MeshtasticBleService& service);
+    ~MeshtasticBleObserverBridge() override;
+
+    void registerObservers();
+    void unregisterObservers();
+
+    void onIncomingText(const chat::MeshIncomingText& msg) override;
+    void onOutgoingText(const chat::MeshIncomingText& msg) override;
+    void onIncomingData(const chat::MeshIncomingData& msg) override;
+
+  private:
+    app::IAppBleFacade& app_;
+    MeshtasticBleService& service_;
+    bool registered_ = false;
+};
+
+} // namespace ble
diff --git a/platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/meshtastic/mt_adapter.h b/platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/meshtastic/mt_adapter.h
index 5f481a6a..c8fc1bc3 100644
--- a/platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/meshtastic/mt_adapter.h
+++ b/platform/esp/arduino_common/include/platform/esp/arduino_common/chat/infra/meshtastic/mt_adapter.h
@@ -13,8 +13,10 @@
 #include "chat/ports/i_mesh_adapter.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/queue.h"
+#include "platform/esp/arduino_common/mesh/esp_meshtastic_adapter_bridge.h"
 #include <array>
 #include <map>
+#include <memory>
 #include <queue>
 #include <string>
 
@@ -118,10 +120,10 @@ class MtAdapter : public chat::IMeshAdapter
     uint8_t mac_addr_[6];
     uint32_t last_nodeinfo_ms_;
     uint8_t primary_channel_hash_;
-    uint8_t primary_psk_[16];
+    uint8_t primary_psk_[chat::kMeshtasticChannelKeyMaxLen];
     size_t primary_psk_len_;
     uint8_t secondary_channel_hash_;
-    uint8_t secondary_psk_[16];
+    uint8_t secondary_psk_[chat::kMeshtasticChannelKeyMaxLen];
     size_t secondary_psk_len_;
     bool pki_ready_;
     std::array<uint8_t, 32> pki_public_key_;
@@ -191,6 +193,7 @@ class MtAdapter : public chat::IMeshAdapter
     std::queue<meshtastic_MqttClientProxyMessage> mqtt_proxy_queue_;
     MqttProxySettings mqtt_proxy_settings_;
     std::map<uint32_t, PendingAckState> pending_ack_states_;
+    std::unique_ptr<::platform::esp::arduino_common::mesh::EspMeshtasticAdapterBridge> core_bridge_;
 
     static constexpr size_t MAX_PACKET_SIZE = 255;
     static constexpr uint32_t RETRY_DELAY_MS = 1000;
@@ -239,6 +242,19 @@ class MtAdapter : public chat::IMeshAdapter
     void initNodeIdentity();
     void updateChannelKeys();
     bool transmitWirePacket(const uint8_t* wire_data, size_t wire_size);
+    bool sendChannelAppDataViaCore(uint32_t portnum,
+                                   const uint8_t* payload,
+                                   size_t len,
+                                   uint32_t dest_node,
+                                   bool effective_want_response,
+                                   MessageId msg_id,
+                                   uint8_t channel_hash,
+                                   const uint8_t* psk,
+                                   size_t psk_len,
+                                   uint8_t hop_limit,
+                                   bool air_want_ack,
+                                   uint8_t* out_wire_data,
+                                   size_t* inout_wire_size);
     void startRadioReceive();
     void trackPendingAck(uint32_t msg_id, uint32_t dest, ChannelId channel, uint8_t channel_hash,
                          const uint8_t* wire_data, size_t wire_size);
diff --git a/platform/esp/arduino_common/include/platform/esp/arduino_common/gps/gps_service_api.h b/platform/esp/arduino_common/include/platform/esp/arduino_common/gps/gps_service_api.h
index 100eae88..e59de13e 100644
--- a/platform/esp/arduino_common/include/platform/esp/arduino_common/gps/gps_service_api.h
+++ b/platform/esp/arduino_common/include/platform/esp/arduino_common/gps/gps_service_api.h
@@ -5,13 +5,19 @@
 #include "gps/domain/gnss_satellite.h"
 #include "gps/domain/gps_diagnostics.h"
 #include "gps/domain/gps_state.h"
+#include "gps/domain/location_fix.h"
 #include "gps/domain/motion_config.h"
+#include "gps/ports/i_location_source.h"
+#include "gps/ports/i_time_authority.h"
 #include "gps/usecase/gps_runtime_config.h"
 
 namespace gps
 {
 
 GpsState gps_get_data();
+bool gps_latest_fix(gps::LocationFix& out);
+const gps::ILocationSource& gps_location_source();
+const gps::ITimeAuthority& gps_time_authority();
 bool gps_get_gnss_snapshot(gps::GnssSatInfo* out, size_t max, size_t* out_count, gps::GnssStatus* status);
 GpsDiagnosticsSnapshot gps_get_diagnostics();
 uint32_t gps_get_last_motion_ms();
diff --git a/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_mesh_runtime_shell.h b/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_mesh_runtime_shell.h
new file mode 100644
index 00000000..052988be
--- /dev/null
+++ b/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_mesh_runtime_shell.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "mesh/usecase/mesh_session.h"
+
+namespace platform::esp::arduino_common::mesh
+{
+
+class EspMeshRuntimeShell final
+{
+  public:
+    explicit EspMeshRuntimeShell(::mesh::MeshSession& session);
+
+    bool start(const ::mesh::MeshRuntimeConfig& config);
+    void stop();
+    void tick();
+    ::mesh::SendResult sendDirect(const ::mesh::DirectMessageCommand& command);
+    ::mesh::MeshSessionState state() const;
+
+  private:
+    ::mesh::MeshSession& session_;
+};
+
+} // namespace platform::esp::arduino_common::mesh
diff --git a/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_meshtastic_adapter_bridge.h b/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_meshtastic_adapter_bridge.h
new file mode 100644
index 00000000..c082036f
--- /dev/null
+++ b/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_meshtastic_adapter_bridge.h
@@ -0,0 +1,97 @@
+#pragma once
+
+#include "board/LoraBoard.h"
+#include "mesh/ports/i_clock.h"
+#include "mesh/ports/i_crypto_provider.h"
+#include "mesh/ports/i_mesh_event_sink.h"
+#include "mesh/ports/i_packet_radio.h"
+#include "mesh/protocol/meshtastic/meshtastic_protocol_strategy.h"
+#include "mesh/usecase/direct_message_service.h"
+#include "mesh/usecase/mesh_dedup_service.h"
+#include "mesh/usecase/mesh_session.h"
+#include "mesh/usecase/peer_identity_service.h"
+#include "mesh/usecase/receive_packet_service.h"
+#include "platform/esp/arduino_common/mesh/esp_preferences_mesh_identity_store.h"
+
+namespace platform::esp::arduino_common::mesh
+{
+
+class EspArduinoMeshClock final : public ::mesh::IClock
+{
+  public:
+    uint32_t nowMs() const override;
+};
+
+class EspArduinoMeshCryptoProvider final : public ::mesh::ICryptoProvider
+{
+  public:
+    ::mesh::CryptoResult random(uint8_t* out, size_t len) override;
+    ::mesh::CryptoResult sha256(::mesh::ByteView input, uint8_t out[32]) override;
+    ::mesh::CryptoResult aesCcmEncrypt(::mesh::ByteView key,
+                                       ::mesh::ByteView nonce,
+                                       ::mesh::ByteView aad,
+                                       ::mesh::ByteView plaintext,
+                                       uint8_t* ciphertext,
+                                       size_t ciphertext_capacity,
+                                       size_t& ciphertext_size) override;
+    ::mesh::CryptoResult aesCcmDecrypt(::mesh::ByteView key,
+                                       ::mesh::ByteView nonce,
+                                       ::mesh::ByteView aad,
+                                       ::mesh::ByteView ciphertext,
+                                       uint8_t* plaintext,
+                                       size_t plaintext_capacity,
+                                       size_t& plaintext_size) override;
+};
+
+class EspMeshtasticPacketRadio final : public ::mesh::IPacketRadio
+{
+  public:
+    explicit EspMeshtasticPacketRadio(LoraBoard& board);
+
+    ::mesh::RadioResult configure(const ::mesh::RadioConfig& config) override;
+    ::mesh::RadioResult send(::mesh::ByteView packet) override;
+    bool poll(::mesh::RadioRxPacket& out) override;
+
+  private:
+    LoraBoard& board_;
+    uint8_t last_sent_[256]{};
+    size_t last_sent_size_ = 0;
+
+    friend class EspMeshtasticAdapterBridge;
+};
+
+class EspMeshEventBridge final : public ::mesh::IMeshEventSink
+{
+  public:
+    void emit(const ::mesh::MeshEvent& event) override;
+
+    ::mesh::MeshEvent last_event{};
+    uint32_t emitted_count = 0;
+};
+
+class EspMeshtasticAdapterBridge final
+{
+  public:
+    explicit EspMeshtasticAdapterBridge(LoraBoard& board);
+
+    ::mesh::SendResult sendDirect(const ::mesh::DirectMessageCommand& command);
+    bool copyLastSentPacket(uint8_t* out, size_t capacity, size_t& out_size) const;
+    void onRadioPacket(const uint8_t* data, size_t size, int16_t rssi, int8_t snr);
+    void tick();
+
+  private:
+    EspMeshtasticPacketRadio radio_;
+    ::mesh::meshtastic::MeshtasticProtocolStrategy protocol_;
+    EspPreferencesLocalIdentityStore local_store_;
+    EspPreferencesPeerKeyStore peer_store_;
+    EspArduinoMeshCryptoProvider crypto_;
+    EspArduinoMeshClock clock_;
+    EspMeshEventBridge events_;
+    ::mesh::PeerIdentityService identity_;
+    ::mesh::MeshDedupService receive_dedup_;
+    ::mesh::ReceivePacketService receive_;
+    ::mesh::DirectMessageService direct_;
+    ::mesh::MeshSession session_;
+};
+
+} // namespace platform::esp::arduino_common::mesh
diff --git a/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_preferences_mesh_identity_store.h b/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_preferences_mesh_identity_store.h
new file mode 100644
index 00000000..dfddfda2
--- /dev/null
+++ b/platform/esp/arduino_common/include/platform/esp/arduino_common/mesh/esp_preferences_mesh_identity_store.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "mesh/ports/i_local_identity_store.h"
+#include "mesh/ports/i_peer_key_store.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <vector>
+
+namespace platform::esp::arduino_common::mesh
+{
+
+class EspPreferencesLocalIdentityStore final : public ::mesh::ILocalIdentityStore
+{
+  public:
+    struct Options
+    {
+        const char* ns = "chat";
+        const char* public_key = "pki_pub";
+        const char* private_key = "pki_priv";
+    };
+
+    EspPreferencesLocalIdentityStore();
+    explicit EspPreferencesLocalIdentityStore(const Options& options);
+
+    ::mesh::StoreResult load(::mesh::LocalIdentity& out) override;
+    ::mesh::StoreResult save(const ::mesh::LocalIdentity& identity) override;
+    ::mesh::StoreResult clear() override;
+
+  private:
+    Options options_;
+};
+
+class EspPreferencesPeerKeyStore final : public ::mesh::IPeerKeyStore
+{
+  public:
+    struct Options
+    {
+        const char* ns = "chat_pki";
+        const char* key = "pki_nodes";
+        const char* version_key = "pki_nodes_ver";
+        uint8_t version = 2;
+        size_t max_keys = 16;
+    };
+
+    EspPreferencesPeerKeyStore();
+    explicit EspPreferencesPeerKeyStore(const Options& options);
+
+    ::mesh::StoreResult get(::mesh::NodeId node_id, ::mesh::PeerPublicKey& out) override;
+    ::mesh::StoreResult put(const ::mesh::PeerPublicKey& key) override;
+    ::mesh::StoreResult remove(::mesh::NodeId node_id) override;
+    ::mesh::StoreResult clear() override;
+
+    ::mesh::StoreResult loadAll(std::vector<::mesh::PeerPublicKey>& out);
+    ::mesh::StoreResult replaceAll(const ::mesh::PeerPublicKey* keys, size_t count);
+
+  private:
+    ::mesh::StoreResult saveAll(std::vector<::mesh::PeerPublicKey>& keys);
+
+    Options options_;
+};
+
+} // namespace platform::esp::arduino_common::mesh
diff --git a/platform/esp/arduino_common/include/platform/esp/arduino_common/team/runtime/team_track_source_gps.h b/platform/esp/arduino_common/include/platform/esp/arduino_common/team/runtime/team_track_source_gps.h
index 74bce397..9900b7aa 100644
--- a/platform/esp/arduino_common/include/platform/esp/arduino_common/team/runtime/team_track_source_gps.h
+++ b/platform/esp/arduino_common/include/platform/esp/arduino_common/team/runtime/team_track_source_gps.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "gps/ports/i_location_source.h"
 #include "team/ports/i_team_track_source.h"
 
 namespace team::infra
@@ -8,7 +9,13 @@ namespace team::infra
 class TeamTrackSourceGps : public team::ITeamTrackSource
 {
   public:
+    TeamTrackSourceGps();
+    explicit TeamTrackSourceGps(const gps::ILocationSource& location_source);
+
     bool readTrackPoint(proto::TeamTrackPoint* out_point) override;
+
+  private:
+    const gps::ILocationSource* location_source_ = nullptr;
 };
 
 } // namespace team::infra
diff --git a/platform/esp/arduino_common/include/ui/widgets/map/map_tiles.h b/platform/esp/arduino_common/include/ui/widgets/map/map_tiles.h
index 0cb343ef..86d99034 100644
--- a/platform/esp/arduino_common/include/ui/widgets/map/map_tiles.h
+++ b/platform/esp/arduino_common/include/ui/widgets/map/map_tiles.h
@@ -6,6 +6,8 @@
 #ifndef MAP_TILES_H
 #define MAP_TILES_H
 
+#include "ui_map_runtime/map_tiles/map_tile_render_queue.h"
+
 #include "lvgl.h"
 #include <cstddef>
 #include <cstdint> // For int32_t
@@ -76,6 +78,7 @@ struct TileContext
     lv_obj_t* map_container; // Only UI dependency - for creating objects and getting size
     MapAnchor* anchor;
     std::vector<MapTile>* tiles;
+    ui::map_tiles::MapTileRenderQueue* render_queue;
     bool* has_map_data;         // Global: any tile ever loaded
     bool* has_visible_map_data; // Viewport: current visible tiles have PNG
 };
@@ -193,7 +196,9 @@ void set_map_render_options(uint8_t map_source, bool contour_enabled);
  * Initialize tile context
  */
 void init_tile_context(TileContext& ctx, lv_obj_t* map_container, MapAnchor* anchor,
-                       std::vector<MapTile>* tiles, bool* has_map_data, bool* has_visible_map_data);
+                       std::vector<MapTile>* tiles,
+                       ui::map_tiles::MapTileRenderQueue* render_queue,
+                       bool* has_map_data, bool* has_visible_map_data);
 
 /**
  * Cleanup tiles
diff --git a/platform/esp/arduino_common/library.json b/platform/esp/arduino_common/library.json
index 875917a6..58371467 100644
--- a/platform/esp/arduino_common/library.json
+++ b/platform/esp/arduino_common/library.json
@@ -14,6 +14,15 @@
                   "flags":  [
                                 "-I../../../platform/shared/include",
                                 "-I../../../modules/ui_shared/include",
+                                "-I../../../modules/ui_chat_runtime/include",
+                                "-I../../../modules/ui_map_runtime/include",
+                                "-I../../../modules/ui_gps_runtime/include",
+                                "-I../../../modules/ui_legacy_adapters/include",
+                                "-I../../../modules/ui_lvgl_core/include",
+                                "-I../../../modules/ui_lvgl_ux_packs/include",
+                                "-I../../../modules/core_device/include",
+                                "-I../../../modules/core_mesh/include",
+                                "-I../../../modules/core_phone/include",
                                 "-I../../../modules/core_sys/include",
                                 "-I../../../modules/core_chat/include",
                                 "-I../../../modules/core_gps/include",
@@ -28,8 +37,14 @@
                          {
                              "name":  "esp_boards"
                          },
+                         {
+                             "name":  "core_mesh"
+                         },
                          {
                              "name":  "trail_mate_codec2"
+                         },
+                         {
+                             "name":  "ui_map_runtime"
                          }
                      ]
 }
diff --git a/platform/esp/arduino_common/src/LV_Helper_v9.cpp b/platform/esp/arduino_common/src/LV_Helper_v9.cpp
index 182dcbb7..c8f332c6 100644
--- a/platform/esp/arduino_common/src/LV_Helper_v9.cpp
+++ b/platform/esp/arduino_common/src/LV_Helper_v9.cpp
@@ -39,7 +39,6 @@ static lv_indev_t* indev_keyboard;
 static lv_color16_t* buf = nullptr;
 static lv_color16_t* buf1 = nullptr;
 
-#if UI_FS_HAS_FLASH_PACK_STORAGE
 namespace
 {
 constexpr char kLvglFlashFsLetter = 'F';
@@ -96,12 +95,42 @@ bool flash_fs_ready_for_io()
     return ::ui::fs::ensure_flash_storage_ready(false);
 }
 
+bool flash_fs_ready_cb(lv_fs_drv_t* drv)
+{
+    LV_UNUSED(drv);
+    return flash_fs_ready_for_io();
+}
+
+void flash_fs_make_full_path(const char* path, char* out, size_t out_size)
+{
+    if (path == nullptr || path[0] == '\0')
+    {
+        lv_snprintf(out, out_size, "%s", kLvglFlashFsMountPoint);
+        return;
+    }
+
+    if (path[0] == '/')
+    {
+        lv_snprintf(out, out_size, "%s%s", kLvglFlashFsMountPoint, path);
+        return;
+    }
+
+    lv_snprintf(out, out_size, "%s/%s", kLvglFlashFsMountPoint, path);
+}
+
 void* flash_fs_open(lv_fs_drv_t* drv, const char* path, lv_fs_mode_t mode)
 {
     LV_UNUSED(drv);
+    static uint8_t s_open_fail_log_count = 0;
 
     if (!flash_fs_ready_for_io())
     {
+        if (s_open_fail_log_count < 8)
+        {
+            Serial.printf("[LVGL][FS] F open blocked: flash not ready path=%s\n",
+                          path ? path : "<null>");
+            ++s_open_fail_log_count;
+        }
         return nullptr;
     }
 
@@ -120,11 +149,20 @@ void* flash_fs_open(lv_fs_drv_t* drv, const char* path, lv_fs_mode_t mode)
     }
 
     char full_path[LV_FS_MAX_PATH_LEN];
-    lv_snprintf(full_path, sizeof(full_path), "%s%s", kLvglFlashFsMountPoint, path);
+    flash_fs_make_full_path(path, full_path, sizeof(full_path));
 
     const int fd = ::open(full_path, flags, 0666);
     if (fd < 0)
     {
+        if (s_open_fail_log_count < 8)
+        {
+            Serial.printf("[LVGL][FS] F open failed path=%s full=%s errno=%d mode=%u\n",
+                          path ? path : "<null>",
+                          full_path,
+                          errno,
+                          static_cast<unsigned>(mode));
+            ++s_open_fail_log_count;
+        }
         return nullptr;
     }
 
@@ -220,15 +258,31 @@ lv_fs_res_t flash_fs_tell(lv_fs_drv_t* drv, void* file_p, uint32_t* pos_p)
 void* flash_fs_dir_open(lv_fs_drv_t* drv, const char* path)
 {
     LV_UNUSED(drv);
+    static uint8_t s_dir_fail_log_count = 0;
 
     if (!flash_fs_ready_for_io())
     {
+        if (s_dir_fail_log_count < 8)
+        {
+            Serial.printf("[LVGL][FS] F dir_open blocked: flash not ready path=%s\n",
+                          path ? path : "<null>");
+            ++s_dir_fail_log_count;
+        }
         return nullptr;
     }
 
     char full_path[LV_FS_MAX_PATH_LEN];
-    lv_snprintf(full_path, sizeof(full_path), "%s%s", kLvglFlashFsMountPoint, path);
-    return ::opendir(full_path);
+    flash_fs_make_full_path(path, full_path, sizeof(full_path));
+    DIR* dir = ::opendir(full_path);
+    if (!dir && s_dir_fail_log_count < 8)
+    {
+        Serial.printf("[LVGL][FS] F dir_open failed path=%s full=%s errno=%d\n",
+                      path ? path : "<null>",
+                      full_path,
+                      errno);
+        ++s_dir_fail_log_count;
+    }
+    return dir;
 }
 
 lv_fs_res_t flash_fs_dir_read(lv_fs_drv_t* drv, void* dir_p, char* fn, uint32_t fn_len)
@@ -279,6 +333,7 @@ void init_flash_fs_driver()
 
     lv_fs_drv_init(&s_flash_fs_drv);
     s_flash_fs_drv.letter = kLvglFlashFsLetter;
+    s_flash_fs_drv.ready_cb = flash_fs_ready_cb;
     s_flash_fs_drv.open_cb = flash_fs_open;
     s_flash_fs_drv.close_cb = flash_fs_close;
     s_flash_fs_drv.read_cb = flash_fs_read;
@@ -290,9 +345,16 @@ void init_flash_fs_driver()
     s_flash_fs_drv.dir_close_cb = flash_fs_dir_close;
     lv_fs_drv_register(&s_flash_fs_drv);
     s_flash_fs_ready = true;
+
+    char letters[16];
+    letters[0] = '\0';
+    lv_fs_get_letters(letters);
+    Serial.printf("[LVGL][FS] flash driver registered letter=%c ready=%d letters=%s\n",
+                  kLvglFlashFsLetter,
+                  lv_fs_is_ready(kLvglFlashFsLetter) ? 1 : 0,
+                  letters);
 }
 } // namespace
-#endif
 
 static void disp_flush(lv_display_t* disp_drv, const lv_area_t* area, uint8_t* color_p)
 {
@@ -661,9 +723,7 @@ void beginLvglHelper(LilyGo_Display& board, bool debug)
     lv_init();
     Serial.println("[LVGL] init done");
 
-#if UI_FS_HAS_FLASH_PACK_STORAGE
     init_flash_fs_driver();
-#endif
 
 #if LV_USE_LOG
     if (debug)
diff --git a/platform/esp/arduino_common/src/app_config_store.cpp b/platform/esp/arduino_common/src/app_config_store.cpp
index 08a8ec6a..6a169f68 100644
--- a/platform/esp/arduino_common/src/app_config_store.cpp
+++ b/platform/esp/arduino_common/src/app_config_store.cpp
@@ -26,6 +26,12 @@ constexpr const char* kChatKeySecondaryEnabled = "sec_enabled";
 constexpr const char* kChatKeyPrimaryDownlink = "pri_downlink";
 constexpr const char* kChatKeySecondaryUplink = "sec_uplink";
 constexpr const char* kChatKeySecondaryDownlink = "sec_downlink";
+constexpr const char* kChatKeyPrimaryChannelName = "pri_ch_name";
+constexpr const char* kChatKeySecondaryChannelName = "sec_ch_name";
+constexpr const char* kChatKeyPrimaryChannelId = "pri_ch_id";
+constexpr const char* kChatKeySecondaryChannelId = "sec_ch_id";
+constexpr const char* kChatKeyPrimaryKeyLen = "pri_key_len";
+constexpr const char* kChatKeySecondaryKeyLen = "sec_key_len";
 constexpr const char* kGpsKeyInitBaud = "init_baud";
 constexpr const char* kGpsKeyInitProbeMs = "init_probe_ms";
 constexpr const char* kGpsKeyInitProfile = "init_profile";
@@ -245,6 +251,26 @@ size_t get_bytes_logged(Preferences& prefs,
     return read;
 }
 
+uint8_t normalize_stored_meshtastic_key(uint8_t* key,
+                                        size_t capacity,
+                                        uint8_t stored_len,
+                                        size_t read_len)
+{
+    uint8_t normalized = chat::normalizeMeshtasticChannelKeyLen(key, capacity, stored_len);
+    if (normalized == 0 && (read_len == chat::kMeshtasticChannelKeyDefaultLen ||
+                            read_len == chat::kMeshtasticChannelKeyMaxLen))
+    {
+        normalized = chat::normalizeMeshtasticChannelKeyLen(key,
+                                                            capacity,
+                                                            static_cast<uint8_t>(read_len));
+    }
+    if (normalized < capacity)
+    {
+        memset(key + normalized, 0, capacity - normalized);
+    }
+    return normalized;
+}
+
 bool put_bool_logged(Preferences& prefs,
                      const char* ns,
                      const char* key,
@@ -398,12 +424,14 @@ bool remove_key_logged(Preferences& prefs,
                        const char* key,
                        bool emit_logs)
 {
-    const bool ok = prefs.remove(key);
+    const bool existed = prefs.isKey(key);
+    const bool ok = !existed || prefs.remove(key);
     if (emit_logs)
     {
-        Serial.printf("[AppCfg][REMOVE] ns=%s key=%s ok=%s\n",
+        Serial.printf("[AppCfg][REMOVE] ns=%s key=%s existed=%s ok=%s\n",
                       safe_label(ns),
                       safe_label(key),
+                      bool_label(existed),
                       bool_label(ok));
     }
     return ok;
@@ -549,6 +577,18 @@ void log_config_delta(const AppConfig& before, const AppConfig& after)
                     after.meshtastic_config.tx_enabled, any_change);
     log_change_u16("meshtastic.channel_num", before.meshtastic_config.channel_num,
                    after.meshtastic_config.channel_num, any_change);
+    log_change_text("meshtastic.primary_name", before.meshtastic_config.primary_channel_name,
+                    after.meshtastic_config.primary_channel_name, any_change);
+    log_change_text("meshtastic.secondary_name", before.meshtastic_config.secondary_channel_name,
+                    after.meshtastic_config.secondary_channel_name, any_change);
+    log_change_u32("meshtastic.primary_id", before.meshtastic_config.primary_channel_id,
+                   after.meshtastic_config.primary_channel_id, any_change);
+    log_change_u32("meshtastic.secondary_id", before.meshtastic_config.secondary_channel_id,
+                   after.meshtastic_config.secondary_channel_id, any_change);
+    log_change_u8("meshtastic.primary_key_len", before.meshtastic_config.primary_key_len,
+                  after.meshtastic_config.primary_key_len, any_change);
+    log_change_u8("meshtastic.secondary_key_len", before.meshtastic_config.secondary_key_len,
+                  after.meshtastic_config.secondary_key_len, any_change);
     log_change_float("meshtastic.freq_offset", before.meshtastic_config.frequency_offset_mhz,
                      after.meshtastic_config.frequency_offset_mhz, any_change);
     log_change_float("meshtastic.freq_override", before.meshtastic_config.override_frequency_mhz,
@@ -647,7 +687,7 @@ void log_config_summary(const char* phase, const AppConfig& config)
                   config.node_name,
                   config.short_name,
                   bool_label(config.ble_enabled));
-    Serial.printf("[AppCfg][%s][radio] region=%u mc_preset=%u relay=%s hop_limit=%u chat_channel=%u tx_power_mt=%d tx_power_mc=%d tx_power_rn=%d\n",
+    Serial.printf("[AppCfg][%s][radio] region=%u mc_preset=%u relay=%s hop_limit=%u chat_channel=%u tx_power_mt=%d tx_power_mc=%d tx_power_rn=%d primary_name=%s secondary_name=%s primary_id=%lu secondary_id=%lu primary_key_len=%u secondary_key_len=%u\n",
                   safe_label(phase),
                   static_cast<unsigned>(config.meshtastic_config.region),
                   static_cast<unsigned>(config.meshcore_config.meshcore_region_preset),
@@ -656,7 +696,13 @@ void log_config_summary(const char* phase, const AppConfig& config)
                   static_cast<unsigned>(config.chat_channel),
                   static_cast<int>(config.meshtastic_config.tx_power),
                   static_cast<int>(config.meshcore_config.tx_power),
-                  static_cast<int>(config.rnode_config.tx_power));
+                  static_cast<int>(config.rnode_config.tx_power),
+                  config.meshtastic_config.primary_channel_name,
+                  config.meshtastic_config.secondary_channel_name,
+                  static_cast<unsigned long>(config.meshtastic_config.primary_channel_id),
+                  static_cast<unsigned long>(config.meshtastic_config.secondary_channel_id),
+                  static_cast<unsigned>(config.meshtastic_config.primary_key_len),
+                  static_cast<unsigned>(config.meshtastic_config.secondary_key_len));
     Serial.printf("[AppCfg][%s][gps_init] baud=%lu probe_ms=%lu profile=%u rxm=%u gnss=%u nmea=%u\n",
                   safe_label(phase),
                   static_cast<unsigned long>(config.gps_init_baud),
@@ -780,6 +826,10 @@ bool loadAppConfigFromPreferences(AppConfig& config,
         {
             return get_ushort_logged(prefs, "chat", key, default_value, emit_logs);
         };
+        auto get_uint = [&](const char* key, uint32_t default_value) -> uint32_t
+        {
+            return get_uint_logged(prefs, "chat", key, default_value, emit_logs);
+        };
         auto get_int = [&](const char* key, int default_value) -> int
         {
             return get_int_logged(prefs, "chat", key, default_value, emit_logs);
@@ -825,6 +875,20 @@ bool loadAppConfigFromPreferences(AppConfig& config,
         meshtastic_config.override_frequency_mhz = get_float(kChatKeyMeshFreqOverride, 0.0f);
         meshtastic_config.ignore_mqtt = get_bool(kChatKeyMeshIgnoreMqtt, false);
         meshtastic_config.config_ok_to_mqtt = get_bool("mesh_ok_to_mqtt", false);
+        String primary_name = get_string(kChatKeyPrimaryChannelName,
+                                         meshtastic_config.primary_channel_name);
+        strncpy(meshtastic_config.primary_channel_name,
+                primary_name.c_str(),
+                sizeof(meshtastic_config.primary_channel_name) - 1);
+        meshtastic_config.primary_channel_name[sizeof(meshtastic_config.primary_channel_name) - 1] = '\0';
+        String secondary_name = get_string(kChatKeySecondaryChannelName,
+                                           meshtastic_config.secondary_channel_name);
+        strncpy(meshtastic_config.secondary_channel_name,
+                secondary_name.c_str(),
+                sizeof(meshtastic_config.secondary_channel_name) - 1);
+        meshtastic_config.secondary_channel_name[sizeof(meshtastic_config.secondary_channel_name) - 1] = '\0';
+        meshtastic_config.primary_channel_id = get_uint(kChatKeyPrimaryChannelId, 0);
+        meshtastic_config.secondary_channel_id = get_uint(kChatKeySecondaryChannelId, 0);
 
         // Load meshcore profile (protocol-specific keys)
         meshcore_config.meshcore_freq_mhz = get_float("mc_freq", meshcore_config.meshcore_freq_mhz);
@@ -887,7 +951,19 @@ bool loadAppConfigFromPreferences(AppConfig& config,
         primary_downlink_enabled = get_bool(kChatKeyPrimaryDownlink, false);
         secondary_uplink_enabled = get_bool(kChatKeySecondaryUplink, false);
         secondary_downlink_enabled = get_bool(kChatKeySecondaryDownlink, false);
-        get_bytes("secondary_key", secondary_key, sizeof(secondary_key));
+        const size_t primary_key_read =
+            get_bytes("primary_key", meshtastic_config.primary_key, sizeof(meshtastic_config.primary_key));
+        meshtastic_config.primary_key_len =
+            normalize_stored_meshtastic_key(meshtastic_config.primary_key,
+                                            sizeof(meshtastic_config.primary_key),
+                                            get_uchar(kChatKeyPrimaryKeyLen, 0),
+                                            primary_key_read);
+        const size_t secondary_key_read = get_bytes("secondary_key", secondary_key, sizeof(secondary_key));
+        meshtastic_config.secondary_key_len =
+            normalize_stored_meshtastic_key(secondary_key,
+                                            sizeof(secondary_key),
+                                            get_uchar(kChatKeySecondaryKeyLen, 0),
+                                            secondary_key_read);
         memcpy(meshtastic_config.secondary_key, secondary_key, sizeof(meshtastic_config.secondary_key));
 
         prefs.end();
@@ -1117,6 +1193,10 @@ bool saveAppConfigToPreferences(AppConfig& config,
         {
             ok = put_ushort_logged(prefs, "chat", key, value, emit_logs) && ok;
         };
+        auto put_uint = [&](const char* key, uint32_t value)
+        {
+            ok = put_uint_logged(prefs, "chat", key, value, emit_logs) && ok;
+        };
         auto put_float = [&](const char* key, float value)
         {
             ok = put_float_logged(prefs, "chat", key, value, emit_logs) && ok;
@@ -1154,6 +1234,10 @@ bool saveAppConfigToPreferences(AppConfig& config,
         put_float(kChatKeyMeshFreqOverride, meshtastic_config.override_frequency_mhz);
         put_bool(kChatKeyMeshIgnoreMqtt, meshtastic_config.ignore_mqtt);
         put_bool("mesh_ok_to_mqtt", meshtastic_config.config_ok_to_mqtt);
+        put_string(kChatKeyPrimaryChannelName, meshtastic_config.primary_channel_name);
+        put_string(kChatKeySecondaryChannelName, meshtastic_config.secondary_channel_name);
+        put_uint(kChatKeyPrimaryChannelId, meshtastic_config.primary_channel_id);
+        put_uint(kChatKeySecondaryChannelId, meshtastic_config.secondary_channel_id);
 
         // Save meshcore profile
         put_float("mc_freq", meshcore_config.meshcore_freq_mhz);
@@ -1193,8 +1277,33 @@ bool saveAppConfigToPreferences(AppConfig& config,
         put_bool(kChatKeyPrimaryDownlink, primary_downlink_enabled);
         put_bool(kChatKeySecondaryUplink, secondary_uplink_enabled);
         put_bool(kChatKeySecondaryDownlink, secondary_downlink_enabled);
+        meshtastic_config.primary_key_len =
+            chat::normalizeMeshtasticChannelKeyLen(meshtastic_config.primary_key,
+                                                   sizeof(meshtastic_config.primary_key),
+                                                   meshtastic_config.primary_key_len);
+        meshtastic_config.secondary_key_len =
+            chat::normalizeMeshtasticChannelKeyLen(meshtastic_config.secondary_key,
+                                                   sizeof(meshtastic_config.secondary_key),
+                                                   meshtastic_config.secondary_key_len);
+        if (meshtastic_config.primary_key_len > 0)
+        {
+            put_bytes("primary_key", meshtastic_config.primary_key, meshtastic_config.primary_key_len);
+        }
+        else
+        {
+            ok = remove_key_logged(prefs, "chat", "primary_key", emit_logs) && ok;
+        }
+        put_uchar(kChatKeyPrimaryKeyLen, meshtastic_config.primary_key_len);
         memcpy(secondary_key, meshtastic_config.secondary_key, sizeof(secondary_key));
-        put_bytes("secondary_key", secondary_key, sizeof(secondary_key));
+        if (meshtastic_config.secondary_key_len > 0)
+        {
+            put_bytes("secondary_key", secondary_key, meshtastic_config.secondary_key_len);
+        }
+        else
+        {
+            ok = remove_key_logged(prefs, "chat", "secondary_key", emit_logs) && ok;
+        }
+        put_uchar(kChatKeySecondaryKeyLen, meshtastic_config.secondary_key_len);
     }
     prefs.end();
 
diff --git a/apps/esp_pio/src/app_context.cpp b/platform/esp/arduino_common/src/app_context.cpp
similarity index 99%
rename from apps/esp_pio/src/app_context.cpp
rename to platform/esp/arduino_common/src/app_context.cpp
index 91ecdcd4..6b0ce862 100644
--- a/apps/esp_pio/src/app_context.cpp
+++ b/platform/esp/arduino_common/src/app_context.cpp
@@ -1,9 +1,12 @@
 /**
  * @file app_context.cpp
- * @brief Application context implementation
+ * @brief ESP Arduino application context implementation.
  */
 
-#include "apps/esp_pio/app_context.h"
+#include "app/app_context.h"
+
+#include <Arduino.h>
+
 #include "ble/ble_manager.h"
 #include "board/BoardBase.h"
 #include "board/GpsBoard.h"
@@ -15,8 +18,7 @@
 #include "sys/event_bus.h"
 #include "ui/chat_ui_runtime_proxy.h"
 #include "ui/ui_boot.h"
-#ifdef USING_ST25R3916
-#endif
+
 #include <cstdio>
 #include <cstring>
 
diff --git a/apps/esp_pio/src/app_context_time_sync.cpp b/platform/esp/arduino_common/src/app_context_time_sync.cpp
similarity index 96%
rename from apps/esp_pio/src/app_context_time_sync.cpp
rename to platform/esp/arduino_common/src/app_context_time_sync.cpp
index 0c371024..ed08ff66 100644
--- a/apps/esp_pio/src/app_context_time_sync.cpp
+++ b/platform/esp/arduino_common/src/app_context_time_sync.cpp
@@ -1,13 +1,13 @@
-#include "apps/esp_pio/app_context.h"
+#include "app/app_context.h"
+
 #include "platform/esp/arduino_common/device_identity.h"
 #include "platform/ui/device_runtime.h"
 
 #include <ctime>
+#include <sys/time.h>
 
 #if defined(TRAIL_MATE_ESP_BOARD_TAB5)
 #include "platform/esp/idf_common/tab5_rtc_runtime.h"
-#else
-#include <sys/time.h>
 #endif
 
 namespace app
diff --git a/platform/esp/arduino_common/src/app_event_runtime_support.cpp b/platform/esp/arduino_common/src/app_event_runtime_support.cpp
index be1175b5..86881fab 100644
--- a/platform/esp/arduino_common/src/app_event_runtime_support.cpp
+++ b/platform/esp/arduino_common/src/app_event_runtime_support.cpp
@@ -21,6 +21,14 @@ namespace platform::esp::arduino_common
 namespace
 {
 
+constexpr const char* kSettingsNs = "settings";
+constexpr const char* kMessageAlertsKey = "chat_message_alerts";
+
+bool messageAlertsEnabled()
+{
+    return platform::ui::settings_store::get_int(kSettingsNs, kMessageAlertsKey, 1) != 0;
+}
+
 void triggerMessageFeedback(app::IAppFacade& app_context)
 {
     BoardBase* board = app_context.getBoard();
@@ -28,7 +36,7 @@ void triggerMessageFeedback(app::IAppFacade& app_context)
     {
         return;
     }
-    if (platform::ui::settings_store::get_bool("settings", "vibration_enabled", true))
+    if (platform::ui::settings_store::get_bool(kSettingsNs, "vibration_enabled", true))
     {
         board->vibrator();
     }
@@ -50,6 +58,10 @@ std::string resolveContactName(app::IAppFacade& app_context, chat::NodeId node_i
 
 void handleTeamChatNotification(app::IAppFacade& app_context, const sys::TeamChatEvent& team_event)
 {
+    if (!messageAlertsEnabled())
+    {
+        return;
+    }
     triggerMessageFeedback(app_context);
 
     std::string notice = ::ui::i18n::tr("Team: ");
@@ -136,8 +148,11 @@ bool handleUiEvent(app::IAppFacade& app_context, sys::Event* event)
     case sys::EventType::ChatNewMessage:
     {
         auto* msg_event = static_cast<sys::ChatNewMessageEvent*>(event);
-        triggerMessageFeedback(app_context);
-        ::ui::SystemNotification::show(msg_event->text, 3000);
+        if (messageAlertsEnabled())
+        {
+            triggerMessageFeedback(app_context);
+            ::ui::SystemNotification::show(msg_event->text, 3000);
+        }
         break;
     }
     case sys::EventType::TeamChat:
diff --git a/platform/esp/arduino_common/src/app_runtime_bootstrap_support.cpp b/platform/esp/arduino_common/src/app_runtime_bootstrap_support.cpp
index d9ba4450..c4cfe2df 100644
--- a/platform/esp/arduino_common/src/app_runtime_bootstrap_support.cpp
+++ b/platform/esp/arduino_common/src/app_runtime_bootstrap_support.cpp
@@ -1,7 +1,7 @@
 #include "platform/esp/arduino_common/app_runtime_bootstrap_support.h"
 
+#include "app/app_context.h"
 #include "app/app_facade_access.h"
-#include "apps/esp_pio/app_context.h"
 #include "ble/ble_manager.h"
 #include "platform/esp/arduino_common/app_context_platform_bindings.h"
 #include "platform/esp/arduino_common/app_event_runtime_support.h"
diff --git a/platform/esp/arduino_common/src/app_runtime_support.cpp b/platform/esp/arduino_common/src/app_runtime_support.cpp
index c10ede6c..ca7b87c1 100644
--- a/platform/esp/arduino_common/src/app_runtime_support.cpp
+++ b/platform/esp/arduino_common/src/app_runtime_support.cpp
@@ -26,6 +26,12 @@ namespace platform::esp::arduino_common
 namespace
 {
 
+constexpr const char* kSettingsNs = "settings";
+constexpr const char* kContactAlertsKey = "chat_contact_alerts";
+constexpr int kContactAlertsNone = 0;
+constexpr int kContactAlertsContacts = 1;
+constexpr int kContactAlertsAll = 2;
+
 void triggerNodeInfoFeedback(app::IAppFacade& app_context)
 {
     BoardBase* board = app_context.getBoard();
@@ -34,7 +40,7 @@ void triggerNodeInfoFeedback(app::IAppFacade& app_context)
         return;
     }
 
-    if (platform::ui::settings_store::get_bool("settings", "vibration_enabled", true))
+    if (platform::ui::settings_store::get_bool(kSettingsNs, "vibration_enabled", true))
     {
         board->vibrator();
     }
@@ -72,6 +78,26 @@ void notifyNodeInfoUpdate(app::IAppFacade& app_context, const sys::NodeInfoUpdat
         return;
     }
 
+    int alert_mode = platform::ui::settings_store::get_int(kSettingsNs,
+                                                           kContactAlertsKey,
+                                                           kContactAlertsContacts);
+    if (alert_mode < kContactAlertsNone || alert_mode > kContactAlertsAll)
+    {
+        alert_mode = kContactAlertsContacts;
+    }
+    if (alert_mode == kContactAlertsNone)
+    {
+        return;
+    }
+
+    const chat::contacts::NodeInfo* node_info =
+        app_context.getContactService().getNodeInfo(node_event.node_id);
+    const bool is_contact = node_info && node_info->is_contact;
+    if (alert_mode == kContactAlertsContacts && !is_contact)
+    {
+        return;
+    }
+
     triggerNodeInfoFeedback(app_context);
 
     const std::string message =
diff --git a/platform/esp/arduino_common/src/ble/app_phone_facade.cpp b/platform/esp/arduino_common/src/ble/app_phone_facade.cpp
new file mode 100644
index 00000000..08e951ad
--- /dev/null
+++ b/platform/esp/arduino_common/src/ble/app_phone_facade.cpp
@@ -0,0 +1,730 @@
+#include "ble/app_phone_facade.h"
+
+#include "board/BoardBase.h"
+#include "chat/ble/meshtastic_phone_config_bridge.h"
+#include "chat/infra/meshcore/meshcore_ble_backend.h"
+#include "chat/ports/i_mesh_adapter.h"
+#include "chat/ports/i_node_store.h"
+#include "chat/usecase/chat_service.h"
+#include "chat/usecase/contact_service.h"
+#include "platform/esp/arduino_common/chat/infra/meshtastic/mt_adapter.h"
+#include "platform/esp/arduino_common/gps/gps_service_api.h"
+#include "platform/shared/ble/app_config_phone_snapshot_bridge.h"
+#include "platform/shared/ble/meshtastic_phone_runtime_bridge.h"
+
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
+
+namespace ble
+{
+namespace
+{
+int estimateBatteryMv(int percent)
+{
+    if (percent < 0)
+    {
+        return 0;
+    }
+    if (percent > 100)
+    {
+        percent = 100;
+    }
+    return 3300 + (percent * 9);
+}
+
+void copyBounded(char* dst, size_t dst_len, const char* src)
+{
+    if (!dst || dst_len == 0)
+    {
+        return;
+    }
+    if (!src)
+    {
+        dst[0] = '\0';
+        return;
+    }
+    std::strncpy(dst, src, dst_len - 1);
+    dst[dst_len - 1] = '\0';
+}
+
+bool parseBoolValue(const char* value, bool* out)
+{
+    if (!value || !out)
+    {
+        return false;
+    }
+    if (std::strcmp(value, "1") == 0 || std::strcmp(value, "true") == 0 ||
+        std::strcmp(value, "on") == 0 || std::strcmp(value, "yes") == 0)
+    {
+        *out = true;
+        return true;
+    }
+    if (std::strcmp(value, "0") == 0 || std::strcmp(value, "false") == 0 ||
+        std::strcmp(value, "off") == 0 || std::strcmp(value, "no") == 0)
+    {
+        *out = false;
+        return true;
+    }
+    return false;
+}
+
+void appendCustomVar(std::string& out, const char* key, const char* value)
+{
+    if (!key || !value)
+    {
+        return;
+    }
+    if (!out.empty())
+    {
+        out.push_back(',');
+    }
+    out += key;
+    out.push_back(':');
+    out += value;
+}
+
+chat::meshtastic::MtAdapter* getMeshtasticBackend(app::IAppBleFacade& app)
+{
+    auto* adapter = app.getMeshAdapter();
+    if (!adapter || adapter->backendProtocol() != chat::MeshProtocol::Meshtastic)
+    {
+        return nullptr;
+    }
+    auto* backend = adapter->backendForProtocol(adapter->backendProtocol());
+    return static_cast<chat::meshtastic::MtAdapter*>(backend);
+}
+
+void copyNodeView(const chat::contacts::NodeEntry& entry, phone::PhoneNodeView& out)
+{
+    out = {};
+    out.node_id = entry.node_id;
+    copyBounded(out.short_name, sizeof(out.short_name), entry.short_name);
+    copyBounded(out.long_name, sizeof(out.long_name), entry.long_name);
+    out.last_seen = entry.last_seen;
+    out.snr = entry.snr;
+    out.rssi = entry.rssi;
+    out.hops_away = entry.hops_away;
+    out.channel = entry.channel;
+    out.next_hop = entry.next_hop;
+    out.protocol = entry.protocol;
+    out.role = entry.role;
+    out.hw_model = entry.hw_model;
+    out.has_macaddr = entry.has_macaddr;
+    std::memcpy(out.macaddr, entry.macaddr, sizeof(out.macaddr));
+    out.via_mqtt = entry.via_mqtt;
+    out.is_ignored = entry.is_ignored;
+    out.has_public_key = entry.has_public_key;
+    out.key_manually_verified = entry.key_manually_verified;
+    out.has_device_metrics = entry.has_device_metrics;
+    out.device_metrics = entry.device_metrics;
+    out.position.valid = entry.position_valid;
+    out.position.latitude_i = entry.position_latitude_i;
+    out.position.longitude_i = entry.position_longitude_i;
+    out.position.has_altitude = entry.position_has_altitude;
+    out.position.altitude = entry.position_altitude;
+    out.position.timestamp = entry.position_timestamp;
+    out.position.precision_bits = entry.position_precision_bits;
+    out.position.pdop = entry.position_pdop;
+    out.position.hdop = entry.position_hdop;
+    out.position.vdop = entry.position_vdop;
+    out.position.gps_accuracy_mm = entry.position_gps_accuracy_mm;
+}
+} // namespace
+
+AppPhoneFacade::AppPhoneFacade(app::IAppBleFacade& app,
+                               meshtastic_Config_BluetoothConfig& bluetooth_config,
+                               meshtastic_LocalModuleConfig& module_config,
+                               platform::shared::ble_bridge::IPhoneBleRuntime* ble_runtime)
+    : app_(app),
+      bluetooth_config_(bluetooth_config),
+      module_config_(module_config),
+      ble_runtime_(ble_runtime)
+{
+}
+
+void AppPhoneFacade::setBleRuntime(platform::shared::ble_bridge::IPhoneBleRuntime* runtime)
+{
+    ble_runtime_ = runtime;
+}
+
+void AppPhoneFacade::syncMeshtasticMqttProxySettings(const meshtastic_LocalModuleConfig& module_config)
+{
+    auto* mt = getMeshtasticBackend(app_);
+    if (!mt)
+    {
+        return;
+    }
+
+    const auto cfg = getMeshtasticPhoneConfig();
+    chat::meshtastic::MtAdapter::MqttProxySettings settings;
+    platform::shared::ble_bridge::applyMeshtasticMqttProxySettings(settings, module_config, cfg);
+    mt->setMqttProxySettings(settings);
+}
+
+phone::MeshtasticPhoneConfigSnapshot AppPhoneFacade::getMeshtasticPhoneConfig() const
+{
+    return platform::shared::ble_bridge::makeMeshtasticPhoneConfigSnapshot(app_.getConfig());
+}
+
+void AppPhoneFacade::setMeshtasticPhoneConfig(const phone::MeshtasticPhoneConfigSnapshot& config)
+{
+    platform::shared::ble_bridge::applyMeshtasticPhoneConfigSnapshot(app_.getConfig(), config);
+}
+
+phone::MeshCorePhoneConfigSnapshot AppPhoneFacade::getMeshCorePhoneConfig() const
+{
+    return platform::shared::ble_bridge::makeMeshCorePhoneConfigSnapshot(app_.getConfig());
+}
+
+void AppPhoneFacade::setMeshCorePhoneConfig(const phone::MeshCorePhoneConfigSnapshot& config)
+{
+    platform::shared::ble_bridge::applyMeshCorePhoneConfigSnapshot(app_.getConfig(), config);
+}
+
+void AppPhoneFacade::saveConfig()
+{
+    app_.saveConfig();
+}
+
+void AppPhoneFacade::applyMeshConfig()
+{
+    app_.applyMeshConfig();
+}
+
+void AppPhoneFacade::applyUserInfo()
+{
+    app_.applyUserInfo();
+}
+
+void AppPhoneFacade::applyPositionConfig()
+{
+    app_.applyPositionConfig();
+}
+
+void AppPhoneFacade::getEffectiveUserInfo(char* out_long,
+                                          std::size_t long_len,
+                                          char* out_short,
+                                          std::size_t short_len) const
+{
+    app_.getEffectiveUserInfo(out_long, long_len, out_short, short_len);
+}
+
+chat::NodeId AppPhoneFacade::getSelfNodeId() const
+{
+    return app_.getSelfNodeId();
+}
+
+bool AppPhoneFacade::sendPhoneText(chat::ChannelId channel,
+                                   const std::string& text,
+                                   chat::MessageId forced_msg_id,
+                                   chat::NodeId peer,
+                                   chat::MessageId& out_msg_id)
+{
+    out_msg_id = app_.getChatService().sendTextWithId(channel, text, forced_msg_id, peer);
+    return out_msg_id != 0;
+}
+
+bool AppPhoneFacade::sendPhoneAppData(chat::ChannelId channel,
+                                      uint32_t portnum,
+                                      const uint8_t* payload,
+                                      std::size_t len,
+                                      chat::NodeId dest,
+                                      bool want_ack,
+                                      chat::MessageId packet_id,
+                                      bool want_response)
+{
+    auto* adapter = app_.getMeshAdapter();
+    return adapter && adapter->sendAppData(channel, portnum, payload, len, dest, want_ack, packet_id, want_response);
+}
+
+bool AppPhoneFacade::pollIncomingPhoneData(chat::MeshIncomingData& out)
+{
+    auto* adapter = app_.getMeshAdapter();
+    return adapter && adapter->pollIncomingData(&out);
+}
+
+std::size_t AppPhoneFacade::phoneNodeCount() const
+{
+    const auto* store = app_.getNodeStore();
+    return store ? store->getEntries().size() : 0;
+}
+
+bool AppPhoneFacade::getPhoneNodeByIndex(std::size_t index, phone::PhoneNodeView& out) const
+{
+    const auto* store = app_.getNodeStore();
+    if (!store)
+    {
+        return false;
+    }
+    const auto& entries = store->getEntries();
+    if (index >= entries.size())
+    {
+        return false;
+    }
+    copyNodeView(entries[index], out);
+    if (const auto* node = app_.getContactService().getNodeInfo(out.node_id))
+    {
+        out.position = node->position;
+    }
+    return true;
+}
+
+bool AppPhoneFacade::findPhoneNode(chat::NodeId node_id, phone::PhoneNodeView& out) const
+{
+    const auto* store = app_.getNodeStore();
+    if (!store)
+    {
+        return false;
+    }
+    for (const auto& entry : store->getEntries())
+    {
+        if (entry.node_id == node_id)
+        {
+            copyNodeView(entry, out);
+            if (const auto* node = app_.getContactService().getNodeInfo(out.node_id))
+            {
+                out.position = node->position;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+bool AppPhoneFacade::isMeshPkiReady() const
+{
+    const auto* adapter = app_.getMeshAdapter();
+    return adapter ? adapter->isPkiReady() : false;
+}
+
+bool AppPhoneFacade::isBleEnabled() const
+{
+    return app_.isBleEnabled();
+}
+
+void AppPhoneFacade::setBleEnabled(bool enabled)
+{
+    app_.setBleEnabled(enabled);
+}
+
+bool AppPhoneFacade::getDeviceMacAddress(uint8_t out_mac[6]) const
+{
+    return app_.getDeviceMacAddress(out_mac);
+}
+
+bool AppPhoneFacade::syncCurrentEpochSeconds(uint32_t epoch_seconds)
+{
+    return app_.syncCurrentEpochSeconds(epoch_seconds);
+}
+
+void AppPhoneFacade::resetMeshConfig()
+{
+    app_.resetMeshConfig();
+}
+
+void AppPhoneFacade::clearNodeDb()
+{
+    app_.clearNodeDb();
+}
+
+void AppPhoneFacade::clearMessageDb()
+{
+    app_.clearMessageDb();
+}
+
+void AppPhoneFacade::restartDevice()
+{
+    app_.restartDevice();
+}
+
+bool AppPhoneFacade::loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const
+{
+    return meshtastic_config_bridge::loadBluetoothConfigView(bluetooth_config_, app_.isBleEnabled(), out);
+}
+
+void AppPhoneFacade::saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config)
+{
+    bluetooth_config_ = config;
+    meshtastic_config_bridge::normalizeBluetoothConfig(&bluetooth_config_);
+    if (ble_runtime_)
+    {
+        ble_runtime_->onPhoneBluetoothConfigChanged();
+    }
+}
+
+bool AppPhoneFacade::loadModuleConfig(meshtastic_LocalModuleConfig* out) const
+{
+    if (!out)
+    {
+        return false;
+    }
+    *out = module_config_;
+    meshtastic_config_bridge::normalizeModuleConfig(out);
+    return true;
+}
+
+void AppPhoneFacade::saveModuleConfig(const meshtastic_LocalModuleConfig& config)
+{
+    module_config_ = config;
+    meshtastic_config_bridge::normalizeModuleConfig(&module_config_);
+    if (ble_runtime_)
+    {
+        ble_runtime_->onPhoneModuleConfigChanged();
+    }
+}
+
+void AppPhoneFacade::onConfigStart()
+{
+    if (ble_runtime_)
+    {
+        ble_runtime_->requestPhoneHighThroughputConnection();
+    }
+}
+
+void AppPhoneFacade::onConfigComplete()
+{
+    if (ble_runtime_)
+    {
+        ble_runtime_->requestPhoneLowerPowerConnection();
+    }
+}
+
+bool AppPhoneFacade::loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const
+{
+    const uint32_t pending_passkey = ble_runtime_ ? ble_runtime_->pendingPhoneBlePasskey() : 0;
+    const bool connected = ble_runtime_ ? ble_runtime_->isPhoneBleConnected() : false;
+    const uint32_t passkey = meshtastic_config_bridge::resolveBlePasskey(bluetooth_config_, pending_passkey);
+    return meshtastic_config_bridge::fillDeviceConnectionStatus(passkey, connected, out);
+}
+
+bool AppPhoneFacade::handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg)
+{
+    auto* mt = getMeshtasticBackend(app_);
+    return mt ? mt->handleMqttProxyMessage(msg) : false;
+}
+
+bool AppPhoneFacade::pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out)
+{
+    auto* mt = getMeshtasticBackend(app_);
+    return (mt && out) ? mt->pollMqttProxyMessage(out) : false;
+}
+
+bool AppPhoneFacade::loadTimezoneTzdef(char* out, size_t out_len) const
+{
+    return platform::shared::ble_bridge::loadTimezoneTzdefFromSettings(out, out_len);
+}
+
+void AppPhoneFacade::saveTimezoneTzdef(const char* tzdef)
+{
+    platform::shared::ble_bridge::saveTimezoneTzdefToSettings(tzdef);
+}
+
+int AppPhoneFacade::getTimezoneOffsetMinutes() const
+{
+    return platform::shared::ble_bridge::getTimezoneOffsetMinutes();
+}
+
+void AppPhoneFacade::setTimezoneOffsetMinutes(int offset_min)
+{
+    platform::shared::ble_bridge::setTimezoneOffsetMinutes(offset_min);
+}
+
+bool AppPhoneFacade::getGpsFix(phone::meshtastic::MeshtasticGpsFix* out) const
+{
+    return platform::shared::ble_bridge::fillMeshtasticGpsFixFromLocationSource(gps::gps_location_source(), out);
+}
+
+phone::meshcore::MeshCorePhoneBatteryInfo AppPhoneFacade::getBatteryInfo() const
+{
+    phone::meshcore::MeshCorePhoneBatteryInfo info{};
+    int level = -1;
+    if (BoardBase* board = app_.getBoard())
+    {
+        level = board->getBatteryLevel();
+    }
+    if (level < 0)
+    {
+        level = 0;
+    }
+    if (level > 100)
+    {
+        level = 100;
+    }
+    info.level = static_cast<uint8_t>(level);
+    info.millivolts = static_cast<uint16_t>(estimateBatteryMv(level));
+    return info;
+}
+
+bool AppPhoneFacade::getCustomVars(std::string* out) const
+{
+    if (!out)
+    {
+        return false;
+    }
+    out->clear();
+
+    char buf[40];
+    if (gps::gps_is_enabled())
+    {
+        appendCustomVar(*out, "gps", gps::gps_is_powered() ? "1" : "0");
+    }
+    const auto cfg = getMeshCorePhoneConfig();
+    appendCustomVar(*out, "node_name", cfg.node_name);
+    appendCustomVar(*out, "channel_name", cfg.mesh.meshcore_channel_name);
+    std::snprintf(buf, sizeof(buf), "%u", static_cast<unsigned>(cfg.mesh.meshcore_multi_acks ? 1U : 0U));
+    appendCustomVar(*out, "multi_acks", buf);
+    return true;
+}
+
+bool AppPhoneFacade::setCustomVar(const char* key, const char* value)
+{
+    if (!key || !value)
+    {
+        return false;
+    }
+
+    auto mesh_cfg = getMeshCorePhoneConfig();
+    auto mt_cfg = getMeshtasticPhoneConfig();
+    bool changed = false;
+    bool mesh_changed = false;
+    bool mt_changed = false;
+    bool apply_mesh = false;
+    bool apply_user = false;
+    bool apply_position = false;
+
+    if (std::strcmp(key, "node_name") == 0)
+    {
+        copyBounded(mesh_cfg.node_name, sizeof(mesh_cfg.node_name), value);
+        copyBounded(mt_cfg.node_name, sizeof(mt_cfg.node_name), value);
+        changed = true;
+        mesh_changed = true;
+        mt_changed = true;
+        apply_user = true;
+    }
+    else if (std::strcmp(key, "channel_name") == 0)
+    {
+        copyBounded(mesh_cfg.mesh.meshcore_channel_name, sizeof(mesh_cfg.mesh.meshcore_channel_name), value);
+        changed = true;
+        mesh_changed = true;
+        apply_mesh = true;
+    }
+    else if (std::strcmp(key, "gps") == 0)
+    {
+        bool parsed = false;
+        if (!parseBoolValue(value, &parsed))
+        {
+            return false;
+        }
+        mt_cfg.gps_enabled = parsed;
+        changed = true;
+        mt_changed = true;
+        apply_position = true;
+    }
+    else if (std::strcmp(key, "multi_acks") == 0)
+    {
+        bool parsed = false;
+        if (!parseBoolValue(value, &parsed))
+        {
+            return false;
+        }
+        mesh_cfg.mesh.meshcore_multi_acks = parsed;
+        changed = true;
+        mesh_changed = true;
+        apply_mesh = true;
+    }
+    else
+    {
+        return false;
+    }
+
+    if (mesh_changed)
+    {
+        setMeshCorePhoneConfig(mesh_cfg);
+    }
+    if (mt_changed)
+    {
+        setMeshtasticPhoneConfig(mt_cfg);
+    }
+    if (changed)
+    {
+        app_.saveConfig();
+    }
+    if (apply_user)
+    {
+        app_.applyUserInfo();
+    }
+    if (apply_mesh)
+    {
+        app_.applyMeshConfig();
+    }
+    if (apply_position)
+    {
+        app_.applyPositionConfig();
+    }
+    return true;
+}
+
+bool AppPhoneFacade::setTuningParams(const phone::meshcore::MeshCorePhoneTuningParams& params)
+{
+    auto cfg = getMeshCorePhoneConfig();
+    cfg.mesh.meshcore_rx_delay_base = static_cast<float>(params.rx_delay_base_ms) / 1000.0f;
+    cfg.mesh.meshcore_airtime_factor = static_cast<float>(params.airtime_factor_milli) / 1000.0f;
+    setMeshCorePhoneConfig(cfg);
+    app_.saveConfig();
+    app_.applyMeshConfig();
+    return true;
+}
+
+bool AppPhoneFacade::getTuningParams(phone::meshcore::MeshCorePhoneTuningParams* out) const
+{
+    if (!out)
+    {
+        return false;
+    }
+    const auto cfg = getMeshCorePhoneConfig();
+    out->rx_delay_base_ms = static_cast<uint32_t>(cfg.mesh.meshcore_rx_delay_base * 1000.0f);
+    out->airtime_factor_milli = static_cast<uint32_t>(cfg.mesh.meshcore_airtime_factor * 1000.0f);
+    return true;
+}
+
+chat::meshcore::IMeshCoreBleBackend* AppPhoneFacade::meshCoreBackend()
+{
+    auto* adapter = app_.getMeshAdapter();
+    if (!adapter || app_.getConfig().mesh_protocol != chat::MeshProtocol::MeshCore)
+    {
+        return nullptr;
+    }
+    if (auto* backend = adapter->backendForProtocol(chat::MeshProtocol::MeshCore))
+    {
+        return backend->asMeshCoreBleBackend();
+    }
+    return adapter->asMeshCoreBleBackend();
+}
+
+const chat::meshcore::IMeshCoreBleBackend* AppPhoneFacade::meshCoreBackend() const
+{
+    auto* adapter = app_.getMeshAdapter();
+    if (!adapter || app_.getConfig().mesh_protocol != chat::MeshProtocol::MeshCore)
+    {
+        return nullptr;
+    }
+    if (auto* backend = adapter->backendForProtocol(chat::MeshProtocol::MeshCore))
+    {
+        return backend->asMeshCoreBleBackend();
+    }
+    return adapter->asMeshCoreBleBackend();
+}
+
+bool AppPhoneFacade::meshCoreExportIdentityPublicKey(uint8_t* out_pubkey, std::size_t len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && out_pubkey && len >= chat::meshcore::kMeshCorePubKeySize &&
+           backend->exportIdentityPublicKey(out_pubkey);
+}
+
+bool AppPhoneFacade::meshCoreExportIdentityPrivateKey(uint8_t* out_priv, std::size_t len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && out_priv && len >= chat::meshcore::kMeshCorePrivKeySize &&
+           backend->exportIdentityPrivateKey(out_priv);
+}
+
+bool AppPhoneFacade::meshCoreImportIdentityPrivateKey(const uint8_t* in_priv, std::size_t len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->importIdentityPrivateKey(in_priv, len);
+}
+
+bool AppPhoneFacade::meshCoreSignPayload(const uint8_t* data, std::size_t len, uint8_t* out_sig, std::size_t out_len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && out_sig && out_len >= chat::meshcore::kMeshCoreSignatureSize &&
+           backend->signPayload(data, len, out_sig);
+}
+
+bool AppPhoneFacade::meshCoreSendSelfAdvert(bool broadcast)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendSelfAdvert(broadcast);
+}
+
+bool AppPhoneFacade::meshCoreSendPeerRequestType(const uint8_t* pubkey,
+                                                 std::size_t len,
+                                                 uint8_t req_type,
+                                                 uint32_t* out_tag,
+                                                 uint32_t* out_est_timeout,
+                                                 bool* out_sent_flood)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendPeerRequestType(pubkey, len, req_type, out_tag, out_est_timeout, out_sent_flood);
+}
+
+bool AppPhoneFacade::meshCoreSendPeerRequestPayload(const uint8_t* pubkey,
+                                                    std::size_t len,
+                                                    const uint8_t* payload,
+                                                    std::size_t payload_len,
+                                                    bool force_flood,
+                                                    uint32_t* out_tag,
+                                                    uint32_t* out_est_timeout,
+                                                    bool* out_sent_flood)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendPeerRequestPayload(pubkey,
+                                                      len,
+                                                      payload,
+                                                      payload_len,
+                                                      force_flood,
+                                                      out_tag,
+                                                      out_est_timeout,
+                                                      out_sent_flood);
+}
+
+bool AppPhoneFacade::meshCoreSendAnonRequestPayload(const uint8_t* pubkey,
+                                                    std::size_t len,
+                                                    const uint8_t* payload,
+                                                    std::size_t payload_len,
+                                                    uint32_t* out_est_timeout,
+                                                    bool* out_sent_flood)
+{
+    auto* backend = meshCoreBackend();
+    return backend &&
+           backend->sendAnonRequestPayload(pubkey, len, payload, payload_len, out_est_timeout, out_sent_flood);
+}
+
+bool AppPhoneFacade::meshCoreSendTracePath(const uint8_t* path,
+                                           std::size_t path_len,
+                                           uint32_t tag,
+                                           uint32_t auth,
+                                           uint8_t flags,
+                                           uint32_t* out_est_timeout)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendTracePath(path, path_len, tag, auth, flags, out_est_timeout);
+}
+
+bool AppPhoneFacade::meshCoreSendControlData(const uint8_t* payload, std::size_t payload_len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendControlData(payload, payload_len);
+}
+
+bool AppPhoneFacade::meshCoreSendRawData(const uint8_t* path,
+                                         std::size_t path_len,
+                                         const uint8_t* payload,
+                                         std::size_t payload_len,
+                                         uint32_t* out_est_timeout)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendRawData(path, path_len, payload, payload_len, out_est_timeout);
+}
+
+void AppPhoneFacade::meshCoreSetFloodScopeKey(const uint8_t* key, std::size_t len)
+{
+    if (auto* backend = meshCoreBackend())
+    {
+        backend->setFloodScopeKey(key, len);
+    }
+}
+
+} // namespace ble
diff --git a/platform/esp/arduino_common/src/ble/meshcore_ble.cpp b/platform/esp/arduino_common/src/ble/meshcore_ble.cpp
index 18144248..ef273760 100644
--- a/platform/esp/arduino_common/src/ble/meshcore_ble.cpp
+++ b/platform/esp/arduino_common/src/ble/meshcore_ble.cpp
@@ -2,7 +2,6 @@
 
 #include "app/app_config.h"
 #include "ble/ble_uuids.h"
-#include "board/BoardBase.h"
 #include "chat/domain/contact_types.h"
 #include "display/DisplayConfig.h"
 #include "platform/esp/arduino_common/chat/infra/meshcore/meshcore_adapter.h"
@@ -421,8 +420,9 @@ class MeshCoreServerCallbacks : public NimBLEServerCallbacks
 
 MeshCoreBleService::MeshCoreBleService(app::IAppBleFacade& ctx, const std::string& device_name)
     : ctx_(ctx),
+      phone_facade_(ctx, phone_ble_config_, phone_module_config_),
       device_name_(device_name),
-      shared_core_(new MeshCorePhoneCore(*this, device_name, this))
+      shared_core_(new phone::meshcore::MeshCorePhoneCore(phone_facade_, device_name, this))
 {
     loadBlePin();
     loadManualContacts();
@@ -610,8 +610,8 @@ bool MeshCoreBleService::handleCustomVarSet(const char* key, const char* value)
         return false;
     }
 
-    auto mesh_cfg = getMeshCorePhoneConfig();
-    auto mt_cfg = getMeshtasticPhoneConfig();
+    auto mesh_cfg = phone_facade_.getMeshCorePhoneConfig();
+    auto mt_cfg = phone_facade_.getMeshtasticPhoneConfig();
     bool save_cfg = false;
     bool apply_mesh = false;
     bool apply_user = false;
@@ -738,27 +738,27 @@ bool MeshCoreBleService::handleCustomVarSet(const char* key, const char* value)
     }
     if (save_mesh_cfg)
     {
-        setMeshCorePhoneConfig(mesh_cfg);
+        phone_facade_.setMeshCorePhoneConfig(mesh_cfg);
     }
     if (save_mt_cfg)
     {
-        setMeshtasticPhoneConfig(mt_cfg);
+        phone_facade_.setMeshtasticPhoneConfig(mt_cfg);
     }
     if (save_cfg)
     {
-        ctx_.saveConfig();
+        phone_facade_.saveConfig();
     }
     if (apply_user)
     {
-        ctx_.applyUserInfo();
+        phone_facade_.applyUserInfo();
     }
     if (apply_mesh)
     {
-        ctx_.applyMeshConfig();
+        phone_facade_.applyMeshConfig();
     }
     if (apply_position)
     {
-        ctx_.applyPositionConfig();
+        phone_facade_.applyPositionConfig();
     }
     return true;
 }
@@ -783,7 +783,7 @@ void MeshCoreBleService::enqueueRawDataPush(const uint8_t* payload, size_t len,
 chat::meshcore::MeshCoreAdapter* MeshCoreBleService::meshCoreAdapter()
 {
     auto* adapter = ctx_.getMeshAdapter();
-    if (!adapter || getMeshCorePhoneConfig().active_protocol != chat::MeshProtocol::MeshCore)
+    if (!adapter || phone_facade_.getMeshCorePhoneConfig().active_protocol != chat::MeshProtocol::MeshCore)
     {
         return nullptr;
     }
@@ -795,7 +795,7 @@ chat::meshcore::MeshCoreAdapter* MeshCoreBleService::meshCoreAdapter()
 const chat::meshcore::MeshCoreAdapter* MeshCoreBleService::meshCoreAdapter() const
 {
     const auto* adapter = ctx_.getMeshAdapter();
-    if (!adapter || getMeshCorePhoneConfig().active_protocol != chat::MeshProtocol::MeshCore)
+    if (!adapter || phone_facade_.getMeshCorePhoneConfig().active_protocol != chat::MeshProtocol::MeshCore)
     {
         return nullptr;
     }
@@ -833,7 +833,7 @@ bool MeshCoreBleService::start()
     }
     startAdvertising();
 
-    multi_acks_ = getMeshCorePhoneConfig().mesh.meshcore_multi_acks ? 1 : 0;
+    multi_acks_ = phone_facade_.getMeshCorePhoneConfig().mesh.meshcore_multi_acks ? 1 : 0;
 
     ctx_.getChatService().addIncomingTextObserver(this);
     if (auto* team = ctx_.getTeamService())
diff --git a/platform/esp/arduino_common/src/ble/meshcore_ble_owner_hooks.cpp b/platform/esp/arduino_common/src/ble/meshcore_ble_owner_hooks.cpp
index 7070d3ba..2dbb9dbf 100644
--- a/platform/esp/arduino_common/src/ble/meshcore_ble_owner_hooks.cpp
+++ b/platform/esp/arduino_common/src/ble/meshcore_ble_owner_hooks.cpp
@@ -1,8 +1,5 @@
 #include "ble/meshcore_ble.h"
 
-#include "board/BoardBase.h"
-#include "platform/esp/arduino_common/gps/gps_service_api.h"
-#include "platform/shared/ble/app_config_phone_snapshot_bridge.h"
 #include "sys/clock.h"
 
 #include <Arduino.h>
@@ -17,19 +14,6 @@ namespace
 constexpr size_t kPubKeySize = chat::meshcore::MeshCoreIdentity::kPubKeySize;
 constexpr bool kMeshCoreBleSecurityEnabled = true;
 
-int estimateBatteryMv(int percent)
-{
-    if (percent < 0)
-    {
-        return 0;
-    }
-    if (percent > 100)
-    {
-        percent = 100;
-    }
-    return 3300 + (percent * 9);
-}
-
 bool isConfiguredBlePin(uint32_t pin)
 {
     return pin == 0 || (pin >= 100000 && pin <= 999999);
@@ -94,30 +78,14 @@ uint32_t nowSeconds()
 
 namespace ble
 {
-MeshCorePhoneBatteryInfo MeshCoreBleService::getBatteryInfo() const
+phone::meshcore::MeshCorePhoneBatteryInfo MeshCoreBleService::getBatteryInfo() const
 {
-    MeshCorePhoneBatteryInfo info{};
-    int level = -1;
-    if (BoardBase* board = ctx_.getBoard())
-    {
-        level = board->getBatteryLevel();
-    }
-    if (level < 0)
-    {
-        level = 0;
-    }
-    if (level > 100)
-    {
-        level = 100;
-    }
-    info.level = static_cast<uint8_t>(level);
-    info.millivolts = static_cast<uint16_t>(estimateBatteryMv(level));
-    return info;
+    return phone_facade_.getBatteryInfo();
 }
 
-MeshCorePhoneLocation MeshCoreBleService::getAdvertLocation() const
+phone::meshcore::MeshCorePhoneLocation MeshCoreBleService::getAdvertLocation() const
 {
-    MeshCorePhoneLocation location{};
+    phone::meshcore::MeshCorePhoneLocation location{};
     location.lat_i6 = advert_lat_;
     location.lon_i6 = advert_lon_;
     return location;
@@ -268,7 +236,7 @@ void MeshCoreBleService::logoutActiveConnection(const uint8_t* prefix, size_t le
     }
 }
 
-bool MeshCoreBleService::getRadioStats(MeshCorePhoneRadioStats* out) const
+bool MeshCoreBleService::getRadioStats(phone::meshcore::MeshCorePhoneRadioStats* out) const
 {
     if (!out)
     {
@@ -289,7 +257,7 @@ bool MeshCoreBleService::getRadioStats(MeshCorePhoneRadioStats* out) const
     return true;
 }
 
-bool MeshCoreBleService::getPacketStats(MeshCorePhonePacketStats* out) const
+bool MeshCoreBleService::getPacketStats(phone::meshcore::MeshCorePhonePacketStats* out) const
 {
     if (!out)
     {
@@ -409,27 +377,18 @@ bool MeshCoreBleService::popOfflineMessage(uint8_t* out, size_t* out_len)
     return true;
 }
 
-bool MeshCoreBleService::setTuningParams(const MeshCorePhoneTuningParams& params)
+bool MeshCoreBleService::setTuningParams(const phone::meshcore::MeshCorePhoneTuningParams& params)
 {
-    auto cfg = getMeshCorePhoneConfig();
-    cfg.mesh.meshcore_rx_delay_base = static_cast<float>(params.rx_delay_base_ms) / 1000.0f;
-    cfg.mesh.meshcore_airtime_factor = static_cast<float>(params.airtime_factor_milli) / 1000.0f;
-    setMeshCorePhoneConfig(cfg);
-    ctx_.saveConfig();
-    ctx_.applyMeshConfig();
-    return true;
+    return phone_facade_.setTuningParams(params);
 }
 
-bool MeshCoreBleService::getTuningParams(MeshCorePhoneTuningParams* out) const
+bool MeshCoreBleService::getTuningParams(phone::meshcore::MeshCorePhoneTuningParams* out) const
 {
     if (!out)
     {
         return false;
     }
-    const auto cfg = getMeshCorePhoneConfig();
-    out->rx_delay_base_ms = static_cast<uint32_t>(cfg.mesh.meshcore_rx_delay_base * 1000.0f);
-    out->airtime_factor_milli = static_cast<uint32_t>(cfg.mesh.meshcore_airtime_factor * 1000.0f);
-    return true;
+    return phone_facade_.getTuningParams(out);
 }
 
 bool MeshCoreBleService::setOtherParams(uint8_t manual_add_contacts, uint8_t telemetry_bits,
@@ -442,12 +401,12 @@ bool MeshCoreBleService::setOtherParams(uint8_t manual_add_contacts, uint8_t tel
     advert_loc_policy_ = advert_loc_policy;
     if (has_multi_acks)
     {
-        auto cfg = getMeshCorePhoneConfig();
+        auto cfg = phone_facade_.getMeshCorePhoneConfig();
         cfg.mesh.meshcore_multi_acks = (multi_acks != 0);
-        setMeshCorePhoneConfig(cfg);
+        phone_facade_.setMeshCorePhoneConfig(cfg);
         multi_acks_ = (multi_acks != 0) ? 1U : 0U;
-        ctx_.saveConfig();
-        ctx_.applyMeshConfig();
+        phone_facade_.saveConfig();
+        phone_facade_.applyMeshConfig();
     }
     saveBlePin();
     return true;
@@ -476,13 +435,7 @@ bool MeshCoreBleService::getCustomVars(std::string* out) const
     }
     out->clear();
     char buf[40];
-    if (gps::gps_is_enabled())
-    {
-        appendCustomVar(*out, "gps", gps::gps_is_powered() ? "1" : "0");
-    }
-    const auto cfg = getMeshCorePhoneConfig();
-    appendCustomVar(*out, "node_name", cfg.node_name);
-    appendCustomVar(*out, "channel_name", cfg.mesh.meshcore_channel_name);
+    phone_facade_.getCustomVars(out);
     std::snprintf(buf, sizeof(buf), "%lu", static_cast<unsigned long>(ble_pin_));
     appendCustomVar(*out, "ble_pin", buf);
     appendCustomVar(*out, "manual_add_contacts", manual_add_contacts_ ? "1" : "0");
@@ -494,33 +447,12 @@ bool MeshCoreBleService::getCustomVars(std::string* out) const
     appendCustomVar(*out, "telemetry_env", buf);
     std::snprintf(buf, sizeof(buf), "%u", static_cast<unsigned>(advert_loc_policy_));
     appendCustomVar(*out, "advert_loc_policy", buf);
-    appendCustomVar(*out, "multi_acks", cfg.mesh.meshcore_multi_acks ? "1" : "0");
     return true;
 }
 
 bool MeshCoreBleService::setCustomVar(const char* key, const char* value)
 {
-    return handleCustomVarSet(key, value);
-}
-
-MeshtasticPhoneConfigSnapshot MeshCoreBleService::getMeshtasticPhoneConfig() const
-{
-    return platform::shared::ble_bridge::makeMeshtasticPhoneConfigSnapshot(ctx_.getConfig());
-}
-
-void MeshCoreBleService::setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config)
-{
-    platform::shared::ble_bridge::applyMeshtasticPhoneConfigSnapshot(ctx_.getConfig(), config);
-}
-
-MeshCorePhoneConfigSnapshot MeshCoreBleService::getMeshCorePhoneConfig() const
-{
-    return platform::shared::ble_bridge::makeMeshCorePhoneConfigSnapshot(ctx_.getConfig());
-}
-
-void MeshCoreBleService::setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config)
-{
-    platform::shared::ble_bridge::applyMeshCorePhoneConfigSnapshot(ctx_.getConfig(), config);
+    return handleCustomVarSet(key, value) || phone_facade_.setCustomVar(key, value);
 }
 
 void MeshCoreBleService::onFactoryReset()
diff --git a/platform/esp/arduino_common/src/ble/meshtastic_ble.cpp b/platform/esp/arduino_common/src/ble/meshtastic_ble.cpp
index 773f9962..7e530bbe 100644
--- a/platform/esp/arduino_common/src/ble/meshtastic_ble.cpp
+++ b/platform/esp/arduino_common/src/ble/meshtastic_ble.cpp
@@ -2,7 +2,7 @@
 
 #include "app/app_config.h"
 #include "ble/ble_uuids.h"
-#include "board/BoardBase.h"
+#include "ble/meshtastic_ble_observer_bridge.h"
 #include "chat/ble/meshtastic_defaults.h"
 #include "chat/ble/meshtastic_phone_core.h"
 #include "chat/domain/contact_types.h"
@@ -13,7 +13,6 @@
 #include "meshtastic/portnums.pb.h"
 #include "meshtastic/telemetry.pb.h"
 #include "platform/esp/arduino_common/chat/infra/meshtastic/mt_adapter.h"
-#include "platform/esp/arduino_common/gps/gps_service_api.h"
 #include "screen_sleep.h"
 #include "ui/widgets/ble_pairing_popup.h"
 #include <Arduino.h>
@@ -280,8 +279,10 @@ class MeshtasticToRadioCallbacks : public NimBLECharacteristicCallbacks
         NimBLEAttValue val = characteristic->getValue();
         if (val.length() == 0 || val.length() > kMaxToRadio)
         {
+            ble_log("fromPhone drop invalid len=%u", static_cast<unsigned>(val.length()));
             return;
         }
+        ble_log("fromPhone write len=%u", static_cast<unsigned>(val.length()));
         if (owner_.last_to_radio_len_ == val.length() &&
             memcmp(owner_.last_to_radio_.data(), val.data(), val.length()) == 0)
         {
@@ -407,7 +408,8 @@ class MeshtasticNotifyStateCallbacks : public NimBLECharacteristicCallbacks
 };
 
 MeshtasticBleService::MeshtasticBleService(app::IAppBleFacade& ctx, const std::string& device_name)
-    : ctx_(ctx),
+    : phone_facade_(ctx, ble_config_, module_config_, this),
+      observer_bridge_(new MeshtasticBleObserverBridge(ctx, *this)),
       device_name_(device_name)
 {
 }
@@ -462,14 +464,19 @@ bool MeshtasticBleService::start()
     }
     startAdvertising();
 
-    ctx_.getChatService().addIncomingTextObserver(this);
-    ctx_.getChatService().addOutgoingTextObserver(this);
-    if (auto* team = ctx_.getTeamService())
+    if (observer_bridge_)
     {
-        team->addIncomingDataObserver(this);
+        observer_bridge_->registerObservers();
     }
 
-    phone_session_.reset(new MeshtasticPhoneSession(*this, *this, this, this, this, this, this, this));
+    phone_session_.reset(new phone::meshtastic::MeshtasticPhoneSession(phone_facade_,
+                                                                       *this,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_));
     if (!phone_session_)
     {
         ble_log("start failed reason=phone_session_alloc");
@@ -481,11 +488,9 @@ bool MeshtasticBleService::start()
 
 void MeshtasticBleService::stop()
 {
-    ctx_.getChatService().removeIncomingTextObserver(this);
-    ctx_.getChatService().removeOutgoingTextObserver(this);
-    if (auto* team = ctx_.getTeamService())
+    if (observer_bridge_)
     {
-        team->removeIncomingDataObserver(this);
+        observer_bridge_->unregisterObservers();
     }
 
     if (server_)
@@ -549,7 +554,7 @@ void MeshtasticBleService::update()
     handleToPhone();
 }
 
-void MeshtasticBleService::onIncomingText(const chat::MeshIncomingText& msg)
+void MeshtasticBleService::handleIncomingTextFromApp(const chat::MeshIncomingText& msg)
 {
     if (phone_session_)
     {
@@ -562,7 +567,7 @@ void MeshtasticBleService::onIncomingText(const chat::MeshIncomingText& msg)
     }
 }
 
-void MeshtasticBleService::onOutgoingText(const chat::MeshIncomingText& msg)
+void MeshtasticBleService::handleOutgoingTextFromApp(const chat::MeshIncomingText& msg)
 {
     if (phone_session_)
     {
@@ -579,7 +584,7 @@ void MeshtasticBleService::onOutgoingText(const chat::MeshIncomingText& msg)
     }
 }
 
-void MeshtasticBleService::onIncomingData(const chat::MeshIncomingData& msg)
+void MeshtasticBleService::handleIncomingDataFromApp(const chat::MeshIncomingData& msg)
 {
     if (phone_session_)
     {
@@ -762,7 +767,7 @@ void MeshtasticBleService::handleToPhone()
         {
             return;
         }
-        MeshtasticBleFrame session_frame{};
+        phone::meshtastic::MeshtasticBleFrame session_frame{};
         if (!phone_session_->popToPhone(&session_frame))
         {
             if (waiting_for_read && in_send_packets)
diff --git a/platform/esp/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp b/platform/esp/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp
new file mode 100644
index 00000000..c9a1138e
--- /dev/null
+++ b/platform/esp/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp
@@ -0,0 +1,65 @@
+#include "ble/meshtastic_ble_observer_bridge.h"
+
+#include "ble/meshtastic_ble.h"
+
+namespace ble
+{
+
+MeshtasticBleObserverBridge::MeshtasticBleObserverBridge(app::IAppBleFacade& app, MeshtasticBleService& service)
+    : app_(app), service_(service)
+{
+}
+
+MeshtasticBleObserverBridge::~MeshtasticBleObserverBridge()
+{
+    unregisterObservers();
+}
+
+void MeshtasticBleObserverBridge::registerObservers()
+{
+    if (registered_)
+    {
+        return;
+    }
+
+    app_.getChatService().addIncomingTextObserver(this);
+    app_.getChatService().addOutgoingTextObserver(this);
+    if (auto* team = app_.getTeamService())
+    {
+        team->addIncomingDataObserver(this);
+    }
+    registered_ = true;
+}
+
+void MeshtasticBleObserverBridge::unregisterObservers()
+{
+    if (!registered_)
+    {
+        return;
+    }
+
+    app_.getChatService().removeIncomingTextObserver(this);
+    app_.getChatService().removeOutgoingTextObserver(this);
+    if (auto* team = app_.getTeamService())
+    {
+        team->removeIncomingDataObserver(this);
+    }
+    registered_ = false;
+}
+
+void MeshtasticBleObserverBridge::onIncomingText(const chat::MeshIncomingText& msg)
+{
+    service_.handleIncomingTextFromApp(msg);
+}
+
+void MeshtasticBleObserverBridge::onOutgoingText(const chat::MeshIncomingText& msg)
+{
+    service_.handleOutgoingTextFromApp(msg);
+}
+
+void MeshtasticBleObserverBridge::onIncomingData(const chat::MeshIncomingData& msg)
+{
+    service_.handleIncomingDataFromApp(msg);
+}
+
+} // namespace ble
diff --git a/platform/esp/arduino_common/src/ble/meshtastic_ble_owner_hooks.cpp b/platform/esp/arduino_common/src/ble/meshtastic_ble_owner_hooks.cpp
index c8675964..bdf081c0 100644
--- a/platform/esp/arduino_common/src/ble/meshtastic_ble_owner_hooks.cpp
+++ b/platform/esp/arduino_common/src/ble/meshtastic_ble_owner_hooks.cpp
@@ -1,10 +1,8 @@
 #include "ble/meshtastic_ble.h"
 
-#include "board/BoardBase.h"
 #include "chat/ble/meshtastic_defaults.h"
 #include "chat/ble/meshtastic_phone_config_bridge.h"
 #include "platform/esp/arduino_common/chat/infra/meshtastic/mt_adapter.h"
-#include "platform/shared/ble/app_config_phone_snapshot_bridge.h"
 #include "platform/shared/ble/meshtastic_phone_runtime_bridge.h"
 
 #include <Arduino.h>
@@ -22,17 +20,6 @@ constexpr const char* kBlePinKey = "pin";
 
 constexpr const char* kModulePrefsNs = "mt_mod";
 constexpr const char* kModuleBlobKey = "cfg";
-
-chat::meshtastic::MtAdapter* getMeshtasticBackend(app::IAppBleFacade& ctx)
-{
-    auto* adapter = ctx.getMeshAdapter();
-    if (!adapter || adapter->backendProtocol() != chat::MeshProtocol::Meshtastic)
-    {
-        return nullptr;
-    }
-    auto* backend = adapter->backendForProtocol(adapter->backendProtocol());
-    return static_cast<chat::meshtastic::MtAdapter*>(backend);
-}
 } // namespace
 
 bool MeshtasticBleService::isBleConnected() const
@@ -40,109 +27,36 @@ bool MeshtasticBleService::isBleConnected() const
     return connected_;
 }
 
-bool MeshtasticBleService::loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const
+bool MeshtasticBleService::isPhoneBleConnected() const
 {
-    return meshtastic_config_bridge::loadBluetoothConfigView(ble_config_, ctx_.isBleEnabled(), out);
+    return connected_;
 }
 
-void MeshtasticBleService::saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config)
+uint32_t MeshtasticBleService::pendingPhoneBlePasskey() const
 {
-    ble_config_ = config;
-    meshtastic_config_bridge::normalizeBluetoothConfig(&ble_config_);
-    saveBleConfig();
+    return pending_passkey_.load();
 }
 
-bool MeshtasticBleService::loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const
-{
-    const uint32_t passkey = meshtastic_config_bridge::resolveBlePasskey(ble_config_, pending_passkey_.load());
-    return meshtastic_config_bridge::fillDeviceConnectionStatus(passkey, connected_, out);
-}
-
-bool MeshtasticBleService::loadModuleConfig(meshtastic_LocalModuleConfig* out) const
-{
-    if (!out)
-    {
-        return false;
-    }
-    *out = module_config_;
-    meshtastic_config_bridge::normalizeModuleConfig(out);
-    return true;
-}
-
-void MeshtasticBleService::saveModuleConfig(const meshtastic_LocalModuleConfig& config)
-{
-    module_config_ = config;
-    meshtastic_config_bridge::normalizeModuleConfig(&module_config_);
-    saveModuleConfig();
-}
-
-bool MeshtasticBleService::loadTimezoneTzdef(char* out, size_t out_len) const
-{
-    return platform::shared::ble_bridge::loadTimezoneTzdefFromSettings(out, out_len);
-}
-
-void MeshtasticBleService::saveTimezoneTzdef(const char* tzdef)
-{
-    platform::shared::ble_bridge::saveTimezoneTzdefToSettings(tzdef);
-}
-
-int MeshtasticBleService::getTimezoneOffsetMinutes() const
-{
-    return platform::shared::ble_bridge::getTimezoneOffsetMinutes();
-}
-
-void MeshtasticBleService::setTimezoneOffsetMinutes(int offset_min)
-{
-    platform::shared::ble_bridge::setTimezoneOffsetMinutes(offset_min);
-}
-
-bool MeshtasticBleService::getGpsFix(MeshtasticGpsFix* out) const
-{
-    return platform::shared::ble_bridge::fillMeshtasticGpsFixFromUiRuntime(out);
-}
-
-MeshtasticPhoneConfigSnapshot MeshtasticBleService::getMeshtasticPhoneConfig() const
-{
-    return platform::shared::ble_bridge::makeMeshtasticPhoneConfigSnapshot(ctx_.getConfig());
-}
-
-void MeshtasticBleService::setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config)
-{
-    platform::shared::ble_bridge::applyMeshtasticPhoneConfigSnapshot(ctx_.getConfig(), config);
-}
-
-MeshCorePhoneConfigSnapshot MeshtasticBleService::getMeshCorePhoneConfig() const
-{
-    return platform::shared::ble_bridge::makeMeshCorePhoneConfigSnapshot(ctx_.getConfig());
-}
-
-void MeshtasticBleService::setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config)
-{
-    platform::shared::ble_bridge::applyMeshCorePhoneConfigSnapshot(ctx_.getConfig(), config);
-}
-
-bool MeshtasticBleService::handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg)
-{
-    auto* mt = getMeshtasticBackend(ctx_);
-    return mt ? mt->handleMqttProxyMessage(msg) : false;
-}
-
-bool MeshtasticBleService::pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out)
-{
-    auto* mt = getMeshtasticBackend(ctx_);
-    return (mt && out) ? mt->pollMqttProxyMessage(out) : false;
-}
-
-void MeshtasticBleService::onConfigStart()
+void MeshtasticBleService::requestPhoneHighThroughputConnection()
 {
     requestHighThroughputConnection();
 }
 
-void MeshtasticBleService::onConfigComplete()
+void MeshtasticBleService::requestPhoneLowerPowerConnection()
 {
     requestLowerPowerConnection();
 }
 
+void MeshtasticBleService::onPhoneBluetoothConfigChanged()
+{
+    saveBleConfig();
+}
+
+void MeshtasticBleService::onPhoneModuleConfigChanged()
+{
+    saveModuleConfig();
+}
+
 void MeshtasticBleService::loadBleConfig()
 {
     ble_config_ = meshtastic_Config_BluetoothConfig_init_zero;
@@ -212,7 +126,7 @@ void MeshtasticBleService::loadModuleConfig()
 {
     auto init_defaults = [&]()
     {
-        meshtastic_config_bridge::initDefaultModuleConfig(&module_config_, ctx_.getSelfNodeId());
+        meshtastic_config_bridge::initDefaultModuleConfig(&module_config_, phone_facade_.getSelfNodeId());
 
 #if defined(ROTARY_A) && defined(ROTARY_B) && defined(ROTARY_C)
         module_config_.canned_message.updown1_enabled = true;
@@ -266,10 +180,7 @@ void MeshtasticBleService::refreshBatteryLevel(bool notify)
     }
 
     int level = -1;
-    if (BoardBase* board = ctx_.getBoard())
-    {
-        level = board->getBatteryLevel();
-    }
+    level = phone_facade_.getBatteryInfo().level;
     if (level < 0)
     {
         level = 0;
@@ -294,16 +205,7 @@ void MeshtasticBleService::refreshBatteryLevel(bool notify)
 
 void MeshtasticBleService::syncMqttProxySettings()
 {
-    auto* mt = getMeshtasticBackend(ctx_);
-    if (!mt)
-    {
-        return;
-    }
-
-    const auto cfg = getMeshtasticPhoneConfig();
-    chat::meshtastic::MtAdapter::MqttProxySettings settings;
-    platform::shared::ble_bridge::applyMeshtasticMqttProxySettings(settings, module_config_, cfg);
-    mt->setMqttProxySettings(settings);
+    phone_facade_.syncMeshtasticMqttProxySettings(module_config_);
 }
 
 } // namespace ble
diff --git a/platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp b/platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp
index adc216d7..64e56578 100644
--- a/platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp
+++ b/platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp
@@ -9,6 +9,7 @@
 #include "chat/infra/meshcore/meshcore_payload_helpers.h"
 #include "chat/infra/meshcore/meshcore_protocol_helpers.h"
 #include "chat/time_utils.h"
+#include "mesh/protocol/meshcore/meshcore_protocol_strategy.h"
 #include "sys/event_bus.h"
 #include <AES.h>
 #include <Arduino.h>
@@ -755,19 +756,19 @@ bool MeshCoreAdapter::resolveGroupSecret(ChannelId channel, uint8_t out_key16[16
     }
 
     const uint8_t* selected = nullptr;
-    if (channel == ChannelId::SECONDARY && !isZeroKey(config_.secondary_key, sizeof(config_.secondary_key)))
+    if (channel == ChannelId::SECONDARY && !isZeroKey(config_.secondary_key, chat::kMeshCoreChannelKeyLen))
     {
         selected = config_.secondary_key;
     }
-    else if (channel == ChannelId::PRIMARY && !isZeroKey(config_.primary_key, sizeof(config_.primary_key)))
+    else if (channel == ChannelId::PRIMARY && !isZeroKey(config_.primary_key, chat::kMeshCoreChannelKeyLen))
     {
         selected = config_.primary_key;
     }
-    else if (!isZeroKey(config_.secondary_key, sizeof(config_.secondary_key)))
+    else if (!isZeroKey(config_.secondary_key, chat::kMeshCoreChannelKeyLen))
     {
         selected = config_.secondary_key;
     }
-    else if (!isZeroKey(config_.primary_key, sizeof(config_.primary_key)))
+    else if (!isZeroKey(config_.primary_key, chat::kMeshCoreChannelKeyLen))
     {
         selected = config_.primary_key;
     }
@@ -797,7 +798,7 @@ ChannelId MeshCoreAdapter::resolveChannelFromHash(uint8_t channel_hash, bool* ou
         *out_match = false;
     }
 
-    if (!isZeroKey(config_.primary_key, sizeof(config_.primary_key)) &&
+    if (!isZeroKey(config_.primary_key, chat::kMeshCoreChannelKeyLen) &&
         computeChannelHash(config_.primary_key) == channel_hash)
     {
         if (out_match)
@@ -806,7 +807,7 @@ ChannelId MeshCoreAdapter::resolveChannelFromHash(uint8_t channel_hash, bool* ou
         }
         return ChannelId::PRIMARY;
     }
-    if (!isZeroKey(config_.secondary_key, sizeof(config_.secondary_key)) &&
+    if (!isZeroKey(config_.secondary_key, chat::kMeshCoreChannelKeyLen) &&
         computeChannelHash(config_.secondary_key) == channel_hash)
     {
         if (out_match)
@@ -2973,79 +2974,54 @@ bool MeshCoreAdapter::sendAppData(ChannelId channel, uint32_t portnum,
                 return false;
             }
         }
+        (void)peer_key16;
 
-        constexpr size_t kDirectCipherBudget =
-            ((kMeshcoreMaxPayloadSize - 2 - kCipherMacSize) / kCipherBlockSize) * kCipherBlockSize;
-        constexpr size_t kDirectPlainPrefix = 2 + 1 + sizeof(portnum);
-        if (kDirectCipherBudget <= kDirectPlainPrefix)
+        ::mesh::meshcore::MeshCoreProtocolStrategy core_strategy;
+        ::mesh::ProtocolBuildContext core_context{};
+        core_context.local_node = ::mesh::NodeId{node_id_};
+        core_context.channel_key = ::mesh::ByteView{peer_key32, sizeof(peer_key32)};
+        core_context.route_type = route_type;
+        core_context.route_path = ::mesh::ByteView{out_path, out_path_len};
+
+        ::mesh::DirectMessageCommand core_command{
+            ::mesh::NodeId{dest},
+            ::mesh::ByteView{payload, len},
+            want_ack};
+        core_command.application_port = portnum;
+
+        ::mesh::EncodedPacket frame{};
+        auto built = core_strategy.buildDirectMessage(core_context, core_command, frame);
+        if (!built.ok)
         {
-            MESHCORE_LOG("[MESHCORE] TX direct app-data dropped (cipher budget too small) peer=%08lX port=%u\n",
-                         static_cast<unsigned long>(dest),
-                         static_cast<unsigned>(portnum));
-            return false;
-        }
-
-        size_t body_len = len;
-        if (body_len + kDirectPlainPrefix > kDirectCipherBudget)
-        {
-            body_len = kDirectCipherBudget - kDirectPlainPrefix;
-        }
-
-        uint8_t plain[kDirectCipherBudget];
-        size_t plain_len = 0;
-        plain[plain_len++] = kDirectAppMagic0;
-        plain[plain_len++] = kDirectAppMagic1;
-        plain[plain_len++] = want_ack ? kDirectAppFlagWantAck : 0x00;
-        memcpy(&plain[plain_len], &portnum, sizeof(portnum));
-        plain_len += sizeof(portnum);
-        memcpy(&plain[plain_len], payload, body_len);
-        plain_len += body_len;
-
-        uint8_t peer_payload[kMeshcoreMaxPayloadSize];
-        size_t peer_payload_len = 0;
-        if (!buildPeerDatagramPayload(peer_hash, self_hash_,
-                                      peer_key16, peer_key32,
-                                      plain, plain_len,
-                                      peer_payload, sizeof(peer_payload), &peer_payload_len))
-        {
-            MESHCORE_LOG("[MESHCORE] TX direct app-data dropped (build payload fail) peer=%08lX port=%u plain_len=%u\n",
-                         static_cast<unsigned long>(dest),
-                         static_cast<unsigned>(portnum),
-                         static_cast<unsigned>(plain_len));
-            return false;
-        }
-
-        uint8_t frame[kMeshcoreMaxFrameSize];
-        size_t frame_len = 0;
-
-        if (!buildFrameNoTransport(route_type, kPayloadTypeDirectData,
-                                   out_path, out_path_len,
-                                   peer_payload, peer_payload_len,
-                                   frame, sizeof(frame), &frame_len))
-        {
-            MESHCORE_LOG("[MESHCORE] TX direct app-data dropped (build frame fail) peer=%08lX route=%s path_len=%u port=%u payload_len=%u\n",
+            MESHCORE_LOG("[MESHCORE] TX direct app-data dropped (core build fail) peer=%08lX route=%s path_len=%u port=%u code=%u\n",
                          static_cast<unsigned long>(dest),
                          (route_type == kRouteTypeDirect) ? "direct" : "flood",
                          static_cast<unsigned>(out_path_len),
                          static_cast<unsigned>(portnum),
-                         static_cast<unsigned>(peer_payload_len));
+                         static_cast<unsigned>(built.failure));
             return false;
         }
 
-        bool ok = transmitFrameNow(frame, frame_len, now_ms);
+        bool ok = transmitFrameNow(frame.bytes, frame.size, now_ms);
         MESHCORE_LOG("[MESHCORE] TX direct app-data peer=%08lX hash=%02X route=%s path_len=%u port=%u len=%u ok=%u\n",
                      static_cast<unsigned long>(dest),
                      static_cast<unsigned>(peer_hash),
                      (route_type == kRouteTypeDirect) ? "direct" : "flood",
                      static_cast<unsigned>(out_path_len),
                      static_cast<unsigned>(portnum),
-                     static_cast<unsigned>(frame_len),
+                     static_cast<unsigned>(frame.size),
                      ok ? 1U : 0U);
         if (ok && want_ack)
         {
-            const uint32_t ack_sig = packetSignature(kPayloadTypeDirectData, out_path_len,
-                                                     peer_payload, peer_payload_len);
-            trackPendingAppAck(ack_sig, dest, portnum, now_ms);
+            ParsedPacket built_packet{};
+            if (parsePacket(frame.bytes, frame.size, &built_packet))
+            {
+                const uint32_t ack_sig = packetSignature(built_packet.payload_type,
+                                                         built_packet.path_len,
+                                                         built_packet.payload,
+                                                         built_packet.payload_len);
+                trackPendingAppAck(ack_sig, dest, portnum, now_ms);
+            }
         }
         return ok;
     }
@@ -3060,55 +3036,32 @@ bool MeshCoreAdapter::sendAppData(ChannelId channel, uint32_t portnum,
                      static_cast<unsigned>(portnum));
         return false;
     }
+    (void)channel_key16;
 
-    constexpr size_t kGroupCipherBudget =
-        ((kMeshcoreMaxPayloadSize - 1 - kCipherMacSize) / kCipherBlockSize) * kCipherBlockSize;
-    constexpr size_t kGroupPlainPrefix = 2 + sizeof(uint32_t) + sizeof(portnum);
-    if (kGroupCipherBudget <= kGroupPlainPrefix)
-    {
-        MESHCORE_LOG("[MESHCORE] TX group app-data dropped (cipher budget too small) ch=%u port=%u\n",
-                     static_cast<unsigned>(channel),
-                     static_cast<unsigned>(portnum));
-        return false;
-    }
-    size_t body_len = len;
-    if (body_len + kGroupPlainPrefix > kGroupCipherBudget)
-    {
-        body_len = kGroupCipherBudget - kGroupPlainPrefix;
-    }
-    uint8_t plain[kGroupCipherBudget];
-    size_t plain_len = 0;
-    plain[plain_len++] = kGroupDataMagic0;
-    plain[plain_len++] = kGroupDataMagic1;
-    memcpy(&plain[plain_len], &node_id_, sizeof(node_id_));
-    plain_len += sizeof(node_id_);
-    memcpy(&plain[plain_len], &portnum, sizeof(portnum));
-    plain_len += sizeof(portnum);
-    memcpy(&plain[plain_len], payload, body_len);
-    plain_len += body_len;
+    ::mesh::meshcore::MeshCoreProtocolStrategy core_strategy;
+    ::mesh::ProtocolBuildContext core_context{};
+    core_context.local_node = ::mesh::NodeId{node_id_};
+    core_context.channel_key = ::mesh::ByteView{channel_key32, sizeof(channel_key32)};
+    core_context.channel_hash = channel_hash;
 
-    uint8_t encrypted[kMeshcoreMaxPayloadSize];
-    size_t encrypted_len = encryptThenMac(channel_key16, channel_key32,
-                                          encrypted, sizeof(encrypted),
-                                          plain, plain_len);
-    if (encrypted_len == 0 || encrypted_len > (kMeshcoreMaxPayloadSize - 1))
+    ::mesh::DirectMessageCommand core_command{
+        ::mesh::NodeId{},
+        ::mesh::ByteView{payload, len},
+        false};
+    core_command.application_port = portnum;
+
+    ::mesh::EncodedPacket frame{};
+    auto built = core_strategy.buildDirectMessage(core_context, core_command, frame);
+    if (!built.ok)
     {
-        MESHCORE_LOG("[MESHCORE] TX group app-data dropped (encrypt fail) ch=%u port=%u plain_len=%u\n",
+        MESHCORE_LOG("[MESHCORE] TX group app-data dropped (core build fail) ch=%u port=%u code=%u\n",
                      static_cast<unsigned>(channel),
                      static_cast<unsigned>(portnum),
-                     static_cast<unsigned>(plain_len));
+                     static_cast<unsigned>(built.failure));
         return false;
     }
 
-    uint8_t buffer[256];
-    size_t index = 0;
-    buffer[index++] = buildHeader(kRouteTypeFlood, kPayloadTypeGrpData, kPayloadVer1);
-    buffer[index++] = 0; // path_len = 0
-    buffer[index++] = channel_hash;
-    memcpy(&buffer[index], encrypted, encrypted_len);
-    index += encrypted_len;
-
-    return transmitFrameNow(buffer, index, now_ms);
+    return transmitFrameNow(frame.bytes, frame.size, now_ms);
 }
 
 bool MeshCoreAdapter::pollIncomingData(MeshIncomingData* out)
@@ -3159,8 +3112,8 @@ void MeshCoreAdapter::applyConfig(const MeshConfig& config)
         self_hash_ = static_cast<uint8_t>(node_id_ & 0xFFU);
     }
 
-    const bool has_primary_key = !isZeroKey(config_.primary_key, sizeof(config_.primary_key));
-    const bool has_secondary_key = !isZeroKey(config_.secondary_key, sizeof(config_.secondary_key));
+    const bool has_primary_key = !isZeroKey(config_.primary_key, chat::kMeshCoreChannelKeyLen);
+    const bool has_secondary_key = !isZeroKey(config_.secondary_key, chat::kMeshCoreChannelKeyLen);
     const uint8_t primary_hash = has_primary_key ? computeChannelHash(config_.primary_key) : 0xFF;
     const uint8_t secondary_hash = has_secondary_key ? computeChannelHash(config_.secondary_key) : 0xFF;
     const bool has_public = shouldUsePublicChannelFallback(config_);
@@ -4420,8 +4373,8 @@ void MeshCoreAdapter::handleRawPacketInternal(const uint8_t* data, size_t size,
 
     auto logUnknownGroupHash = [&](const char* kind, uint8_t channel_hash) -> void
     {
-        const bool has_primary_key = !isZeroKey(config_.primary_key, sizeof(config_.primary_key));
-        const bool has_secondary_key = !isZeroKey(config_.secondary_key, sizeof(config_.secondary_key));
+        const bool has_primary_key = !isZeroKey(config_.primary_key, chat::kMeshCoreChannelKeyLen);
+        const bool has_secondary_key = !isZeroKey(config_.secondary_key, chat::kMeshCoreChannelKeyLen);
         const uint8_t primary_hash = has_primary_key ? computeChannelHash(config_.primary_key) : 0xFF;
         const uint8_t secondary_hash = has_secondary_key ? computeChannelHash(config_.secondary_key) : 0xFF;
         const bool has_public = shouldUsePublicChannelFallback(config_);
diff --git a/platform/esp/arduino_common/src/chat/infra/meshtastic/mt_adapter.cpp b/platform/esp/arduino_common/src/chat/infra/meshtastic/mt_adapter.cpp
index 17cf90fd..ad28d21d 100644
--- a/platform/esp/arduino_common/src/chat/infra/meshtastic/mt_adapter.cpp
+++ b/platform/esp/arduino_common/src/chat/infra/meshtastic/mt_adapter.cpp
@@ -11,6 +11,7 @@
 #include "chat/time_utils.h"
 #include "platform/esp/arduino_common/app_tasks.h"
 #include "platform/esp/arduino_common/gps/gps_service_api.h"
+#include "platform/esp/arduino_common/mesh/esp_preferences_mesh_identity_store.h"
 #include "sys/event_bus.h"
 #include "team/protocol/team_portnum.h"
 #include <Arduino.h>
@@ -22,7 +23,6 @@
 #include <limits>
 #include <string>
 #define TEST_CURVE25519_FIELD_OPS
-#include "../../internal/blob_store_io.h"
 #include "board/TLoRaPagerTypes.h"
 #include "chat/infra/meshtastic/mt_node_payload.h"
 #include "chat/infra/meshtastic/mt_pki_crypto.h"
@@ -52,7 +52,6 @@
 namespace
 {
 constexpr uint8_t kDefaultPskIndex = 1;
-constexpr const char* kSecondaryChannelName = "Squad";
 constexpr uint8_t kBitfieldWantResponseMask = 0x02;
 constexpr size_t kMaxMqttProxyQueue = 12;
 constexpr uint32_t kBroadcastNodeId = 0xFFFFFFFFu;
@@ -119,6 +118,26 @@ bool shouldRequireDirectPki(uint8_t encrypt_mode, uint32_t dest_node, uint32_t p
            allowPkiForPortnum(portnum);
 }
 
+int16_t coreRadioRssi(float rssi)
+{
+    if (!std::isfinite(rssi))
+    {
+        return 0;
+    }
+    return static_cast<int16_t>(std::lround(
+        std::max(-32768.0f, std::min(32767.0f, rssi))));
+}
+
+int8_t coreRadioSnr(float snr)
+{
+    if (!std::isfinite(snr))
+    {
+        return 0;
+    }
+    return static_cast<int8_t>(std::lround(
+        std::max(-128.0f, std::min(127.0f, snr))));
+}
+
 void mt_diag_log(const char* fmt, ...)
 {
     char buf[192] = {};
@@ -316,6 +335,7 @@ MtAdapter::MtAdapter(LoraBoard& board)
       has_pending_raw_packet_(false)
 {
     config_ = MeshConfig(); // Default config
+    core_bridge_.reset(new ::platform::esp::arduino_common::mesh::EspMeshtasticAdapterBridge(board_));
     initNodeIdentity();
     next_packet_id_ = static_cast<MessageId>(random(1, 0x7FFFFFFF));
     LORA_LOG("[LORA] packet id start=%lu\n", static_cast<unsigned long>(next_packet_id_));
@@ -518,19 +538,51 @@ bool MtAdapter::sendAppData(ChannelId channel, uint32_t portnum,
                 static_cast<unsigned>(channel_hash),
                 use_pki ? "PKI" : "CHANNEL",
                 static_cast<unsigned>(out_len));
-    if (!buildWirePacket(out_payload, out_len, node_id_, msg_id,
-                         dest_node, channel_hash, hop_limit, air_want_ack,
-                         psk, psk_len, wire_buffer, &wire_size))
+    bool ok = false;
+    if (use_pki)
     {
-        return false;
+        if (!buildWirePacket(out_payload, out_len, node_id_, msg_id,
+                             dest_node, channel_hash, hop_limit, air_want_ack,
+                             psk, psk_len, wire_buffer, &wire_size))
+        {
+            return false;
+        }
+        if (!board_.isRadioOnline())
+        {
+            return false;
+        }
+        ok = transmitWirePacket(wire_buffer, wire_size);
     }
-
-    if (!board_.isRadioOnline())
+    else if (dest_node == kBroadcastNodeId)
     {
-        return false;
+        if (!buildWirePacket(out_payload, out_len, node_id_, msg_id,
+                             dest_node, channel_hash, hop_limit, air_want_ack,
+                             psk, psk_len, wire_buffer, &wire_size))
+        {
+            return false;
+        }
+        if (!board_.isRadioOnline())
+        {
+            return false;
+        }
+        ok = transmitWirePacket(wire_buffer, wire_size);
+    }
+    else
+    {
+        ok = sendChannelAppDataViaCore(portnum,
+                                       payload,
+                                       len,
+                                       dest_node,
+                                       effective_want_response,
+                                       msg_id,
+                                       channel_hash,
+                                       psk,
+                                       psk_len,
+                                       hop_limit,
+                                       air_want_ack,
+                                       wire_buffer,
+                                       &wire_size);
     }
-
-    bool ok = transmitWirePacket(wire_buffer, wire_size);
     mt_diag_log("[MT][TX] app id=%08lX dest=%08lX port=%u ok=%u air_ack=%u track_ack=%u len=%u\n",
                 static_cast<unsigned long>(msg_id),
                 static_cast<unsigned long>(dest_node),
@@ -1376,6 +1428,14 @@ void MtAdapter::processReceivedPacket(const uint8_t* data, size_t size)
         has_pending_raw_packet_ = true;
     }
 
+    if (core_bridge_)
+    {
+        core_bridge_->onRadioPacket(data,
+                                    size,
+                                    coreRadioRssi(last_rx_rssi_),
+                                    coreRadioSnr(last_rx_snr_));
+    }
+
     // Parse wire packet header
     PacketHeaderWire header;
     uint8_t payload[256];
@@ -1863,7 +1923,7 @@ void MtAdapter::processReceivedPacket(const uint8_t* data, size_t size)
                     node.via_mqtt,
                     node.is_ignored,
                     node.has_public_key,
-                    node.key_manually_verified,
+                    false,
                     node.has_device_metrics,
                     node.has_device_metrics ? &node.device_metrics : nullptr);
                 bool published = sys::EventBus::publish(event, 0);
@@ -2453,11 +2513,7 @@ bool MtAdapter::sendPacket(const PendingSend& pending)
         }
     }
 
-    const char* channel_name = kSecondaryChannelName;
-    if (channel != ChannelId::SECONDARY)
-    {
-        channel_name = chat::meshtastic::primaryChannelName(config_);
-    }
+    const char* channel_name = chat::meshtastic::channelName(config_, channel);
     LORA_LOG("[LORA] TX channel name='%s' hash=0x%02X psk=%u pki=%u dest=%08lX\n",
              channel_name,
              channel_hash,
@@ -2896,8 +2952,10 @@ void MtAdapter::updateChannelKeys()
     }
     else
     {
-        memcpy(primary_psk_, config_.primary_key, sizeof(primary_psk_));
-        primary_psk_len_ = sizeof(primary_psk_);
+        primary_psk_len_ = chat::normalizeMeshtasticChannelKeyLen(config_.primary_key,
+                                                                  sizeof(config_.primary_key),
+                                                                  config_.primary_key_len);
+        memcpy(primary_psk_, config_.primary_key, primary_psk_len_);
     }
 
     if (isZeroKey(config_.secondary_key, sizeof(config_.secondary_key)))
@@ -2907,14 +2965,17 @@ void MtAdapter::updateChannelKeys()
     }
     else
     {
-        memcpy(secondary_psk_, config_.secondary_key, sizeof(secondary_psk_));
-        secondary_psk_len_ = sizeof(secondary_psk_);
+        secondary_psk_len_ = chat::normalizeMeshtasticChannelKeyLen(config_.secondary_key,
+                                                                    sizeof(config_.secondary_key),
+                                                                    config_.secondary_key_len);
+        memcpy(secondary_psk_, config_.secondary_key, secondary_psk_len_);
     }
 
     const char* primary_name = chat::meshtastic::primaryChannelName(config_);
+    const char* secondary_name = chat::meshtastic::secondaryChannelName(config_);
     primary_channel_hash_ = computeChannelHash(primary_name, primary_psk_, primary_psk_len_);
     secondary_channel_hash_ =
-        computeChannelHash(kSecondaryChannelName,
+        computeChannelHash(secondary_name,
                            (secondary_psk_len_ > 0) ? secondary_psk_ : nullptr,
                            secondary_psk_len_);
     std::string primary_psk_hex = toHex(primary_psk_, primary_psk_len_, primary_psk_len_);
@@ -2927,7 +2988,7 @@ void MtAdapter::updateChannelKeys()
              (unsigned)primary_psk_len_,
              primary_psk_hex.c_str());
     LORA_LOG("[LORA] channel secondary='%s' hash=0x%02X psk=%u hex=%s\n",
-             kSecondaryChannelName,
+             secondary_name,
              secondary_channel_hash_,
              (unsigned)secondary_psk_len_,
              secondary_psk_hex.c_str());
@@ -2981,6 +3042,54 @@ bool MtAdapter::transmitWirePacket(const uint8_t* wire_data, size_t wire_size)
     return ok;
 }
 
+bool MtAdapter::sendChannelAppDataViaCore(uint32_t portnum,
+                                          const uint8_t* payload,
+                                          size_t len,
+                                          uint32_t dest_node,
+                                          bool effective_want_response,
+                                          MessageId msg_id,
+                                          uint8_t channel_hash,
+                                          const uint8_t* psk,
+                                          size_t psk_len,
+                                          uint8_t hop_limit,
+                                          bool air_want_ack,
+                                          uint8_t* out_wire_data,
+                                          size_t* inout_wire_size)
+{
+    if (!core_bridge_ || !payload || len == 0 || !out_wire_data || !inout_wire_size)
+    {
+        return false;
+    }
+
+    ::mesh::DirectMessageCommand command{
+        ::mesh::NodeId{dest_node},
+        ::mesh::ByteView{payload, len},
+        effective_want_response};
+    command.from = ::mesh::NodeId{node_id_};
+    command.application_port = portnum;
+    command.packet_id = msg_id;
+    command.channel_hash = channel_hash;
+    command.channel_key = ::mesh::ByteView{psk, psk_len};
+    command.hop_limit = hop_limit;
+    command.has_air_want_ack = true;
+    command.air_want_ack = air_want_ack;
+    command.include_payload_dest = false;
+    command.require_local_identity = false;
+    command.require_peer_key = false;
+
+    auto sent = core_bridge_->sendDirect(command);
+    if (!sent.ok)
+    {
+        mt_diag_log("[MT][TX_BLOCK] id=%08lX dest=%08lX port=%u reason=core_send_fail code=%u path=CHANNEL\n",
+                    static_cast<unsigned long>(msg_id),
+                    static_cast<unsigned long>(dest_node),
+                    static_cast<unsigned>(portnum),
+                    static_cast<unsigned>(sent.failure));
+        return false;
+    }
+    return core_bridge_->copyLastSentPacket(out_wire_data, *inout_wire_size, *inout_wire_size);
+}
+
 void MtAdapter::trackPendingAck(uint32_t msg_id, uint32_t dest, ChannelId channel, uint8_t channel_hash,
                                 const uint8_t* wire_data, size_t wire_size)
 {
@@ -3025,35 +3134,24 @@ void MtAdapter::retryPendingAck(uint32_t msg_id, PendingAckState& pending)
 
 bool MtAdapter::initPkiKeys()
 {
-    std::array<uint8_t, 32> pub_before{};
-    std::vector<uint8_t> pub_blob;
-    std::vector<uint8_t> priv_blob;
-    const bool have_pub_blob = chat::infra::loadRawBlobFromPreferences("chat", "pki_pub", pub_blob);
-    const bool have_priv_blob = chat::infra::loadRawBlobFromPreferences("chat", "pki_priv", priv_blob);
-    const size_t pub_len = have_pub_blob ? pub_blob.size() : 0;
-    const size_t priv_len = have_priv_blob ? priv_blob.size() : 0;
-    if (pub_len == pub_before.size())
+    ::platform::esp::arduino_common::mesh::EspPreferencesLocalIdentityStore store;
+    ::mesh::LocalIdentity stored_identity{};
+    auto loaded = store.load(stored_identity);
+    bool have_keys = loaded.ok &&
+                     !isZeroKey(stored_identity.private_key,
+                                sizeof(stored_identity.private_key));
+    if (have_keys)
     {
-        memcpy(pub_before.data(), pub_blob.data(), pub_before.size());
-    }
-    if (priv_len == pki_private_key_.size())
-    {
-        memcpy(pki_private_key_.data(), priv_blob.data(), pki_private_key_.size());
-    }
-
-    if (pub_len > 0)
-    {
-        std::string stored_fp = toHex(pub_before.data(), pub_len, 8);
-        LORA_LOG("[LORA] PKI stored pub len=%u fp=%s\n",
-                 static_cast<unsigned>(pub_len), stored_fp.c_str());
+        memcpy(pki_public_key_.data(), stored_identity.public_key, pki_public_key_.size());
+        memcpy(pki_private_key_.data(), stored_identity.private_key, pki_private_key_.size());
+        std::string loaded_fp = toHex(pki_public_key_.data(), pki_public_key_.size(), 8);
+        LORA_LOG("[LORA] PKI keys loaded pub fp=%s\n", loaded_fp.c_str());
     }
     else
     {
-        LORA_LOG("[LORA] PKI stored pub len=0\n");
+        LORA_LOG("[LORA] PKI stored identity unavailable status=%u\n",
+                 static_cast<unsigned>(loaded.failure));
     }
-    LORA_LOG("[LORA] PKI stored priv len=%u\n", static_cast<unsigned>(priv_len));
-    bool have_keys = (pub_len == pki_public_key_.size() && priv_len == pki_private_key_.size() &&
-                      !isZeroKey(pki_private_key_.data(), pki_private_key_.size()));
 
     if (!have_keys)
     {
@@ -3068,28 +3166,18 @@ bool MtAdapter::initPkiKeys()
         {
             std::string gen_fp = toHex(pki_public_key_.data(), pki_public_key_.size(), 8);
             LORA_LOG("[LORA] PKI keys generated pub fp=%s\n", gen_fp.c_str());
-            const bool pub_ok = chat::infra::saveRawBlobToPreferences("chat",
-                                                                      "pki_pub",
-                                                                      pki_public_key_.data(),
-                                                                      pki_public_key_.size());
-            const bool priv_ok = chat::infra::saveRawBlobToPreferences("chat",
-                                                                       "pki_priv",
-                                                                       pki_private_key_.data(),
-                                                                       pki_private_key_.size());
-            if (!pub_ok || !priv_ok)
+            ::mesh::LocalIdentity generated{};
+            memcpy(generated.public_key, pki_public_key_.data(), sizeof(generated.public_key));
+            memcpy(generated.private_key, pki_private_key_.data(), sizeof(generated.private_key));
+            generated.valid = true;
+            auto saved = store.save(generated);
+            if (!saved.ok)
             {
-                LORA_LOG("[LORA] PKI key persist failed pub_ok=%u priv_ok=%u\n",
-                         pub_ok ? 1U : 0U,
-                         priv_ok ? 1U : 0U);
+                LORA_LOG("[LORA] PKI key persist failed status=%u\n",
+                         static_cast<unsigned>(saved.failure));
             }
         }
     }
-    else
-    {
-        memcpy(pki_public_key_.data(), pub_before.data(), pki_public_key_.size());
-        std::string loaded_fp = toHex(pki_public_key_.data(), pki_public_key_.size(), 8);
-        LORA_LOG("[LORA] PKI keys loaded pub fp=%s\n", loaded_fp.c_str());
-    }
 
     pki_ready_ = have_keys;
     if (pki_ready_)
@@ -3105,93 +3193,34 @@ bool MtAdapter::initPkiKeys()
 
 void MtAdapter::loadPkiNodeKeys()
 {
-    struct PkiKeyEntry
-    {
-        uint32_t node_id;
-        uint8_t key[32];
-    };
-    struct PkiKeyEntryV2
-    {
-        uint32_t node_id;
-        uint32_t last_seen;
-        uint8_t key[32];
-    } __attribute__((packed));
-
-    std::vector<uint8_t> blob;
-    chat::infra::PreferencesBlobMetadata meta;
-    if (!chat::infra::loadRawBlobFromPreferencesWithMetadata(kPkiPrefsNs,
-                                                             kPkiPrefsKey,
-                                                             kPkiPrefsKeyVer,
-                                                             nullptr,
-                                                             blob,
-                                                             &meta))
-    {
-        LORA_LOG("[LORA] PKI prefs open failed ns=%s\n", kPkiPrefsNs);
-        return;
-    }
-    if (meta.len < sizeof(PkiKeyEntry))
+    ::platform::esp::arduino_common::mesh::EspPreferencesPeerKeyStore store;
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = store.loadAll(keys);
+    if (!loaded.ok)
     {
+        if (loaded.failure != ::mesh::StoreFailure::NotFound)
+        {
+            LORA_LOG("[LORA] PKI key load failed ns=%s status=%u\n",
+                     kPkiPrefsNs,
+                     static_cast<unsigned>(loaded.failure));
+        }
         return;
     }
 
-    if (meta.has_version && meta.version == kPkiPrefsVersion &&
-        (meta.len % sizeof(PkiKeyEntryV2) == 0))
+    node_public_keys_.clear();
+    node_key_last_seen_.clear();
+    for (const auto& peer_key : keys)
     {
-        size_t count = meta.len / sizeof(PkiKeyEntryV2);
-        if (count > kMaxPkiNodes)
-        {
-            count = kMaxPkiNodes;
-        }
-        const auto* entries_v2 = reinterpret_cast<const PkiKeyEntryV2*>(blob.data());
-        for (size_t i = 0; i < count; ++i)
-        {
-            if (entries_v2[i].node_id == 0)
-            {
-                continue;
-            }
-            std::array<uint8_t, 32> key{};
-            memcpy(key.data(), entries_v2[i].key, sizeof(entries_v2[i].key));
-            node_public_keys_[entries_v2[i].node_id] = key;
-            node_key_last_seen_[entries_v2[i].node_id] = entries_v2[i].last_seen;
-            LORA_LOG("[LORA] PKI key loaded for %08lX\n",
-                     static_cast<unsigned long>(entries_v2[i].node_id));
-        }
-        LORA_LOG("[LORA] PKI keys loaded=%u ns=%s\n",
-                 static_cast<unsigned>(count),
-                 kPkiPrefsNs);
-        return;
-    }
-
-    if ((meta.len % sizeof(PkiKeyEntry)) != 0)
-    {
-        return;
-    }
-    size_t count = meta.len / sizeof(PkiKeyEntry);
-    if (count > kMaxPkiNodes)
-    {
-        count = kMaxPkiNodes;
-    }
-    const auto* entries = reinterpret_cast<const PkiKeyEntry*>(blob.data());
-    for (size_t i = 0; i < count; ++i)
-    {
-        if (entries[i].node_id == 0)
-        {
-            continue;
-        }
         std::array<uint8_t, 32> key{};
-        memcpy(key.data(), entries[i].key, sizeof(entries[i].key));
-        node_public_keys_[entries[i].node_id] = key;
-        node_key_last_seen_[entries[i].node_id] = 0;
+        memcpy(key.data(), peer_key.public_key, key.size());
+        node_public_keys_[peer_key.node_id.value] = key;
+        node_key_last_seen_[peer_key.node_id.value] = peer_key.updated_at_ms;
         LORA_LOG("[LORA] PKI key loaded for %08lX\n",
-                 static_cast<unsigned long>(entries[i].node_id));
+                 static_cast<unsigned long>(peer_key.node_id.value));
     }
     LORA_LOG("[LORA] PKI keys loaded=%u ns=%s\n",
-             static_cast<unsigned>(count),
+             static_cast<unsigned>(keys.size()),
              kPkiPrefsNs);
-    if (!node_public_keys_.empty())
-    {
-        savePkiKeysToPrefs();
-    }
 }
 
 void MtAdapter::savePkiNodeKey(uint32_t node_id, const uint8_t* key, size_t key_len)
@@ -3209,60 +3238,41 @@ void MtAdapter::savePkiNodeKey(uint32_t node_id, const uint8_t* key, size_t key_
 
 void MtAdapter::savePkiKeysToPrefs()
 {
-    struct PkiKeyEntryV2
-    {
-        uint32_t node_id;
-        uint32_t last_seen;
-        uint8_t key[32];
-    } __attribute__((packed));
-
-    std::vector<PkiKeyEntryV2> entries;
+    std::vector<::mesh::PeerPublicKey> entries;
     entries.reserve(node_public_keys_.size());
     for (const auto& kv : node_public_keys_)
     {
-        PkiKeyEntryV2 entry{};
-        entry.node_id = kv.first;
+        ::mesh::PeerPublicKey entry{};
+        entry.node_id = ::mesh::NodeId{kv.first};
         auto seen_it = node_key_last_seen_.find(kv.first);
-        entry.last_seen = (seen_it != node_key_last_seen_.end()) ? seen_it->second : 0;
-        memcpy(entry.key, kv.second.data(), sizeof(entry.key));
+        entry.updated_at_ms = (seen_it != node_key_last_seen_.end()) ? seen_it->second : 0;
+        entry.verified = false;
+        memcpy(entry.public_key, kv.second.data(), sizeof(entry.public_key));
         entries.push_back(entry);
     }
     if (entries.size() > kMaxPkiNodes)
     {
         std::sort(entries.begin(), entries.end(),
-                  [](const PkiKeyEntryV2& a, const PkiKeyEntryV2& b)
+                  [](const ::mesh::PeerPublicKey& a, const ::mesh::PeerPublicKey& b)
                   {
-                      return a.last_seen < b.last_seen;
+                      return a.updated_at_ms < b.updated_at_ms;
                   });
         size_t drop = entries.size() - kMaxPkiNodes;
         for (size_t i = 0; i < drop; ++i)
         {
-            node_public_keys_.erase(entries[i].node_id);
-            node_key_last_seen_.erase(entries[i].node_id);
+            node_public_keys_.erase(entries[i].node_id.value);
+            node_key_last_seen_.erase(entries[i].node_id.value);
         }
         entries.erase(entries.begin(), entries.begin() + static_cast<long>(drop));
     }
 
-    chat::infra::PreferencesBlobMetadata meta;
-    if (!entries.empty())
+    ::platform::esp::arduino_common::mesh::EspPreferencesPeerKeyStore store;
+    auto saved = store.replaceAll(entries.empty() ? nullptr : entries.data(), entries.size());
+    if (!saved.ok)
     {
-        meta.len = entries.size() * sizeof(PkiKeyEntryV2);
-        meta.has_version = true;
-        meta.version = kPkiPrefsVersion;
-    }
-
-    const bool ok = chat::infra::saveRawBlobToPreferencesWithMetadata(
-        kPkiPrefsNs,
-        kPkiPrefsKey,
-        kPkiPrefsKeyVer,
-        nullptr,
-        entries.empty() ? nullptr : reinterpret_cast<const uint8_t*>(entries.data()),
-        entries.size() * sizeof(PkiKeyEntryV2),
-        &meta,
-        false);
-    if (!ok)
-    {
-        LORA_LOG("[LORA] PKI key save failed open ns=%s\n", kPkiPrefsNs);
+        LORA_LOG("[LORA] PKI key save failed ns=%s status=%u\n",
+                 kPkiPrefsNs,
+                 static_cast<unsigned>(saved.failure));
         return;
     }
     if (!entries.empty())
diff --git a/platform/esp/arduino_common/src/gps/gps_service_api.cpp b/platform/esp/arduino_common/src/gps/gps_service_api.cpp
index b4373a06..6a523280 100644
--- a/platform/esp/arduino_common/src/gps/gps_service_api.cpp
+++ b/platform/esp/arduino_common/src/gps/gps_service_api.cpp
@@ -1,15 +1,93 @@
 #include "platform/esp/arduino_common/gps/gps_service_api.h"
 #include "platform/esp/arduino_common/gps/gps_service.h"
+#include "sys/clock.h"
 #include <cmath>
+#include <ctime>
 
 namespace gps
 {
+namespace
+{
+constexpr uint32_t kMinValidEpochSeconds = 1577836800UL; // 2020-01-01 UTC
+
+class GpsServiceLocationSource final : public ILocationSource
+{
+  public:
+    bool latestFix(LocationFix& out) const override
+    {
+        const GpsState state = gps_get_data();
+        if (!state.valid)
+        {
+            out = {};
+            return false;
+        }
+        uint64_t epoch = 0;
+        const uint32_t now_epoch = sys::epoch_seconds_now();
+        if (now_epoch >= kMinValidEpochSeconds)
+        {
+            epoch = now_epoch;
+        }
+        out = locationFixFromGpsState(state, sys::millis_now(), epoch);
+        return true;
+    }
+};
+
+class SystemEpochTimeAuthority final : public ITimeAuthority
+{
+  public:
+    uint32_t nowMonotonicMs() const override
+    {
+        return sys::millis_now();
+    }
+
+    bool nowEpoch(uint64_t& out_epoch_seconds) const override
+    {
+        const uint32_t epoch = sys::epoch_seconds_now();
+        if (epoch < kMinValidEpochSeconds)
+        {
+            out_epoch_seconds = 0;
+            return false;
+        }
+        out_epoch_seconds = epoch;
+        return true;
+    }
+
+    TimeSyncStatus syncStatus() const override
+    {
+        TimeSyncStatus status{};
+        uint64_t epoch = 0;
+        status.epoch_valid = nowEpoch(epoch);
+        status.synced = status.epoch_valid;
+        status.source = status.epoch_valid ? TimeSourceKind::System : TimeSourceKind::None;
+        status.epoch_seconds = epoch;
+        status.observed_at_ms = sys::millis_now();
+        return status;
+    }
+};
+} // namespace
 
 GpsState gps_get_data()
 {
     return GpsService::getInstance().getData();
 }
 
+bool gps_latest_fix(gps::LocationFix& out)
+{
+    return gps_location_source().latestFix(out);
+}
+
+const gps::ILocationSource& gps_location_source()
+{
+    static GpsServiceLocationSource source;
+    return source;
+}
+
+const gps::ITimeAuthority& gps_time_authority()
+{
+    static SystemEpochTimeAuthority authority;
+    return authority;
+}
+
 bool gps_get_gnss_snapshot(gps::GnssSatInfo* out, size_t max, size_t* out_count, gps::GnssStatus* status)
 {
     return GpsService::getInstance().getGnssSnapshot(out, max, out_count, status);
diff --git a/platform/esp/arduino_common/src/mesh/esp_mesh_runtime_shell.cpp b/platform/esp/arduino_common/src/mesh/esp_mesh_runtime_shell.cpp
new file mode 100644
index 00000000..532af8e1
--- /dev/null
+++ b/platform/esp/arduino_common/src/mesh/esp_mesh_runtime_shell.cpp
@@ -0,0 +1,37 @@
+#include "platform/esp/arduino_common/mesh/esp_mesh_runtime_shell.h"
+
+namespace platform::esp::arduino_common::mesh
+{
+
+EspMeshRuntimeShell::EspMeshRuntimeShell(::mesh::MeshSession& session)
+    : session_(session)
+{
+}
+
+bool EspMeshRuntimeShell::start(const ::mesh::MeshRuntimeConfig& config)
+{
+    return session_.start(config);
+}
+
+void EspMeshRuntimeShell::stop()
+{
+    session_.stop();
+}
+
+void EspMeshRuntimeShell::tick()
+{
+    session_.tick();
+}
+
+::mesh::SendResult EspMeshRuntimeShell::sendDirect(
+    const ::mesh::DirectMessageCommand& command)
+{
+    return session_.sendDirect(command);
+}
+
+::mesh::MeshSessionState EspMeshRuntimeShell::state() const
+{
+    return session_.state();
+}
+
+} // namespace platform::esp::arduino_common::mesh
diff --git a/platform/esp/arduino_common/src/mesh/esp_meshtastic_adapter_bridge.cpp b/platform/esp/arduino_common/src/mesh/esp_meshtastic_adapter_bridge.cpp
new file mode 100644
index 00000000..a3ec740a
--- /dev/null
+++ b/platform/esp/arduino_common/src/mesh/esp_meshtastic_adapter_bridge.cpp
@@ -0,0 +1,193 @@
+#include "platform/esp/arduino_common/mesh/esp_meshtastic_adapter_bridge.h"
+
+#include "platform/esp/arduino_common/app_tasks.h"
+
+#include <Arduino.h>
+#include <RadioLib.h>
+#include <cstring>
+
+namespace platform::esp::arduino_common::mesh
+{
+
+uint32_t EspArduinoMeshClock::nowMs() const
+{
+    return millis();
+}
+
+::mesh::CryptoResult EspArduinoMeshCryptoProvider::random(uint8_t* out, size_t len)
+{
+    if (!out && len > 0)
+    {
+        return ::mesh::CryptoResult::fail(::mesh::CryptoFailure::InvalidInput);
+    }
+    for (size_t index = 0; index < len; ++index)
+    {
+        out[index] = static_cast<uint8_t>(::random(0, 256));
+    }
+    return ::mesh::CryptoResult::success();
+}
+
+::mesh::CryptoResult EspArduinoMeshCryptoProvider::sha256(::mesh::ByteView input, uint8_t out[32])
+{
+    (void)input;
+    (void)out;
+    return ::mesh::CryptoResult::fail(::mesh::CryptoFailure::Unsupported);
+}
+
+::mesh::CryptoResult EspArduinoMeshCryptoProvider::aesCcmEncrypt(::mesh::ByteView key,
+                                                                 ::mesh::ByteView nonce,
+                                                                 ::mesh::ByteView aad,
+                                                                 ::mesh::ByteView plaintext,
+                                                                 uint8_t* ciphertext,
+                                                                 size_t ciphertext_capacity,
+                                                                 size_t& ciphertext_size)
+{
+    (void)key;
+    (void)nonce;
+    (void)aad;
+    (void)plaintext;
+    (void)ciphertext;
+    (void)ciphertext_capacity;
+    ciphertext_size = 0;
+    return ::mesh::CryptoResult::fail(::mesh::CryptoFailure::Unsupported);
+}
+
+::mesh::CryptoResult EspArduinoMeshCryptoProvider::aesCcmDecrypt(::mesh::ByteView key,
+                                                                 ::mesh::ByteView nonce,
+                                                                 ::mesh::ByteView aad,
+                                                                 ::mesh::ByteView ciphertext,
+                                                                 uint8_t* plaintext,
+                                                                 size_t plaintext_capacity,
+                                                                 size_t& plaintext_size)
+{
+    (void)key;
+    (void)nonce;
+    (void)aad;
+    (void)ciphertext;
+    (void)plaintext;
+    (void)plaintext_capacity;
+    plaintext_size = 0;
+    return ::mesh::CryptoResult::fail(::mesh::CryptoFailure::Unsupported);
+}
+
+EspMeshtasticPacketRadio::EspMeshtasticPacketRadio(LoraBoard& board)
+    : board_(board)
+{
+}
+
+::mesh::RadioResult EspMeshtasticPacketRadio::configure(const ::mesh::RadioConfig& config)
+{
+    (void)config;
+    return board_.isRadioOnline()
+               ? ::mesh::RadioResult::success()
+               : ::mesh::RadioResult::fail(::mesh::RadioFailure::NotReady);
+}
+
+::mesh::RadioResult EspMeshtasticPacketRadio::send(::mesh::ByteView packet)
+{
+    if (packet.empty())
+    {
+        return ::mesh::RadioResult::fail(::mesh::RadioFailure::InvalidConfig);
+    }
+    if (packet.size > 255)
+    {
+        return ::mesh::RadioResult::fail(::mesh::RadioFailure::InvalidConfig);
+    }
+    if (!board_.isRadioOnline())
+    {
+        return ::mesh::RadioResult::fail(::mesh::RadioFailure::NotReady);
+    }
+
+    app::AppTasks::requestRadioReceiveRestart();
+#if defined(ARDUINO_LILYGO_LORA_SX1262) || defined(ARDUINO_LILYGO_LORA_SX1280)
+    const int state = board_.transmitRadio(packet.data, packet.size);
+#else
+    const int state = RADIOLIB_ERR_UNSUPPORTED;
+#endif
+    if (state == RADIOLIB_ERR_NONE)
+    {
+        last_sent_size_ = packet.size;
+        std::memcpy(last_sent_, packet.data, packet.size);
+        board_.startRadioReceive();
+        return ::mesh::RadioResult::success();
+    }
+    app::AppTasks::requestRadioReceiveRestart();
+    return ::mesh::RadioResult::fail(::mesh::RadioFailure::TxFailed);
+}
+
+bool EspMeshtasticPacketRadio::poll(::mesh::RadioRxPacket& out)
+{
+    (void)out;
+    return false;
+}
+
+void EspMeshEventBridge::emit(const ::mesh::MeshEvent& event)
+{
+    last_event = event;
+    ++emitted_count;
+}
+
+EspMeshtasticAdapterBridge::EspMeshtasticAdapterBridge(LoraBoard& board)
+    : radio_(board),
+      identity_(local_store_, peer_store_, crypto_, clock_),
+      receive_(protocol_, identity_, events_, clock_, &receive_dedup_),
+      direct_(protocol_, identity_, radio_, clock_, events_),
+      session_(radio_, protocol_, direct_, receive_, clock_)
+{
+    ::mesh::MeshRuntimeConfig config{};
+    config.protocol = ::mesh::MeshProtocolKind::Meshtastic;
+    config.radio.frequency_hz = 1;
+    (void)session_.start(config);
+}
+
+::mesh::SendResult EspMeshtasticAdapterBridge::sendDirect(const ::mesh::DirectMessageCommand& command)
+{
+    if (session_.state() != ::mesh::MeshSessionState::Ready)
+    {
+        ::mesh::MeshRuntimeConfig config{};
+        config.protocol = ::mesh::MeshProtocolKind::Meshtastic;
+        config.radio.frequency_hz = 1;
+        if (!session_.start(config))
+        {
+            return ::mesh::SendResult::fail(::mesh::SendFailure::NotReady);
+        }
+    }
+    return session_.sendDirect(command);
+}
+
+bool EspMeshtasticAdapterBridge::copyLastSentPacket(uint8_t* out, size_t capacity, size_t& out_size) const
+{
+    if (!out || radio_.last_sent_size_ == 0 || capacity < radio_.last_sent_size_)
+    {
+        return false;
+    }
+    std::memcpy(out, radio_.last_sent_, radio_.last_sent_size_);
+    out_size = radio_.last_sent_size_;
+    return true;
+}
+
+void EspMeshtasticAdapterBridge::onRadioPacket(const uint8_t* data,
+                                               size_t size,
+                                               int16_t rssi,
+                                               int8_t snr)
+{
+    if (!data || size == 0 || size > sizeof(::mesh::RadioRxPacket::bytes))
+    {
+        return;
+    }
+
+    ::mesh::RadioRxPacket packet{};
+    std::memcpy(packet.bytes, data, size);
+    packet.size = size;
+    packet.rssi = rssi;
+    packet.snr = snr;
+    packet.received_at_ms = clock_.nowMs();
+    receive_.onRadioPacket(packet);
+}
+
+void EspMeshtasticAdapterBridge::tick()
+{
+    session_.tick();
+}
+
+} // namespace platform::esp::arduino_common::mesh
diff --git a/platform/esp/arduino_common/src/mesh/esp_preferences_mesh_identity_store.cpp b/platform/esp/arduino_common/src/mesh/esp_preferences_mesh_identity_store.cpp
new file mode 100644
index 00000000..a5e729ac
--- /dev/null
+++ b/platform/esp/arduino_common/src/mesh/esp_preferences_mesh_identity_store.cpp
@@ -0,0 +1,383 @@
+#include "platform/esp/arduino_common/mesh/esp_preferences_mesh_identity_store.h"
+
+#include "../chat/internal/blob_store_io.h"
+
+#include <algorithm>
+#include <cstring>
+
+namespace platform::esp::arduino_common::mesh
+{
+namespace
+{
+
+struct LegacyPeerKeyEntry
+{
+    uint32_t node_id;
+    uint8_t key[32];
+};
+
+struct PeerKeyEntryV2
+{
+    uint32_t node_id;
+    uint32_t updated_at_ms;
+    uint8_t key[32];
+} __attribute__((packed));
+
+bool isZero(const uint8_t* data, size_t size)
+{
+    if (!data)
+    {
+        return true;
+    }
+    for (size_t index = 0; index < size; ++index)
+    {
+        if (data[index] != 0)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool validIdentity(const ::mesh::LocalIdentity& identity)
+{
+    return identity.valid &&
+           !isZero(identity.private_key, sizeof(identity.private_key));
+}
+
+} // namespace
+
+EspPreferencesLocalIdentityStore::EspPreferencesLocalIdentityStore()
+    : options_(Options{})
+{
+}
+
+EspPreferencesLocalIdentityStore::EspPreferencesLocalIdentityStore(const Options& options)
+    : options_(options)
+{
+}
+
+::mesh::StoreResult EspPreferencesLocalIdentityStore::load(::mesh::LocalIdentity& out)
+{
+    out = ::mesh::LocalIdentity{};
+
+    std::vector<uint8_t> public_blob;
+    std::vector<uint8_t> private_blob;
+    const bool have_public =
+        ::chat::infra::loadRawBlobFromPreferences(options_.ns, options_.public_key, public_blob);
+    const bool have_private =
+        ::chat::infra::loadRawBlobFromPreferences(options_.ns, options_.private_key, private_blob);
+    if (!have_public && !have_private)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+    }
+    if (!have_public || !have_private ||
+        public_blob.size() != sizeof(out.public_key) ||
+        private_blob.size() != sizeof(out.private_key))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+
+    std::memcpy(out.public_key, public_blob.data(), sizeof(out.public_key));
+    std::memcpy(out.private_key, private_blob.data(), sizeof(out.private_key));
+    out.valid = !isZero(out.private_key, sizeof(out.private_key));
+    if (!out.valid)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult EspPreferencesLocalIdentityStore::save(
+    const ::mesh::LocalIdentity& identity)
+{
+    if (!validIdentity(identity))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    const bool public_ok = ::chat::infra::saveRawBlobToPreferences(
+        options_.ns,
+        options_.public_key,
+        identity.public_key,
+        sizeof(identity.public_key));
+    const bool private_ok = ::chat::infra::saveRawBlobToPreferences(
+        options_.ns,
+        options_.private_key,
+        identity.private_key,
+        sizeof(identity.private_key));
+    if (!public_ok || !private_ok)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::IoError);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult EspPreferencesLocalIdentityStore::clear()
+{
+    ::chat::infra::clearPreferencesKeys(options_.ns, options_.public_key, options_.private_key);
+    return ::mesh::StoreResult::success();
+}
+
+EspPreferencesPeerKeyStore::EspPreferencesPeerKeyStore()
+    : options_(Options{})
+{
+}
+
+EspPreferencesPeerKeyStore::EspPreferencesPeerKeyStore(const Options& options)
+    : options_(options)
+{
+}
+
+::mesh::StoreResult EspPreferencesPeerKeyStore::get(::mesh::NodeId node_id,
+                                                    ::mesh::PeerPublicKey& out)
+{
+    if (!node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok)
+    {
+        return loaded;
+    }
+
+    for (const auto& key : keys)
+    {
+        if (key.node_id == node_id)
+        {
+            out = key;
+            return ::mesh::StoreResult::success();
+        }
+    }
+    return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+}
+
+::mesh::StoreResult EspPreferencesPeerKeyStore::put(const ::mesh::PeerPublicKey& key)
+{
+    if (!key.node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok && loaded.failure != ::mesh::StoreFailure::NotFound)
+    {
+        return loaded;
+    }
+
+    bool replaced = false;
+    for (auto& existing : keys)
+    {
+        if (existing.node_id == key.node_id)
+        {
+            existing = key;
+            replaced = true;
+            break;
+        }
+    }
+    if (!replaced)
+    {
+        keys.push_back(key);
+    }
+    return saveAll(keys);
+}
+
+::mesh::StoreResult EspPreferencesPeerKeyStore::remove(::mesh::NodeId node_id)
+{
+    if (!node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok)
+    {
+        return loaded.failure == ::mesh::StoreFailure::NotFound
+                   ? ::mesh::StoreResult::success()
+                   : loaded;
+    }
+
+    keys.erase(std::remove_if(keys.begin(),
+                              keys.end(),
+                              [node_id](const ::mesh::PeerPublicKey& key)
+                              {
+                                  return key.node_id == node_id;
+                              }),
+               keys.end());
+    return saveAll(keys);
+}
+
+::mesh::StoreResult EspPreferencesPeerKeyStore::clear()
+{
+    ::chat::infra::clearPreferencesKeys(options_.ns,
+                                        options_.key,
+                                        options_.version_key);
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult EspPreferencesPeerKeyStore::loadAll(
+    std::vector<::mesh::PeerPublicKey>& out)
+{
+    out.clear();
+
+    std::vector<uint8_t> blob;
+    ::chat::infra::PreferencesBlobMetadata meta;
+    if (!::chat::infra::loadRawBlobFromPreferencesWithMetadata(options_.ns,
+                                                               options_.key,
+                                                               options_.version_key,
+                                                               nullptr,
+                                                               blob,
+                                                               &meta))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+    }
+    if (meta.len == 0)
+    {
+        return ::mesh::StoreResult::success();
+    }
+
+    if (meta.has_version)
+    {
+        if (meta.version != options_.version)
+        {
+            return ::mesh::StoreResult::fail(::mesh::StoreFailure::VersionUnsupported);
+        }
+        if ((meta.len % sizeof(PeerKeyEntryV2)) != 0)
+        {
+            return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+        }
+
+        size_t count = meta.len / sizeof(PeerKeyEntryV2);
+        if (count > options_.max_keys)
+        {
+            count = options_.max_keys;
+        }
+        const auto* entries = reinterpret_cast<const PeerKeyEntryV2*>(blob.data());
+        out.reserve(count);
+        for (size_t index = 0; index < count; ++index)
+        {
+            if (entries[index].node_id == 0)
+            {
+                continue;
+            }
+            ::mesh::PeerPublicKey key{};
+            key.node_id = ::mesh::NodeId{entries[index].node_id};
+            key.updated_at_ms = entries[index].updated_at_ms;
+            key.verified = false;
+            std::memcpy(key.public_key, entries[index].key, sizeof(key.public_key));
+            out.push_back(key);
+        }
+        return ::mesh::StoreResult::success();
+    }
+
+    if ((meta.len % sizeof(LegacyPeerKeyEntry)) != 0)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+
+    size_t count = meta.len / sizeof(LegacyPeerKeyEntry);
+    if (count > options_.max_keys)
+    {
+        count = options_.max_keys;
+    }
+    const auto* entries = reinterpret_cast<const LegacyPeerKeyEntry*>(blob.data());
+    out.reserve(count);
+    for (size_t index = 0; index < count; ++index)
+    {
+        if (entries[index].node_id == 0)
+        {
+            continue;
+        }
+        ::mesh::PeerPublicKey key{};
+        key.node_id = ::mesh::NodeId{entries[index].node_id};
+        std::memcpy(key.public_key, entries[index].key, sizeof(key.public_key));
+        out.push_back(key);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult EspPreferencesPeerKeyStore::replaceAll(
+    const ::mesh::PeerPublicKey* keys,
+    size_t count)
+{
+    if (count > 0 && !keys)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> copy;
+    copy.reserve(count);
+    for (size_t index = 0; index < count; ++index)
+    {
+        if (!keys[index].node_id.isValidUnicast())
+        {
+            return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+        }
+        copy.push_back(keys[index]);
+    }
+    return saveAll(copy);
+}
+
+::mesh::StoreResult EspPreferencesPeerKeyStore::saveAll(
+    std::vector<::mesh::PeerPublicKey>& keys)
+{
+    if (keys.empty())
+    {
+        return clear();
+    }
+
+    if (keys.size() > options_.max_keys)
+    {
+        std::sort(keys.begin(),
+                  keys.end(),
+                  [](const ::mesh::PeerPublicKey& left,
+                     const ::mesh::PeerPublicKey& right)
+                  {
+                      return left.updated_at_ms < right.updated_at_ms;
+                  });
+        keys.erase(keys.begin(),
+                   keys.begin() + static_cast<long>(keys.size() - options_.max_keys));
+    }
+
+    std::vector<PeerKeyEntryV2> entries;
+    entries.reserve(keys.size());
+    for (const auto& key : keys)
+    {
+        if (!key.node_id.isValidUnicast())
+        {
+            return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+        }
+        PeerKeyEntryV2 entry{};
+        entry.node_id = key.node_id.value;
+        entry.updated_at_ms = key.updated_at_ms;
+        std::memcpy(entry.key, key.public_key, sizeof(entry.key));
+        entries.push_back(entry);
+    }
+
+    ::chat::infra::PreferencesBlobMetadata meta;
+    meta.len = entries.size() * sizeof(PeerKeyEntryV2);
+    meta.has_version = true;
+    meta.version = options_.version;
+
+    const bool ok = ::chat::infra::saveRawBlobToPreferencesWithMetadata(
+        options_.ns,
+        options_.key,
+        options_.version_key,
+        nullptr,
+        reinterpret_cast<const uint8_t*>(entries.data()),
+        entries.size() * sizeof(PeerKeyEntryV2),
+        &meta,
+        false);
+    if (!ok)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::IoError);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+} // namespace platform::esp::arduino_common::mesh
diff --git a/platform/esp/arduino_common/src/platform_ui_settings_backup_runtime.cpp b/platform/esp/arduino_common/src/platform_ui_settings_backup_runtime.cpp
new file mode 100644
index 00000000..8ffdf699
--- /dev/null
+++ b/platform/esp/arduino_common/src/platform_ui_settings_backup_runtime.cpp
@@ -0,0 +1,991 @@
+#include "platform/ui/settings_backup_runtime.h"
+
+#include <Arduino.h>
+#include <Preferences.h>
+#include <SD.h>
+
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
+
+#include "app/app_config.h"
+#include "app/app_facade_access.h"
+#include "cJSON.h"
+#include "chat/domain/chat_types.h"
+#include "platform/ui/device_runtime.h"
+#include "platform/ui/settings_store.h"
+
+namespace platform::ui::settings_backup
+{
+namespace
+{
+
+constexpr const char* kBackupDir = "/trailmate";
+constexpr const char* kBackupPath = "/trailmate/settings-backup.json";
+constexpr const char* kBackupTempPath = "/trailmate/settings-backup.tmp";
+constexpr const char* kBackupMagic = "trail-mate-settings-backup";
+constexpr int kBackupVersion = 1;
+constexpr std::size_t kMaxBackupBytes = 24 * 1024;
+
+enum class ValueType : uint8_t
+{
+    Bool,
+    Int,
+    UInt,
+    String,
+    Blob,
+};
+
+struct ExtraKey
+{
+    const char* ns;
+    const char* key;
+    const char* storage_key;
+    ValueType type;
+};
+
+constexpr ExtraKey kExtraKeys[] = {
+    {"settings", "screen_timeout", "screen_timeout", ValueType::UInt},
+    {"settings", "screen_brightness", "screen_bright", ValueType::Int},
+    {"settings", "speaker_volume", "speaker_volume", ValueType::Int},
+    {"settings", "vibration_enabled", "vibe_enabled", ValueType::Bool},
+    {"settings", "display_locale", "disp_locale", ValueType::String},
+    {"settings", "enabled_imes", "enabled_imes", ValueType::String},
+    {"settings", "timezone_offset", "timezone_offset", ValueType::Int},
+    {"settings", "chat_message_alerts", "chat_msg_alert", ValueType::Int},
+    {"settings", "chat_contact_alerts", "chat_ct_alert", ValueType::Int},
+    {"settings", "adv_debug", "adv_debug", ValueType::Bool},
+    {"power", "gauge_design_mah", "gauge_dsgn", ValueType::UInt},
+    {"power", "gauge_full_mah", "gauge_full_mah", ValueType::UInt},
+};
+
+void copy_bounded(char* out, std::size_t out_len, const char* text)
+{
+    if (!out || out_len == 0)
+    {
+        return;
+    }
+    std::snprintf(out, out_len, "%s", text ? text : "");
+}
+
+void set_status_message(Status& out, const char* message, const char* detail = nullptr)
+{
+    copy_bounded(out.message, sizeof(out.message), message);
+    copy_bounded(out.detail, sizeof(out.detail), detail);
+}
+
+bool sd_available()
+{
+    return ::platform::ui::device::card_ready() && SD.cardType() != CARD_NONE;
+}
+
+bool ensure_backup_dir()
+{
+    if (SD.exists(kBackupDir))
+    {
+        File dir = SD.open(kBackupDir, FILE_READ);
+        const bool ok = static_cast<bool>(dir) && dir.isDirectory();
+        if (dir)
+        {
+            dir.close();
+        }
+        return ok;
+    }
+    return SD.mkdir(kBackupDir);
+}
+
+const char* value_type_name(ValueType type)
+{
+    switch (type)
+    {
+    case ValueType::Bool:
+        return "bool";
+    case ValueType::Int:
+        return "int";
+    case ValueType::UInt:
+        return "uint";
+    case ValueType::String:
+        return "string";
+    case ValueType::Blob:
+        return "blob";
+    }
+    return "unknown";
+}
+
+bool bytes_to_hex(const uint8_t* data, std::size_t len, char* out, std::size_t out_len)
+{
+    if (!out || out_len == 0)
+    {
+        return false;
+    }
+    out[0] = '\0';
+    if (!data && len > 0)
+    {
+        return false;
+    }
+    if (out_len < len * 2 + 1)
+    {
+        return false;
+    }
+    static constexpr char kHex[] = "0123456789ABCDEF";
+    for (std::size_t index = 0; index < len; ++index)
+    {
+        out[index * 2] = kHex[(data[index] >> 4) & 0x0F];
+        out[index * 2 + 1] = kHex[data[index] & 0x0F];
+    }
+    out[len * 2] = '\0';
+    return true;
+}
+
+int hex_nibble(char ch)
+{
+    if (ch >= '0' && ch <= '9')
+    {
+        return ch - '0';
+    }
+    if (ch >= 'a' && ch <= 'f')
+    {
+        return 10 + ch - 'a';
+    }
+    if (ch >= 'A' && ch <= 'F')
+    {
+        return 10 + ch - 'A';
+    }
+    return -1;
+}
+
+bool hex_to_bytes(const char* text, std::vector<uint8_t>& out)
+{
+    out.clear();
+    if (!text)
+    {
+        return false;
+    }
+    const std::size_t len = std::strlen(text);
+    if ((len % 2) != 0)
+    {
+        return false;
+    }
+    out.resize(len / 2);
+    for (std::size_t index = 0; index < out.size(); ++index)
+    {
+        const int high = hex_nibble(text[index * 2]);
+        const int low = hex_nibble(text[index * 2 + 1]);
+        if (high < 0 || low < 0)
+        {
+            out.clear();
+            return false;
+        }
+        out[index] = static_cast<uint8_t>((high << 4) | low);
+    }
+    return true;
+}
+
+cJSON* add_object(cJSON* parent, const char* key)
+{
+    cJSON* object = cJSON_AddObjectToObject(parent, key);
+    return object;
+}
+
+void add_bool(cJSON* parent, const char* key, bool value)
+{
+    cJSON_AddBoolToObject(parent, key, value);
+}
+
+void add_int(cJSON* parent, const char* key, int value)
+{
+    cJSON_AddNumberToObject(parent, key, value);
+}
+
+void add_uint(cJSON* parent, const char* key, uint32_t value)
+{
+    cJSON_AddNumberToObject(parent, key, static_cast<double>(value));
+}
+
+void add_float(cJSON* parent, const char* key, float value)
+{
+    cJSON_AddNumberToObject(parent, key, static_cast<double>(value));
+}
+
+void add_string(cJSON* parent, const char* key, const char* value)
+{
+    cJSON_AddStringToObject(parent, key, value ? value : "");
+}
+
+void add_blob_hex(cJSON* parent, const char* key, const uint8_t* data, std::size_t len)
+{
+    char hex[chat::kMeshtasticChannelKeyMaxLen * 2 + 1] = {};
+    if (bytes_to_hex(data, len, hex, sizeof(hex)))
+    {
+        add_string(parent, key, hex);
+    }
+}
+
+bool json_bool(cJSON* object, const char* key, bool fallback)
+{
+    cJSON* item = cJSON_GetObjectItemCaseSensitive(object, key);
+    if (cJSON_IsBool(item))
+    {
+        return cJSON_IsTrue(item);
+    }
+    return fallback;
+}
+
+int json_int(cJSON* object, const char* key, int fallback)
+{
+    cJSON* item = cJSON_GetObjectItemCaseSensitive(object, key);
+    if (!cJSON_IsNumber(item))
+    {
+        return fallback;
+    }
+    return static_cast<int>(item->valuedouble);
+}
+
+uint32_t json_uint(cJSON* object, const char* key, uint32_t fallback)
+{
+    cJSON* item = cJSON_GetObjectItemCaseSensitive(object, key);
+    if (!cJSON_IsNumber(item) || item->valuedouble < 0.0)
+    {
+        return fallback;
+    }
+    return static_cast<uint32_t>(item->valuedouble);
+}
+
+float json_float(cJSON* object, const char* key, float fallback)
+{
+    cJSON* item = cJSON_GetObjectItemCaseSensitive(object, key);
+    if (!cJSON_IsNumber(item) || !std::isfinite(item->valuedouble))
+    {
+        return fallback;
+    }
+    return static_cast<float>(item->valuedouble);
+}
+
+const char* json_string(cJSON* object, const char* key)
+{
+    cJSON* item = cJSON_GetObjectItemCaseSensitive(object, key);
+    return cJSON_IsString(item) && item->valuestring ? item->valuestring : nullptr;
+}
+
+void copy_json_string(cJSON* object, const char* key, char* out, std::size_t out_len)
+{
+    const char* value = json_string(object, key);
+    if (value)
+    {
+        copy_bounded(out, out_len, value);
+    }
+}
+
+void copy_json_blob(cJSON* object,
+                    const char* key,
+                    uint8_t* out,
+                    std::size_t capacity,
+                    uint8_t* out_len = nullptr)
+{
+    const char* hex = json_string(object, key);
+    if (!hex)
+    {
+        return;
+    }
+    std::vector<uint8_t> bytes;
+    if (!hex_to_bytes(hex, bytes) || bytes.size() > capacity)
+    {
+        return;
+    }
+    std::memset(out, 0, capacity);
+    if (!bytes.empty())
+    {
+        std::memcpy(out, bytes.data(), bytes.size());
+    }
+    if (out_len)
+    {
+        *out_len = static_cast<uint8_t>(bytes.size());
+    }
+}
+
+void add_chat_policy(cJSON* parent, const chat::ChatPolicy& policy)
+{
+    cJSON* object = add_object(parent, "chat_policy");
+    if (!object)
+    {
+        return;
+    }
+    add_bool(object, "enable_relay", policy.enable_relay);
+    add_int(object, "hop_limit_default", policy.hop_limit_default);
+    add_bool(object, "ack_for_broadcast", policy.ack_for_broadcast);
+    add_bool(object, "ack_for_squad", policy.ack_for_squad);
+    add_int(object, "max_tx_retries", policy.max_tx_retries);
+    add_int(object, "max_channels", policy.max_channels);
+}
+
+void restore_chat_policy(cJSON* object, chat::ChatPolicy& policy)
+{
+    if (!cJSON_IsObject(object))
+    {
+        return;
+    }
+    policy.enable_relay = json_bool(object, "enable_relay", policy.enable_relay);
+    policy.hop_limit_default = static_cast<uint8_t>(
+        json_int(object, "hop_limit_default", policy.hop_limit_default));
+    policy.ack_for_broadcast = json_bool(object, "ack_for_broadcast", policy.ack_for_broadcast);
+    policy.ack_for_squad = json_bool(object, "ack_for_squad", policy.ack_for_squad);
+    policy.max_tx_retries = static_cast<uint8_t>(
+        json_int(object, "max_tx_retries", policy.max_tx_retries));
+    policy.max_channels = static_cast<uint8_t>(
+        json_int(object, "max_channels", policy.max_channels));
+}
+
+void add_mesh_config(cJSON* parent,
+                     const char* key,
+                     const chat::MeshConfig& config,
+                     bool include_meshcore_fields)
+{
+    cJSON* object = add_object(parent, key);
+    if (!object)
+    {
+        return;
+    }
+    add_int(object, "region", config.region);
+    add_bool(object, "use_preset", config.use_preset);
+    add_int(object, "modem_preset", config.modem_preset);
+    add_float(object, "bandwidth_khz", config.bandwidth_khz);
+    add_int(object, "spread_factor", config.spread_factor);
+    add_int(object, "coding_rate", config.coding_rate);
+    add_int(object, "tx_power", config.tx_power);
+    add_int(object, "hop_limit", config.hop_limit);
+    add_bool(object, "tx_enabled", config.tx_enabled);
+    add_bool(object, "override_duty_cycle", config.override_duty_cycle);
+    add_int(object, "channel_num", config.channel_num);
+    add_float(object, "frequency_offset_mhz", config.frequency_offset_mhz);
+    add_float(object, "override_frequency_mhz", config.override_frequency_mhz);
+    add_bool(object, "enable_relay", config.enable_relay);
+    add_bool(object, "ignore_mqtt", config.ignore_mqtt);
+    add_bool(object, "config_ok_to_mqtt", config.config_ok_to_mqtt);
+    add_string(object, "primary_channel_name", config.primary_channel_name);
+    add_string(object, "secondary_channel_name", config.secondary_channel_name);
+    add_uint(object, "primary_channel_id", config.primary_channel_id);
+    add_uint(object, "secondary_channel_id", config.secondary_channel_id);
+    add_int(object, "primary_key_len", config.primary_key_len);
+    add_blob_hex(object, "primary_key", config.primary_key, config.primary_key_len);
+    add_int(object, "secondary_key_len", config.secondary_key_len);
+    add_blob_hex(object, "secondary_key", config.secondary_key, config.secondary_key_len);
+    if (include_meshcore_fields)
+    {
+        add_int(object, "meshcore_region_preset", config.meshcore_region_preset);
+        add_float(object, "meshcore_freq_mhz", config.meshcore_freq_mhz);
+        add_float(object, "meshcore_bw_khz", config.meshcore_bw_khz);
+        add_int(object, "meshcore_sf", config.meshcore_sf);
+        add_int(object, "meshcore_cr", config.meshcore_cr);
+        add_bool(object, "meshcore_client_repeat", config.meshcore_client_repeat);
+        add_float(object, "meshcore_rx_delay_base", config.meshcore_rx_delay_base);
+        add_float(object, "meshcore_airtime_factor", config.meshcore_airtime_factor);
+        add_int(object, "meshcore_flood_max", config.meshcore_flood_max);
+        add_bool(object, "meshcore_multi_acks", config.meshcore_multi_acks);
+        add_int(object, "meshcore_channel_slot", config.meshcore_channel_slot);
+        add_string(object, "meshcore_channel_name", config.meshcore_channel_name);
+        add_blob_hex(object, "meshcore_channel_key", config.secondary_key, chat::kMeshCoreChannelKeyLen);
+    }
+}
+
+void restore_mesh_config(cJSON* object,
+                         chat::MeshConfig& config,
+                         bool include_meshcore_fields)
+{
+    if (!cJSON_IsObject(object))
+    {
+        return;
+    }
+    config.region = static_cast<uint8_t>(json_int(object, "region", config.region));
+    config.use_preset = json_bool(object, "use_preset", config.use_preset);
+    config.modem_preset = static_cast<uint8_t>(json_int(object, "modem_preset", config.modem_preset));
+    config.bandwidth_khz = json_float(object, "bandwidth_khz", config.bandwidth_khz);
+    config.spread_factor = static_cast<uint8_t>(json_int(object, "spread_factor", config.spread_factor));
+    config.coding_rate = static_cast<uint8_t>(json_int(object, "coding_rate", config.coding_rate));
+    config.tx_power = static_cast<int8_t>(json_int(object, "tx_power", config.tx_power));
+    config.hop_limit = static_cast<uint8_t>(json_int(object, "hop_limit", config.hop_limit));
+    config.tx_enabled = json_bool(object, "tx_enabled", config.tx_enabled);
+    config.override_duty_cycle = json_bool(object, "override_duty_cycle", config.override_duty_cycle);
+    config.channel_num = static_cast<uint16_t>(json_int(object, "channel_num", config.channel_num));
+    config.frequency_offset_mhz = json_float(object, "frequency_offset_mhz", config.frequency_offset_mhz);
+    config.override_frequency_mhz = json_float(object, "override_frequency_mhz", config.override_frequency_mhz);
+    config.enable_relay = json_bool(object, "enable_relay", config.enable_relay);
+    config.ignore_mqtt = json_bool(object, "ignore_mqtt", config.ignore_mqtt);
+    config.config_ok_to_mqtt = json_bool(object, "config_ok_to_mqtt", config.config_ok_to_mqtt);
+    copy_json_string(object, "primary_channel_name", config.primary_channel_name, sizeof(config.primary_channel_name));
+    copy_json_string(object, "secondary_channel_name", config.secondary_channel_name, sizeof(config.secondary_channel_name));
+    config.primary_channel_id = json_uint(object, "primary_channel_id", config.primary_channel_id);
+    config.secondary_channel_id = json_uint(object, "secondary_channel_id", config.secondary_channel_id);
+    uint8_t primary_key_len = static_cast<uint8_t>(
+        json_int(object, "primary_key_len", config.primary_key_len));
+    copy_json_blob(object, "primary_key", config.primary_key, sizeof(config.primary_key), &primary_key_len);
+    config.primary_key_len = chat::normalizeMeshtasticChannelKeyLen(
+        config.primary_key, sizeof(config.primary_key), primary_key_len);
+    uint8_t secondary_key_len = static_cast<uint8_t>(
+        json_int(object, "secondary_key_len", config.secondary_key_len));
+    copy_json_blob(object, "secondary_key", config.secondary_key, sizeof(config.secondary_key), &secondary_key_len);
+    config.secondary_key_len = chat::normalizeMeshtasticChannelKeyLen(
+        config.secondary_key, sizeof(config.secondary_key), secondary_key_len);
+    if (include_meshcore_fields)
+    {
+        config.meshcore_region_preset = static_cast<uint8_t>(
+            json_int(object, "meshcore_region_preset", config.meshcore_region_preset));
+        config.meshcore_freq_mhz = json_float(object, "meshcore_freq_mhz", config.meshcore_freq_mhz);
+        config.meshcore_bw_khz = json_float(object, "meshcore_bw_khz", config.meshcore_bw_khz);
+        config.meshcore_sf = static_cast<uint8_t>(json_int(object, "meshcore_sf", config.meshcore_sf));
+        config.meshcore_cr = static_cast<uint8_t>(json_int(object, "meshcore_cr", config.meshcore_cr));
+        config.meshcore_client_repeat = json_bool(object, "meshcore_client_repeat", config.meshcore_client_repeat);
+        config.meshcore_rx_delay_base = json_float(object, "meshcore_rx_delay_base", config.meshcore_rx_delay_base);
+        config.meshcore_airtime_factor = json_float(object, "meshcore_airtime_factor", config.meshcore_airtime_factor);
+        config.meshcore_flood_max = static_cast<uint8_t>(json_int(object, "meshcore_flood_max", config.meshcore_flood_max));
+        config.meshcore_multi_acks = json_bool(object, "meshcore_multi_acks", config.meshcore_multi_acks);
+        config.meshcore_channel_slot = static_cast<uint8_t>(
+            json_int(object, "meshcore_channel_slot", config.meshcore_channel_slot));
+        copy_json_string(object, "meshcore_channel_name", config.meshcore_channel_name, sizeof(config.meshcore_channel_name));
+        copy_json_blob(object, "meshcore_channel_key", config.secondary_key, sizeof(config.secondary_key));
+    }
+}
+
+void add_aprs_config(cJSON* parent, const app::AprsConfig& config)
+{
+    cJSON* object = add_object(parent, "aprs");
+    if (!object)
+    {
+        return;
+    }
+    add_bool(object, "enabled", config.enabled);
+    add_string(object, "igate_callsign", config.igate_callsign);
+    add_int(object, "igate_ssid", config.igate_ssid);
+    add_string(object, "tocall", config.tocall);
+    add_string(object, "path", config.path);
+    add_int(object, "tx_min_interval_s", config.tx_min_interval_s);
+    add_int(object, "dedupe_window_s", config.dedupe_window_s);
+    char symbol_table[2] = {config.symbol_table, '\0'};
+    char symbol_code[2] = {config.symbol_code, '\0'};
+    add_string(object, "symbol_table", symbol_table);
+    add_string(object, "symbol_code", symbol_code);
+    add_int(object, "position_interval_s", config.position_interval_s);
+    add_bool(object, "self_enable", config.self_enable);
+    add_string(object, "self_callsign", config.self_callsign);
+}
+
+void restore_aprs_config(cJSON* object, app::AprsConfig& config)
+{
+    if (!cJSON_IsObject(object))
+    {
+        return;
+    }
+    config.enabled = json_bool(object, "enabled", config.enabled);
+    copy_json_string(object, "igate_callsign", config.igate_callsign, sizeof(config.igate_callsign));
+    config.igate_ssid = static_cast<uint8_t>(json_int(object, "igate_ssid", config.igate_ssid));
+    copy_json_string(object, "tocall", config.tocall, sizeof(config.tocall));
+    copy_json_string(object, "path", config.path, sizeof(config.path));
+    config.tx_min_interval_s = static_cast<uint16_t>(
+        json_int(object, "tx_min_interval_s", config.tx_min_interval_s));
+    config.dedupe_window_s = static_cast<uint16_t>(
+        json_int(object, "dedupe_window_s", config.dedupe_window_s));
+    const char* symbol_table = json_string(object, "symbol_table");
+    if (symbol_table && symbol_table[0] != '\0')
+    {
+        config.symbol_table = symbol_table[0];
+    }
+    const char* symbol_code = json_string(object, "symbol_code");
+    if (symbol_code && symbol_code[0] != '\0')
+    {
+        config.symbol_code = symbol_code[0];
+    }
+    config.position_interval_s = static_cast<uint16_t>(
+        json_int(object, "position_interval_s", config.position_interval_s));
+    config.self_enable = json_bool(object, "self_enable", config.self_enable);
+    copy_json_string(object, "self_callsign", config.self_callsign, sizeof(config.self_callsign));
+}
+
+cJSON* create_app_config_json(const app::AppConfig& config)
+{
+    cJSON* object = cJSON_CreateObject();
+    if (!object)
+    {
+        return nullptr;
+    }
+    add_chat_policy(object, config.chat_policy);
+    add_mesh_config(object, "meshtastic", config.meshtastic_config, false);
+    add_mesh_config(object, "meshcore", config.meshcore_config, true);
+    add_mesh_config(object, "rnode", config.rnode_config, false);
+    add_int(object, "mesh_protocol", static_cast<int>(config.mesh_protocol));
+    add_string(object, "node_name", config.node_name);
+    add_string(object, "short_name", config.short_name);
+    add_bool(object, "ble_enabled", config.ble_enabled);
+    add_bool(object, "primary_enabled", config.primary_enabled);
+    add_bool(object, "secondary_enabled", config.secondary_enabled);
+    add_bool(object, "primary_uplink_enabled", config.primary_uplink_enabled);
+    add_bool(object, "primary_downlink_enabled", config.primary_downlink_enabled);
+    add_bool(object, "secondary_uplink_enabled", config.secondary_uplink_enabled);
+    add_bool(object, "secondary_downlink_enabled", config.secondary_downlink_enabled);
+    add_bool(object, "gps_enabled", config.gps_enabled);
+    add_uint(object, "gps_init_baud", config.gps_init_baud);
+    add_uint(object, "gps_init_probe_ms", config.gps_init_probe_ms);
+    add_int(object, "gps_init_profile", config.gps_init_profile);
+    add_int(object, "gps_init_rxm_policy", config.gps_init_rxm_policy);
+    add_int(object, "gps_init_gnss_policy", config.gps_init_gnss_policy);
+    add_int(object, "gps_init_nmea_policy", config.gps_init_nmea_policy);
+    add_uint(object, "gps_interval_ms", config.gps_interval_ms);
+    add_int(object, "gps_mode", config.gps_mode);
+    add_int(object, "gps_sat_mask", config.gps_sat_mask);
+    add_int(object, "gps_strategy", config.gps_strategy);
+    add_int(object, "gps_alt_ref", config.gps_alt_ref);
+    add_int(object, "gps_coord_format", config.gps_coord_format);
+    add_uint(object, "motion_idle_ms", config.motion_config.idle_timeout_ms);
+    add_int(object, "motion_sensor_id", config.motion_config.sensor_id);
+    add_int(object, "external_nmea_output_hz", config.external_nmea_output_hz);
+    add_int(object, "external_nmea_sentence_mask", config.external_nmea_sentence_mask);
+    add_int(object, "map_coord_system", config.map_coord_system);
+    add_int(object, "map_source", config.map_source);
+    add_bool(object, "map_contour_enabled", config.map_contour_enabled);
+    add_bool(object, "map_track_enabled", config.map_track_enabled);
+    add_int(object, "map_track_interval", config.map_track_interval);
+    add_int(object, "map_track_format", config.map_track_format);
+    add_int(object, "chat_channel", config.chat_channel);
+    add_bool(object, "net_duty_cycle", config.net_duty_cycle);
+    add_int(object, "net_channel_util", config.net_channel_util);
+    add_int(object, "privacy_encrypt_mode", config.privacy_encrypt_mode);
+    add_bool(object, "route_enabled", config.route_enabled);
+    add_string(object, "route_path", config.route_path);
+    add_aprs_config(object, config.aprs);
+    return object;
+}
+
+void restore_app_config_json(cJSON* object, app::AppConfig& config)
+{
+    if (!cJSON_IsObject(object))
+    {
+        return;
+    }
+    restore_chat_policy(cJSON_GetObjectItemCaseSensitive(object, "chat_policy"), config.chat_policy);
+    restore_mesh_config(cJSON_GetObjectItemCaseSensitive(object, "meshtastic"), config.meshtastic_config, false);
+    restore_mesh_config(cJSON_GetObjectItemCaseSensitive(object, "meshcore"), config.meshcore_config, true);
+    restore_mesh_config(cJSON_GetObjectItemCaseSensitive(object, "rnode"), config.rnode_config, false);
+    const int protocol = json_int(object, "mesh_protocol", static_cast<int>(config.mesh_protocol));
+    if (protocol >= static_cast<int>(chat::MeshProtocol::Meshtastic) &&
+        protocol <= static_cast<int>(chat::MeshProtocol::LXMF))
+    {
+        config.mesh_protocol = static_cast<chat::MeshProtocol>(protocol);
+    }
+    copy_json_string(object, "node_name", config.node_name, sizeof(config.node_name));
+    copy_json_string(object, "short_name", config.short_name, sizeof(config.short_name));
+    config.ble_enabled = json_bool(object, "ble_enabled", config.ble_enabled);
+    config.primary_enabled = json_bool(object, "primary_enabled", config.primary_enabled);
+    config.secondary_enabled = json_bool(object, "secondary_enabled", config.secondary_enabled);
+    config.primary_uplink_enabled = json_bool(object, "primary_uplink_enabled", config.primary_uplink_enabled);
+    config.primary_downlink_enabled = json_bool(object, "primary_downlink_enabled", config.primary_downlink_enabled);
+    config.secondary_uplink_enabled = json_bool(object, "secondary_uplink_enabled", config.secondary_uplink_enabled);
+    config.secondary_downlink_enabled = json_bool(object, "secondary_downlink_enabled", config.secondary_downlink_enabled);
+    config.gps_enabled = json_bool(object, "gps_enabled", config.gps_enabled);
+    config.gps_init_baud = json_uint(object, "gps_init_baud", config.gps_init_baud);
+    config.gps_init_probe_ms = json_uint(object, "gps_init_probe_ms", config.gps_init_probe_ms);
+    config.gps_init_profile = static_cast<uint8_t>(json_int(object, "gps_init_profile", config.gps_init_profile));
+    config.gps_init_rxm_policy = static_cast<uint8_t>(json_int(object, "gps_init_rxm_policy", config.gps_init_rxm_policy));
+    config.gps_init_gnss_policy = static_cast<uint8_t>(json_int(object, "gps_init_gnss_policy", config.gps_init_gnss_policy));
+    config.gps_init_nmea_policy = static_cast<uint8_t>(json_int(object, "gps_init_nmea_policy", config.gps_init_nmea_policy));
+    config.gps_interval_ms = json_uint(object, "gps_interval_ms", config.gps_interval_ms);
+    config.gps_mode = static_cast<uint8_t>(json_int(object, "gps_mode", config.gps_mode));
+    config.gps_sat_mask = static_cast<uint8_t>(json_int(object, "gps_sat_mask", config.gps_sat_mask));
+    config.gps_strategy = static_cast<uint8_t>(json_int(object, "gps_strategy", config.gps_strategy));
+    config.gps_alt_ref = static_cast<uint8_t>(json_int(object, "gps_alt_ref", config.gps_alt_ref));
+    config.gps_coord_format = static_cast<uint8_t>(json_int(object, "gps_coord_format", config.gps_coord_format));
+    config.motion_config.idle_timeout_ms = json_uint(object, "motion_idle_ms", config.motion_config.idle_timeout_ms);
+    config.motion_config.sensor_id = static_cast<uint8_t>(
+        json_int(object, "motion_sensor_id", config.motion_config.sensor_id));
+    config.external_nmea_output_hz = static_cast<uint8_t>(
+        json_int(object, "external_nmea_output_hz", config.external_nmea_output_hz));
+    config.external_nmea_sentence_mask = static_cast<uint8_t>(
+        json_int(object, "external_nmea_sentence_mask", config.external_nmea_sentence_mask));
+    config.map_coord_system = static_cast<uint8_t>(json_int(object, "map_coord_system", config.map_coord_system));
+    config.map_source = static_cast<uint8_t>(json_int(object, "map_source", config.map_source));
+    config.map_contour_enabled = json_bool(object, "map_contour_enabled", config.map_contour_enabled);
+    config.map_track_enabled = json_bool(object, "map_track_enabled", config.map_track_enabled);
+    config.map_track_interval = static_cast<uint8_t>(json_int(object, "map_track_interval", config.map_track_interval));
+    config.map_track_format = static_cast<uint8_t>(json_int(object, "map_track_format", config.map_track_format));
+    config.chat_channel = static_cast<uint8_t>(json_int(object, "chat_channel", config.chat_channel));
+    config.net_duty_cycle = json_bool(object, "net_duty_cycle", config.net_duty_cycle);
+    config.net_channel_util = static_cast<uint8_t>(json_int(object, "net_channel_util", config.net_channel_util));
+    config.privacy_encrypt_mode = static_cast<uint8_t>(
+        json_int(object, "privacy_encrypt_mode", config.privacy_encrypt_mode));
+    config.route_enabled = json_bool(object, "route_enabled", config.route_enabled);
+    copy_json_string(object, "route_path", config.route_path, sizeof(config.route_path));
+    restore_aprs_config(cJSON_GetObjectItemCaseSensitive(object, "aprs"), config.aprs);
+}
+
+PreferenceType extra_preference_type(const ExtraKey& key)
+{
+    Preferences prefs;
+    if (!prefs.begin(key.ns, true))
+    {
+        return PT_INVALID;
+    }
+    const PreferenceType type = prefs.getType(key.storage_key ? key.storage_key : key.key);
+    prefs.end();
+    return type;
+}
+
+void add_extra_value(cJSON* parent, const ExtraKey& key)
+{
+    const PreferenceType pref_type = extra_preference_type(key);
+    if (pref_type == PT_INVALID)
+    {
+        return;
+    }
+
+    cJSON* ns_object = cJSON_GetObjectItemCaseSensitive(parent, key.ns);
+    if (!cJSON_IsObject(ns_object))
+    {
+        ns_object = cJSON_AddObjectToObject(parent, key.ns);
+    }
+    if (!ns_object)
+    {
+        return;
+    }
+
+    cJSON* value_object = cJSON_AddObjectToObject(ns_object, key.key);
+    if (!value_object)
+    {
+        return;
+    }
+    add_string(value_object, "type", value_type_name(key.type));
+
+    switch (key.type)
+    {
+    case ValueType::Bool:
+        add_bool(value_object,
+                 "value",
+                 ::platform::ui::settings_store::get_bool(key.ns, key.key, false));
+        break;
+    case ValueType::Int:
+        add_int(value_object,
+                "value",
+                ::platform::ui::settings_store::get_int(key.ns, key.key, 0));
+        break;
+    case ValueType::UInt:
+        add_uint(value_object,
+                 "value",
+                 ::platform::ui::settings_store::get_uint(key.ns, key.key, 0));
+        break;
+    case ValueType::String:
+    {
+        std::string value;
+        if (::platform::ui::settings_store::get_string(key.ns, key.key, value))
+        {
+            add_string(value_object, "value", value.c_str());
+        }
+        break;
+    }
+    case ValueType::Blob:
+    {
+        std::vector<uint8_t> value;
+        if (::platform::ui::settings_store::get_blob(key.ns, key.key, value))
+        {
+            std::string hex(value.size() * 2 + 1, '\0');
+            if (bytes_to_hex(value.data(), value.size(), &hex[0], hex.size()))
+            {
+                add_string(value_object, "value", hex.c_str());
+            }
+        }
+        break;
+    }
+    }
+}
+
+void restore_extra_value(const ExtraKey& key, cJSON* value_object)
+{
+    if (!cJSON_IsObject(value_object))
+    {
+        return;
+    }
+
+    cJSON* value = cJSON_GetObjectItemCaseSensitive(value_object, "value");
+    switch (key.type)
+    {
+    case ValueType::Bool:
+        if (cJSON_IsBool(value))
+        {
+            ::platform::ui::settings_store::put_bool(key.ns, key.key, cJSON_IsTrue(value));
+        }
+        break;
+    case ValueType::Int:
+        if (cJSON_IsNumber(value))
+        {
+            ::platform::ui::settings_store::put_int(key.ns, key.key, static_cast<int>(value->valuedouble));
+        }
+        break;
+    case ValueType::UInt:
+        if (cJSON_IsNumber(value) && value->valuedouble >= 0.0)
+        {
+            ::platform::ui::settings_store::put_uint(key.ns, key.key, static_cast<uint32_t>(value->valuedouble));
+        }
+        break;
+    case ValueType::String:
+        if (cJSON_IsString(value) && value->valuestring)
+        {
+            (void)::platform::ui::settings_store::put_string(key.ns, key.key, value->valuestring);
+        }
+        break;
+    case ValueType::Blob:
+        if (cJSON_IsString(value) && value->valuestring)
+        {
+            std::vector<uint8_t> bytes;
+            if (hex_to_bytes(value->valuestring, bytes))
+            {
+                (void)::platform::ui::settings_store::put_blob(
+                    key.ns,
+                    key.key,
+                    bytes.empty() ? nullptr : bytes.data(),
+                    bytes.size());
+            }
+        }
+        break;
+    }
+}
+
+void add_extra_settings(cJSON* root)
+{
+    cJSON* extra = cJSON_AddObjectToObject(root, "extra_settings");
+    if (!extra)
+    {
+        return;
+    }
+    for (const ExtraKey& key : kExtraKeys)
+    {
+        add_extra_value(extra, key);
+    }
+}
+
+void restore_extra_settings(cJSON* root)
+{
+    cJSON* extra = cJSON_GetObjectItemCaseSensitive(root, "extra_settings");
+    if (!cJSON_IsObject(extra))
+    {
+        return;
+    }
+    for (const ExtraKey& key : kExtraKeys)
+    {
+        cJSON* ns_object = cJSON_GetObjectItemCaseSensitive(extra, key.ns);
+        cJSON* value_object = cJSON_IsObject(ns_object)
+                                  ? cJSON_GetObjectItemCaseSensitive(ns_object, key.key)
+                                  : nullptr;
+        restore_extra_value(key, value_object);
+    }
+}
+
+cJSON* create_backup_document()
+{
+    app::IAppFacade& facade = app::appFacade();
+    cJSON* root = cJSON_CreateObject();
+    if (!root)
+    {
+        return nullptr;
+    }
+    add_string(root, "magic", kBackupMagic);
+    add_int(root, "version", kBackupVersion);
+    add_string(root, "firmware", ::platform::ui::device::firmware_version());
+    add_uint(root, "created_ms", millis());
+
+    cJSON* app_config = create_app_config_json(facade.getConfig());
+    if (!app_config)
+    {
+        cJSON_Delete(root);
+        return nullptr;
+    }
+    cJSON_AddItemToObject(root, "app_config", app_config);
+    add_extra_settings(root);
+    return root;
+}
+
+bool write_text_atomic(const char* path, const char* temp_path, const char* text, std::size_t len)
+{
+    if (!path || !temp_path || !text)
+    {
+        return false;
+    }
+    if (SD.exists(temp_path))
+    {
+        SD.remove(temp_path);
+    }
+    File file = SD.open(temp_path, FILE_WRITE);
+    if (!file)
+    {
+        return false;
+    }
+    const bool wrote = file.write(reinterpret_cast<const uint8_t*>(text), len) == len;
+    file.close();
+    if (!wrote)
+    {
+        SD.remove(temp_path);
+        return false;
+    }
+    if (SD.exists(path))
+    {
+        SD.remove(path);
+    }
+    if (!SD.rename(temp_path, path))
+    {
+        SD.remove(temp_path);
+        return false;
+    }
+    return true;
+}
+
+bool read_file_text(const char* path, std::string& out)
+{
+    out.clear();
+    File file = SD.open(path, FILE_READ);
+    if (!file)
+    {
+        return false;
+    }
+    const std::size_t size = file.size();
+    if (size == 0 || size > kMaxBackupBytes)
+    {
+        file.close();
+        return false;
+    }
+    out.resize(size);
+    const std::size_t read = file.readBytes(&out[0], size);
+    file.close();
+    if (read != size)
+    {
+        out.clear();
+        return false;
+    }
+    return true;
+}
+
+bool validate_document(cJSON* root, char* error, std::size_t error_len)
+{
+    if (!cJSON_IsObject(root))
+    {
+        copy_bounded(error, error_len, "Invalid backup document");
+        return false;
+    }
+    const char* magic = json_string(root, "magic");
+    if (!magic || std::strcmp(magic, kBackupMagic) != 0)
+    {
+        copy_bounded(error, error_len, "Not a Trail-Mate settings backup");
+        return false;
+    }
+    const int version = json_int(root, "version", 0);
+    if (version <= 0 || version > kBackupVersion)
+    {
+        copy_bounded(error, error_len, "Unsupported backup version");
+        return false;
+    }
+    if (!cJSON_IsObject(cJSON_GetObjectItemCaseSensitive(root, "app_config")))
+    {
+        copy_bounded(error, error_len, "Backup missing app_config");
+        return false;
+    }
+    return true;
+}
+
+} // namespace
+
+bool is_supported()
+{
+    return true;
+}
+
+Status status()
+{
+    Status out{};
+    out.supported = true;
+    out.sd_present = sd_available();
+    out.has_backup = out.sd_present && SD.exists(kBackupPath);
+    out.busy = false;
+    if (!out.sd_present)
+    {
+        set_status_message(out, "SD not detected", kBackupPath);
+    }
+    else if (out.has_backup)
+    {
+        set_status_message(out, "Backup found", kBackupPath);
+    }
+    else
+    {
+        set_status_message(out, "No backup found", kBackupPath);
+    }
+    return out;
+}
+
+bool backup()
+{
+    if (!sd_available())
+    {
+        return false;
+    }
+    if (!ensure_backup_dir())
+    {
+        return false;
+    }
+    cJSON* root = create_backup_document();
+    if (!root)
+    {
+        return false;
+    }
+    char* text = cJSON_Print(root);
+    cJSON_Delete(root);
+    if (!text)
+    {
+        return false;
+    }
+    const bool ok = write_text_atomic(kBackupPath, kBackupTempPath, text, std::strlen(text));
+    cJSON_free(text);
+    return ok;
+}
+
+bool restore()
+{
+    if (!sd_available() || !SD.exists(kBackupPath))
+    {
+        return false;
+    }
+    std::string text;
+    if (!read_file_text(kBackupPath, text))
+    {
+        return false;
+    }
+    cJSON* root = cJSON_ParseWithLength(text.c_str(), text.size());
+    char error[96] = {};
+    if (!validate_document(root, error, sizeof(error)))
+    {
+        if (root)
+        {
+            cJSON_Delete(root);
+        }
+        std::printf("[SettingsBackup] restore validation failed: %s\n", error);
+        return false;
+    }
+
+    app::AppConfig restored = app::appFacade().getConfig();
+    restore_app_config_json(cJSON_GetObjectItemCaseSensitive(root, "app_config"), restored);
+    restore_extra_settings(root);
+    cJSON_Delete(root);
+
+    app::IAppFacade& facade = app::appFacade();
+    facade.getConfig() = restored;
+    facade.saveConfig();
+    return true;
+}
+
+bool remove()
+{
+    if (!sd_available())
+    {
+        return false;
+    }
+    if (SD.exists(kBackupTempPath))
+    {
+        SD.remove(kBackupTempPath);
+    }
+    return !SD.exists(kBackupPath) || SD.remove(kBackupPath);
+}
+
+} // namespace platform::ui::settings_backup
diff --git a/platform/esp/arduino_common/src/team/runtime/team_track_source_gps.cpp b/platform/esp/arduino_common/src/team/runtime/team_track_source_gps.cpp
index dcaa6dbf..32f3cae2 100644
--- a/platform/esp/arduino_common/src/team/runtime/team_track_source_gps.cpp
+++ b/platform/esp/arduino_common/src/team/runtime/team_track_source_gps.cpp
@@ -5,6 +5,16 @@
 namespace team::infra
 {
 
+TeamTrackSourceGps::TeamTrackSourceGps()
+    : location_source_(&gps::gps_location_source())
+{
+}
+
+TeamTrackSourceGps::TeamTrackSourceGps(const gps::ILocationSource& location_source)
+    : location_source_(&location_source)
+{
+}
+
 bool TeamTrackSourceGps::readTrackPoint(proto::TeamTrackPoint* out_point)
 {
     if (!out_point)
@@ -12,16 +22,16 @@ bool TeamTrackSourceGps::readTrackPoint(proto::TeamTrackPoint* out_point)
         return false;
     }
 
-    gps::GpsState gps_state = gps::gps_get_data();
-    if (!gps_state.valid)
+    gps::LocationFix fix{};
+    if (!location_source_ || !location_source_->latestFix(fix))
     {
         out_point->lat_e7 = 0;
         out_point->lon_e7 = 0;
         return false;
     }
 
-    out_point->lat_e7 = static_cast<int32_t>(gps_state.lat * 1e7);
-    out_point->lon_e7 = static_cast<int32_t>(gps_state.lng * 1e7);
+    out_point->lat_e7 = static_cast<int32_t>(fix.latitude * 1e7);
+    out_point->lon_e7 = static_cast<int32_t>(fix.longitude * 1e7);
     return true;
 }
 
diff --git a/platform/esp/arduino_common/src/ui/runtime/pack_repository.cpp b/platform/esp/arduino_common/src/ui/runtime/pack_repository.cpp
index 37720780..82b93e1f 100644
--- a/platform/esp/arduino_common/src/ui/runtime/pack_repository.cpp
+++ b/platform/esp/arduino_common/src/ui/runtime/pack_repository.cpp
@@ -5,12 +5,17 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cerrno>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <dirent.h>
 #include <map>
 #include <string>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <utility>
 #include <vector>
 
@@ -49,10 +54,6 @@ extern "C" esp_err_t esp_crt_bundle_attach(void* conf);
 #include <SD.h>
 #else
 #include "platform/esp/idf_common/bsp_runtime.h"
-#include <cerrno>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #endif
 
 namespace ui::runtime::packs
@@ -71,16 +72,20 @@ constexpr const char* kFlashInstalledIndexPath = "/fs/trailmate/packs/index/inst
 constexpr const char* kSdPackRoot = "/trailmate/packs";
 constexpr const char* kSdInstalledIndexPath = "/trailmate/packs/index/installed.json";
 constexpr const char* kLegacyInstalledIndexPath = "/trailmate/packs/.index/installed.json";
+constexpr const char* kStorageSd = "sd";
+constexpr const char* kStorageFlash = "flash";
 #if defined(ARDUINO)
-constexpr const char* kPackRoot = kFlashPackRoot;
-constexpr const char* kIndexDir = kFlashIndexDir;
-constexpr const char* kTempDir = kFlashTempDir;
-constexpr const char* kInstalledIndexPath = kFlashInstalledIndexPath;
+constexpr const char* kPackRoot = kSdPackRoot;
+constexpr const char* kIndexDir = "/trailmate/packs/index";
+constexpr const char* kTempDir = "/trailmate/packs/index/tmp";
+constexpr const char* kInstalledIndexPath = kSdInstalledIndexPath;
+constexpr const char* kInstallStorage = kStorageSd;
 #else
 constexpr const char* kPackRoot = "/trailmate/packs";
 constexpr const char* kIndexDir = "/trailmate/packs/index";
 constexpr const char* kTempDir = "/trailmate/packs/index/tmp";
 constexpr const char* kInstalledIndexPath = "/trailmate/packs/index/installed.json";
+constexpr const char* kInstallStorage = kStorageSd;
 #endif
 constexpr int kHttpBufferSize = 1024;
 constexpr int kHttpTxBufferSize = 512;
@@ -91,8 +96,6 @@ constexpr std::size_t kZipTailSearchMax = 0x10000 + kZipEocdMinSize;
 constexpr std::uint32_t kZipEocdSignature = 0x06054B50u;
 constexpr std::uint32_t kZipCentralSignature = 0x02014B50u;
 constexpr std::uint32_t kZipLocalSignature = 0x04034B50u;
-constexpr const char* kStorageFlash = "flash";
-constexpr const char* kStorageSd = "sd";
 
 struct InstalledIndex
 {
@@ -355,12 +358,7 @@ struct ArduinoStorageBinding
 
 bool is_flash_logical_path(const std::string& logical_path)
 {
-#if UI_FS_HAS_FLASH_PACK_STORAGE
     return logical_path == "/fs" || starts_with(logical_path, "/fs/");
-#else
-    (void)logical_path;
-    return false;
-#endif
 }
 
 bool is_explicit_sd_logical_path(const std::string& logical_path)
@@ -368,6 +366,13 @@ bool is_explicit_sd_logical_path(const std::string& logical_path)
     return logical_path == "/sd" || starts_with(logical_path, "/sd/");
 }
 
+const char* storage_for_logical_path(const std::string& logical_path)
+{
+    return is_explicit_sd_logical_path(logical_path) ? kStorageSd
+                                                     : (is_flash_logical_path(logical_path) ? kStorageFlash
+                                                                                            : kStorageSd);
+}
+
 std::string strip_mount_prefix(const std::string& logical_path, const char* prefix)
 {
     if (!prefix || !starts_with(logical_path, prefix))
@@ -404,7 +409,6 @@ bool resolve_storage_binding(const std::string& logical_path,
                              ArduinoStorageBinding& out)
 {
     out = ArduinoStorageBinding{};
-
     if (logical_path.empty())
     {
         return false;
@@ -423,6 +427,11 @@ bool resolve_storage_binding(const std::string& logical_path,
         out.volume_path = strip_mount_prefix(logical_path, "/fs");
         return true;
     }
+#else
+    if (is_flash_logical_path(logical_path))
+    {
+        return false;
+    }
 #endif
 
     if (!platform::ui::device::card_ready())
@@ -442,6 +451,110 @@ bool resolve_storage_binding(const std::string& logical_path,
     return true;
 }
 
+std::string normalize_pack_path(const std::string& logical_path, bool allow_format_on_fail)
+{
+    if (logical_path.empty())
+    {
+        return {};
+    }
+
+#if UI_FS_HAS_FLASH_PACK_STORAGE
+    if (is_flash_logical_path(logical_path) &&
+        !::ui::fs::ensure_flash_storage_ready(allow_format_on_fail))
+    {
+        return {};
+    }
+#endif
+
+    if (is_flash_logical_path(logical_path))
+    {
+        std::string suffix = logical_path.substr(3);
+        if (suffix.empty())
+        {
+            suffix = "/";
+        }
+        if (suffix.front() != '/')
+        {
+            suffix.insert(suffix.begin(), '/');
+        }
+        return std::string("F:") + suffix;
+    }
+
+    (void)allow_format_on_fail;
+    return ::ui::fs::normalize_path(logical_path.c_str());
+}
+
+std::string lvgl_real_path_suffix(const std::string& normalized_path)
+{
+    if (normalized_path.size() < 2 || normalized_path[1] != ':')
+    {
+        return {};
+    }
+
+    std::string suffix = normalized_path.substr(2);
+    if (suffix.empty())
+    {
+        suffix = "/";
+    }
+    if (suffix.front() != '/')
+    {
+        suffix.insert(suffix.begin(), '/');
+    }
+    return suffix;
+}
+
+std::string host_path_from_normalized_lvgl_path(const std::string& normalized_path)
+{
+    if (normalized_path.size() < 2 || normalized_path[1] != ':')
+    {
+        return {};
+    }
+
+    const std::string suffix = lvgl_real_path_suffix(normalized_path);
+    if (suffix.empty())
+    {
+        return {};
+    }
+
+    const char letter = static_cast<char>(std::toupper(static_cast<unsigned char>(normalized_path[0])));
+    if (letter == 'F')
+    {
+        return std::string("/fs") + suffix;
+    }
+
+#if LV_USE_FS_POSIX
+    if (letter == LV_FS_POSIX_LETTER)
+    {
+        std::string root = LV_FS_POSIX_PATH;
+        if (root.empty() || root == "/")
+        {
+            return suffix;
+        }
+        while (root.size() > 1 && root.back() == '/')
+        {
+            root.pop_back();
+        }
+        return root + suffix;
+    }
+#endif
+
+    return {};
+}
+
+const char* safe_cstr(const std::string& value)
+{
+    return value.empty() ? "<none>" : value.c_str();
+}
+
+std::string host_path_for_logical_path(const std::string& logical_path, bool allow_format_on_fail)
+{
+    return host_path_from_normalized_lvgl_path(
+        normalize_pack_path(logical_path, allow_format_on_fail));
+}
+
+bool remove_file_if_exists(const std::string& logical_path);
+void log_lvgl_path_probe(const char* scope, const std::string& logical_path);
+
 bool ensure_dir_recursive(const std::string& logical_dir)
 {
     if (logical_dir.empty())
@@ -452,6 +565,9 @@ bool ensure_dir_recursive(const std::string& logical_dir)
     ArduinoStorageBinding binding;
     if (!resolve_storage_binding(logical_dir, true, binding))
     {
+        std::printf("[Packs][Storage] mkdir resolve failed logical=%s storage=%s\n",
+                    logical_dir.c_str(),
+                    storage_for_logical_path(logical_dir));
         return false;
     }
 
@@ -479,7 +595,8 @@ bool ensure_dir_recursive(const std::string& logical_dir)
             {
                 if (!binding.volume->mkdir(current.c_str()))
                 {
-                    std::printf("[Packs] mkdir failed storage=%s path=%s\n",
+                    std::printf("[Packs][Storage] mkdir failed logical=%s storage=%s path=%s\n",
+                                logical_dir.c_str(),
                                 binding.storage ? binding.storage : "<none>",
                                 current.c_str());
                     return false;
@@ -487,7 +604,8 @@ bool ensure_dir_recursive(const std::string& logical_dir)
             }
             else if (!is_dir)
             {
-                std::printf("[Packs] mkdir blocked by file storage=%s path=%s\n",
+                std::printf("[Packs][Storage] mkdir blocked by file logical=%s storage=%s path=%s\n",
+                            logical_dir.c_str(),
                             binding.storage ? binding.storage : "<none>",
                             current.c_str());
                 return false;
@@ -520,6 +638,65 @@ bool logical_file_exists(const std::string& logical_path)
     return exists;
 }
 
+bool logical_dir_exists(const std::string& logical_path)
+{
+    ArduinoStorageBinding binding;
+    if (!resolve_storage_binding(logical_path, false, binding))
+    {
+        return false;
+    }
+
+    File dir = binding.volume->open(binding.volume_path.c_str(), FILE_READ);
+    const bool exists = static_cast<bool>(dir) && dir.isDirectory();
+    if (dir)
+    {
+        dir.close();
+    }
+    return exists;
+}
+
+void log_lvgl_path_probe(const char* scope, const std::string& logical_path)
+{
+    const std::string normalized = normalize_pack_path(logical_path, false);
+    if (normalized.empty())
+    {
+        std::printf("[Packs][Probe][LVGL] %s logical=%s normalized=<none> file=0 dir=0 size_ok=0 size=0\n",
+                    scope ? scope : "path",
+                    logical_path.c_str());
+        return;
+    }
+
+    bool file_exists = false;
+    std::size_t size = 0;
+    lv_fs_file_t file;
+    if (lv_fs_open(&file, normalized.c_str(), LV_FS_MODE_RD) == LV_FS_RES_OK)
+    {
+        file_exists = true;
+        uint32_t lv_size = 0;
+        if (lv_fs_get_size(&file, &lv_size) == LV_FS_RES_OK)
+        {
+            size = lv_size;
+        }
+        lv_fs_close(&file);
+    }
+
+    lv_fs_dir_t dir;
+    const bool dir_exists = lv_fs_dir_open(&dir, normalized.c_str()) == LV_FS_RES_OK;
+    if (dir_exists)
+    {
+        lv_fs_dir_close(&dir);
+    }
+
+    std::printf("[Packs][Probe][LVGL] %s logical=%s normalized=%s file=%d dir=%d size_ok=%d size=%lu\n",
+                scope ? scope : "path",
+                logical_path.c_str(),
+                normalized.c_str(),
+                file_exists ? 1 : 0,
+                dir_exists ? 1 : 0,
+                file_exists && size > 0 ? 1 : 0,
+                static_cast<unsigned long>(size));
+}
+
 bool write_binary_file(const std::string& logical_path, const void* data, std::size_t len)
 {
     const std::size_t slash = logical_path.find_last_of('/');
@@ -529,23 +706,25 @@ bool write_binary_file(const std::string& logical_path, const void* data, std::s
         return false;
     }
 
+    (void)remove_file_if_exists(logical_path);
+
     ArduinoStorageBinding binding;
     if (!resolve_storage_binding(logical_path, true, binding))
     {
+        std::printf("[Packs][Storage] write resolve failed logical=%s len=%lu storage=%s\n",
+                    logical_path.c_str(),
+                    static_cast<unsigned long>(len),
+                    storage_for_logical_path(logical_path));
         return false;
     }
 
-    if (binding.volume->exists(binding.volume_path.c_str()))
-    {
-        (void)binding.volume->remove(binding.volume_path.c_str());
-    }
-
     File file = binding.volume->open(binding.volume_path.c_str(), FILE_WRITE);
     if (!file)
     {
-        std::printf("[Packs] open for write failed storage=%s path=%s len=%lu\n",
-                    binding.storage ? binding.storage : "<none>",
+        std::printf("[Packs][Storage] open for write failed logical=%s storage=%s path=%s len=%lu\n",
                     logical_path.c_str(),
+                    binding.storage ? binding.storage : "<none>",
+                    binding.volume_path.c_str(),
                     static_cast<unsigned long>(len));
         return false;
     }
@@ -558,9 +737,10 @@ bool write_binary_file(const std::string& logical_path, const void* data, std::s
         const std::size_t chunk_written = file.write(bytes + written, chunk);
         if (chunk_written != chunk)
         {
-            std::printf("[Packs] write failed storage=%s path=%s offset=%lu chunk=%lu wrote=%lu total=%lu\n",
-                        binding.storage ? binding.storage : "<none>",
+            std::printf("[Packs][Storage] write failed logical=%s storage=%s path=%s offset=%lu chunk=%lu wrote=%lu total=%lu\n",
                         logical_path.c_str(),
+                        binding.storage ? binding.storage : "<none>",
+                        binding.volume_path.c_str(),
                         static_cast<unsigned long>(written),
                         static_cast<unsigned long>(chunk),
                         static_cast<unsigned long>(chunk_written),
@@ -570,6 +750,7 @@ bool write_binary_file(const std::string& logical_path, const void* data, std::s
         }
         written += chunk_written;
     }
+    file.flush();
     file.close();
     return true;
 }
@@ -590,8 +771,12 @@ bool read_binary_file(const std::string& logical_path, std::vector<std::uint8_t>
     }
 
     File file = binding.volume->open(binding.volume_path.c_str(), FILE_READ);
-    if (!file)
+    if (!file || file.isDirectory())
     {
+        if (file)
+        {
+            file.close();
+        }
         return false;
     }
 
@@ -607,6 +792,30 @@ bool read_binary_file(const std::string& logical_path, std::vector<std::uint8_t>
     return true;
 }
 
+bool logical_file_size(const std::string& logical_path, std::size_t& out_size)
+{
+    out_size = 0;
+
+    ArduinoStorageBinding binding;
+    if (!resolve_storage_binding(logical_path, false, binding))
+    {
+        return false;
+    }
+
+    File file = binding.volume->open(binding.volume_path.c_str(), FILE_READ);
+    if (!file || file.isDirectory())
+    {
+        if (file)
+        {
+            file.close();
+        }
+        return false;
+    }
+    out_size = static_cast<std::size_t>(file.size());
+    file.close();
+    return true;
+}
+
 bool read_text_file(const std::string& logical_path, std::string& out)
 {
     std::vector<std::uint8_t> bytes;
@@ -619,6 +828,26 @@ bool read_text_file(const std::string& logical_path, std::string& out)
     return true;
 }
 
+void log_path_probe(const char* scope, const std::string& logical_path)
+{
+    const std::string normalized = normalize_pack_path(logical_path, false);
+    const std::string host = host_path_from_normalized_lvgl_path(normalized);
+    std::size_t size = 0;
+    const bool file_exists = logical_file_exists(logical_path);
+    const bool dir_exists = logical_dir_exists(logical_path);
+    const bool size_ok = file_exists && logical_file_size(logical_path, size);
+    std::printf("[Packs][Probe] %s logical=%s normalized=%s host=%s file=%d dir=%d size_ok=%d size=%lu storage=%s\n",
+                scope ? scope : "path",
+                logical_path.c_str(),
+                safe_cstr(normalized),
+                safe_cstr(host),
+                file_exists ? 1 : 0,
+                dir_exists ? 1 : 0,
+                size_ok ? 1 : 0,
+                static_cast<unsigned long>(size),
+                storage_for_logical_path(logical_path));
+}
+
 bool remove_file_if_exists(const std::string& logical_path)
 {
     ArduinoStorageBinding binding;
@@ -627,11 +856,30 @@ bool remove_file_if_exists(const std::string& logical_path)
         return false;
     }
 
-    if (!binding.volume->exists(binding.volume_path.c_str()))
+    File file = binding.volume->open(binding.volume_path.c_str(), FILE_READ);
+    const bool exists = static_cast<bool>(file);
+    const bool is_dir = exists && file.isDirectory();
+    if (file)
+    {
+        file.close();
+    }
+    if (!exists)
     {
         return true;
     }
-    return binding.volume->remove(binding.volume_path.c_str());
+    if (is_dir)
+    {
+        return false;
+    }
+    if (!binding.volume->remove(binding.volume_path.c_str()))
+    {
+        std::printf("[Packs][Storage] remove file failed logical=%s storage=%s path=%s\n",
+                    logical_path.c_str(),
+                    binding.storage ? binding.storage : "<none>",
+                    binding.volume_path.c_str());
+        return false;
+    }
+    return true;
 }
 
 bool remove_dir_recursive_if_exists(const std::string& logical_path)
@@ -659,45 +907,38 @@ bool remove_dir_recursive_if_exists(const std::string& logical_path)
         return binding.volume->remove(binding.volume_path.c_str());
     }
 
-    while (true)
+    File child = node.openNextFile();
+    while (child)
     {
-        File entry = node.openNextFile();
-        if (!entry)
-        {
-            break;
-        }
+        const std::string name = file_entry_name(child.name());
+        const bool is_dir = child.isDirectory();
+        child.close();
 
-        const bool is_dir = entry.isDirectory();
-        const std::string child_name = file_entry_name(entry.name());
-        entry.close();
-
-        if (child_name.empty())
+        if (!name.empty())
         {
-            continue;
-        }
-
-        const std::string child_path = join_logical_path(logical_path, child_name);
-        if (is_dir)
-        {
-            if (!remove_dir_recursive_if_exists(child_path))
+            const std::string child_logical = join_logical_path(logical_path, name);
+            const bool ok = is_dir ? remove_dir_recursive_if_exists(child_logical)
+                                   : remove_file_if_exists(child_logical);
+            if (!ok)
             {
                 node.close();
                 return false;
             }
-            continue;
         }
 
-        ArduinoStorageBinding child_binding;
-        if (!resolve_storage_binding(child_path, false, child_binding) ||
-            !child_binding.volume->remove(child_binding.volume_path.c_str()))
-        {
-            node.close();
-            return false;
-        }
+        child = node.openNextFile();
     }
 
     node.close();
-    return binding.volume->rmdir(binding.volume_path.c_str());
+    if (!binding.volume->rmdir(binding.volume_path.c_str()))
+    {
+        std::printf("[Packs][Storage] rmdir failed logical=%s storage=%s path=%s\n",
+                    logical_path.c_str(),
+                    binding.storage ? binding.storage : "<none>",
+                    binding.volume_path.c_str());
+        return false;
+    }
+    return true;
 }
 
 class RandomAccessFile
@@ -712,7 +953,16 @@ class RandomAccessFile
         }
 
         file_ = binding.volume->open(binding.volume_path.c_str(), FILE_READ);
-        return static_cast<bool>(file_);
+        if (!file_ || file_.isDirectory())
+        {
+            if (file_)
+            {
+                file_.close();
+            }
+            return false;
+        }
+        size_ = static_cast<std::size_t>(file_.size());
+        return true;
     }
 
     void close()
@@ -720,25 +970,27 @@ class RandomAccessFile
         if (file_)
         {
             file_.close();
+            size_ = 0;
         }
     }
 
     std::size_t size() const
     {
-        return file_ ? static_cast<std::size_t>(file_.size()) : 0;
+        return size_;
     }
 
     bool read_at(std::size_t offset, void* out, std::size_t len)
     {
-        if (!file_ || !file_.seek(offset))
+        if (!file_ || !file_.seek(static_cast<uint32_t>(offset)))
         {
             return false;
         }
-        return static_cast<std::size_t>(file_.read(static_cast<std::uint8_t*>(out), len)) == len;
+        return file_.read(static_cast<std::uint8_t*>(out), len) == len;
     }
 
   private:
     File file_{};
+    std::size_t size_ = 0;
 };
 
 class SequentialWriteFile
@@ -753,31 +1005,36 @@ class SequentialWriteFile
             return false;
         }
 
+        (void)remove_file_if_exists(logical_path);
+
         ArduinoStorageBinding binding;
         if (!resolve_storage_binding(logical_path, true, binding))
         {
             return false;
         }
 
-        if (binding.volume->exists(binding.volume_path.c_str()))
-        {
-            (void)binding.volume->remove(binding.volume_path.c_str());
-        }
         file_ = binding.volume->open(binding.volume_path.c_str(), FILE_WRITE);
-        return static_cast<bool>(file_);
+        if (!file_)
+        {
+            return false;
+        }
+        return true;
     }
 
     bool write(const void* data, std::size_t len)
     {
-        return file_ &&
-               static_cast<std::size_t>(
-                   file_.write(static_cast<const std::uint8_t*>(data), len)) == len;
+        if (!file_)
+        {
+            return false;
+        }
+        return file_.write(static_cast<const std::uint8_t*>(data), len) == len;
     }
 
     void close()
     {
         if (file_)
         {
+            file_.flush();
             file_.close();
         }
     }
@@ -919,6 +1176,47 @@ bool read_text_file(const std::string& logical_path, std::string& out)
     return true;
 }
 
+bool logical_dir_exists(const std::string& logical_path)
+{
+    const std::string dir = host_path(logical_path);
+    struct stat st
+    {
+    };
+    return ::stat(dir.c_str(), &st) == 0 && S_ISDIR(st.st_mode);
+}
+
+bool logical_file_size(const std::string& logical_path, std::size_t& out_size)
+{
+    out_size = 0;
+    const std::string path = host_path(logical_path);
+    struct stat st
+    {
+    };
+    if (::stat(path.c_str(), &st) != 0 || !S_ISREG(st.st_mode))
+    {
+        return false;
+    }
+    out_size = static_cast<std::size_t>(st.st_size);
+    return true;
+}
+
+void log_path_probe(const char* scope, const std::string& logical_path)
+{
+    std::size_t size = 0;
+    const bool file_exists = logical_file_exists(logical_path);
+    const bool dir_exists = logical_dir_exists(logical_path);
+    const bool size_ok = file_exists && logical_file_size(logical_path, size);
+    std::printf("[Packs][Probe] %s logical=%s host=%s file=%d dir=%d size_ok=%d size=%lu storage=%s\n",
+                scope ? scope : "path",
+                logical_path.c_str(),
+                host_path(logical_path).c_str(),
+                file_exists ? 1 : 0,
+                dir_exists ? 1 : 0,
+                size_ok ? 1 : 0,
+                static_cast<unsigned long>(size),
+                kStorageSd);
+}
+
 bool remove_file_if_exists(const std::string& logical_path)
 {
     if (!logical_file_exists(logical_path))
@@ -1468,6 +1766,12 @@ bool load_installed_index_file(const char* index_path,
     out_error.clear();
     if (!index_path || !logical_file_exists(index_path))
     {
+        if (index_path)
+        {
+            std::printf("[Packs][Index] not found path=%s default_storage=%s\n",
+                        index_path,
+                        default_storage ? default_storage : "<none>");
+        }
         return true;
     }
 
@@ -1503,12 +1807,21 @@ bool load_installed_index_file(const char* index_path,
             record.installed_at_epoch = json_u64(item, "installed_at_epoch");
             if (!record.id.empty())
             {
+                std::printf("[Packs][Index] record path=%s id=%s version=%s storage=%s sha=%s\n",
+                            index_path,
+                            record.id.c_str(),
+                            record.version.c_str(),
+                            record.storage.c_str(),
+                            record.archive_sha256.empty() ? "<none>" : record.archive_sha256.c_str());
                 out_index.packages.push_back(std::move(record));
             }
         }
     }
 
     cJSON_Delete(root);
+    std::printf("[Packs][Index] loaded path=%s records=%lu\n",
+                index_path,
+                static_cast<unsigned long>(out_index.packages.size()));
     return true;
 }
 
@@ -1517,6 +1830,8 @@ bool load_installed_index(InstalledIndex& out_index, std::string& out_error)
     out_index = InstalledIndex{};
     out_error.clear();
 
+    log_path_probe("index.flash", kInstalledIndexPath);
+
     if (logical_file_exists(kInstalledIndexPath))
     {
         return load_installed_index_file(
@@ -1524,10 +1839,12 @@ bool load_installed_index(InstalledIndex& out_index, std::string& out_error)
     }
 
 #if defined(ARDUINO)
+    log_path_probe("index.sd", kSdInstalledIndexPath);
     if (logical_file_exists(kSdInstalledIndexPath))
     {
         return load_installed_index_file(kSdInstalledIndexPath, kStorageSd, out_index, out_error);
     }
+    log_path_probe("index.sd_legacy", kLegacyInstalledIndexPath);
     if (logical_file_exists(kLegacyInstalledIndexPath))
     {
         return load_installed_index_file(kLegacyInstalledIndexPath, kStorageSd, out_index, out_error);
@@ -1586,6 +1903,11 @@ bool save_installed_index(const InstalledIndex& index, std::string& out_error)
         out_error = "Write installed index failed";
         return false;
     }
+    std::printf("[Packs][Index] saved path=%s records=%lu bytes=%lu\n",
+                kInstalledIndexPath,
+                static_cast<unsigned long>(index.packages.size()),
+                static_cast<unsigned long>(output.size()));
+    log_path_probe("index.saved", kInstalledIndexPath);
     return true;
 }
 
@@ -1707,6 +2029,15 @@ bool extract_zip_payload(const std::string& logical_zip_path, std::string& out_e
         return false;
     }
 
+    std::printf("[Packs][Install] zip entries=%lu path=%s\n",
+                static_cast<unsigned long>(entries.size()),
+                logical_zip_path.c_str());
+
+    std::size_t payload_files = 0;
+    std::size_t payload_dirs = 0;
+    std::size_t payload_bytes = 0;
+    std::size_t payload_logged = 0;
+
     for (const ZipEntry& entry : entries)
     {
         if (!starts_with(entry.name, "payload/"))
@@ -1723,6 +2054,14 @@ bool extract_zip_payload(const std::string& logical_zip_path, std::string& out_e
                 file.close();
                 return false;
             }
+            ++payload_dirs;
+            if (payload_logged < 24)
+            {
+                std::printf("[Packs][Install] payload dir entry=%s target=%s\n",
+                            entry.name.c_str(),
+                            logical_target.c_str());
+                ++payload_logged;
+            }
             continue;
         }
 
@@ -1783,33 +2122,31 @@ bool extract_zip_payload(const std::string& logical_zip_path, std::string& out_e
             file.close();
             return false;
         }
+
+        ++payload_files;
+        payload_bytes += output.size();
+        if (payload_logged < 24 ||
+            entry.name.find("/manifest.ini") != std::string::npos ||
+            entry.name.find("/font.bin") != std::string::npos)
+        {
+            std::printf("[Packs][Install] payload file entry=%s target=%s method=%u usize=%lu csize=%lu\n",
+                        entry.name.c_str(),
+                        logical_target.c_str(),
+                        static_cast<unsigned>(entry.method),
+                        static_cast<unsigned long>(entry.uncompressed_size),
+                        static_cast<unsigned long>(entry.compressed_size));
+            ++payload_logged;
+        }
     }
 
     file.close();
+    std::printf("[Packs][Install] payload summary files=%lu dirs=%lu bytes=%lu\n",
+                static_cast<unsigned long>(payload_files),
+                static_cast<unsigned long>(payload_dirs),
+                static_cast<unsigned long>(payload_bytes));
     return true;
 }
 
-void merge_installed_state(const std::vector<InstalledPackageRecord>& installed,
-                           std::vector<PackageRecord>& packages)
-{
-    for (PackageRecord& package : packages)
-    {
-        for (const InstalledPackageRecord& record : installed)
-        {
-            if (record.id != package.id)
-            {
-                continue;
-            }
-            package.installed = true;
-            package.installed_record = record;
-            package.update_available =
-                record.version != package.version ||
-                lowercase_ascii(record.archive_sha256) != lowercase_ascii(package.archive_sha256);
-            break;
-        }
-    }
-}
-
 const char* storage_pack_root(const std::string& storage)
 {
 #if defined(ARDUINO)
@@ -1870,6 +2207,125 @@ bool remove_package_payload(const PackageRecord& package,
     return true;
 }
 
+bool package_payload_visible(const PackageRecord& package, const std::string& storage)
+{
+    const char* pack_root = storage_pack_root(storage);
+    bool has_declared_payload = false;
+    bool all_declared_payload_visible = true;
+
+    for (const std::string& id : package.provided_locale_ids)
+    {
+        if (id.empty())
+        {
+            continue;
+        }
+        has_declared_payload = true;
+        const std::string manifest =
+            join_logical_path(join_logical_path(join_logical_path(pack_root, "locales"), id),
+                              "manifest.ini");
+        all_declared_payload_visible = all_declared_payload_visible && logical_file_exists(manifest);
+    }
+    for (const std::string& id : package.provided_font_ids)
+    {
+        if (id.empty())
+        {
+            continue;
+        }
+        has_declared_payload = true;
+        const std::string font_root = join_logical_path(join_logical_path(pack_root, "fonts"), id);
+        all_declared_payload_visible =
+            all_declared_payload_visible &&
+            logical_file_exists(join_logical_path(font_root, "manifest.ini")) &&
+            logical_file_exists(join_logical_path(font_root, "font.bin"));
+    }
+    for (const std::string& id : package.provided_ime_ids)
+    {
+        if (id.empty())
+        {
+            continue;
+        }
+        has_declared_payload = true;
+        const std::string manifest =
+            join_logical_path(join_logical_path(join_logical_path(pack_root, "ime"), id),
+                              "manifest.ini");
+        all_declared_payload_visible = all_declared_payload_visible && logical_file_exists(manifest);
+    }
+
+    return has_declared_payload && all_declared_payload_visible;
+}
+
+void log_package_payload_probe(const char* scope,
+                               const PackageRecord& package,
+                               const std::string& storage)
+{
+    const char* pack_root = storage_pack_root(storage);
+    std::printf("[Packs][Verify] %s id=%s storage=%s root=%s locales=%lu fonts=%lu ime=%lu\n",
+                scope ? scope : "payload",
+                package.id.c_str(),
+                storage.empty() ? "<none>" : storage.c_str(),
+                pack_root,
+                static_cast<unsigned long>(package.provided_locale_ids.size()),
+                static_cast<unsigned long>(package.provided_font_ids.size()),
+                static_cast<unsigned long>(package.provided_ime_ids.size()));
+
+    for (const std::string& id : package.provided_locale_ids)
+    {
+        const std::string manifest =
+            join_logical_path(join_logical_path(join_logical_path(pack_root, "locales"), id),
+                              "manifest.ini");
+        log_path_probe("locale.manifest", manifest);
+        log_lvgl_path_probe("locale.manifest", manifest);
+    }
+    for (const std::string& id : package.provided_font_ids)
+    {
+        const std::string font_root = join_logical_path(join_logical_path(pack_root, "fonts"), id);
+        const std::string manifest = join_logical_path(font_root, "manifest.ini");
+        const std::string font_bin = join_logical_path(font_root, "font.bin");
+        log_path_probe("font.manifest", manifest);
+        log_lvgl_path_probe("font.manifest", manifest);
+        log_path_probe("font.bin", font_bin);
+        log_lvgl_path_probe("font.bin", font_bin);
+    }
+    for (const std::string& id : package.provided_ime_ids)
+    {
+        const std::string manifest =
+            join_logical_path(join_logical_path(join_logical_path(pack_root, "ime"), id),
+                              "manifest.ini");
+        log_path_probe("ime.manifest", manifest);
+        log_lvgl_path_probe("ime.manifest", manifest);
+    }
+}
+
+void merge_installed_state(const std::vector<InstalledPackageRecord>& installed,
+                           std::vector<PackageRecord>& packages)
+{
+    for (PackageRecord& package : packages)
+    {
+        for (const InstalledPackageRecord& record : installed)
+        {
+            if (record.id != package.id)
+            {
+                continue;
+            }
+            if (!package_payload_visible(package, record.storage))
+            {
+                std::printf("[Packs][Index] stale installed record id=%s version=%s storage=%s reason=payload_not_visible\n",
+                            record.id.c_str(),
+                            record.version.c_str(),
+                            record.storage.c_str());
+                log_package_payload_probe("stale_index", package, record.storage);
+                break;
+            }
+            package.installed = true;
+            package.installed_record = record;
+            package.update_available =
+                record.version != package.version ||
+                lowercase_ascii(record.archive_sha256) != lowercase_ascii(package.archive_sha256);
+            break;
+        }
+    }
+}
+
 } // namespace
 
 bool is_supported()
@@ -1890,6 +2346,8 @@ bool load_installed_packages(std::vector<InstalledPackageRecord>& out_installed,
         return false;
     }
     out_installed = index.packages;
+    std::printf("[Packs][Index] load_installed_packages count=%lu\n",
+                static_cast<unsigned long>(out_installed.size()));
     return true;
 }
 
@@ -1979,6 +2437,11 @@ bool fetch_catalog(std::vector<PackageRecord>& out_packages, std::string& out_er
     {
         merge_installed_state(installed, out_packages);
     }
+    else
+    {
+        std::printf("[Packs][Index] load installed during catalog failed error=%s\n",
+                    installed_error.c_str());
+    }
 
     std::sort(out_packages.begin(),
               out_packages.end(),
@@ -1993,9 +2456,21 @@ bool install_package(const PackageRecord& package, std::string& out_error)
 {
     out_error.clear();
 
+    std::printf("[Packs][Install] begin id=%s version=%s url=%s root=%s\n",
+                package.id.c_str(),
+                package.version.c_str(),
+                package.download_url.c_str(),
+                kPackRoot);
+    std::printf("[Packs][Install] provides locales=%lu fonts=%lu ime=%lu expected_sha=%s\n",
+                static_cast<unsigned long>(package.provided_locale_ids.size()),
+                static_cast<unsigned long>(package.provided_font_ids.size()),
+                static_cast<unsigned long>(package.provided_ime_ids.size()),
+                package.archive_sha256.empty() ? "<none>" : package.archive_sha256.c_str());
+
     if (package.id.empty() || package.download_url.empty())
     {
         out_error = "Package metadata is incomplete";
+        std::printf("[Packs][Install] failed reason=%s\n", out_error.c_str());
         return false;
     }
 
@@ -2003,41 +2478,70 @@ bool install_package(const PackageRecord& package, std::string& out_error)
     if (!wifi_status.connected)
     {
         out_error = "Wi-Fi is not connected";
+        std::printf("[Packs][Install] failed reason=%s\n", out_error.c_str());
         return false;
     }
 
-    if (!ensure_dir_recursive(kPackRoot) ||
-        !ensure_dir_recursive(kIndexDir) ||
-        !ensure_dir_recursive(kTempDir))
+    const bool root_ok = ensure_dir_recursive(kPackRoot);
+    const bool index_ok = ensure_dir_recursive(kIndexDir);
+    const bool temp_ok = ensure_dir_recursive(kTempDir);
+    std::printf("[Packs][Install] dirs root=%d index=%d temp=%d\n",
+                root_ok ? 1 : 0,
+                index_ok ? 1 : 0,
+                temp_ok ? 1 : 0);
+    log_path_probe("root.after_ensure", kPackRoot);
+    log_path_probe("index_dir.after_ensure", kIndexDir);
+    log_path_probe("temp_dir.after_ensure", kTempDir);
+
+    if (!root_ok || !index_ok || !temp_ok)
     {
-        out_error = "Create flash pack directories failed";
+        out_error = "Create pack directories failed";
+        std::printf("[Packs][Install] failed reason=%s\n", out_error.c_str());
         return false;
     }
 
     const std::string temp_zip_path = std::string(kTempDir) + "/" + package.id + "-" + package.version + ".zip";
+    std::printf("[Packs][Install] download temp=%s\n", temp_zip_path.c_str());
     if (!http_download_file(package.download_url, temp_zip_path, out_error))
     {
+        std::printf("[Packs][Install] download failed error=%s\n", out_error.c_str());
         return false;
     }
+    log_path_probe("temp_zip.after_download", temp_zip_path);
 
     std::string archive_sha256;
     if (!sha256_file(temp_zip_path, archive_sha256))
     {
         (void)remove_file_if_exists(temp_zip_path);
         out_error = "Hash downloaded archive failed";
+        std::printf("[Packs][Install] failed reason=%s\n", out_error.c_str());
         return false;
     }
+    std::printf("[Packs][Install] downloaded sha=%s\n", archive_sha256.c_str());
     if (!package.archive_sha256.empty() &&
         lowercase_ascii(archive_sha256) != lowercase_ascii(package.archive_sha256))
     {
         (void)remove_file_if_exists(temp_zip_path);
         out_error = "Archive SHA256 mismatch";
+        std::printf("[Packs][Install] failed reason=%s actual=%s expected=%s\n",
+                    out_error.c_str(),
+                    archive_sha256.c_str(),
+                    package.archive_sha256.c_str());
         return false;
     }
 
     if (!extract_zip_payload(temp_zip_path, out_error))
     {
         (void)remove_file_if_exists(temp_zip_path);
+        std::printf("[Packs][Install] extract failed error=%s\n", out_error.c_str());
+        return false;
+    }
+    log_package_payload_probe("after_extract", package, kInstallStorage);
+    if (!package_payload_visible(package, kInstallStorage))
+    {
+        (void)remove_file_if_exists(temp_zip_path);
+        out_error = "Installed payload is missing after extract";
+        std::printf("[Packs][Install] failed reason=%s\n", out_error.c_str());
         return false;
     }
 
@@ -2047,6 +2551,7 @@ bool install_package(const PackageRecord& package, std::string& out_error)
     {
         (void)remove_file_if_exists(temp_zip_path);
         out_error = index_error;
+        std::printf("[Packs][Install] load index failed error=%s\n", out_error.c_str());
         return false;
     }
 
@@ -2062,7 +2567,7 @@ bool install_package(const PackageRecord& package, std::string& out_error)
         }
         record.version = package.version;
         record.archive_sha256 = archive_sha256;
-        record.storage = kStorageFlash;
+        record.storage = kInstallStorage;
         record.installed_at_epoch = static_cast<std::uint64_t>(std::time(nullptr));
         updated = true;
         break;
@@ -2074,7 +2579,7 @@ bool install_package(const PackageRecord& package, std::string& out_error)
         record.id = package.id;
         record.version = package.version;
         record.archive_sha256 = archive_sha256;
-        record.storage = kStorageFlash;
+        record.storage = kInstallStorage;
         record.installed_at_epoch = static_cast<std::uint64_t>(std::time(nullptr));
         index.packages.push_back(std::move(record));
     }
@@ -2082,10 +2587,12 @@ bool install_package(const PackageRecord& package, std::string& out_error)
     if (!save_installed_index(index, out_error))
     {
         (void)remove_file_if_exists(temp_zip_path);
+        std::printf("[Packs][Install] save index failed error=%s\n", out_error.c_str());
         return false;
     }
 
     (void)remove_file_if_exists(temp_zip_path);
+    log_path_probe("temp_zip.after_cleanup", temp_zip_path);
 
 #if defined(ARDUINO)
     if (!previous_storage.empty() &&
@@ -2102,7 +2609,10 @@ bool install_package(const PackageRecord& package, std::string& out_error)
     }
 #endif
 
+    log_package_payload_probe("before_reload", package, kInstallStorage);
+    std::printf("[Packs][Install] reload_language id=%s\n", package.id.c_str());
     ::ui::i18n::reload_language();
+    std::printf("[Packs][Install] complete id=%s\n", package.id.c_str());
     return true;
 }
 
@@ -2110,33 +2620,47 @@ bool uninstall_package(const PackageRecord& package, std::string& out_error)
 {
     out_error.clear();
 
+    std::printf("[Packs][Uninstall] begin id=%s version=%s\n",
+                package.id.c_str(),
+                package.version.c_str());
+
     if (package.id.empty())
     {
         out_error = "Package metadata is incomplete";
+        std::printf("[Packs][Uninstall] failed reason=%s\n", out_error.c_str());
         return false;
     }
 
     InstalledIndex index;
     if (!load_installed_index(index, out_error))
     {
+        std::printf("[Packs][Uninstall] load index failed error=%s\n", out_error.c_str());
         return false;
     }
 
     const InstalledPackageRecord* installed = find_installed_record(index, package.id);
-    const std::string storage = installed ? installed->storage : std::string(kStorageFlash);
+    const std::string storage = installed ? installed->storage : std::string(kInstallStorage);
+    std::printf("[Packs][Uninstall] resolved storage=%s installed_record=%d records=%lu\n",
+                storage.c_str(),
+                installed ? 1 : 0,
+                static_cast<unsigned long>(index.packages.size()));
+    log_package_payload_probe("before_uninstall", package, storage);
 
 #if defined(ARDUINO)
     if (lowercase_ascii(storage) == kStorageSd && !platform::ui::device::card_ready())
     {
         out_error = "SD card is not ready";
+        std::printf("[Packs][Uninstall] failed reason=%s\n", out_error.c_str());
         return false;
     }
 #endif
 
     if (!remove_package_payload(package, storage, out_error))
     {
+        std::printf("[Packs][Uninstall] remove payload failed error=%s\n", out_error.c_str());
         return false;
     }
+    log_package_payload_probe("after_remove_payload", package, storage);
 
     index.packages.erase(
         std::remove_if(index.packages.begin(),
@@ -2149,10 +2673,13 @@ bool uninstall_package(const PackageRecord& package, std::string& out_error)
 
     if (!save_installed_index(index, out_error))
     {
+        std::printf("[Packs][Uninstall] save index failed error=%s\n", out_error.c_str());
         return false;
     }
 
+    std::printf("[Packs][Uninstall] reload_language id=%s\n", package.id.c_str());
     ::ui::i18n::reload_language();
+    std::printf("[Packs][Uninstall] complete id=%s\n", package.id.c_str());
     return true;
 }
 
diff --git a/platform/esp/arduino_common/src/ui/widgets/map/map_tiles.cpp b/platform/esp/arduino_common/src/ui/widgets/map/map_tiles.cpp
index d7c9cf22..0faca7ef 100644
--- a/platform/esp/arduino_common/src/ui/widgets/map/map_tiles.cpp
+++ b/platform/esp/arduino_common/src/ui/widgets/map/map_tiles.cpp
@@ -14,6 +14,8 @@
 #include "ui/runtime/memory_profile.h"
 #include "ui/screens/gps/gps_constants.h"
 #include "ui/support/lvgl_fs_utils.h"
+#include "ui_map_runtime/map_tiles/filesystem_map_tile_source.h"
+#include "ui_map_runtime/map_tiles/map_tile_decoder_cache.h"
 
 #include <algorithm>
 #include <cmath>
@@ -39,12 +41,6 @@
         std::fflush(stdout);      \
     } while (0)
 
-// Decoded tile image cache upper bound.
-// Active slots are selected at runtime from the current viewport size so
-// large displays like Tab5 can keep one full screen of decoded tiles hot.
-#define TILE_DECODE_CACHE_SIZE 32
-static DecodedTileCache g_tile_decode_cache[TILE_DECODE_CACHE_SIZE];
-static bool g_tile_cache_initialized = false;
 static uint32_t g_cache_full_until_ms = 0;
 static uint32_t g_cache_full_log_ms = 0;
 static uint8_t g_requested_map_source = 0;
@@ -99,6 +95,350 @@ static uint8_t g_missing_tile_notice_source = 0;
 
 namespace
 {
+class LvglMapTileFileSystem final : public ui::map_tiles::IMapTileFileSystem
+{
+  public:
+    bool exists(const char* path) const override
+    {
+        return ui::fs::file_exists(path);
+    }
+
+    bool isDirectory(const char* path) const override
+    {
+        return ui::fs::dir_exists(path);
+    }
+
+    bool readFile(const char* path,
+                  uint8_t* buffer,
+                  std::size_t capacity,
+                  std::size_t& out_size) const override
+    {
+        out_size = 0;
+        if (!path || !buffer || capacity == 0)
+        {
+            return false;
+        }
+
+        lv_fs_file_t file;
+        if (lv_fs_open(&file, path, LV_FS_MODE_RD) != LV_FS_RES_OK)
+        {
+            return false;
+        }
+
+        uint32_t bytes_read = 0;
+        const lv_fs_res_t result =
+            lv_fs_read(&file, buffer, static_cast<uint32_t>(capacity), &bytes_read);
+        lv_fs_close(&file);
+        if (result != LV_FS_RES_OK)
+        {
+            return false;
+        }
+
+        out_size = bytes_read;
+        return true;
+    }
+};
+
+class LvglDecodedTileCache final : public ui::map_tiles::IMapTileDecoderCache
+{
+  public:
+    static constexpr std::size_t kCapacity = 32;
+
+    void clear() override
+    {
+        if (!initialized_)
+        {
+            return;
+        }
+
+        for (std::size_t i = 0; i < kCapacity; ++i)
+        {
+            freeSlot(slots_[i]);
+            resetSlot(slots_[i]);
+        }
+        g_cache_full_until_ms = 0;
+    }
+
+    bool hasDecoded(const ui::map_tiles::MapTileRef& ref) const override
+    {
+        return find(ref) != nullptr;
+    }
+
+    void initialize()
+    {
+        if (initialized_)
+        {
+            return;
+        }
+
+        for (std::size_t i = 0; i < kCapacity; ++i)
+        {
+            resetSlot(slots_[i]);
+        }
+        initialized_ = true;
+        GPS_LOG("[GPS] Tile decode cache initialized (size=%d)\n", static_cast<int>(kCapacity));
+    }
+
+    DecodedTileCache* find(const ui::map_tiles::MapTileRef& ref) const
+    {
+        if (!initialized_)
+        {
+            return nullptr;
+        }
+
+        const uint8_t map_source = mapSourceFor(ref.layer);
+        for (std::size_t i = 0; i < kCapacity; ++i)
+        {
+            if (slots_[i].x == static_cast<int32_t>(ref.x) &&
+                slots_[i].y == static_cast<int32_t>(ref.y) &&
+                slots_[i].z == static_cast<int32_t>(ref.z) &&
+                slots_[i].map_source == map_source &&
+                slots_[i].img_dsc != NULL)
+            {
+                slots_[i].last_used_ms = sys::millis_now();
+                return &slots_[i];
+            }
+        }
+        return nullptr;
+    }
+
+    DecodedTileCache* acquireSlot(std::size_t active_limit)
+    {
+        initialize();
+
+        const int slot_count = std::max(1, std::min(static_cast<int>(active_limit), static_cast<int>(kCapacity)));
+        uint32_t oldest_ms = UINT32_MAX;
+        int lru_idx = -1;
+        bool found_unused = false;
+
+        for (int i = 0; i < slot_count; ++i)
+        {
+            if (slots_[i].img_dsc == NULL)
+            {
+                return &slots_[i];
+            }
+            if (!slots_[i].in_use)
+            {
+                found_unused = true;
+                if (slots_[i].last_used_ms < oldest_ms)
+                {
+                    oldest_ms = slots_[i].last_used_ms;
+                    lru_idx = i;
+                }
+            }
+        }
+
+        if (!found_unused || lru_idx == -1)
+        {
+            const uint32_t now_ms = sys::millis_now();
+            g_cache_full_until_ms = now_ms + 500;
+            if (now_ms - g_cache_full_log_ms >= 1000)
+            {
+                GPS_LOG("[GPS] All cache slots are in use, cannot evict safely\n");
+                g_cache_full_log_ms = now_ms;
+            }
+            return nullptr;
+        }
+
+        GPS_LOG("[GPS] Evicting cached tile %d/%d/%d from decode cache\n",
+                fmt_tile_coord(slots_[lru_idx].z),
+                fmt_tile_coord(slots_[lru_idx].x),
+                fmt_tile_coord(slots_[lru_idx].y));
+        freeSlot(slots_[lru_idx]);
+        resetSlot(slots_[lru_idx]);
+        return &slots_[lru_idx];
+    }
+
+    void releaseUsage()
+    {
+        if (!initialized_)
+        {
+            return;
+        }
+
+        const uint32_t now_ms = sys::millis_now();
+        for (std::size_t i = 0; i < kCapacity; ++i)
+        {
+            slots_[i].in_use = false;
+            if (slots_[i].img_dsc != NULL)
+            {
+                slots_[i].last_used_ms = now_ms;
+            }
+        }
+    }
+
+  private:
+    static uint8_t mapSourceFor(ui::map_tiles::MapTileLayer layer)
+    {
+        switch (layer)
+        {
+        case ui::map_tiles::MapTileLayer::Terrain:
+            return 1;
+        case ui::map_tiles::MapTileLayer::Satellite:
+            return 2;
+        case ui::map_tiles::MapTileLayer::Osm:
+        default:
+            return 0;
+        }
+    }
+
+    static void freeSlot(DecodedTileCache& slot)
+    {
+        if (slot.img_dsc != NULL)
+        {
+            if (slot.img_dsc->data != NULL)
+            {
+                lv_free((void*)slot.img_dsc->data);
+            }
+            lv_free(slot.img_dsc);
+            slot.img_dsc = NULL;
+        }
+    }
+
+    static void resetSlot(DecodedTileCache& slot)
+    {
+        slot.x = -1;
+        slot.y = -1;
+        slot.z = -1;
+        slot.map_source = 0;
+        slot.img_dsc = NULL;
+        slot.last_used_ms = 0;
+        slot.in_use = false;
+    }
+
+    mutable DecodedTileCache slots_[kCapacity]{};
+    bool initialized_ = false;
+};
+
+LvglMapTileFileSystem& tile_file_system()
+{
+    static LvglMapTileFileSystem fs;
+    return fs;
+}
+
+LvglDecodedTileCache& decoded_tile_cache()
+{
+    static LvglDecodedTileCache cache;
+    return cache;
+}
+
+ui::map_tiles::FilesystemMapTileSource& tile_source()
+{
+    static ui::map_tiles::FilesystemMapTileSource source(tile_file_system(), "A:");
+    return source;
+}
+
+uint8_t clamp_tile_zoom(int z)
+{
+    if (z < 0)
+    {
+        return 0;
+    }
+    if (z > 255)
+    {
+        return 255;
+    }
+    return static_cast<uint8_t>(z);
+}
+
+ui::map_tiles::MapTileRef base_tile_ref(int z, int x, int y, uint8_t map_source)
+{
+    ui::map_tiles::MapTileRef ref{};
+    ref.layer = ui::map_tiles::mapTileLayerFromBaseSource(sanitize_map_source(map_source));
+    ref.z = clamp_tile_zoom(z);
+    ref.x = static_cast<uint32_t>(x < 0 ? 0 : x);
+    ref.y = static_cast<uint32_t>(y < 0 ? 0 : y);
+    return ref;
+}
+
+bool contour_tile_ref(int z, int x, int y, ui::map_tiles::MapTileRef& out)
+{
+    bool supported = false;
+    const auto layer = ui::map_tiles::mapTileContourLayerForZoom(z, &supported);
+    if (!supported)
+    {
+        return false;
+    }
+
+    out.layer = layer;
+    out.z = clamp_tile_zoom(z);
+    out.x = static_cast<uint32_t>(x < 0 ? 0 : x);
+    out.y = static_cast<uint32_t>(y < 0 ? 0 : y);
+    return true;
+}
+
+ui::map_tiles::MapTileRef base_tile_ref_for_tile(const MapTile& tile)
+{
+    return base_tile_ref(tile.z,
+                         static_cast<int>(tile.x),
+                         static_cast<int>(tile.y),
+                         g_active_map_source);
+}
+
+int16_t clamp_screen_coord(int value)
+{
+    if (value < -32768)
+    {
+        return -32768;
+    }
+    if (value > 32767)
+    {
+        return 32767;
+    }
+    return static_cast<int16_t>(value);
+}
+
+ui::map_tiles::MapTileRenderState tile_render_state(const MapTile& tile)
+{
+    if (tile.has_png_file)
+    {
+        return ui::map_tiles::MapTileRenderState::Ready;
+    }
+    if (tile.base_missing)
+    {
+        return ui::map_tiles::MapTileRenderState::Missing;
+    }
+    return ui::map_tiles::MapTileRenderState::Loading;
+}
+
+void rebuild_render_queue(TileContext& ctx)
+{
+    if (!ctx.render_queue)
+    {
+        return;
+    }
+
+    ctx.render_queue->clear();
+    if (!ctx.tiles || !ctx.anchor || !ctx.anchor->valid)
+    {
+        return;
+    }
+
+    for (const auto& tile : *ctx.tiles)
+    {
+        if (!tile.visible)
+        {
+            continue;
+        }
+
+        int screen_x = 0;
+        int screen_y = 0;
+        if (!tile_screen_pos_xyz(ctx, tile.x, tile.y, tile.z, screen_x, screen_y))
+        {
+            continue;
+        }
+
+        ui::map_tiles::MapTileRenderRef item{};
+        item.tile = base_tile_ref_for_tile(tile);
+        item.rect.x = clamp_screen_coord(screen_x);
+        item.rect.y = clamp_screen_coord(screen_y);
+        item.rect.width = TILE_SIZE;
+        item.rect.height = TILE_SIZE;
+        item.state = tile_render_state(tile);
+        ctx.render_queue->push(item);
+    }
+}
+
 void summarize_visible_tiles(const TileContext& ctx,
                              int& visible_total,
                              int& visible_loaded,
@@ -137,25 +477,6 @@ void summarize_visible_tiles(const TileContext& ctx,
     }
 }
 
-const char* base_source_dir(uint8_t map_source)
-{
-    switch (sanitize_map_source(map_source))
-    {
-    case 1:
-        return "terrain";
-    case 2:
-        return "satellite";
-    case 0:
-    default:
-        return "osm";
-    }
-}
-
-const char* base_source_ext(uint8_t map_source)
-{
-    return sanitize_map_source(map_source) == 2 ? "jpg" : "png";
-}
-
 size_t tiles_covering_axis(lv_coord_t axis_px)
 {
     const lv_coord_t clamped = std::max<lv_coord_t>(axis_px, 1);
@@ -200,40 +521,7 @@ size_t tile_decode_cache_limit(const TileContext& ctx)
     const size_t profile_limit =
         std::max<std::size_t>(1U, ::ui::runtime::current_memory_profile().max_map_decode_tiles);
     return std::min<size_t>(std::min<size_t>(desired, profile_limit),
-                            static_cast<size_t>(TILE_DECODE_CACHE_SIZE));
-}
-
-const char* major_contour_profile_for_zoom(int z)
-{
-    if (z <= 7)
-    {
-        return nullptr;
-    }
-    if (z == 8)
-    {
-        return "major-500";
-    }
-    if (z == 9)
-    {
-        return "major-200";
-    }
-    if (z == 10)
-    {
-        return "major-500";
-    }
-    if (z == 11)
-    {
-        return "major-200";
-    }
-    if (z <= 14)
-    {
-        return "major-100";
-    }
-    if (z <= 16)
-    {
-        return "major-50";
-    }
-    return "major-25";
+                            static_cast<size_t>(LvglDecodedTileCache::kCapacity));
 }
 
 } // namespace
@@ -259,73 +547,36 @@ const char* map_source_label(uint8_t map_source)
 
 bool build_base_tile_path(int z, int x, int y, uint8_t map_source, char* out_path, size_t out_size)
 {
-    if (out_path == NULL || out_size == 0)
-    {
-        return false;
-    }
-    const char* source_dir = base_source_dir(map_source);
-    const char* ext = base_source_ext(map_source);
-    snprintf(out_path, out_size, "A:/maps/base/%s/%d/%d/%d.%s", source_dir, z, x, y, ext);
-    out_path[out_size - 1] = '\0';
-    return true;
+    return tile_source().resolvePath(base_tile_ref(z, x, y, map_source),
+                                     out_path,
+                                     out_size);
 }
 
 bool base_tile_available(int z, int x, int y, uint8_t map_source)
 {
-    char path[96];
-    if (!build_base_tile_path(z, x, y, map_source, path, sizeof(path)))
-    {
-        return false;
-    }
-    return ui::fs::file_exists(path);
+    const auto result = tile_source().lookup(base_tile_ref(z, x, y, map_source));
+    return result.status == ui::map_tiles::MapTileStatus::Available;
 }
 
 bool build_contour_tile_path(int z, int x, int y, char* out_path, size_t out_size)
 {
-    if (out_path == NULL || out_size == 0)
+    ui::map_tiles::MapTileRef ref{};
+    if (!contour_tile_ref(z, x, y, ref))
     {
         return false;
     }
-    const char* profile = major_contour_profile_for_zoom(z);
-    if (profile == nullptr)
-    {
-        return false;
-    }
-    snprintf(out_path, out_size, "A:/maps/contour/%s/%d/%d/%d.png", profile, z, x, y);
-    out_path[out_size - 1] = '\0';
-    return true;
+    return tile_source().resolvePath(ref, out_path, out_size);
 }
 
 bool map_source_directory_available(uint8_t map_source)
 {
-    char path[48];
-    snprintf(path, sizeof(path), "A:/maps/base/%s", base_source_dir(map_source));
-    path[sizeof(path) - 1] = '\0';
-    return ui::fs::dir_exists(path);
+    return tile_source().layerDirectoryAvailable(
+        ui::map_tiles::mapTileLayerFromBaseSource(sanitize_map_source(map_source)));
 }
 
 bool contour_directory_available()
 {
-    static const char* kMajorProfiles[] = {
-        "major-500",
-        "major-200",
-        "major-100",
-        "major-50",
-        "major-25",
-    };
-
-    for (const char* profile : kMajorProfiles)
-    {
-        char path[64];
-        snprintf(path, sizeof(path), "A:/maps/contour/%s", profile);
-        path[sizeof(path) - 1] = '\0';
-        if (ui::fs::dir_exists(path))
-        {
-            return true;
-        }
-    }
-
-    return ui::fs::dir_exists("A:/maps/contour");
+    return tile_source().anyContourDirectoryAvailable();
 }
 
 bool take_missing_tile_notice(uint8_t* out_map_source)
@@ -348,69 +599,14 @@ void set_map_render_options(uint8_t map_source, bool contour_enabled)
     g_requested_contour_enabled = contour_enabled;
 }
 
-/**
- * Initialize tile decode cache
- */
-static void init_tile_decode_cache()
-{
-    if (g_tile_cache_initialized) return;
-    for (int i = 0; i < TILE_DECODE_CACHE_SIZE; i++)
-    {
-        g_tile_decode_cache[i].x = -1;
-        g_tile_decode_cache[i].y = -1;
-        g_tile_decode_cache[i].z = -1;
-        g_tile_decode_cache[i].map_source = 0;
-        g_tile_decode_cache[i].img_dsc = NULL;
-        g_tile_decode_cache[i].last_used_ms = 0;
-        g_tile_decode_cache[i].in_use = false;
-    }
-    g_tile_cache_initialized = true;
-    GPS_LOG("[GPS] Tile decode cache initialized (size=%d)\n", TILE_DECODE_CACHE_SIZE);
-}
-
 static void clear_tile_decode_cache()
 {
-    if (!g_tile_cache_initialized)
-    {
-        return;
-    }
-    for (int i = 0; i < TILE_DECODE_CACHE_SIZE; i++)
-    {
-        if (g_tile_decode_cache[i].img_dsc != NULL)
-        {
-            if (g_tile_decode_cache[i].img_dsc->data != NULL)
-            {
-                lv_free((void*)g_tile_decode_cache[i].img_dsc->data);
-            }
-            lv_free(g_tile_decode_cache[i].img_dsc);
-            g_tile_decode_cache[i].img_dsc = NULL;
-        }
-        g_tile_decode_cache[i].x = -1;
-        g_tile_decode_cache[i].y = -1;
-        g_tile_decode_cache[i].z = -1;
-        g_tile_decode_cache[i].map_source = 0;
-        g_tile_decode_cache[i].last_used_ms = 0;
-        g_tile_decode_cache[i].in_use = false;
-    }
-    g_cache_full_until_ms = 0;
+    decoded_tile_cache().clear();
 }
 
 static void release_tile_decode_cache_usage()
 {
-    if (!g_tile_cache_initialized)
-    {
-        return;
-    }
-
-    const uint32_t now_ms = sys::millis_now();
-    for (int i = 0; i < TILE_DECODE_CACHE_SIZE; i++)
-    {
-        g_tile_decode_cache[i].in_use = false;
-        if (g_tile_decode_cache[i].img_dsc != NULL)
-        {
-            g_tile_decode_cache[i].last_used_ms = now_ms;
-        }
-    }
+    decoded_tile_cache().releaseUsage();
 }
 
 /**
@@ -418,22 +614,7 @@ static void release_tile_decode_cache_usage()
  */
 static DecodedTileCache* find_cached_tile(int x, int y, int z, uint8_t map_source)
 {
-    if (!g_tile_cache_initialized) init_tile_decode_cache();
-    map_source = sanitize_map_source(map_source);
-
-    for (int i = 0; i < TILE_DECODE_CACHE_SIZE; i++)
-    {
-        if (g_tile_decode_cache[i].x == x &&
-            g_tile_decode_cache[i].y == y &&
-            g_tile_decode_cache[i].z == z &&
-            g_tile_decode_cache[i].map_source == map_source &&
-            g_tile_decode_cache[i].img_dsc != NULL)
-        {
-            g_tile_decode_cache[i].last_used_ms = sys::millis_now();
-            return &g_tile_decode_cache[i];
-        }
-    }
-    return NULL;
+    return decoded_tile_cache().find(base_tile_ref(z, x, y, map_source));
 }
 
 /**
@@ -442,67 +623,7 @@ static DecodedTileCache* find_cached_tile(int x, int y, int z, uint8_t map_sourc
  */
 static DecodedTileCache* get_lru_cache_slot(size_t active_limit)
 {
-    if (!g_tile_cache_initialized) init_tile_decode_cache();
-
-    const int slot_count = std::max(1, std::min(static_cast<int>(active_limit), TILE_DECODE_CACHE_SIZE));
-    uint32_t oldest_ms = UINT32_MAX;
-    int lru_idx = -1;
-    bool found_unused = false;
-
-    for (int i = 0; i < slot_count; i++)
-    {
-        if (g_tile_decode_cache[i].img_dsc == NULL)
-        {
-            return &g_tile_decode_cache[i]; // Empty slot
-        }
-        if (!g_tile_decode_cache[i].in_use)
-        {
-            found_unused = true;
-            if (g_tile_decode_cache[i].last_used_ms < oldest_ms)
-            {
-                oldest_ms = g_tile_decode_cache[i].last_used_ms;
-                lru_idx = i;
-            }
-        }
-    }
-
-    // If all slots are in use, return NULL to avoid use-after-free
-    if (!found_unused || lru_idx == -1)
-    {
-        uint32_t now_ms = sys::millis_now();
-        g_cache_full_until_ms = now_ms + 500;
-        if (now_ms - g_cache_full_log_ms >= 1000)
-        {
-            GPS_LOG("[GPS] All cache slots are in use, cannot evict safely\n");
-            g_cache_full_log_ms = now_ms;
-        }
-        return NULL;
-    }
-
-    // Evict LRU entry (only if it's not in use)
-    if (g_tile_decode_cache[lru_idx].img_dsc != NULL)
-    {
-        GPS_LOG("[GPS] Evicting cached tile %d/%d/%d from decode cache\n",
-                fmt_tile_coord(g_tile_decode_cache[lru_idx].z),
-                fmt_tile_coord(g_tile_decode_cache[lru_idx].x),
-                fmt_tile_coord(g_tile_decode_cache[lru_idx].y));
-        // Free the image descriptor (data was allocated by us)
-        if (g_tile_decode_cache[lru_idx].img_dsc->data != NULL)
-        {
-            lv_free((void*)g_tile_decode_cache[lru_idx].img_dsc->data);
-        }
-        lv_free(g_tile_decode_cache[lru_idx].img_dsc);
-        g_tile_decode_cache[lru_idx].img_dsc = NULL;
-    }
-
-    g_tile_decode_cache[lru_idx].x = -1;
-    g_tile_decode_cache[lru_idx].y = -1;
-    g_tile_decode_cache[lru_idx].z = -1;
-    g_tile_decode_cache[lru_idx].map_source = 0;
-    g_tile_decode_cache[lru_idx].last_used_ms = 0;
-    g_tile_decode_cache[lru_idx].in_use = false;
-
-    return &g_tile_decode_cache[lru_idx];
+    return decoded_tile_cache().acquireSlot(active_limit);
 }
 
 /**
@@ -1191,6 +1312,7 @@ static void load_tile_image(TileContext& ctx, MapTile& tile)
     tile.last_used_ms = sys::millis_now();
     tile.obj_evicted_ms = 0;
     tile.record_evicted = false;
+    rebuild_render_queue(ctx);
     GPS_LOG("[GPS] Tile %d/%d/%d loaded, visible=%d\n",
             tile.z,
             fmt_tile_coord(tile.x),
@@ -1764,6 +1886,7 @@ void calculate_required_tiles(TileContext& ctx, double lat, double lng, int zoom
     layout_loaded_tile_objects(ctx);
 
     evict_cache(ctx);
+    rebuild_render_queue(ctx);
 
     // Update GPS marker position after tiles are laid out (rendered after map)
     // This ensures marker is on top and moves with the map
@@ -1986,19 +2109,27 @@ void tile_loader_step(TileContext& ctx)
             }
         }
     }
+    rebuild_render_queue(ctx);
 }
 
 /**
  * Initialize tile context
  */
 void init_tile_context(TileContext& ctx, lv_obj_t* map_container, MapAnchor* anchor,
-                       std::vector<MapTile>* tiles, bool* has_map_data, bool* has_visible_map_data)
+                       std::vector<MapTile>* tiles,
+                       ui::map_tiles::MapTileRenderQueue* render_queue,
+                       bool* has_map_data, bool* has_visible_map_data)
 {
     ctx.map_container = map_container;
     ctx.anchor = anchor;
     ctx.tiles = tiles;
+    ctx.render_queue = render_queue;
     ctx.has_map_data = has_map_data;
     ctx.has_visible_map_data = has_visible_map_data;
+    if (ctx.render_queue)
+    {
+        ctx.render_queue->clear();
+    }
 }
 
 /**
@@ -2035,4 +2166,8 @@ void cleanup_tiles(TileContext& ctx)
     {
         *ctx.has_visible_map_data = false;
     }
+    if (ctx.render_queue)
+    {
+        ctx.render_queue->clear();
+    }
 }
diff --git a/platform/esp/common/include/platform/esp/common/settings_store_impl.h b/platform/esp/common/include/platform/esp/common/settings_store_impl.h
index 528f2286..579887de 100644
--- a/platform/esp/common/include/platform/esp/common/settings_store_impl.h
+++ b/platform/esp/common/include/platform/esp/common/settings_store_impl.h
@@ -26,6 +26,8 @@ constexpr StorageKeyAlias kStorageKeyAliases[] = {
     {"display_locale", "disp_locale"},
     {"screen_brightness", "screen_bright"},
     {"vibration_enabled", "vibe_enabled"},
+    {"chat_message_alerts", "chat_msg_alert"},
+    {"chat_contact_alerts", "chat_ct_alert"},
     {"gauge_design_mah", "gauge_dsgn"},
 };
 
diff --git a/platform/esp/idf_common/src/platform_ui_settings_backup_runtime.cpp b/platform/esp/idf_common/src/platform_ui_settings_backup_runtime.cpp
new file mode 100644
index 00000000..105fbdb2
--- /dev/null
+++ b/platform/esp/idf_common/src/platform_ui_settings_backup_runtime.cpp
@@ -0,0 +1,36 @@
+#include "platform/ui/settings_backup_runtime.h"
+
+#include <cstdio>
+
+namespace platform::ui::settings_backup
+{
+
+bool is_supported()
+{
+    return false;
+}
+
+Status status()
+{
+    Status out{};
+    out.supported = false;
+    std::snprintf(out.message, sizeof(out.message), "%s", "Settings backup unsupported");
+    return out;
+}
+
+bool backup()
+{
+    return false;
+}
+
+bool restore()
+{
+    return false;
+}
+
+bool remove()
+{
+    return false;
+}
+
+} // namespace platform::ui::settings_backup
diff --git a/platform/esp/radio/README.md b/platform/esp/radio/README.md
new file mode 100644
index 00000000..7ab4637b
--- /dev/null
+++ b/platform/esp/radio/README.md
@@ -0,0 +1,21 @@
+# ESP Radio Runtime
+
+Final owner for ESP radio/protocol adapter code that is platform-bound but not
+an app shell responsibility.
+
+Current migrated source:
+
+- `meshtastic_radio_adapter.h`
+- `meshtastic_radio_adapter.cpp`
+
+Evidence:
+
+- migrated from `removed root esp_idf/include/apps/esp_idf/meshtastic_radio_adapter.h`
+- migrated from `removed root esp_idf/src/meshtastic_radio_adapter.cpp`
+
+Rules:
+
+- do not select UX packs here
+- do not own app shell startup or loop sequencing here
+- do not include `removed legacy app implementation roots`
+- keep protocol behavior unchanged unless a protocol-specific change is made
diff --git a/apps/esp_idf/src/meshtastic_radio_adapter.cpp b/platform/esp/radio/meshtastic_radio_adapter.cpp
similarity index 96%
rename from apps/esp_idf/src/meshtastic_radio_adapter.cpp
rename to platform/esp/radio/meshtastic_radio_adapter.cpp
index 357042fa..e5a3661f 100644
--- a/apps/esp_idf/src/meshtastic_radio_adapter.cpp
+++ b/platform/esp/radio/meshtastic_radio_adapter.cpp
@@ -1,4 +1,4 @@
-#include "apps/esp_idf/meshtastic_radio_adapter.h"
+#include "platform/esp/radio/meshtastic_radio_adapter.h"
 
 #include "chat/domain/contact_types.h"
 #include "chat/infra/meshtastic/mt_node_payload.h"
@@ -19,7 +19,7 @@
 #include <cstdio>
 #include <cstring>
 
-namespace apps::esp_idf
+namespace platform::esp::radio
 {
 namespace
 {
@@ -32,7 +32,6 @@ constexpr uint16_t kIrqCrcErr = 0x0040;
 constexpr uint16_t kIrqTimeout = 0x0200;
 constexpr uint8_t kBitfieldWantResponseMask = 0x02;
 constexpr uint32_t kRadioOk = 0;
-constexpr char kSecondaryChannelName[] = "Squad";
 
 uint32_t now_millis()
 {
@@ -638,8 +637,10 @@ void MeshtasticRadioAdapter::updateChannelKeys()
     }
     else
     {
-        std::memcpy(primary_psk_, config_.primary_key, sizeof(primary_psk_));
-        primary_psk_len_ = sizeof(primary_psk_);
+        primary_psk_len_ = chat::normalizeMeshtasticChannelKeyLen(config_.primary_key,
+                                                                  sizeof(config_.primary_key),
+                                                                  config_.primary_key_len);
+        std::memcpy(primary_psk_, config_.primary_key, primary_psk_len_);
     }
 
     if (chat::meshtastic::isZeroKey(config_.secondary_key, sizeof(config_.secondary_key)))
@@ -649,17 +650,20 @@ void MeshtasticRadioAdapter::updateChannelKeys()
     }
     else
     {
-        std::memcpy(secondary_psk_, config_.secondary_key, sizeof(secondary_psk_));
-        secondary_psk_len_ = sizeof(secondary_psk_);
+        secondary_psk_len_ = chat::normalizeMeshtasticChannelKeyLen(config_.secondary_key,
+                                                                    sizeof(config_.secondary_key),
+                                                                    config_.secondary_key_len);
+        std::memcpy(secondary_psk_, config_.secondary_key, secondary_psk_len_);
     }
 
     primary_channel_hash_ =
         chat::meshtastic::computeChannelHash(chat::meshtastic::primaryChannelName(config_),
                                              primary_psk_,
                                              primary_psk_len_);
-    secondary_channel_hash_ = chat::meshtastic::computeChannelHash(kSecondaryChannelName,
-                                                                   secondary_psk_len_ > 0 ? secondary_psk_ : nullptr,
-                                                                   secondary_psk_len_);
+    secondary_channel_hash_ = chat::meshtastic::computeChannelHash(
+        chat::meshtastic::secondaryChannelName(config_),
+        secondary_psk_len_ > 0 ? secondary_psk_ : nullptr,
+        secondary_psk_len_);
 }
 
 void MeshtasticRadioAdapter::initNodeIdentity()
@@ -722,7 +726,7 @@ bool MeshtasticRadioAdapter::publishNodePayload(const meshtastic_Data& data,
             node.via_mqtt,
             node.is_ignored,
             node.has_public_key,
-            node.key_manually_verified,
+            false,
             node.has_device_metrics,
             node.has_device_metrics ? &node.device_metrics : nullptr),
         0);
@@ -779,4 +783,4 @@ const uint8_t* MeshtasticRadioAdapter::channelKeyFor(chat::ChannelId channel, si
     return primary_psk_;
 }
 
-} // namespace apps::esp_idf
+} // namespace platform::esp::radio
diff --git a/apps/esp_idf/include/apps/esp_idf/meshtastic_radio_adapter.h b/platform/esp/radio/meshtastic_radio_adapter.h
similarity index 95%
rename from apps/esp_idf/include/apps/esp_idf/meshtastic_radio_adapter.h
rename to platform/esp/radio/meshtastic_radio_adapter.h
index c4793d89..bd9e8345 100644
--- a/apps/esp_idf/include/apps/esp_idf/meshtastic_radio_adapter.h
+++ b/platform/esp/radio/meshtastic_radio_adapter.h
@@ -11,7 +11,7 @@
 #include <queue>
 #include <string>
 
-namespace apps::esp_idf
+namespace platform::esp::radio
 {
 
 class MeshtasticRadioAdapter final : public chat::IMeshAdapter
@@ -91,10 +91,10 @@ class MeshtasticRadioAdapter final : public chat::IMeshAdapter
     uint8_t radio_cr_ = 0;
     uint8_t primary_channel_hash_ = 0x00;
     uint8_t secondary_channel_hash_ = 0x00;
-    uint8_t primary_psk_[16] = {};
+    uint8_t primary_psk_[chat::kMeshtasticChannelKeyMaxLen] = {};
     size_t primary_psk_len_ = 0;
-    uint8_t secondary_psk_[16] = {};
+    uint8_t secondary_psk_[chat::kMeshtasticChannelKeyMaxLen] = {};
     size_t secondary_psk_len_ = 0;
 };
 
-} // namespace apps::esp_idf
+} // namespace platform::esp::radio
diff --git a/platform/linux/common/include/chat/linux_raw_lora_mesh_adapter.h b/platform/linux/common/include/chat/linux_raw_lora_mesh_adapter.h
index c46f3fb6..f45716f8 100644
--- a/platform/linux/common/include/chat/linux_raw_lora_mesh_adapter.h
+++ b/platform/linux/common/include/chat/linux_raw_lora_mesh_adapter.h
@@ -1,13 +1,17 @@
 #pragma once
 
+#include <array>
 #include <cstddef>
 #include <cstdint>
 #include <deque>
+#include <map>
 #include <string>
 #include <vector>
 
 #include "chat/domain/chat_model.h"
+#include "chat/infra/meshtastic/mt_packet_wire.h"
 #include "chat/ports/i_mesh_adapter.h"
+#include "meshtastic/mesh.pb.h"
 #include "platform/linux/sx126x_radio.h"
 
 namespace trailmate::linux_app
@@ -45,10 +49,19 @@ class LinuxRawLoraMeshAdapter final : public ::chat::IMeshAdapter
                      bool want_response = false) override;
     bool pollIncomingData(::chat::MeshIncomingData* out) override;
     bool requestNodeInfo(::chat::NodeId dest, bool want_response) override;
+    bool startKeyVerification(::chat::NodeId node_id) override;
+    bool submitKeyVerificationNumber(::chat::NodeId node_id,
+                                     std::uint64_t nonce,
+                                     std::uint32_t number) override;
     void applyConfig(const ::chat::MeshConfig& config) override;
     void applyProtocolConfig(::chat::MeshProtocol protocol,
                              const ::chat::MeshConfig& config);
     void setUserInfo(const char* long_name, const char* short_name) override;
+    bool isPkiReady() const override;
+    bool hasPkiKey(::chat::NodeId dest) const override;
+    void setNetworkLimits(bool duty_cycle_enabled,
+                          std::uint8_t util_percent) override;
+    void setPrivacyConfig(std::uint8_t encrypt_mode) override;
     ::chat::NodeId getNodeId() const override;
     bool isReady() const override;
     bool pollIncomingRawPacket(std::uint8_t* out_data,
@@ -75,6 +88,16 @@ class LinuxRawLoraMeshAdapter final : public ::chat::IMeshAdapter
         bool ok = false;
     };
 
+    enum class KeyVerificationState : std::uint8_t
+    {
+        Idle,
+        SenderInitiated,
+        SenderAwaitingNumber,
+        SenderAwaitingUser,
+        ReceiverAwaitingHash1,
+        ReceiverAwaitingUser,
+    };
+
     bool ensureRadioReady();
     ::chat::MessageId nextMessageId();
     void logStatusIfChanged(const char* title, const std::string& status);
@@ -91,6 +114,49 @@ class LinuxRawLoraMeshAdapter final : public ::chat::IMeshAdapter
     bool sendMeshtasticNodeInfoTo(::chat::NodeId dest,
                                   bool want_response,
                                   ::chat::ChannelId channel);
+    bool sendKeyVerificationPacket(::chat::NodeId dest,
+                                   const meshtastic_KeyVerification& kv,
+                                   bool want_response);
+    bool sendRoutingAck(::chat::NodeId dest,
+                        ::chat::MessageId request_id,
+                        std::uint8_t channel_hash,
+                        const std::uint8_t* psk,
+                        std::size_t psk_len);
+    bool encryptPkiPayload(::chat::NodeId dest,
+                           ::chat::MessageId packet_id,
+                           const std::uint8_t* plain,
+                           std::size_t plain_len,
+                           std::uint8_t* out_cipher,
+                           std::size_t* out_cipher_len);
+    bool decryptPkiPayload(::chat::NodeId from,
+                           ::chat::MessageId packet_id,
+                           const std::uint8_t* cipher,
+                           std::size_t cipher_len,
+                           std::uint8_t* out_plain,
+                           std::size_t* out_plain_len);
+    bool initPkiKeys();
+    void loadPkiNodeKeys();
+    void savePkiNodeKey(::chat::NodeId node_id,
+                        const std::uint8_t* key,
+                        std::size_t key_len);
+    void savePkiKeysToStore();
+    void forgetPkiNodeKey(::chat::NodeId node_id);
+    void touchPkiNodeKey(::chat::NodeId node_id);
+    void updateKeyVerificationState();
+    void resetKeyVerificationState();
+    void buildVerificationCode(char* out, std::size_t out_len) const;
+    bool handleKeyVerificationInit(
+        const ::chat::meshtastic::PacketHeaderWire& header,
+        const meshtastic_KeyVerification& kv);
+    bool handleKeyVerificationReply(
+        const ::chat::meshtastic::PacketHeaderWire& header,
+        const meshtastic_KeyVerification& kv);
+    bool handleKeyVerificationFinal(
+        const ::chat::meshtastic::PacketHeaderWire& header,
+        const meshtastic_KeyVerification& kv);
+    bool processKeyVerificationNumber(::chat::NodeId remote_node,
+                                      std::uint64_t nonce,
+                                      std::uint32_t number);
     bool sendFrame(PacketKind kind,
                    ::chat::ChannelId channel,
                    ::chat::NodeId dest,
@@ -106,7 +172,23 @@ class LinuxRawLoraMeshAdapter final : public ::chat::IMeshAdapter
     ::chat::NodeId self_node_id_ = 0;
     ::chat::MeshConfig config_{};
     ::chat::MeshProtocol active_protocol_ = ::chat::MeshProtocol::Meshtastic;
-    std::uint32_t next_msg_id_ = 1;
+    std::uint32_t next_msg_id_ = 0;
+    std::uint8_t encrypt_mode_ = 1;
+    bool duty_cycle_enabled_ = true;
+    std::uint8_t channel_util_percent_ = 0;
+    bool pki_ready_ = false;
+    std::array<std::uint8_t, 32> pki_public_key_{};
+    std::array<std::uint8_t, 32> pki_private_key_{};
+    std::map<::chat::NodeId, std::array<std::uint8_t, 32>> node_public_keys_{};
+    std::map<::chat::NodeId, std::uint32_t> node_key_last_seen_{};
+    std::map<::chat::NodeId, std::uint32_t> nodeinfo_last_reply_ms_{};
+    KeyVerificationState kv_state_ = KeyVerificationState::Idle;
+    std::uint64_t kv_nonce_ = 0;
+    std::uint32_t kv_nonce_ms_ = 0;
+    std::uint32_t kv_security_number_ = 0;
+    ::chat::NodeId kv_remote_node_ = 0;
+    std::array<std::uint8_t, 32> kv_hash1_{};
+    std::array<std::uint8_t, 32> kv_hash2_{};
     bool started_ = false;
     bool tx_enabled_ = true;
     std::string long_name_{};
diff --git a/platform/linux/common/include/platform/linux/mesh/linux_mesh_runtime_shell.h b/platform/linux/common/include/platform/linux/mesh/linux_mesh_runtime_shell.h
new file mode 100644
index 00000000..bdb3b300
--- /dev/null
+++ b/platform/linux/common/include/platform/linux/mesh/linux_mesh_runtime_shell.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "mesh/usecase/mesh_session.h"
+
+namespace platform::linux_runtime::mesh
+{
+
+class LinuxMeshRuntimeShell final
+{
+  public:
+    explicit LinuxMeshRuntimeShell(::mesh::MeshSession& session);
+
+    bool start(const ::mesh::MeshRuntimeConfig& config);
+    void stop();
+    void tick();
+    ::mesh::SendResult sendDirect(const ::mesh::DirectMessageCommand& command);
+    ::mesh::MeshSessionState state() const;
+
+  private:
+    ::mesh::MeshSession& session_;
+};
+
+} // namespace platform::linux_runtime::mesh
diff --git a/platform/linux/common/include/platform/linux/mesh/linux_sqlite_mesh_identity_store.h b/platform/linux/common/include/platform/linux/mesh/linux_sqlite_mesh_identity_store.h
new file mode 100644
index 00000000..96669ca3
--- /dev/null
+++ b/platform/linux/common/include/platform/linux/mesh/linux_sqlite_mesh_identity_store.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "mesh/ports/i_local_identity_store.h"
+#include "mesh/ports/i_peer_key_store.h"
+
+#include <cstddef>
+#include <cstdint>
+#include <vector>
+
+namespace platform::linux_runtime::mesh
+{
+
+class LinuxSqliteLocalIdentityStore final : public ::mesh::ILocalIdentityStore
+{
+  public:
+    struct Options
+    {
+        const char* ns = "chat";
+        const char* public_key = "pki_pub";
+        const char* private_key = "pki_priv";
+    };
+
+    LinuxSqliteLocalIdentityStore();
+    explicit LinuxSqliteLocalIdentityStore(const Options& options);
+
+    ::mesh::StoreResult load(::mesh::LocalIdentity& out) override;
+    ::mesh::StoreResult save(const ::mesh::LocalIdentity& identity) override;
+    ::mesh::StoreResult clear() override;
+
+  private:
+    Options options_;
+};
+
+class LinuxSqlitePeerKeyStore final : public ::mesh::IPeerKeyStore
+{
+  public:
+    struct Options
+    {
+        const char* ns = "chat_pki";
+        const char* key = "pki_nodes";
+        std::size_t max_keys = 16;
+    };
+
+    LinuxSqlitePeerKeyStore();
+    explicit LinuxSqlitePeerKeyStore(const Options& options);
+
+    ::mesh::StoreResult get(::mesh::NodeId node_id, ::mesh::PeerPublicKey& out) override;
+    ::mesh::StoreResult put(const ::mesh::PeerPublicKey& key) override;
+    ::mesh::StoreResult remove(::mesh::NodeId node_id) override;
+    ::mesh::StoreResult clear() override;
+
+    ::mesh::StoreResult loadAll(std::vector<::mesh::PeerPublicKey>& out);
+    ::mesh::StoreResult replaceAll(const ::mesh::PeerPublicKey* keys, std::size_t count);
+
+  private:
+    ::mesh::StoreResult saveAll(std::vector<::mesh::PeerPublicKey>& keys);
+
+    Options options_;
+};
+
+} // namespace platform::linux_runtime::mesh
diff --git a/platform/linux/common/include/ui/widgets/map/map_tiles.h b/platform/linux/common/include/ui/widgets/map/map_tiles.h
index 7de4bdce..32cba415 100644
--- a/platform/linux/common/include/ui/widgets/map/map_tiles.h
+++ b/platform/linux/common/include/ui/widgets/map/map_tiles.h
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "ui_map_runtime/map_tiles/map_tile_render_queue.h"
+
 #include "lvgl.h"
 
 #include <cstddef>
@@ -73,6 +75,7 @@ struct TileContext
     lv_obj_t* map_container = nullptr;
     MapAnchor* anchor = nullptr;
     std::vector<MapTile>* tiles = nullptr;
+    ui::map_tiles::MapTileRenderQueue* render_queue = nullptr;
     bool* has_map_data = nullptr;
     bool* has_visible_map_data = nullptr;
 };
@@ -101,6 +104,7 @@ void init_tile_context(TileContext& ctx,
                        lv_obj_t* map_container,
                        MapAnchor* anchor,
                        std::vector<MapTile>* tiles,
+                       ui::map_tiles::MapTileRenderQueue* render_queue,
                        bool* has_map_data,
                        bool* has_visible_map_data);
 void cleanup_tiles(TileContext& ctx);
diff --git a/platform/linux/common/src/app/linux_app_services.cpp b/platform/linux/common/src/app/linux_app_services.cpp
index ee2e35b6..b7de3e5c 100644
--- a/platform/linux/common/src/app/linux_app_services.cpp
+++ b/platform/linux/common/src/app/linux_app_services.cpp
@@ -1651,6 +1651,8 @@ bool LinuxAppServices::initialize()
     syncLocalIdentity();
     applyMeshConfig();
     applyPositionConfig();
+    applyNetworkLimits();
+    applyPrivacyConfig();
     applyChatDefaults();
     initialized_ = true;
     return true;
@@ -1754,10 +1756,15 @@ void LinuxAppServices::applyPositionConfig()
 
 void LinuxAppServices::applyNetworkLimits()
 {
+    ensureServicesReady();
+    impl().mesh_adapter.setNetworkLimits(config_.net_duty_cycle,
+                                         config_.net_channel_util);
 }
 
 void LinuxAppServices::applyPrivacyConfig()
 {
+    ensureServicesReady();
+    impl().mesh_adapter.setPrivacyConfig(config_.privacy_encrypt_mode);
 }
 
 void LinuxAppServices::applyChatDefaults()
diff --git a/platform/linux/common/src/chat/linux_raw_lora_mesh_adapter.cpp b/platform/linux/common/src/chat/linux_raw_lora_mesh_adapter.cpp
index 274093c2..9488c8bc 100644
--- a/platform/linux/common/src/chat/linux_raw_lora_mesh_adapter.cpp
+++ b/platform/linux/common/src/chat/linux_raw_lora_mesh_adapter.cpp
@@ -1,10 +1,14 @@
 #include "chat/linux_raw_lora_mesh_adapter.h"
 
 #include <algorithm>
+#include <array>
 #include <chrono>
 #include <cmath>
 #include <cstdio>
 #include <cstring>
+#include <ctime>
+#include <limits>
+#include <random>
 #include <string>
 #include <utility>
 #include <vector>
@@ -13,14 +17,17 @@
 #include "chat/infra/meshtastic/mt_codec_pb.h"
 #include "chat/infra/meshtastic/mt_node_payload.h"
 #include "chat/infra/meshtastic/mt_packet_wire.h"
+#include "chat/infra/meshtastic/mt_pki_crypto.h"
 #include "chat/infra/meshtastic/mt_protocol_helpers.h"
 #include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/time_utils.h"
+#include "platform/linux/mesh/linux_sqlite_mesh_identity_store.h"
 #include "platform/linux/runtime_packet_log.h"
 #include "sys/event_bus.h"
 
 #if defined(TRAIL_MATE_HAS_OPENSSL)
 #include <openssl/evp.h>
+#include <openssl/rand.h>
 #endif
 
 namespace trailmate::linux_app
@@ -38,15 +45,19 @@ constexpr std::size_t kHeaderSize = 26;
 constexpr std::size_t kMaxPayloadSize = 190;
 constexpr std::uint32_t kBroadcastNodeId = 0xFFFFFFFFUL;
 constexpr std::uint8_t kDefaultPskIndex = 1;
-constexpr char kSecondaryChannelName[] = "Squad";
 constexpr std::uint32_t kRxMonitorHeartbeatSeconds = 15;
+constexpr std::uint8_t kBitfieldWantResponseMask = 0x02;
+constexpr std::uint32_t kNodeInfoReplySuppressMs = 60000;
+constexpr std::uint32_t kKeyVerificationTimeoutMs = 60000;
+constexpr std::size_t kMaxPkiNodes = 16;
+constexpr std::size_t kPkiKeySize = 32;
 
 struct MeshtasticAirPlan
 {
     ::chat::meshtastic::RadioConfig radio{};
-    std::uint8_t primary_psk[16]{};
+    std::uint8_t primary_psk[::chat::kMeshtasticChannelKeyMaxLen]{};
     std::size_t primary_psk_len = 0;
-    std::uint8_t secondary_psk[16]{};
+    std::uint8_t secondary_psk[::chat::kMeshtasticChannelKeyMaxLen]{};
     std::size_t secondary_psk_len = 0;
     std::uint8_t primary_channel_hash = 0;
     std::uint8_t secondary_channel_hash = 0;
@@ -61,6 +72,162 @@ std::uint32_t now_seconds()
             .count());
 }
 
+bool should_require_direct_pki(std::uint8_t encrypt_mode,
+                               std::uint32_t dest_node,
+                               std::uint32_t portnum)
+{
+    return encrypt_mode != 0 && dest_node != kBroadcastNodeId &&
+           ::chat::meshtastic::allowPkiForPortnum(portnum);
+}
+
+bool secure_random_bytes(std::uint8_t* out, std::size_t len)
+{
+    if (out == nullptr || len == 0)
+    {
+        return false;
+    }
+#if defined(TRAIL_MATE_HAS_OPENSSL)
+    if (len <= static_cast<std::size_t>(std::numeric_limits<int>::max()) &&
+        RAND_bytes(out, static_cast<int>(len)) == 1)
+    {
+        return true;
+    }
+#endif
+    std::random_device rd;
+    for (std::size_t pos = 0; pos < len;)
+    {
+        std::uint32_t word = rd();
+        const std::size_t chunk = std::min<std::size_t>(sizeof(word), len - pos);
+        std::memcpy(out + pos, &word, chunk);
+        pos += chunk;
+    }
+    return true;
+}
+
+std::uint32_t random_u32()
+{
+    std::uint32_t value = 0;
+    (void)secure_random_bytes(reinterpret_cast<std::uint8_t*>(&value),
+                              sizeof(value));
+    if (value == 0)
+    {
+        value = static_cast<std::uint32_t>(
+            std::chrono::steady_clock::now().time_since_epoch().count());
+    }
+    return value;
+}
+
+std::uint64_t random_u64()
+{
+    std::uint64_t value = 0;
+    (void)secure_random_bytes(reinterpret_cast<std::uint8_t*>(&value),
+                              sizeof(value));
+    if (value == 0)
+    {
+        value = random_u32();
+    }
+    return value;
+}
+
+std::uint32_t random_packet_id_seed()
+{
+    std::uint32_t seed = random_u32() & 0x7FFFFFFFUL;
+    if (seed == 0)
+    {
+        seed = 1;
+    }
+    return seed;
+}
+
+std::uint32_t random_security_number()
+{
+    return (random_u32() % 999999U) + 1U;
+}
+
+bool generate_x25519_keypair(std::uint8_t public_key[kPkiKeySize],
+                             std::uint8_t private_key[kPkiKeySize])
+{
+    if (public_key == nullptr || private_key == nullptr)
+    {
+        return false;
+    }
+#if defined(TRAIL_MATE_HAS_OPENSSL)
+    EVP_PKEY_CTX* ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_X25519, nullptr);
+    if (ctx == nullptr)
+    {
+        return false;
+    }
+    EVP_PKEY* pkey = nullptr;
+    bool ok = EVP_PKEY_keygen_init(ctx) == 1 &&
+              EVP_PKEY_keygen(ctx, &pkey) == 1 && pkey != nullptr;
+    EVP_PKEY_CTX_free(ctx);
+    if (!ok)
+    {
+        if (pkey != nullptr)
+        {
+            EVP_PKEY_free(pkey);
+        }
+        return false;
+    }
+
+    std::size_t public_len = kPkiKeySize;
+    std::size_t private_len = kPkiKeySize;
+    ok = EVP_PKEY_get_raw_public_key(pkey, public_key, &public_len) == 1 &&
+         EVP_PKEY_get_raw_private_key(pkey, private_key, &private_len) == 1 &&
+         public_len == kPkiKeySize && private_len == kPkiKeySize;
+    EVP_PKEY_free(pkey);
+    return ok;
+#else
+    (void)public_key;
+    (void)private_key;
+    return false;
+#endif
+}
+
+bool derive_x25519_shared_key(const std::uint8_t peer_public_key[kPkiKeySize],
+                              const std::uint8_t local_private_key[kPkiKeySize],
+                              std::uint8_t out_shared[kPkiKeySize])
+{
+    if (peer_public_key == nullptr || local_private_key == nullptr ||
+        out_shared == nullptr)
+    {
+        return false;
+    }
+#if defined(TRAIL_MATE_HAS_OPENSSL)
+    EVP_PKEY* local = EVP_PKEY_new_raw_private_key(
+        EVP_PKEY_X25519, nullptr, local_private_key, kPkiKeySize);
+    EVP_PKEY* peer = EVP_PKEY_new_raw_public_key(
+        EVP_PKEY_X25519, nullptr, peer_public_key, kPkiKeySize);
+    EVP_PKEY_CTX* ctx = local != nullptr ? EVP_PKEY_CTX_new(local, nullptr)
+                                         : nullptr;
+    std::size_t shared_len = kPkiKeySize;
+    const bool ok =
+        local != nullptr && peer != nullptr && ctx != nullptr &&
+        EVP_PKEY_derive_init(ctx) == 1 &&
+        EVP_PKEY_derive_set_peer(ctx, peer) == 1 &&
+        EVP_PKEY_derive(ctx, out_shared, &shared_len) == 1 &&
+        shared_len == kPkiKeySize;
+    if (ctx != nullptr)
+    {
+        EVP_PKEY_CTX_free(ctx);
+    }
+    if (peer != nullptr)
+    {
+        EVP_PKEY_free(peer);
+    }
+    if (local != nullptr)
+    {
+        EVP_PKEY_free(local);
+    }
+    return ok;
+#else
+    (void)peer_public_key;
+    (void)local_private_key;
+    (void)out_shared;
+    return false;
+#endif
+}
+
 void write_u16(std::uint8_t* out, std::uint16_t value)
 {
     out[0] = static_cast<std::uint8_t>(value & 0xFF);
@@ -207,19 +374,23 @@ MeshtasticAirPlan build_meshtastic_air_plan(
     }
     else
     {
+        plan.primary_psk_len = ::chat::normalizeMeshtasticChannelKeyLen(config.primary_key,
+                                                                        sizeof(config.primary_key),
+                                                                        config.primary_key_len);
         std::memcpy(plan.primary_psk,
                     config.primary_key,
-                    sizeof(plan.primary_psk));
-        plan.primary_psk_len = sizeof(plan.primary_psk);
+                    plan.primary_psk_len);
     }
 
     if (!::chat::meshtastic::isZeroKey(config.secondary_key,
                                        sizeof(config.secondary_key)))
     {
+        plan.secondary_psk_len = ::chat::normalizeMeshtasticChannelKeyLen(config.secondary_key,
+                                                                          sizeof(config.secondary_key),
+                                                                          config.secondary_key_len);
         std::memcpy(plan.secondary_psk,
                     config.secondary_key,
-                    sizeof(plan.secondary_psk));
-        plan.secondary_psk_len = sizeof(plan.secondary_psk);
+                    plan.secondary_psk_len);
     }
 
     plan.primary_channel_hash = ::chat::meshtastic::computeChannelHash(
@@ -227,7 +398,7 @@ MeshtasticAirPlan build_meshtastic_air_plan(
         plan.primary_psk,
         plan.primary_psk_len);
     plan.secondary_channel_hash = ::chat::meshtastic::computeChannelHash(
-        kSecondaryChannelName,
+        ::chat::meshtastic::secondaryChannelName(config),
         plan.secondary_psk_len > 0 ? plan.secondary_psk : nullptr,
         plan.secondary_psk_len);
     return plan;
@@ -845,6 +1016,9 @@ LinuxRawLoraMeshAdapter::LinuxRawLoraMeshAdapter(::chat::NodeId self_node_id)
     : radio_(::platform::linux_runtime::Sx126xRadio::instance()),
       self_node_id_(self_node_id)
 {
+    next_msg_id_ = random_packet_id_seed();
+    (void)initPkiKeys();
+    loadPkiNodeKeys();
 }
 
 bool LinuxRawLoraMeshAdapter::hardwareCandidatePresent()
@@ -921,7 +1095,7 @@ bool LinuxRawLoraMeshAdapter::takePendingSendResult(::chat::MessageId& out_msg_i
         .supports_appdata_ack = false,
         .provides_appdata_sender = true,
         .supports_node_info = true,
-        .supports_pki = false,
+        .supports_pki = pki_ready_,
         .supports_discovery_actions = false,
     };
 }
@@ -950,6 +1124,14 @@ bool LinuxRawLoraMeshAdapter::sendTextWithId(::chat::ChannelId channel,
     {
         *out_msg_id = msg_id;
     }
+    if (forced_msg_id != 0 && forced_msg_id >= next_msg_id_)
+    {
+        next_msg_id_ = forced_msg_id + 1U;
+        if (next_msg_id_ == 0)
+        {
+            next_msg_id_ = 1;
+        }
+    }
 
     const auto* bytes = reinterpret_cast<const std::uint8_t*>(text.data());
     const ::chat::NodeId dest = peer == 0 ? kBroadcastNodeId : peer;
@@ -1001,8 +1183,6 @@ bool LinuxRawLoraMeshAdapter::sendAppData(::chat::ChannelId channel,
                                           ::chat::MessageId packet_id,
                                           bool want_response)
 {
-    (void)want_ack;
-    (void)want_response;
     if (payload == nullptr || len == 0)
     {
         return false;
@@ -1010,6 +1190,14 @@ bool LinuxRawLoraMeshAdapter::sendAppData(::chat::ChannelId channel,
     const ::chat::NodeId effective_dest = dest == 0 ? kBroadcastNodeId : dest;
     const ::chat::MessageId effective_id =
         packet_id != 0 ? packet_id : nextMessageId();
+    if (packet_id != 0 && packet_id >= next_msg_id_)
+    {
+        next_msg_id_ = packet_id + 1U;
+        if (next_msg_id_ == 0)
+        {
+            next_msg_id_ = 1;
+        }
+    }
     if (active_protocol_ == ::chat::MeshProtocol::Meshtastic)
     {
         return sendMeshtasticPayload(channel,
@@ -1062,6 +1250,52 @@ bool LinuxRawLoraMeshAdapter::requestNodeInfo(::chat::NodeId dest,
                                     ::chat::ChannelId::PRIMARY);
 }
 
+bool LinuxRawLoraMeshAdapter::startKeyVerification(::chat::NodeId node_id)
+{
+    updateKeyVerificationState();
+    if (kv_state_ != KeyVerificationState::Idle ||
+        node_id == 0 || node_id == kBroadcastNodeId)
+    {
+        return false;
+    }
+    if (!pki_ready_ || node_public_keys_.find(node_id) == node_public_keys_.end())
+    {
+        append_lora_system_log(
+            "Key verification unavailable",
+            "PKI is not ready or the remote public key has not been exchanged yet.");
+        return false;
+    }
+
+    kv_remote_node_ = node_id;
+    kv_nonce_ = random_u64();
+    kv_nonce_ms_ = ::sys::millis_now();
+    kv_security_number_ = 0;
+    kv_hash1_.fill(0);
+    kv_hash2_.fill(0);
+
+    meshtastic_KeyVerification init = meshtastic_KeyVerification_init_zero;
+    init.nonce = kv_nonce_;
+    init.hash1.size = 0;
+    init.hash2.size = 0;
+
+    if (!sendKeyVerificationPacket(kv_remote_node_, init, true))
+    {
+        resetKeyVerificationState();
+        return false;
+    }
+
+    kv_state_ = KeyVerificationState::SenderInitiated;
+    return true;
+}
+
+bool LinuxRawLoraMeshAdapter::submitKeyVerificationNumber(
+    ::chat::NodeId node_id,
+    std::uint64_t nonce,
+    std::uint32_t number)
+{
+    return processKeyVerificationNumber(node_id, nonce, number);
+}
+
 void LinuxRawLoraMeshAdapter::applyConfig(const ::chat::MeshConfig& config)
 {
     applyProtocolConfig(active_protocol_, config);
@@ -1116,6 +1350,28 @@ void LinuxRawLoraMeshAdapter::setUserInfo(const char* long_name,
     short_name_ = short_name == nullptr ? "" : short_name;
 }
 
+bool LinuxRawLoraMeshAdapter::isPkiReady() const
+{
+    return pki_ready_;
+}
+
+bool LinuxRawLoraMeshAdapter::hasPkiKey(::chat::NodeId dest) const
+{
+    return dest != 0 && node_public_keys_.find(dest) != node_public_keys_.end();
+}
+
+void LinuxRawLoraMeshAdapter::setNetworkLimits(bool duty_cycle_enabled,
+                                               std::uint8_t util_percent)
+{
+    duty_cycle_enabled_ = duty_cycle_enabled;
+    channel_util_percent_ = util_percent;
+}
+
+void LinuxRawLoraMeshAdapter::setPrivacyConfig(std::uint8_t encrypt_mode)
+{
+    encrypt_mode_ = std::min<std::uint8_t>(encrypt_mode, 2);
+}
+
 ::chat::NodeId LinuxRawLoraMeshAdapter::getNodeId() const
 {
     return self_node_id_;
@@ -1334,12 +1590,16 @@ bool LinuxRawLoraMeshAdapter::ensureRadioReady()
 
 ::chat::MessageId LinuxRawLoraMeshAdapter::nextMessageId()
 {
-    ++next_msg_id_;
+    if (next_msg_id_ == 0)
+    {
+        next_msg_id_ = random_packet_id_seed();
+    }
+    const std::uint32_t msg_id = next_msg_id_++;
     if (next_msg_id_ == 0)
     {
         next_msg_id_ = 1;
     }
-    return next_msg_id_;
+    return msg_id == 0 ? nextMessageId() : msg_id;
 }
 
 bool LinuxRawLoraMeshAdapter::sendMeshtasticPayload(
@@ -1360,6 +1620,7 @@ bool LinuxRawLoraMeshAdapter::sendMeshtasticPayload(
     std::uint8_t data_payload[256] = {};
     std::size_t data_size = sizeof(data_payload);
     bool encoded = false;
+    const bool data_want_response = want_response || want_ack;
     if (portnum == meshtastic_PortNum_TEXT_MESSAGE_APP)
     {
         const std::string text(reinterpret_cast<const char*>(payload), len);
@@ -1376,7 +1637,7 @@ bool LinuxRawLoraMeshAdapter::sendMeshtasticPayload(
         encoded = ::chat::meshtastic::encodeAppData(portnum,
                                                     payload,
                                                     len,
-                                                    want_response,
+                                                    data_want_response,
                                                     data_payload,
                                                     &data_size);
     }
@@ -1397,8 +1658,70 @@ bool LinuxRawLoraMeshAdapter::sendMeshtasticPayload(
     const MeshtasticAirPlan plan = build_meshtastic_air_plan(config_);
     std::size_t psk_len = 0;
     const std::uint8_t* psk = psk_for_channel(plan, channel, &psk_len);
-    const std::uint8_t channel_hash = channel_hash_for(plan, channel);
-    if (psk != nullptr && psk_len > 0 && !meshtastic_crypto_available())
+    std::uint8_t channel_hash = channel_hash_for(plan, channel);
+    const std::uint8_t* wire_payload = data_payload;
+    std::size_t wire_payload_size = data_size;
+    std::uint8_t pki_payload[256] = {};
+    bool use_pki = false;
+    bool air_want_ack =
+        ::chat::meshtastic::shouldSetAirWantAck(dest, want_ack);
+
+    if (should_require_direct_pki(encrypt_mode_, dest, portnum))
+    {
+        const bool have_dest_key =
+            node_public_keys_.find(dest) != node_public_keys_.end();
+        if (!pki_ready_ || !have_dest_key)
+        {
+            append_lora_system_log(
+                "Meshtastic direct TX blocked",
+                std::string("PKI is required for direct ") +
+                    meshtastic_port_label(portnum) + " to " +
+                    node_hex(dest) +
+                    (!pki_ready_ ? " but local PKI is not ready."
+                                 : " but the remote public key is unknown."),
+                {{
+                    .kind =
+                        ::platform::linux_runtime::PacketLogSegmentKind::Error,
+                    .label = "pki",
+                    .text = !pki_ready_ ? "pki_not_ready" : "key_missing",
+                }});
+            if (pki_ready_ && !have_dest_key)
+            {
+                (void)sendMeshtasticNodeInfoTo(dest, true, channel);
+            }
+            return false;
+        }
+
+        std::size_t pki_len = sizeof(pki_payload);
+        if (!encryptPkiPayload(dest,
+                               msg_id,
+                               data_payload,
+                               data_size,
+                               pki_payload,
+                               &pki_len))
+        {
+            append_lora_system_log(
+                "Meshtastic direct TX blocked",
+                "PKI payload encryption failed.",
+                {{
+                    .kind =
+                        ::platform::linux_runtime::PacketLogSegmentKind::Error,
+                    .label = "pki",
+                    .text = "encrypt_failed",
+                }});
+            return false;
+        }
+        wire_payload = pki_payload;
+        wire_payload_size = pki_len;
+        channel_hash = 0;
+        psk = nullptr;
+        psk_len = 0;
+        air_want_ack = true;
+        use_pki = true;
+    }
+
+    if (!use_pki && psk != nullptr && psk_len > 0 &&
+        !meshtastic_crypto_available())
     {
         append_lora_system_log(
             "Meshtastic TX crypto unavailable",
@@ -1412,10 +1735,8 @@ bool LinuxRawLoraMeshAdapter::sendMeshtasticPayload(
     }
     std::uint8_t wire[255] = {};
     std::size_t wire_size = sizeof(wire);
-    const bool air_want_ack =
-        ::chat::meshtastic::shouldSetAirWantAck(dest, want_ack);
-    if (!build_meshtastic_wire_packet(data_payload,
-                                      data_size,
+    if (!build_meshtastic_wire_packet(wire_payload,
+                                      wire_payload_size,
                                       self_node_id_,
                                       msg_id,
                                       dest,
@@ -1441,7 +1762,8 @@ bool LinuxRawLoraMeshAdapter::sendMeshtasticPayload(
     const std::string summary =
         std::string("Meshtastic ") + meshtastic_port_label(portnum) +
         " TX to " + node_hex(dest) + " id " + node_hex(msg_id) +
-        " channel " + hex_u8(channel_hash) + ".";
+        " channel " + hex_u8(channel_hash) +
+        (use_pki ? " via PKI." : ".");
     auto entry = make_meshtastic_wire_log(
         ::platform::linux_runtime::PacketLogDirection::Tx,
         wire,
@@ -1454,6 +1776,11 @@ bool LinuxRawLoraMeshAdapter::sendMeshtasticPayload(
         .label = "air",
         .text = describe_meshtastic_air_plan(plan),
     });
+    entry.segments.push_back({
+        .kind = ::platform::linux_runtime::PacketLogSegmentKind::Meta,
+        .label = "path",
+        .text = use_pki ? "PKI direct" : "channel",
+    });
     ::platform::linux_runtime::append_packet_log(std::move(entry));
 
     const bool ok = radio_.transmit(wire, wire_size);
@@ -1517,8 +1844,8 @@ bool LinuxRawLoraMeshAdapter::sendMeshtasticNodeInfoTo(
             short_name,
             meshtastic_HardwareModel_PRIVATE_HW,
             mac_addr,
-            nullptr,
-            0,
+            pki_ready_ ? pki_public_key_.data() : nullptr,
+            pki_ready_ ? pki_public_key_.size() : 0,
             want_response,
             data_payload,
             &data_size))
@@ -1601,6 +1928,675 @@ bool LinuxRawLoraMeshAdapter::sendMeshtasticNodeInfoTo(
     return ok;
 }
 
+bool LinuxRawLoraMeshAdapter::initPkiKeys()
+{
+    ::platform::linux_runtime::mesh::LinuxSqliteLocalIdentityStore store;
+    ::mesh::LocalIdentity stored_identity{};
+    auto loaded = store.load(stored_identity);
+    if (loaded.ok &&
+        !::chat::meshtastic::isZeroKey(stored_identity.private_key,
+                                       sizeof(stored_identity.private_key)))
+    {
+        std::memcpy(pki_public_key_.data(),
+                    stored_identity.public_key,
+                    pki_public_key_.size());
+        std::memcpy(pki_private_key_.data(),
+                    stored_identity.private_key,
+                    pki_private_key_.size());
+        pki_ready_ = true;
+        append_lora_system_log("Meshtastic PKI ready",
+                               "Loaded local X25519 identity key.");
+        return true;
+    }
+
+    pki_public_key_.fill(0);
+    pki_private_key_.fill(0);
+    if (!generate_x25519_keypair(pki_public_key_.data(),
+                                 pki_private_key_.data()) ||
+        ::chat::meshtastic::isZeroKey(pki_private_key_.data(),
+                                      pki_private_key_.size()))
+    {
+        pki_ready_ = false;
+        append_lora_system_log(
+            "Meshtastic PKI unavailable",
+            "OpenSSL X25519 key generation failed or libcrypto is not linked.");
+        return false;
+    }
+
+    ::mesh::LocalIdentity generated{};
+    std::memcpy(generated.public_key,
+                pki_public_key_.data(),
+                sizeof(generated.public_key));
+    std::memcpy(generated.private_key,
+                pki_private_key_.data(),
+                sizeof(generated.private_key));
+    generated.valid = true;
+    auto saved = store.save(generated);
+    pki_ready_ = saved.ok;
+    append_lora_system_log(
+        pki_ready_ ? "Meshtastic PKI ready" : "Meshtastic PKI save failed",
+        pki_ready_ ? "Generated and saved local X25519 identity key."
+                   : "Generated a local PKI key but could not persist it.");
+    return pki_ready_;
+}
+
+void LinuxRawLoraMeshAdapter::loadPkiNodeKeys()
+{
+    ::platform::linux_runtime::mesh::LinuxSqlitePeerKeyStore store;
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = store.loadAll(keys);
+    if (!loaded.ok)
+    {
+        return;
+    }
+
+    node_public_keys_.clear();
+    node_key_last_seen_.clear();
+    for (const auto& peer_key : keys)
+    {
+        std::array<std::uint8_t, 32> key_copy{};
+        std::memcpy(key_copy.data(), peer_key.public_key, key_copy.size());
+        node_public_keys_[peer_key.node_id.value] = key_copy;
+        node_key_last_seen_[peer_key.node_id.value] = peer_key.updated_at_ms;
+    }
+}
+
+void LinuxRawLoraMeshAdapter::savePkiNodeKey(::chat::NodeId node_id,
+                                             const std::uint8_t* key,
+                                             std::size_t key_len)
+{
+    if (node_id == 0 || node_id == kBroadcastNodeId || key == nullptr ||
+        key_len != kPkiKeySize ||
+        ::chat::meshtastic::isZeroKey(key, key_len))
+    {
+        return;
+    }
+
+    std::array<std::uint8_t, 32> key_copy{};
+    std::memcpy(key_copy.data(), key, key_copy.size());
+    node_public_keys_[node_id] = key_copy;
+    touchPkiNodeKey(node_id);
+    savePkiKeysToStore();
+}
+
+void LinuxRawLoraMeshAdapter::savePkiKeysToStore()
+{
+    std::vector<::mesh::PeerPublicKey> entries;
+    entries.reserve(node_public_keys_.size());
+    for (const auto& item : node_public_keys_)
+    {
+        ::mesh::PeerPublicKey entry{};
+        entry.node_id = ::mesh::NodeId{item.first};
+        const auto seen_it = node_key_last_seen_.find(item.first);
+        entry.updated_at_ms =
+            seen_it == node_key_last_seen_.end() ? 0 : seen_it->second;
+        entry.verified = false;
+        std::memcpy(entry.public_key, item.second.data(), sizeof(entry.public_key));
+        entries.push_back(entry);
+    }
+
+    if (entries.size() > kMaxPkiNodes)
+    {
+        std::sort(entries.begin(),
+                  entries.end(),
+                  [](const ::mesh::PeerPublicKey& left,
+                     const ::mesh::PeerPublicKey& right)
+                  {
+                      return left.updated_at_ms < right.updated_at_ms;
+                  });
+        const std::size_t drop_count = entries.size() - kMaxPkiNodes;
+        for (std::size_t index = 0; index < drop_count; ++index)
+        {
+            node_public_keys_.erase(entries[index].node_id.value);
+            node_key_last_seen_.erase(entries[index].node_id.value);
+        }
+        entries.erase(entries.begin(),
+                      entries.begin() +
+                          static_cast<std::ptrdiff_t>(drop_count));
+    }
+
+    ::platform::linux_runtime::mesh::LinuxSqlitePeerKeyStore store;
+    (void)store.replaceAll(entries.empty() ? nullptr : entries.data(), entries.size());
+}
+
+void LinuxRawLoraMeshAdapter::forgetPkiNodeKey(::chat::NodeId node_id)
+{
+    if (node_public_keys_.erase(node_id) > 0)
+    {
+        node_key_last_seen_.erase(node_id);
+        savePkiKeysToStore();
+    }
+}
+
+void LinuxRawLoraMeshAdapter::touchPkiNodeKey(::chat::NodeId node_id)
+{
+    node_key_last_seen_[node_id] = now_seconds();
+}
+
+bool LinuxRawLoraMeshAdapter::encryptPkiPayload(
+    ::chat::NodeId dest,
+    ::chat::MessageId packet_id,
+    const std::uint8_t* plain,
+    std::size_t plain_len,
+    std::uint8_t* out_cipher,
+    std::size_t* out_cipher_len)
+{
+    if (!pki_ready_ || plain == nullptr || plain_len == 0 ||
+        out_cipher == nullptr || out_cipher_len == nullptr)
+    {
+        return false;
+    }
+    const auto key_it = node_public_keys_.find(dest);
+    if (key_it == node_public_keys_.end())
+    {
+        return false;
+    }
+
+    const std::size_t auth_len = 8;
+    const std::size_t needed = plain_len + auth_len + sizeof(std::uint32_t);
+    if (*out_cipher_len < needed)
+    {
+        *out_cipher_len = needed;
+        return false;
+    }
+
+    std::array<std::uint8_t, 32> shared{};
+    if (!derive_x25519_shared_key(key_it->second.data(),
+                                  pki_private_key_.data(),
+                                  shared.data()))
+    {
+        return false;
+    }
+    ::chat::meshtastic::hashSharedKey(shared.data(), shared.size());
+    const std::uint32_t extra_nonce = random_u32();
+    std::uint8_t nonce[::chat::meshtastic::kPkiNonceSize] = {};
+    ::chat::meshtastic::initPkiNonce(self_node_id_,
+                                     packet_id,
+                                     extra_nonce,
+                                     nonce);
+
+    std::uint8_t auth[16] = {};
+    if (!::chat::meshtastic::encryptPkiAesCcm(shared.data(),
+                                              shared.size(),
+                                              nonce,
+                                              auth_len,
+                                              nullptr,
+                                              0,
+                                              plain,
+                                              plain_len,
+                                              out_cipher,
+                                              auth))
+    {
+        return false;
+    }
+
+    std::memcpy(out_cipher + plain_len, auth, auth_len);
+    std::memcpy(out_cipher + plain_len + auth_len,
+                &extra_nonce,
+                sizeof(extra_nonce));
+    *out_cipher_len = needed;
+    touchPkiNodeKey(dest);
+    return true;
+}
+
+bool LinuxRawLoraMeshAdapter::decryptPkiPayload(
+    ::chat::NodeId from,
+    ::chat::MessageId packet_id,
+    const std::uint8_t* cipher,
+    std::size_t cipher_len,
+    std::uint8_t* out_plain,
+    std::size_t* out_plain_len)
+{
+    if (!pki_ready_ || cipher == nullptr || cipher_len <= 12 ||
+        out_plain == nullptr || out_plain_len == nullptr)
+    {
+        return false;
+    }
+    const auto key_it = node_public_keys_.find(from);
+    if (key_it == node_public_keys_.end())
+    {
+        (void)sendMeshtasticNodeInfoTo(from, true, ::chat::ChannelId::PRIMARY);
+        return false;
+    }
+
+    const std::size_t auth_len = 8;
+    const std::size_t plain_len = cipher_len - auth_len - sizeof(std::uint32_t);
+    if (*out_plain_len < plain_len)
+    {
+        *out_plain_len = plain_len;
+        return false;
+    }
+
+    std::array<std::uint8_t, 32> shared{};
+    if (!derive_x25519_shared_key(key_it->second.data(),
+                                  pki_private_key_.data(),
+                                  shared.data()))
+    {
+        return false;
+    }
+    ::chat::meshtastic::hashSharedKey(shared.data(), shared.size());
+
+    const std::uint8_t* auth = cipher + plain_len;
+    std::uint32_t extra_nonce = 0;
+    std::memcpy(&extra_nonce, auth + auth_len, sizeof(extra_nonce));
+    std::uint8_t nonce[::chat::meshtastic::kPkiNonceSize] = {};
+    ::chat::meshtastic::initPkiNonce(from, packet_id, extra_nonce, nonce);
+
+    if (!::chat::meshtastic::decryptPkiAesCcm(shared.data(),
+                                              shared.size(),
+                                              nonce,
+                                              auth_len,
+                                              cipher,
+                                              plain_len,
+                                              nullptr,
+                                              0,
+                                              auth,
+                                              out_plain))
+    {
+        return false;
+    }
+
+    *out_plain_len = plain_len;
+    touchPkiNodeKey(from);
+    return true;
+}
+
+void LinuxRawLoraMeshAdapter::updateKeyVerificationState()
+{
+    if (kv_state_ == KeyVerificationState::Idle)
+    {
+        return;
+    }
+
+    const std::uint32_t now_ms = ::sys::millis_now();
+    if (kv_nonce_ms_ != 0 &&
+        static_cast<std::uint32_t>(now_ms - kv_nonce_ms_) >
+            kKeyVerificationTimeoutMs)
+    {
+        resetKeyVerificationState();
+        return;
+    }
+    kv_nonce_ms_ = now_ms;
+}
+
+void LinuxRawLoraMeshAdapter::resetKeyVerificationState()
+{
+    kv_state_ = KeyVerificationState::Idle;
+    kv_nonce_ = 0;
+    kv_nonce_ms_ = 0;
+    kv_security_number_ = 0;
+    kv_remote_node_ = 0;
+    kv_hash1_.fill(0);
+    kv_hash2_.fill(0);
+}
+
+void LinuxRawLoraMeshAdapter::buildVerificationCode(char* out,
+                                                    std::size_t out_len) const
+{
+    if (out == nullptr || out_len == 0)
+    {
+        return;
+    }
+    if (out_len < 10)
+    {
+        out[0] = '\0';
+        return;
+    }
+    for (int index = 0; index < 4; ++index)
+    {
+        out[index] = static_cast<char>((kv_hash1_[index] >> 2) + 48);
+    }
+    out[4] = ' ';
+    for (int index = 0; index < 4; ++index)
+    {
+        out[index + 5] =
+            static_cast<char>((kv_hash1_[index + 4] >> 2) + 48);
+    }
+    out[9] = '\0';
+}
+
+bool LinuxRawLoraMeshAdapter::handleKeyVerificationInit(
+    const ::chat::meshtastic::PacketHeaderWire& header,
+    const meshtastic_KeyVerification& kv)
+{
+    updateKeyVerificationState();
+    if (kv_state_ != KeyVerificationState::Idle ||
+        header.to != self_node_id_ || header.to == kBroadcastNodeId ||
+        !pki_ready_)
+    {
+        return false;
+    }
+    const auto key_it = node_public_keys_.find(header.from);
+    if (key_it == node_public_keys_.end())
+    {
+        return false;
+    }
+
+    kv_nonce_ = kv.nonce;
+    kv_nonce_ms_ = ::sys::millis_now();
+    kv_remote_node_ = header.from;
+    kv_security_number_ = random_security_number();
+    if (!::chat::meshtastic::computeKeyVerificationHashes(
+            kv_security_number_,
+            kv_nonce_,
+            kv_remote_node_,
+            self_node_id_,
+            key_it->second.data(),
+            key_it->second.size(),
+            pki_public_key_.data(),
+            pki_public_key_.size(),
+            kv_hash1_.data(),
+            kv_hash2_.data()))
+    {
+        resetKeyVerificationState();
+        return false;
+    }
+
+    meshtastic_KeyVerification reply = meshtastic_KeyVerification_init_zero;
+    reply.nonce = kv_nonce_;
+    reply.hash1.size = 0;
+    reply.hash2.size = static_cast<pb_size_t>(kv_hash2_.size());
+    std::memcpy(reply.hash2.bytes, kv_hash2_.data(), kv_hash2_.size());
+
+    if (!sendKeyVerificationPacket(kv_remote_node_, reply, false))
+    {
+        resetKeyVerificationState();
+        return false;
+    }
+
+    kv_state_ = KeyVerificationState::ReceiverAwaitingHash1;
+    ::sys::EventBus::publish(
+        new ::sys::KeyVerificationNumberInformEvent(kv_remote_node_,
+                                                    kv_nonce_,
+                                                    kv_security_number_),
+        0);
+    return true;
+}
+
+bool LinuxRawLoraMeshAdapter::handleKeyVerificationReply(
+    const ::chat::meshtastic::PacketHeaderWire& header,
+    const meshtastic_KeyVerification& kv)
+{
+    updateKeyVerificationState();
+    if (kv_state_ != KeyVerificationState::SenderInitiated ||
+        header.to != self_node_id_ || header.to == kBroadcastNodeId ||
+        kv.nonce != kv_nonce_ || header.from != kv_remote_node_ ||
+        kv.hash1.size != 0 || kv.hash2.size != kv_hash2_.size())
+    {
+        return false;
+    }
+
+    std::memcpy(kv_hash2_.data(), kv.hash2.bytes, kv_hash2_.size());
+    kv_state_ = KeyVerificationState::SenderAwaitingNumber;
+    kv_nonce_ms_ = ::sys::millis_now();
+    ::sys::EventBus::publish(
+        new ::sys::KeyVerificationNumberRequestEvent(kv_remote_node_,
+                                                     kv_nonce_),
+        0);
+    return true;
+}
+
+bool LinuxRawLoraMeshAdapter::processKeyVerificationNumber(
+    ::chat::NodeId remote_node,
+    std::uint64_t nonce,
+    std::uint32_t number)
+{
+    updateKeyVerificationState();
+    if (kv_state_ != KeyVerificationState::SenderAwaitingNumber ||
+        kv_remote_node_ != remote_node || kv_nonce_ != nonce)
+    {
+        return false;
+    }
+    const auto key_it = node_public_keys_.find(remote_node);
+    if (key_it == node_public_keys_.end())
+    {
+        resetKeyVerificationState();
+        return false;
+    }
+
+    std::array<std::uint8_t, 32> scratch_hash{};
+    kv_security_number_ = number;
+    if (!::chat::meshtastic::computeKeyVerificationHashes(
+            kv_security_number_,
+            kv_nonce_,
+            self_node_id_,
+            kv_remote_node_,
+            pki_public_key_.data(),
+            pki_public_key_.size(),
+            key_it->second.data(),
+            key_it->second.size(),
+            kv_hash1_.data(),
+            scratch_hash.data()))
+    {
+        return false;
+    }
+    if (std::memcmp(scratch_hash.data(), kv_hash2_.data(), kv_hash2_.size()) !=
+        0)
+    {
+        return false;
+    }
+
+    meshtastic_KeyVerification response = meshtastic_KeyVerification_init_zero;
+    response.nonce = kv_nonce_;
+    response.hash1.size = static_cast<pb_size_t>(kv_hash1_.size());
+    std::memcpy(response.hash1.bytes, kv_hash1_.data(), kv_hash1_.size());
+    response.hash2.size = 0;
+    if (!sendKeyVerificationPacket(kv_remote_node_, response, true))
+    {
+        return false;
+    }
+
+    kv_state_ = KeyVerificationState::SenderAwaitingUser;
+    kv_nonce_ms_ = ::sys::millis_now();
+
+    char code[12] = {};
+    buildVerificationCode(code, sizeof(code));
+    ::sys::EventBus::publish(
+        new ::sys::KeyVerificationFinalEvent(kv_remote_node_,
+                                             kv_nonce_,
+                                             true,
+                                             code),
+        0);
+    return true;
+}
+
+bool LinuxRawLoraMeshAdapter::handleKeyVerificationFinal(
+    const ::chat::meshtastic::PacketHeaderWire& header,
+    const meshtastic_KeyVerification& kv)
+{
+    updateKeyVerificationState();
+    if (kv_state_ != KeyVerificationState::ReceiverAwaitingHash1 ||
+        header.to != self_node_id_ || header.to == kBroadcastNodeId ||
+        kv.nonce != kv_nonce_ || header.from != kv_remote_node_ ||
+        kv.hash1.size != kv_hash1_.size() || kv.hash2.size != 0)
+    {
+        return false;
+    }
+    if (std::memcmp(kv.hash1.bytes, kv_hash1_.data(), kv_hash1_.size()) != 0)
+    {
+        return false;
+    }
+
+    kv_state_ = KeyVerificationState::ReceiverAwaitingUser;
+    kv_nonce_ms_ = ::sys::millis_now();
+
+    char code[12] = {};
+    buildVerificationCode(code, sizeof(code));
+    ::sys::EventBus::publish(
+        new ::sys::KeyVerificationFinalEvent(kv_remote_node_,
+                                             kv_nonce_,
+                                             false,
+                                             code),
+        0);
+    return true;
+}
+
+bool LinuxRawLoraMeshAdapter::sendKeyVerificationPacket(
+    ::chat::NodeId dest,
+    const meshtastic_KeyVerification& kv,
+    bool want_response)
+{
+    if (!tx_enabled_ || !ensureRadioReady() || !pki_ready_ ||
+        node_public_keys_.find(dest) == node_public_keys_.end())
+    {
+        return false;
+    }
+
+    std::uint8_t kv_buf[96] = {};
+    pb_ostream_t kv_stream = pb_ostream_from_buffer(kv_buf, sizeof(kv_buf));
+    if (!pb_encode(&kv_stream, meshtastic_KeyVerification_fields, &kv))
+    {
+        return false;
+    }
+
+    std::uint8_t data_buf[160] = {};
+    std::size_t data_size = sizeof(data_buf);
+    if (!::chat::meshtastic::encodeAppData(
+            meshtastic_PortNum_KEY_VERIFICATION_APP,
+            kv_buf,
+            kv_stream.bytes_written,
+            want_response,
+            data_buf,
+            &data_size))
+    {
+        return false;
+    }
+
+    const ::chat::MessageId msg_id = nextMessageId();
+    std::uint8_t pki_buf[256] = {};
+    std::size_t pki_len = sizeof(pki_buf);
+    if (!encryptPkiPayload(dest, msg_id, data_buf, data_size, pki_buf, &pki_len))
+    {
+        return false;
+    }
+
+    std::uint8_t wire[255] = {};
+    std::size_t wire_size = sizeof(wire);
+    if (!build_meshtastic_wire_packet(pki_buf,
+                                      pki_len,
+                                      self_node_id_,
+                                      msg_id,
+                                      dest,
+                                      0,
+                                      config_.hop_limit,
+                                      false,
+                                      nullptr,
+                                      0,
+                                      wire,
+                                      &wire_size))
+    {
+        return false;
+    }
+
+    const bool ok = radio_.transmit(wire, wire_size);
+    if (ok)
+    {
+        append_lora_system_log(
+            "Meshtastic key verification TX",
+            "Sent key verification stage to " + node_hex(dest) +
+                " id " + node_hex(msg_id) + ".");
+    }
+    return ok;
+}
+
+bool LinuxRawLoraMeshAdapter::sendRoutingAck(::chat::NodeId dest,
+                                             ::chat::MessageId request_id,
+                                             std::uint8_t channel_hash,
+                                             const std::uint8_t* psk,
+                                             std::size_t psk_len)
+{
+    if (!tx_enabled_ || !ensureRadioReady() || dest == 0 ||
+        dest == kBroadcastNodeId || request_id == 0)
+    {
+        return false;
+    }
+
+    meshtastic_Routing routing = meshtastic_Routing_init_default;
+    routing.which_variant = meshtastic_Routing_error_reason_tag;
+    routing.error_reason = meshtastic_Routing_Error_NONE;
+
+    std::uint8_t routing_buf[64] = {};
+    pb_ostream_t routing_stream =
+        pb_ostream_from_buffer(routing_buf, sizeof(routing_buf));
+    if (!pb_encode(&routing_stream, meshtastic_Routing_fields, &routing))
+    {
+        return false;
+    }
+
+    meshtastic_Data data = meshtastic_Data_init_default;
+    data.portnum = meshtastic_PortNum_ROUTING_APP;
+    data.dest = dest;
+    data.source = self_node_id_;
+    data.request_id = request_id;
+    data.want_response = false;
+    data.has_bitfield = true;
+    data.bitfield = 0;
+    data.payload.size = routing_stream.bytes_written;
+    if (data.payload.size > sizeof(data.payload.bytes))
+    {
+        return false;
+    }
+    std::memcpy(data.payload.bytes, routing_buf, data.payload.size);
+
+    std::uint8_t data_buf[128] = {};
+    pb_ostream_t data_stream =
+        pb_ostream_from_buffer(data_buf, sizeof(data_buf));
+    if (!pb_encode(&data_stream, meshtastic_Data_fields, &data))
+    {
+        return false;
+    }
+
+    const ::chat::MessageId msg_id = nextMessageId();
+    const std::uint8_t* payload = data_buf;
+    std::size_t payload_len = data_stream.bytes_written;
+    std::uint8_t pki_buf[256] = {};
+    if (channel_hash == 0)
+    {
+        std::size_t pki_len = sizeof(pki_buf);
+        if (!encryptPkiPayload(dest,
+                               msg_id,
+                               data_buf,
+                               data_stream.bytes_written,
+                               pki_buf,
+                               &pki_len))
+        {
+            return false;
+        }
+        payload = pki_buf;
+        payload_len = pki_len;
+        psk = nullptr;
+        psk_len = 0;
+    }
+
+    std::uint8_t wire[255] = {};
+    std::size_t wire_size = sizeof(wire);
+    if (!build_meshtastic_wire_packet(payload,
+                                      payload_len,
+                                      self_node_id_,
+                                      msg_id,
+                                      dest,
+                                      channel_hash,
+                                      config_.hop_limit,
+                                      false,
+                                      psk,
+                                      psk_len,
+                                      wire,
+                                      &wire_size))
+    {
+        return false;
+    }
+
+    const bool ok = radio_.transmit(wire, wire_size);
+    if (ok)
+    {
+        append_lora_system_log(
+            "Meshtastic routing ACK TX",
+            "ACK to " + node_hex(dest) + " for " + node_hex(request_id) +
+                " via channel " + hex_u8(channel_hash) + ".");
+    }
+    return ok;
+}
+
 bool LinuxRawLoraMeshAdapter::sendFrame(PacketKind kind,
                                         ::chat::ChannelId channel,
                                         ::chat::NodeId dest,
@@ -1747,7 +2743,11 @@ bool LinuxRawLoraMeshAdapter::parseMeshtasticPacket(
 
     const MeshtasticAirPlan plan = build_meshtastic_air_plan(config_);
     ::chat::ChannelId channel = ::chat::ChannelId::PRIMARY;
-    if (!channel_from_hash(plan, header.channel, &channel))
+    const bool matches_channel = channel_from_hash(plan, header.channel, &channel);
+    const bool can_try_pki =
+        header.to == self_node_id_ && header.to != kBroadcastNodeId &&
+        payload_size > 12 && (header.channel == 0 || !matches_channel);
+    if (!matches_channel && !can_try_pki)
     {
         append_lora_system_log(
             "Meshtastic RX unknown channel",
@@ -1811,10 +2811,42 @@ bool LinuxRawLoraMeshAdapter::parseMeshtasticPacket(
     }
 
     std::size_t psk_len = 0;
-    const std::uint8_t* psk = psk_for_channel(plan, channel, &psk_len);
+    const std::uint8_t* psk =
+        matches_channel ? psk_for_channel(plan, channel, &psk_len) : nullptr;
     std::uint8_t plaintext[256] = {};
     std::size_t plaintext_len = sizeof(plaintext);
-    if (psk != nullptr && psk_len > 0)
+    bool used_pki_transport = false;
+    if (can_try_pki)
+    {
+        if (!decryptPkiPayload(header.from,
+                               header.id,
+                               payload,
+                               payload_size,
+                               plaintext,
+                               &plaintext_len))
+        {
+            append_lora_system_log(
+                "Meshtastic PKI RX decrypt failed",
+                "Direct PKI payload could not be decoded; requesting fresh NodeInfo from " +
+                    node_hex(header.from) + ".",
+                {{
+                    .kind =
+                        ::platform::linux_runtime::PacketLogSegmentKind::Error,
+                    .label = "pki",
+                    .text = "decrypt_failed",
+                }});
+            forgetPkiNodeKey(header.from);
+            (void)sendMeshtasticNodeInfoTo(header.from,
+                                           true,
+                                           ::chat::ChannelId::PRIMARY);
+            return true;
+        }
+        used_pki_transport = true;
+        channel = ::chat::ChannelId::PRIMARY;
+        psk = nullptr;
+        psk_len = 0;
+    }
+    else if (psk != nullptr && psk_len > 0)
     {
         if (!meshtastic_crypto_available())
         {
@@ -1884,10 +2916,26 @@ bool LinuxRawLoraMeshAdapter::parseMeshtasticPacket(
     }
 
     const ::chat::RxMeta rx_meta = make_meshtastic_rx_meta(header, packet);
-    const bool encrypted = psk != nullptr && psk_len > 0;
+    const bool encrypted =
+        used_pki_transport || (psk != nullptr && psk_len > 0);
     const auto channel_index = static_cast<std::uint8_t>(channel);
     const bool via_mqtt_packet =
         (header.flags & ::chat::meshtastic::PACKET_FLAGS_VIA_MQTT_MASK) != 0;
+    const bool decoded_want_response =
+        decoded.want_response ||
+        (decoded.has_bitfield &&
+         ((decoded.bitfield & kBitfieldWantResponseMask) != 0));
+    const bool want_ack_flag =
+        (header.flags &
+         ::chat::meshtastic::PACKET_FLAGS_WANT_ACK_MASK) != 0;
+    if (want_ack_flag && header.to == self_node_id_)
+    {
+        (void)sendRoutingAck(header.from,
+                             header.id,
+                             header.channel,
+                             psk,
+                             psk_len);
+    }
 
     if (decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP ||
         decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP)
@@ -1977,6 +3025,12 @@ bool LinuxRawLoraMeshAdapter::parseMeshtasticPacket(
         ::chat::meshtastic::DecodedNodePayload node{};
         if (::chat::meshtastic::decodeNodeInfoPayload(decoded, context, &node))
         {
+            if (node.has_public_key)
+            {
+                savePkiNodeKey(node.node_id,
+                               node.public_key.data(),
+                               node.public_key.size());
+            }
             ::sys::EventBus::publish(
                 new ::sys::NodeInfoUpdateEvent(
                     node.node_id,
@@ -1995,7 +3049,7 @@ bool LinuxRawLoraMeshAdapter::parseMeshtasticPacket(
                     node.via_mqtt,
                     node.is_ignored,
                     node.has_public_key,
-                    node.key_manually_verified,
+                    false,
                     node.has_device_metrics,
                     node.has_device_metrics ? &node.device_metrics : nullptr),
                 0);
@@ -2064,6 +3118,24 @@ bool LinuxRawLoraMeshAdapter::parseMeshtasticPacket(
                                  (node.has_device_metrics ? "metrics" : ""),
                      }});
             }
+            if (decoded_want_response &&
+                (header.to == self_node_id_ || header.to == kBroadcastNodeId))
+            {
+                const std::uint32_t now_ms = ::sys::millis_now();
+                bool allow_reply = true;
+                const auto last_it = nodeinfo_last_reply_ms_.find(header.from);
+                if (last_it != nodeinfo_last_reply_ms_.end() &&
+                    static_cast<std::uint32_t>(now_ms - last_it->second) <
+                        kNodeInfoReplySuppressMs)
+                {
+                    allow_reply = false;
+                }
+                nodeinfo_last_reply_ms_[header.from] = now_ms;
+                if (allow_reply)
+                {
+                    (void)sendMeshtasticNodeInfoTo(header.from, false, channel);
+                }
+            }
         }
         else
         {
@@ -2173,16 +3245,60 @@ bool LinuxRawLoraMeshAdapter::parseMeshtasticPacket(
         return true;
     }
 
+    if (decoded.portnum == meshtastic_PortNum_KEY_VERIFICATION_APP &&
+        decoded.payload.size > 0)
+    {
+        meshtastic_KeyVerification kv = meshtastic_KeyVerification_init_default;
+        bool handled = false;
+        if (::chat::meshtastic::decodeKeyVerificationMessage(plaintext,
+                                                             plaintext_len,
+                                                             &kv) &&
+            header.channel == 0)
+        {
+            if (kv.hash1.size == 0 && kv.hash2.size == 0)
+            {
+                handled = handleKeyVerificationInit(header, kv);
+            }
+            else if (kv.hash1.size == 0 && kv.hash2.size == 32)
+            {
+                handled = handleKeyVerificationReply(header, kv);
+            }
+            else if (kv.hash1.size == 32 && kv.hash2.size == 0)
+            {
+                handled = handleKeyVerificationFinal(header, kv);
+            }
+        }
+
+        append_lora_system_log(
+            handled ? "Meshtastic key verification RX"
+                    : "Meshtastic key verification ignored",
+            "From " + node_hex(header.from) + " id " + node_hex(header.id) +
+                " nonce " + std::to_string(kv.nonce) + ".",
+            {{
+                 .kind = ::platform::linux_runtime::PacketLogSegmentKind::Meta,
+                 .label = "stage",
+                 .text = ::chat::meshtastic::keyVerificationStage(kv),
+             },
+             {
+                 .kind = ::platform::linux_runtime::PacketLogSegmentKind::Meta,
+                 .label = "signal",
+                 .text = packet_signal_text(packet),
+             }});
+        return true;
+    }
+
     ::chat::MeshIncomingData app{};
     if (::chat::meshtastic::decodeAppPayload(decoded, &app))
     {
         app.from = header.from;
         app.to = header.to;
         app.packet_id = header.id;
+        app.request_id = decoded.request_id;
         app.channel = channel;
         app.channel_hash = header.channel;
         app.hop_limit =
             header.flags & ::chat::meshtastic::PACKET_FLAGS_HOP_LIMIT_MASK;
+        app.want_response = decoded_want_response;
         app.rx_meta = rx_meta;
         incoming_data_.push_back(std::move(app));
     }
diff --git a/platform/linux/common/src/mesh/linux_mesh_runtime_shell.cpp b/platform/linux/common/src/mesh/linux_mesh_runtime_shell.cpp
new file mode 100644
index 00000000..734702ae
--- /dev/null
+++ b/platform/linux/common/src/mesh/linux_mesh_runtime_shell.cpp
@@ -0,0 +1,37 @@
+#include "platform/linux/mesh/linux_mesh_runtime_shell.h"
+
+namespace platform::linux_runtime::mesh
+{
+
+LinuxMeshRuntimeShell::LinuxMeshRuntimeShell(::mesh::MeshSession& session)
+    : session_(session)
+{
+}
+
+bool LinuxMeshRuntimeShell::start(const ::mesh::MeshRuntimeConfig& config)
+{
+    return session_.start(config);
+}
+
+void LinuxMeshRuntimeShell::stop()
+{
+    session_.stop();
+}
+
+void LinuxMeshRuntimeShell::tick()
+{
+    session_.tick();
+}
+
+::mesh::SendResult LinuxMeshRuntimeShell::sendDirect(
+    const ::mesh::DirectMessageCommand& command)
+{
+    return session_.sendDirect(command);
+}
+
+::mesh::MeshSessionState LinuxMeshRuntimeShell::state() const
+{
+    return session_.state();
+}
+
+} // namespace platform::linux_runtime::mesh
diff --git a/platform/linux/common/src/mesh/linux_sqlite_mesh_identity_store.cpp b/platform/linux/common/src/mesh/linux_sqlite_mesh_identity_store.cpp
new file mode 100644
index 00000000..f0e48e0f
--- /dev/null
+++ b/platform/linux/common/src/mesh/linux_sqlite_mesh_identity_store.cpp
@@ -0,0 +1,347 @@
+#include "platform/linux/mesh/linux_sqlite_mesh_identity_store.h"
+
+#include "platform/ui/settings_store.h"
+
+#include <algorithm>
+#include <cstring>
+
+namespace platform::linux_runtime::mesh
+{
+namespace
+{
+
+constexpr std::size_t kPublicKeySize = 32;
+constexpr std::size_t kPeerKeyEntryV2Size = 40;
+constexpr std::size_t kPeerKeyEntryV1Size = 36;
+
+bool isZero(const std::uint8_t* data, std::size_t size)
+{
+    if (!data)
+    {
+        return true;
+    }
+    for (std::size_t index = 0; index < size; ++index)
+    {
+        if (data[index] != 0)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+std::uint32_t readU32(const std::uint8_t* data)
+{
+    return static_cast<std::uint32_t>(data[0]) |
+           (static_cast<std::uint32_t>(data[1]) << 8) |
+           (static_cast<std::uint32_t>(data[2]) << 16) |
+           (static_cast<std::uint32_t>(data[3]) << 24);
+}
+
+void writeU32(std::uint8_t* data, std::uint32_t value)
+{
+    data[0] = static_cast<std::uint8_t>(value & 0xFFU);
+    data[1] = static_cast<std::uint8_t>((value >> 8) & 0xFFU);
+    data[2] = static_cast<std::uint8_t>((value >> 16) & 0xFFU);
+    data[3] = static_cast<std::uint8_t>((value >> 24) & 0xFFU);
+}
+
+bool validIdentity(const ::mesh::LocalIdentity& identity)
+{
+    return identity.valid &&
+           !isZero(identity.private_key, sizeof(identity.private_key));
+}
+
+} // namespace
+
+LinuxSqliteLocalIdentityStore::LinuxSqliteLocalIdentityStore()
+    : options_(Options{})
+{
+}
+
+LinuxSqliteLocalIdentityStore::LinuxSqliteLocalIdentityStore(const Options& options)
+    : options_(options)
+{
+}
+
+::mesh::StoreResult LinuxSqliteLocalIdentityStore::load(::mesh::LocalIdentity& out)
+{
+    out = ::mesh::LocalIdentity{};
+
+    std::vector<std::uint8_t> public_blob;
+    std::vector<std::uint8_t> private_blob;
+    const bool have_public =
+        ::platform::ui::settings_store::get_blob(options_.ns, options_.public_key, public_blob);
+    const bool have_private =
+        ::platform::ui::settings_store::get_blob(options_.ns, options_.private_key, private_blob);
+    if (!have_public && !have_private)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+    }
+    if (!have_public || !have_private ||
+        public_blob.size() != sizeof(out.public_key) ||
+        private_blob.size() != sizeof(out.private_key))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+
+    std::memcpy(out.public_key, public_blob.data(), sizeof(out.public_key));
+    std::memcpy(out.private_key, private_blob.data(), sizeof(out.private_key));
+    out.valid = !isZero(out.private_key, sizeof(out.private_key));
+    if (!out.valid)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult LinuxSqliteLocalIdentityStore::save(
+    const ::mesh::LocalIdentity& identity)
+{
+    if (!validIdentity(identity))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    const bool public_ok = ::platform::ui::settings_store::put_blob(
+        options_.ns,
+        options_.public_key,
+        identity.public_key,
+        sizeof(identity.public_key));
+    const bool private_ok = ::platform::ui::settings_store::put_blob(
+        options_.ns,
+        options_.private_key,
+        identity.private_key,
+        sizeof(identity.private_key));
+    if (!public_ok || !private_ok)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::IoError);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult LinuxSqliteLocalIdentityStore::clear()
+{
+    const char* keys[] = {options_.public_key, options_.private_key};
+    ::platform::ui::settings_store::remove_keys(options_.ns, keys, 2);
+    return ::mesh::StoreResult::success();
+}
+
+LinuxSqlitePeerKeyStore::LinuxSqlitePeerKeyStore()
+    : options_(Options{})
+{
+}
+
+LinuxSqlitePeerKeyStore::LinuxSqlitePeerKeyStore(const Options& options)
+    : options_(options)
+{
+}
+
+::mesh::StoreResult LinuxSqlitePeerKeyStore::get(::mesh::NodeId node_id,
+                                                 ::mesh::PeerPublicKey& out)
+{
+    if (!node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok)
+    {
+        return loaded;
+    }
+
+    for (const auto& key : keys)
+    {
+        if (key.node_id == node_id)
+        {
+            out = key;
+            return ::mesh::StoreResult::success();
+        }
+    }
+    return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+}
+
+::mesh::StoreResult LinuxSqlitePeerKeyStore::put(const ::mesh::PeerPublicKey& key)
+{
+    if (!key.node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok && loaded.failure != ::mesh::StoreFailure::NotFound)
+    {
+        return loaded;
+    }
+
+    bool replaced = false;
+    for (auto& existing : keys)
+    {
+        if (existing.node_id == key.node_id)
+        {
+            existing = key;
+            replaced = true;
+            break;
+        }
+    }
+    if (!replaced)
+    {
+        keys.push_back(key);
+    }
+    return saveAll(keys);
+}
+
+::mesh::StoreResult LinuxSqlitePeerKeyStore::remove(::mesh::NodeId node_id)
+{
+    if (!node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok)
+    {
+        return loaded.failure == ::mesh::StoreFailure::NotFound
+                   ? ::mesh::StoreResult::success()
+                   : loaded;
+    }
+
+    keys.erase(std::remove_if(keys.begin(),
+                              keys.end(),
+                              [node_id](const ::mesh::PeerPublicKey& key)
+                              {
+                                  return key.node_id == node_id;
+                              }),
+               keys.end());
+    return saveAll(keys);
+}
+
+::mesh::StoreResult LinuxSqlitePeerKeyStore::clear()
+{
+    const char* keys[] = {options_.key};
+    ::platform::ui::settings_store::remove_keys(options_.ns, keys, 1);
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult LinuxSqlitePeerKeyStore::loadAll(
+    std::vector<::mesh::PeerPublicKey>& out)
+{
+    out.clear();
+
+    std::vector<std::uint8_t> blob;
+    if (!::platform::ui::settings_store::get_blob(options_.ns, options_.key, blob))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+    }
+    if (blob.empty())
+    {
+        return ::mesh::StoreResult::success();
+    }
+
+    const bool is_v2 = (blob.size() % kPeerKeyEntryV2Size) == 0;
+    const bool is_v1 = !is_v2 && (blob.size() % kPeerKeyEntryV1Size) == 0;
+    if (!is_v2 && !is_v1)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+
+    const std::size_t entry_size = is_v2 ? kPeerKeyEntryV2Size : kPeerKeyEntryV1Size;
+    std::size_t count = blob.size() / entry_size;
+    if (count > options_.max_keys)
+    {
+        count = options_.max_keys;
+    }
+    out.reserve(count);
+    for (std::size_t index = 0; index < count; ++index)
+    {
+        const std::uint8_t* entry = blob.data() + (index * entry_size);
+        const std::uint32_t node_id = readU32(entry);
+        const std::uint8_t* public_key = is_v2 ? entry + 8 : entry + 4;
+        if (node_id == 0 || isZero(public_key, kPublicKeySize))
+        {
+            continue;
+        }
+
+        ::mesh::PeerPublicKey key{};
+        key.node_id = ::mesh::NodeId{node_id};
+        key.updated_at_ms = is_v2 ? readU32(entry + 4) : 0;
+        key.verified = false;
+        std::memcpy(key.public_key, public_key, sizeof(key.public_key));
+        out.push_back(key);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult LinuxSqlitePeerKeyStore::replaceAll(
+    const ::mesh::PeerPublicKey* keys,
+    std::size_t count)
+{
+    if (count > 0 && !keys)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> copy;
+    copy.reserve(count);
+    for (std::size_t index = 0; index < count; ++index)
+    {
+        if (!keys[index].node_id.isValidUnicast())
+        {
+            return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+        }
+        copy.push_back(keys[index]);
+    }
+    return saveAll(copy);
+}
+
+::mesh::StoreResult LinuxSqlitePeerKeyStore::saveAll(
+    std::vector<::mesh::PeerPublicKey>& keys)
+{
+    if (keys.empty())
+    {
+        return clear();
+    }
+
+    if (keys.size() > options_.max_keys)
+    {
+        std::sort(keys.begin(),
+                  keys.end(),
+                  [](const ::mesh::PeerPublicKey& left,
+                     const ::mesh::PeerPublicKey& right)
+                  {
+                      return left.updated_at_ms < right.updated_at_ms;
+                  });
+        keys.erase(keys.begin(),
+                   keys.begin() + static_cast<std::ptrdiff_t>(keys.size() - options_.max_keys));
+    }
+
+    std::vector<std::uint8_t> blob(keys.size() * kPeerKeyEntryV2Size);
+    for (std::size_t index = 0; index < keys.size(); ++index)
+    {
+        if (!keys[index].node_id.isValidUnicast())
+        {
+            return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+        }
+        std::uint8_t* out = blob.data() + (index * kPeerKeyEntryV2Size);
+        writeU32(out, keys[index].node_id.value);
+        writeU32(out + 4, keys[index].updated_at_ms);
+        std::memcpy(out + 8, keys[index].public_key, kPublicKeySize);
+    }
+
+    const bool persisted = ::platform::ui::settings_store::put_blob(
+        options_.ns,
+        options_.key,
+        blob.data(),
+        blob.size());
+    if (!persisted)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::IoError);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+} // namespace platform::linux_runtime::mesh
diff --git a/platform/linux/common/src/platform/ui/settings_backup_runtime.cpp b/platform/linux/common/src/platform/ui/settings_backup_runtime.cpp
new file mode 100644
index 00000000..972a0867
--- /dev/null
+++ b/platform/linux/common/src/platform/ui/settings_backup_runtime.cpp
@@ -0,0 +1,36 @@
+#include "platform/ui/settings_backup_runtime.h"
+
+#include <cstdio>
+
+namespace platform::ui::settings_backup
+{
+
+bool is_supported()
+{
+    return false;
+}
+
+Status status()
+{
+    Status out{};
+    out.supported = false;
+    std::snprintf(out.message, sizeof(out.message), "%s", "Settings backup unsupported on Linux");
+    return out;
+}
+
+bool backup()
+{
+    return false;
+}
+
+bool restore()
+{
+    return false;
+}
+
+bool remove()
+{
+    return false;
+}
+
+} // namespace platform::ui::settings_backup
diff --git a/platform/linux/common/src/ui/widgets/map/map_tiles.cpp b/platform/linux/common/src/ui/widgets/map/map_tiles.cpp
index 2ac2cc33..98cb1559 100644
--- a/platform/linux/common/src/ui/widgets/map/map_tiles.cpp
+++ b/platform/linux/common/src/ui/widgets/map/map_tiles.cpp
@@ -7,6 +7,8 @@
 
 #include "lvgl.h"
 
+#include "ui_map_runtime/map_tiles/filesystem_map_tile_source.h"
+
 #include <algorithm>
 #include <chrono>
 #include <cmath>
@@ -30,9 +32,42 @@ bool g_missing_tile_notice_pending = false;
 bool g_missing_tile_notice_emitted = false;
 uint8_t g_missing_tile_notice_source = 0;
 
-const char* base_source_dir(uint8_t map_source);
-const char* base_source_ext(uint8_t map_source);
-const char* major_contour_profile_for_zoom(int z);
+class StdMapTileFileSystem final : public ui::map_tiles::IMapTileFileSystem
+{
+  public:
+    bool exists(const char* path) const override
+    {
+        return path && std::filesystem::exists(std::filesystem::path(path));
+    }
+
+    bool isDirectory(const char* path) const override
+    {
+        return path && std::filesystem::is_directory(std::filesystem::path(path));
+    }
+
+    bool readFile(const char* path,
+                  uint8_t* buffer,
+                  std::size_t capacity,
+                  std::size_t& out_size) const override
+    {
+        out_size = 0;
+        if (!path || !buffer || capacity == 0)
+        {
+            return false;
+        }
+
+        FILE* file = std::fopen(path, "rb");
+        if (!file)
+        {
+            return false;
+        }
+
+        out_size = std::fread(buffer, 1, capacity, file);
+        const bool ok = std::ferror(file) == 0;
+        std::fclose(file);
+        return ok;
+    }
+};
 
 uint32_t now_ms()
 {
@@ -46,22 +81,86 @@ std::filesystem::path default_storage_root()
     return ::platform::linux_runtime::resolve_paths().sd_root;
 }
 
+StdMapTileFileSystem& tile_file_system()
+{
+    static StdMapTileFileSystem fs;
+    return fs;
+}
+
+ui::map_tiles::FilesystemMapTileSource& tile_source()
+{
+    static const std::string root = default_storage_root().string();
+    static ui::map_tiles::FilesystemMapTileSource source(
+        tile_file_system(),
+        root.c_str());
+    return source;
+}
+
+uint8_t clamp_tile_zoom(int z)
+{
+    if (z < 0)
+    {
+        return 0;
+    }
+    if (z > 255)
+    {
+        return 255;
+    }
+    return static_cast<uint8_t>(z);
+}
+
+ui::map_tiles::MapTileRef base_tile_ref(int z, int x, int y, uint8_t map_source)
+{
+    ui::map_tiles::MapTileRef ref{};
+    ref.layer = ui::map_tiles::mapTileLayerFromBaseSource(sanitize_map_source(map_source));
+    ref.z = clamp_tile_zoom(z);
+    ref.x = static_cast<uint32_t>(x < 0 ? 0 : x);
+    ref.y = static_cast<uint32_t>(y < 0 ? 0 : y);
+    return ref;
+}
+
+bool contour_tile_ref(int z, int x, int y, ui::map_tiles::MapTileRef& out)
+{
+    bool supported = false;
+    const auto layer = ui::map_tiles::mapTileContourLayerForZoom(z, &supported);
+    if (!supported)
+    {
+        return false;
+    }
+
+    out.layer = layer;
+    out.z = clamp_tile_zoom(z);
+    out.x = static_cast<uint32_t>(x < 0 ? 0 : x);
+    out.y = static_cast<uint32_t>(y < 0 ? 0 : y);
+    return true;
+}
+
 std::filesystem::path build_base_tile_actual_path(int z, int x, int y, uint8_t map_source)
 {
-    return default_storage_root() / "maps" / "base" / base_source_dir(map_source) / std::to_string(z) / std::to_string(x) /
-           (std::to_string(y) + "." + base_source_ext(map_source));
+    char path[160]{};
+    if (!tile_source().resolvePath(base_tile_ref(z, x, y, map_source),
+                                   path,
+                                   sizeof(path)))
+    {
+        return {};
+    }
+    return std::filesystem::path(path);
 }
 
 std::filesystem::path build_contour_tile_actual_path(int z, int x, int y)
 {
-    const char* profile = major_contour_profile_for_zoom(z);
-    if (!profile)
+    ui::map_tiles::MapTileRef ref{};
+    if (!contour_tile_ref(z, x, y, ref))
     {
         return {};
     }
 
-    return default_storage_root() / "maps" / "contour" / profile / std::to_string(z) / std::to_string(x) /
-           (std::to_string(y) + ".png");
+    char path[160]{};
+    if (!tile_source().resolvePath(ref, path, sizeof(path)))
+    {
+        return {};
+    }
+    return std::filesystem::path(path);
 }
 
 bool build_lvgl_path_from_actual(const std::filesystem::path& actual_path, char* out_path, size_t out_size)
@@ -77,56 +176,83 @@ bool build_lvgl_path_from_actual(const std::filesystem::path& actual_path, char*
     return true;
 }
 
-const char* base_source_dir(uint8_t map_source)
+int16_t clamp_screen_coord(int value)
 {
-    switch (sanitize_map_source(map_source))
+    if (value < -32768)
     {
-    case 1:
-        return "terrain";
-    case 2:
-        return "satellite";
-    case 0:
-    default:
-        return "osm";
+        return -32768;
     }
+    if (value > 32767)
+    {
+        return 32767;
+    }
+    return static_cast<int16_t>(value);
 }
 
-const char* base_source_ext(uint8_t map_source)
+ui::map_tiles::MapTileRef tile_render_ref(const MapTile& tile)
 {
-    return sanitize_map_source(map_source) == 2 ? "jpg" : "png";
+    ui::map_tiles::MapTileRef ref{};
+    ref.layer = ui::map_tiles::mapTileLayerFromBaseSource(sanitize_map_source(tile.map_source));
+    ref.z = clamp_tile_zoom(tile.z);
+    ref.x = static_cast<uint32_t>(tile.x < 0 ? 0 : tile.x);
+    ref.y = static_cast<uint32_t>(tile.y < 0 ? 0 : tile.y);
+    return ref;
 }
 
-const char* major_contour_profile_for_zoom(int z)
+ui::map_tiles::MapTileRenderState tile_render_state(const MapTile& tile)
 {
-    if (z <= 7)
+    if (tile.has_png_file)
     {
-        return nullptr;
+        return ui::map_tiles::MapTileRenderState::Ready;
     }
-    if (z == 8)
+    if (tile.base_missing)
     {
-        return "major-500";
+        return ui::map_tiles::MapTileRenderState::Missing;
     }
-    if (z == 9)
+    return ui::map_tiles::MapTileRenderState::Loading;
+}
+
+void rebuild_render_queue(TileContext& ctx)
+{
+    if (!ctx.render_queue)
     {
-        return "major-200";
+        return;
     }
-    if (z == 10)
+
+    ctx.render_queue->clear();
+    if (!ctx.tiles || !ctx.anchor || !ctx.anchor->valid)
     {
-        return "major-500";
+        return;
     }
-    if (z == 11)
+
+    for (const auto& tile : *ctx.tiles)
     {
-        return "major-200";
+        if (!tile.visible)
+        {
+            continue;
+        }
+
+        int screen_x = 0;
+        int screen_y = 0;
+        if (!tile_screen_pos_xyz(ctx,
+                                 static_cast<int>(tile.x),
+                                 static_cast<int>(tile.y),
+                                 tile.z,
+                                 screen_x,
+                                 screen_y))
+        {
+            continue;
+        }
+
+        ui::map_tiles::MapTileRenderRef item{};
+        item.tile = tile_render_ref(tile);
+        item.rect.x = clamp_screen_coord(screen_x);
+        item.rect.y = clamp_screen_coord(screen_y);
+        item.rect.width = TILE_SIZE;
+        item.rect.height = TILE_SIZE;
+        item.state = tile_render_state(tile);
+        ctx.render_queue->push(item);
     }
-    if (z <= 14)
-    {
-        return "major-100";
-    }
-    if (z <= 16)
-    {
-        return "major-50";
-    }
-    return "major-25";
 }
 
 double clamp_lat(double lat)
@@ -308,12 +434,18 @@ void create_or_refresh_tile_card(TileContext& ctx, MapTile& tile)
 
     const auto base_actual_path =
         build_base_tile_actual_path(tile.z, static_cast<int>(tile.x), static_cast<int>(tile.y), tile.map_source);
-    const bool has_base = std::filesystem::exists(base_actual_path);
+    const auto base_result = tile_source().lookup(
+        base_tile_ref(tile.z, static_cast<int>(tile.x), static_cast<int>(tile.y), tile.map_source));
+    const bool has_base = base_result.status == ui::map_tiles::MapTileStatus::Available;
 
     const auto contour_actual_path =
         g_requested_contour_enabled ? build_contour_tile_actual_path(tile.z, static_cast<int>(tile.x), static_cast<int>(tile.y))
                                     : std::filesystem::path{};
-    const bool has_contour = !contour_actual_path.empty() && std::filesystem::exists(contour_actual_path);
+    ui::map_tiles::MapTileRef contour_ref{};
+    const bool has_contour =
+        g_requested_contour_enabled &&
+        contour_tile_ref(tile.z, static_cast<int>(tile.x), static_cast<int>(tile.y), contour_ref) &&
+        tile_source().lookup(contour_ref).status == ui::map_tiles::MapTileStatus::Available;
 
     if (!tile.img_obj || !lv_obj_is_valid(tile.img_obj))
     {
@@ -430,32 +562,19 @@ bool build_contour_tile_path(int z, int x, int y, char* out_path, size_t out_siz
 
 bool base_tile_available(int z, int x, int y, uint8_t map_source)
 {
-    return std::filesystem::exists(build_base_tile_actual_path(z, x, y, map_source));
+    const auto result = tile_source().lookup(base_tile_ref(z, x, y, map_source));
+    return result.status == ui::map_tiles::MapTileStatus::Available;
 }
 
 bool map_source_directory_available(uint8_t map_source)
 {
-    return std::filesystem::exists(default_storage_root() / "maps" / "base" / base_source_dir(map_source));
+    return tile_source().layerDirectoryAvailable(
+        ui::map_tiles::mapTileLayerFromBaseSource(sanitize_map_source(map_source)));
 }
 
 bool contour_directory_available()
 {
-    static const char* kMajorProfiles[] = {
-        "major-500",
-        "major-200",
-        "major-100",
-        "major-50",
-        "major-25",
-    };
-
-    for (const char* profile : kMajorProfiles)
-    {
-        if (std::filesystem::exists(default_storage_root() / "maps" / "contour" / profile))
-        {
-            return true;
-        }
-    }
-    return std::filesystem::exists(default_storage_root() / "maps" / "contour");
+    return tile_source().anyContourDirectoryAvailable();
 }
 
 bool take_missing_tile_notice(uint8_t* out_map_source)
@@ -727,6 +846,7 @@ void calculate_required_tiles(TileContext& ctx, double lat, double lng, int zoom
     }
 
     refresh_status_flags(ctx);
+    rebuild_render_queue(ctx);
 }
 
 void tile_loader_step(TileContext& ctx)
@@ -766,20 +886,27 @@ void tile_loader_step(TileContext& ctx)
     }
 
     refresh_status_flags(ctx);
+    rebuild_render_queue(ctx);
 }
 
 void init_tile_context(TileContext& ctx,
                        lv_obj_t* map_container,
                        MapAnchor* anchor,
                        std::vector<MapTile>* tiles,
+                       ui::map_tiles::MapTileRenderQueue* render_queue,
                        bool* has_map_data,
                        bool* has_visible_map_data)
 {
     ctx.map_container = map_container;
     ctx.anchor = anchor;
     ctx.tiles = tiles;
+    ctx.render_queue = render_queue;
     ctx.has_map_data = has_map_data;
     ctx.has_visible_map_data = has_visible_map_data;
+    if (ctx.render_queue)
+    {
+        ctx.render_queue->clear();
+    }
     if (ctx.has_map_data)
     {
         *ctx.has_map_data = false;
@@ -816,4 +943,8 @@ void cleanup_tiles(TileContext& ctx)
     {
         ctx.anchor->valid = false;
     }
+    if (ctx.render_queue)
+    {
+        ctx.render_queue->clear();
+    }
 }
diff --git a/platform/linux/uconsole/include/uconsole/uconsole_map_workspace_model.h b/platform/linux/uconsole/include/uconsole/uconsole_map_workspace_model.h
index 2345c980..3a57d77c 100644
--- a/platform/linux/uconsole/include/uconsole/uconsole_map_workspace_model.h
+++ b/platform/linux/uconsole/include/uconsole/uconsole_map_workspace_model.h
@@ -8,6 +8,11 @@
 
 #include "platform/linux/map_contour_tile_generator.h"
 #include "platform/linux/map_tile_cache.h"
+#include "ui/presentation_sources/legacy_gps_status_source.h"
+#include "ui/presentation_sources/legacy_map_action_sink.h"
+#include "ui/presentation_sources/legacy_map_presentation_source.h"
+#include "ui_presentation/map/map_workspace_model.h"
+#include "ui_presentation/map/map_workspace_snapshot.h"
 
 namespace trailmate::linux_app
 {
@@ -60,6 +65,8 @@ struct MapCoordinate
 
 struct MapWorkspaceSnapshot
 {
+    ::ui::map::MapWorkspaceSnapshot presentation_workspace{};
+
     bool has_center = false;
     bool has_fix = false;
     bool has_configured_center = false;
@@ -105,6 +112,15 @@ class UConsoleMapWorkspaceModel final
                                                       int zoom,
                                                       int radius_x,
                                                       int radius_y) const;
+    [[nodiscard]] ::ui::map::MapWorkspaceModel& presentationModel() noexcept
+    {
+        return presentation_model_;
+    }
+    [[nodiscard]] const ::ui::map::MapWorkspaceModel& presentationModel() const
+        noexcept
+    {
+        return presentation_model_;
+    }
     [[nodiscard]] ::platform::linux_runtime::MapTileResult ensureTile(
         const ::platform::linux_runtime::MapTileId& tile) const;
     [[nodiscard]] ::platform::linux_runtime::MapContourGenerationResult
@@ -146,11 +162,19 @@ class UConsoleMapWorkspaceModel final
     [[nodiscard]] ::platform::linux_runtime::MapBaseSource source() const;
     [[nodiscard]] bool showMqttNodes() const;
     [[nodiscard]] bool contourEnabled() const;
+    void syncPresentationWorkspace(double lat, double lon, int zoom) const;
     void persistZoom() const;
     void persistManualCenter() const;
     void clearPersistedManualCenter() const;
 
     linux_app::LinuxAppServices& services_;
+    mutable ::ui::presentation_sources::LegacyGpsStatusSource legacy_gps_source_{};
+    mutable ::ui::presentation_sources::LegacyMapPresentationState
+        legacy_map_state_{};
+    mutable ::ui::presentation_sources::LegacyMapPresentationSource
+        legacy_map_source_;
+    mutable ::ui::presentation_sources::LegacyMapActionSink legacy_map_sink_;
+    mutable ::ui::map::MapWorkspaceModel presentation_model_;
     ::platform::linux_runtime::MapTileCache tile_cache_{};
     ::platform::linux_runtime::MapContourTileStore contour_store_{};
     ::platform::linux_runtime::MapContourTileGenerator contour_generator_{};
diff --git a/platform/linux/uconsole/src/uconsole_chat_workspace_model.cpp b/platform/linux/uconsole/src/uconsole_chat_workspace_model.cpp
index 9567510c..58bdc62b 100644
--- a/platform/linux/uconsole/src/uconsole_chat_workspace_model.cpp
+++ b/platform/linux/uconsole/src/uconsole_chat_workspace_model.cpp
@@ -1558,24 +1558,14 @@ bool UConsoleChatWorkspaceModel::verifyNodeKey(::chat::NodeId node_id)
         return true;
     }
 
-    const auto* node = services_.contacts().getNodeInfo(node_id);
-    if (node == nullptr || !node->has_public_key)
+    if (adapter != nullptr && capabilities.supports_pki)
     {
-        action_status_ = "No public key is stored for this node.";
+        action_status_ = "Key verification could not start.";
         return false;
     }
-    if (node->key_manually_verified)
-    {
-        action_status_ = "Key is already trusted.";
-        return true;
-    }
-    if (!services_.contacts().setNodeKeyManuallyVerified(node_id, true))
-    {
-        action_status_ = "Key trust state could not be saved.";
-        return false;
-    }
-    action_status_ = "Key marked trusted.";
-    return true;
+
+    action_status_ = "Key verification is unsupported by this mesh adapter.";
+    return false;
 }
 
 void UConsoleChatWorkspaceModel::ensureActiveConversation()
diff --git a/platform/linux/uconsole/src/uconsole_map_workspace_model.cpp b/platform/linux/uconsole/src/uconsole_map_workspace_model.cpp
index d25d6e8a..a4333ffc 100644
--- a/platform/linux/uconsole/src/uconsole_map_workspace_model.cpp
+++ b/platform/linux/uconsole/src/uconsole_map_workspace_model.cpp
@@ -12,8 +12,8 @@
 #include "app/linux_app_services.h"
 #include "chat/usecase/contact_service.h"
 #include "platform/linux/env_config.h"
-#include "platform/ui/gps_runtime.h"
 #include "platform/ui/settings_store.h"
+#include "platform/ui/team_ui_store_runtime.h"
 #include "uconsole/uconsole_hardware_probe.h"
 
 namespace trailmate::uconsole
@@ -251,6 +251,11 @@ void append_projected_node(MapWorkspaceSnapshot& out,
 UConsoleMapWorkspaceModel::UConsoleMapWorkspaceModel(
     linux_app::LinuxAppServices& services)
     : services_(services),
+      legacy_map_source_(legacy_gps_source_,
+                         legacy_map_state_,
+                         &::team::ui::team_ui_get_store()),
+      legacy_map_sink_(legacy_gps_source_, legacy_map_state_),
+      presentation_model_(legacy_map_source_, legacy_map_sink_),
       zoom_(std::clamp(
           platform::ui::settings_store::get_int(kMapNamespace, kZoomKey, 14),
           kMinZoom,
@@ -301,15 +306,17 @@ MapWorkspaceSnapshot UConsoleMapWorkspaceModel::snapshot() const
     else
     {
         const bool has_external_source = external_gps_source_configured();
-        const auto gps = ::platform::ui::gps::get_data();
-        out.has_fix = has_external_source && gps.valid;
+        ::ui::gps::GpsStatusSnapshot gps;
+        const bool has_gps_snapshot =
+            legacy_gps_source_.buildGpsStatusSnapshot(gps) && gps.header.valid;
+        out.has_fix = has_external_source && has_gps_snapshot && gps.fix_valid;
         out.has_center = out.has_fix;
-        out.lat = gps.lat;
-        out.lon = gps.lng;
-        out.altitude_m = gps.alt_m;
-        out.has_altitude = gps.has_alt;
-        out.speed_mps = gps.speed_mps;
-        out.has_speed = gps.has_speed;
+        out.lat = gps.latitude;
+        out.lon = gps.longitude;
+        out.altitude_m = static_cast<double>(gps.altitude_m);
+        out.has_altitude = out.has_fix;
+        out.speed_mps = static_cast<double>(gps.speed_mps);
+        out.has_speed = out.has_fix;
         out.satellites = gps.satellites;
         out.fix_label = out.has_fix ? "GPS fix" : "Default map center";
         if (!out.has_center)
@@ -334,6 +341,9 @@ MapWorkspaceSnapshot UConsoleMapWorkspaceModel::snapshot() const
         return out;
     }
 
+    syncPresentationWorkspace(out.lat, out.lon, out.zoom);
+    out.presentation_workspace = presentation_model_.snapshot();
+
     out.columns = static_cast<std::size_t>(kLandscapeTileRadiusX * 2 + 1);
     out.rows = static_cast<std::size_t>(kLandscapeTileRadiusY * 2 + 1);
     out.center_tile_index =
@@ -693,6 +703,28 @@ bool UConsoleMapWorkspaceModel::contourEnabled() const
     return services_.config().map_contour_enabled;
 }
 
+void UConsoleMapWorkspaceModel::syncPresentationWorkspace(double lat,
+                                                          double lon,
+                                                          int zoom) const
+{
+    const auto map_source = source();
+    legacy_map_state_.layers.osm =
+        map_source == ::platform::linux_runtime::MapBaseSource::Osm;
+    legacy_map_state_.layers.terrain =
+        map_source == ::platform::linux_runtime::MapBaseSource::Terrain;
+    legacy_map_state_.layers.satellite =
+        map_source == ::platform::linux_runtime::MapBaseSource::Satellite;
+    legacy_map_state_.layers.contour = contourEnabled();
+
+    ::ui::map::MapViewport viewport;
+    viewport.center_lat = lat;
+    viewport.center_lon = lon;
+    viewport.zoom = static_cast<std::uint8_t>(
+        std::clamp(zoom, kMinZoom, kMaxZoom));
+    (void)presentation_model_.setViewport(viewport);
+    (void)presentation_model_.setActiveTool(::ui::map::MapToolKind::Pan);
+}
+
 void UConsoleMapWorkspaceModel::persistZoom() const
 {
     ::platform::ui::settings_store::put_int(kMapNamespace, kZoomKey, zoom_);
diff --git a/platform/nrf52/README.md b/platform/nrf52/README.md
new file mode 100644
index 00000000..fa7cf542
--- /dev/null
+++ b/platform/nrf52/README.md
@@ -0,0 +1,12 @@
+# nRF52 Platform Owners
+
+This directory owns nRF52 platform glue that is not a board fact and not an app
+shell decision.
+
+- `arduino_common/` contains shared nRF52 Arduino infrastructure.
+- `debug/` owns the nRF52 serial debug console.
+- `protocol/` owns nRF52 protocol adapter construction.
+- `runtime/` owns nRF52 runtime apply services for active board/app state.
+
+GAT562 board hardware facts remain in `boards/gat562_mesh_evb_pro/`.
+The nRF52 node app lifecycle remains in `apps/nrf52_node/`.
diff --git a/platform/nrf52/arduino_common/include/ble/app_phone_facade.h b/platform/nrf52/arduino_common/include/ble/app_phone_facade.h
new file mode 100644
index 00000000..5a4ca7eb
--- /dev/null
+++ b/platform/nrf52/arduino_common/include/ble/app_phone_facade.h
@@ -0,0 +1,144 @@
+#pragma once
+
+#include "app/app_facades.h"
+#include "phone/common/phone_app_facade.h"
+#include "phone/meshcore/meshcore_phone_core.h"
+#include "phone/meshtastic/meshtastic_phone_core.h"
+#include "platform/shared/ble/phone_ble_runtime.h"
+
+#include <cstddef>
+#include <string>
+
+namespace chat::meshcore
+{
+class IMeshCoreBleBackend;
+}
+
+namespace ble
+{
+
+class AppPhoneFacade final : public phone::IPhoneAppFacade,
+                             public phone::meshtastic::MeshtasticPhoneBluetoothConfigHooks,
+                             public phone::meshtastic::MeshtasticPhoneModuleConfigHooks,
+                             public phone::meshtastic::MeshtasticPhoneConfigLifecycleHooks,
+                             public phone::meshtastic::MeshtasticPhoneStatusHooks,
+                             public phone::meshtastic::MeshtasticPhoneMqttHooks,
+                             public phone::meshtastic::MeshtasticPhoneDeviceRuntimeHooks,
+                             public phone::meshcore::MeshCorePhoneHooks
+{
+  public:
+    AppPhoneFacade(app::IAppBleFacade& app,
+                   meshtastic_Config_BluetoothConfig& bluetooth_config,
+                   meshtastic_LocalModuleConfig& module_config,
+                   platform::shared::ble_bridge::IPhoneBleRuntime* ble_runtime = nullptr);
+
+    void setBleRuntime(platform::shared::ble_bridge::IPhoneBleRuntime* runtime);
+    void syncMeshtasticMqttProxySettings(const meshtastic_LocalModuleConfig& module_config);
+
+    phone::MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const override;
+    void setMeshtasticPhoneConfig(const phone::MeshtasticPhoneConfigSnapshot& config) override;
+    phone::MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const override;
+    void setMeshCorePhoneConfig(const phone::MeshCorePhoneConfigSnapshot& config) override;
+    void saveConfig() override;
+    void applyMeshConfig() override;
+    void applyUserInfo() override;
+    void applyPositionConfig() override;
+    void getEffectiveUserInfo(char* out_long,
+                              std::size_t long_len,
+                              char* out_short,
+                              std::size_t short_len) const override;
+    chat::NodeId getSelfNodeId() const override;
+    bool sendPhoneText(chat::ChannelId channel,
+                       const std::string& text,
+                       chat::MessageId forced_msg_id,
+                       chat::NodeId peer,
+                       chat::MessageId& out_msg_id) override;
+    bool sendPhoneAppData(chat::ChannelId channel,
+                          uint32_t portnum,
+                          const uint8_t* payload,
+                          std::size_t len,
+                          chat::NodeId dest,
+                          bool want_ack,
+                          chat::MessageId packet_id,
+                          bool want_response) override;
+    bool pollIncomingPhoneData(chat::MeshIncomingData& out) override;
+    std::size_t phoneNodeCount() const override;
+    bool getPhoneNodeByIndex(std::size_t index, phone::PhoneNodeView& out) const override;
+    bool findPhoneNode(chat::NodeId node_id, phone::PhoneNodeView& out) const override;
+    bool isMeshPkiReady() const override;
+    bool isBleEnabled() const override;
+    void setBleEnabled(bool enabled) override;
+    bool getDeviceMacAddress(uint8_t out_mac[6]) const override;
+    bool syncCurrentEpochSeconds(uint32_t epoch_seconds) override;
+    void resetMeshConfig() override;
+    void clearNodeDb() override;
+    void clearMessageDb() override;
+    void restartDevice() override;
+
+    bool loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const override;
+    void saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config) override;
+    bool loadModuleConfig(meshtastic_LocalModuleConfig* out) const override;
+    void saveModuleConfig(const meshtastic_LocalModuleConfig& config) override;
+    void onConfigStart() override;
+    void onConfigComplete() override;
+    bool loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const override;
+    bool handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg) override;
+    bool pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out) override;
+    bool loadTimezoneTzdef(char* out, size_t out_len) const override;
+    void saveTimezoneTzdef(const char* tzdef) override;
+    int getTimezoneOffsetMinutes() const override;
+    void setTimezoneOffsetMinutes(int offset_min) override;
+    bool getGpsFix(phone::meshtastic::MeshtasticGpsFix* out) const override;
+
+    bool getCustomVars(std::string* out) const override;
+    bool setCustomVar(const char* key, const char* value) override;
+    bool meshCoreExportIdentityPublicKey(uint8_t* out_pubkey, std::size_t len) override;
+    bool meshCoreExportIdentityPrivateKey(uint8_t* out_priv, std::size_t len) override;
+    bool meshCoreImportIdentityPrivateKey(const uint8_t* in_priv, std::size_t len) override;
+    bool meshCoreSignPayload(const uint8_t* data, std::size_t len, uint8_t* out_sig, std::size_t out_len) override;
+    bool meshCoreSendSelfAdvert(bool broadcast) override;
+    bool meshCoreSendPeerRequestType(const uint8_t* pubkey,
+                                     std::size_t len,
+                                     uint8_t req_type,
+                                     uint32_t* out_tag,
+                                     uint32_t* out_est_timeout,
+                                     bool* out_sent_flood) override;
+    bool meshCoreSendPeerRequestPayload(const uint8_t* pubkey,
+                                        std::size_t len,
+                                        const uint8_t* payload,
+                                        std::size_t payload_len,
+                                        bool force_flood,
+                                        uint32_t* out_tag,
+                                        uint32_t* out_est_timeout,
+                                        bool* out_sent_flood) override;
+    bool meshCoreSendAnonRequestPayload(const uint8_t* pubkey,
+                                        std::size_t len,
+                                        const uint8_t* payload,
+                                        std::size_t payload_len,
+                                        uint32_t* out_est_timeout,
+                                        bool* out_sent_flood) override;
+    bool meshCoreSendTracePath(const uint8_t* path,
+                               std::size_t path_len,
+                               uint32_t tag,
+                               uint32_t auth,
+                               uint8_t flags,
+                               uint32_t* out_est_timeout) override;
+    bool meshCoreSendControlData(const uint8_t* payload, std::size_t payload_len) override;
+    bool meshCoreSendRawData(const uint8_t* path,
+                             std::size_t path_len,
+                             const uint8_t* payload,
+                             std::size_t payload_len,
+                             uint32_t* out_est_timeout) override;
+    void meshCoreSetFloodScopeKey(const uint8_t* key, std::size_t len) override;
+
+  private:
+    chat::meshcore::IMeshCoreBleBackend* meshCoreBackend();
+    const chat::meshcore::IMeshCoreBleBackend* meshCoreBackend() const;
+
+    app::IAppBleFacade& app_;
+    meshtastic_Config_BluetoothConfig& bluetooth_config_;
+    meshtastic_LocalModuleConfig& module_config_;
+    platform::shared::ble_bridge::IPhoneBleRuntime* ble_runtime_ = nullptr;
+};
+
+} // namespace ble
diff --git a/platform/nrf52/arduino_common/include/ble/meshcore_ble.h b/platform/nrf52/arduino_common/include/ble/meshcore_ble.h
index f7354b4b..cde1e021 100644
--- a/platform/nrf52/arduino_common/include/ble/meshcore_ble.h
+++ b/platform/nrf52/arduino_common/include/ble/meshcore_ble.h
@@ -1,11 +1,13 @@
 #pragma once
 
 #include "app/app_facades.h"
+#include "ble/app_phone_facade.h"
 #include "ble_manager.h"
-#include "chat/ble/meshcore_phone_core.h"
 #include "chat/domain/chat_types.h"
 #include "chat/ports/i_node_store.h"
 #include "chat/usecase/chat_service.h"
+#include "phone/meshcore/meshcore_phone_core.h"
+#include "phone/meshtastic/meshtastic_phone_core.h"
 
 #include <bluefruit.h>
 #include <memory>
@@ -15,9 +17,8 @@ namespace ble
 {
 
 class MeshCoreBleService final : public BleService,
-                                 public MeshCorePhoneHooks,
-                                 public chat::ChatService::IncomingTextObserver,
-                                 public IPhoneRuntimeContext
+                                 public phone::meshcore::MeshCorePhoneHooks,
+                                 public chat::ChatService::IncomingTextObserver
 {
   public:
     MeshCoreBleService(app::IAppBleFacade& ctx, const std::string& device_name);
@@ -38,41 +39,11 @@ class MeshCoreBleService final : public BleService,
     void sendPendingNotifications();
     bool getCustomVars(std::string* out) const override;
     bool setCustomVar(const char* key, const char* value) override;
-    MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const override;
-    void setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config) override;
-    MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const override;
-    void setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config) override;
-    void saveConfig() override { ctx_.saveConfig(); }
-    void applyMeshConfig() override { ctx_.applyMeshConfig(); }
-    void applyUserInfo() override { ctx_.applyUserInfo(); }
-    void applyPositionConfig() override { ctx_.applyPositionConfig(); }
-    void getEffectiveUserInfo(char* out_long,
-                              std::size_t long_len,
-                              char* out_short,
-                              std::size_t short_len) const override
-    {
-        ctx_.getEffectiveUserInfo(out_long, long_len, out_short, short_len);
-    }
-    chat::ChatService& getChatService() override { return ctx_.getChatService(); }
-    chat::contacts::ContactService& getContactService() override { return ctx_.getContactService(); }
-    chat::IMeshAdapter* getMeshAdapter() override { return ctx_.getMeshAdapter(); }
-    const chat::IMeshAdapter* getMeshAdapter() const override { return ctx_.getMeshAdapter(); }
-    chat::contacts::INodeStore* getNodeStore() override { return ctx_.getNodeStore(); }
-    const chat::contacts::INodeStore* getNodeStore() const override { return ctx_.getNodeStore(); }
-    chat::NodeId getSelfNodeId() const override { return ctx_.getSelfNodeId(); }
-    bool isBleEnabled() const override { return ctx_.isBleEnabled(); }
-    void setBleEnabled(bool enabled) override { ctx_.setBleEnabled(enabled); }
-    bool getDeviceMacAddress(uint8_t out_mac[6]) const override { return ctx_.getDeviceMacAddress(out_mac); }
-    bool syncCurrentEpochSeconds(uint32_t epoch_seconds) override
-    {
-        return ctx_.syncCurrentEpochSeconds(epoch_seconds);
-    }
-    void resetMeshConfig() override { ctx_.resetMeshConfig(); }
-    void clearNodeDb() override { ctx_.clearNodeDb(); }
-    void clearMessageDb() override { ctx_.clearMessageDb(); }
-    void restartDevice() override { ctx_.restartDevice(); }
 
     app::IAppBleFacade& ctx_;
+    meshtastic_Config_BluetoothConfig phone_ble_config_ = meshtastic_Config_BluetoothConfig_init_zero;
+    meshtastic_LocalModuleConfig phone_module_config_ = meshtastic_LocalModuleConfig_init_zero;
+    AppPhoneFacade phone_facade_;
     std::string device_name_;
     ::BLEService service_;
     ::BLECharacteristic rx_char_;
@@ -80,7 +51,7 @@ class MeshCoreBleService final : public BleService,
     bool active_ = false;
     bool gatt_initialized_ = false;
     bool observer_registered_ = false;
-    std::unique_ptr<MeshCorePhoneCore> core_;
+    std::unique_ptr<phone::meshcore::MeshCorePhoneCore> core_;
 };
 
 } // namespace ble
diff --git a/platform/nrf52/arduino_common/include/ble/meshtastic_ble.h b/platform/nrf52/arduino_common/include/ble/meshtastic_ble.h
index e33bd1bf..f8c9595d 100644
--- a/platform/nrf52/arduino_common/include/ble/meshtastic_ble.h
+++ b/platform/nrf52/arduino_common/include/ble/meshtastic_ble.h
@@ -1,11 +1,9 @@
 #pragma once
 
 #include "app/app_facades.h"
+#include "ble/app_phone_facade.h"
 #include "ble/ble_manager.h"
-#include "chat/ble/meshtastic_phone_session.h"
 #include "chat/domain/chat_types.h"
-#include "chat/ports/i_node_store.h"
-#include "chat/usecase/chat_service.h"
 #include "meshtastic/admin.pb.h"
 #include "meshtastic/channel.pb.h"
 #include "meshtastic/config.pb.h"
@@ -14,6 +12,8 @@
 #include "meshtastic/mesh.pb.h"
 #include "meshtastic/module_config.pb.h"
 #include "meshtastic/telemetry.pb.h"
+#include "phone/meshtastic/meshtastic_phone_session.h"
+#include "platform/shared/ble/phone_ble_runtime.h"
 #include <array>
 #include <atomic>
 #include <bluefruit.h>
@@ -23,20 +23,11 @@
 namespace ble
 {
 
-class MeshtasticPhoneCore;
+class MeshtasticBleObserverBridge;
 
 class MeshtasticBleService final : public BleService,
-                                   public chat::ChatService::IncomingTextObserver,
-                                   public chat::ChatService::OutgoingTextObserver,
-                                   public chat::ChatService::IncomingDataObserver,
-                                   public MeshtasticPhoneTransport,
-                                   public MeshtasticPhoneBluetoothConfigHooks,
-                                   public MeshtasticPhoneModuleConfigHooks,
-                                   public MeshtasticPhoneConfigLifecycleHooks,
-                                   public MeshtasticPhoneStatusHooks,
-                                   public MeshtasticPhoneMqttHooks,
-                                   public MeshtasticPhoneDeviceRuntimeHooks,
-                                   public IPhoneRuntimeContext
+                                   public phone::meshtastic::MeshtasticPhoneTransport,
+                                   public platform::shared::ble_bridge::IPhoneBleRuntime
 {
   public:
     struct Frame
@@ -55,9 +46,9 @@ class MeshtasticBleService final : public BleService,
     bool isRunning() const override;
     void setDeviceName(const std::string& name) override;
 
-    void onIncomingText(const chat::MeshIncomingText& msg) override;
-    void onOutgoingText(const chat::MeshIncomingText& msg) override;
-    void onIncomingData(const chat::MeshIncomingData& msg) override;
+    void handleIncomingTextFromApp(const chat::MeshIncomingText& msg);
+    void handleOutgoingTextFromApp(const chat::MeshIncomingText& msg);
+    void handleIncomingDataFromApp(const chat::MeshIncomingData& msg);
 
     bool handleToRadio(const uint8_t* data, size_t len);
     bool enqueueToRadio(const uint8_t* data, size_t len);
@@ -81,51 +72,12 @@ class MeshtasticBleService final : public BleService,
     bool getPairingStatus(BlePairingStatus* out) const override;
     bool isBleConnected() const override;
     void notifyFromNum(uint32_t from_num) override;
-    bool loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const override;
-    void saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config) override;
-    bool loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const override;
-    bool loadModuleConfig(meshtastic_LocalModuleConfig* out) const override;
-    void saveModuleConfig(const meshtastic_LocalModuleConfig& config) override;
-    bool loadTimezoneTzdef(char* out, size_t out_len) const override;
-    void saveTimezoneTzdef(const char* tzdef) override;
-    int getTimezoneOffsetMinutes() const override;
-    void setTimezoneOffsetMinutes(int offset_min) override;
-    bool getGpsFix(MeshtasticGpsFix* out) const override;
-    MeshtasticPhoneConfigSnapshot getMeshtasticPhoneConfig() const override;
-    void setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config) override;
-    MeshCorePhoneConfigSnapshot getMeshCorePhoneConfig() const override;
-    void setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config) override;
-    void saveConfig() override { ctx_.saveConfig(); }
-    void applyMeshConfig() override { ctx_.applyMeshConfig(); }
-    void applyUserInfo() override { ctx_.applyUserInfo(); }
-    void applyPositionConfig() override { ctx_.applyPositionConfig(); }
-    void getEffectiveUserInfo(char* out_long,
-                              std::size_t long_len,
-                              char* out_short,
-                              std::size_t short_len) const override
-    {
-        ctx_.getEffectiveUserInfo(out_long, long_len, out_short, short_len);
-    }
-    chat::ChatService& getChatService() override { return ctx_.getChatService(); }
-    chat::contacts::ContactService& getContactService() override { return ctx_.getContactService(); }
-    chat::IMeshAdapter* getMeshAdapter() override { return ctx_.getMeshAdapter(); }
-    const chat::IMeshAdapter* getMeshAdapter() const override { return ctx_.getMeshAdapter(); }
-    chat::contacts::INodeStore* getNodeStore() override { return ctx_.getNodeStore(); }
-    const chat::contacts::INodeStore* getNodeStore() const override { return ctx_.getNodeStore(); }
-    chat::NodeId getSelfNodeId() const override { return ctx_.getSelfNodeId(); }
-    bool isBleEnabled() const override { return ctx_.isBleEnabled(); }
-    void setBleEnabled(bool enabled) override { ctx_.setBleEnabled(enabled); }
-    bool getDeviceMacAddress(uint8_t out_mac[6]) const override { return ctx_.getDeviceMacAddress(out_mac); }
-    bool syncCurrentEpochSeconds(uint32_t epoch_seconds) override
-    {
-        return ctx_.syncCurrentEpochSeconds(epoch_seconds);
-    }
-    void resetMeshConfig() override { ctx_.resetMeshConfig(); }
-    void clearNodeDb() override { ctx_.clearNodeDb(); }
-    void clearMessageDb() override { ctx_.clearMessageDb(); }
-    void restartDevice() override { ctx_.restartDevice(); }
-    bool handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg) override;
-    bool pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out) override;
+    bool isPhoneBleConnected() const override;
+    uint32_t pendingPhoneBlePasskey() const override;
+    void requestPhoneHighThroughputConnection() override;
+    void requestPhoneLowerPowerConnection() override;
+    void onPhoneBluetoothConfigChanged() override;
+    void onPhoneModuleConfigChanged() override;
 
   private:
     struct PendingToRadioFrame
@@ -148,7 +100,10 @@ class MeshtasticBleService final : public BleService,
     uint32_t effectivePasskey() const;
     void logDeferredBleEvents();
 
-    app::IAppBleFacade& ctx_;
+    meshtastic_Config_BluetoothConfig ble_config_ = meshtastic_Config_BluetoothConfig_init_zero;
+    meshtastic_LocalModuleConfig module_config_ = meshtastic_LocalModuleConfig_init_zero;
+    AppPhoneFacade phone_facade_;
+    std::unique_ptr<MeshtasticBleObserverBridge> observer_bridge_;
     std::string device_name_;
     ::BLEService service_;
     ::BLECharacteristic to_radio_;
@@ -161,9 +116,7 @@ class MeshtasticBleService final : public BleService,
     bool connected_ = false;
     bool from_num_notify_enabled_ = false;
     uint16_t conn_handle_ = BLE_CONN_HANDLE_INVALID;
-    meshtastic_Config_BluetoothConfig ble_config_ = meshtastic_Config_BluetoothConfig_init_zero;
-    meshtastic_LocalModuleConfig module_config_ = meshtastic_LocalModuleConfig_init_zero;
-    std::unique_ptr<MeshtasticPhoneSession> phone_session_;
+    std::unique_ptr<phone::meshtastic::MeshtasticPhoneSession> phone_session_;
     std::atomic<uint32_t> pending_passkey_{0};
 
     static constexpr uint8_t kPendingToRadioCapacity = 6;
@@ -179,7 +132,7 @@ class MeshtasticBleService final : public BleService,
 
     bool pending_to_phone_valid_ = false;
     Frame pending_to_phone_{};
-    MeshtasticBleFrame session_frame_scratch_{};
+    phone::meshtastic::MeshtasticBleFrame session_frame_scratch_{};
 
     static constexpr uint8_t kToPhoneQueueDepth = 3;
     Frame to_phone_queue_[kToPhoneQueueDepth]{};
diff --git a/platform/nrf52/arduino_common/include/ble/meshtastic_ble_observer_bridge.h b/platform/nrf52/arduino_common/include/ble/meshtastic_ble_observer_bridge.h
new file mode 100644
index 00000000..0e0da53f
--- /dev/null
+++ b/platform/nrf52/arduino_common/include/ble/meshtastic_ble_observer_bridge.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "app/app_facades.h"
+#include "chat/usecase/chat_service.h"
+
+namespace ble
+{
+
+class MeshtasticBleService;
+
+class MeshtasticBleObserverBridge final : public chat::ChatService::IncomingTextObserver,
+                                          public chat::ChatService::OutgoingTextObserver,
+                                          public chat::ChatService::IncomingDataObserver
+{
+  public:
+    MeshtasticBleObserverBridge(app::IAppBleFacade& app, MeshtasticBleService& service);
+    ~MeshtasticBleObserverBridge() override;
+
+    void registerObservers();
+    void unregisterObservers();
+
+    void onIncomingText(const chat::MeshIncomingText& msg) override;
+    void onOutgoingText(const chat::MeshIncomingText& msg) override;
+    void onIncomingData(const chat::MeshIncomingData& msg) override;
+
+  private:
+    app::IAppBleFacade& app_;
+    MeshtasticBleService& service_;
+    bool registered_ = false;
+};
+
+} // namespace ble
diff --git a/platform/nrf52/arduino_common/include/ble/meshtastic_ble_persistence_bridge.h b/platform/nrf52/arduino_common/include/ble/meshtastic_ble_persistence_bridge.h
new file mode 100644
index 00000000..92671ff1
--- /dev/null
+++ b/platform/nrf52/arduino_common/include/ble/meshtastic_ble_persistence_bridge.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "chat/ble/meshtastic_phone_config_bridge.h"
+
+namespace ble
+{
+
+bool loadMeshtasticBlePersistedState(meshtastic_config_bridge::PersistedState* out);
+bool saveMeshtasticBlePersistedState(const meshtastic_Config_BluetoothConfig& bluetooth,
+                                     const meshtastic_LocalModuleConfig& module);
+void logMeshtasticBlePersistenceStatus();
+
+} // namespace ble
diff --git a/platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/mesh/nrf52_mesh_runtime_shell.h b/platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/mesh/nrf52_mesh_runtime_shell.h
new file mode 100644
index 00000000..d6e8a72d
--- /dev/null
+++ b/platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/mesh/nrf52_mesh_runtime_shell.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "mesh/usecase/mesh_session.h"
+
+namespace platform::nrf52::arduino_common::mesh
+{
+
+class Nrf52MeshRuntimeShell final
+{
+  public:
+    explicit Nrf52MeshRuntimeShell(::mesh::MeshSession& session);
+
+    bool start(const ::mesh::MeshRuntimeConfig& config);
+    void stop();
+    void tick();
+    ::mesh::SendResult sendDirect(const ::mesh::DirectMessageCommand& command);
+    ::mesh::MeshSessionState state() const;
+
+  private:
+    ::mesh::MeshSession& session_;
+};
+
+} // namespace platform::nrf52::arduino_common::mesh
diff --git a/platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/mesh/nrf52_settings_mesh_identity_store.h b/platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/mesh/nrf52_settings_mesh_identity_store.h
new file mode 100644
index 00000000..2ff6cc25
--- /dev/null
+++ b/platform/nrf52/arduino_common/include/platform/nrf52/arduino_common/mesh/nrf52_settings_mesh_identity_store.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "mesh/ports/i_local_identity_store.h"
+#include "mesh/ports/i_peer_key_store.h"
+
+#include <stddef.h>
+#include <stdint.h>
+#include <vector>
+
+namespace platform::nrf52::arduino_common::mesh
+{
+
+class Nrf52SettingsLocalIdentityStore final : public ::mesh::ILocalIdentityStore
+{
+  public:
+    struct Options
+    {
+        const char* ns = "chat";
+        const char* public_key = "pki_pub";
+        const char* private_key = "pki_priv";
+    };
+
+    Nrf52SettingsLocalIdentityStore();
+    explicit Nrf52SettingsLocalIdentityStore(const Options& options);
+
+    ::mesh::StoreResult load(::mesh::LocalIdentity& out) override;
+    ::mesh::StoreResult save(const ::mesh::LocalIdentity& identity) override;
+    ::mesh::StoreResult clear() override;
+
+  private:
+    Options options_;
+};
+
+class Nrf52SettingsPeerKeyStore final : public ::mesh::IPeerKeyStore
+{
+  public:
+    struct Options
+    {
+        const char* ns = "chat_pki";
+        const char* key = "pki_nodes";
+        size_t max_keys = 16;
+    };
+
+    Nrf52SettingsPeerKeyStore();
+    explicit Nrf52SettingsPeerKeyStore(const Options& options);
+
+    ::mesh::StoreResult get(::mesh::NodeId node_id, ::mesh::PeerPublicKey& out) override;
+    ::mesh::StoreResult put(const ::mesh::PeerPublicKey& key) override;
+    ::mesh::StoreResult remove(::mesh::NodeId node_id) override;
+    ::mesh::StoreResult clear() override;
+
+    ::mesh::StoreResult loadAll(std::vector<::mesh::PeerPublicKey>& out);
+    ::mesh::StoreResult replaceAll(const ::mesh::PeerPublicKey* keys, size_t count);
+
+  private:
+    ::mesh::StoreResult saveAll(std::vector<::mesh::PeerPublicKey>& keys);
+
+    Options options_;
+};
+
+} // namespace platform::nrf52::arduino_common::mesh
diff --git a/platform/nrf52/arduino_common/library.json b/platform/nrf52/arduino_common/library.json
index 02934f26..c1d1f600 100644
--- a/platform/nrf52/arduino_common/library.json
+++ b/platform/nrf52/arduino_common/library.json
@@ -13,6 +13,8 @@
       "-I../../..",
       "-I../../../boards/gat562_mesh_evb_pro/include",
       "-I../../../platform/shared/include",
+      "-I../../../modules/core_mesh/include",
+      "-I../../../modules/core_phone/include",
       "-I../../../modules/core_sys/include",
       "-I../../../modules/core_chat/include",
       "-I../../../modules/core_chat/generated",
@@ -31,5 +33,13 @@
       "-IC:/Users/VicLi/.platformio/packages/framework-arduinoadafruitnrf52/libraries/Adafruit_LittleFS/src",
       "-IC:/Users/VicLi/.platformio/packages/framework-arduinoadafruitnrf52/libraries/InternalFileSytem/src"
     ]
-  }
+  },
+  "dependencies": [
+    {
+      "name": "core_mesh"
+    },
+    {
+      "name": "core_phone"
+    }
+  ]
 }
diff --git a/platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp b/platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp
new file mode 100644
index 00000000..55b706ad
--- /dev/null
+++ b/platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp
@@ -0,0 +1,704 @@
+#include "../../include/ble/app_phone_facade.h"
+
+#include "chat/ble/meshtastic_phone_config_bridge.h"
+#include "chat/infra/meshcore/meshcore_ble_backend.h"
+#include "chat/ports/i_mesh_adapter.h"
+#include "chat/ports/i_node_store.h"
+#include "chat/usecase/chat_service.h"
+#include "chat/usecase/contact_service.h"
+#include "platform/nrf52/arduino_common/chat/infra/meshtastic/meshtastic_radio_adapter.h"
+#include "platform/shared/ble/app_config_phone_snapshot_bridge.h"
+#include "platform/shared/ble/meshtastic_phone_runtime_bridge.h"
+
+#include <cstring>
+
+namespace ble
+{
+namespace
+{
+void appendCustomVar(std::string& out, const char* key, const char* value)
+{
+    if (!key || !value)
+    {
+        return;
+    }
+    if (!out.empty())
+    {
+        out.push_back(',');
+    }
+    out += key;
+    out.push_back(':');
+    out += value;
+}
+
+bool parseBoolValue(const char* value, bool* out)
+{
+    if (!value || !out)
+    {
+        return false;
+    }
+    if (std::strcmp(value, "1") == 0 || std::strcmp(value, "true") == 0 ||
+        std::strcmp(value, "on") == 0 || std::strcmp(value, "yes") == 0)
+    {
+        *out = true;
+        return true;
+    }
+    if (std::strcmp(value, "0") == 0 || std::strcmp(value, "false") == 0 ||
+        std::strcmp(value, "off") == 0 || std::strcmp(value, "no") == 0)
+    {
+        *out = false;
+        return true;
+    }
+    return false;
+}
+
+void copyBounded(char* dst, size_t dst_len, const char* src)
+{
+    if (!dst || dst_len == 0)
+    {
+        return;
+    }
+    if (!src)
+    {
+        dst[0] = '\0';
+        return;
+    }
+    std::strncpy(dst, src, dst_len - 1);
+    dst[dst_len - 1] = '\0';
+}
+
+platform::nrf52::arduino_common::chat::meshtastic::MeshtasticRadioAdapter* getMeshtasticBackend(
+    app::IAppBleFacade& app)
+{
+    auto* adapter = app.getMeshAdapter();
+    if (!adapter || adapter->backendProtocol() != chat::MeshProtocol::Meshtastic)
+    {
+        return nullptr;
+    }
+
+    auto* backend = adapter->backendForProtocol(chat::MeshProtocol::Meshtastic);
+    return static_cast<platform::nrf52::arduino_common::chat::meshtastic::MeshtasticRadioAdapter*>(backend);
+}
+
+void copyNodeView(const chat::contacts::NodeEntry& entry, phone::PhoneNodeView& out)
+{
+    out = {};
+    out.node_id = entry.node_id;
+    copyBounded(out.short_name, sizeof(out.short_name), entry.short_name);
+    copyBounded(out.long_name, sizeof(out.long_name), entry.long_name);
+    out.last_seen = entry.last_seen;
+    out.snr = entry.snr;
+    out.rssi = entry.rssi;
+    out.hops_away = entry.hops_away;
+    out.channel = entry.channel;
+    out.next_hop = entry.next_hop;
+    out.protocol = entry.protocol;
+    out.role = entry.role;
+    out.hw_model = entry.hw_model;
+    out.has_macaddr = entry.has_macaddr;
+    std::memcpy(out.macaddr, entry.macaddr, sizeof(out.macaddr));
+    out.via_mqtt = entry.via_mqtt;
+    out.is_ignored = entry.is_ignored;
+    out.has_public_key = entry.has_public_key;
+    out.key_manually_verified = entry.key_manually_verified;
+    out.has_device_metrics = entry.has_device_metrics;
+    out.device_metrics = entry.device_metrics;
+    out.position.valid = entry.position_valid;
+    out.position.latitude_i = entry.position_latitude_i;
+    out.position.longitude_i = entry.position_longitude_i;
+    out.position.has_altitude = entry.position_has_altitude;
+    out.position.altitude = entry.position_altitude;
+    out.position.timestamp = entry.position_timestamp;
+    out.position.precision_bits = entry.position_precision_bits;
+    out.position.pdop = entry.position_pdop;
+    out.position.hdop = entry.position_hdop;
+    out.position.vdop = entry.position_vdop;
+    out.position.gps_accuracy_mm = entry.position_gps_accuracy_mm;
+}
+} // namespace
+
+AppPhoneFacade::AppPhoneFacade(app::IAppBleFacade& app,
+                               meshtastic_Config_BluetoothConfig& bluetooth_config,
+                               meshtastic_LocalModuleConfig& module_config,
+                               platform::shared::ble_bridge::IPhoneBleRuntime* ble_runtime)
+    : app_(app),
+      bluetooth_config_(bluetooth_config),
+      module_config_(module_config),
+      ble_runtime_(ble_runtime)
+{
+}
+
+void AppPhoneFacade::setBleRuntime(platform::shared::ble_bridge::IPhoneBleRuntime* runtime)
+{
+    ble_runtime_ = runtime;
+}
+
+void AppPhoneFacade::syncMeshtasticMqttProxySettings(const meshtastic_LocalModuleConfig& module_config)
+{
+    auto* mt = getMeshtasticBackend(app_);
+    if (!mt)
+    {
+        return;
+    }
+
+    const auto cfg = getMeshtasticPhoneConfig();
+    platform::nrf52::arduino_common::chat::meshtastic::MeshtasticRadioAdapter::MqttProxySettings settings;
+    platform::shared::ble_bridge::applyMeshtasticMqttProxySettings(settings, module_config, cfg);
+    mt->setMqttProxySettings(settings);
+}
+
+phone::MeshtasticPhoneConfigSnapshot AppPhoneFacade::getMeshtasticPhoneConfig() const
+{
+    return platform::shared::ble_bridge::makeMeshtasticPhoneConfigSnapshot(app_.getConfig());
+}
+
+void AppPhoneFacade::setMeshtasticPhoneConfig(const phone::MeshtasticPhoneConfigSnapshot& config)
+{
+    platform::shared::ble_bridge::applyMeshtasticPhoneConfigSnapshot(app_.getConfig(), config);
+}
+
+phone::MeshCorePhoneConfigSnapshot AppPhoneFacade::getMeshCorePhoneConfig() const
+{
+    return platform::shared::ble_bridge::makeMeshCorePhoneConfigSnapshot(app_.getConfig());
+}
+
+void AppPhoneFacade::setMeshCorePhoneConfig(const phone::MeshCorePhoneConfigSnapshot& config)
+{
+    platform::shared::ble_bridge::applyMeshCorePhoneConfigSnapshot(app_.getConfig(), config);
+}
+
+void AppPhoneFacade::saveConfig()
+{
+    app_.saveConfig();
+}
+
+void AppPhoneFacade::applyMeshConfig()
+{
+    app_.applyMeshConfig();
+}
+
+void AppPhoneFacade::applyUserInfo()
+{
+    app_.applyUserInfo();
+}
+
+void AppPhoneFacade::applyPositionConfig()
+{
+    app_.applyPositionConfig();
+}
+
+void AppPhoneFacade::getEffectiveUserInfo(char* out_long,
+                                          std::size_t long_len,
+                                          char* out_short,
+                                          std::size_t short_len) const
+{
+    app_.getEffectiveUserInfo(out_long, long_len, out_short, short_len);
+}
+
+chat::NodeId AppPhoneFacade::getSelfNodeId() const
+{
+    return app_.getSelfNodeId();
+}
+
+bool AppPhoneFacade::sendPhoneText(chat::ChannelId channel,
+                                   const std::string& text,
+                                   chat::MessageId forced_msg_id,
+                                   chat::NodeId peer,
+                                   chat::MessageId& out_msg_id)
+{
+    out_msg_id = app_.getChatService().sendTextWithId(channel, text, forced_msg_id, peer);
+    return out_msg_id != 0;
+}
+
+bool AppPhoneFacade::sendPhoneAppData(chat::ChannelId channel,
+                                      uint32_t portnum,
+                                      const uint8_t* payload,
+                                      std::size_t len,
+                                      chat::NodeId dest,
+                                      bool want_ack,
+                                      chat::MessageId packet_id,
+                                      bool want_response)
+{
+    auto* adapter = app_.getMeshAdapter();
+    return adapter && adapter->sendAppData(channel, portnum, payload, len, dest, want_ack, packet_id, want_response);
+}
+
+bool AppPhoneFacade::pollIncomingPhoneData(chat::MeshIncomingData& out)
+{
+    auto* adapter = app_.getMeshAdapter();
+    return adapter && adapter->pollIncomingData(&out);
+}
+
+std::size_t AppPhoneFacade::phoneNodeCount() const
+{
+    const auto* store = app_.getNodeStore();
+    return store ? store->getEntries().size() : 0;
+}
+
+bool AppPhoneFacade::getPhoneNodeByIndex(std::size_t index, phone::PhoneNodeView& out) const
+{
+    const auto* store = app_.getNodeStore();
+    if (!store)
+    {
+        return false;
+    }
+    const auto& entries = store->getEntries();
+    if (index >= entries.size())
+    {
+        return false;
+    }
+    copyNodeView(entries[index], out);
+    if (const auto* node = app_.getContactService().getNodeInfo(out.node_id))
+    {
+        out.position = node->position;
+    }
+    return true;
+}
+
+bool AppPhoneFacade::findPhoneNode(chat::NodeId node_id, phone::PhoneNodeView& out) const
+{
+    const auto* store = app_.getNodeStore();
+    if (!store)
+    {
+        return false;
+    }
+    for (const auto& entry : store->getEntries())
+    {
+        if (entry.node_id == node_id)
+        {
+            copyNodeView(entry, out);
+            if (const auto* node = app_.getContactService().getNodeInfo(out.node_id))
+            {
+                out.position = node->position;
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+bool AppPhoneFacade::isMeshPkiReady() const
+{
+    const auto* adapter = app_.getMeshAdapter();
+    return adapter ? adapter->isPkiReady() : false;
+}
+
+bool AppPhoneFacade::isBleEnabled() const
+{
+    return app_.isBleEnabled();
+}
+
+void AppPhoneFacade::setBleEnabled(bool enabled)
+{
+    app_.setBleEnabled(enabled);
+}
+
+bool AppPhoneFacade::getDeviceMacAddress(uint8_t out_mac[6]) const
+{
+    return app_.getDeviceMacAddress(out_mac);
+}
+
+bool AppPhoneFacade::syncCurrentEpochSeconds(uint32_t epoch_seconds)
+{
+    return app_.syncCurrentEpochSeconds(epoch_seconds);
+}
+
+void AppPhoneFacade::resetMeshConfig()
+{
+    app_.resetMeshConfig();
+}
+
+void AppPhoneFacade::clearNodeDb()
+{
+    app_.clearNodeDb();
+}
+
+void AppPhoneFacade::clearMessageDb()
+{
+    app_.clearMessageDb();
+}
+
+void AppPhoneFacade::restartDevice()
+{
+    app_.restartDevice();
+}
+
+bool AppPhoneFacade::loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const
+{
+    return meshtastic_config_bridge::loadBluetoothConfigView(bluetooth_config_, app_.isBleEnabled(), out);
+}
+
+void AppPhoneFacade::saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config)
+{
+    bluetooth_config_ = config;
+    meshtastic_config_bridge::normalizeBluetoothConfig(&bluetooth_config_);
+    bluetooth_config_.enabled = config.enabled;
+    if (ble_runtime_)
+    {
+        ble_runtime_->onPhoneBluetoothConfigChanged();
+    }
+}
+
+bool AppPhoneFacade::loadModuleConfig(meshtastic_LocalModuleConfig* out) const
+{
+    if (!out)
+    {
+        return false;
+    }
+
+    *out = module_config_;
+    meshtastic_config_bridge::normalizeModuleConfig(out);
+    return true;
+}
+
+void AppPhoneFacade::saveModuleConfig(const meshtastic_LocalModuleConfig& config)
+{
+    module_config_ = config;
+    meshtastic_config_bridge::normalizeModuleConfig(&module_config_);
+    if (ble_runtime_)
+    {
+        ble_runtime_->onPhoneModuleConfigChanged();
+    }
+}
+
+void AppPhoneFacade::onConfigStart()
+{
+    if (ble_runtime_)
+    {
+        ble_runtime_->requestPhoneHighThroughputConnection();
+    }
+}
+
+void AppPhoneFacade::onConfigComplete()
+{
+    if (ble_runtime_)
+    {
+        ble_runtime_->requestPhoneLowerPowerConnection();
+    }
+}
+
+bool AppPhoneFacade::loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const
+{
+    const bool connected = ble_runtime_ ? ble_runtime_->isPhoneBleConnected() : false;
+    const uint32_t passkey = ble_runtime_ ? ble_runtime_->pendingPhoneBlePasskey() : 0;
+    return meshtastic_config_bridge::fillDeviceConnectionStatus(passkey, connected, out);
+}
+
+bool AppPhoneFacade::handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg)
+{
+    auto* mt = getMeshtasticBackend(app_);
+    return mt ? mt->handleMqttProxyMessage(msg) : false;
+}
+
+bool AppPhoneFacade::pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out)
+{
+    auto* mt = getMeshtasticBackend(app_);
+    return (mt && out) ? mt->pollMqttProxyMessage(out) : false;
+}
+
+bool AppPhoneFacade::loadTimezoneTzdef(char* out, size_t out_len) const
+{
+    if (!out || out_len == 0)
+    {
+        return false;
+    }
+
+    out[0] = '\0';
+
+#if defined(GAT562_MESH_EVB_PRO)
+    return false;
+#else
+    return platform::shared::ble_bridge::loadTimezoneTzdefFromSettings(out, out_len);
+#endif
+}
+
+void AppPhoneFacade::saveTimezoneTzdef(const char* tzdef)
+{
+#if defined(GAT562_MESH_EVB_PRO)
+    (void)tzdef;
+#else
+    platform::shared::ble_bridge::saveTimezoneTzdefToSettings(tzdef);
+#endif
+}
+
+int AppPhoneFacade::getTimezoneOffsetMinutes() const
+{
+    return platform::shared::ble_bridge::getTimezoneOffsetMinutes();
+}
+
+void AppPhoneFacade::setTimezoneOffsetMinutes(int offset_min)
+{
+    platform::shared::ble_bridge::setTimezoneOffsetMinutes(offset_min);
+}
+
+bool AppPhoneFacade::getGpsFix(phone::meshtastic::MeshtasticGpsFix* out) const
+{
+    return platform::shared::ble_bridge::setMeshtasticGpsFixUnavailable(out);
+}
+
+bool AppPhoneFacade::getCustomVars(std::string* out) const
+{
+    if (!out)
+    {
+        return false;
+    }
+
+    out->clear();
+
+    const auto mesh_cfg = getMeshCorePhoneConfig();
+    const auto mt_cfg = getMeshtasticPhoneConfig();
+    appendCustomVar(*out, "node_name", mesh_cfg.node_name);
+    appendCustomVar(*out, "channel_name", mesh_cfg.mesh.meshcore_channel_name);
+    appendCustomVar(*out, "multi_acks", mesh_cfg.mesh.meshcore_multi_acks ? "1" : "0");
+    appendCustomVar(*out, "gps", mt_cfg.gps_enabled ? "1" : "0");
+
+    appendCustomVar(*out, "manual_add_contacts", "0");
+    appendCustomVar(*out, "telemetry_base", "0");
+    appendCustomVar(*out, "telemetry_loc", "0");
+    appendCustomVar(*out, "telemetry_env", "0");
+    appendCustomVar(*out, "advert_loc_policy", "0");
+    appendCustomVar(*out, "ble_pin", "0");
+
+    return true;
+}
+
+bool AppPhoneFacade::setCustomVar(const char* key, const char* value)
+{
+    if (!key || !value)
+    {
+        return false;
+    }
+
+    auto mesh_cfg = getMeshCorePhoneConfig();
+    auto mt_cfg = getMeshtasticPhoneConfig();
+    bool changed = false;
+    bool mesh_changed = false;
+    bool mt_changed = false;
+    bool position_changed = false;
+
+    if (std::strcmp(key, "node_name") == 0)
+    {
+        char next[sizeof(mesh_cfg.node_name)] = {};
+        copyBounded(next, sizeof(next), value);
+        if (std::strcmp(mesh_cfg.node_name, next) != 0)
+        {
+            copyBounded(mesh_cfg.node_name, sizeof(mesh_cfg.node_name), next);
+            copyBounded(mt_cfg.node_name, sizeof(mt_cfg.node_name), next);
+            changed = true;
+            mesh_changed = true;
+            mt_changed = true;
+        }
+    }
+    else if (std::strcmp(key, "channel_name") == 0)
+    {
+        char next[sizeof(mesh_cfg.mesh.meshcore_channel_name)] = {};
+        copyBounded(next, sizeof(next), value);
+        if (std::strcmp(mesh_cfg.mesh.meshcore_channel_name, next) != 0)
+        {
+            copyBounded(mesh_cfg.mesh.meshcore_channel_name, sizeof(mesh_cfg.mesh.meshcore_channel_name), next);
+            changed = true;
+            mesh_changed = true;
+        }
+    }
+    else if (std::strcmp(key, "multi_acks") == 0)
+    {
+        bool parsed = false;
+        if (!parseBoolValue(value, &parsed))
+        {
+            return false;
+        }
+        if (mesh_cfg.mesh.meshcore_multi_acks != parsed)
+        {
+            mesh_cfg.mesh.meshcore_multi_acks = parsed;
+            changed = true;
+            mesh_changed = true;
+        }
+    }
+    else if (std::strcmp(key, "gps") == 0)
+    {
+        bool parsed = false;
+        if (!parseBoolValue(value, &parsed))
+        {
+            return false;
+        }
+        if (mt_cfg.gps_enabled != parsed)
+        {
+            mt_cfg.gps_enabled = parsed;
+            changed = true;
+            mt_changed = true;
+            position_changed = true;
+        }
+    }
+    else if (std::strcmp(key, "manual_add_contacts") == 0 ||
+             std::strcmp(key, "telemetry_base") == 0 ||
+             std::strcmp(key, "telemetry_loc") == 0 ||
+             std::strcmp(key, "telemetry_env") == 0 ||
+             std::strcmp(key, "advert_loc_policy") == 0 ||
+             std::strcmp(key, "ble_pin") == 0)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+
+    if (changed)
+    {
+        if (mesh_changed)
+        {
+            setMeshCorePhoneConfig(mesh_cfg);
+        }
+        if (mt_changed)
+        {
+            setMeshtasticPhoneConfig(mt_cfg);
+        }
+        app_.saveConfig();
+    }
+    if (position_changed)
+    {
+        app_.applyPositionConfig();
+    }
+    return true;
+}
+
+chat::meshcore::IMeshCoreBleBackend* AppPhoneFacade::meshCoreBackend()
+{
+    auto* adapter = app_.getMeshAdapter();
+    if (!adapter || app_.getConfig().mesh_protocol != chat::MeshProtocol::MeshCore)
+    {
+        return nullptr;
+    }
+    if (auto* backend = adapter->backendForProtocol(chat::MeshProtocol::MeshCore))
+    {
+        return backend->asMeshCoreBleBackend();
+    }
+    return adapter->asMeshCoreBleBackend();
+}
+
+const chat::meshcore::IMeshCoreBleBackend* AppPhoneFacade::meshCoreBackend() const
+{
+    auto* adapter = app_.getMeshAdapter();
+    if (!adapter || app_.getConfig().mesh_protocol != chat::MeshProtocol::MeshCore)
+    {
+        return nullptr;
+    }
+    if (auto* backend = adapter->backendForProtocol(chat::MeshProtocol::MeshCore))
+    {
+        return backend->asMeshCoreBleBackend();
+    }
+    return adapter->asMeshCoreBleBackend();
+}
+
+bool AppPhoneFacade::meshCoreExportIdentityPublicKey(uint8_t* out_pubkey, std::size_t len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && out_pubkey && len >= chat::meshcore::kMeshCorePubKeySize &&
+           backend->exportIdentityPublicKey(out_pubkey);
+}
+
+bool AppPhoneFacade::meshCoreExportIdentityPrivateKey(uint8_t* out_priv, std::size_t len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && out_priv && len >= chat::meshcore::kMeshCorePrivKeySize &&
+           backend->exportIdentityPrivateKey(out_priv);
+}
+
+bool AppPhoneFacade::meshCoreImportIdentityPrivateKey(const uint8_t* in_priv, std::size_t len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->importIdentityPrivateKey(in_priv, len);
+}
+
+bool AppPhoneFacade::meshCoreSignPayload(const uint8_t* data, std::size_t len, uint8_t* out_sig, std::size_t out_len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && out_sig && out_len >= chat::meshcore::kMeshCoreSignatureSize &&
+           backend->signPayload(data, len, out_sig);
+}
+
+bool AppPhoneFacade::meshCoreSendSelfAdvert(bool broadcast)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendSelfAdvert(broadcast);
+}
+
+bool AppPhoneFacade::meshCoreSendPeerRequestType(const uint8_t* pubkey,
+                                                 std::size_t len,
+                                                 uint8_t req_type,
+                                                 uint32_t* out_tag,
+                                                 uint32_t* out_est_timeout,
+                                                 bool* out_sent_flood)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendPeerRequestType(pubkey, len, req_type, out_tag, out_est_timeout, out_sent_flood);
+}
+
+bool AppPhoneFacade::meshCoreSendPeerRequestPayload(const uint8_t* pubkey,
+                                                    std::size_t len,
+                                                    const uint8_t* payload,
+                                                    std::size_t payload_len,
+                                                    bool force_flood,
+                                                    uint32_t* out_tag,
+                                                    uint32_t* out_est_timeout,
+                                                    bool* out_sent_flood)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendPeerRequestPayload(pubkey,
+                                                      len,
+                                                      payload,
+                                                      payload_len,
+                                                      force_flood,
+                                                      out_tag,
+                                                      out_est_timeout,
+                                                      out_sent_flood);
+}
+
+bool AppPhoneFacade::meshCoreSendAnonRequestPayload(const uint8_t* pubkey,
+                                                    std::size_t len,
+                                                    const uint8_t* payload,
+                                                    std::size_t payload_len,
+                                                    uint32_t* out_est_timeout,
+                                                    bool* out_sent_flood)
+{
+    auto* backend = meshCoreBackend();
+    return backend &&
+           backend->sendAnonRequestPayload(pubkey, len, payload, payload_len, out_est_timeout, out_sent_flood);
+}
+
+bool AppPhoneFacade::meshCoreSendTracePath(const uint8_t* path,
+                                           std::size_t path_len,
+                                           uint32_t tag,
+                                           uint32_t auth,
+                                           uint8_t flags,
+                                           uint32_t* out_est_timeout)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendTracePath(path, path_len, tag, auth, flags, out_est_timeout);
+}
+
+bool AppPhoneFacade::meshCoreSendControlData(const uint8_t* payload, std::size_t payload_len)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendControlData(payload, payload_len);
+}
+
+bool AppPhoneFacade::meshCoreSendRawData(const uint8_t* path,
+                                         std::size_t path_len,
+                                         const uint8_t* payload,
+                                         std::size_t payload_len,
+                                         uint32_t* out_est_timeout)
+{
+    auto* backend = meshCoreBackend();
+    return backend && backend->sendRawData(path, path_len, payload, payload_len, out_est_timeout);
+}
+
+void AppPhoneFacade::meshCoreSetFloodScopeKey(const uint8_t* key, std::size_t len)
+{
+    if (auto* backend = meshCoreBackend())
+    {
+        backend->setFloodScopeKey(key, len);
+    }
+}
+
+} // namespace ble
diff --git a/platform/nrf52/arduino_common/src/ble/meshcore_ble.cpp b/platform/nrf52/arduino_common/src/ble/meshcore_ble.cpp
index 3e99b1b0..699684ba 100644
--- a/platform/nrf52/arduino_common/src/ble/meshcore_ble.cpp
+++ b/platform/nrf52/arduino_common/src/ble/meshcore_ble.cpp
@@ -2,7 +2,6 @@
 
 #include "ble/ble_uuids.h"
 #include "ble/bluefruit_runtime.h"
-#include "platform/shared/ble/app_config_phone_snapshot_bridge.h"
 
 #include <Arduino.h>
 #include <cstdlib>
@@ -143,11 +142,12 @@ void onTxAuthorize(uint16_t conn_handle, BLECharacteristic* chr, ble_gatts_evt_r
 
 MeshCoreBleService::MeshCoreBleService(app::IAppBleFacade& ctx, const std::string& device_name)
     : ctx_(ctx),
+      phone_facade_(ctx, phone_ble_config_, phone_module_config_),
       device_name_(device_name),
       service_(::BLEUuid(NUS_SERVICE_UUID)),
       rx_char_(::BLEUuid(NUS_CHAR_RX_UUID)),
       tx_char_(::BLEUuid(NUS_CHAR_TX_UUID)),
-      core_(new MeshCorePhoneCore(*this, device_name, this))
+      core_(new phone::meshcore::MeshCorePhoneCore(phone_facade_, device_name, this))
 {
 }
 
@@ -297,12 +297,7 @@ bool MeshCoreBleService::getCustomVars(std::string* out) const
 
     out->clear();
 
-    const auto mesh_cfg = getMeshCorePhoneConfig();
-    const auto mt_cfg = getMeshtasticPhoneConfig();
-    appendCustomVar(*out, "node_name", mesh_cfg.node_name);
-    appendCustomVar(*out, "channel_name", mesh_cfg.mesh.meshcore_channel_name);
-    appendCustomVar(*out, "multi_acks", mesh_cfg.mesh.meshcore_multi_acks ? "1" : "0");
-    appendCustomVar(*out, "gps", mt_cfg.gps_enabled ? "1" : "0");
+    phone_facade_.getCustomVars(out);
 
     // Keep the variable surface compatible with the MeshCore app even if
     // nRF52 doesn't implement every extended option yet.
@@ -323,8 +318,8 @@ bool MeshCoreBleService::setCustomVar(const char* key, const char* value)
         return false;
     }
 
-    auto mesh_cfg = getMeshCorePhoneConfig();
-    auto mt_cfg = getMeshtasticPhoneConfig();
+    auto mesh_cfg = phone_facade_.getMeshCorePhoneConfig();
+    auto mt_cfg = phone_facade_.getMeshtasticPhoneConfig();
     bool changed = false;
     bool mesh_changed = false;
     bool mt_changed = false;
@@ -404,39 +399,19 @@ bool MeshCoreBleService::setCustomVar(const char* key, const char* value)
     {
         if (mesh_changed)
         {
-            setMeshCorePhoneConfig(mesh_cfg);
+            phone_facade_.setMeshCorePhoneConfig(mesh_cfg);
         }
         if (mt_changed)
         {
-            setMeshtasticPhoneConfig(mt_cfg);
+            phone_facade_.setMeshtasticPhoneConfig(mt_cfg);
         }
-        ctx_.saveConfig();
+        phone_facade_.saveConfig();
     }
     if (position_changed)
     {
-        ctx_.applyPositionConfig();
+        phone_facade_.applyPositionConfig();
     }
     return true;
 }
 
-MeshtasticPhoneConfigSnapshot MeshCoreBleService::getMeshtasticPhoneConfig() const
-{
-    return platform::shared::ble_bridge::makeMeshtasticPhoneConfigSnapshot(ctx_.getConfig());
-}
-
-void MeshCoreBleService::setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config)
-{
-    platform::shared::ble_bridge::applyMeshtasticPhoneConfigSnapshot(ctx_.getConfig(), config);
-}
-
-MeshCorePhoneConfigSnapshot MeshCoreBleService::getMeshCorePhoneConfig() const
-{
-    return platform::shared::ble_bridge::makeMeshCorePhoneConfigSnapshot(ctx_.getConfig());
-}
-
-void MeshCoreBleService::setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config)
-{
-    platform::shared::ble_bridge::applyMeshCorePhoneConfigSnapshot(ctx_.getConfig(), config);
-}
-
 } // namespace ble
diff --git a/platform/nrf52/arduino_common/src/ble/meshtastic_ble.cpp b/platform/nrf52/arduino_common/src/ble/meshtastic_ble.cpp
index 85707fdb..1a9d1591 100644
--- a/platform/nrf52/arduino_common/src/ble/meshtastic_ble.cpp
+++ b/platform/nrf52/arduino_common/src/ble/meshtastic_ble.cpp
@@ -1,25 +1,18 @@
 #include "../../include/ble/meshtastic_ble.h"
 
 #include "ble/ble_uuids.h"
-#if defined(GAT562_MESH_EVB_PRO)
-#include "boards/gat562_mesh_evb_pro/settings_store.h"
-#endif
+#include "ble/meshtastic_ble_observer_bridge.h"
+#include "ble/meshtastic_ble_persistence_bridge.h"
 #include "chat/ble/meshtastic_defaults.h"
 #include "chat/ble/meshtastic_phone_config_bridge.h"
 #include "platform/nrf52/arduino_common/chat/infra/meshtastic/meshtastic_radio_adapter.h"
 #include "platform/shared/ble/app_config_phone_snapshot_bridge.h"
 #include "platform/shared/ble/meshtastic_phone_runtime_bridge.h"
-#if !defined(GAT562_MESH_EVB_PRO)
-#include "platform/ui/settings_store.h"
-#endif
 
 #include <Arduino.h>
 #include <cstdarg>
 #include <cstdio>
 #include <cstring>
-#if !defined(GAT562_MESH_EVB_PRO)
-#include <vector>
-#endif
 
 namespace ble
 {
@@ -27,11 +20,6 @@ namespace
 {
 constexpr uint32_t kDefaultBleFixedPin = 654321;
 constexpr uint32_t kConfigSaveDebounceMs = 1500UL;
-#if !defined(GAT562_MESH_EVB_PRO)
-constexpr const char* kBleSettingsNamespace = "ble_meshtastic";
-constexpr const char* kBluetoothConfigKey = "bt_cfg";
-constexpr const char* kModuleConfigKey = "mod_cfg";
-#endif
 
 bool usbSerialWritable(std::size_t len)
 {
@@ -52,101 +40,6 @@ void bleLogBoth(const char* fmt, ...)
     Serial2.println(buffer);
 }
 
-platform::nrf52::arduino_common::chat::meshtastic::MeshtasticRadioAdapter* getMeshtasticBackend(app::IAppBleFacade& ctx)
-{
-    auto* adapter = ctx.getMeshAdapter();
-    if (!adapter || adapter->backendProtocol() != chat::MeshProtocol::Meshtastic)
-    {
-        return nullptr;
-    }
-
-    auto* backend = adapter->backendForProtocol(chat::MeshProtocol::Meshtastic);
-    return static_cast<platform::nrf52::arduino_common::chat::meshtastic::MeshtasticRadioAdapter*>(backend);
-}
-
-#if !defined(GAT562_MESH_EVB_PRO)
-template <typename T>
-bool loadBlobConfigFromUiStore(const char* key, T* out)
-{
-    if (!out)
-    {
-        return false;
-    }
-
-    std::vector<uint8_t> blob;
-    if (!platform::ui::settings_store::get_blob(kBleSettingsNamespace, key, blob))
-    {
-        return false;
-    }
-    if (blob.size() != sizeof(T))
-    {
-        bleLogBoth("[BLE][nrf52][mt] load cfg size mismatch key=%s got=%u expected=%u",
-                   key ? key : "?",
-                   static_cast<unsigned>(blob.size()),
-                   static_cast<unsigned>(sizeof(T)));
-        return false;
-    }
-
-    std::memcpy(out, blob.data(), sizeof(T));
-    return true;
-}
-
-template <typename T>
-bool saveBlobConfigToUiStore(const char* key, const T& value)
-{
-    const bool ok = platform::ui::settings_store::put_blob(kBleSettingsNamespace, key, &value, sizeof(T));
-    if (!ok)
-    {
-        bleLogBoth("[BLE][nrf52][mt] save cfg failed key=%s size=%u",
-                   key ? key : "?",
-                   static_cast<unsigned>(sizeof(T)));
-    }
-    return ok;
-}
-#endif
-
-bool loadPersistedBleState(meshtastic_config_bridge::PersistedState* out)
-{
-    if (!out)
-    {
-        return false;
-    }
-
-    *out = meshtastic_config_bridge::PersistedState{};
-
-#if defined(GAT562_MESH_EVB_PRO)
-    if (::boards::gat562_mesh_evb_pro::settings_store::loadMeshtasticBleState(&out->bluetooth, &out->module))
-    {
-        out->has_bluetooth = true;
-        out->has_module = true;
-        return true;
-    }
-    return false;
-#else
-    out->has_bluetooth = loadBlobConfigFromUiStore(kBluetoothConfigKey, &out->bluetooth);
-    out->has_module = loadBlobConfigFromUiStore(kModuleConfigKey, &out->module);
-    if (out->has_bluetooth || out->has_module)
-    {
-        bleLogBoth("[BLE][nrf52][mt] legacy cfg store fallback bt=%u mod=%u",
-                   out->has_bluetooth ? 1U : 0U,
-                   out->has_module ? 1U : 0U);
-    }
-    return out->has_bluetooth || out->has_module;
-#endif
-}
-
-bool savePersistedBleState(const meshtastic_Config_BluetoothConfig& bluetooth,
-                           const meshtastic_LocalModuleConfig& module)
-{
-#if defined(GAT562_MESH_EVB_PRO)
-    return ::boards::gat562_mesh_evb_pro::settings_store::saveMeshtasticBleState(bluetooth, module);
-#else
-    const bool bluetooth_ok = saveBlobConfigToUiStore(kBluetoothConfigKey, bluetooth);
-    const bool module_ok = saveBlobConfigToUiStore(kModuleConfigKey, module);
-    return bluetooth_ok && module_ok;
-#endif
-}
-
 uint32_t parsePasskeyDigits(const uint8_t passkey[6])
 {
     if (!passkey)
@@ -324,7 +217,8 @@ void onFromRadioAuthorize(uint16_t conn_handle, BLECharacteristic* chr, ble_gatt
 } // namespace
 
 MeshtasticBleService::MeshtasticBleService(app::IAppBleFacade& ctx, const std::string& device_name)
-    : ctx_(ctx),
+    : phone_facade_(ctx, ble_config_, module_config_, this),
+      observer_bridge_(new MeshtasticBleObserverBridge(ctx, *this)),
       device_name_(device_name),
       service_(::BLEUuid(MESH_SERVICE_UUID)),
       to_radio_(::BLEUuid(TORADIO_UUID)),
@@ -333,28 +227,22 @@ MeshtasticBleService::MeshtasticBleService(app::IAppBleFacade& ctx, const std::s
       log_radio_(::BLEUuid(LOGRADIO_UUID))
 {
     ble_config_ = meshtastic_Config_BluetoothConfig_init_zero;
-    ble_config_.enabled = ctx_.isBleEnabled();
+    ble_config_.enabled = phone_facade_.isBleEnabled();
     ble_config_.mode = meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN;
     ble_config_.fixed_pin = 0;
 
     meshtastic_config_bridge::PersistedState persisted{};
-    const bool persisted_ok = loadPersistedBleState(&persisted);
+    const bool persisted_ok = loadMeshtasticBlePersistedState(&persisted);
 
     bleLogBoth("[BLE][nrf52][mt] persisted load ok=%u has_bt=%u has_mod=%u",
                persisted_ok ? 1U : 0U,
                persisted.has_bluetooth ? 1U : 0U,
                persisted.has_module ? 1U : 0U);
 
-#if defined(GAT562_MESH_EVB_PRO)
-    bleLogBoth("[BLE][nrf52][mt] settings_store load=%s save=%s",
-               ::boards::gat562_mesh_evb_pro::settings_store::statusLabel(
-                   ::boards::gat562_mesh_evb_pro::settings_store::lastLoadStatus()),
-               ::boards::gat562_mesh_evb_pro::settings_store::statusLabel(
-                   ::boards::gat562_mesh_evb_pro::settings_store::lastSaveStatus()));
-#endif
+    logMeshtasticBlePersistenceStatus();
 
     meshtastic_config_bridge::initializeConfigState(
-        persisted, ctx_.isBleEnabled(), ctx_.getSelfNodeId(), &ble_config_, &module_config_);
+        persisted, phone_facade_.isBleEnabled(), phone_facade_.getSelfNodeId(), &ble_config_, &module_config_);
 
     if (persisted.has_bluetooth)
     {
@@ -370,7 +258,14 @@ MeshtasticBleService::MeshtasticBleService(app::IAppBleFacade& ctx, const std::s
                    module_config_.mqtt.root);
     }
 
-    phone_session_.reset(new MeshtasticPhoneSession(*this, *this, this, this, this, this, this, this));
+    phone_session_.reset(new phone::meshtastic::MeshtasticPhoneSession(phone_facade_,
+                                                                       *this,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_,
+                                                                       &phone_facade_));
 }
 
 MeshtasticBleService::~MeshtasticBleService()
@@ -454,9 +349,10 @@ void MeshtasticBleService::start()
     log_radio_.begin();
     bleLogBoth("[BLE][nrf52][mt] chars ready");
 
-    ctx_.getChatService().addIncomingTextObserver(this);
-    ctx_.getChatService().addOutgoingTextObserver(this);
-    ctx_.getChatService().addIncomingDataObserver(this);
+    if (observer_bridge_)
+    {
+        observer_bridge_->registerObservers();
+    }
 
     startAdvertising(service_);
     active_ = true;
@@ -468,9 +364,10 @@ void MeshtasticBleService::start()
 
 void MeshtasticBleService::stop()
 {
-    ctx_.getChatService().removeIncomingTextObserver(this);
-    ctx_.getChatService().removeOutgoingTextObserver(this);
-    ctx_.getChatService().removeIncomingDataObserver(this);
+    if (observer_bridge_)
+    {
+        observer_bridge_->unregisterObservers();
+    }
 
     disconnectAll();
     Bluefruit.Advertising.stop();
@@ -542,7 +439,7 @@ void MeshtasticBleService::update()
     }
 }
 
-void MeshtasticBleService::onIncomingText(const chat::MeshIncomingText& msg)
+void MeshtasticBleService::handleIncomingTextFromApp(const chat::MeshIncomingText& msg)
 {
     if (phone_session_)
     {
@@ -554,7 +451,7 @@ void MeshtasticBleService::onIncomingText(const chat::MeshIncomingText& msg)
     }
 }
 
-void MeshtasticBleService::onOutgoingText(const chat::MeshIncomingText& msg)
+void MeshtasticBleService::handleOutgoingTextFromApp(const chat::MeshIncomingText& msg)
 {
     if (phone_session_)
     {
@@ -571,7 +468,7 @@ void MeshtasticBleService::onOutgoingText(const chat::MeshIncomingText& msg)
     }
 }
 
-void MeshtasticBleService::onIncomingData(const chat::MeshIncomingData& msg)
+void MeshtasticBleService::handleIncomingDataFromApp(const chat::MeshIncomingData& msg)
 {
     if (phone_session_)
     {
@@ -649,7 +546,7 @@ void MeshtasticBleService::handleToPhone()
             return;
         }
 
-        MeshtasticBleFrame session_frame{};
+        phone::meshtastic::MeshtasticBleFrame session_frame{};
         if (!phone_session_->popToPhone(&session_frame))
         {
             if (waiting_for_read && in_send_packets)
@@ -1045,7 +942,7 @@ bool MeshtasticBleService::getPairingStatus(BlePairingStatus* out) const
     }
 
     *out = BlePairingStatus{};
-    out->available = ctx_.isBleEnabled();
+    out->available = phone_facade_.isBleEnabled();
     out->requires_passkey = ble_config_.mode != meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN;
     out->is_fixed_pin = ble_config_.mode == meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN;
     out->is_connected = isBleConnected();
@@ -1059,6 +956,40 @@ bool MeshtasticBleService::isBleConnected() const
     return connected_ && Bluefruit.connected();
 }
 
+bool MeshtasticBleService::isPhoneBleConnected() const
+{
+    return isBleConnected();
+}
+
+uint32_t MeshtasticBleService::pendingPhoneBlePasskey() const
+{
+    return effectivePasskey();
+}
+
+void MeshtasticBleService::requestPhoneHighThroughputConnection()
+{
+}
+
+void MeshtasticBleService::requestPhoneLowerPowerConnection()
+{
+}
+
+void MeshtasticBleService::onPhoneBluetoothConfigChanged()
+{
+    markConfigSavePending(true, false);
+    bleLogBoth("[BLE][nrf52][mt] saveBluetoothConfig queued mode=%u pin=%06lu enabled=%u",
+               static_cast<unsigned>(ble_config_.mode),
+               static_cast<unsigned long>(ble_config_.fixed_pin),
+               ble_config_.enabled ? 1U : 0U);
+}
+
+void MeshtasticBleService::onPhoneModuleConfigChanged()
+{
+    markConfigSavePending(false, true);
+    syncMqttProxySettings();
+    bleLogBoth("[BLE][nrf52][mt] saveModuleConfig queued");
+}
+
 void MeshtasticBleService::notifyFromNum(uint32_t from_num)
 {
     pending_from_num_ = from_num;
@@ -1108,114 +1039,6 @@ void MeshtasticBleService::flushPendingFromNumNotify()
     }
 }
 
-bool MeshtasticBleService::loadBluetoothConfig(meshtastic_Config_BluetoothConfig* out) const
-{
-    return meshtastic_config_bridge::loadBluetoothConfigView(ble_config_, ctx_.isBleEnabled(), out);
-}
-
-void MeshtasticBleService::saveBluetoothConfig(const meshtastic_Config_BluetoothConfig& config)
-{
-    ble_config_ = config;
-    meshtastic_config_bridge::normalizeBluetoothConfig(&ble_config_);
-    ble_config_.enabled = config.enabled;
-    markConfigSavePending(true, false);
-    bleLogBoth("[BLE][nrf52][mt] saveBluetoothConfig queued mode=%u pin=%06lu enabled=%u",
-               static_cast<unsigned>(ble_config_.mode),
-               static_cast<unsigned long>(ble_config_.fixed_pin),
-               ble_config_.enabled ? 1U : 0U);
-}
-
-bool MeshtasticBleService::loadDeviceConnectionStatus(meshtastic_DeviceConnectionStatus* out) const
-{
-    return meshtastic_config_bridge::fillDeviceConnectionStatus(effectivePasskey(), isBleConnected(), out);
-}
-
-bool MeshtasticBleService::loadModuleConfig(meshtastic_LocalModuleConfig* out) const
-{
-    if (!out)
-    {
-        return false;
-    }
-
-    *out = module_config_;
-    meshtastic_config_bridge::normalizeModuleConfig(out);
-    return true;
-}
-
-void MeshtasticBleService::saveModuleConfig(const meshtastic_LocalModuleConfig& config)
-{
-    bleLogBoth("[BLE][nrf52][mt] saveModuleConfig mqtt enabled=%u proxy=%u enc=%u root=%s",
-               config.has_mqtt && config.mqtt.enabled ? 1U : 0U,
-               config.has_mqtt && config.mqtt.proxy_to_client_enabled ? 1U : 0U,
-               config.has_mqtt ? (config.mqtt.encryption_enabled ? 1U : 0U) : 1U,
-               config.has_mqtt ? config.mqtt.root : "");
-    module_config_ = config;
-    meshtastic_config_bridge::normalizeModuleConfig(&module_config_);
-    markConfigSavePending(false, true);
-    syncMqttProxySettings();
-    bleLogBoth("[BLE][nrf52][mt] saveModuleConfig queued");
-}
-
-bool MeshtasticBleService::loadTimezoneTzdef(char* out, size_t out_len) const
-{
-    if (!out || out_len == 0)
-    {
-        return false;
-    }
-
-    out[0] = '\0';
-
-#if defined(GAT562_MESH_EVB_PRO)
-    return false;
-#else
-    return platform::shared::ble_bridge::loadTimezoneTzdefFromSettings(out, out_len);
-#endif
-}
-
-void MeshtasticBleService::saveTimezoneTzdef(const char* tzdef)
-{
-#if defined(GAT562_MESH_EVB_PRO)
-    (void)tzdef;
-#else
-    platform::shared::ble_bridge::saveTimezoneTzdefToSettings(tzdef);
-#endif
-}
-
-int MeshtasticBleService::getTimezoneOffsetMinutes() const
-{
-    return platform::shared::ble_bridge::getTimezoneOffsetMinutes();
-}
-
-void MeshtasticBleService::setTimezoneOffsetMinutes(int offset_min)
-{
-    platform::shared::ble_bridge::setTimezoneOffsetMinutes(offset_min);
-}
-
-bool MeshtasticBleService::getGpsFix(MeshtasticGpsFix* out) const
-{
-    return platform::shared::ble_bridge::setMeshtasticGpsFixUnavailable(out);
-}
-
-MeshtasticPhoneConfigSnapshot MeshtasticBleService::getMeshtasticPhoneConfig() const
-{
-    return platform::shared::ble_bridge::makeMeshtasticPhoneConfigSnapshot(ctx_.getConfig());
-}
-
-void MeshtasticBleService::setMeshtasticPhoneConfig(const MeshtasticPhoneConfigSnapshot& config)
-{
-    platform::shared::ble_bridge::applyMeshtasticPhoneConfigSnapshot(ctx_.getConfig(), config);
-}
-
-MeshCorePhoneConfigSnapshot MeshtasticBleService::getMeshCorePhoneConfig() const
-{
-    return platform::shared::ble_bridge::makeMeshCorePhoneConfigSnapshot(ctx_.getConfig());
-}
-
-void MeshtasticBleService::setMeshCorePhoneConfig(const MeshCorePhoneConfigSnapshot& config)
-{
-    platform::shared::ble_bridge::applyMeshCorePhoneConfigSnapshot(ctx_.getConfig(), config);
-}
-
 void MeshtasticBleService::markConfigSavePending(bool bluetooth_changed, bool module_changed)
 {
     if (bluetooth_changed)
@@ -1255,11 +1078,11 @@ void MeshtasticBleService::flushPendingConfigSaves(bool force)
 
     meshtastic_Config_BluetoothConfig persisted_bluetooth = ble_config_;
     meshtastic_config_bridge::normalizeBluetoothConfig(&persisted_bluetooth);
-    persisted_bluetooth.enabled = ctx_.isBleEnabled();
+    persisted_bluetooth.enabled = phone_facade_.isBleEnabled();
     meshtastic_LocalModuleConfig persisted_module = module_config_;
     meshtastic_config_bridge::normalizeModuleConfig(&persisted_module);
     const bool needs_save = bluetooth_config_save_pending_ || module_config_save_pending_;
-    const bool persisted = needs_save ? savePersistedBleState(persisted_bluetooth, persisted_module) : true;
+    const bool persisted = needs_save ? saveMeshtasticBlePersistedState(persisted_bluetooth, persisted_module) : true;
     ble_config_.enabled = persisted_bluetooth.enabled;
 
     bleLogBoth("[BLE][nrf52][mt] current mem persisted=%u bluetooth_config_save_pending_=%u module_config_save_pending_=%u needs_save=%u",
@@ -1300,30 +1123,9 @@ void MeshtasticBleService::flushPendingConfigSaves(bool force)
     }
 }
 
-bool MeshtasticBleService::handleMqttProxyToRadio(const meshtastic_MqttClientProxyMessage& msg)
-{
-    auto* mt = getMeshtasticBackend(ctx_);
-    return mt ? mt->handleMqttProxyMessage(msg) : false;
-}
-
-bool MeshtasticBleService::pollMqttProxyToPhone(meshtastic_MqttClientProxyMessage* out)
-{
-    auto* mt = getMeshtasticBackend(ctx_);
-    return (mt && out) ? mt->pollMqttProxyMessage(out) : false;
-}
-
 void MeshtasticBleService::syncMqttProxySettings()
 {
-    auto* mt = getMeshtasticBackend(ctx_);
-    if (!mt)
-    {
-        return;
-    }
-
-    const auto cfg = getMeshtasticPhoneConfig();
-    platform::nrf52::arduino_common::chat::meshtastic::MeshtasticRadioAdapter::MqttProxySettings settings;
-    platform::shared::ble_bridge::applyMeshtasticMqttProxySettings(settings, module_config_, cfg);
-    mt->setMqttProxySettings(settings);
+    phone_facade_.syncMeshtasticMqttProxySettings(module_config_);
 }
 
 void MeshtasticBleService::applyBleSecurity()
diff --git a/platform/nrf52/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp b/platform/nrf52/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp
new file mode 100644
index 00000000..fb820e27
--- /dev/null
+++ b/platform/nrf52/arduino_common/src/ble/meshtastic_ble_observer_bridge.cpp
@@ -0,0 +1,59 @@
+#include "ble/meshtastic_ble_observer_bridge.h"
+
+#include "ble/meshtastic_ble.h"
+
+namespace ble
+{
+
+MeshtasticBleObserverBridge::MeshtasticBleObserverBridge(app::IAppBleFacade& app, MeshtasticBleService& service)
+    : app_(app), service_(service)
+{
+}
+
+MeshtasticBleObserverBridge::~MeshtasticBleObserverBridge()
+{
+    unregisterObservers();
+}
+
+void MeshtasticBleObserverBridge::registerObservers()
+{
+    if (registered_)
+    {
+        return;
+    }
+
+    app_.getChatService().addIncomingTextObserver(this);
+    app_.getChatService().addOutgoingTextObserver(this);
+    app_.getChatService().addIncomingDataObserver(this);
+    registered_ = true;
+}
+
+void MeshtasticBleObserverBridge::unregisterObservers()
+{
+    if (!registered_)
+    {
+        return;
+    }
+
+    app_.getChatService().removeIncomingTextObserver(this);
+    app_.getChatService().removeOutgoingTextObserver(this);
+    app_.getChatService().removeIncomingDataObserver(this);
+    registered_ = false;
+}
+
+void MeshtasticBleObserverBridge::onIncomingText(const chat::MeshIncomingText& msg)
+{
+    service_.handleIncomingTextFromApp(msg);
+}
+
+void MeshtasticBleObserverBridge::onOutgoingText(const chat::MeshIncomingText& msg)
+{
+    service_.handleOutgoingTextFromApp(msg);
+}
+
+void MeshtasticBleObserverBridge::onIncomingData(const chat::MeshIncomingData& msg)
+{
+    service_.handleIncomingDataFromApp(msg);
+}
+
+} // namespace ble
diff --git a/platform/nrf52/arduino_common/src/ble/meshtastic_ble_persistence_bridge.cpp b/platform/nrf52/arduino_common/src/ble/meshtastic_ble_persistence_bridge.cpp
new file mode 100644
index 00000000..e90a95c3
--- /dev/null
+++ b/platform/nrf52/arduino_common/src/ble/meshtastic_ble_persistence_bridge.cpp
@@ -0,0 +1,142 @@
+#include "ble/meshtastic_ble_persistence_bridge.h"
+
+#if defined(GAT562_MESH_EVB_PRO)
+#include "boards/gat562_mesh_evb_pro/settings_store.h"
+#else
+#include "platform/ui/settings_store.h"
+#endif
+
+#include <Arduino.h>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+#if !defined(GAT562_MESH_EVB_PRO)
+#include <vector>
+#endif
+
+namespace ble
+{
+namespace
+{
+#if !defined(GAT562_MESH_EVB_PRO)
+constexpr const char* kBleSettingsNamespace = "ble_meshtastic";
+constexpr const char* kBluetoothConfigKey = "bt_cfg";
+constexpr const char* kModuleConfigKey = "mod_cfg";
+#endif
+
+bool usbSerialWritable(std::size_t len)
+{
+    return static_cast<bool>(Serial) && Serial.dtr() != 0 && Serial.availableForWrite() >= static_cast<int>(len);
+}
+
+void blePersistenceLog(const char* fmt, ...)
+{
+    char buffer[192] = {};
+    va_list args;
+    va_start(args, fmt);
+    std::vsnprintf(buffer, sizeof(buffer), fmt, args);
+    va_end(args);
+    if (usbSerialWritable(std::strlen(buffer) + 2U))
+    {
+        Serial.println(buffer);
+    }
+    Serial2.println(buffer);
+}
+
+#if !defined(GAT562_MESH_EVB_PRO)
+template <typename T>
+bool loadBlobConfigFromUiStore(const char* key, T* out)
+{
+    if (!out)
+    {
+        return false;
+    }
+
+    std::vector<uint8_t> blob;
+    if (!platform::ui::settings_store::get_blob(kBleSettingsNamespace, key, blob))
+    {
+        return false;
+    }
+    if (blob.size() != sizeof(T))
+    {
+        blePersistenceLog("[BLE][nrf52][mt] load cfg size mismatch key=%s got=%u expected=%u",
+                          key ? key : "?",
+                          static_cast<unsigned>(blob.size()),
+                          static_cast<unsigned>(sizeof(T)));
+        return false;
+    }
+
+    std::memcpy(out, blob.data(), sizeof(T));
+    return true;
+}
+
+template <typename T>
+bool saveBlobConfigToUiStore(const char* key, const T& value)
+{
+    const bool ok = platform::ui::settings_store::put_blob(kBleSettingsNamespace, key, &value, sizeof(T));
+    if (!ok)
+    {
+        blePersistenceLog("[BLE][nrf52][mt] save cfg failed key=%s size=%u",
+                          key ? key : "?",
+                          static_cast<unsigned>(sizeof(T)));
+    }
+    return ok;
+}
+#endif
+} // namespace
+
+bool loadMeshtasticBlePersistedState(meshtastic_config_bridge::PersistedState* out)
+{
+    if (!out)
+    {
+        return false;
+    }
+
+    *out = meshtastic_config_bridge::PersistedState{};
+
+#if defined(GAT562_MESH_EVB_PRO)
+    if (::boards::gat562_mesh_evb_pro::settings_store::loadMeshtasticBleState(&out->bluetooth, &out->module))
+    {
+        out->has_bluetooth = true;
+        out->has_module = true;
+        return true;
+    }
+    return false;
+#else
+    out->has_bluetooth = loadBlobConfigFromUiStore(kBluetoothConfigKey, &out->bluetooth);
+    out->has_module = loadBlobConfigFromUiStore(kModuleConfigKey, &out->module);
+    if (out->has_bluetooth || out->has_module)
+    {
+        blePersistenceLog("[BLE][nrf52][mt] legacy cfg store fallback bt=%u mod=%u",
+                          out->has_bluetooth ? 1U : 0U,
+                          out->has_module ? 1U : 0U);
+    }
+    return out->has_bluetooth || out->has_module;
+#endif
+}
+
+bool saveMeshtasticBlePersistedState(const meshtastic_Config_BluetoothConfig& bluetooth,
+                                     const meshtastic_LocalModuleConfig& module)
+{
+#if defined(GAT562_MESH_EVB_PRO)
+    return ::boards::gat562_mesh_evb_pro::settings_store::saveMeshtasticBleState(bluetooth, module);
+#else
+    const bool bluetooth_ok = saveBlobConfigToUiStore(kBluetoothConfigKey, bluetooth);
+    const bool module_ok = saveBlobConfigToUiStore(kModuleConfigKey, module);
+    return bluetooth_ok && module_ok;
+#endif
+}
+
+void logMeshtasticBlePersistenceStatus()
+{
+#if defined(GAT562_MESH_EVB_PRO)
+    blePersistenceLog("[BLE][nrf52][mt] settings_store load=%s save=%s",
+                      ::boards::gat562_mesh_evb_pro::settings_store::statusLabel(
+                          ::boards::gat562_mesh_evb_pro::settings_store::lastLoadStatus()),
+                      ::boards::gat562_mesh_evb_pro::settings_store::statusLabel(
+                          ::boards::gat562_mesh_evb_pro::settings_store::lastSaveStatus()));
+#endif
+}
+
+} // namespace ble
diff --git a/platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp b/platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp
index aaf6022c..365b76da 100644
--- a/platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp
+++ b/platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp
@@ -6,12 +6,14 @@
 #include "chat/infra/meshtastic/mt_packet_wire.h"
 #include "chat/infra/meshtastic/mt_pki_crypto.h"
 #include "chat/infra/meshtastic/mt_protocol_helpers.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/infra/meshtastic/mt_region.h"
 #include "chat/runtime/meshtastic_self_announcement_core.h"
 #include "chat/runtime/self_identity_policy.h"
 #include "meshtastic/mqtt.pb.h"
 #include "platform/nrf52/arduino_common/chat/infra/radio_packet_io.h"
 #include "platform/nrf52/arduino_common/device_identity.h"
+#include "platform/nrf52/arduino_common/mesh/nrf52_settings_mesh_identity_store.h"
 #include "platform/nrf52/arduino_common/sys/event_bus.h"
 #include "platform/ui/gps_runtime.h"
 #include "platform/ui/settings_store.h"
@@ -49,11 +51,6 @@ constexpr ::chat::NodeId kBroadcastNode = 0xFFFFFFFFUL;
 constexpr uint8_t kDefaultPskIndex = 1;
 constexpr uint8_t kBitfieldWantResponseMask = 0x02U;
 constexpr size_t kMaxPkiNodes = 16;
-constexpr const char* kPkiNodeNs = "chat_pki";
-constexpr const char* kPkiNodeKey = "pki_nodes";
-constexpr const char* kPkiPublicNs = "chat";
-constexpr const char* kPkiPublicKey = "pki_pub";
-constexpr const char* kPkiPrivateKey = "pki_priv";
 
 using ::chat::meshtastic::allowPkiForPortnum;
 using ::chat::meshtastic::computeKeyVerificationHashes;
@@ -136,22 +133,28 @@ const uint8_t* selectKey(const ::chat::MeshConfig& config,
 
     if (channel == ::chat::ChannelId::SECONDARY)
     {
-        if (!isZeroKey(config.secondary_key, sizeof(config.secondary_key)))
+        const uint8_t key_len = ::chat::normalizeMeshtasticChannelKeyLen(config.secondary_key,
+                                                                         sizeof(config.secondary_key),
+                                                                         config.secondary_key_len);
+        if (key_len > 0)
         {
             if (out_len)
             {
-                *out_len = sizeof(config.secondary_key);
+                *out_len = key_len;
             }
             return config.secondary_key;
         }
         return nullptr;
     }
 
-    if (!isZeroKey(config.primary_key, sizeof(config.primary_key)))
+    const uint8_t key_len = ::chat::normalizeMeshtasticChannelKeyLen(config.primary_key,
+                                                                     sizeof(config.primary_key),
+                                                                     config.primary_key_len);
+    if (key_len > 0)
     {
         if (out_len)
         {
-            *out_len = sizeof(config.primary_key);
+            *out_len = key_len;
         }
         return config.primary_key;
     }
@@ -168,21 +171,7 @@ const uint8_t* selectKey(const ::chat::MeshConfig& config,
 
 const char* channelNameFor(const ::chat::MeshConfig& config, ::chat::ChannelId channel)
 {
-    if (channel == ::chat::ChannelId::SECONDARY)
-    {
-        return "Secondary";
-    }
-
-    if (config.use_preset)
-    {
-        const char* preset_name = ::chat::meshtastic::presetDisplayName(
-            static_cast<meshtastic_Config_LoRaConfig_ModemPreset>(config.modem_preset));
-        if (preset_name && preset_name[0] != '\0' && std::strcmp(preset_name, "Invalid") != 0)
-        {
-            return preset_name;
-        }
-    }
-    return "Custom";
+    return ::chat::meshtastic::channelName(config, channel);
 }
 
 const char* channelDebugLabel(::chat::ChannelId channel)
@@ -2351,18 +2340,16 @@ uint64_t MeshtasticRadioAdapter::pendingKey(::chat::NodeId from, ::chat::Message
 
 bool MeshtasticRadioAdapter::initPkiKeys()
 {
-    std::vector<uint8_t> pub_blob;
-    std::vector<uint8_t> priv_blob;
-    const bool have_pub = platform::ui::settings_store::get_blob(kPkiPublicNs, kPkiPublicKey, pub_blob);
-    const bool have_priv = platform::ui::settings_store::get_blob(kPkiPublicNs, kPkiPrivateKey, priv_blob);
-    bool have_keys = have_pub && have_priv &&
-                     pub_blob.size() == pki_public_key_.size() &&
-                     priv_blob.size() == pki_private_key_.size();
+    ::platform::nrf52::arduino_common::mesh::Nrf52SettingsLocalIdentityStore store;
+    ::mesh::LocalIdentity stored_identity{};
+    auto loaded = store.load(stored_identity);
+    bool have_keys = loaded.ok &&
+                     !isZeroKey(stored_identity.private_key,
+                                sizeof(stored_identity.private_key));
     if (have_keys)
     {
-        std::memcpy(pki_public_key_.data(), pub_blob.data(), pki_public_key_.size());
-        std::memcpy(pki_private_key_.data(), priv_blob.data(), pki_private_key_.size());
-        have_keys = !isZeroKey(pki_private_key_.data(), pki_private_key_.size());
+        std::memcpy(pki_public_key_.data(), stored_identity.public_key, pki_public_key_.size());
+        std::memcpy(pki_private_key_.data(), stored_identity.private_key, pki_private_key_.size());
     }
 
     if (!have_keys)
@@ -2376,10 +2363,11 @@ bool MeshtasticRadioAdapter::initPkiKeys()
         have_keys = !isZeroKey(pki_private_key_.data(), pki_private_key_.size());
         if (have_keys)
         {
-            (void)platform::ui::settings_store::put_blob(kPkiPublicNs, kPkiPublicKey,
-                                                         pki_public_key_.data(), pki_public_key_.size());
-            (void)platform::ui::settings_store::put_blob(kPkiPublicNs, kPkiPrivateKey,
-                                                         pki_private_key_.data(), pki_private_key_.size());
+            ::mesh::LocalIdentity generated{};
+            std::memcpy(generated.public_key, pki_public_key_.data(), sizeof(generated.public_key));
+            std::memcpy(generated.private_key, pki_private_key_.data(), sizeof(generated.private_key));
+            generated.valid = true;
+            (void)store.save(generated);
         }
     }
 
@@ -2388,34 +2376,27 @@ bool MeshtasticRadioAdapter::initPkiKeys()
 
 void MeshtasticRadioAdapter::loadPkiNodeKeys()
 {
-    struct PkiKeyEntry
-    {
-        uint32_t node_id;
-        uint32_t last_seen;
-        uint8_t key[32];
-    } __attribute__((packed));
-
-    std::vector<uint8_t> blob;
-    if (!platform::ui::settings_store::get_blob(kPkiNodeNs, kPkiNodeKey, blob) ||
-        blob.size() < sizeof(PkiKeyEntry))
+    ::platform::nrf52::arduino_common::mesh::Nrf52SettingsPeerKeyStore store;
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = store.loadAll(keys);
+    if (!loaded.ok)
     {
+        if (loaded.failure != ::mesh::StoreFailure::NotFound)
+        {
+            logMeshtasticRx("[gat562][mt] pki key load failed status=%u\n",
+                            static_cast<unsigned>(loaded.failure));
+        }
         return;
     }
 
-    const size_t count = std::min(blob.size() / sizeof(PkiKeyEntry), kMaxPkiNodes);
-    const auto* entries = reinterpret_cast<const PkiKeyEntry*>(blob.data());
     node_public_keys_.clear();
     node_key_last_seen_.clear();
-    for (size_t i = 0; i < count; ++i)
+    for (const auto& peer_key : keys)
     {
-        if (entries[i].node_id == 0)
-        {
-            continue;
-        }
         std::array<uint8_t, 32> key{};
-        std::memcpy(key.data(), entries[i].key, sizeof(entries[i].key));
-        node_public_keys_[entries[i].node_id] = key;
-        node_key_last_seen_[entries[i].node_id] = entries[i].last_seen;
+        std::memcpy(key.data(), peer_key.public_key, key.size());
+        node_public_keys_[peer_key.node_id.value] = key;
+        node_key_last_seen_[peer_key.node_id.value] = peer_key.updated_at_ms;
     }
 }
 
@@ -2463,49 +2444,42 @@ void MeshtasticRadioAdapter::markPkiKeysDirty()
 
 bool MeshtasticRadioAdapter::savePkiKeysToPrefs()
 {
-    struct PkiKeyEntry
-    {
-        uint32_t node_id;
-        uint32_t last_seen;
-        uint8_t key[32];
-    } __attribute__((packed));
-
-    std::vector<PkiKeyEntry> entries;
+    std::vector<::mesh::PeerPublicKey> entries;
     entries.reserve(node_public_keys_.size());
     for (const auto& item : node_public_keys_)
     {
-        PkiKeyEntry entry{};
-        entry.node_id = item.first;
+        ::mesh::PeerPublicKey entry{};
+        entry.node_id = ::mesh::NodeId{item.first};
         auto seen_it = node_key_last_seen_.find(item.first);
-        entry.last_seen = (seen_it != node_key_last_seen_.end()) ? seen_it->second : 0;
-        std::memcpy(entry.key, item.second.data(), sizeof(entry.key));
+        entry.updated_at_ms = (seen_it != node_key_last_seen_.end()) ? seen_it->second : 0;
+        entry.verified = false;
+        std::memcpy(entry.public_key, item.second.data(), sizeof(entry.public_key));
         entries.push_back(entry);
     }
 
     if (entries.size() > kMaxPkiNodes)
     {
         std::sort(entries.begin(), entries.end(),
-                  [](const PkiKeyEntry& a, const PkiKeyEntry& b)
+                  [](const ::mesh::PeerPublicKey& a, const ::mesh::PeerPublicKey& b)
                   {
-                      return a.last_seen < b.last_seen;
+                      return a.updated_at_ms < b.updated_at_ms;
                   });
         const size_t drop = entries.size() - kMaxPkiNodes;
         for (size_t i = 0; i < drop; ++i)
         {
-            node_public_keys_.erase(entries[i].node_id);
-            node_key_last_seen_.erase(entries[i].node_id);
+            node_public_keys_.erase(entries[i].node_id.value);
+            node_key_last_seen_.erase(entries[i].node_id.value);
         }
         entries.erase(entries.begin(), entries.begin() + static_cast<long>(drop));
     }
 
-    const bool persisted = platform::ui::settings_store::put_blob(kPkiNodeNs, kPkiNodeKey,
-                                                                  entries.empty() ? nullptr : entries.data(),
-                                                                  entries.size() * sizeof(PkiKeyEntry));
-    if (persisted)
+    ::platform::nrf52::arduino_common::mesh::Nrf52SettingsPeerKeyStore store;
+    auto saved = store.replaceAll(entries.empty() ? nullptr : entries.data(), entries.size());
+    if (saved.ok)
     {
         pki_node_keys_dirty_ = false;
     }
-    return persisted;
+    return saved.ok;
 }
 
 void MeshtasticRadioAdapter::touchPkiNodeKey(::chat::NodeId node_id)
diff --git a/platform/nrf52/arduino_common/src/mesh/nrf52_mesh_runtime_shell.cpp b/platform/nrf52/arduino_common/src/mesh/nrf52_mesh_runtime_shell.cpp
new file mode 100644
index 00000000..57ec9f53
--- /dev/null
+++ b/platform/nrf52/arduino_common/src/mesh/nrf52_mesh_runtime_shell.cpp
@@ -0,0 +1,37 @@
+#include "platform/nrf52/arduino_common/mesh/nrf52_mesh_runtime_shell.h"
+
+namespace platform::nrf52::arduino_common::mesh
+{
+
+Nrf52MeshRuntimeShell::Nrf52MeshRuntimeShell(::mesh::MeshSession& session)
+    : session_(session)
+{
+}
+
+bool Nrf52MeshRuntimeShell::start(const ::mesh::MeshRuntimeConfig& config)
+{
+    return session_.start(config);
+}
+
+void Nrf52MeshRuntimeShell::stop()
+{
+    session_.stop();
+}
+
+void Nrf52MeshRuntimeShell::tick()
+{
+    session_.tick();
+}
+
+::mesh::SendResult Nrf52MeshRuntimeShell::sendDirect(
+    const ::mesh::DirectMessageCommand& command)
+{
+    return session_.sendDirect(command);
+}
+
+::mesh::MeshSessionState Nrf52MeshRuntimeShell::state() const
+{
+    return session_.state();
+}
+
+} // namespace platform::nrf52::arduino_common::mesh
diff --git a/platform/nrf52/arduino_common/src/mesh/nrf52_settings_mesh_identity_store.cpp b/platform/nrf52/arduino_common/src/mesh/nrf52_settings_mesh_identity_store.cpp
new file mode 100644
index 00000000..c926cf0e
--- /dev/null
+++ b/platform/nrf52/arduino_common/src/mesh/nrf52_settings_mesh_identity_store.cpp
@@ -0,0 +1,329 @@
+#include "platform/nrf52/arduino_common/mesh/nrf52_settings_mesh_identity_store.h"
+
+#include "platform/ui/settings_store.h"
+
+#include <algorithm>
+#include <cstring>
+
+namespace platform::nrf52::arduino_common::mesh
+{
+namespace
+{
+
+struct PeerKeyEntry
+{
+    uint32_t node_id;
+    uint32_t updated_at_ms;
+    uint8_t key[32];
+} __attribute__((packed));
+
+bool isZero(const uint8_t* data, size_t size)
+{
+    if (!data)
+    {
+        return true;
+    }
+    for (size_t index = 0; index < size; ++index)
+    {
+        if (data[index] != 0)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool validIdentity(const ::mesh::LocalIdentity& identity)
+{
+    return identity.valid &&
+           !isZero(identity.private_key, sizeof(identity.private_key));
+}
+
+} // namespace
+
+Nrf52SettingsLocalIdentityStore::Nrf52SettingsLocalIdentityStore()
+    : options_(Options{})
+{
+}
+
+Nrf52SettingsLocalIdentityStore::Nrf52SettingsLocalIdentityStore(const Options& options)
+    : options_(options)
+{
+}
+
+::mesh::StoreResult Nrf52SettingsLocalIdentityStore::load(::mesh::LocalIdentity& out)
+{
+    out = ::mesh::LocalIdentity{};
+
+    std::vector<uint8_t> public_blob;
+    std::vector<uint8_t> private_blob;
+    const bool have_public =
+        ::platform::ui::settings_store::get_blob(options_.ns, options_.public_key, public_blob);
+    const bool have_private =
+        ::platform::ui::settings_store::get_blob(options_.ns, options_.private_key, private_blob);
+    if (!have_public && !have_private)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+    }
+    if (!have_public || !have_private ||
+        public_blob.size() != sizeof(out.public_key) ||
+        private_blob.size() != sizeof(out.private_key))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+
+    std::memcpy(out.public_key, public_blob.data(), sizeof(out.public_key));
+    std::memcpy(out.private_key, private_blob.data(), sizeof(out.private_key));
+    out.valid = !isZero(out.private_key, sizeof(out.private_key));
+    if (!out.valid)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult Nrf52SettingsLocalIdentityStore::save(
+    const ::mesh::LocalIdentity& identity)
+{
+    if (!validIdentity(identity))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    const bool public_ok = ::platform::ui::settings_store::put_blob(
+        options_.ns,
+        options_.public_key,
+        identity.public_key,
+        sizeof(identity.public_key));
+    const bool private_ok = ::platform::ui::settings_store::put_blob(
+        options_.ns,
+        options_.private_key,
+        identity.private_key,
+        sizeof(identity.private_key));
+    if (!public_ok || !private_ok)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::IoError);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult Nrf52SettingsLocalIdentityStore::clear()
+{
+    const char* keys[] = {options_.public_key, options_.private_key};
+    ::platform::ui::settings_store::remove_keys(options_.ns, keys, 2);
+    return ::mesh::StoreResult::success();
+}
+
+Nrf52SettingsPeerKeyStore::Nrf52SettingsPeerKeyStore()
+    : options_(Options{})
+{
+}
+
+Nrf52SettingsPeerKeyStore::Nrf52SettingsPeerKeyStore(const Options& options)
+    : options_(options)
+{
+}
+
+::mesh::StoreResult Nrf52SettingsPeerKeyStore::get(::mesh::NodeId node_id,
+                                                   ::mesh::PeerPublicKey& out)
+{
+    if (!node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok)
+    {
+        return loaded;
+    }
+
+    for (const auto& key : keys)
+    {
+        if (key.node_id == node_id)
+        {
+            out = key;
+            return ::mesh::StoreResult::success();
+        }
+    }
+    return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+}
+
+::mesh::StoreResult Nrf52SettingsPeerKeyStore::put(const ::mesh::PeerPublicKey& key)
+{
+    if (!key.node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok && loaded.failure != ::mesh::StoreFailure::NotFound)
+    {
+        return loaded;
+    }
+
+    bool replaced = false;
+    for (auto& existing : keys)
+    {
+        if (existing.node_id == key.node_id)
+        {
+            existing = key;
+            replaced = true;
+            break;
+        }
+    }
+    if (!replaced)
+    {
+        keys.push_back(key);
+    }
+    return saveAll(keys);
+}
+
+::mesh::StoreResult Nrf52SettingsPeerKeyStore::remove(::mesh::NodeId node_id)
+{
+    if (!node_id.isValidUnicast())
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> keys;
+    auto loaded = loadAll(keys);
+    if (!loaded.ok)
+    {
+        return loaded.failure == ::mesh::StoreFailure::NotFound
+                   ? ::mesh::StoreResult::success()
+                   : loaded;
+    }
+
+    keys.erase(std::remove_if(keys.begin(),
+                              keys.end(),
+                              [node_id](const ::mesh::PeerPublicKey& key)
+                              {
+                                  return key.node_id == node_id;
+                              }),
+               keys.end());
+    return saveAll(keys);
+}
+
+::mesh::StoreResult Nrf52SettingsPeerKeyStore::clear()
+{
+    const char* keys[] = {options_.key};
+    ::platform::ui::settings_store::remove_keys(options_.ns, keys, 1);
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult Nrf52SettingsPeerKeyStore::loadAll(
+    std::vector<::mesh::PeerPublicKey>& out)
+{
+    out.clear();
+
+    std::vector<uint8_t> blob;
+    if (!::platform::ui::settings_store::get_blob(options_.ns, options_.key, blob))
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::NotFound);
+    }
+    if (blob.empty())
+    {
+        return ::mesh::StoreResult::success();
+    }
+    if ((blob.size() % sizeof(PeerKeyEntry)) != 0)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::Corrupt);
+    }
+
+    size_t count = blob.size() / sizeof(PeerKeyEntry);
+    if (count > options_.max_keys)
+    {
+        count = options_.max_keys;
+    }
+    const auto* entries = reinterpret_cast<const PeerKeyEntry*>(blob.data());
+    out.reserve(count);
+    for (size_t index = 0; index < count; ++index)
+    {
+        if (entries[index].node_id == 0)
+        {
+            continue;
+        }
+        ::mesh::PeerPublicKey key{};
+        key.node_id = ::mesh::NodeId{entries[index].node_id};
+        key.updated_at_ms = entries[index].updated_at_ms;
+        key.verified = false;
+        std::memcpy(key.public_key, entries[index].key, sizeof(key.public_key));
+        out.push_back(key);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+::mesh::StoreResult Nrf52SettingsPeerKeyStore::replaceAll(
+    const ::mesh::PeerPublicKey* keys,
+    size_t count)
+{
+    if (count > 0 && !keys)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+    }
+
+    std::vector<::mesh::PeerPublicKey> copy;
+    copy.reserve(count);
+    for (size_t index = 0; index < count; ++index)
+    {
+        if (!keys[index].node_id.isValidUnicast())
+        {
+            return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+        }
+        copy.push_back(keys[index]);
+    }
+    return saveAll(copy);
+}
+
+::mesh::StoreResult Nrf52SettingsPeerKeyStore::saveAll(
+    std::vector<::mesh::PeerPublicKey>& keys)
+{
+    if (keys.empty())
+    {
+        return clear();
+    }
+
+    if (keys.size() > options_.max_keys)
+    {
+        std::sort(keys.begin(),
+                  keys.end(),
+                  [](const ::mesh::PeerPublicKey& left,
+                     const ::mesh::PeerPublicKey& right)
+                  {
+                      return left.updated_at_ms < right.updated_at_ms;
+                  });
+        keys.erase(keys.begin(),
+                   keys.begin() + static_cast<long>(keys.size() - options_.max_keys));
+    }
+
+    std::vector<PeerKeyEntry> entries;
+    entries.reserve(keys.size());
+    for (const auto& key : keys)
+    {
+        if (!key.node_id.isValidUnicast())
+        {
+            return ::mesh::StoreResult::fail(::mesh::StoreFailure::InvalidArgument);
+        }
+        PeerKeyEntry entry{};
+        entry.node_id = key.node_id.value;
+        entry.updated_at_ms = key.updated_at_ms;
+        std::memcpy(entry.key, key.public_key, sizeof(entry.key));
+        entries.push_back(entry);
+    }
+
+    const bool persisted = ::platform::ui::settings_store::put_blob(
+        options_.ns,
+        options_.key,
+        entries.data(),
+        entries.size() * sizeof(PeerKeyEntry));
+    if (!persisted)
+    {
+        return ::mesh::StoreResult::fail(::mesh::StoreFailure::IoError);
+    }
+    return ::mesh::StoreResult::success();
+}
+
+} // namespace platform::nrf52::arduino_common::mesh
diff --git a/platform/nrf52/arduino_common/src/platform_ui_settings_backup_runtime.cpp b/platform/nrf52/arduino_common/src/platform_ui_settings_backup_runtime.cpp
new file mode 100644
index 00000000..105fbdb2
--- /dev/null
+++ b/platform/nrf52/arduino_common/src/platform_ui_settings_backup_runtime.cpp
@@ -0,0 +1,36 @@
+#include "platform/ui/settings_backup_runtime.h"
+
+#include <cstdio>
+
+namespace platform::ui::settings_backup
+{
+
+bool is_supported()
+{
+    return false;
+}
+
+Status status()
+{
+    Status out{};
+    out.supported = false;
+    std::snprintf(out.message, sizeof(out.message), "%s", "Settings backup unsupported");
+    return out;
+}
+
+bool backup()
+{
+    return false;
+}
+
+bool restore()
+{
+    return false;
+}
+
+bool remove()
+{
+    return false;
+}
+
+} // namespace platform::ui::settings_backup
diff --git a/apps/gat562_mesh_evb_pro/src/debug_console.cpp b/platform/nrf52/debug/nrf52_debug_console.cpp
similarity index 88%
rename from apps/gat562_mesh_evb_pro/src/debug_console.cpp
rename to platform/nrf52/debug/nrf52_debug_console.cpp
index 965809b1..166b4f46 100644
--- a/apps/gat562_mesh_evb_pro/src/debug_console.cpp
+++ b/platform/nrf52/debug/nrf52_debug_console.cpp
@@ -1,11 +1,11 @@
-#include "apps/gat562_mesh_evb_pro/debug_console.h"
+#include "nrf52_debug_console.h"
 
 #include <Arduino.h>
 #include <cstring>
 #include <stdarg.h>
 #include <stdio.h>
 
-namespace apps::gat562_mesh_evb_pro::debug_console
+namespace platform::nrf52::debug_console
 {
 namespace
 {
@@ -83,4 +83,4 @@ void printf(const char* format, ...)
     print(buffer);
 }
 
-} // namespace apps::gat562_mesh_evb_pro::debug_console
+} // namespace platform::nrf52::debug_console
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/debug_console.h b/platform/nrf52/debug/nrf52_debug_console.h
similarity index 56%
rename from apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/debug_console.h
rename to platform/nrf52/debug/nrf52_debug_console.h
index cfd8f389..974f9815 100644
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/debug_console.h
+++ b/platform/nrf52/debug/nrf52_debug_console.h
@@ -1,8 +1,8 @@
-#pragma once
+#pragma once
 
 #include <stddef.h>
 
-namespace apps::gat562_mesh_evb_pro::debug_console
+namespace platform::nrf52::debug_console
 {
 
 void begin();
@@ -11,4 +11,4 @@ void println();
 void println(const char* text);
 void printf(const char* format, ...);
 
-} // namespace apps::gat562_mesh_evb_pro::debug_console
+} // namespace platform::nrf52::debug_console
diff --git a/platform/nrf52/library.json b/platform/nrf52/library.json
new file mode 100644
index 00000000..11a85b35
--- /dev/null
+++ b/platform/nrf52/library.json
@@ -0,0 +1,54 @@
+{
+  "name": "platform_nrf52",
+  "version": "0.1.0",
+  "frameworks": [
+    "arduino"
+  ],
+  "platforms": [
+    "nordicnrf52"
+  ],
+  "build": {
+    "includeDir": ".",
+    "srcDir": ".",
+    "srcFilter": [
+      "+<debug/*.cpp>",
+      "+<protocol/*.cpp>",
+      "+<runtime/*.cpp>",
+      "-<arduino_common/>"
+    ],
+    "flags": [
+      "-std=gnu++17",
+      "-I.",
+      "-I../..",
+      "-I../../boards/gat562_mesh_evb_pro/include",
+      "-I../../modules/core_chat/include",
+      "-I../../modules/core_chat/generated",
+      "-I../../modules/core_chat/third_party/nanopb",
+      "-I../../modules/core_sys/include",
+      "-I../../modules/core_mesh/include",
+      "-I../../modules/core_phone/include",
+      "-I../../platform/shared/include",
+      "-I../../platform/nrf52/arduino_common/include"
+    ]
+  },
+  "dependencies": [
+    {
+      "name": "core_chat"
+    },
+    {
+      "name": "core_mesh"
+    },
+    {
+      "name": "core_phone"
+    },
+    {
+      "name": "core_sys"
+    },
+    {
+      "name": "platform_nrf52_arduino_common"
+    },
+    {
+      "name": "boards_gat562_mesh_evb_pro"
+    }
+  ]
+}
diff --git a/apps/gat562_mesh_evb_pro/src/protocol_factory.cpp b/platform/nrf52/protocol/nrf52_protocol_factory.cpp
similarity index 90%
rename from apps/gat562_mesh_evb_pro/src/protocol_factory.cpp
rename to platform/nrf52/protocol/nrf52_protocol_factory.cpp
index 55c47391..970cd74e 100644
--- a/apps/gat562_mesh_evb_pro/src/protocol_factory.cpp
+++ b/platform/nrf52/protocol/nrf52_protocol_factory.cpp
@@ -1,9 +1,9 @@
-#include "apps/gat562_mesh_evb_pro/protocol_factory.h"
+#include "platform/nrf52/protocol/nrf52_protocol_factory.h"
 
 #include "platform/nrf52/arduino_common/chat/infra/meshcore/meshcore_radio_adapter.h"
 #include "platform/nrf52/arduino_common/chat/infra/meshtastic/meshtastic_radio_adapter.h"
 
-namespace apps::gat562_mesh_evb_pro
+namespace platform::nrf52::protocol
 {
 
 std::unique_ptr<chat::IMeshAdapter> createProtocolAdapter(chat::MeshProtocol protocol,
@@ -25,4 +25,4 @@ std::unique_ptr<chat::IMeshAdapter> createProtocolAdapter(chat::MeshProtocol pro
     }
 }
 
-} // namespace apps::gat562_mesh_evb_pro
+} // namespace platform::nrf52::protocol
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/protocol_factory.h b/platform/nrf52/protocol/nrf52_protocol_factory.h
similarity index 88%
rename from apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/protocol_factory.h
rename to platform/nrf52/protocol/nrf52_protocol_factory.h
index 60012ae1..7a3eec05 100644
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/protocol_factory.h
+++ b/platform/nrf52/protocol/nrf52_protocol_factory.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "chat/domain/chat_types.h"
 #include "chat/runtime/self_identity_provider.h"
@@ -12,7 +12,7 @@ namespace chat
 class IMeshAdapter;
 }
 
-namespace apps::gat562_mesh_evb_pro
+namespace platform::nrf52::protocol
 {
 
 std::unique_ptr<chat::IMeshAdapter> createProtocolAdapter(chat::MeshProtocol protocol,
@@ -20,4 +20,4 @@ std::unique_ptr<chat::IMeshAdapter> createProtocolAdapter(chat::MeshProtocol pro
                                                           platform::nrf52::arduino_common::chat::meshtastic::NodeStore* meshtastic_node_store = nullptr,
                                                           chat::contacts::ContactService* contact_service = nullptr);
 
-} // namespace apps::gat562_mesh_evb_pro
+} // namespace platform::nrf52::protocol
diff --git a/apps/gat562_mesh_evb_pro/src/runtime_apply_service.cpp b/platform/nrf52/runtime/nrf52_runtime_apply_service.cpp
similarity index 67%
rename from apps/gat562_mesh_evb_pro/src/runtime_apply_service.cpp
rename to platform/nrf52/runtime/nrf52_runtime_apply_service.cpp
index 0a18a9b9..6441dbbb 100644
--- a/apps/gat562_mesh_evb_pro/src/runtime_apply_service.cpp
+++ b/platform/nrf52/runtime/nrf52_runtime_apply_service.cpp
@@ -1,16 +1,16 @@
-#include "apps/gat562_mesh_evb_pro/runtime_apply_service.h"
+#include "platform/nrf52/runtime/nrf52_runtime_apply_service.h"
 
-#include "apps/gat562_mesh_evb_pro/debug_console.h"
 #include "ble/ble_manager.h"
 #include "boards/gat562_mesh_evb_pro/gat562_board.h"
 #include "boards/gat562_mesh_evb_pro/settings_store.h"
 #include "chat/infra/mesh_adapter_router_core.h"
 #include "chat/infra/mesh_protocol_utils.h"
 #include "chat/usecase/chat_service.h"
+#include "platform/nrf52/debug/nrf52_debug_console.h"
 
 #include <cstring>
 
-namespace apps::gat562_mesh_evb_pro
+namespace platform::nrf52::runtime
 {
 namespace
 {
@@ -28,10 +28,10 @@ void RuntimeApplyService::applyMesh(app::AppConfig& config,
                                     ble::BleManager* ble_manager,
                                     boards::gat562_mesh_evb_pro::Gat562Board* board) const
 {
-    debug_console::printf("[gat562][cfg] applyMesh start proto=%u ok_to_mqtt=%u ignore_mqtt=%u\n",
-                          static_cast<unsigned>(config.mesh_protocol),
-                          config.meshtastic_config.config_ok_to_mqtt ? 1U : 0U,
-                          config.meshtastic_config.ignore_mqtt ? 1U : 0U);
+    platform::nrf52::debug_console::printf("[gat562][cfg] applyMesh start proto=%u ok_to_mqtt=%u ignore_mqtt=%u\n",
+                                           static_cast<unsigned>(config.mesh_protocol),
+                                           config.meshtastic_config.config_ok_to_mqtt ? 1U : 0U,
+                                           config.meshtastic_config.ignore_mqtt ? 1U : 0U);
     ::boards::gat562_mesh_evb_pro::settings_store::normalizeConfig(config);
 
     if (mesh_router)
@@ -53,16 +53,16 @@ void RuntimeApplyService::applyMesh(app::AppConfig& config,
         ble_manager->applyProtocol(config.mesh_protocol);
     }
 
-    debug_console::printf("[gat562][cfg] applyMesh end\n");
+    platform::nrf52::debug_console::printf("[gat562][cfg] applyMesh end\n");
 
     const chat::MeshConfig& mesh = config.activeMeshConfig();
-    debug_console::printf("[gat562] radio cfg %s region=%u preset=%u ch=%u tx=%d hop=%u\n",
-                          protocolLabel(config.mesh_protocol),
-                          static_cast<unsigned>(mesh.region),
-                          static_cast<unsigned>(mesh.modem_preset),
-                          static_cast<unsigned>(mesh.channel_num),
-                          static_cast<int>(mesh.tx_power),
-                          static_cast<unsigned>(mesh.hop_limit));
+    platform::nrf52::debug_console::printf("[gat562] radio cfg %s region=%u preset=%u ch=%u tx=%d hop=%u\n",
+                                           protocolLabel(config.mesh_protocol),
+                                           static_cast<unsigned>(mesh.region),
+                                           static_cast<unsigned>(mesh.modem_preset),
+                                           static_cast<unsigned>(mesh.channel_num),
+                                           static_cast<int>(mesh.tx_power),
+                                           static_cast<unsigned>(mesh.hop_limit));
 }
 
 void RuntimeApplyService::applyUserInfo(const chat::runtime::EffectiveSelfIdentity& previous_identity,
@@ -94,4 +94,4 @@ void RuntimeApplyService::applyPosition(const app::AppConfig& config,
     }
 }
 
-} // namespace apps::gat562_mesh_evb_pro
+} // namespace platform::nrf52::runtime
diff --git a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/runtime_apply_service.h b/platform/nrf52/runtime/nrf52_runtime_apply_service.h
similarity index 91%
rename from apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/runtime_apply_service.h
rename to platform/nrf52/runtime/nrf52_runtime_apply_service.h
index 9af427a0..4609be35 100644
--- a/apps/gat562_mesh_evb_pro/include/apps/gat562_mesh_evb_pro/runtime_apply_service.h
+++ b/platform/nrf52/runtime/nrf52_runtime_apply_service.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "app/app_config.h"
 #include "chat/runtime/self_identity_policy.h"
@@ -19,7 +19,7 @@ namespace boards::gat562_mesh_evb_pro
 class Gat562Board;
 }
 
-namespace apps::gat562_mesh_evb_pro
+namespace platform::nrf52::runtime
 {
 
 class RuntimeApplyService
@@ -40,4 +40,4 @@ class RuntimeApplyService
                        boards::gat562_mesh_evb_pro::Gat562Board* board) const;
 };
 
-} // namespace apps::gat562_mesh_evb_pro
+} // namespace platform::nrf52::runtime
diff --git a/platform/shared/include/platform/shared/ble/app_config_phone_snapshot_bridge.h b/platform/shared/include/platform/shared/ble/app_config_phone_snapshot_bridge.h
index f3ddc183..85bc204e 100644
--- a/platform/shared/include/platform/shared/ble/app_config_phone_snapshot_bridge.h
+++ b/platform/shared/include/platform/shared/ble/app_config_phone_snapshot_bridge.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "app/app_config.h"
-#include "chat/ble/phone_runtime_context.h"
+#include "phone/common/phone_app_facade.h"
 
 #include <cstddef>
 #include <cstring>
@@ -29,9 +29,9 @@ inline void copyBounded(char* dst, std::size_t dst_len, const char* src)
     dst[dst_len - 1] = '\0';
 }
 
-inline ::ble::MeshtasticPhoneConfigSnapshot makeMeshtasticPhoneConfigSnapshot(const app::AppConfig& cfg)
+inline ::phone::MeshtasticPhoneConfigSnapshot makeMeshtasticPhoneConfigSnapshot(const app::AppConfig& cfg)
 {
-    ::ble::MeshtasticPhoneConfigSnapshot snapshot{};
+    ::phone::MeshtasticPhoneConfigSnapshot snapshot{};
     snapshot.mesh = cfg.meshtastic_config;
     snapshot.relay_enabled = cfg.chat_policy.enable_relay;
     copyBounded(snapshot.node_name, sizeof(snapshot.node_name), cfg.node_name);
@@ -50,7 +50,7 @@ inline ::ble::MeshtasticPhoneConfigSnapshot makeMeshtasticPhoneConfigSnapshot(co
 }
 
 inline void applyMeshtasticPhoneConfigSnapshot(app::AppConfig& cfg,
-                                               const ::ble::MeshtasticPhoneConfigSnapshot& snapshot)
+                                               const ::phone::MeshtasticPhoneConfigSnapshot& snapshot)
 {
     cfg.meshtastic_config = snapshot.mesh;
     cfg.chat_policy.enable_relay = snapshot.relay_enabled;
@@ -68,9 +68,9 @@ inline void applyMeshtasticPhoneConfigSnapshot(app::AppConfig& cfg,
     cfg.gps_strategy = snapshot.gps_strategy;
 }
 
-inline ::ble::MeshCorePhoneConfigSnapshot makeMeshCorePhoneConfigSnapshot(const app::AppConfig& cfg)
+inline ::phone::MeshCorePhoneConfigSnapshot makeMeshCorePhoneConfigSnapshot(const app::AppConfig& cfg)
 {
-    ::ble::MeshCorePhoneConfigSnapshot snapshot{};
+    ::phone::MeshCorePhoneConfigSnapshot snapshot{};
     snapshot.active_protocol = cfg.mesh_protocol;
     snapshot.mesh = cfg.meshcore_config;
     copyBounded(snapshot.node_name, sizeof(snapshot.node_name), cfg.node_name);
@@ -81,7 +81,7 @@ inline ::ble::MeshCorePhoneConfigSnapshot makeMeshCorePhoneConfigSnapshot(const
 }
 
 inline void applyMeshCorePhoneConfigSnapshot(app::AppConfig& cfg,
-                                             const ::ble::MeshCorePhoneConfigSnapshot& snapshot)
+                                             const ::phone::MeshCorePhoneConfigSnapshot& snapshot)
 {
     cfg.mesh_protocol = snapshot.active_protocol;
     cfg.meshcore_config = snapshot.mesh;
diff --git a/platform/shared/include/platform/shared/ble/meshtastic_phone_runtime_bridge.h b/platform/shared/include/platform/shared/ble/meshtastic_phone_runtime_bridge.h
index f834bb3a..43bf946e 100644
--- a/platform/shared/include/platform/shared/ble/meshtastic_phone_runtime_bridge.h
+++ b/platform/shared/include/platform/shared/ble/meshtastic_phone_runtime_bridge.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "chat/ble/meshtastic_defaults.h"
-#include "chat/ble/meshtastic_phone_core.h"
-#include "chat/ble/phone_runtime_context.h"
+#include "chat/infra/meshtastic/mt_radio_config.h"
 #include "chat/infra/meshtastic/mt_region.h"
+#include "gps/ports/i_location_source.h"
 #include "meshtastic/localonly.pb.h"
-#include "platform/ui/gps_runtime.h"
+#include "phone/common/phone_app_facade.h"
+#include "phone/meshtastic/meshtastic_defaults.h"
+#include "phone/meshtastic/meshtastic_phone_core.h"
 #include "platform/ui/settings_store.h"
 #include "platform/ui/time_runtime.h"
 
@@ -21,15 +22,11 @@ namespace platform::shared::ble_bridge
 constexpr const char* kUiSettingsNs = "settings";
 constexpr const char* kTimezoneTzdefKey = "timezone_tzdef";
 
-inline std::string meshtasticChannelDisplayName(const ::ble::MeshtasticPhoneConfigSnapshot& cfg, uint8_t idx)
+inline std::string meshtasticChannelDisplayName(const ::phone::MeshtasticPhoneConfigSnapshot& cfg, uint8_t idx)
 {
-    if (idx == 1)
-    {
-        return "Secondary";
-    }
-
-    auto preset = static_cast<meshtastic_Config_LoRaConfig_ModemPreset>(cfg.mesh.modem_preset);
-    return cfg.mesh.use_preset ? std::string(::chat::meshtastic::presetDisplayName(preset)) : std::string("Custom");
+    return std::string(::chat::meshtastic::channelName(
+        cfg.mesh,
+        idx == 1 ? ::chat::ChannelId::SECONDARY : ::chat::ChannelId::PRIMARY));
 }
 
 inline bool loadTimezoneTzdefFromSettings(char* out, std::size_t out_len)
@@ -74,7 +71,7 @@ inline void setTimezoneOffsetMinutes(int offset_min)
     platform::ui::time::set_timezone_offset_min(offset_min);
 }
 
-inline bool setMeshtasticGpsFixUnavailable(::ble::MeshtasticGpsFix* out)
+inline bool setMeshtasticGpsFixUnavailable(::phone::meshtastic::MeshtasticGpsFix* out)
 {
     if (!out)
     {
@@ -85,31 +82,38 @@ inline bool setMeshtasticGpsFixUnavailable(::ble::MeshtasticGpsFix* out)
     return false;
 }
 
-inline bool fillMeshtasticGpsFixFromUiRuntime(::ble::MeshtasticGpsFix* out)
+inline bool fillMeshtasticGpsFixFromLocationSource(const ::gps::ILocationSource& source,
+                                                   ::phone::meshtastic::MeshtasticGpsFix* out)
 {
     if (!out)
     {
         return false;
     }
 
-    const platform::ui::gps::GpsState gps_state = platform::ui::gps::get_data();
-    out->valid = gps_state.valid;
-    out->lat = gps_state.lat;
-    out->lng = gps_state.lng;
-    out->has_alt = gps_state.has_alt;
-    out->alt_m = gps_state.alt_m;
-    out->has_speed = gps_state.has_speed;
-    out->speed_mps = gps_state.speed_mps;
-    out->has_course = gps_state.has_course;
-    out->course_deg = gps_state.course_deg;
-    out->satellites = gps_state.satellites;
+    ::gps::LocationFix fix{};
+    if (!source.latestFix(fix))
+    {
+        *out = {};
+        return false;
+    }
+
+    out->valid = fix.valid;
+    out->lat = fix.latitude;
+    out->lng = fix.longitude;
+    out->has_alt = fix.has_altitude;
+    out->alt_m = static_cast<double>(fix.altitude_m);
+    out->has_speed = fix.has_speed;
+    out->speed_mps = static_cast<double>(fix.speed_mps);
+    out->has_course = fix.has_course;
+    out->course_deg = static_cast<double>(fix.course_deg);
+    out->satellites = fix.satellites;
     return out->valid;
 }
 
 template <typename Settings>
 inline void applyMeshtasticMqttProxySettings(Settings& settings,
                                              const meshtastic_LocalModuleConfig& module_config,
-                                             const ::ble::MeshtasticPhoneConfigSnapshot& cfg)
+                                             const ::phone::MeshtasticPhoneConfigSnapshot& cfg)
 {
     settings.enabled = module_config.has_mqtt && module_config.mqtt.enabled;
     settings.proxy_to_client_enabled = module_config.has_mqtt && module_config.mqtt.proxy_to_client_enabled;
@@ -118,7 +122,7 @@ inline void applyMeshtasticMqttProxySettings(Settings& settings,
     settings.primary_downlink_enabled = cfg.primary_downlink_enabled;
     settings.secondary_uplink_enabled = cfg.secondary_uplink_enabled;
     settings.secondary_downlink_enabled = cfg.secondary_downlink_enabled;
-    settings.root = module_config.mqtt.root[0] ? module_config.mqtt.root : ::ble::meshtastic_defaults::kDefaultMqttRoot;
+    settings.root = module_config.mqtt.root[0] ? module_config.mqtt.root : ::phone::meshtastic::defaults::kDefaultMqttRoot;
     settings.primary_channel_id = meshtasticChannelDisplayName(cfg, 0);
     settings.secondary_channel_id = meshtasticChannelDisplayName(cfg, 1);
 }
diff --git a/platform/shared/include/platform/shared/ble/phone_ble_runtime.h b/platform/shared/include/platform/shared/ble/phone_ble_runtime.h
new file mode 100644
index 00000000..0fa43e72
--- /dev/null
+++ b/platform/shared/include/platform/shared/ble/phone_ble_runtime.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstdint>
+
+namespace platform::shared::ble_bridge
+{
+
+class IPhoneBleRuntime
+{
+  public:
+    virtual ~IPhoneBleRuntime() = default;
+
+    virtual bool isPhoneBleConnected() const = 0;
+    virtual uint32_t pendingPhoneBlePasskey() const = 0;
+    virtual void requestPhoneHighThroughputConnection() = 0;
+    virtual void requestPhoneLowerPowerConnection() = 0;
+    virtual void onPhoneBluetoothConfigChanged() {}
+    virtual void onPhoneModuleConfigChanged() {}
+};
+
+} // namespace platform::shared::ble_bridge
diff --git a/platformio.ini b/platformio.ini
index c59067c6..60fbc6cc 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -43,15 +43,6 @@ build_flags =
 	-D HAS_GPS=1
 	-D HAS_SD=1
 	-D HAS_PSRAM=1
-	-I${PROJECT_DIR}
-	-I${PROJECT_DIR}/modules/ui_shared/include
-	-I${PROJECT_DIR}/modules/core_sys/include
-	-I${PROJECT_DIR}/modules/core_chat/include
-	-I${PROJECT_DIR}/modules/core_gps/include
-	-I${PROJECT_DIR}/modules/core_hostlink/include
-	-I${PROJECT_DIR}/modules/core_team/include
-	-I${PROJECT_DIR}/platform/esp/arduino_common/include
-	-I${PROJECT_DIR}/platform/esp/common/include
 	-D RADIOLIB_EXCLUDE_RF69
 	-D RADIOLIB_EXCLUDE_SX1231
 	-D RADIOLIB_EXCLUDE_RFM2X
@@ -76,6 +67,8 @@ lib_extra_dirs =
 lib_ignore =
 	gat562_mesh_evb_pro
 	boards_gat562_mesh_evb_pro
+	trailmate-nrf52-node-app-shell
+	ui_mono_128x64
 	platform_nrf52_arduino_common
 lib_deps = 
 	lvgl/lvgl @ 9.4.0
@@ -88,6 +81,6 @@ lib_deps =
 	nanopb/nanopb @ ^0.4.8
 	rweather/Crypto @ 0.4.0
 
-; NOTE: Board-specific environments (including tlora_pager_sx1262 / tlora_pager_sx1280)
+; NOTE: Board-specific environments (including tlora_pager_sx1262)
 ; are defined in variants/*/envs/*.ini and loaded via extra_configs above.
 ; Keep root config focused on shared settings only.
diff --git a/site/assets/.gitignore b/site/assets/.gitignore
index d6b7ef32..b08d0898 100644
--- a/site/assets/.gitignore
+++ b/site/assets/.gitignore
@@ -1,2 +1,10 @@
 *
 !.gitignore
+!animal-island/
+!animal-island/dividers/
+!animal-island/dividers/divider-line-teal.svg
+!animal-island/footer/
+!animal-island/footer/footer-tree.webp
+!animal-island/icons/
+!animal-island/icons/*.svg
+!animal-island/icons/icon-leaf.png
diff --git a/site/assets/animal-island/dividers/divider-line-teal.svg b/site/assets/animal-island/dividers/divider-line-teal.svg
new file mode 100644
index 00000000..4d760b6a
--- /dev/null
+++ b/site/assets/animal-island/dividers/divider-line-teal.svg
@@ -0,0 +1 @@
+<svg height="14" viewBox="0 0 297 14" width="297" xmlns="http://www.w3.org/2000/svg"><path d="M20 10.42L33 11 28.002 0zM10 6.97L0 3l.858 9zM43 1l.613 11L53 5.585zm89 13l11-5.867L133.507 1zm67-3.58l13 .58-4.998-11zm-10-3.45L179 3l.858 9zM90.634 1L88 13l12-4.39zM155 13l12-2.4-8.47-9.6zM110 3l2.057 9L118 6.292zm-47 8.215L76 14 71.048 1zM222 1l.613 11L232 5.585zm47.634 0L267 13l12-4.39zM289 3l2.057 9L297 6.292zm-48 8.215L254 14l-4.952-13z" fill="#008077" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/site/assets/animal-island/footer/footer-tree.webp b/site/assets/animal-island/footer/footer-tree.webp
new file mode 100644
index 0000000000000000000000000000000000000000..1489bd49f82da4fb9492dc067e7cfd22822dc189
GIT binary patch
literal 29254
zcmV*NKw`gANk&FKasU8VMM6+kP&il$0000G0001g3;^T+06|PpNNj8X00I9eBuMc8
zcxyzY?%{#||MxEY|I0ZiOGF|fYQ~D%d+!z0o}s0!wraMtsM?!`qE@REwJEJxo0?VB
zti6d*#0rs}bDoz=a?b1Zd_ErcXX5kue7`*r{r5%NN^RS=Z6$k~&o;-bT5ByTA}TU|
zJpSM2<Q4wKz_xxK?mJSqyCN;U7;JIZ!6@O9mb&TqQ{Ul==;@w=y~2QdR(Bj^OEp4N
zamPUkVMu3p927F<9d{g99vNW|am(>5lZ@El;g$pcYp%o;@^H_Q3Y>A~eiaXQ9m%`b
z6(JrD&*tI2BZbEZk=(<L$Ir*fPXA`I#Z3p6iLSr0+Q%&iJ}ZSmI+Vi=2RRN1!*sQ%
z+YO3b7A7gWrkf3_KNhAbzLQ%GI>ZZ!WdF*I27~NEF3q#K$-wr#kWSnD-D7Nb@pqw+
zPUm%lL7tOBDcvpW_JT4|LNUE;>i%M*i^?gvhr5f7E>fh)7IzjKT_j4YecV@Ubdf9_
z%HghJql<*;YEkzT8(kz#(KX#sY;;jExx3f~qi5fEL7wd6{oP2=_M%`(|9<M}CW0CV
z1zWn<#vKG<>l}hJ?XThPft+)b1aory66V%nq4oF9+)Pimxp?68qA!2x?f&7n0=cN;
z`ag5~kK2FT{^Rx^xBs~P$L&9EYlvGXm$tgmAWHJpg}VL6?LTh+ar=+kf874#_8+(Z
zxc$fNKmV@<Gi`1@h!B0<d*B--qO-g8V6+fowmT0(<I+ee>BfUqP9KL||BXt%1%_#f
zDX|OW(kgQ{8^5Y*{}Z6D%MJFl{ZCZN3b@que*jod2xqSOxar_i;hKiI=ODo7=Gb56
zcFVzZVU(7-<Dj^4$Tm5uy5YdgD~?AkZZ~Kt%+iPdeHz@aL1}5G(M;(egS5*zq#A-u
z(=I3O8NHCB2JA|I8QyRBcwIK-{(qxJ1xlm=G3E+H=Opxs%vWSTY`|8J{{f`I!aPN~
z*C6Dj1PO)RYOqkqq>b)0s4N*L@QvMPU^yh@IPd8;gRVk0^>>$nUz9XYgWY5>LCB{c
z++z@$pg>BQ|1yno<X&lMhfx^6_A*H4oY(E{Wtz@8@yzIjTsPoc`pXD=b7!4UN&DPk
z>^rNzP)qIIUtl|<$Sq&D7xWRTX{5UgvPUZuo6pS!vxRzE>E418DFirb{6{Ideu=>%
zep}f$b9M=ebi(?drGKv-G@O1Fh5HLy`@NxmblM1-^pVGZn5JTb{z&1*{`crgZ|*);
z@VQ3B!+`%d^?CL0yqtft_psYgL6yG!?<l<L4qtcbact`II|qL1SK6Wn-gQU*dfF+g
ze=h1@UX!f)G#LHcndsLk&u{IU-=~BI+1$*_HO~AN>HgEcJJ0Q}9-dt{zDd?MGIGBp
zBeB^3)7})zyabPa!I`AgIrGwq2=UE?sJ7^tFi!u@s)A3=#m~)VSbSFrpE}FTCZyk+
zRso&Uyd>~#duxc<df`diy82<0*Atoi+Oky8rQb6_@@JM?oXq43^nY?+j{I-(3|y6I
zF>YQa=`796ODAIC$V`VC`-Mz8)y0b41(7??-rpT9&@?zAmDQtdEzmp>yeWifwZ3m-
zWpeOhYA$4c?T7rgPQ`;zO{wA#gsEw!$6F8bWsX1hGc8$Ui75X}kt#QQGAkOMx4pR&
z^1@L&)4IZ=)N+}lvotd;orucz%x1ymz$MbHyweSE30f(g)#EjA30^H^)6rVUR~0Cj
z;TebOD&5tJ9hn8UW`;fk)I9NvriZ;fDk!<^mHGMoVOb`*!{T|Fm-*_*%n-|;nU+87
zZU2bAZ|*F}yzILFl1XkFd#ezeGq00qFV9>=R<~5vbz6)ov#SxMVr%M0Kh$xa`zodT
zeHPrm2sdpw6iSyWO=GE!S~H(TzK+3islriLOFj^^>5EK`D)!8AdB?h$*FjQRWs+Vh
z>MBHR-pq-<LOjj!rcQ-aAw-YN>k5xLWq!2CymTVo6C!hI3ABt;oO@jvb4iDIMLBkP
zNIE4dTDU5MN+WLiG5j_EQp-m2FbinSjND}0mp=Gs)e!&t#JmW}{QUlK+>$x&uy|kQ
zWxjf2=7-<COv@kk*`L12U$*JNOv|pj^|bS*u`@?!X<qWooKB*hxwHf<`;;eNcR~E(
z9Z}6{Tt~!p2>({iYHS-&x^pvyo-WGMB{ujW*33?NX1hV@<WyLnYRET&IxWc5c+aV1
zyJvdz%)Abg@|9D8Hp(1NXY8n+X>ENirSuzt9mG1#BO=-~Eb6J%Ez>)tY4~@<SGPq(
zMC%5HZTel|(I~wdw*~5@m2Rv01+5w}$hmX}pkpmqzhy*3%X$SY8ZlmI*b=Z6uHPym
zqD5WM*)Cc43&rI44Dl9e4y$H0wHIRZ{Fri9Kf+`rH!C^XZ+6w3{22(lImC9DvvzJd
z5gni%g%ik0t)P$0rCfN&h=}k?0s8s<;a`8fhP^7Jm2Ri-3jTWSuviaSWI(0xP7xi$
z%lT<#zFJ2w6=km+9ud(Yyo|4Yr!zikK_^GmCJ_<s!%O;TM9CB#FWWR{wWbjf?HU*N
z&N%RH8hI$zKzHE$f^NaO+%mlecHMnjOgmzr^pbS;hc4OmARt<|O=J7E`tF!PMV@$a
zPDFq%HVa&IB9K3%ejVnVOf(oCI5x9=R$Z?D*qMj^x{xhm?%5=R5s4$yTlfIJf4i0c
z^g!%u?NiR``#Scu-i72xZVqtd^utu;toWgB4)MAVBBNZ&YPxo86!ht!7QFq%I-}WI
z4>u2~pqbwvBDJB!zzs%9clS38E~^PMTrxTwdM}(qHa|2d(5Q7^me7Pnt{SA;P;uzi
zXoJe*_UiscwK<(JzAVyGb>t2M!}#_aEBY4HZ0l?7birC{%<dNkrF(5@&)gXS<rl_C
zG!eG7(?Nbe8sDya)nyX)F_Sknx9D_*M=SN9_KH{LrJML$W38N}IS-abzevoNh+kbt
ztCMI)YJsKM28k&eG0Ups^^CVEcL~~h=-1auZH3s^I-r`>q$Y@L<>m%UR^L_rv)P8a
zImBUzBjT~H)j@G-GLp$c5%2^IJSX$19GOcaDUV1jq6I-iWJ>q)&>T8+wvq+9EHY%|
zWr+ekH!wg8n+1A#sVL9*>k_4Vx}Og6!TR|Aun&#AEm5GyKFy-V*4Om9Y||ps@0k~_
z{lJGlno~nsKzj2ND>?;?TD47K*C3EgSKhN|a)n2_%$<Jcgly@a?_j~VSzyqDEr&__
ze`E{vR0|!h|5&4zfaSf*vZec1INZppvZVP{+HLP^*Vl?EreR;}Sz$o_;U<aa>Ch=j
zH8Yd3Xl?Y_%#FuNU44(@d7gzRKk)v*x345~o46p4E`EQ|WbSm%Ij<#4H*Rh&c(xnl
zaT#cTU_pZH<9u2U4Xok1ra2lAx=i+g_hMq82B$LymqmvCBD;OKCnNne+WOis4Jfri
zR%Q6%kSrRLZ-Y=s7we<nGQFYX#S>Apc!x@Xo~~{PxG4671zw!=hf3)lEf0?2qIUZr
z#{!ki3+)FVP`92D8npzfoKPv<9YxXp{3;aFrF0!)-TGSp_-NSII^~7OGr^tSVv^RW
z{&6%%-5lalJdvB>9RB87@tNRBqoJR5170X(H-5Y~x|ByFPy2cfeWg&ku|qxKueAqS
z7U?}+#jxRv0ai_X2C0KlW8Wz%wiKWAv|!UqxBzP5*nhUlWBlLu!5Jbnx@^<H`6((g
zosQbl?YU4&_L;uW>Pp52WCj3!Q(mbRXv$<SWSSf2usgWW<;!?QneJ#Cw#@>=g!i?v
zjZkdZ#SgY%U;nXT3I}foOj6vm?d!g1@8v3?n5H@vtY&?!36NRcq}w^d{RBHzxJFx5
z=WX8$gtF>m*kr7N_Sih3>(YY3Pnn1d#ifv{zT(+(I{5uTi@DRqRqayz4K2;`x?-%(
zgI8&lJF8frhYBO(ch@k3yTPe?NwIWy=L0{TF|;hQ-Yr!v+7NBFzP1#cCU+G}cTJF%
zc+M5d=~!OmTc(G$>+Z8ey+HTp)Zq$`@QoU0U8`QYJF;uwEKN*nCV>RX{J&*|K8dzA
zErH;D>ZQ9J?CrEIQ6$BAm`<<0R&pt=`dX+qHcIf*j;$JtQ_RixsGCDPYC$%cJV+zH
z7hGu#?yC0c{jj*sx=4A%=h#CZ>IVgT)e8Drd!S{JonI>#=(9%J_zbcgG#@1@m+m9v
zy)Dc%$zVe?K36}v!QG0${A@DHfV~a8p?2lcy-`X-vg{B9>3(rodN}6~bnbMvLlgyi
zvmm-PTpi|42mMV^x|j0c+bn>zaQqgDTKK78;OjrurX>)1ouYIP2ZD(jev-?igzCRm
zeXVUC8uqn*K_i?Ah!N-dv5Gy)qA)Br%MX?oM8HE`mliCO!UgX7@ZCrbpF0HJ?+-f6
zo$j4VP`dVh8eD4+q=n<JDE2Rw@_{ZsgS_DbZwg;kq|_eSW&yA)(lV2xKwme-w^<<I
zjT&1QQk3q?I{N+W5+vzg)IR|a%}6Z|_46l9f!;0%YYo@*X%GfW;3=BYy^;srSPP^z
zlaNa^1$rhJ_Zh28OCbMEn$kT2_Q#?sadzDSnpS<SY8v*n9Oc3In4fPM^=1|2*elU$
zW=yj;k)}oUlQ!%VObK^=`1ez3vOE;m8m?KI3;g4t=~#ZI%eD4Ig3TNtNvR*`;xou$
zTK@=<)DabP@q9lhX3-RAd^1oi=7yQN!D3lVQ@XKrHN&z}5TzR-m`pRz-ae#u57|i|
z&Ie*5(azh5iuWH>rF#O@T#STldj*n4*)ggDJ>ZSWRtXInRI;6;D&6fiuxHH-HP(SX
z-o963rH6)nt;J~LkNm7=%yRV?YX6i6#;T8LnuuiUCQ;X=1=|Uxgu6a`qa>;<cY~Jl
z=rDJ>O)AyMR$I`OGVG=#7DgI0quRZ3N+V3_2~%F>hV8WqqLfq}_DX!sWs&+Fee88v
z@cV|qH)=eIs&r$*^kRr0O9volPZvu>w(CBLu0S_iK&|1Lr>3CHA#7Md8*9O|X0nW~
zKz~Gi#%j_Muxt>z9{O&ITIHMvw1}sx)s(q3>}$p6026cYbC@&Fm7d~TiRvoMNhplG
z^xz>q@V&(eWKhNxqML)CP#F>#D|LHO7ni1U62<FMpx4?1EQ_ohM^>QE3v1#t$fcmv
zO(HAZ$B;Fbm+9$@v36<IB9*K_@8m$l@4k#77*rEQbSE6RnoTDvBni6oH6kvDCB>XO
zT_=^WKzjjO!_{E!bTbEG>AnYTvjEY;afBdDEikYDSeKSS4@zbC`e2`!5Vg_P0hriw
zsm(<1jfqzQwf~=w!E_S%xx;F&vUQ@;j5CnE=1EzcfT5|}(t=trLhz>Pcy00ngjv4i
zi!0^PVD7Z%al+C)=><p^sq8g|=|o=;gwkUxur*x#fPwI*6cud8yb@nvS!9lfgax`v
zi~ELv-9B+%O4Ic7_1c*s3Ap<*X^L#u-J8@I9<TD^5kb?OL}`%_@+=3gu@*>cCP7aq
zd5{(H8LLZ6Adl*iQ$Z&)dN&-m`MRo1U>_XbjmB@gqiXPDCmcTY$8Ei-n$^u%oaZN*
zsXY|dd&%FgR5Mf@_C`J$A}>7{l|=*c#d3d2O5nMjlrl|5w1z8Z55`A36%YKW6Mj(w
zSQa^nv_Sjf`V3Noxzlq<OBZmNj$Cq8^llWElNM-eJPOL0ZvPdM^@0#bgAD4}1;4=I
zdD$7vxznHPy_?c3QF1&D)?Ioy1JGuH91pW$FqO7I#~|7)(4{3XProxySQ;*VL6O5G
zUnne%myl?CB!C%FX|n7UMOI^NP`pse-yVacCg0;wmB>GgX0i9rU~lB(9~%Y(WS17y
zfE7YAX)9RH`iPYHe5g_$4dzbgctOg`oN$bl{Z@i>qT@(;oDGieWIG;!6iucbM)m=`
z5?^3hWO+L&7j2r{H$+1~>Il;Gw?!8`Z_(l?hsFTpv9&CZXh|vLfjtWrcw<)nF|;J)
zMm3EKY0V@go|cz^c+Xf}S^@==X?YAFjkb0>LzTr^NDsE|WE1-<BW3lIi&R;K`X2`f
z70wx&iGVUaR&pto#_kH-8~Nyqy!2pPC_FVBf<3j=$@3@hCOAT5E3eo*cub+*2|u8P
zNLg8=hI`%|4r;SNhq=?sh)ee~_$%>++JmRU61jSGC>uzxaca}u%wQW`XfM|Z*!)?u
zcRrr~T(02`D&EGNJN=O$PLY_;SRLk0_mS(}tm)G-yvK66MVLmQ*(^wsB{2-6A)xg`
zwt`*g(h`^~*N0ouqj}RlzsbF)AMih7Piy!-HoK^yDWi7?vkGN|vlIf<#xisMK(}hf
z1>76?c$yt~;Bghaw(|+W&owWoVz^CAtUsodM}xW3zR%<oug0|tZ#z~_`R|E0+yO{k
z5~79Uz&K*=SUvQZ@iqyLoQZPkWg|L<cZ|F#H$H)PCBDG2$WS{mM|8Pwh`w-?lxyJc
z`>I`dms$Txv5N%MF6W+NE*43r%E+c(Wzj_I<%AW0{nR|RVX;adh5l1Atj+5p(Oe{D
zQb3oT#%@I51~q5kp0T>L1gsCFWU4OvE|8nCeSllHWIm;=d74K^t5J)$@B8ETMI&0~
zU?kf@T5bA})}xke-?#Vog~MBNwx|P^(W(pPZZl@dj{SSL{50$x?xDM;2z*IP+sA~Z
z``W{+TEAHv_8i!~ddkNoEl@Y|F&la5K}Q{Mx(kFf7>Q=&S?-Bu4OjlXuLid+xm0!E
z-r^#El~R-F0%su-SQgn+P^WhwZ5HS-clrydsgMm_D$tLm)NE^F@vd+I(!%jrL7hrz
zVoCW4oN2!qQmwU0F4IB>$#iM$1@*vBMx*!#qaHv9nOdnC6y;SW-*yKO5~K?1R2@sh
zPo;s`4oz=JQDeKGO!mu|f!ovr*j9NtL7oag5g~*wErDuk=l-xvmLN3;?<m<7(zo%-
zal2t*9Q`VUOC#aBpybjChv8HA$iSRj4e6VLk_)GdvwG-@9GrZDz;x2C$ZSEHHX7^o
zJp8d1gH<1SQcB|LBEWkgAmAY*p!?ICL(WD>DUS|wr&mjG*+{)F{{;zFKw(u`9C#0g
z)ntwJ_PkWg`}~H6%=%`31sjb!-vd`=@rx43vdB~94AbSlA!ef?)9l!4v=Ut{8P(6e
z3V^p=x7rlvj?Y9^gag~9RfHgCEV5F8`o^r7TU%;t7Jn<jKuFWLnAS`N((?(}Ggh0H
zz$m%-zG{u+&aBEi%=^MkTpY?lV`h&~C(O^!@*I7|o7K1<85R4+A+VNmwi&mP;gjuf
zZscPZ^wNW$LNirhq=i6SBPZ4qb~FS$=$Ryj3ZEM*2!}~L7$2iqhy<2JdcLN2avq}1
z0v+Z~XHAsQUkfpo;Ymo)PeCvDj<pBR5IZ@4=(5~<3YclX!ZMpj@G~C0bC|P54~9sz
zHcW<lEXScwofd&T>1`4{o1vbu>XY7(<#kU2O}Zu$a_^Op!@!spj+fE%0}^9|J}rR_
z62l#yCN0iqNTRGpae_M~Oz@_k|B=X^)%ek#^!hXWS&bXc)}maDz+Z$N^FIZ9I!I~@
zc&6g)NaUpl9|izZERhk={pn?6n1o*nP|Bmj-06JEQn)Xm2h#(hmAL7{Kj(}-1wdKD
zReRvsz?B3dROe78dtuGvMV3W25#+>R+AP4I`q5FMzgSCkTGm}XSZ2<0WueS7sC93#
zmpIwPaPB#6lnP?=VGqTAqqy}(A<iJ$EC97;a+00{SkG8}S_0RU$6BWX?MSigYXOkX
z6s2E@7$BXZwxCcQBCE%_8e6+K;HzkCJ0PwXp(l6EjB-f0;fiH59hfZwCH-lEF#;y&
zi2!0O=@KV!?aNp{vz3Bkk>_Vj$5!O&#6V3{n+4#yJD*7Wv)Q*UkHqjrSs>P88^RhW
z=u>_mb}BD%0xiwmr><!qs0DkJAE?<Rrf>LYvr(gs-2BbZ62N=L>M?ivy0X32V#q`3
zKZ1{gMALH(N;_JkmO!HN1GNFpP<qHM0g;~7qZJ6=1IcPFTEXrEjI2Jc%ELtjQfzcP
zb;C&CTR_&6AA-5`AiNg>nr1wA)YE~1FW{s+dd!{v$ec~)>#_kW^S+&|NNjFy4Fm={
z;!w%%45?*2AkEhA)th=vp==gF%OYnoPz~N@0p<~K7pvD8_sl7&1;@=X-&*|xb8_jk
z?rl@{Sw8g18(gUX^|)tGmA%L5DY4Nvz-@J*S~E$Z=P}eXR-cwY7Io+2hT;qkZW16V
zu7QTK?N@aPvFt+0YD_g2VmV+_b7}5CDc+xn{<I{R{Eh7I-L0s2T?XQw9|#{YFb0P;
z${E}My~x-MQ@#bBCAn2#%OXcJ@ClsF0zKwV&r-J&xEgnG(5k*z)<kBOFwg`BZ}s_R
zUqLzSRlV<h$ebElaL$}!rd%~A6oyp<MsYlOiDDp7AO9B|vmh__Y(A@AV)Z~5bTF&D
zj~R!)x}esRLZg;IHi=n7=Emd9iDKMv5lokWP~W{9PFA0XQJTJjNzq{pWEW%rXoF<E
zi&MOli1wOC(0zhldax-d0|aA&-Jf1x1|rd<Jetg%9%jxsb=8z%a0eiTwWk=#Kwlth
zxXPrILOvweC+aF_U6JPTV#^{|XuRa<V69C1ZB)0QyHn3-s6S#(eN$eU6Qt3)w*z>&
zz<@;~rGoB2M41z&8i)7dwJSQ9HEYL93_TB!p0PT$1cb6uWf_Ti@m%7aTLLFt$wD@y
zbRQ_I7kmh}&ViFodDBw{g9s}3X5rvyMN%^(PyV(@Z|fib2)H3Hphy7Oufqon3<t7?
zs}7PYp8J~fle#K#f3$%%+_}@k82Av)W`QPirz6!ZmHuu{dlUjGl)!((+Ix{kEswV-
zHl4Q^$+H;h-PSYaRMmnF%Ez&;Ah9DQt48bIJ`3hGl1<N3os<e5_~Y=ma+j)=#2K$(
zY!=*h1=hmxReH|C*erM?v}y@FG^dgBNWx(z`U#{ogNiSqvN{D}614_Kz~50Ety*W0
zqKx5Da|wEhRJ#9Wr?BcnvJ9~WdFjCcp#I^)O6zo;2-8y|DUaw2Z29N1x~%eD6b8a?
z!Qc}HnximIul;*`p}glr+cQ|f{dD-A$QTAngWD`XJp%4@<t>zCOQO-R(qJbz7p$st
zEU#*{?(ICiYPY|&QYwf9)*9Yx#wrz)*@&99Sflpa>DhqujMb|pa70;&=72fNnFQRI
zp-3juiL%~=BC!w+w!2Wo=Vw?O5F*Xgu0tuNFxAW`>K*<MWRX7tt~L|qG?l>?VxTch
zgo_gZ<%;JDGFwekeqGhT2HJq<PS<CkIF`)<ZRSq5mZ*aAoBE#FoP3Hf8veuEgXjAU
z1J+q#j<QK)+7EZs^GP<<_1}|hGypC<)x+e0EHQ6ktyb&ark2raV-E|kl?rf=dp1N>
zRl9PEj4e&HZHD4nIG#k$XcU_T$uv9-f?=+VwE)$c<V!9$lVhc&2!}8SeI&HR$SR}j
zo+gk0qP=jD0oIdWRkqV`-w#<?|3^R$2tJ_qr}vPa99U8wZRSpUCrL=@j2m^9-4ajX
zELxpNY%(X=9puDXQLN!=c37l*s#TEJX^Dk{^ztWPU#*snxq@x80C)0E4OMFa*(CO!
zb;3gnLS$^~lrz+8l-Va=f4w%~xsQ`DT~$GU)NS7mHDwwh1q?q_GTK>f!E6>FTQhlw
zo(6jP&TuyH?49%34Zk|kD1yl89Ppo3Z~+*xG$tv2Ldz<-XzgbVj*)D=TY#m3$~80c
z<nO|XvJe~rSF`;%=raoYD>;{7tl<)oQX06+IYMz03P-U9+OX$NpCM-_mdyf<=1$*G
zT<~Ka)ajvRg@3pfjxEvZfS!y0Jv!5VD0sz6JWmV<Z*4M`IcMpBrNIK3hr;t_t`v}(
z6<0>Hb#L3VVQu;|Jq0vVDrkg(t<`EF^QWpSrEf@WTnePO<!}Yo!m(Go_4KXrEHK;8
z)2b!l(`k!Ti{@<ucP7Y8fr;_dzyt(})rK2rS$!AJ&>o=GhCLYECq7J#4n3`R1r-Se
zk^Q~95AQrUJixE*P+$oC_w)zNJe9f&ghC^w-t!r*Pf|~*)pWjrap^x*TF=;u8uu?b
zLp3|F-p?r8ww)}~JxCpDas588fK`w7x-8&jk>$R9K~7f`n+2Mg_NzQCR!05jBZJwD
zQmad~#mD#atFq12^$l$4Qklrta+<(1@&P#;8F%h<*1;@>hMq*`!rj_E>T%BkhRbT&
zr~X{clHLXTL2l>h569;~+A}w-HIp1>^$3}GVnl#e3li)?AmkfaaZl2BWz*l=n#<*M
zZf+0G%JG1;qp^m9K!L_$ngL{0;MG8{Vqo{8u#t~OYIcm8S*(Nh_ih9jqotoC5j1Hd
z=qPNh^&B%{9J`ykqQ}^FI|Lg1F8lbq);%a)bLzt@a^J&k4fGmlYsmHP?Q(E@-8a+(
zvRR<X+-XZ2X*>U?JEd2IxjvI?0ww=aNgWQue{g&7v_||T7*gW0GE(4b3MU}UKexRv
z-BjG)+$Vkh($FVzqU6QJv9WxjWSaBUh0~7|-iPS{I++<6!SW{edn}mJ>q&k(DHVLi
zj^|({KM6cPclL?GFz`rU91rJ!S~&I@$+la<XM?@eK$}zCmYpn<VwKjtICEY>6!f^C
zC%wc)pmC8z9g!WD-O4n8;}kV<Aek*lvYiC9q;{71@uXUp$o}5F?F&U{9Iu6yNXSvx
zlG_AVI#Ly8`A0qGPM6=SlBtxNCvGS#bNfdHoPjn}dy3Wgwt%*+B!V?uy7ZTYU&BmE
z(wTJigu;oQ9qYpojC5nmBAc9JlTfV+1-4m$s6W?6=?N2m>Eu0y?)l<8z`T8g)m~&P
zW;`!AgF1J*>?zIyz0(-X8ZPw4tg5go^IWS3vuAEh3&(Y?a~A0NYWxcl=+hDizr)%h
zFHgRy3^-DBRPK)_S-KjIm()Xr0)*NWTbG5SCrHgK&e)Lsy*nC;)q)woQCP2uNrErg
zf5@uQcAJJV<1-_L^C>sOSEDu2`_kk0Bj=cQ(nK$2rfa0A6tL96S!0Z_F|&{~k8S7)
zUMm<=?3dh~$#t~CDQ0rB?tmhuw*{3Cxc9*~*Gr#uZ<o=VH%s6xPe-IppZy=qVIB=l
z<}F?O7z@UpxgjkaTgIj`H^~R_GG8CnVcS&Zt$QT)Cim<KTnf-Jt3D))X~QMr2T(bE
z=GP=q!f%v^xKYp>+26ab^8r!U!3~~XR4Df_+Le+J%RlNccRGyQBlZ6j#c=6Arai?n
zSGafBnIFTY|5TRoSgCxQdyCI+aU1DImPOX#-lp7+9NabwXr)T5G~pJNZO8_RWr|==
z`?E6={LC55xzn~E_zQF!r!XtuYcqg1X63aMz{02x!k)Pyt(o}##$TXIJ$V--(4{5d
zzn#Byzqisha4M@O6Djyyf|uzDk<~A$vudM|E)l%;uTA>n1X(4f6$(Qr8X*M9cohF3
z!K=)TQZtL_?8wJ_T7`r4lmGzh@Y~h-cM9;T2`3AvpXba6p5ac<>L6N(#F#<U{1tnF
zKCBFI%PBg{o$eUVUb^>6t3hq}4{Hye-T7rmH;S?cd7U0^sp^-)ujX9<@n^mONT+jX
zv&{Z+3$aJh0n(q@ba}>#J!rQmK%QwoZK6wIBlTr*0HjUc+AK)0gi&GmPXUltgRM!_
z&k${{RCu6{Sse;}sI)%nXk<^?%ebD4V%}>Wahiqf?_Ebt7(NwP0DN=mz7qT?sU7?B
zk2=hqZiX-=E4~@v0Z1Wc5OqKp1AWEVqidnh_GCUpSSIvYWj-Q=0G365<^U+rhou;8
z7U<(;y`cgiMTOxp7sO<w9~WilzewF-cMzj6)y^Bv8ZMl+fb}<w(%o$1-=YMdg=4Rs
z7zMi0!uX6OZwWxU=~P$0gv~K0YY;y3C9;|YpC#t_X9r>u3hObv8(@lOkdGEMvq&xh
zU?ds;2)KdK{D5s7y=;s?NJ))Qtl<K0%&Gx~MTofS+ITl&7bPt*R4`-8YO{6Zb!cun
zC2zJD<HC>LNcYe5ZaU>3QYwHN<aI!&o$V_i()B!O^c5g!odww0$ZXE>9)eP!i<mvR
zp@ARUCZLq=cT9L*r02XRd+4+2a)4i7*O}<-)=c!V+&Tyfli{x6E!RI0B6fFoZ)^^l
zWVPM;XF@#R^??^QM@`J$wcq?)h?m>m_XJ@X3V*}-Q6{R;l#6zedTB}_7OOt=Yq>%D
zd-o#{rVD<s^rG^rpUZ{SMYPnGDX`t$TQC}=bffdjK{)>n(w<_87?1+J8^XjOq073!
zl~C*nUJGQ~5Eig3vM$O5zO!7y{~6kNS??W`J?<O@Yl2k7nLGJ8tDk`|=T6tf*-_93
zGVmJyLDLp!A}ufgdBkH*FYZUUEjkn&4SC%bjc?85V;t*O)seVsOss*pr8+bw8utd3
z>y=8-ypSy2iy*$o+K0j;1csYP<&#`rz*wsWYxTFJv%++PfrkMg`&WX6=^m1;`vpom
z<IQx@tY+YD%*yj9OzHk<WA$zX<lJfBb1((E!@|0CWc<0)*%XXmA`SbH8vaAtgJ&?#
zwy+m+?WBw2<H<wbXaOT5hr;u;fFZ6hy0ekVFa6K=s(|4|ZZJ=7fN2Z(18wgwI+%mt
z7p?$WI1a}7l8U?j9ORGV;C@z?M^Ow;>0a@{!QUaRtQ-MMki3R@OJH)#fB9Qr_$>hi
zhd1yD&;}cP%`C2Y^X`&dhpWKaCIEoai|Q+I(l~9LL_dLruYpQ;kTx6M8A|6cGMv<d
z$r>(4>cey|Ksf1LrUQ@y%OY0*6=-uVH?3%L)R9dB21gz3uG$WG_f#X8@(1C^WPB?l
zQ!|SE!CM}lhnzoJTMUTDFk>>9FabD!nq5FfB^B@O<5EjOmQog%`q)`b5GbiI0LMUl
zjk6Wm4_CQkWx+oJZc71<=uS*<3=Oy&rYaD}ls`Ooh{D@BESAWWKY;y_YA~m{LMl`K
zklZ1PB_kv;{0C^^xQ+ngnm5N2P#Z7nwLmJ}Ggb<;I2{ne$w<2PGDymEMOXDQN;Dtl
z95G1P8PxnN-Hl2~S*vi7(JSofMNjTHB$5i!W9wm5X7f~;YxD|<u5GtSG7_&t=<(@k
zR7}bfL%ub7g&#6d&W^<M0KmW7A!H5#KmwZf+fj=F`k2N#Zs8}Vs@Bp?!xW`RJpf)}
zte)j>_{{%BmGMTe@Lj5}o?)JDsJ>r@udphDd!`^jTH^Ivfs}scXgC|bqj%(yh+6W>
zY)3rN*Ct&x!!moQ$aTY4SdMo{Ko{v*9ivj}{X&s*h6P%J<xT`h6W|GE8yXc^Kh@UO
z3B%GQ($P7DwQ?+nB|4*08j!5WA;SXA&(IV;4OP1DqPuzS#{ONG916sr+<xQ<;BmLs
zsdqGyhnUfiyR{4Y&W<JuIWF({L#bMSb!_`zlFgx6(9x=M$O7*9Gv&sZae=~ZNn<OZ
zR*wC`j)S+A`Zq_m{~d?z_rZxOdF}{{(z-`2V3`GdjOa>~L-wKQcUqHII0NLOa^G8o
zi-Pb;RyFYv-(Ufch$O}T6%@(53qv-9KA}_2cuB45zqTKbRnlkOv-c|CEupkSyT`ZC
z6ewQsE=t%PdfUpSBp(aWe{MgO;DmG?dO)%c{nv|ER|suXwuXS>I<M4hlu#r#AD}yf
z?jPFzkIJ_u<?QxD4<sAQ(6{5AG^?0Xl{w;tBp2UH|6<ze?T~unz6Enw7=&h><u(?t
z1E6Cl@>5Q1kEFgF<DB+DQ#dkS)|OAJ^pQ#Lccl6$&wOP7I#+lX>g@r&#NwXK3DiRh
zzQa1*LaM@eGB}r0B{MHYlD&;=>2FKN3#!K-fE7Tjfn|#d%V607edL%nI1J^dp$hh3
z9)=5GFJ4$r3ys{)@zzTXNGy!JP7UxC@_L>pK6)>LDDps4&-C7O`_q!dPH?V6C&z=G
z!O`bBon>jn|DNs`*r<mG+Xp8p+FZ+;p4|_wOY&rhQyp632dUwN_9mch)8Ka#wA(yr
zBWT}`tYqaksj6qWQ$ILIpMPchM7@KYq<E|CLcksZ_id@Y?HY`9=9QDB&-FCu<IA+#
z`a-Wf`I5L(RaJncuFx?Q86C(-BPr8!1r0t^m!+B|BP|A2kyD}kTI7Ep?RN0n3$Rp=
z_Zf@a68K2%+IOo-y_HEl4Zf#RlQ?0lR4JK|xe3cv6)wVZ2l~vw{cxDePhU7MGUSV;
zS`-9zX_H|<EEE_3O~c#^#yQr{DYk*}zh&gQpBr>~Cpn}F(4gxWc1h+h!pSg!CX2iZ
z#x_nOp|`DUeV}yhyFQELbS(_@tt-nIwO)t4PF_=5yko#v$a@xaWT}#WywbJrX4@=h
z8pS|!wdr$QCy))4kx?5ewD}!ZJQ`@LRC9jkyudiP57am`RvH4Re>R;Fna1xq!%kGl
zb;a%d_J9&NPlU4vvk;AM4FS|Y8wfSRvCnYYT+zphx34!2_Ug=S2}&x1sCcC)skspW
zw)^>i`H93~Ge2|SWI4-_7X=B7*6GMbRqVJh-A%lIiU3Om_y~Rqee~X34vFVzH^t7#
z1>-tYLWpP2$wzJqExShn#Am7lBhinK!imt^R<0zYW@9|WFi-LRCksj_h{V|VD3c<<
zWRVR8825R7KY}b(YAw@<C~Mf*STCbvVKJN>_!?Fm`KwTL|49+^FVZQS;wjXhS=h)P
z4Y#uOZZvLV$53Q)2_QFdrIuCvB5hUu(ES4wtvU!-hj9gsL#)qO=$62J)r&-Et0;!I
z974T%nW934hp3cN`^KYEL8x$*pOrYA;%67yG>#e$vPD5)t+Fmf!E#7|fV0GFBY{R2
zK4#O)mAS{#mn#M#l)aouvpW@N3d~YLD~r@|kI%KR&u=uEkN&Dh<MsN-Tu6~e^+Q+A
z475SY0bG+ka87H0yi#^|KBlT#ehx5i14a2O4of(4fFPliwBK}yP4QWiJr3tRpGDMq
zwHTn`hPbmE0IAcsl?_XrvX=fP#ZxjCGnYQ5dNJxWlBBhi_}bBU#m64(b6*C_9Cli<
zTbp3k!Kz0j@c}bKcnp>HY7ZM!-cw=^KL>Dl%ukdO6&bJ`r(P5UaA^}q6&TBMDB!fd
z2Eq|(495n*VCPPck;sAB_)ra16AHiJT$)Q&2MNi=@RrTi;S55J1qpHa3}IG<coAS$
zd8pQ*M{zux(oP68S>!r6+F-jz;b8#IJj<J&X5CuFb!j|rg8DkhCQ;e+R6McJQ=4)}
zzn%v`r3a#^kWIi*9@>`@LbSxOs`HNGb{<Zu`+1~@AuJ=OK-Nr33b+)^_>3iQ32@Ji
zDx+u|Xp{2P35O59MWP9)3|C?lB{+JaL-@JD2%J}4vpSUeR2(V<-N_dPVO-h--3+wf
zT^Mi<lk+_sYm5O@Ryf4QGIie|-&CxOTf>N(EJp>LEOHYZ(_BD3JlHCny(FykP;?V;
zN#z+$W4Q3Sh36oPQ*eBd4)99ZQ`oqwEF1|oYayowDu;vGCl~|@b4*o`Y)OjC&3_4F
z7<89#0%`7aC?4U=F%$_qce<<uS<T3!dOYdrD6W0985|@5$HH+Pew2Nt3b!SVgD@i;
zvF5#IRp+Ly1@*u2Pb%0;p|V^_{#h86H7cYOWXF;SL>RjPVz9l_`IGG>VKWOYgig0?
zK0&|$^ZGqj!Lio_zzu*!aIsZ=J=&#;vZ|csY(jS`-8+OFhGQ8Qp9>-!wP4Jle6Hx)
zwHM~wi-NJ~F-+jeBBS7##6=|flCKg|*V`(p+MoAOmO2c>Ae6w{q4yM*RO%{epNf6u
zNesDfSv*=IDHtHF8BvQsze#lqh{MdO>jKxFC6KI{G{>VH+cOrtCD2*jS=XVeZ`(ZD
zRx(B{zSskm<0{O8&FWbdW&#+M6+kpJ0Pnf?{4Ly?S%{|G8;6DWbA7=C9B@3<v=xrS
zY}RlI1Dy$FYrp*z-^XNiuT*a1iz`MvS>#zbR=dJ<cre_#)3?-R+^ZB_q8y4cY?ha9
zn+E$S1EdIZ*bI4B02^U^YF=Hjy>UQY5<L!sJQ5UDbhzhw^|?@;xWfFLj(EDc)1~le
zf*wPWF(FKfL+Y+N4^eGIP6hdg>`z?*vTz)Z{|~%d(g3=b<hJV53@WOwRl5rGAD$?1
zE&!I7N~Z}x#TpNt)hbAQfIGsF%JCpAnn=ebPhfWzh=~BK6HtJx^RO9?KTILs02uJx
z>AmWjKZ_K7rW~a353p;545Z@({6F9+4}QYL74>VH->K*`<+3RMuv7rbA|K-Y1AM^O
zHAV59ZMdQb%g(5eiw{MKjay}776nwVOmeQ|dxBKyF<PsB3y<pXTXJ8B5?ZWf6sHYs
zQ*Qy3G6r&g?$ha7j(Ftbdd8x+1RALuv*@CFxR7I**XI(fvWd~RV1M$eDAeHw!B8O;
zof!m!BJGeE4%@_!?EoGUeFJzm4h!$+`i24<CPnC<;n;{|4HxPbbbnKy0ddHT3d;Vv
zSk4+(j9_!8_rNjN0Mx^SJq!RD9G|K>FcYNwFrEy5J-&B*b+z#+zGgqa5vl{&qm<S5
zJYyBjGWSmh@uYCk=FB(MWmFuNvD}epIOB!+Iorf~YXV-w89s(0?G<?@a7sJ{Mk)@h
zy!JOCOAJQCxm1cPNEVKB!;$RCLN$j#ZwZ9SSoKpJSh;I8>n@~9Ok07Vwt3g%fr}Z(
zu|%t0WAy(HJ#=Y!j08S-NON=fxXT0h*)WKMhxA9{M{drU>Uz0~Mt7D#zmB9AIjLDl
zny25mv7JEz$5TxcGlquqQhd#%S>`<RR=gU@G0JXV`G(7}&XnmVGM2zG6yLGV)5uU=
zCE&8^z{>l|efz%nG08ky*CirES9sr#hygrEykomntCa@Iefzc`98@(6=W|nWc%UOl
z`*IQHe)-R$@dCnoei$3GQn6Gb7m<}Y%qKgIRb7%Xiq~cVm^G89Xq@AH#sXV2@r;)c
zsn|@~#EFVk$uv;UOnz!Uzs;+~lr`&Sz3cA*occ**wdJ>KR!)n^ik#Ii%`0J_w%`7;
z?z>JPr#<`@iQmDNu#EC3F=)xUrGrXn5E6a!nD5mZdoE62fdo$L>s>hdFj>RJ4|JxU
zLRIuTRWTj_0v;>0FFDq@Lz_GO74jTc)Wd@%76VZtX{Xq+Icrl~!A{iW_1-O(h2z<H
zb6oMyZ}dEvg`bsesP8dlhnWVt!<@H4m?l%x+SDc{q#7@^neRSE%d3hVb6=A`!CEpw
zUeB{L3#)|MxS3_O;-1D!y~NPuZA)FcEvVR<5oq#$sKZwL4+*t#Gp~J$$BnC(4C;Q;
zY36unkml%^)%oUNWok7NXP7A>Oko~Oq9wH)vO5dT*_cD67Z8NK>J@>bD!!CQoU|Ij
zX^ZBmv7wIY2@>NTs%wd|^xkdM(b#cNS1XZun5^N_rY#_r@opI_#<g(>p)zh}lNc6C
z4P=T*W=L7&duYUavnX3X7hF;$-mR^j^fP{0inEjaB)+dttrEbfyDjik>kY=#Hqtve
ziLow$<uK@e`8%UAm?tK>U4XV`@}b%~4OXd@jPI2);O(0-1B$FR3(%~Y^hcw+2G3Y=
z!iurphQp`<?jv;=n+ryNszuAJUW38!I<iYg4q|f%iKoo8G)Je9=-UT<=-9rj%ob1p
zwZ3kG@z{#sY;?@cnm&-Jg^C!By-97^aI(dq4xK7wS9wK0T~-9ukYo%qs$1$nJv>-b
z4zkE-u^%`3(@>`D9sP{z&}DK<=yDqV1G8|P!w$wS59ae5VL5<Zxq{p7Z}jL-lG)>)
z(bU9jJ8_*K<1JO49ds$x{Hr9#42L@FMp!!B2Z@!!uBeAj42Z|V@ixmdR*M6Yha^c&
zdMxbHuaR^c!>eANF0pVS)77`<<KS!59%Laq7KuR|OctCi0bc9WKfBB>uY62$KSW)u
z&Xv&61lSlPxUM62b>tB?w~-KjybMNy!GTJhklk7EG&>`uQZ&R-Q$JU9FVaEEBOV2S
zwC<j~Z*^|}d?x86r{7)c&>bKa!E-z%Cn}4U>&A=+wuZ|cPoP_+-j`M`>#L5I{5~(u
z?J`^aD9GZng%bp*Eb=fIy|nQC$UYQjY+tDD@_n4;kb7WGcWJIQxP%;o1T*9^ynl4}
zh_8N^Kacve1p~T#I8Dw_{8`R5Z~^B|FT>&>r-A|P+-VfUIw?DcbpCL}Zu#%hgYQ3&
z_+++RTjO_Dn+15*Om>0oT9Wk{3vSIs&dIHbzkSv1y)lR6)xdAe=o8Uv!DGqMU<iCt
zHN@YcA=w2qR^B6ffvNZY1Vot>dT#k5-!sf?Ms^7-fLdQ=!KkT+qgbZHtipL`=0}}B
z|M8)`gn8%i54sH7nJSb$ZjL*{V6=`qC$txYv{`_mV$nvj0~OgTqR(Rar8^Qg43Vxw
zlR{Wyk{Qmz@dsGM`s?AQfDSN+H90l$lZgJSW97?m)xh_<O_W=g{)rC^#jph2Jv8we
z$qpSi{@zKCXRP=I?}}Ae2ZQNNj^J51Zlk@?<_$uRmcaW^h3hDbK^dVTm4t@W!X}S^
zqA`{NT9jUnd>GB?&H~`u^J^!-Kx%#Mh2o?hQXY|9j7Q9al=d;j6(g!F(sDs}qs=uO
zrhsnN)boz+GeH{(fhvp45-s3P&&}wGS!f5a2P$hPY8!(#E0DP6$rC|F1c^<*ehU((
zEi6$(?gG3ulLMNs)?3BSB3G(_bxKK&ZAAi0(vmn@0-jeX&@GJSI_XGP9r+lWs#tVq
zUcwTGc7lW0d=NK1i{{x~pKE9!wZ3YT0(lU#^}0OG-+`iz2{>c<Z2I+Gkg%7Bv{`^M
zO5YQS<f6L7B=a==45!8A0S)*%j59urL?Sj95TUVbfE=Z39aI0xi-r=3I5-*uJ!1in
zfLk#YhtwLZ4_rhG$MqaIB$eTL#_G}%Xn|zzqX-Bib!4KBOu?oj7NfD2u#D0yB>GlC
zxw8Pp>isZ*2Goe`FXVuo=eMCg{i_{7tY?ZVMqF8><p>ZzBLr;??q*GGXMmW^>Yx!s
z3&%d!fS3T(9|1f9u3r=oSkZnu0EcxNsVxo0h&)NYHPLC+mb92V{VfhNSZx+yS~y<7
zhvWu7F}-ku5d=0%_<+5W@0B{TPDeIl^CcDwSgDP}aKVG42J21FVjclE_bWJ{T3@-J
z!tkmvf;C*=&6*Z^1;ex4jN9r0ojYAB0fq-bEH}2OkK$aFWEgJvgT^E?<6PPXb{Nk2
z=o9dDD_D%|I$$_%gTk^2g?qt39eI=^;M)E`;hLG}d3ihXkVnAvK8C{CEDU75?+T`c
z<E-aUIO4@)pGBXRK+ts*_E=FksUzof<SI7PvDn5+4;b>r3g9N=r&?{UVyS=wYecqX
zDh*`EUIg`d7RIeNc5#5<VA<dIFo7+L?1@5ZQv_?c(3>^=3Puy6wocB;rFtVL!u)3y
zfMU!K^9Z=JP>4ah0G)tyAa6O#C2#ab9|;M$4)QKL8Tepw`iUlUr}N&^*OQhL&__aw
zMC<EG%h_5TIiMuSbhPU@Q92N-A+`h!@k+twmki?!;U3dqSjN}}XT0fI%p>4db7+ic
z%GfT~A%v8Io=Spx;LOP&jOE={7pjHh??Lzy>Bbg8kAS-zgio}JN#@I5Itl+Bo!A4u
z4n7k5Y<ocZ=6I1npFaxXrzw)Ve}RsG8+H$Ym$i|s;i4V^w=9Ipz_Uuc##&%499Msd
zz{8SE&seQm0uAF3xR2ut?*c+YiV6)WC9pXHw&5IBewRSIkm!3DfILREgk_Q(9%!wv
znGh_uaWGpir9{gz2!6Ein8rnyMcOtfgL`Djje5;#^WMn<#g@@Y4b#C|IQBcNtM0Ys
zZ@o;S1fGQG+#v>FRKY9!#5VB&7>0t}rB$&z{5-Gi0W_Ha_XxP<{{{HhJiBgOr@_JC
zY5?@;?(=N1X_s#PZ*KtbFK-t0fFWE*TIxu9aPA7M#Jb<F>mXQ;v$o?%Z+aHr&-EV)
zK+pv0mgxwSrdfVUr^o?(;7l9Bj*RA7c(>JsYvI^?H2{;54ttAx1YBQ$0Sd<m4<?%h
z@Ulq%J^ZBhM-KQpoOl8aI>JxNCy)(+pk1^m`3i{NnXz~=vzzNMH<#b`0JVmT=I6D1
zC%8FldeS`d#h#EY92Ysy&Cxta&sgLm;Fi3midLc8|GAC~){)`Z*iyhK!McPc2;BuI
ziN%n&mv+=bzOpzXc&)Eq$;{Z9Hf$@~<bXbK=AcwsBz*<MV<A!lS)^r*gBHnaj|I07
z39@+)+f;7iI(q<as|#fB(q8k}6?AyEU6k#icE`*2S*nb#q1ta7nZ(L3!4NUlgt|*B
z@5w2=a;yNJXRP${PS8id^_|Ju)pE?s%JWHO-r4XeD_Lu00c%}ipO)t27<T(Cn#4O+
z_7%MCfbmefWB)-%e$tWU*yIynG-afWz`&n*P<Ipb@hZEL&klwJZxiV?F0*nc+yh9;
z1AgGldc3XJ8)-o>&$+-Xx;@2a_j$LQRT;x=&|2IeQ2WQMoMyUSvSC6GS!B28to)UB
z9$R3W1z7O}`sqtn_7%cy3zR>=M-<m#(_3m|;JG@Z$mM#v&pCmt;i4Y_x9(}i=dJ6~
z&TNh%hqrLt<RarEwzdb<GZy^_xUCsGTSvjdzI(5Z9M+NJ*wjRWbC|so2$9I$Hm}Rf
z-1jG*BnJs%>nlrSJfHaEdx_I5u`aoQe&Eb(Gx(&eNz<4%V&;EeXd;UYn#U()jh~Rd
zlMWzjxZp>?4Oz@5WsM!dB%{m2y*A!HLK8x(9c;W9Xk!bpdET^<YnI0bKA!ZkU~6Na
zWU74zdV|DR6Y?&tEblQH7Q5Zo=?Fw{)^LH{SY`c)sTFbUW3JN8{)ByRsD!n&XP+B9
zT<FSW2{-pEZtnPUeGLahF=^~|LVFV3(~&1S@)DZ}G{!PA5`!X%++6fTc6ZMN;@QEF
zU`~|`UCi@NC$DC+d@)qlbveUU^8Aa$B?Wc82dytDO=|p_!t<|w%nN;GW{9C~UU8$H
zh1av$PVTu>=p&1)v7P5%yqucu*BfA)1%Mt>uDh4%e>E{Xe0!kw(ih~9+wJf2DV+?~
zYnjDHtH@ikiJLp5t?dGN4^q&MC9}M<E{^<hyS|moauwPf7G^qWm#*!`1o9{BFHQLR
z155Q?Dcja*Ya;pMb|qdkW(Noj2^JcXS70*`jfIS?!~oz<8wVf<+)_ee(%He7ptinp
zjW|!v)d_qj&d>dloj5)pFXkC{nZ64>n$PWyg%gBMvdGZMH|T{|L!BoM!dZv}cVku2
zZ*S9Yhio8Uv$?v%6)h|rmzZ^r8pqMkvf)Lzq6XozQ1*w1)YuR8_Vdsoc{iQ3-&GKr
zd|~M}iGrSa%(Vv*dwTA>K^`7DJ#d*1?&aHJ%AsejgUA0Ymgsn%n0w;2Yjg6%tWIes
z_=b7LGHuL?FZs2ee#Eskk$8H+pAyfWA5O))KFW{HXvcZ5y%H(>B)?6pDbRlAv6lvJ
zpZ`H(gz(P=XA)h-14pK|;@kmy6$d|YoZe^1-f7N>Sl6!G@i`K^soT5woU6F<>7j3$
zBOb)Is*cpwkw)NrhsI9MSZ#zLT=4TE82M;w>nLXjg93c8oVWY0Hn{u$2Rmf)_wDbl
zqqM2FfBP~$___6w@?af6qVyN*Zn@5ZzqeIp2jDZd-ZzMafVKS%E;X8UTV2{%IIb{g
zgTdYZ-`OlPHWInxp=<4XeN{hJo9%nG_K2*d%8<=>U218^tqlug_AkFX+8`DJR`e>&
znZct%Gg+jy#&ClV-F;P1Tv5|t2tflu2X}XZySonVF2UVB!QCgg```o#1a}5^3lQ90
z2VM5B+I`!%?|a#o?mBf(_qpAtk5u2j-R&=fZ6$mCz?J*CCI>H@Lt2)5mCA_mk4*bc
z`p2>Bm$k=z$16u%dxBZ6|5_{k51+Trd<5O)f9%?ZMl8}DP?v;sah;l{mzjBc=g7A%
zTSbH`lu2PCSR@675ux?wUvc&IRpMSKRyGuqY%H{c`ugm&EjDJf#h_-%OA*_oSG9F`
zUK4H_<p2^RX5*FL(}EQ<O}mwtBu14Ke=14~LreZhy#ibX5#6+^h)Im7omNz)87jh~
ztzK<6H@O(={xBE(_Gfz`H~pjY3TQBnb*ho~=<Q?Nt(VoMj#gw``#3+Fi?nMhW3sWB
z1oS8-Wm%Bmaa#8elNQ(0VnMh>|15Usd`MNl8X|R7t5Ps%Pxm6e3K?@wn@ov|ef@~-
z3=pm@1QCWUvJ#W+6E||^SiL3R_7Z9bW<7nYVTvo>n5qdq4=_JNCG`eW{^e~qs%WH_
zEO0F$Q~?`#7eNMoGy5&|A}O>~-!R$_lZ&w!@d>s&%89fpts#^~{gz)ubJA(0yQjYo
z*!kR8_UT<2H3(i43R-e@p*WKiUJw0^X`l|pkPCRwXE!G-s!IQi0GkOrsP-@$?0k#+
zd}Esan6_=8yJB0j=yLexEhFyE>jWGGcUBgO+2_62*{f$4yG@CHWjS!g!lsp<!Kzhy
z^Oga(&if#9XPByi0VyyuP1nkU#O#cUO*zwo3sbl<xw~wHpIu32?;j?)$t+$eHIwD{
zN9BKkIu=>bzw{3_@L~pZGlVejanYw$@E`Y-aUL|ZKB6*=@Z*bXnWMYWA_dygtDEN2
z%EivSN%Z*=Lk(p-d(8OaM%9D9^lnh4)3PJ>ue=Fw1;-mKCjHqt_{S_ewz~fCj2g^N
zj}IT;_T~|4l^p(1Y#Z4H`?GIY@L!$FMIYg(r%$~77?f9}GT2xIYSPxS)Ia16VRC%k
zmUevH@<WD2(eqx1FseO@Q{vsjECslE1o3~?`I~p&YlVxu-@S2f*%9McP-3Z8>~u@J
zTk7;)#r;sFkP!2~-;icnNP55OegPT7@$QdQcWDQhlNsB?OSne8ac%*L`QGoDqV$eD
zGWW-y{NCbzXi|iToje3F9=gqPGDA2U`1=LDIJiv2zvav$rH^Th=g{a97sABcj2?|-
zu~(q+zgeeij!IQjd4@dn_LOn$tZpRx9!3;&VFi4DcW)c{@X@=3><i_JYWZ9i6W}?0
z683r5>$i~N->zqzBVc%q5%dOMoRn~I>nv4e1Xq5XqSjg<)&I#M@qZIWd_j%5(vlI-
z-ALasO_+eLhi<H%@vRf71`%miJkdNe+v?q+w!PjS82k&;wu6g#?13j}M_O!0WoXBk
zepJ7;%kEkj-ABbZZ_?6SpkZc#4$54Z-L8>!W~%;EN>b&TLlg5Tj=POZ2=hrLb~sql
zI*-FR_sE50tpJVmj^YyXsgJx4p}txNSrmP?<$2MkIta&vq}Qokl(57Cgq={8i)E=8
z3cgulUmniHsFs_3he?#Mb1D7c@2K@o#rH-ojxY2!BPzv8tCCW|=61Bq^dQxsn2%Rh
zbexKY3K(H<xFS~*&Ks-#%N*FkI9T-0QvQuO^OSuxfOdB5POKcHFJk|e#LutG4Ib4Q
z%qsxgQPH2)Ie<n+;ZX*U+oYKVDzv-W(F%`$X8LIR0@QYqASwqmrK$#?#mjibreLcH
zlz%@;Vj2(2+bG*Q46|Jz4Nm(sL$V^%`C|_;>rG3<63$WRW+LNF^`!PT<RwD{FMnjS
zxZzT+<!}tbk?UirsuqZ{?COc|wro`){8OYUN5IwTynzBP7N-|RHE}@2=1FjmSmV<c
zi@yNlE;^xgW$W>&-c267$yz15%a$BYGAxb3+2;86*IV^Rk$Q@RS>t-SRdj<D{(jZW
zkf`V7L2>ze)W^m4<K~$zP146rcG*Y(RT-X}ef1~>R+~n4BGZp_4gcw+?7t4qBR;^T
zJ`IJDWmsH^kJdS)o)K4?@O~l9YlTP2>P`GC)Mf*pgD@vShNp*p6k+%!Z?MNJ_U3Py
zoui0S>V7<`OK!9*OcNMC-%^!=sXqshK{eYC#LrBE&4tUcmAcTgAkncN9V88C?TB3q
zQBkSjHiSVPGCt-ruKc|P`Oh_ta*@S?k}Z<XzX3k$%=&Ug#b7A3Fi{fmGK7__!wgbr
zrr_1z%USr8=qsF|LUrVoc~kl#EP(#eH-?;^vVz)D{cKl;`j|R+*uZA@YF+ptx~HWY
zO8Qxzc5>4A=<|r}W%Bcf_SJZ3fg0T!b0$~hS<8-@mlHq3AoXrx)g_IdSclr1lesO6
zQ*(iukX-qwyunMOPcbvp&qNpKJFXg6gB?*^jsE#L@{mNE7%=)JSb&4|$oH&FRy-qo
z5^09F`0Qn0KM@6|!n~pjfJL$+Gr;=N@9?7O6yLMk5x~p&J^Q|&`SWJPNzYR{>6)ZV
zb0~(+271(kbcHOy{pa27y!D7{H22YRO(dny&gPf+6{*1D2U_Gg>DEblTH}l)zGdhH
zu5J`!s|<loLavKhhzP}GsBF%T9Ah0i1*Y~&>Q9>FHM;dMv<_>0#(p72;_ZQ7G?D(G
zK(nQpx%hY*r_|Z-#o&e|`mUrFiG4tc8Q<ydXcf8_17<h&`1;eeYTomO0k?`4Z&L$v
zsjQ5`UW}6~$KSd`LGg*`ZKw(mzI80GnIQ%@i#gq!)C&w4W(nIq69uE`O{^9R?==iW
zGs8p*V)v39O3ADK)gzCXZHiK&bi2M7Na(P^C-0X4LU8eCF_T~pOEiD}^w<&$+}W-f
z{Kg|89Jzvt8;U_f^+<Q<09vaIKC&2<C}_;a-2Vv8KPWVAQ8OeM7_I1!JGycy4r0~D
z#x)B^O%yz=DdEgaW-06|kM!S&&{;{HVDJ5%@E-3e?r&^6z3z@C6@h+VnKVq{)$}Vv
zY})FN!H>Hw9YoS6O)DI8XCe)Gx|~JFy!c5uHEojoxRqmwIAZ4Icg$nL<mB;+^my!I
z&l!IpgI>a<1e1gOz8p^5cFy`sa>MlejF=x_>Q9(#iOuEMD?{Y^K!HoZTw;{bu$%4(
z3D!7MW7p2j;BDFUy!a6-Xjtz{yjijE&ltb7Qjh7`g!K&?;HnBK4@glh$5InDKBn10
z8TX<N>AG(?1opU<HHVW<Gcri-X4Buxvu;`dYgf<mh%!}LP1SK?6(#Lwnpz}FK2xsJ
zn3Njhi82~gyti4|H*z#7RdZ=@5NC!qA;sic2Sff*oh1ABuH?)_o#n5@6i|66<-$wP
zGNR2-dBTH9{m?qJ7L|*&#h&6Z=f|s{Z{+=V;^^FvAV<fN;u^Q=3xHu_`*KjVyg2EW
z3ihAmJCb%_FJxU;Zh7aX<XjZ2w~xMs24q+s%G4vGb#YYKhcD|7OP%b=zbSo1UJ(VY
z<%C$oZkM@!OSE>V^*9y4G8#N~y>#{`+0y@}r43@c4%%CG%x%p5cp`he+Z}qwiP^m>
z5gbbnb*24MhaQ2hhSsnN`*e5HOyRQgL8%CZHUD>O*c^01uy`KvQv~NW%mSWEd_%R4
z9`B-64w9VH7b-4_LXfPHVaRLZwGcf}{LNmRg`wBX+OWgM!xzNpFGuy=MFdpPWpaHh
zmMUyhW}ljet1VJyXT1|h_bF^?<c6iF4+(rsb^QU65}k;@bV+uHb+QbH!b_`Y+t1iM
zH4G3+iFdixk02b{wKEn7v4d}_trTCYIFf&YDm|x4kJ8!Fnd(oEw)*_!ToU&Y!3d4J
z`ntKa+$&Fe>U!A#A%Y0RMdxXUGLRsEr;YS4WA?CLBCNK|&Z~AN5d5Gdm-svC`smXd
zRJGMgL8D_Y^yg^Xa5;n4n^yg}GFYb?5f;>!28z#xt~WIeOW2D3Ggl(*!^$^7r=uU*
zXs-e`B~#5lPmeJM263vFmCk<7k!Bd8AwWxKH5#K+Bt2sj!BjRlRn}u{$1W2ttpvz-
zdR74Fl*K3Wn=RauHwNKmxIs>-1yRcFusQaFiH$$b=h&?!o;Q^ipMcy)Vrp>>%EhSC
zv8yjOEB#F=RL_4!DV#G7<*r$Vrf<n&2o2Kx5KTqL>A4^!;t|)jZyyTv9!idj{^oHe
z)2L~I%A)FO`TE6rlK3Ob&9D6ROkLl+S#BsbsudL2ERkMNT?_x96*P|MYKG4#9lLDc
zl9N~dQa{HEiFyjAy~5(6yZ0bNd*kRG37Uo5H4k#~y|$iMb?=g-@Qh~bDhr>8-px8s
z`t^HW`b4YxblHX=wZf*?*7mLWO+EU7MFbur>5Q{dMx)m@C?w`@dAVd{za_iM8k2q#
z)mFI?-li++xDn?z?qv)^Vv`nX`_KgrKF^F?K*T`+md)Wx+7C&%3vphotel%*e6_`L
zFtMjAI>PE-%>6Nxrm0wz&UDq(zs5ZZ&xabvW43U?s$J@&PcteUBVor{GoM9(4@sr|
zFWFgrBkt@>+fNx(Q((cVkraOP!E+um%H&2ZStsPK$IefvI3bJ=$BKRuQdaAlOdEeE
zaw=qu`m2-H_^hQ-PqMOf%D0tn#PQ8q#!x6xR<{pEpnyb_wMzL$mYSuv_^_)QJ72%4
zW@)oktgs!kxw>o(6c>7MY7)0L{+|5j67OvbFH!~@tT6BxPKH8q>A~HeM=M;|od4V=
ze+y4K15@U`R~?42)JVvnJ4;Qz{|W8q%^S`_YsN={IKx}oSHfmW&C^)}mWhlq;W_0V
z!%c;0Buz&~`N5@y-7CpP$`0|H;9hzuAVh}3fj!z3*$geby%g`JxytQjPGv*&t!RY`
znd=Z(R2yPb^pfg)m8Y=kLuTrqpo&yEgrps>;uq@Gx<XcW49D7>f5-4VpL~SO#iD6>
zUe%A=g0+}}c&@V#6esLuv@OEasztX!x88kpUh8wI@#{tMBbSf`=ejGvawexsNIDF_
z!&~0g(Sz_}nzbUm9KVb)%3V&ov{jpb)XZR*<H0gI0x8g27JNzX;|i2aLbZ77hzjG?
zgRjvlj5AE|gVMwLUdUO%AoI0POSv~ue}N`HWTu`;6WAll&0`rFcX(uNJ(HkJ%JrFt
z=$R(do|5%`g&5VFdl525CH8`f=BDeLr0Id{5f)~RA<{q2rSZX5BfEjG{V>+qQ)!A#
z6VR6<#lyqJRO91W=$xD(ps&{*|IaD$xB6_Ud3TKXOPs=k4Y`L_id$ln)5(3X1Y7up
znP!e(B2|}UA;YhkY$@y`@^yISA$;jlI&<gakzMO>H59)@3oO2q4ez8c$}(Yz|9q#Z
z;&Yg*v0tyrF$6$twBV#d&q9p@OY{+I;0`UJeCrZVCDuCyX5`KBUPibiU6QB$)k+)Z
z3{7;;68GNoHhZ{CalCW5-~&vG?=(sY9&+U&jVlofHMs`jqBP&KR1_9cB_W}2S_^!|
zMs<pe@60FQ-`br5-G>IQp3tpENt&t}Ya*<uWjWR=o*I6`P+L5t%6YgcD!taI()Pk>
z-CIsPc~S+EsYEY^WGS+}4h-@}ultkqJt^!tvf{WaeeuL5fK?19ordK)_r4L96yxSx
z&wN&&D56grS;p7%hEV`plG2VWk%dd}krJ<h8l!h92%xDyeI=k-J@q&HGgVw8tHnoX
z3gkxa%E}^8QU0Md8H);wkIu?;&%<Yt$j};Ad}oksx6HId1Dx){Z!Qnf0cM`>;apt+
zV;z9`g9j9(WEq3{D|Ol2Gm*&0Qwzvl_>C;S76m?LYGYJ^mMmtcmgM=r#jx5NF(mtX
zvKo^3#4l8=Sgp#X1#+7`dZy!e@3zzy=BX38@yj9T{CP(%gl0U<#=nZio_@riN?r)L
z1Q0NTMUPW^%){hz!2V+iy!~lTD9FVrG)*Np*)y(9V@u71K3!4kX!!}YSaUtn4pMsB
zq7EZ+1RR-J4*hA!-h1Z89yVA}U`1Gt6ZIVUYDB_EKwQ4<<=cT2Zi7F9fKT#c-l4AF
z%qmJ;rLtGR1Xb_R--J*MJ9=2y!$PywO{^=jpA7>90iM#j!@;sMoh4CWoEI=fw(4Kk
z{`q9*@zRmzN$zQrs+CMb;<&fJCN=CSQW6_6y2x6o=@58Zdslx4SqGGRQ^ejx<0?O4
z7)Km1OC4hp6NN9IE8=%%Rfd#{i)^A%rs_XyY{UGJ7QXc5tHe9iRCJh>>Oo!6BVSSR
zpHr`{<_)dVDt8DE2ya);updUzD!Y$g5+`lDu;ZOsj*%r(;QM^7zM^NEXu9pwxuPRo
zgJ6NX>o*lUs##$#T-+{2H&jZ1_SIULPidPPl_}@Xtq@&U!?bCCCtMJJQ~nVveu+(L
zf%TiVYUZumFzc*SsOdP#w|IZ+iVaeLIKdGp{@jrNRxWP%x!Zmzq&QmryVn7ccr!h&
z&&lv&2^tuENRqKY!Wzw^d8VHiZf&Ql+d}MdX@fr0MZZ2ZxciKH*^nI}^P(7QEe>zx
zde%5ZNsYDlA77J`gZPnA3qo8rIe|f@G>QBrkU~PUSZR={=*eik5ULd_or2I~mB02-
znH2LCa&#VtNaK;el%PxJ1hb<WNK400g57JoDokG9uPmVC%C26Iq)weAxXukBv^vrb
z>V4X1eb&{2{O*y%H&-7zpzxW5OI}-|4y#*viym2I{;aDKP5Y&3CgPi^Il(&5>$74#
zhV;Wil9xm3CEw!_tj9B^ja}HdczPoM5ELb?IXD?=Wq8orHKw`*@Q6_#+=j8(&bT`r
z2P`|O>7ZpL@{jtFz|pkOJ!=fKNuFAmFU+()oPLRW8G23_hMn(b9e5W*2Kw1*MvJP$
zvpXy>wI(O_3uVGyeFyTOOf}77of#VC9}1iy1CjY#w=pxxFzfIA&Vt{+s?5~f-IukK
z?95%}9%ZvZRLNk>mDo$n{O2a2$I|R656NsJl=hOx`*;^iqaPY<@F%k{0yi<!wAA`f
z2*@Y#`+rgfWCsf6V1f(Rq&e{f{{D7-3?1&Sy7WL`HH}<Q)qFZOm)#z<>Vl3JmC^Ie
zWN2l`lP03ZcbrzubXg?ZsvOcgjuy2me+}TR&06zVNicG!K01&&PO^I1X^g<gu>p17
zOh_mi8XHTkSX41c0CH<%V6DFe=W@P#=YNap!mU?J(pF<x1>3M%J^JHo`kRI67G+x?
z31OLXjVmQ87rBlc7|y>sM_v+v+=x_bu7DWg2qxzjC2<CSVBuy82pC@avg9QOBz2Uw
zjrwynq%kHzv>dihCx7JP>4=tdbEcMiela(ax3vkL(u*#h=gAO#0Lw2>w*zP9kx2%}
z!wsPtGO8!81zj>w8m5~9M%AIT=)auRfX-Vr%MX`a4=<*AjP|Lg(g-q0?7DL0Q8x^U
z*4uc4$x0%aM;X|?FSeoe27WA|JCI{UD^uSA#6D@hmlE6cSN`-t);>249ZQ1;@XO}E
z)!s-2A~9b#w%9t!`-kaA>8nW<k9qzTy@CXvj&%V>CBI)?$V0K8yC@{kNgIpES9Y>Q
zLZ_HBFUK`HB<QnhBIvfM0bx{EGc@3yrOAVNWN}3jxB6v+0u9x!8}8+M3j$4db3))N
zW$LH9UBsCZC{A+u2SbITvWK=7DMNwjL_!>XDg3_4DSeGNc^PBO?HroI(caMe@T8US
z&9i)>KI~#8NicgW$}WL}uGz_rVf@l!Opvis+;rk>&)lU4Xi8fMg?pUzsejg&bvNm0
zr7ZKZH?K6HS-i=tB?F0$AxlghDyT^yipcg<aK}@7rKSG}`CCSP*|-kts%giX1P{_W
zgXyDT20>%;vuHM=PKwV2sq5dPrcNUGC8KJ!<w6u;pl<Q2rmxHLt`5$2HsTNgWgm~I
zuPJ&$5cyI%32u_9kgK6gD$`%mn)epCF4Y&GRX;`Oj;%%W$I*ns=A|>^i+XGno~u8>
zW}DRiuudVhMewJ+(SCO3rm6uj$hP+_?r?8uh|I?>op5e!afyMOdReZ!lIRb@zD#B%
z(bJ#Y6~+IUYpiZYzmw9|!>hsGnzW}XV02lNrx>dX+E-`_jAzr=>CN%h#9@GH`m0+S
z7s;2IAFYr8$DEl!e!;$Z=%q~R_^zB9jQ^q#GD&I@1MWblwFoOnLH6uPJW0G$;<yUg
z71i?|VoI&ExpXKF>f-b_*l%hi#-rZ|+GA0zu`Ly6I~X`?r>AAsyvrn`eYC6l6@@>u
z&MO@}TSE@pBwvk!lEch=x4ubmB&CK2dtLp-??E9Pw-d|>AunCy{)832KI(s!g{qiN
zrH!!bW08CNiv4XMPr7(F!@bcwm!m&!FO@aQF~s%{TGXZTtl9-Nr#!D>hV)*-B22EU
z15woKm6Jl!`RXlV+)7q)=LGuUXFOd3GT%53<|9I6cHoEvQ#3}T+$tTZiM$4FVIB9c
z2-Te@Z<k%3Bhv8CaI6lwZ%^~qMn&cyB$h<m{qw#ONo<2thB8N?@H1b!%Tho(s7sky
zv;?_#*PmcE6@i&UkY)5jZybv3FnoGz!rfLSxyM0cPY&nOLq=r!6*mu6qvD%2%alw(
zIb!h}0xu}rZ#5{bh<I6K0#z61R(g*s>9CqhYE!S%AbhMW-Sb=(%lP)kYT{{iIBO$w
z19dfKlr5)WODyF@l~yKscFl}tcw0CFFJmYz6r@zSYTPASo(VEO3($8eIkq26Et!Xl
zBc)wlU^(-3tL5xyQjms^#;#A7S-WG;t+SW+&NGW0oX(<M8ZT9sq=Cyo%5k9)Jl{Vg
zXLTr42g$Lst4K;zQ_Xs+mVdS|r$4$|9KsW-bFB;gKDkC=3nW{SZcVVsA*Sh?>Iz+w
zd*S#cga&o)zh?Th<2>9SRwn*t0k@eDVSugioMN~;9?kWB1>%<cei9==MGdPx<Ep%v
ztuIG9`|cOny(o@m=llt;Oz>JKc@3ojHl1!waYHB-YwvZgei=~FFz>sA+28Q+=qO0z
zbtC|qdVAY2*yfz^uSY<otFJzGHY-p_Ekriis9ok1Ta2DDitDS2WLw~uTO!gv0Rmbb
zdy~*jG=(vobyn$vx^q?V(g}?{T8h!ZMm8PrmSU~iQLU?}FIHPOYG)~Q8zv^!BKke>
z$XF^HO-rqsvIY>HfrdByifL1Q@v8ua5_0Q?vj1=)Sw6en_WlwsO1zYblxm=W!L9vu
zt=>__%<`|Ia#dRYFvzDV=qIqNa_pYxx@gsP9mND~97*I^dp1Ua%lfM-vRa8A(unf)
zvuwDqQYZzln7G~8!lE4Z5afY)BPN)-Yg>O$NdARzTAT{*T&Jj3Jm`3%u^kHx5p<b1
zp`w_Cy(Wrt4R>UTYJ0h*ffxByS+S9}DM~zmZa@)u()IOhjI*qLH^CFUom`95t58@K
zN>#}?Ta8XKS@w#)aWszJcHLXw8LL-}fW<Q?q3BCAPcOk!UkJV%H1B=EYe_2yK-djU
zMrvP=ZZEu;yfP9wffX3s>1|rp)?<5L(Ll!UCc<}OmLEy31&<k=-V5?8Eo<P9+IIVi
zR~Mf{RD5O~(0gbrMCW@+!gr3WraJ<w4J+loTEn4)l@YA*`i<}Q#|#Ib?pDa1bAUWy
zR=i{C$Bg4@dUN&KUq_w1Tf*A40C{;t$3IwMA3kh)i=y?C)@mRTWsOcREm5%(0!+9~
zMDd#qxip5T^W3*$2u2wdYtDdYMKyzXGIa>ZP2S~)ax^z`FXT$em1GVS8lVcrO09pY
zk4;~#7#68%9hxfwffRgZ&U}`tVq3rQMbbcuxHk<cW+gYQs?j-~fAHwkN-O4gVYNkv
zCsnyLcMe8eFxXtw0hN({$fT^dB#)|xXZa31mjlRuIp<7@bw!4-lTlp)skFaLhiOP@
z(1svFx*aE`oz14@3_Kbx!eWTem|uRhD7a{-9^cdb;DVkkhVl6!;<4VZLpBb4EJH}+
zS&r`@oIkV_zKIVd+ux+0n^L2aHd#jV<Lj>%KGBn_Z;$On>&+79g4^IYcv%h^EN#f=
zBh_dfQ`5fM({>i&teb^`+4T)ku<2(-OSK+i&*J4PZb*j&wjW|C(K)xQLK9iS%Q~&f
zxWmOGj*w}4lH?r#gVCrc*s3*o5<)}!h9i39ih-(pMWnvO*Iii^>r;XrMbGWiGFBEi
z(DCl+1!Piw5NeP7*$?(pP>4Z~h@Vm$z+lB$nye!pS_9_PhKgGKW9sql{@$omua%2L
z10P#nRj4v~d707<H<t^xjdh93*iPf9z(`^_F!eFbxtH5I(_qtU3huTO4-OLI!?rYH
zwz0TXf##~5205nV-vI{Z-oX8FSAXG8`)k`ljwP`gCpY?SKPU)JC6VGA=pcf*mHDfG
zGr!U`<76iB3h=!6gMB0=tlk1G$UCD;UgS$ZOoH~~J|)5*jiq&Wo)?ME<4lg6pj_?*
zw1FNiT~$Qx(D0ec$ylc*7zvB`xHOt;QUoFD9lX^vsFZED-Chcb?R>p5rhOyI_Ltw#
z@y^tZe0CbfIH)7PRm`QfUgiCYMoQLHA^~A6X{Rod;*kNad#Bgm{}8Aj?cF8KF%9Lu
zM#u<USisg^XNiyPjMuA9oXt-R_o*~gCn^Dt+0w#F9aV@nrjBJusqQWR%|s4~FTF!Y
z8d6Q})D{v_LAuf_$P^Q}#DY$4em&CL^nRCoJwMWV5QEe-K12xHHtZKXyxg$I*qe<x
zIa*IVt*IpL<U?i3R{aU<NXa7u@)G^FppQ7-1jZowkn;KpUraDT(K6aDFNEB(@@0Q`
zTzXBF^y>v3aoU$n#jV<GR6JExo($@PjAJDHo|Dima9f}YRf@?gyC$G88=Y;YBxh;7
z5O2;s70m9G1P16dLw3u#S{pe$^jmJoMF-ADEYPmXI=2^Rm~eAM63mu$hvduRo1R&x
zqjLgr7(d#4u_6b_Cow{(s_afnIxD(wD)9SJr&8hI1-_G2!y~931ecD<9^=x<Wyxw<
zev!BRnk=uYH6>&7R$^LkL_kX0FdGrRP@;?zj7l{kc;`lUnZ>c6{pfMkCCTXNODpsk
z_gh+JFgc4Jb4Ylyf;->#S%Mx_XeONrvV*8}knL)72U0)CkR6IYkqql;>XSkYVmjV!
zm`gHHrSY)hY1%xnZacjk=N_!DXHt-594}h>nPBcAJdpA)5eyjv@~9NYCs-UbfoRX2
zXkS+r6m-LP^OvE6TI$uX6bdY<v-8Mp7S_t1B`N=8OOIwwT-a6m3CvEqrXmifc2#Yg
zdi@tkZHcc(bE-eB4iq@1)_U%lQI?E%%QeV}m7L0RH9N!RD6$R-vyr9g%?@}-lQqRd
zFKLMC&B(BUpqrNC?>}bboT+9xZG2k^z7`sYMEJ)~E|&H)m6y$t*zDX${K}k!H8-RE
z<~2?{kelPnD>IiE%{KvAJQwjw^aM7jfC1jI09Si5N26Sla(h>E9z&HP2acWlXhmF0
znof;HIHBsoM<-p6Yu$DtnVmd#jM!-k-neF;L*6Cz)*uf<M1g4n4(-@F)-n~`byg``
zLJz~K0EQ0!jgFRF+L?C^l?ax5mGHV*bN3(S*^X`NDmw(t@Ao4``M5yt;GO(M^Eajx
z6L}y(&X{#K+86^JLD!}z)k_t7RZJwG8eN86R^{zV4<<q}vGp3W#scZ~=Ckcb04zX8
zX2>_q^RBWhi1gpsctEjUt6}(xAR<2b&XRl;-Ss5dF08j>K}=ARQn-DsxGRFePTW<H
zrr#yW&k~-z!BH2Dz}T3<y?e9LVQXS@HAbQ{K=E@OPh*5^DKpgxV+@;=(tFbQN6zXO
z21Bj$HJhf7)m0YXD0`h$p}c%^2{8Lv7Nx!_nyqqFrir1FeOp>yz*1gwfxRMo$;$yU
z5Q@jU%lrUkMDsP*BI)N|h3nszX-It$4dWv6Hg%vZC)0%5$<?d+qn>HZ)%PDmiCGE8
zNMd{`zl&mED8aXGJ2Nsz{H=RngilI^zu`GcOn4{)^^~uL+++H<-;<f=d^!s46qAzI
zMs<2}tQDgyd%n1CGmKDP_pX}`5t(mLNY0K?QQcd|jwaTO$DN@4N2$5DrXRBRtmj(H
ztyZO(drN8U^=X$`uhr;RWWp0_4ySof=D44-!EfkaOKU=ggFhrb81V@PB!-D*$UisH
zKsBZ2#8HzZAF0igm}?r%ItvkfLz?qHI%zvj2^J3ROLS#4nXH}r0gc*T5dZBA2F}1>
zFJ(>rwtLRRv9T+|<lIca%Gkv-7u5g)J9Uut^67rnvC??|Y6!=sH>PZtXfcu)RMf3|
zUKEm1-taHR9L9^qm?5Z<N0X471>Pb`FRYF}mrvRXZv3!l4`d7=T4VuG&?lQjc)>UU
zDs&jzXCpcy;@>=bAh&+;xgF5rted{%8=;z?6ms&y;!+t1vyf!>nqlQ`uN9p?@fLr0
zU3oJZ<6QV|w`^>~+LS1TU26c`r_d*Vz3Of#i5F(F;4O_tYAbgeT@)%7!hDT^ai+eL
zidJ<>H30kCBf*3RYa#!6z`!mn<MRUlJo2>9gB_glA#aFkGn~q(!L4X3lGBAmxr%cw
z&j_U>e?awD1H>WBU>-)h35s3tpE=~~v}!jnfX1z}rL{Puu!^sMNMLXO@e^j--UP=-
z8;>zoDV>MHSnJ|KWXT!MU_J7z_b+T>wFTSnBU%q!9By}bwn@C3$2TwnHUqiK#2-s?
z4LaG(lsi)%n%lq0lVE81Veq=+d4UsT-F@y{Z3EP!@qY9u^xEuE@{|dDue2kDPKF!s
z;JsQ5^*7t94R+i?`8@ocHf)7#T2ezxm_dbODXo%O*HETgbFer%i@i(kXivW0y~%9(
zw;tQJ{KI2o>#TP0jlS<Pc@G=IVe?D(5a$cNUF<blflY4E6P6|>4;5ANP}f^|tWucK
zmJS#3#wt@2LQN}k9|QQF%tzr<T&ApJea~SB1rbjB9%j$|4cMa|!Kz(*tZ?D)GR9tk
z3$i`C>#tPLp05m28B4p8N%XUkEU~}y-Y0@AukOx$zu(g~C@JS|KyLxLRZnS&9`I2K
z<6X+hPFhz#X(t3t!F2>A+-9x4=-N#LeQ6$Tzw4Tk>YxIbYL$xfWCc$oW%Y_?zAu6D
z*S}i?-MD1Mn?)CjSR-#1STa*??%NYaSLT{`-N4~Lo5ZVGwKq~XwHf$4ubNqOW!cmE
z#BR6iS7ndC@44aIO&s@acm(KIXr-qLo8&t&%vla@dUMdl!)OmH-hTfMt*vNOCcv+Z
zCiwTe!PX?F>S)E&+)&ugw<{!QFw6Oe<og-p$I}4s81F*T2z<e^NK)eeo1Px9A&sus
z`2sE+BpIW-+(e@t8~n<hLI<I$vD=mc)gxQ5&1udLc=PGT_!O`Kn}OCjX(ox|tvTsE
zoHz=M4Ff*Tc9L|ugET5H-X|`BzdBugs-~2qWchy8X;a?<4PX~rEAb`F*@Po4ByS(~
z-OC<xO;ze=?C1U|qit{cHgwtcPPdYRnk(*~RxLio|2!0YQOQPHWWtVSulTb;YxnOF
zNZ}XYx<EMm3TC|zSPe62Q+l%{SVSHWN%s?64n3ucW{)~vO%4!(BxUf^ofmqDdgizL
zl&(RV@y)8Iy!&a?|DXUgc(hEad_{|pY%e4@T<_e=FQXdY8PdNo9jWVfXqB%jZ0nI1
z?>-Puj`7>@$?YuBcI8(BN=pLP=sd>G?+R@NxHxeiL7KGy{^rG3{T<!<$w}O?wyTZu
zqa6Y;$rQR+>CJ0WYXP0hQ%gbIM<F`(@QW`-oW2N^m0nj9C_4m*G<BnXH928|Q;b`$
z+4I%EsU`fK0_+0oAK{n7dHsqNGJVMdodxh$y2v!EW1!~pGBf!IW6lIIvw$d^txNl1
z4jyBL?EyS~w*3#dC%9<=Mk!jD$)=n*Pv9*2=*(eqN=o*1=s%8q+jO-i7U&JIgTdFb
z+?a9_xdS(k2MjnWXM|)wAzv=AD+nO<BT~jW=808*eG0)`K)LL=tza|R<$_haX5`@@
z3c7>9q~CLg>md|_Jy>%>1MzK;PdQKj*}?A7xlZcdey7EdH8UHW$)G(w)?+j<5+*CE
z0;~rHO|Vfmb+gXxE~##)_^HIH3_Wjt;IHJGjSCIzV6-Z45*IDnBqU87zs%Sz^!=VT
zm`NDTPSi7Dz0ngy&z-}z)uW+u{=E^f1^E-IX%Vjx(z6)LwQJAjIK&ZsL2m4B>25k^
zkA}JBB#*|b;g0Xmb)@yJJ5DMX)g^qO*5MHD2=Q|T^{56<hhM<>zsK;F-pn3u93Vp`
zeYCCy+I3NuapZxRuC-rb1@6xPqrOE-bLC}%FRRXZW_E=kB#H>tfXq?rMS3S(+Qa??
zA&AenM#m*PVb82<@k&bUc{ayb`sj?)*F!yoR3TOEf;=ws8UW<pz?}v356>Bzqltzd
z1*k1cCo+mNv47oTHJ(Qswzdm9deJuU;MMI?Ni`p0viT034p4}sHCAW%k>`c^cndt%
z`Zio4I^=}buSNuW_WRcn3|WjNs+8rw^Zc!F-p{?lR!<wRk&QpAK->>UIi_7L18w8N
znci|P)5uFildlmAXh7mlo)fKa2XO<Qwo1fH)6;)1ImBgU(6zoe*)GXJ5(#50=htDE
z+N$oZF^X+($nD_guO~0;!k&ps&w>DzTE1|mq}T!3jmHP&cWxVCe6MQs1&;+|q-cFC
zW|XXLoBdUN+1=1<VV3=j=|yDJPNN{;C7!cbU6XixsBUrKS$z%OG$(Igpp#oW$2Ysi
ztp&;J?geB`<5+Ug7F;!yLFpi^o>spVi2IuISeZLM(&0Bo%V+s;o}asM)zZPC+hwUW
ztKO|LbCiT%=I`sf&q?P*^R$k`Tva&>;Mlcb#40SSqIo|G+rdXR9Yq>@28=uNvjSy5
zpd8Eh&CVD?A}V4TS1ojvrNrph8BHYbRmjMy;68k~DE^QG!|)wt_k(bfY=IJWF(m~V
z;)gm+Bpb&~FH=HMr1MWZLU$v>ey1sk_p7wz=grCz8}``|oy&Y^0S&GsPZs~*KTbjy
z{BOwn4-w(NphP-+@7DkP%utZ|{O6gHpLe7GH*83S{nGV6Z<vyzSO0mY5*y#i{u@gu
z-*Ri`Kff*`fBYAiMs$4;{cmhAqN4-<`CW_c!-v;5qtB0MF==maW-mXU6-Xc}>{_4R
zOF4cp3hovC{*Ljj|EHNEO7`A>2gAI>4_qpU?+^z3UGyEHYJ7Z$A8hmgcLhjT%@5z-
R5kdL?5Y7KTiQfBs_+Qn>gth<x

literal 0
HcmV?d00001

diff --git a/site/assets/animal-island/icons/icon-camera.svg b/site/assets/animal-island/icons/icon-camera.svg
new file mode 100644
index 00000000..e1e1c299
--- /dev/null
+++ b/site/assets/animal-island/icons/icon-camera.svg
@@ -0,0 +1,7 @@
+<svg width="85" height="66" viewBox="0 0 85 66" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="5.94434" y="4.92773" width="15.5386" height="16.1112" rx="1.78001" fill="#FF66AD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.585 0H54.7227C56.8954 0.0509226 61.251 1.72121 61.2917 7.99496C61.2917 10.9719 62.9303 12.1182 64.1666 12.4312H70.5935C78.4581 12.4312 84.8336 18.8067 84.8336 26.6712V51.0976C84.8336 58.9622 78.4581 65.3377 70.5935 65.3377H14.2401C6.37551 65.3377 0 58.9622 0 51.0976V26.6712C0 18.8067 6.37549 12.4312 14.2401 12.4312H21.3539C22.5467 12.1169 24.1915 11.0856 24.1915 8.63043C24.1915 4.37225 26.5803 0 30.585 0Z" fill="#4C3C33"/>
+<path d="M47.2051 7.81382H38.5511C36.0335 8.96867 36.4298 12.6061 37.9934 12.6061H48.3218C50.0712 10.9311 48.3218 7.69332 47.2051 7.81382Z" fill="#F9F6E5"/>
+<ellipse cx="42.9035" cy="39.4683" rx="19.7658" ry="19.7652" fill="#F9F6E5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M57.5033 39.468C57.5033 47.5323 50.9659 54.0697 42.9016 54.0697C34.8372 54.0697 28.2998 47.5323 28.2998 39.468C28.2998 31.4036 34.8372 24.8662 42.9016 24.8662C50.9659 24.8662 57.5033 31.4036 57.5033 39.468ZM53.8936 40.9628C53.8936 42.2078 52.8844 43.2171 51.6394 43.2171C50.3945 43.2171 49.3852 42.2078 49.3852 40.9628C49.3852 39.7179 50.3945 38.7086 51.6394 38.7086C52.8844 38.7086 53.8936 39.7179 53.8936 40.9628ZM43.9772 28.6918C42.996 28.6022 41.2035 28.6918 41.0334 30.4128C40.8416 32.3543 42.5052 32.8329 43.9772 32.8866C44.9658 32.9228 47.5574 33.3182 49.1556 35.9975C49.4861 36.571 50.5237 37.5062 52.0306 36.6586C53.5375 35.811 52.4715 33.7908 51.7502 32.8866C50.94 31.6534 48.251 29.0878 43.9772 28.6918Z" fill="#9364DE"/>
+</svg>
diff --git a/site/assets/animal-island/icons/icon-chat.svg b/site/assets/animal-island/icons/icon-chat.svg
new file mode 100644
index 00000000..df7ac741
--- /dev/null
+++ b/site/assets/animal-island/icons/icon-chat.svg
@@ -0,0 +1,7 @@
+<svg width="80" height="67" viewBox="0 0 80 67" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6992 9.64355C12.1012 9.64355 2.69922 19.0456 2.69922 30.6436V38.4145C2.69922 50.0125 12.1012 59.4145 23.6992 59.4145H34.8603L40.1597 66.2754C40.56 66.7937 41.3422 66.7937 41.7425 66.2754L47.042 59.4145H58.203C69.801 59.4145 79.203 50.0124 79.203 38.4145V30.6436C79.203 19.0456 69.801 9.64355 58.203 9.64355H23.6992Z" fill="#F5F1E6"/>
+<circle cx="20.8502" cy="35.8375" r="5.78961" fill="#5E483B"/>
+<circle cx="40.4293" cy="35.8375" r="5.78961" fill="#5E483B"/>
+<circle cx="60.0084" cy="35.8375" r="5.78961" fill="#5E483B"/>
+<rect width="33.5693" height="19.2872" rx="9" fill="#F583A4"/>
+</svg>
diff --git a/site/assets/animal-island/icons/icon-design.svg b/site/assets/animal-island/icons/icon-design.svg
new file mode 100644
index 00000000..ce2456e8
--- /dev/null
+++ b/site/assets/animal-island/icons/icon-design.svg
@@ -0,0 +1,7 @@
+<svg width="98" height="72" viewBox="0 0 98 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.335777 10.1492C4.89272 4.90487 15.8067 0.905744 20.33 0C22.2521 5.66649 23.6648 7.58058 31.4973 8.31653C39.3299 9.05248 42.7776 1.90327 42.7776 0.0974021C46.7848 1.07591 49.301 2.84653 56.5233 6.71395C62.3011 9.80789 62.955 12.1036 62.5598 12.8647C59.1326 19.2015 54.8059 25.4431 52.631 25.4431C51.1506 25.4431 49.4913 24.2734 49.0295 22.7651C48.5678 21.2568 46.998 21.0413 47.7675 23.2576C48.537 25.4739 51.2217 42.2647 51.1609 42.3863C51.1 42.508 40.1516 45.4883 31.8187 45.8533C23.4858 46.2182 11.9884 42.9227 10.9875 39.6866C9.98669 36.4505 13.2561 26.1083 14.4572 23.039C15.418 20.5836 14.0568 21.7046 13.2561 22.572C12.3154 23.6242 10.0697 25.5898 8.61345 25.035C7.15721 24.4803 2.36158 16.8418 0.145802 13.092C-0.00407374 12.3316 -0.155879 11.1351 0.335777 10.1492Z" fill="#F7F3E1"/>
+<circle cx="31.2875" cy="15.763" r="3.88316" fill="#59433A"/>
+<circle cx="31.2875" cy="25.8568" r="3.88316" fill="#59433A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M72.9897 8.06671L43.1696 38.9087L43.1757 38.9148C42.5864 39.3622 41.205 40.9237 40.3256 43.6513C39.4422 46.3915 36.0168 58.2743 34.4145 63.8732C33.7432 66.3763 33.9857 71.3165 40.3256 71.053C46.4057 69.5775 56.89 66.0908 61.3721 64.5319C62.628 64.0928 65.3476 62.8852 66.1791 61.5678C66.1756 61.5644 66.1721 61.561 66.1685 61.5575L95.882 30.8258C98.7075 27.9035 98.6611 23.2113 95.7784 20.3454L83.3251 7.96458C80.4425 5.0987 75.8151 5.14442 72.9897 8.06671Z" fill="#59433A"/>
+<path d="M42.4894 39.7568C40.4231 41.1563 37.7123 51.2246 36.6152 56.0838C38.3518 57.788 43.3351 62.6673 49.3763 68.5511C59.1201 66.2132 64.0929 63.486 65.3614 62.4147C58.3623 55.5701 43.9892 41.4562 42.4894 39.7568Z" fill="#FFCF4F"/>
+</svg>
diff --git a/site/assets/animal-island/icons/icon-diy.svg b/site/assets/animal-island/icons/icon-diy.svg
new file mode 100644
index 00000000..710f4f28
--- /dev/null
+++ b/site/assets/animal-island/icons/icon-diy.svg
@@ -0,0 +1,8 @@
+<svg width="91" height="82" viewBox="0 0 91 82" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="11.7194" height="29.2229" rx="5.85971" transform="matrix(0.835401 0.549641 -0.539556 0.84195 64.2549 50.3584)" fill="#FAD12B"/>
+<rect x="1.18652" y="1.29688" width="57.27" height="74.7502" rx="8" fill="#F7F3E1"/>
+<rect x="7.08887" y="7.21875" width="45.4652" height="62.9072" rx="3" fill="#E68E6D"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.6888 35.5469C30.6862 30.2339 19.8407 34.0493 15.9183 36.6212C13.8852 52.7036 18.98 56.7398 27.1072 60.3539C27.6614 60.5307 28.9816 61.3837 29.8281 63.3814C29.7361 61.4936 31.0417 60.5765 31.7061 60.3539C42.6889 56.3496 46.6113 48.1457 42.6888 35.5469ZM37.1053 41.2027C37.3954 41.7241 37.3952 42.3441 37.395 42.919L37.395 42.9614C37.395 43.1244 37.382 43.3738 37.3668 43.6646L37.3668 43.6647C37.3272 44.4205 37.2731 45.4562 37.395 45.9848C37.6452 47.0696 39.9601 47.9483 40.8106 46.2544C41.491 44.8992 41.0941 41.5758 40.8106 40.0835C39.5653 36.3328 35.86 38.9643 37.1053 41.2027ZM37.626 52.0231C38.7863 52.0231 39.7269 51.0863 39.7269 49.9307C39.7269 48.7751 38.7863 47.8383 37.626 47.8383C36.4657 47.8383 35.5252 48.7751 35.5252 49.9307C35.5252 51.0863 36.4657 52.0231 37.626 52.0231Z" fill="#4C3C33"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.0104 34.2474C19.387 31.7516 31.3738 28.0935 44.3081 33.4268C47.3301 29.9873 44.3081 14.2375 30.0067 20.1733C29.2398 18.8106 29.6872 16.6112 30.0067 15.6818C30.211 15.2695 30.4971 14.3835 30.0067 14.1377C29.3937 13.8305 26.7941 13.8305 25.9569 14.9276C26.813 16.1477 28.0035 19.5124 27.9069 19.6726C27.8983 19.687 27.7513 19.6701 27.4942 19.6407C24.8861 19.3419 10.9446 17.7447 15.0104 34.2474ZM17.2549 24.576C17.5476 23.4308 19.682 21.1593 25.8783 21.2342C26.5807 22.0837 26.9027 22.5042 26.9758 22.6084C24.5926 22.65 19.3119 23.1019 17.2549 24.576ZM29.2407 25.608C21.6914 25.119 17.8094 26.9325 16.812 27.9004V26.3665C21.2575 24.2181 26.1818 23.989 28.0882 24.1429C28.1916 24.1687 28.5667 24.4977 29.2407 25.608ZM16.7432 30.899C18.771 29.7217 21.8219 28.1461 31.2604 28.5446L30.1014 27.0166C27.2762 26.9223 20.6493 27.2302 16.7432 29.2161V30.899Z" fill="#FAD12B"/>
+<path d="M85.2042 67.1151C83.0668 58.9215 77.189 59.3095 74.5173 60.5278C70.9837 58.1866 63.1911 53.0321 60.2899 51.143C59.7256 46.616 55.1638 46.7113 54.0351 47.0131C53.546 47.4451 52.1306 47.1931 51.484 47.0131C51.5976 47.1282 51.3557 47.0415 49.4797 45.7743C47.6038 44.5071 48.3475 42.5817 48.9539 41.7773C51.0074 38.5782 55.3014 31.8643 56.0494 30.6012C56.7973 29.3382 58.3693 29.5604 59.0618 29.8294C59.2118 29.9229 59.8305 30.2644 61.1048 30.8819C62.379 31.4994 62.5822 32.7765 62.5245 33.3379C62.9123 38.0814 67.3375 37.982 69.784 37.982C73.0553 40.0977 80.8635 45.3292 85.926 49.3296C91.2509 54.8708 90.2805 63.5056 89.2118 66.5737C88.1431 69.6418 85.6495 68.7845 85.2042 67.1151Z" fill="#4C3C33"/>
+</svg>
diff --git a/site/assets/animal-island/icons/icon-helicopter.svg b/site/assets/animal-island/icons/icon-helicopter.svg
new file mode 100644
index 00000000..02eda17f
--- /dev/null
+++ b/site/assets/animal-island/icons/icon-helicopter.svg
@@ -0,0 +1,13 @@
+<svg width="103" height="65" viewBox="0 0 103 65" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.431 31.5628C20.2041 32.4932 19.8918 33.7738 17.4399 34.2157C13.698 35.1891 5.8384 38.0279 5.26856 42.9666C4.55625 49.1399 15.5053 52.3044 18.7308 52.578C19.616 52.6531 26.9921 52.5983 29.5966 52.578L31.6721 58.3161H16.9859C16.2866 58.3161 14.5745 58.2834 10.8006 55.6755C9.9796 55.3954 8.18736 55.3294 7.1325 56.6568C5.81394 58.3161 6.5831 60.1383 7.1325 60.7609C7.1585 60.7904 7.18882 60.8257 7.22362 60.8661C7.92438 61.6812 10.4396 64.6068 15.9265 64.6596C20.534 64.7039 54.6051 64.678 71.0647 64.6596C71.888 64.5599 73.5226 63.7715 73.4745 61.4154C73.4264 59.0592 71.8479 58.4301 71.0647 58.4101L55.8638 58.3161L53.7578 52.578C53.4557 52.03 53.2558 50.8363 54.8734 50.4459C56.8954 49.9578 60.9394 46.7505 62.7522 42.1487C66.0444 41.1904 80.6847 36.9405 87.5933 34.9353C87.6719 34.9125 87.7568 34.8855 87.8464 34.857C88.5629 34.6292 89.5833 34.3048 90.1443 35.2399L93.3713 39.8807H101.535L98.308 31.0954C98.0889 30.5973 97.8419 29.1829 98.6068 27.5096C99.3718 25.8362 101.47 20.6918 102.424 18.3287C102.636 17.5633 102.615 16.1242 100.834 16.4916H95.1811C94.8176 16.4916 93.9075 16.6318 92.9879 18.1337L89.244 23.6611C88.9563 24.0728 88.1347 24.9806 85.3506 25.2216L61.2418 28.777C61.2418 28.1865 60.6171 26.0927 55.9709 22.3835L26.1287 22.8192C24.6471 24.3397 21.4875 28.0641 20.7021 30.7981C20.5716 30.9861 20.506 31.2554 20.431 31.5628ZM37.0636 52.1857L39.1573 58.1004H48.7882L46.3805 52.1857H37.0636Z" fill="#4C3C33"/>
+<path d="M10.9122 40.1817C10.6651 39.202 11.4844 38.0471 12.1666 37.673C13.2889 36.8477 15.7383 35.4415 16.557 36.4186C17.3756 37.3957 16.8981 38.1681 16.557 38.4322L13.7511 39.9507C13.2229 40.2918 11.786 40.4333 10.9122 40.1817Z" fill="#FAF5E5"/>
+<path d="M10.2909 45.4017C9.99041 46.3604 10.8375 47.5317 11.5627 47.9266C12.7488 48.7835 15.3506 50.2635 16.2692 49.3285C17.1877 48.3936 16.6973 47.6128 16.3373 47.3393L13.3537 45.7352C12.794 45.3786 11.2445 45.1856 10.2909 45.4017Z" fill="#FAF5E5"/>
+<path d="M11.4234 42.7699C12.226 43.7714 12.7738 44.0845 13.9554 44.1649C15.286 44.2554 17.5885 44.4232 17.9339 43.2161C18.2792 42.009 17.3786 41.3555 16.9526 41.2845L14.1365 41.2845C12.1233 41.6272 11.9979 42.1519 11.4234 42.7699Z" fill="#FAF5E5"/>
+<path d="M27.8366 38.0261C25.1869 38.0261 26.1688 34.5025 26.991 32.7407C28.2313 29.7527 29.411 29.2924 30.0565 29.1114C30.4738 29.0533 31.924 28.9351 33.6153 28.9351C36.4963 28.785 36.7979 29.4841 36.6457 30.7674C36.4577 31.4017 36.1242 33.2763 35.1657 35.4186C34.2073 37.5609 32.6287 38.0496 31.9592 38.0261H27.8366Z" fill="#F9F6E5"/>
+<path d="M44.0776 28.9156C42.4632 28.8812 41.5444 30.5614 41.2868 31.4057C41.2009 31.6204 40.9949 32.5049 40.8575 34.3253C40.7201 36.1458 42.0597 36.515 42.7466 36.4721C43.0472 36.4864 44.2064 36.5065 46.439 36.4721C48.6717 36.4378 49.3157 35.7136 49.3586 35.3558C49.5161 34.8835 49.8825 33.4323 50.0885 31.4057C50.2946 29.3792 49.4302 28.9012 48.9722 28.9156C48.0133 28.9299 45.692 28.9499 44.0776 28.9156Z" fill="#F9F6E5"/>
+<path d="M42.3243 1.75967C40.2543 1.75967 14.9108 0.708353 2.4957 0.108886C-1.20529 1.24532 -0.436366 7.43593 2.4957 8.03971C15.322 7.73285 40.1705 6.84297 42.3243 6.84297C43.4265 6.84297 69.8824 7.5412 82.9866 8.0284C87.3415 4.97586 84.6693 -0.193929 82.3393 0.00561061C79.7804 0.224947 44.4896 1.75967 42.3243 1.75967Z" fill="#FFAD00"/>
+<ellipse cx="18.6724" cy="17.4369" rx="2.0992" ry="3.79239" fill="#7B7B73"/>
+<path d="M29.2576 15.7934C30.7747 16.3638 30.7747 18.5098 29.2576 19.0801L20.6055 22.3328C19.4575 22.7644 18.232 21.9159 18.232 20.6895L18.232 14.184C18.232 12.9576 19.4575 12.1091 20.6055 12.5407L29.2576 15.7934Z" fill="#FFAD00"/>
+<path d="M22.528 19.205C24.851 12.236 34.33 10.4141 38.7791 10.3743V2.70085C38.7791 0.603806 40.2843 0.0265152 41.0369 0H44.6843C46.2445 0.0362842 47.0517 2.36727 47.0517 2.85737V10.3743C58.4673 11.1024 62.5788 18.6106 62.875 19.8547C63.1119 20.8499 63.5029 21.0884 63.6687 21.0832C64.386 21.1749 65.8254 21.8187 65.8454 23.6601C65.8654 25.5015 64.6567 26.0005 64.0498 26.0198H20.666C18.5375 23.8913 20.0865 21.9402 21.1271 21.2308C21.4592 21.0043 22.2303 20.6553 22.528 19.205Z" fill="#FFD103"/>
+<rect x="25.6084" y="19.0068" width="34.0957" height="2.37974" rx="1.17044" fill="#4C3C33"/>
+</svg>
diff --git a/site/assets/animal-island/icons/icon-leaf.png b/site/assets/animal-island/icons/icon-leaf.png
new file mode 100644
index 0000000000000000000000000000000000000000..92d32bd8490cda18baefb2f65aed109be4b26b57
GIT binary patch
literal 3337
zcmV+k4fgVhP)<h;3K|Lk000e1NJLTq00372002`60{{R3-G^&P0008_P)t-s0000B
zJRJxj6bK*?1Re|xNFxnKA`MF=2PY5=NhAp`76}~@5Lzn^NhAzJ9|<cI2`m)|DijS$
zBMLVe2{jrGK^zDx5(+LA7+NO_KpqT89SJrR3qBqRG8PLu9SAcR5Mv$;R2mCP9}Q0(
z3q2kQGZqLs8Vf=l3p*PNMjtDVH79g0AzvyDTpbHTAq`d>2r3l|NE{$-E)7>25Lg=u
zI~@&0A`DF(3@#El&l?wXHwro(3_u?YMj{J7A0L)J7I8KfZ#5ZyD-~@s3`8LYHyk3X
zH5z~_4MHFnb~p`J8Y;dj7<)P^vo|lxG$g1pFwHFtQWpwN7A(6pDYPvMJsmL1Iw+|(
z7<w)ZNh3PZ8wyGmAD}udzc?wmEf{($JJTC0w>KrQF)6$(7j`TfgDN1MKpvYp7<o7(
zt}`vbG9H~WE5Ixuq&OXzG9jQaG0rLtS{f##HYA=lA*3=Lj4~8wF(|e!EyO4eT^tv4
zG8lI-BdjkIU@jYlDlN7o2Rt7cjz%o5I3cJv9hEZ`Ycej&FD0@qEWjxbP9+FP6+Ey!
z9E>|H#yJ>yEgzRGGSe$3t}7UPD-csCFv%qYGa3g)6feayGSD(9urU^JEg_pMD6uLN
zTOB;r8X0{sBd0ABNh1nDAy~pd8h|(&i8L+7E*yy~AC4&*Q71IdB|Y05V8~b<kv|)U
zI~|ibCZIPQku)HaEi}g-iP36b%Ry1QKrqiaCc`urb~GA;GaZU1D5@nPmnAd59~gTc
z6H^zA*KaGNJVUuTIh8pXhBh?XFBfGiB%dfa)*=>gA|{|9G|V5C>vD<ZY=y{WZPZ_N
zxm{$VQx=9pTDn0cx-})KDjH-Y6>S><K@O$vdz$fenc#DI++%R)U{8ujNyJBY)kbN;
zLOr`eRL4L}tw1xhG!I}jGJ7#BYA++CEjQ31rT2M&<z|4xWn9-(jOj~+<48x+NL#^1
zN{d5PpFuL$JUMbYDSk05uplX_9b3&*LWnVESbx|600233QchC<{Rj;N_Wa~8$4L_Y
z@YX>&9Q#^QooFNb`=yMBfPG;8_{_qpnQ!Q_j{g4s?&8m-WB%~r!n^({F9E=K000Sy
zNkl<ZSi|j@S6EYL7{}R5mLfP&L_w{iwpCkl&WVsg29c0RfDj-URuB}z2zx4f$d<ij
zS+Sxbf~a-xJ?h@Gd(Vr$Ur?*P2*h$%eiykod7j_%&-=aK_nt3mV~p|tMGJk5zIBH6
zJQKCiXNHhWXq%58ZLNlWGfqz>bZ3sTcf4_G=d-4Avd~;}RK0pe^o92yEQHAVlSb1!
zQAjuZ@w@wfrP7(YrlYxRO#0Kn2j74Ha}$W)C9%eM3(ILs=1g5;V>$B^&DT%o;bc-;
zTJQbu9!$n)GgMz5TkA!2bsrNnoDd3ijEtx2y?j1bAiR`z$^O~n%abvts@_lLFJiO#
ze7*n!1Z1)Rr)f_cuPCn$R+^S}Dap{V8N*eqgNEfIHcwQ+jyqY>&=8-IWLPR}#sq}!
zMEK5z5XjTg?30oRjBI48S|`1ata1BmB#w@bYrTT<Tld(@OPPXZ9a}X`V=~T3<H(bQ
z>bQ|=yLsj;89!GxAnCgz33iMM3t6{e+Yu>=B^P2iVP*hjxRmDb4%!dmcp}mMtiI5g
z7)c^m;oZJ{v(%ntpQDazFUB!>niOfZ4OB}j<B8aVnQeZ4em+?sR(PW~AKBwTvM&|j
zxPZw?lY@4`M3uBAb?n@@tC^vG$QzS|0uOmx?Hx!CIT(%^rjc^g$rDsNcE&Abi)4E<
zL!AJHH}OSS$dGrBg99sriIJ(CQURH;R8xtmG7<k&cr1{e?c^7em6h0t3K6}zzaP8~
z_DMu(MiNcHoUYn<F_7_c2a3vK%gRodm6gS2gBgiY;Qn|j;E+Mh$PwV$w&PUV57zA5
zFUq=3pFVB3FJ<rX<24%*>()Ww2G9Z!nMz>lWTx(P6$XY`9H0Nk2|GKx`rj!Ou|H5K
z_5d0h5~vwe2LR0WNjWqDMy8E?U}(%{SL{FG30~infsXcMh8XbhC`^ctN79UA*N%bK
zo<wp;${`DwLYol|4AWT<cZ(gu({9I(eNc<R_5ex=h{1fV?!bXMXksLmvgA4H0%G>a
zs%#!t@r5sni^QJ3zV*JRvr~%O3q2AN5~`8)q<<?%st~g{EJJlc^Ky-m^sX^abPD4B
z1BA{#P7y;TKwIa(d0Rfv%^`sp%<?G$V%o@7jlB=NZ;6k4h@lW3RwAqDpr8#KwjsJX
zLy?oFkSC1bkeJ36?YHxN)9UHFS6o7&P&_=UPxeHHgoK5KgaiRAx=9MLp*n53*06(T
zDX-#RWvEYKlrWGsp&=|PB<w}w)vJwBQE(y$=ChF4L1zSk^=9#Szi;t;Q@byqgu$Sc
zP(1t-)<uOyH5MZhx$D<@1?H0!l~Bj04twsxUhDGp^z?kK-7z2zU{J&x8!6!BMsX8s
zYm19(YbB2B*9Hc5LtqYd3R!oUeWx`KZHg~J44~T9dk&T`0zm8J)Lxy?gS=TOwY9ab
zuECD$y}VX%>`5$E4n~_e%w{uY^9PH*^aY@I>+9?7PB8)k7~+lDv7t5b@jby@Zm=ZF
z)z#Gpyss+3nXEqCsGqcm&rS*NLgM-@zB^J*bp!+?E3{6b#U9nsRmdxmfLJo*MS-RA
zDa<*_JHjGP6jv5r)^%db7Q2+=9RUnRa&kaP52ST+@`;xBS2=<hkbo9>6%}StY4|b?
z<=q=6I_U!5u6=tu7!*c8GH59skQN3<Xjn!A*D)d@Vm%E0VB}Tw8tOCxH&%Z7*vLeK
zMd4j3Jq&+;G0F<XO-?DxM)Sxgt05tZ8x<7f<+T>6*DLaFWsShA`94py_h@){Pc@~Z
z=4whxJ0k$%#-g}BF|MvJLb&O93f$Ksyu5-|Y?UG}Q@PjlBObpPyrHg6vEe6<)>0U-
zBa;14T<``<o*Zh~)zWggx8>18XfmW-v6W-bq7uwyO1%a$ew<H{OL!3w-j$t9VZgz_
zsEt)<B@(dq9{%maW5*U8eta(-9T5tzR8FHQ?*}v36_u4PK)6eIc#S`$u%lf}X$(c$
ztg1u1S`Hs;PQ@^cPH$T9_#jxpD@FZFQ#zWprt&HVj%H@MAc|bYC56eMjfI6Zp{Tf$
zL%Vu^BQOldX+j!~m3JOih+*A0r5Mdj>6t#4CmKBZQrp&ED5lgF`7r$3{d`<qvz|O^
zS&)k1I>z&DEiCnQnDox~0>PV4Vv#10wM~^DW+GWkr85N1bg8WI_wa9YX=|&gZm9C9
zs!BYx>%G)e+T0Hm3#2h|F^yh|@^+)`M%LF<x+`F`RXRH(ab+UR_nOSM&^Fk<VLnxf
z>5qC#F{ZBG>kNx=dOQSfB}ol2D6i59&l3%R7pU~{sIK1F))opxXGF(Tai2ikw|=e}
zyaS_UgL8eDGMHHL`7yf{+D-i#)SgY7)~s2xYE1++fm_AR`|(41v-w*CRzMsH?2eZj
zsuS~+cA2?Mbg}@vpxrE|ZU8Ovu3FVEkF1KyyF8ix_S^1MGTs`<ky2r9nkZehk9fH?
zzqq+M@7@&sG$Yb^NDFYIBizICE_c$6CjHx+FC|S-XU-Ys?X<$GV7Hr_+iv%#@$PO&
z>kZ!3D_5>`kBH1`nf$g_Q(wT`(+Y3b!weylS-gsk5Eob#x!QS?xA!V<2#dVw;62#8
zkgoma?={uNgwj3ewqc_DC}ZbZ^(nLkklGsoQUJ8>5uZioEug>IPFizl0>ca)xMG+o
zzo5(b2R^;y=ImU6K-M8CFyu`?td1G!{c}W3z?nHyFq)Csumk?uxidHK{NPs5*Y`>b
zQqT^0KRY<N9M?6_cr~$vI8G)L#=~7U4dQq_{_~6HZrr@{?GFWgSFT)nQw!e6i1&2p
zOdb8{78Xc8Ntd9}wC9f-_F7>sWAk&b*FF1r=dCkmzW(-}_v)3wj)1#6iVNPzgVEaM
z<*9J9&oKwFss3Vfy^;JGW-;4J#^YblWncU0!ns>teRcNypZ6X<Om~k82?<$;*buV)
zLql3Q#v}{T2GJNd(wmTp<@>YPY*B9Rb>8#47r(i6<HpT1XTQFE`~0U0&Y!=1_Uwh9
zI#Zc6TQ$`fr#IhvX&j1OPS@#N`0L$^7rxo~IbtVp?!v{pzdmmw<Ioo>qcz@k+U$=$
zCYn>}<>hobOdV!ZQ)g#W6O){Zp-0U$T?4guLsQShZ2q#jM%qn6f*@lr!3l!U(VjcU
z3<~@1z`9H_u&}gQvRq$Z-`ZMVfA+j3HZx|Lj?)^o{|q%W0Szs+F~%5UjQ_~rRi7K5
Ts`M%000000NkvXXu0mjfPdL)E

literal 0
HcmV?d00001

diff --git a/site/assets/animal-island/icons/icon-map.svg b/site/assets/animal-island/icons/icon-map.svg
new file mode 100644
index 00000000..bb69d47b
--- /dev/null
+++ b/site/assets/animal-island/icons/icon-map.svg
@@ -0,0 +1,15 @@
+<svg width="75" height="96" viewBox="0 0 75 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M73.4776 42.6469C74.3136 43.1559 74.8239 44.0639 74.8239 45.0427L74.8238 91.3169C74.8238 93.4535 72.5304 94.8056 70.6609 93.7711L57.1138 86.2752C57.0003 86.2124 56.8922 86.1424 56.79 86.0659C56.6721 86.15 56.5468 86.2257 56.4148 86.2917L38.2551 95.3748C37.2348 95.8851 36.1174 95.7104 35.3137 95.1075L17.4432 85.8943L4.19306 93.4406C2.32316 94.5055 5.73555e-06 93.1551 5.49234e-06 91.0032L0 44.0708C0 43.0455 0.559409 42.1019 1.45893 41.6099L15.2233 34.0814C15.7573 33.5984 16.4698 33.3238 17.2092 33.3496C17.9055 33.3344 18.5765 33.5852 19.0941 34.0247L36.8163 43.2084C36.9627 43.2843 37.1006 43.3721 37.229 43.4702L55.2861 34.1782C55.8761 33.5561 56.7392 33.2153 57.6166 33.3053C58.4756 33.294 59.2896 33.6875 59.8246 34.3346L73.4776 42.6469Z" fill="#F7F3E1"/>
+<path d="M6.52377 82.0731V48.0332L14.8739 42.4786C17.2846 40.5949 18.8918 41.3573 20.3426 42.2992C24.7996 44.5635 34.0799 49.3192 35.5458 50.2277C37.0117 51.1363 38.7848 50.6063 39.4881 50.2277C43.6624 47.9953 52.6388 43.2341 55.1504 42.0491C56.9845 41.0167 58.6538 41.4091 59.4364 42.0491L68.3122 47.8817C68.3025 58.2423 68.2888 79.5382 68.3122 81.8371C68.3355 84.136 66.3569 83.6355 65.3647 83.0979C63.993 82.2183 60.8645 80.1598 59.3237 78.9635C57.8528 77.6733 55.9286 78.4259 55.1504 78.9635C50.6606 81.3572 41.2617 86.3554 39.5842 87.1988C37.9067 88.0422 36.1662 87.5502 35.5056 87.1988L19.857 78.9518C17.6359 77.4557 16.3856 78.4383 15.5177 78.9518C14.6499 79.4653 12.4948 80.8085 10.8174 82.0731C7.10015 84.4843 6.40613 83.0778 6.52377 82.0731Z" fill="#59C9C0"/>
+<path d="M24.4086 53.0932L25.9292 53.9876C29.5476 56.129 28.0535 53.5144 28.4666 52.4232C28.9404 51.1717 30.4401 51.7871 31.1307 52.2511C32.3216 52.8804 34.9841 54.3144 36.1063 55.0167C37.2284 55.7191 38.4265 55.3094 38.8852 55.0167L42.1137 53.3136C45.1875 51.4254 45.5405 53.0253 45.5405 54.1388C45.5405 55.9531 46.5898 55.4428 47.2036 55.1748L50.8837 53.214C52.8302 52.0448 54.2425 52.7848 54.2425 53.7721L54.0151 62.4485C54.0028 63.9623 54.5399 63.953 54.9876 63.8289C56.63 63.0316 57.2343 64.1081 57.2343 64.8255V66.6648C57.2111 68.5931 56.2002 69.1815 55.6078 69.1815C54.3706 69.2098 54.237 69.3934 54.237 71.8833C54.237 73.1405 53.8679 72.9251 51.9192 73.9787L39.4953 80.499C37.2996 81.6669 37.5424 81.5421 35.4914 80.499L24.4086 74.7195C21.2306 72.9533 21.2561 73.6566 21.2561 71.2639V54.8819C21.1967 51.3641 23.3701 52.4597 24.4086 53.0932Z" fill="#45A86F"/>
+<path d="M6.78223 76.2303L17.3863 69.5098L37.534 79.8364L57.2739 69.5098L67.0623 75.5746" stroke="#299187" stroke-opacity="0.5" stroke-width="1.12197" stroke-dasharray="2.24 0.56"/>
+<path d="M6.61914 65.6479L17.2373 59.1045L37.341 69.0619L57.1615 59.1045L66.9302 65.6479" stroke="#299187" stroke-opacity="0.5" stroke-width="1.12197" stroke-dasharray="2.24 0.56"/>
+<path d="M6.02734 55.1539L17.5332 48.3486L37.5258 59.0074L57.1919 48.3486L67.1473 55.1539" stroke="#299187" stroke-opacity="0.5" stroke-width="1.12197" stroke-dasharray="2.24 0.56"/>
+<path d="M22.1572 43.4854L22.2822 80.2499" stroke="#299187" stroke-opacity="0.5" stroke-width="1.12197" stroke-dasharray="2.24 0.56"/>
+<path d="M32.5498 48.7334L32.6634 85.5838" stroke="#299187" stroke-opacity="0.5" stroke-width="1.12197" stroke-dasharray="2.24 0.56"/>
+<path d="M42.4062 48.7334L42.5199 85.5838" stroke="#299187" stroke-opacity="0.5" stroke-width="1.12197" stroke-dasharray="2.24 0.56"/>
+<path d="M52.7871 43.3994L52.9018 80.2498" stroke="#299187" stroke-opacity="0.5" stroke-width="1.12197" stroke-dasharray="2.24 0.56"/>
+<path d="M63.0068 44.748L63.1267 81.3965" stroke="#299187" stroke-opacity="0.5" stroke-width="1.12197" stroke-dasharray="2.24 0.56"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.0825 34.8346C57.006 31.1652 58.7544 26.5095 58.7544 21.4436C58.7544 9.60064 49.1992 0 37.4123 0C25.6255 0 16.0703 9.60064 16.0703 21.4436C16.0703 26.5613 17.8546 31.2602 20.8321 34.9467L34.047 57.2165C35.5684 59.7805 39.2797 59.7805 40.8011 57.2165L54.0825 34.8346Z" fill="#4C3C33"/>
+<ellipse cx="37.4124" cy="22.2135" rx="7.25612" ry="7.29066" fill="#F7F2D9"/>
+</svg>
diff --git a/site/assets/animal-island/icons/icon-miles.svg b/site/assets/animal-island/icons/icon-miles.svg
new file mode 100644
index 00000000..941026e1
--- /dev/null
+++ b/site/assets/animal-island/icons/icon-miles.svg
@@ -0,0 +1,11 @@
+<svg width="94" height="104" viewBox="0 0 94 104" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.5704 51.2672C20.1382 47.5048 23.6707 45.5342 25.4343 45.0117C23.6734 43.9782 19.9354 40.3391 19.6027 32.9953C10.7666 33.4922 5.22798 29.0074 3.5632 26.7029C-2.5944 15.7943 1.2284 11.8209 2.05308 10.3364C2.87776 8.85203 6.20221 6.93342 10.1607 7.31827C14.1191 7.70312 16.5932 10.7269 15.8785 18.6439C15.3067 24.9774 18.123 26.6555 19.6027 26.7029C19.8497 12.3783 38.5262 7.17892 47.8605 6.22668H61.0065C60.9316 6.2097 60.6876 5.45528 60.4309 3.52975C60.1682 1.55967 62.4557 0.355715 63.6323 0H68.3112C70.1828 0 71.2433 1.97008 71.5396 2.95512V7.91826C77.8629 8.68473 84.0869 15.4689 84.3665 20.3155C84.5902 24.1928 87.4859 25.5401 88.9058 25.7291H93.0804C93.7846 37.2469 78.5536 44.5877 77.6498 44.7615C76.9268 44.9005 77.1294 45.4489 77.3211 45.7057C79.28 46.7111 83.2015 49.5912 83.2015 51.3733C82.7428 58.0241 77.2769 58.0624 74.6013 57.2501C71.5912 55.8884 64.625 53.0216 60.8409 52.4483C56.1107 51.7316 46.0054 53.0933 42.852 53.165C40.3293 53.2223 30.7041 56.9351 26.2069 58.7843C24.0484 59.2616 18.5704 55.5783 18.5704 51.2672Z" fill="#4D3E36"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M83.6368 17.5752C84.0789 18.2418 85.027 20.004 85.2826 21.7197C85.5381 23.4354 86.4233 24.3206 86.834 24.5488C85.4347 27.7886 81.6503 34.3047 77.7078 34.4507C72.7796 34.6333 71 34.5876 68.9466 31.0284C66.8932 27.4692 67.6234 22.541 70.9088 20.4876C73.8911 18.6237 77.4701 18.2392 82.1689 17.7345C82.6465 17.6832 83.1356 17.6307 83.6368 17.5752ZM78.2167 29.6498C79.8959 29.6498 81.2571 28.2886 81.2571 26.6094C81.2571 24.9303 79.8959 23.569 78.2167 23.569C76.5376 23.569 75.1763 24.9303 75.1763 26.6094C75.1763 28.2886 76.5376 29.6498 78.2167 29.6498Z" fill="#EBCD55"/>
+<path d="M5.08344 18.6624C3.47727 17.6914 1.32688 18.6341 0.452449 19.2268C0.204931 17.7093 -0.207434 14.3276 0.123246 12.9404C0.536596 11.2065 3.1348 7.27628 8.9217 6.9295C13.5512 6.65207 15.5747 10.4359 16.0077 12.3625V18.2C15.4172 18.9899 13.5748 20.5928 10.9294 20.6853C7.6226 20.8009 7.09115 19.8761 5.08344 18.6624Z" fill="#EBCD55"/>
+<path d="M67.6838 3.63792C64.9471 5.08683 66.1857 8.44504 67.1471 9.94307L69.3606 8.80278C69.9419 6.47748 69.3606 2.75012 67.6838 3.63792Z" fill="#8A7B60"/>
+<circle cx="47.2224" cy="104.709" r="45.8825" fill="#B3BFFF"/>
+<path d="M6.04234 92.2489C4.12914 92.0872 3.80803 89.9585 3.88663 88.9143C10.919 71.7363 24.5276 63.6598 30.4529 61.7687C33.057 60.954 38.5951 59.7288 39.9143 61.3459C41.5634 63.3673 40.8186 65.0164 39.6246 67.8453C38.6025 73.7087 42.8147 72.5908 45.4879 72.5908C48.2832 71.887 51.4333 71.9617 52.9447 72.1831C54.1015 72.6027 56.2347 74.0523 55.5131 76.4949C54.611 79.5481 48.921 81.0708 42.8147 82.1849C37.9296 83.0762 33.5547 87.3458 31.9778 89.3692C30.5025 91.4282 27.1723 95.342 25.6548 94.5249C24.1373 93.7077 24.1567 88.5309 24.3561 86.0447C24.2592 85.5467 23.7276 84.9347 22.929 85.3284C22.2678 85.966 20.3144 86.2107 19.8126 85.6636C18.8246 84.4594 19.7354 82.1 20.3144 81.0708C20.7389 79.7457 20.847 77.1187 17.8829 77.2113C14.9188 77.3039 11.7291 83.3417 10.4855 86.5033C9.8016 88.4859 7.95555 92.4106 6.04234 92.2489Z" fill="#5ABF98"/>
+<path d="M76.8657 73.8091C78.3322 73.7829 80.7752 74.7737 81.8133 75.2723C91.1148 84.9418 93.3753 100.183 93.0805 102.188C92.7857 104.193 90.3091 106.021 88.2453 104.842C82.7616 100.537 86.7689 95.1464 87.8341 93.7448C89.6699 90.7341 87.7423 90.7769 86.549 91.1746C85.5088 91.8172 82.9142 93.1022 80.8581 93.1022C72.597 92.1843 72.4463 83.237 72.5118 79.3087C72.5773 75.3804 75.0324 73.8419 76.8657 73.8091Z" fill="#5ABF98"/>
+<path d="M57.4213 89.2585C54.2281 92.5335 56.0908 94.5122 57.4213 95.0922C58.1164 95.3951 58.4814 95.6386 58.4814 96.6214C58.4814 98.7314 58.8161 99.6819 59.4856 99.9927C60.2645 100.372 61.9451 101.56 62.4364 103.28C62.9276 104.999 64.0739 104.815 64.5856 104.508C64.8927 104.986 66.1618 104.672 68.7818 99.5954C71.4019 94.5191 67.0761 89.7702 64.5856 88.0303C63.528 87.0751 60.6146 85.9834 57.4213 89.2585Z" fill="#5ABF98"/>
+<path d="M71.4918 112.273C68.3595 111.586 69.8047 107.085 70.9188 104.92C72.1485 102.919 73.2107 102.437 74.6432 104.156C75.7891 105.531 76.1465 107.759 76.2738 108.746C76.4203 109.881 74.6241 112.961 71.4918 112.273Z" fill="#5ABF98"/>
+</svg>
diff --git a/site/assets/animal-island/icons/icon-shopping.svg b/site/assets/animal-island/icons/icon-shopping.svg
new file mode 100644
index 00000000..de461c7f
--- /dev/null
+++ b/site/assets/animal-island/icons/icon-shopping.svg
@@ -0,0 +1,6 @@
+<svg width="71" height="102" viewBox="0 0 71 102" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35156 37.6318C7.73431 36.0515 10.642 31.3027 11.2109 24.95C11.7798 18.5972 13.7394 14.4805 14.6481 13.2163C15.8525 11.5407 19.9545 6.49634 25.173 5.80196C27.9297 5.43522 34.7153 5.33636 36.9296 10.7419C37.4507 11.7566 38.6388 13.1771 39.2217 10.7419C39.8045 8.30677 41.1465 3.75719 41.7446 1.7868C41.8872 0.650267 42.699 -1.10802 44.8049 0.951045C45.9827 2.21621 46.5858 2.85586 46.7401 3.01754C47.3749 3.68254 47.7481 4.75898 46.0837 5.80196L41.7446 10.3282C41.6745 10.4642 41.6028 10.5951 41.5335 10.7215C40.8661 11.939 40.4245 12.7446 43.8929 13.8254C49.2551 15.4963 49.6473 18.9449 49.4979 25.5929C49.4922 27.7517 48.5101 32.943 44.6272 36.4376C43.9371 37.0587 43.2631 37.6013 42.6144 38.0741C43.2465 37.1271 43.5855 35.8959 43.5855 34.3764C43.5855 30.2947 40.6459 26.818 36.641 26.818C32.6361 26.818 29.7905 29.4779 29.7905 33.5597C29.7905 37.6415 33.1299 40.4599 37.1348 40.4599C37.6446 40.4599 38.1291 40.4275 38.5865 40.3624C37.4973 40.8019 36.6539 40.9844 36.167 41.0122C32.6149 41.2019 24.0809 41.3374 18.3609 40.3618C12.6409 39.5812 7.97135 38.2166 6.35156 37.6318Z" fill="#409B5E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M60.0691 40.8215H67.1206C68.7774 40.8215 70.1206 39.4784 70.1206 37.8215V35.5485C70.1206 33.8917 68.7774 32.5485 67.1206 32.5485H56.7823C56.6085 32.5371 56.4354 32.5373 56.264 32.5485H56.0204C54.9415 32.5485 53.9955 33.1182 53.4669 33.9731C53.1679 34.3324 52.9274 34.7512 52.7651 35.2198L49.1837 45.5611H0V58.4033C0 66.1352 6.26801 72.4033 14 72.4033H36.8272C37.9123 72.4033 38.972 72.2953 39.9964 72.0894L38.9452 75.1249L4.09012 75.1246C2.43326 75.1245 1.09009 76.4677 1.09009 78.1246V80.0307C1.09009 81.6876 2.43324 83.0307 4.09009 83.0307H5.73181C4.69681 84.4841 4.09037 86.2483 4.09037 88.1504C4.09037 93.121 8.23174 97.1504 13.3404 97.1504C18.449 97.1504 22.5904 93.121 22.5904 88.1504C22.5904 86.2483 21.9839 84.4841 20.9489 83.0307H27.7318C26.6968 84.4841 26.0904 86.2483 26.0904 88.1504C26.0904 93.121 30.2317 97.1504 35.3404 97.1504C40.449 97.1504 44.5904 93.121 44.5904 88.1504C44.5904 86.2857 44.0075 84.5535 43.0095 83.1168C44.4915 82.9562 45.8202 81.9654 46.3415 80.46L60.0691 40.8215ZM8.31396 50.0458C8.31396 49.4936 8.76168 49.0458 9.31396 49.0458H11.431C11.9833 49.0458 12.431 49.4936 12.431 50.0458V66.0649C12.431 66.6172 11.9833 67.0649 11.431 67.0649H9.31396C8.76168 67.0649 8.31396 66.6172 8.31396 66.0649V50.0458ZM18.781 49.0458C18.2287 49.0458 17.781 49.4936 17.781 50.0458V66.0649C17.781 66.6172 18.2287 67.0649 18.781 67.0649H20.8981C21.4504 67.0649 21.8981 66.6172 21.8981 66.0649V50.0458C21.8981 49.4936 21.4504 49.0458 20.8981 49.0458H18.781ZM27.2481 50.0458C27.2481 49.4936 27.6958 49.0458 28.2481 49.0458H30.3651C30.9174 49.0458 31.3651 49.4936 31.3651 50.0458V66.0649C31.3651 66.6172 30.9174 67.0649 30.3651 67.0649H28.2481C27.6958 67.0649 27.2481 66.6172 27.2481 66.0649V50.0458ZM37.7151 49.0458C37.1628 49.0458 36.7151 49.4936 36.7151 50.0458V66.0649C36.7151 66.6172 37.1628 67.0649 37.7151 67.0649H39.8322C40.3845 67.0649 40.8322 66.6172 40.8322 66.0649V50.0458C40.8322 49.4936 40.3845 49.0458 39.8322 49.0458H37.7151Z" fill="#4A3D37"/>
+<ellipse cx="12.9968" cy="88.6746" rx="2.99679" ry="2.91579" fill="#F5FCEA"/>
+<ellipse cx="35.49" cy="88.6746" rx="2.99679" ry="2.91579" fill="#F5FCEA"/>
+</svg>
diff --git a/site/assets/animal-island/icons/location.svg b/site/assets/animal-island/icons/location.svg
new file mode 100644
index 00000000..7e28d08b
--- /dev/null
+++ b/site/assets/animal-island/icons/location.svg
@@ -0,0 +1,4 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.702 36C27.4785 36 35.404 27.9411 35.404 18C35.404 8.05888 27.4785 0 17.702 0C7.92545 0 0 8.05888 0 18C0 27.9411 7.92545 36 17.702 36ZM17.7017 33.8991C26.5382 33.8991 33.7017 26.7808 33.7017 18C33.7017 9.2192 26.5382 2.10095 17.7017 2.10095C8.8651 2.10095 1.70166 9.2192 1.70166 18C1.70166 26.7808 8.8651 33.8991 17.7017 33.8991Z" fill="#DDDBCC"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.7495 30.0341H19.606L25.4534 19.6785C25.8252 18.2539 26.3457 14.7333 25.4534 12.047C24.5612 9.36073 22.7725 7.77243 20.9921 7.08655C18.8417 6.63599 17.4865 6.53042 15.5994 7.08655C11.1996 8.38316 9.92903 12.1277 9.75929 12.7084C9.41313 14.2726 9.07661 17.9852 10.4998 20.3222C11.9229 22.6593 15.2593 27.7706 16.7495 30.0341ZM17.7019 18.371C19.2475 18.371 20.5004 17.126 20.5004 15.5901C20.5004 14.0543 19.2475 12.8092 17.7019 12.8092C16.1563 12.8092 14.9033 14.0543 14.9033 15.5901C14.9033 17.126 16.1563 18.371 17.7019 18.371Z" fill="#DDDBCC"/>
+</svg>
diff --git a/site/assets/animal-island/icons/wifi.svg b/site/assets/animal-island/icons/wifi.svg
new file mode 100644
index 00000000..c20507fc
--- /dev/null
+++ b/site/assets/animal-island/icons/wifi.svg
@@ -0,0 +1,9 @@
+<svg width="79" height="29" viewBox="0 0 79 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M41.5179 7.97865C39.0208 4.85882 35.6805 6.14902 34.4608 7.97865C33.4267 9.52884 29.7589 8.88529 30.3774 6.44079C31.621 1.52561 34.7843 0 38.7391 0C41.903 0 44.3136 3.23921 45.1234 4.85882C46.5924 6.89277 42.8826 9.68353 41.5179 7.97865Z" fill="#DDDBCC"/>
+<path d="M26.3646 17.797C23.8674 14.6772 20.5272 15.9674 19.3075 17.797C18.2734 19.3472 14.6056 18.7037 15.2241 16.2591C16.4677 11.344 19.6309 9.81836 23.5858 9.81836C26.7497 9.81836 29.1603 13.0576 29.9701 14.6772C31.439 16.7111 27.7292 19.5019 26.3646 17.797Z" fill="#DDDBCC"/>
+<path d="M41.5189 17.797C39.0217 14.6772 35.6815 15.9674 34.4618 17.797C33.4277 19.3472 29.7599 18.7037 30.3784 16.2591C31.622 11.344 34.7852 9.81836 38.7401 9.81836C41.904 9.81836 44.3146 13.0576 45.1244 14.6772C46.5933 16.7111 42.8835 19.5019 41.5189 17.797Z" fill="#DDDBCC"/>
+<path d="M11.2103 27.6154C8.71314 24.4955 5.37292 25.7857 4.15319 27.6154C3.11907 29.1656 -0.548691 28.522 0.0697887 26.0775C1.31337 21.1623 4.47664 19.6367 8.4315 19.6367C11.5954 19.6367 14.006 22.8759 14.8158 24.4955C16.2847 26.5295 12.5749 29.3202 11.2103 27.6154Z" fill="#DDDBCC"/>
+<path d="M26.3646 27.6154C23.8674 24.4955 20.5272 25.7857 19.3075 27.6154C18.2734 29.1656 14.6056 28.522 15.2241 26.0775C16.4677 21.1623 19.6309 19.6367 23.5858 19.6367C26.7497 19.6367 29.1603 22.8759 29.9701 24.4955C31.439 26.5295 27.7292 29.3202 26.3646 27.6154Z" fill="#DDDBCC"/>
+<path d="M41.5179 27.6154C39.0208 24.4955 35.6805 25.7857 34.4608 27.6154C33.4267 29.1656 29.7589 28.522 30.3774 26.0775C31.621 21.1623 34.7843 19.6367 38.7391 19.6367C41.903 19.6367 44.3136 22.8759 45.1234 24.4955C46.5924 26.5295 42.8826 29.3202 41.5179 27.6154Z" fill="#DDDBCC"/>
+<path d="M51.9187 15.4616C52.4711 15.9887 52.1489 16.5086 51.9187 16.7027C52.3416 17.2101 53.5107 17.9205 54.8046 16.7027C54.3896 14.9234 56.1563 11.8729 57.0916 10.5701C56.084 10.3247 54.1394 9.29462 54.4216 7.13807C55.1569 2.18582 59.8478 2.82086 62.1013 3.75741V7.13807H70.7012L71.0201 5.16791C72.1837 4.19828 74.9762 2.84079 76.8379 5.16791C78.6996 7.49503 78.5556 9.73903 78.2508 10.5701C78.2508 10.9303 77.7355 11.6506 75.6744 11.6506C78.5969 20.4271 74.4566 24.4375 72.0212 25.3456H59.3183C57.1585 25.3823 50.5691 19.2688 49.947 17.475C49.0685 16.5964 49.5809 15.7666 49.947 15.4616C50.3741 15.2419 51.3664 14.9344 51.9187 15.4616Z" fill="#DDDBCC"/>
+</svg>
diff --git a/site/data/packs.json b/site/data/packs.json
index aef7ad37..38b1673d 100644
--- a/site/data/packs.json
+++ b/site/data/packs.json
@@ -1,12 +1,12 @@
 {
   "schema_version": 1,
   "archive_layout": "trailmate-pack-v1",
-  "generated_at": "2026-05-09T03:51:33.335618Z",
+  "generated_at": "2026-05-19T06:23:34.333290Z",
   "packages": [
     {
       "id": "ar",
       "package_type": "locale-bundle",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "display_name": "Arabic",
       "summary": "Arabic review locale bundle with Naskh font coverage for RTL UI text and mixed-script content rendering; display-only until Arabic input is implemented.",
       "description": "Arabic locale bundle for Trail Mate.\n\nIncludes:\n- ar-naskh font (Noto Naskh Arabic, 16px, 2bpp)\n  Covers Arabic core (0600-06FF), Supplement (0750-077F),\n  Presentation Forms-A (FB50-FDFF) and Forms-B (FE70-FEFF)\n  for correct contextual letter shaping without HarfBuzz.\n- Arabic translations (ar locale)\n- RTL direction support (direction=rtl in manifest)\n- Display-only review status; Arabic input is not implemented yet\n\nFont dependency: tools/fonts/NotoNaskhArabic-Regular.otf",
@@ -55,9 +55,9 @@
       },
       "archive": {
         "layout": "trailmate-pack-v1",
-        "path": "assets/packs/ar-1.1.0.zip",
-        "size_bytes": 32415,
-        "sha256": "0c23d1a1a29d9ee01804d4018b87c302ed00566c09e18640a823c20410b3aa8f"
+        "path": "assets/packs/ar-1.1.1.zip",
+        "size_bytes": 32700,
+        "sha256": "3b2ec0d350168161e687fa2155d656fb36d38d6f7e288418dea7ed46fb8a2e7a"
       },
       "files": {
         "package_manifest": "package.ini",
@@ -68,7 +68,7 @@
     {
       "id": "europe-cyrillic-ext",
       "package_type": "locale-bundle",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "display_name": "European Cyrillic Extended",
       "summary": "Shared Cyrillic font coverage plus a Russian review locale pack; display-only until native review is complete.",
       "description": "European Cyrillic Extended installs the Russian locale together with a shared\nCyrillic external font pack so interface labels and Russian content can render\nwithout inflating the firmware image.\n\nThis bundle is display-only today. It does not add a Russian IME, and the locale\nremains in review status until native-language review is complete.\n\nCredits: Russian translations were contributed by polarikus, based on the\npolarikus/trail-mate Russian localization PR.",
@@ -119,9 +119,9 @@
       },
       "archive": {
         "layout": "trailmate-pack-v1",
-        "path": "assets/packs/europe-cyrillic-ext-1.1.0.zip",
-        "size_bytes": 15564,
-        "sha256": "e2afc57f55da1228178428f18447c452ea3036e3ef11953915b46c9de4ee36eb"
+        "path": "assets/packs/europe-cyrillic-ext-1.1.1.zip",
+        "size_bytes": 15883,
+        "sha256": "ba2a677fb3abc7e10b9e672eee429697049e4986a10401735af3c3cc291a2638"
       },
       "files": {
         "package_manifest": "package.ini",
@@ -132,7 +132,7 @@
     {
       "id": "europe-latin-ext",
       "package_type": "locale-bundle",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "display_name": "European Latin Extended",
       "summary": "Shared Latin-Extended font coverage plus German, Spanish, French, Italian, Dutch, Polish, and Portuguese review locale packs.",
       "description": "European Latin Extended adds a shared external font pack for common accented Latin text\nand installs locale packs for German, Spanish, French, Italian, Dutch, Polish, and\nPortuguese (Portugal).\n\nThis bundle is designed to stay lightweight while still rendering mixed-language contact\nnames, chat content, and localized UI labels cleanly across European languages. The\nlocales are review-status until native-language review is complete.",
@@ -248,9 +248,9 @@
       },
       "archive": {
         "layout": "trailmate-pack-v1",
-        "path": "assets/packs/europe-latin-ext-1.1.0.zip",
-        "size_bytes": 63949,
-        "sha256": "a87371e15c33ccfbeb08c7fef4c4b94e6a91cffd16370c55890ea292decb4d81"
+        "path": "assets/packs/europe-latin-ext-1.1.1.zip",
+        "size_bytes": 65761,
+        "sha256": "f3517d6d037326a3d6e1391c5d08ca9b15b57cff0251e8500c71b9b5699d987e"
       },
       "files": {
         "package_manifest": "package.ini",
@@ -261,7 +261,7 @@
     {
       "id": "ja",
       "package_type": "locale-bundle",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "display_name": "Japanese",
       "summary": "Japanese review locale bundle with external CJK font coverage for UI text and mixed-language content; display-only until Japanese input is implemented.",
       "description": "Japanese installs the ja locale together with the ja-cjk external font pack so menu text,\nlabels, and received Japanese content can render without inflating the firmware image.\n\nThis bundle is currently display-only. It does not add a Japanese IME yet, but it keeps\nJapanese coverage available as an installable package on SD storage.",
@@ -311,9 +311,9 @@
       },
       "archive": {
         "layout": "trailmate-pack-v1",
-        "path": "assets/packs/ja-1.1.0.zip",
-        "size_bytes": 19497,
-        "sha256": "24d2eac7276425ddb3fb7258b46a48d0ae850d2f650d908d48a81395e25db6fb"
+        "path": "assets/packs/ja-1.1.1.zip",
+        "size_bytes": 19770,
+        "sha256": "81566b99fcedea55f62343c45c07c779c47d5946bc5c1ad889c34c35ef17a3df"
       },
       "files": {
         "package_manifest": "package.ini",
@@ -324,7 +324,7 @@
     {
       "id": "ko",
       "package_type": "locale-bundle",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "display_name": "Korean",
       "summary": "Korean review locale bundle with external CJK font coverage for UI text and mixed-language content; display-only until Korean input is implemented.",
       "description": "Korean installs the ko locale together with the ko-cjk external font pack so interface\nlabels and Korean content can render correctly without carrying the glyph set in firmware.\n\nThis bundle is currently display-only. It does not add a Korean IME yet, but it keeps\nKorean support available as an installable SD package.",
@@ -374,9 +374,9 @@
       },
       "archive": {
         "layout": "trailmate-pack-v1",
-        "path": "assets/packs/ko-1.1.0.zip",
-        "size_bytes": 16312,
-        "sha256": "e666160147fdd97c71e80ee2b07981b88e0a8d9ec4cfc5e133a29b0d8a3d1c74"
+        "path": "assets/packs/ko-1.1.1.zip",
+        "size_bytes": 16579,
+        "sha256": "d38a6dd3b1c3b02dd1dd0c8affc10596f69a687dfbf95a0d74442bc4d7d80ff6"
       },
       "files": {
         "package_manifest": "package.ini",
@@ -387,7 +387,7 @@
     {
       "id": "zh-Hans",
       "package_type": "locale-bundle",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "display_name": "Simplified Chinese",
       "summary": "Tiered Simplified Chinese locale bundle with a fast core font, an on-demand extension font, and the built-in Pinyin IME backend.",
       "description": "Simplified Chinese installs the zh-Hans locale, a tiered two-pack font stack, and the\nzh-hans-pinyin IME registration used by the built-in Pinyin input backend.\n\nThe bundle ships:\n- zh-hans-core: the common-glyph UI/content font loaded first for fast startup and lower steady-state RAM use\n- zh-hans-ext: the remaining Chinese glyph coverage that the runtime can load on demand as a content supplement\n- zh-hans-pinyin: the built-in Pinyin IME registration layer\n\nUse this bundle when you want a Chinese interface, Chinese text entry, or reliable\nrendering of Chinese names and chat content while another locale remains active, without\npaying the full monolithic CJK font cost up front.",
@@ -450,9 +450,9 @@
       },
       "archive": {
         "layout": "trailmate-pack-v1",
-        "path": "assets/packs/zh-Hans-1.1.0.zip",
-        "size_bytes": 339707,
-        "sha256": "0a5f4f3db7d2dc563509e8da6ba77aa53dfe42fe1b0553a7ba4fad630bcfe194"
+        "path": "assets/packs/zh-Hans-1.1.1.zip",
+        "size_bytes": 339968,
+        "sha256": "cac31038da4ca4512f05c34ddb6cc0315d9a217f17b64f6bbf5581149f61b1bc"
       },
       "files": {
         "package_manifest": "package.ini",
@@ -463,7 +463,7 @@
     {
       "id": "zh-Hant",
       "package_type": "locale-bundle",
-      "version": "1.1.0",
+      "version": "1.1.1",
       "display_name": "Traditional Chinese (Taiwan)",
       "summary": "Traditional Chinese (Taiwan) review locale bundle with CJK font coverage; display-only until native review and a real Zhuyin-focused IME are available.",
       "description": "Traditional Chinese installs the zh-Hant locale together with the zh-hant-cjk external\nfont pack so the UI and mixed-language content can render Traditional Chinese correctly.\n\nThis bundle is display-focused today. It does not add a dedicated Traditional Chinese IME\nyet, but it keeps rendering support fully external to the firmware image.",
@@ -514,9 +514,9 @@
       },
       "archive": {
         "layout": "trailmate-pack-v1",
-        "path": "assets/packs/zh-Hant-1.1.0.zip",
-        "size_bytes": 19026,
-        "sha256": "55f5b4f6dc5e19d9097cfa90b9680b8288bc17d6a3b986e9053c2b009747a683"
+        "path": "assets/packs/zh-Hant-1.1.1.zip",
+        "size_bytes": 19264,
+        "sha256": "1d119629f87cbbdcfe67b758f746f3498de46586bb6fdba32c88b2e68de1302d"
       },
       "files": {
         "package_manifest": "package.ini",
diff --git a/site/index.html b/site/index.html
index c3a9abc7..0800385d 100644
--- a/site/index.html
+++ b/site/index.html
@@ -11,7 +11,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link
-      href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500&family=Space+Grotesk:wght@400;500;700&display=swap"
+      href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;500;600;700;800;900&family=Noto+Sans+SC:wght@400;500;700&family=Zen+Maru+Gothic:wght@400;500;700&display=swap"
       rel="stylesheet"
     >
     <link rel="icon" type="image/png" href="./assets/showcase/brand-logo.png">
@@ -35,346 +35,500 @@
           >
           <span class="brand-text">Trail Mate</span>
         </a>
-        <nav class="nav">
-          <a href="#overview">Overview</a>
-          <a href="#languages">Languages</a>
-          <a href="#webflasher">Web Flasher</a>
-          <a href="https://github.com/vicliu624/trail-mate">GitHub</a>
-          <a href="https://github.com/vicliu624/trail-mate/blob/main/README.md">Docs</a>
-          <a href="https://github.com/vicliu624/trail-mate/blob/main/README_CN.md">Chinese</a>
-        </nav>
+
+        <div class="top-actions" aria-label="Global actions">
+          <a class="top-link" href="https://github.com/vicliu624/trail-mate" data-i18n="top.github">
+            GitHub
+          </a>
+          <a class="top-link" href="https://github.com/vicliu624/trail-mate/wiki" data-i18n="top.wiki">
+            Wiki
+          </a>
+          <a class="top-link top-link-strong" href="#webflasher" data-i18n="top.flash">
+            Flash
+          </a>
+          <div class="language-toggle" role="group" aria-label="Language">
+            <button class="lang-button is-active" type="button" data-lang-choice="en" aria-pressed="true">
+              EN
+            </button>
+            <button class="lang-button" type="button" data-lang-choice="zh" aria-pressed="false">
+              中文
+            </button>
+          </div>
+        </div>
       </header>
 
-      <main>
-        <section class="hero">
-          <div class="hero-copy">
-            <p class="eyebrow">Offline Navigation + LoRa Communication</p>
-            <h1>Trail Mate turns ESP32 handhelds into field-ready offline tools.</h1>
-            <p class="lede">
-              A low-power firmware stack for outdoor navigation, GNSS diagnostics,
-              LoRa chat, installable multilingual UI support, team coordination,
-              and protocol interoperability on compact devices you can actually
-              carry into the field.
-            </p>
-            <div class="hero-actions">
-              <a class="button button-primary" href="#webflasher">Open Web Flasher</a>
-              <a class="button button-secondary" href="https://github.com/vicliu624/trail-mate">
-                View Repository
-              </a>
-            </div>
-          </div>
+      <div class="content-shell">
+        <aside class="sidebar" aria-label="Site navigation">
+          <p class="sidebar-label" data-i18n="side.label">Product Map</p>
+          <nav class="side-nav">
+            <a href="#overview" data-i18n="side.overview">Overview</a>
+            <a href="#capabilities" data-i18n="side.capabilities">Capabilities</a>
+            <details class="nav-group" open>
+              <summary data-i18n="side.devices">Devices</summary>
+              <button class="side-device is-active" type="button" data-device-nav="tlora-pager-sx1262">
+                <span>T-LoRa Pager</span>
+              </button>
+              <button class="side-device" type="button" data-device-nav="tdeck">
+                <span>T-Deck</span>
+              </button>
+              <button class="side-device" type="button" data-device-nav="lilygo-twatch-s3">
+                <span>T-Watch-S3</span>
+              </button>
+              <button class="side-device" type="button" data-device-nav="gat562-mesh-evb-pro">
+                <span>GAT562 EVB Pro</span>
+              </button>
+            </details>
+            <a href="#features" data-i18n="side.features">Feature Walkthrough</a>
+            <a href="#languages" data-i18n="side.languages">Language Packs</a>
+            <a href="#webflasher" data-i18n="side.flasher">Web Flasher</a>
+            <a href="#docs" data-i18n="side.docs">Docs</a>
+          </nav>
+        </aside>
 
-          <div class="hero-visual">
-            <div class="hero-screen">
-              <img
-                src="./assets/showcase/home-main.png"
-                alt="Trail Mate main menu screenshot"
-                loading="eager"
-              >
-            </div>
-            <div class="hero-note hero-note-release">
-              <p class="feature-kicker">Latest Release</p>
-              <p class="hero-note-value" data-release-version>Waiting for first tagged release</p>
-            </div>
-            <div class="hero-note hero-note-proof">
-              <p class="feature-kicker">Captured From Real UI</p>
-              <p class="hero-note-value">Every feature block below uses screens from the actual firmware.</p>
-            </div>
-          </div>
-        </section>
-
-        <section class="overview-ribbon" id="overview" aria-label="Project overview">
-          <p class="overview-copy">
-            Trail Mate is not a single-page radio demo. It is a compact offline field stack:
-            navigation, direct LoRa messaging, team coordination, RF diagnostics, and utility
-            tooling shaped for embedded hardware with tight power and UI constraints, now
-            with installable language packs that keep broader localization practical on
-            small devices.
-          </p>
-          <div class="overview-tags">
-            <span>Offline Maps</span>
-            <span>GNSS Diagnostics</span>
-            <span>Mesh Chat</span>
-            <span>Team Mode</span>
-            <span>Language Packs</span>
-            <span>Sub-GHz Scan</span>
-            <span>PC Link</span>
-          </div>
-        </section>
-
-        <section class="language-section" id="languages">
-          <div class="section-heading">
-            <div>
-              <p class="eyebrow">Localization</p>
-              <h2>0.1.25-alpha adds GPS receiver controls, diagnostics, and T-Deck UART noise guidance.</h2>
-            </div>
-            <p class="section-note">
-              The release keeps the installable language-pack catalog from 0.1.24-alpha and
-              adds clearer GPS setup paths for receiver baud, receiver profile, initialization
-              policy, diagnostics, and ordinary T-Deck hardware checks.
-            </p>
-          </div>
-
-          <div class="language-highlights">
-            <article class="language-highlight">
-              <p class="feature-kicker">Built-In Default</p>
-              <h3>English is always available.</h3>
-              <p>
-                The device can boot, recover, and stay usable even when no external language
-                packs are installed on the SD card.
+        <main class="main-content">
+          <section class="hero" id="overview">
+            <div class="hero-copy">
+              <p class="eyebrow" data-i18n="hero.eyebrow">Offline Navigation + LoRa Communication</p>
+              <h1>Trail Mate</h1>
+              <p class="hero-tagline" data-i18n="hero.tagline">
+                Field firmware for offline maps, LoRa messaging, and team coordination.
               </p>
-            </article>
-
-            <article class="language-highlight">
-              <p class="feature-kicker">Pack Catalog</p>
-              <h3><span data-pack-count>0</span> bundles covering <span data-locale-count>0</span> cataloged locales.</h3>
-              <p>
-                Locale, font, and real IME resources are shipped as packages so firmware builds
-                stay lean while the language surface can mature through review and release states.
+              <p class="lede" data-i18n="hero.lede">
+                A low-power firmware stack for outdoor navigation, GNSS diagnostics, LoRa chat,
+                installable multilingual UI support, team coordination, and protocol interoperability
+                on compact devices you can actually carry into the field.
               </p>
-            </article>
-
-            <article class="language-highlight">
-              <p class="feature-kicker">Release Gate</p>
-              <h3>Review packs are visible in the catalog but kept out of the runtime language picker.</h3>
-              <p>
-                The catalog carries translation status, archive hashes, and package versions so
-                updates are visible without pretending unfinished locales are ready.
-              </p>
-            </article>
-
-            <article class="language-highlight">
-              <p class="feature-kicker">Mixed-Script UI</p>
-              <h3>Localized chrome and multilingual content can coexist.</h3>
-              <p>
-                External font coverage lets menus, contact names, and chat content stay
-                readable across scripts without recompiling the whole firmware.
-              </p>
-            </article>
-          </div>
-
-          <div class="language-pack-grid" data-pack-grid>
-            <article class="language-pack-card language-pack-empty">
-              <p class="feature-kicker">Catalog</p>
-              <h3>Loading package catalog...</h3>
-              <p class="language-pack-summary">
-                Published locale bundles from the current Pages build will appear here.
-              </p>
-            </article>
-          </div>
-        </section>
-
-        <section class="overview-ribbon" aria-label="GPS release update">
-          <p class="overview-copy">
-            0.1.25-alpha separates GPS transport readiness from receiver health, exposes UART
-            traffic diagnostics in Settings, and documents the ordinary T-Deck case where LoRa TX
-            can induce non-NMEA bytes on a floating or weakly driven GPS UART RX line.
-          </p>
-          <div class="overview-tags">
-            <span>GPS Settings</span>
-            <span>Receiver Profiles</span>
-            <span>UART Diagnostics</span>
-            <span>T-Deck Hardware Notes</span>
-            <span>LoRa TX Noise Checks</span>
-          </div>
-        </section>
-
-        <section class="story-stack" aria-label="Feature walkthrough">
-          <article class="story-section">
-            <div class="story-copy">
-              <p class="eyebrow">Navigation</p>
-              <h2>Offline mapping is a first-class workflow, not an afterthought.</h2>
-              <p class="story-lede">
-                The navigation side is built around field use on constrained hardware:
-                north-up rendering, SD card map tiles, simple visual hierarchy, and fast
-                satellite diagnostics without overloading the screen.
-              </p>
-              <ul class="story-points">
-                <li>North-up map orientation keeps movement reading predictable while walking.</li>
-                <li>OSM, terrain, and satellite layers cover different outdoor planning needs.</li>
-                <li>Sky plot and fix diagnostics make GNSS quality visible instead of opaque.</li>
-                <li>Tracker history and breadcrumb awareness stay available on-device.</li>
-              </ul>
-            </div>
-            <div class="story-media story-media-navigation">
-              <figure class="shot shot-wide">
-                <img src="./assets/showcase/nav-map-osm.png" alt="Offline OSM map view" loading="lazy">
-              </figure>
-              <figure class="shot">
-                <img src="./assets/showcase/nav-map-terrain.png" alt="Terrain map layer" loading="lazy">
-              </figure>
-              <figure class="shot">
-                <img src="./assets/showcase/nav-map-satellite.png" alt="Satellite map layer" loading="lazy">
-              </figure>
-              <figure class="shot shot-panel">
-                <img src="./assets/showcase/nav-skyplot.png" alt="GNSS sky plot screen" loading="lazy">
-              </figure>
-            </div>
-          </article>
-
-          <article class="story-section story-section-alt">
-            <div class="story-copy">
-              <p class="eyebrow">Communication</p>
-              <h2>Messaging and team coordination stay practical under low bandwidth.</h2>
-              <p class="story-lede">
-                Trail Mate focuses on short-form communication that still works when latency,
-                packet loss, and limited input make smartphone assumptions unrealistic.
-              </p>
-              <ul class="story-points">
-                <li>Compose and review LoRa messages directly on-device without a phone dependency.</li>
-                <li>Meshtastic and MeshCore compatibility keep it interoperable with existing networks.</li>
-                <li>Contact discovery, recent activity, and quick actions reduce menu friction.</li>
-                <li>ESP-NOW pairing plus LoRa runtime gives small teams shared identity and map context.</li>
-              </ul>
-            </div>
-            <div class="story-media story-media-communication">
-              <figure class="shot shot-tall">
-                <img src="./assets/showcase/chat-compose.png" alt="Message compose interface" loading="lazy">
-              </figure>
-              <figure class="shot shot-panel">
-                <img src="./assets/showcase/chat-messages.png" alt="Message history screen" loading="lazy">
-              </figure>
-              <figure class="shot shot-panel">
-                <img src="./assets/showcase/chat-contacts.png" alt="Contacts screen" loading="lazy">
-              </figure>
-              <figure class="shot">
-                <img src="./assets/showcase/team-join.png" alt="Team join screen" loading="lazy">
-              </figure>
-              <figure class="shot shot-wide">
-                <img src="./assets/showcase/team-map.png" alt="Team map interface" loading="lazy">
-              </figure>
-            </div>
-          </article>
-
-          <article class="story-section">
-            <div class="story-copy">
-              <p class="eyebrow">Field Utilities</p>
-              <h2>The firmware expands into a toolkit: scan, decode, sync, and inspect.</h2>
-              <p class="story-lede">
-                The project is broader than chat and maps. It already includes utility surfaces
-                for RF awareness, host integration, SSTV experimentation, and route or track review.
-              </p>
-              <ul class="story-points">
-                <li>Energy Sweep exposes Sub-GHz occupancy for quick in-field channel planning.</li>
-                <li>SSTV receive and on-device decoding add a real experimental radio workflow.</li>
-                <li>PC Link exports structured device data over USB for downstream integration.</li>
-                <li>Tracker views keep recorded movement accessible on the device itself.</li>
-              </ul>
-            </div>
-            <div class="story-media story-media-utilities">
-              <figure class="shot shot-panel">
-                <img src="./assets/showcase/utility-spectrum.png" alt="Sub-GHz energy sweep view" loading="lazy">
-              </figure>
-              <figure class="shot">
-                <img src="./assets/showcase/utility-sstv-page.jpg" alt="SSTV receiver screen" loading="lazy">
-              </figure>
-              <figure class="shot">
-                <img src="./assets/showcase/utility-sstv-result.jpg" alt="SSTV decode result" loading="lazy">
-              </figure>
-              <figure class="shot shot-panel">
-                <img src="./assets/showcase/utility-data-exchange.png" alt="USB data exchange screen" loading="lazy">
-              </figure>
-              <figure class="shot shot-wide">
-                <img src="./assets/showcase/utility-tracker.png" alt="Tracker overview screen" loading="lazy">
-              </figure>
-            </div>
-          </article>
-        </section>
-
-        <section class="install-section" id="webflasher">
-          <div class="section-heading">
-            <div>
-              <p class="eyebrow">Install</p>
-              <h2>Web Flasher</h2>
-            </div>
-            <p class="section-note">
-              Use Google Chrome or Microsoft Edge over HTTPS with a USB data cable.
-              The browser installer currently targets the ESP32-S3 builds.
-            </p>
-          </div>
-
-          <div class="install-grid">
-            <article class="board-card" data-board-id="tlora-pager-sx1262">
-              <p class="board-chip">ESP32-S3</p>
-              <h3>LilyGo T-LoRa Pager</h3>
-              <p class="board-copy">SX1262 build for the keyboard pager hardware.</p>
-              <div class="board-install" data-install-slot>
-                <p class="board-hint">Checking release assets...</p>
+              <div class="hero-actions">
+                <a class="button button-primary" href="#webflasher" data-i18n="hero.primaryAction">
+                  Open Web Flasher
+                </a>
+                <a
+                  class="button button-secondary"
+                  href="https://github.com/vicliu624/trail-mate"
+                  data-i18n="hero.secondaryAction"
+                >
+                  View Repository
+                </a>
               </div>
-              <a class="release-link" data-release-link href="https://github.com/vicliu624/trail-mate/releases">
-                Open latest release
-              </a>
-            </article>
+            </div>
 
-            <article class="board-card" data-board-id="tdeck">
-              <p class="board-chip">ESP32-S3</p>
-              <h3>LilyGo T-Deck</h3>
-              <p class="board-copy">Keyboard + touch build tuned for the T-Deck layout.</p>
-              <div class="board-install" data-install-slot>
-                <p class="board-hint">Checking release assets...</p>
+            <div class="hero-visual">
+              <div class="hero-screen">
+                <img
+                  src="./assets/showcase/home-main.png"
+                  alt="Trail Mate main menu screenshot"
+                  loading="eager"
+                >
               </div>
-              <a class="release-link" data-release-link href="https://github.com/vicliu624/trail-mate/releases">
-                Open latest release
-              </a>
-            </article>
-
-            <article class="board-card" data-board-id="lilygo-twatch-s3">
-              <p class="board-chip">ESP32-S3</p>
-              <h3>LilyGo T-Watch-S3</h3>
-              <p class="board-copy">Touch-first watch build for compact field experiments.</p>
-              <div class="board-install" data-install-slot>
-                <p class="board-hint">Checking release assets...</p>
+              <div class="hero-note hero-note-release">
+                <p class="feature-kicker" data-i18n="hero.releaseKicker">Latest Release</p>
+                <p class="hero-note-value" data-release-version>Waiting for first tagged release</p>
               </div>
-              <a class="release-link" data-release-link href="https://github.com/vicliu624/trail-mate/releases">
-                Open latest release
-              </a>
-            </article>
-
-            <article class="board-card board-card-muted">
-              <p class="board-chip">nRF52</p>
-              <h3>GAT562 Mesh EVB Pro</h3>
-              <p class="board-copy">
-                Browser flashing is not wired up for the nRF52 target yet. Use the
-                release package for manual flashing instead.
-              </p>
-              <div class="board-install">
-                <p class="board-hint">
-                  Download the packaged firmware from the latest GitHub release.
+              <div class="hero-note hero-note-proof">
+                <p class="feature-kicker" data-i18n="hero.proofKicker">Screenshot Policy</p>
+                <p class="hero-note-value" data-i18n="hero.proofText">
+                  Device pages only claim screenshots that belong to that device. Pager is complete today; other devices get their own lanes as captures arrive.
                 </p>
               </div>
-              <a class="release-link" data-release-link href="https://github.com/vicliu624/trail-mate/releases">
-                Open latest release
-              </a>
-            </article>
-          </div>
-
-          <div class="workflow-note">
-            <p>1. Connect the device with a USB data cable.</p>
-            <p>2. Put the board into download mode if your hardware requires it.</p>
-            <p>3. Choose the correct target above and let the browser flash the merged image.</p>
-          </div>
-        </section>
-
-        <section class="links-section" id="docs">
-          <article>
-            <p class="feature-kicker">Read More</p>
-            <h2>Deeper guides now live in the project's wiki.</h2>
-            <p>
-              The homepage shows the product surface directly, while the project's wiki
-              carries the long-form material: architecture, supported hardware, flashing,
-              configuration, protocol boundaries, troubleshooting, and development notes.
-            </p>
-            <div class="hero-actions">
-              <a class="button button-secondary" href="https://github.com/vicliu624/trail-mate/wiki">
-                Wiki Home
-              </a>
-              <a class="button button-secondary" href="https://github.com/vicliu624/trail-mate/wiki/2.-Supported-Hardware">
-                Supported Hardware
-              </a>
             </div>
-          </article>
-        </section>
-      </main>
+          </section>
+
+          <section class="overview-ribbon" aria-label="Project overview">
+            <p class="overview-copy" data-i18n="overview.copy">
+              Trail Mate is a compact offline field stack: navigation, direct LoRa messaging,
+              team coordination, RF diagnostics, utility tooling, and installable language packs
+              shaped for embedded hardware with tight power and UI constraints.
+            </p>
+            <div class="overview-tags" aria-label="Core capabilities">
+              <span data-i18n="tag.maps">Offline Maps</span>
+              <span data-i18n="tag.gnss">GNSS Diagnostics</span>
+              <span data-i18n="tag.chat">Mesh Chat</span>
+              <span data-i18n="tag.team">Team Mode</span>
+              <span data-i18n="tag.languages">Language Packs</span>
+              <span data-i18n="tag.scan">Sub-GHz Scan</span>
+              <span data-i18n="tag.usb">PC Link</span>
+            </div>
+          </section>
+
+          <div class="animal-divider animal-divider-teal" aria-hidden="true"></div>
+
+          <section class="capability-section" id="capabilities">
+            <div class="section-heading">
+              <div>
+                <p class="eyebrow" data-i18n="capabilities.eyebrow">Capability Map</p>
+                <h2 data-i18n="capabilities.title">The homepage now has room for the whole product, not just a few screenshots.</h2>
+              </div>
+              <p class="section-note" data-i18n="capabilities.note">
+                These lanes make future growth explicit: each area can gain pages, captures, docs, release notes, and board-specific detail without overloading the top navigation.
+              </p>
+            </div>
+
+            <div class="capability-grid">
+              <article class="capability-card capability-device">
+                <p class="feature-kicker" data-i18n="capabilities.deviceKicker">Devices</p>
+                <h3 data-i18n="capabilities.deviceTitle">Board-owned product lanes</h3>
+                <p data-i18n="capabilities.deviceText">
+                  Every board can carry its own screenshots, interaction notes, install state, and hardware caveats.
+                </p>
+              </article>
+              <article class="capability-card capability-navigation">
+                <p class="feature-kicker" data-i18n="capabilities.navigationKicker">Navigation</p>
+                <h3 data-i18n="capabilities.navigationTitle">Offline map workflows</h3>
+                <p data-i18n="capabilities.navigationText">
+                  Map layers, GNSS diagnostics, route review, and tracker views stay grouped as field navigation.
+                </p>
+              </article>
+              <article class="capability-card capability-protocol">
+                <p class="feature-kicker" data-i18n="capabilities.protocolKicker">Protocols</p>
+                <h3 data-i18n="capabilities.protocolTitle">Mesh and radio compatibility</h3>
+                <p data-i18n="capabilities.protocolText">
+                  Meshtastic, MeshCore, LoRa runtime work, RF diagnostics, and future protocol notes have a dedicated lane.
+                </p>
+              </article>
+              <article class="capability-card capability-install">
+                <p class="feature-kicker" data-i18n="capabilities.installKicker">Install</p>
+                <h3 data-i18n="capabilities.installTitle">Release-first flashing</h3>
+                <p data-i18n="capabilities.installText">
+                  Web flashing, manual downloads, OTA assets, and per-board availability can evolve together.
+                </p>
+              </article>
+              <article class="capability-card capability-locale">
+                <p class="feature-kicker" data-i18n="capabilities.localeKicker">Localization</p>
+                <h3 data-i18n="capabilities.localeTitle">Installable language packs</h3>
+                <p data-i18n="capabilities.localeText">
+                  The site distinguishes homepage language switching from firmware language-pack releases.
+                </p>
+              </article>
+              <article class="capability-card capability-field">
+                <p class="feature-kicker" data-i18n="capabilities.fieldKicker">Field Tools</p>
+                <h3 data-i18n="capabilities.fieldTitle">Utilities beyond chat and maps</h3>
+                <p data-i18n="capabilities.fieldText">
+                  SSTV, Energy Sweep, USB data exchange, and diagnostics can become their own focused pages later.
+                </p>
+              </article>
+            </div>
+          </section>
+
+          <div class="animal-divider animal-divider-teal" aria-hidden="true"></div>
+
+          <section class="device-section" id="devices">
+            <div class="section-heading">
+              <div>
+                <p class="eyebrow" data-i18n="devices.eyebrow">Device Library</p>
+                <h2 data-i18n="devices.title">Each supported board gets its own product lane.</h2>
+              </div>
+              <p class="section-note" data-i18n="devices.note">
+                The left navigation is ready for a growing hardware catalog. Select a device to see its
+                release status, interaction notes, and only the screenshot set that belongs to that device.
+              </p>
+            </div>
+
+            <div class="device-browser">
+              <div class="device-switcher" role="tablist" aria-label="Supported devices">
+                <button class="device-tab is-active" type="button" data-device-target="tlora-pager-sx1262">
+                  <span>T-LoRa Pager</span>
+                  <small>ESP32-S3</small>
+                </button>
+                <button class="device-tab" type="button" data-device-target="tdeck">
+                  <span>T-Deck</span>
+                  <small>ESP32-S3</small>
+                </button>
+                <button class="device-tab" type="button" data-device-target="lilygo-twatch-s3">
+                  <span>T-Watch-S3</span>
+                  <small>ESP32-S3</small>
+                </button>
+                <button class="device-tab" type="button" data-device-target="gat562-mesh-evb-pro">
+                  <span>GAT562 EVB Pro</span>
+                  <small>nRF52</small>
+                </button>
+              </div>
+
+              <article class="device-stage" aria-live="polite">
+                <div class="device-stage-header">
+                  <div>
+                    <p class="feature-kicker" data-device-kicker>ESP32-S3</p>
+                    <h3 data-device-title>LilyGo T-LoRa Pager</h3>
+                    <p class="device-summary" data-device-summary>
+                      Keyboard pager target with the most complete captured UI surface today.
+                    </p>
+                  </div>
+                  <div class="device-status-card">
+                    <span data-device-status>Complete screenshot set</span>
+                  </div>
+                </div>
+
+                <div class="device-showcase">
+                  <figure class="device-main-shot">
+                    <img
+                      src="./assets/showcase/home-main.png"
+                      alt="T-LoRa Pager home launcher"
+                      data-device-main-image
+                    >
+                    <figcaption data-device-main-caption>Home launcher</figcaption>
+                  </figure>
+
+                  <div class="device-detail-panel">
+                    <p class="feature-kicker" data-i18n="devices.interactionKicker">Interaction Notes</p>
+                    <ul class="device-interactions" data-device-interactions></ul>
+                  </div>
+                </div>
+
+                <div class="device-thumb-grid" data-device-thumbs></div>
+              </article>
+            </div>
+          </section>
+
+          <div class="animal-divider animal-divider-teal" aria-hidden="true"></div>
+
+          <section class="story-stack" id="features" aria-label="Feature walkthrough">
+            <article class="story-section">
+              <div class="story-copy">
+                <p class="eyebrow" data-i18n="features.navEyebrow">Navigation</p>
+                <h2 data-i18n="features.navTitle">Offline mapping is a first-class workflow.</h2>
+                <p class="story-lede" data-i18n="features.navLead">
+                  North-up rendering, SD card map tiles, terrain and satellite layers, sky plot, and fix diagnostics
+                  keep field navigation readable on constrained hardware.
+                </p>
+              </div>
+              <div class="story-media">
+                <figure class="shot">
+                  <img src="./assets/showcase/nav-map-osm.png" alt="Offline OSM map view" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/nav-map-terrain.png" alt="Terrain map layer" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/nav-map-satellite.png" alt="Satellite map layer" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/nav-skyplot.png" alt="GNSS sky plot screen" loading="lazy">
+                </figure>
+              </div>
+            </article>
+
+            <article class="story-section">
+              <div class="story-copy">
+                <p class="eyebrow" data-i18n="features.commEyebrow">Communication</p>
+                <h2 data-i18n="features.commTitle">Messaging and team coordination stay practical under low bandwidth.</h2>
+                <p class="story-lede" data-i18n="features.commLead">
+                  Compose LoRa messages on-device, review contacts and activity, and keep small teams aligned without
+                  assuming a phone or cloud connection.
+                </p>
+              </div>
+              <div class="story-media">
+                <figure class="shot">
+                  <img src="./assets/showcase/chat-compose.png" alt="Message compose interface" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/chat-messages.png" alt="Message history screen" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/chat-contacts.png" alt="Contacts screen" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/team-map.png" alt="Team map interface" loading="lazy">
+                </figure>
+              </div>
+            </article>
+
+            <article class="story-section">
+              <div class="story-copy">
+                <p class="eyebrow" data-i18n="features.toolsEyebrow">Field Utilities</p>
+                <h2 data-i18n="features.toolsTitle">The firmware expands into a toolkit.</h2>
+                <p class="story-lede" data-i18n="features.toolsLead">
+                  Energy Sweep, SSTV receive, USB data exchange, and tracker views make the device useful beyond a
+                  single chat or map screen.
+                </p>
+              </div>
+              <div class="story-media">
+                <figure class="shot">
+                  <img src="./assets/showcase/utility-spectrum.png" alt="Sub-GHz energy sweep view" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/utility-sstv-page.jpg" alt="SSTV receiver screen" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/utility-data-exchange.png" alt="USB data exchange screen" loading="lazy">
+                </figure>
+                <figure class="shot">
+                  <img src="./assets/showcase/utility-tracker.png" alt="Tracker overview screen" loading="lazy">
+                </figure>
+              </div>
+            </article>
+          </section>
+
+          <div class="animal-divider animal-divider-teal" aria-hidden="true"></div>
+
+          <section class="language-section" id="languages">
+            <div class="section-heading">
+              <div>
+                <p class="eyebrow" data-i18n="languages.eyebrow">Localization</p>
+                <h2 data-i18n="languages.title">English stays built in; installable packs extend the interface.</h2>
+              </div>
+              <p class="section-note" data-i18n="languages.note">
+                The homepage itself now switches between English and Chinese. On-device language packs remain release
+                artifacts, with review status visible instead of hidden.
+              </p>
+            </div>
+
+            <div class="language-highlights">
+              <article class="language-highlight">
+                <p class="feature-kicker" data-i18n="languages.defaultKicker">Built-In Default</p>
+                <h3 data-i18n="languages.defaultTitle">English is always available.</h3>
+                <p data-i18n="languages.defaultText">
+                  The device can boot, recover, and stay usable even when no external language packs are installed.
+                </p>
+              </article>
+
+              <article class="language-highlight">
+                <p class="feature-kicker" data-i18n="languages.catalogKicker">Pack Catalog</p>
+                <h3>
+                  <span data-pack-count>0</span>
+                  <span data-i18n="languages.bundleSuffix">bundles covering</span>
+                  <span data-locale-count>0</span>
+                  <span data-i18n="languages.localeSuffix">cataloged locales.</span>
+                </h3>
+                <p data-i18n="languages.catalogText">
+                  Locale, font, and IME resources are shipped as packages so firmware builds stay lean.
+                </p>
+              </article>
+
+              <article class="language-highlight">
+                <p class="feature-kicker" data-i18n="languages.gateKicker">Release Gate</p>
+                <h3 data-i18n="languages.gateTitle">Review packs are visible but not treated as finished UI choices.</h3>
+                <p data-i18n="languages.gateText">
+                  Package metadata carries translation status, archive hashes, and package versions for every release.
+                </p>
+              </article>
+            </div>
+
+            <div class="language-pack-grid" data-pack-grid>
+              <article class="language-pack-card language-pack-empty">
+                <p class="feature-kicker" data-i18n="languages.loadingKicker">Catalog</p>
+                <h3 data-i18n="languages.loadingTitle">Loading package catalog...</h3>
+                <p class="language-pack-summary" data-i18n="languages.loadingText">
+                  Published locale bundles from the current Pages build will appear here.
+                </p>
+              </article>
+            </div>
+          </section>
+
+          <section class="install-section" id="webflasher">
+            <div class="section-heading">
+              <div>
+                <p class="eyebrow" data-i18n="install.eyebrow">Install</p>
+                <h2 data-i18n="install.title">Web Flasher</h2>
+              </div>
+              <p class="section-note" data-i18n="install.note">
+                Use Google Chrome or Microsoft Edge over HTTPS with a USB data cable.
+                The browser installer currently targets the ESP32-S3 builds.
+              </p>
+            </div>
+
+            <div class="install-grid">
+              <article class="board-card" data-board-id="tlora-pager-sx1262">
+                <p class="board-chip">ESP32-S3</p>
+                <h3>LilyGo T-LoRa Pager</h3>
+                <p class="board-copy" data-i18n="install.pagerCopy">SX1262 build for the keyboard pager hardware.</p>
+                <div class="board-install" data-install-slot>
+                  <p class="board-hint" data-i18n="install.checking">Checking release assets...</p>
+                </div>
+                <a class="release-link" data-release-link href="https://github.com/vicliu624/trail-mate/releases" data-i18n="install.openRelease">
+                  Open latest release
+                </a>
+              </article>
+
+              <article class="board-card" data-board-id="tdeck">
+                <p class="board-chip">ESP32-S3</p>
+                <h3>LilyGo T-Deck</h3>
+                <p class="board-copy" data-i18n="install.tdeckCopy">Keyboard + touch build tuned for the T-Deck layout.</p>
+                <div class="board-install" data-install-slot>
+                  <p class="board-hint" data-i18n="install.checking">Checking release assets...</p>
+                </div>
+                <a class="release-link" data-release-link href="https://github.com/vicliu624/trail-mate/releases" data-i18n="install.openRelease">
+                  Open latest release
+                </a>
+              </article>
+
+              <article class="board-card" data-board-id="lilygo-twatch-s3">
+                <p class="board-chip">ESP32-S3</p>
+                <h3>LilyGo T-Watch-S3</h3>
+                <p class="board-copy" data-i18n="install.twatchCopy">Touch-first watch build for compact field experiments.</p>
+                <div class="board-install" data-install-slot>
+                  <p class="board-hint" data-i18n="install.checking">Checking release assets...</p>
+                </div>
+                <a class="release-link" data-release-link href="https://github.com/vicliu624/trail-mate/releases" data-i18n="install.openRelease">
+                  Open latest release
+                </a>
+              </article>
+
+              <article class="board-card board-card-muted">
+                <p class="board-chip">nRF52</p>
+                <h3>GAT562 Mesh EVB Pro</h3>
+                <p class="board-copy" data-i18n="install.gatCopy">
+                  Browser flashing is not wired up for the nRF52 target yet. Use the release package for manual flashing.
+                </p>
+                <div class="board-install">
+                  <p class="board-hint" data-i18n="install.gatHint">
+                    Download the packaged firmware from the latest GitHub release.
+                  </p>
+                </div>
+                <a class="release-link" data-release-link href="https://github.com/vicliu624/trail-mate/releases" data-i18n="install.openRelease">
+                  Open latest release
+                </a>
+              </article>
+            </div>
+
+            <div class="workflow-note">
+              <p data-i18n="install.step1">1. Connect the device with a USB data cable.</p>
+              <p data-i18n="install.step2">2. Put the board into download mode if your hardware requires it.</p>
+              <p data-i18n="install.step3">3. Choose the correct target and let the browser flash the merged image.</p>
+            </div>
+          </section>
+
+          <section class="links-section" id="docs">
+            <article>
+              <p class="feature-kicker" data-i18n="docs.eyebrow">Read More</p>
+              <h2 data-i18n="docs.title">Long-form project material belongs in the wiki.</h2>
+              <p data-i18n="docs.copy">
+                The homepage is now a product surface and device library. The wiki carries architecture,
+                supported hardware, flashing, configuration, protocol boundaries, troubleshooting, and development notes.
+              </p>
+              <div class="hero-actions">
+                <a class="button button-secondary" href="https://github.com/vicliu624/trail-mate/wiki" data-i18n="docs.wiki">
+                  Wiki Home
+                </a>
+                <a
+                  class="button button-secondary"
+                  href="https://github.com/vicliu624/trail-mate/wiki/2.-Supported-Hardware"
+                  data-i18n="docs.hardware"
+                >
+                  Supported Hardware
+                </a>
+              </div>
+            </article>
+          </section>
+        </main>
+      </div>
+
+      <footer class="site-footer">
+        <div class="site-footer-card">
+          <div>
+            <p class="feature-kicker" data-i18n="footer.eyebrow">Trail Mate Field Notes</p>
+            <h2 data-i18n="footer.title">Built for the quiet work between signal and terrain.</h2>
+            <p data-i18n="footer.copy">
+              Follow the repository for releases, device captures, hardware notes, and language-pack updates as the
+              project grows beyond a single board.
+            </p>
+          </div>
+          <div class="site-footer-links">
+            <a href="https://github.com/vicliu624/trail-mate" data-i18n="footer.repo">Repository</a>
+            <a href="https://github.com/vicliu624/trail-mate/releases" data-i18n="footer.releases">Releases</a>
+            <a href="https://github.com/vicliu624/trail-mate/wiki" data-i18n="footer.wiki">Wiki</a>
+          </div>
+        </div>
+        <div class="animal-footer-art" aria-hidden="true"></div>
+      </footer>
     </div>
   </body>
 </html>
diff --git a/site/main.js b/site/main.js
index 6890c849..6348c67d 100644
--- a/site/main.js
+++ b/site/main.js
@@ -4,23 +4,508 @@ const boardCards = document.querySelectorAll("[data-board-id]");
 const packGrid = document.querySelector("[data-pack-grid]");
 const packCountEls = document.querySelectorAll("[data-pack-count]");
 const localeCountEls = document.querySelectorAll("[data-locale-count]");
+const languageButtons = document.querySelectorAll("[data-lang-choice]");
+const i18nEls = document.querySelectorAll("[data-i18n]");
+const deviceNavButtons = document.querySelectorAll("[data-device-nav]");
+const deviceTabButtons = document.querySelectorAll("[data-device-target]");
+const deviceThumbGrid = document.querySelector("[data-device-thumbs]");
+const deviceMainImage = document.querySelector("[data-device-main-image]");
+const deviceMainCaption = document.querySelector("[data-device-main-caption]");
+const deviceTitle = document.querySelector("[data-device-title]");
+const deviceKicker = document.querySelector("[data-device-kicker]");
+const deviceSummary = document.querySelector("[data-device-summary]");
+const deviceStatus = document.querySelector("[data-device-status]");
+const deviceInteractions = document.querySelector("[data-device-interactions]");
 
-function setReleaseVersion(text) {
-  releaseVersionEls.forEach((element) => {
-    element.textContent = text;
-  });
+const I18N = {
+  en: {
+    "top.github": "GitHub",
+    "top.wiki": "Wiki",
+    "top.flash": "Flash",
+    "side.label": "Product Map",
+    "side.overview": "Overview",
+    "side.capabilities": "Capabilities",
+    "side.devices": "Devices",
+    "side.features": "Feature Walkthrough",
+    "side.languages": "Language Packs",
+    "side.flasher": "Web Flasher",
+    "side.docs": "Docs",
+    "hero.eyebrow": "Offline Navigation + LoRa Communication",
+    "hero.tagline": "Field firmware for offline maps, LoRa messaging, and team coordination.",
+    "hero.lede":
+      "A low-power firmware stack for outdoor navigation, GNSS diagnostics, LoRa chat, installable multilingual UI support, team coordination, and protocol interoperability on compact devices you can actually carry into the field.",
+    "hero.primaryAction": "Open Web Flasher",
+    "hero.secondaryAction": "View Repository",
+    "hero.releaseKicker": "Latest Release",
+    "hero.proofKicker": "Screenshot Policy",
+    "hero.proofText":
+      "Device pages only claim screenshots that belong to that device. Pager is complete today; other devices get their own lanes as captures arrive.",
+    "overview.copy":
+      "Trail Mate is a compact offline field stack: navigation, direct LoRa messaging, team coordination, RF diagnostics, utility tooling, and installable language packs shaped for embedded hardware with tight power and UI constraints.",
+    "tag.maps": "Offline Maps",
+    "tag.gnss": "GNSS Diagnostics",
+    "tag.chat": "Mesh Chat",
+    "tag.team": "Team Mode",
+    "tag.languages": "Language Packs",
+    "tag.scan": "Sub-GHz Scan",
+    "tag.usb": "PC Link",
+    "capabilities.eyebrow": "Capability Map",
+    "capabilities.title": "The homepage now has room for the whole product, not just a few screenshots.",
+    "capabilities.note":
+      "These lanes make future growth explicit: each area can gain pages, captures, docs, release notes, and board-specific detail without overloading the top navigation.",
+    "capabilities.deviceKicker": "Devices",
+    "capabilities.deviceTitle": "Board-owned product lanes",
+    "capabilities.deviceText":
+      "Every board can carry its own screenshots, interaction notes, install state, and hardware caveats.",
+    "capabilities.navigationKicker": "Navigation",
+    "capabilities.navigationTitle": "Offline map workflows",
+    "capabilities.navigationText":
+      "Map layers, GNSS diagnostics, route review, and tracker views stay grouped as field navigation.",
+    "capabilities.protocolKicker": "Protocols",
+    "capabilities.protocolTitle": "Mesh and radio compatibility",
+    "capabilities.protocolText":
+      "Meshtastic, MeshCore, LoRa runtime work, RF diagnostics, and future protocol notes have a dedicated lane.",
+    "capabilities.installKicker": "Install",
+    "capabilities.installTitle": "Release-first flashing",
+    "capabilities.installText":
+      "Web flashing, manual downloads, OTA assets, and per-board availability can evolve together.",
+    "capabilities.localeKicker": "Localization",
+    "capabilities.localeTitle": "Installable language packs",
+    "capabilities.localeText":
+      "The site distinguishes homepage language switching from firmware language-pack releases.",
+    "capabilities.fieldKicker": "Field Tools",
+    "capabilities.fieldTitle": "Utilities beyond chat and maps",
+    "capabilities.fieldText":
+      "SSTV, Energy Sweep, USB data exchange, and diagnostics can become their own focused pages later.",
+    "devices.eyebrow": "Device Library",
+    "devices.title": "Each supported board gets its own product lane.",
+    "devices.note":
+      "The left navigation is ready for a growing hardware catalog. Select a device to see its release status, interaction notes, and only the screenshot set that belongs to that device.",
+    "devices.interactionKicker": "Interaction Notes",
+    "features.navEyebrow": "Navigation",
+    "features.navTitle": "Offline mapping is a first-class workflow.",
+    "features.navLead":
+      "North-up rendering, SD card map tiles, terrain and satellite layers, sky plot, and fix diagnostics keep field navigation readable on constrained hardware.",
+    "features.commEyebrow": "Communication",
+    "features.commTitle": "Messaging and team coordination stay practical under low bandwidth.",
+    "features.commLead":
+      "Compose LoRa messages on-device, review contacts and activity, and keep small teams aligned without assuming a phone or cloud connection.",
+    "features.toolsEyebrow": "Field Utilities",
+    "features.toolsTitle": "The firmware expands into a toolkit.",
+    "features.toolsLead":
+      "Energy Sweep, SSTV receive, USB data exchange, and tracker views make the device useful beyond a single chat or map screen.",
+    "languages.eyebrow": "Localization",
+    "languages.title": "English stays built in; installable packs extend the interface.",
+    "languages.note":
+      "The homepage itself now switches between English and Chinese. On-device language packs remain release artifacts, with review status visible instead of hidden.",
+    "languages.defaultKicker": "Built-In Default",
+    "languages.defaultTitle": "English is always available.",
+    "languages.defaultText":
+      "The device can boot, recover, and stay usable even when no external language packs are installed.",
+    "languages.catalogKicker": "Pack Catalog",
+    "languages.bundleSuffix": "bundles covering",
+    "languages.localeSuffix": "cataloged locales.",
+    "languages.catalogText":
+      "Locale, font, and IME resources are shipped as packages so firmware builds stay lean.",
+    "languages.gateKicker": "Release Gate",
+    "languages.gateTitle": "Review packs are visible but not treated as finished UI choices.",
+    "languages.gateText":
+      "Package metadata carries translation status, archive hashes, and package versions for every release.",
+    "languages.loadingKicker": "Catalog",
+    "languages.loadingTitle": "Loading package catalog...",
+    "languages.loadingText": "Published locale bundles from the current Pages build will appear here.",
+    "install.eyebrow": "Install",
+    "install.title": "Web Flasher",
+    "install.note":
+      "Use Google Chrome or Microsoft Edge over HTTPS with a USB data cable. The browser installer currently targets the ESP32-S3 builds.",
+    "install.pagerCopy": "SX1262 build for the keyboard pager hardware.",
+    "install.tdeckCopy": "Keyboard + touch build tuned for the T-Deck layout.",
+    "install.twatchCopy": "Touch-first watch build for compact field experiments.",
+    "install.gatCopy":
+      "Browser flashing is not wired up for the nRF52 target yet. Use the release package for manual flashing.",
+    "install.gatHint": "Download the packaged firmware from the latest GitHub release.",
+    "install.checking": "Checking release assets...",
+    "install.openRelease": "Open latest release",
+    "install.step1": "1. Connect the device with a USB data cable.",
+    "install.step2": "2. Put the board into download mode if your hardware requires it.",
+    "install.step3": "3. Choose the correct target and let the browser flash the merged image.",
+    "docs.eyebrow": "Read More",
+    "docs.title": "Long-form project material belongs in the wiki.",
+    "docs.copy":
+      "The homepage is now a product surface and device library. The wiki carries architecture, supported hardware, flashing, configuration, protocol boundaries, troubleshooting, and development notes.",
+    "docs.wiki": "Wiki Home",
+    "docs.hardware": "Supported Hardware",
+    "footer.eyebrow": "Trail Mate Field Notes",
+    "footer.title": "Built for the quiet work between signal and terrain.",
+    "footer.copy":
+      "Follow the repository for releases, device captures, hardware notes, and language-pack updates as the project grows beyond a single board.",
+    "footer.repo": "Repository",
+    "footer.releases": "Releases",
+    "footer.wiki": "Wiki",
+    "release.waiting": "Waiting for first tagged release",
+    "release.ready": "{tag} ready for install",
+    "release.unavailable": "Release metadata unavailable",
+    "flasher.activate": "Flash In Browser",
+    "flasher.unsupported": "Use Chrome or Edge on desktop with Web Serial enabled.",
+    "flasher.notAllowed": "Open this page over HTTPS to use the web flasher.",
+    "flasher.readyNote": "Merged firmware image from the latest published release.",
+    "flasher.missingAsset":
+      "This board is missing web flasher assets in the latest release. Use the manual download for now.",
+    "flasher.pending": "Web flasher assets will appear here after the first tagged release is published.",
+    "flasher.error":
+      "Could not load release metadata. Open the GitHub release page for manual downloads.",
+    "pack.release": "Release Bundle",
+    "pack.review": "Review Bundle",
+    "pack.locale": "locale",
+    "pack.locales": "locales",
+    "pack.font": "font pack",
+    "pack.fonts": "font packs",
+    "pack.ime": "IME",
+    "pack.imes": "IMEs",
+    "pack.download": "Download package",
+    "pack.emptyTitle": "No published language bundles yet.",
+    "pack.emptyText": "Pages will show locale bundles here after the package catalog is generated.",
+    "pack.errorTitle": "Language catalog unavailable",
+    "pack.errorText": "The homepage could not load the published language-pack metadata right now.",
+    "device.emptyTitle": "Dedicated screenshot lane reserved.",
+    "device.emptyText":
+      "This device has a product entry and release path, but its own screen capture set has not been added yet.",
+  },
+  zh: {
+    "top.github": "GitHub",
+    "top.wiki": "维基",
+    "top.flash": "刷机",
+    "side.label": "产品地图",
+    "side.overview": "概览",
+    "side.capabilities": "能力地图",
+    "side.devices": "设备",
+    "side.features": "功能走查",
+    "side.languages": "语言包",
+    "side.flasher": "网页刷机",
+    "side.docs": "文档",
+    "hero.eyebrow": "离线导航 + LoRa 通信",
+    "hero.tagline": "面向离线地图、LoRa 消息和团队协作的户外固件。",
+    "hero.lede":
+      "Trail Mate 是一个低功耗手持固件栈，覆盖户外导航、GNSS 诊断、LoRa 聊天、可安装多语言 UI、团队协作和多协议互通，目标是能真正带到现场使用的小型设备。",
+    "hero.primaryAction": "打开网页刷机",
+    "hero.secondaryAction": "查看仓库",
+    "hero.releaseKicker": "最新发布",
+    "hero.proofKicker": "截图规则",
+    "hero.proofText":
+      "设备页只展示属于该设备的截图。当前 Pager 截图集较完整，其他设备先保留独立入口，后续补充各自截图。",
+    "overview.copy":
+      "Trail Mate 是一个紧凑的离线现场工具栈：导航、LoRa 直连消息、团队协作、射频诊断、实用工具，以及面向小内存硬件的可安装语言包。",
+    "tag.maps": "离线地图",
+    "tag.gnss": "GNSS 诊断",
+    "tag.chat": "网格聊天",
+    "tag.team": "团队模式",
+    "tag.languages": "语言包",
+    "tag.scan": "Sub-GHz 扫描",
+    "tag.usb": "PC 连接",
+    "capabilities.eyebrow": "能力地图",
+    "capabilities.title": "官网现在可以承载整个产品，而不只是几张截图。",
+    "capabilities.note":
+      "这些板块把未来增长显式分开：每个区域都能继续加入页面、截图、文档、发布说明和板卡细节，而不挤爆顶部导航。",
+    "capabilities.deviceKicker": "设备",
+    "capabilities.deviceTitle": "板卡自己的产品入口",
+    "capabilities.deviceText": "每个板卡都可以拥有自己的截图、交互说明、安装状态和硬件注意事项。",
+    "capabilities.navigationKicker": "导航",
+    "capabilities.navigationTitle": "离线地图工作流",
+    "capabilities.navigationText": "地图图层、GNSS 诊断、路线回看和轨迹视图都归入现场导航。",
+    "capabilities.protocolKicker": "协议",
+    "capabilities.protocolTitle": "网格与电台兼容",
+    "capabilities.protocolText": "Meshtastic、MeshCore、LoRa 运行时、射频诊断和未来协议说明都有独立入口。",
+    "capabilities.installKicker": "安装",
+    "capabilities.installTitle": "围绕发布产物的刷机",
+    "capabilities.installText": "网页刷机、手动下载、OTA 资产和每个板卡的可用状态可以一起演进。",
+    "capabilities.localeKicker": "本地化",
+    "capabilities.localeTitle": "可安装语言包",
+    "capabilities.localeText": "官网语言切换和设备端固件语言包发布被明确区分。",
+    "capabilities.fieldKicker": "现场工具",
+    "capabilities.fieldTitle": "聊天和地图之外的工具",
+    "capabilities.fieldText": "SSTV、Energy Sweep、USB 数据交换和诊断后续都可以成为独立页面。",
+    "devices.eyebrow": "设备库",
+    "devices.title": "每个受支持的板卡都有自己的产品入口。",
+    "devices.note":
+      "左侧导航已经按长期硬件目录设计。选择设备后，可以看到发布状态、交互说明，以及只属于该设备的截图集。",
+    "devices.interactionKicker": "交互说明",
+    "features.navEyebrow": "导航",
+    "features.navTitle": "离线地图是一条主工作流。",
+    "features.navLead":
+      "北向地图、SD 卡瓦片、地形与卫星图层、天空图和定位质量诊断，让受限硬件上的现场导航仍然清晰可读。",
+    "features.commEyebrow": "通信",
+    "features.commTitle": "消息和团队协作在低带宽下仍保持实用。",
+    "features.commLead":
+      "设备端直接编写 LoRa 消息、查看联系人与活动记录，并在不依赖手机或云端的情况下保持小队同步。",
+    "features.toolsEyebrow": "现场工具",
+    "features.toolsTitle": "固件正在扩展成一套工具箱。",
+    "features.toolsLead":
+      "Energy Sweep、SSTV 接收、USB 数据交换和轨迹查看，让设备不只是聊天或地图单页。",
+    "languages.eyebrow": "本地化",
+    "languages.title": "英文内置可用，安装式语言包扩展界面。",
+    "languages.note":
+      "官网现在支持英文和中文切换。设备端语言包仍作为发布产物管理，复核状态会明确展示。",
+    "languages.defaultKicker": "内置默认",
+    "languages.defaultTitle": "英文始终可用。",
+    "languages.defaultText": "即使没有安装外部语言包，设备也可以启动、恢复并保持可用。",
+    "languages.catalogKicker": "语言包目录",
+    "languages.bundleSuffix": "个包，覆盖",
+    "languages.localeSuffix": "个目录语言。",
+    "languages.catalogText": "语言、字体和输入法资源以包形式发布，让固件镜像保持精简。",
+    "languages.gateKicker": "发布门禁",
+    "languages.gateTitle": "复核语言包可见，但不会被假装成已完成的 UI 选择。",
+    "languages.gateText": "包元数据会记录翻译状态、归档哈希和版本信息。",
+    "languages.loadingKicker": "目录",
+    "languages.loadingTitle": "正在加载语言包目录...",
+    "languages.loadingText": "当前 Pages 构建发布的语言包会显示在这里。",
+    "install.eyebrow": "安装",
+    "install.title": "网页刷机",
+    "install.note": "请使用 Google Chrome 或 Microsoft Edge，通过 HTTPS 和 USB 数据线刷写。目前网页刷机目标是 ESP32-S3 构建。",
+    "install.pagerCopy": "面向键盘 Pager 硬件的 SX1262 构建。",
+    "install.tdeckCopy": "面向 T-Deck 键盘 + 触屏布局调校的构建。",
+    "install.twatchCopy": "面向紧凑触屏手表实验的构建。",
+    "install.gatCopy": "nRF52 目标暂未接入浏览器刷机，请使用发布包手动刷写。",
+    "install.gatHint": "从最新 GitHub Release 下载打包固件。",
+    "install.checking": "正在检查发布产物...",
+    "install.openRelease": "打开最新发布",
+    "install.step1": "1. 使用 USB 数据线连接设备。",
+    "install.step2": "2. 如果硬件需要，请先进入下载模式。",
+    "install.step3": "3. 选择正确目标，让浏览器刷写合并镜像。",
+    "docs.eyebrow": "继续阅读",
+    "docs.title": "长篇项目资料放在维基中。",
+    "docs.copy":
+      "官网现在作为产品展示面和设备库。架构、支持硬件、刷机、配置、协议边界、排障和开发笔记由维基承载。",
+    "docs.wiki": "维基首页",
+    "docs.hardware": "支持硬件",
+    "footer.eyebrow": "Trail Mate 现场笔记",
+    "footer.title": "为信号与地形之间那些安静但重要的工作而做。",
+    "footer.copy":
+      "关注仓库即可获取发布、设备截图、硬件说明和语言包更新。这个项目会继续超出单一板卡。",
+    "footer.repo": "仓库",
+    "footer.releases": "发布",
+    "footer.wiki": "维基",
+    "release.waiting": "等待首个带标签发布",
+    "release.ready": "{tag} 可安装",
+    "release.unavailable": "无法加载发布信息",
+    "flasher.activate": "在浏览器中刷机",
+    "flasher.unsupported": "请使用支持 Web Serial 的桌面版 Chrome 或 Edge。",
+    "flasher.notAllowed": "请通过 HTTPS 打开页面以使用网页刷机。",
+    "flasher.readyNote": "来自最新发布的合并固件镜像。",
+    "flasher.missingAsset": "最新发布中缺少此板卡的网页刷机产物，请暂时手动下载。",
+    "flasher.pending": "首个带标签发布完成后，网页刷机产物会显示在这里。",
+    "flasher.error": "无法加载发布信息。请打开 GitHub Release 页面手动下载。",
+    "pack.release": "正式包",
+    "pack.review": "复核包",
+    "pack.locale": "个语言",
+    "pack.locales": "个语言",
+    "pack.font": "个字体包",
+    "pack.fonts": "个字体包",
+    "pack.ime": "个输入法",
+    "pack.imes": "个输入法",
+    "pack.download": "下载语言包",
+    "pack.emptyTitle": "还没有发布语言包。",
+    "pack.emptyText": "包目录生成后，Pages 会在这里展示语言包。",
+    "pack.errorTitle": "语言包目录不可用",
+    "pack.errorText": "官网当前无法加载已发布的语言包元数据。",
+    "device.emptyTitle": "已预留专属截图位。",
+    "device.emptyText": "该设备已有产品入口和发布路径，但还没有加入属于它自己的屏幕截图集。",
+  },
+};
+
+const PACK_NAME_ZH = {
+  ar: "阿拉伯语",
+  "europe-cyrillic-ext": "欧洲西里尔扩展",
+  "europe-latin-ext": "欧洲拉丁扩展",
+  ja: "日语",
+  ko: "韩语",
+  "zh-Hans": "简体中文",
+  "zh-Hant": "繁体中文（台湾）",
+};
+
+const DEVICES = [
+  {
+    id: "tlora-pager-sx1262",
+    chip: "ESP32-S3 + SX1262",
+    title: {
+      en: "LilyGo T-LoRa Pager",
+      zh: "LilyGo T-LoRa Pager",
+    },
+    status: {
+      en: "Complete screenshot set",
+      zh: "完整截图集",
+    },
+    summary: {
+      en: "Keyboard pager target with the most complete captured UI surface today.",
+      zh: "当前截图素材最完整的键盘 Pager 目标。",
+    },
+    interactions: {
+      en: [
+        "Use the thumbnail strip to switch between the captured Pager workflows.",
+        "The gallery keeps every screenshot in the same 480:222 screen frame so image sizes stay calm.",
+        "Navigation, chat, team mode, and utility screens are separated as device-owned captures.",
+      ],
+      zh: [
+        "点击缩略图可以切换 Pager 已捕获的工作流。",
+        "图库统一使用 480:222 屏幕框，避免截图大小忽大忽小。",
+        "导航、聊天、团队模式和工具页都作为该设备自己的截图展示。",
+      ],
+    },
+    screenshots: [
+      {
+        src: "./assets/showcase/home-main.png",
+        title: { en: "Home launcher", zh: "主菜单" },
+        alt: { en: "T-LoRa Pager home launcher", zh: "T-LoRa Pager 主菜单" },
+      },
+      {
+        src: "./assets/showcase/nav-map-osm.png",
+        title: { en: "Offline OSM map", zh: "离线 OSM 地图" },
+        alt: { en: "T-LoRa Pager OSM map screen", zh: "T-LoRa Pager OSM 地图界面" },
+      },
+      {
+        src: "./assets/showcase/nav-map-terrain.png",
+        title: { en: "Terrain map", zh: "地形地图" },
+        alt: { en: "T-LoRa Pager terrain map screen", zh: "T-LoRa Pager 地形地图界面" },
+      },
+      {
+        src: "./assets/showcase/nav-skyplot.png",
+        title: { en: "GNSS sky plot", zh: "GNSS 天空图" },
+        alt: { en: "T-LoRa Pager GNSS sky plot screen", zh: "T-LoRa Pager GNSS 天空图界面" },
+      },
+      {
+        src: "./assets/showcase/chat-compose.png",
+        title: { en: "Message compose", zh: "消息编写" },
+        alt: { en: "T-LoRa Pager message compose screen", zh: "T-LoRa Pager 消息编写界面" },
+      },
+      {
+        src: "./assets/showcase/chat-messages.png",
+        title: { en: "Message history", zh: "消息记录" },
+        alt: { en: "T-LoRa Pager message history screen", zh: "T-LoRa Pager 消息记录界面" },
+      },
+      {
+        src: "./assets/showcase/team-map.png",
+        title: { en: "Team map", zh: "团队地图" },
+        alt: { en: "T-LoRa Pager team map screen", zh: "T-LoRa Pager 团队地图界面" },
+      },
+      {
+        src: "./assets/showcase/utility-spectrum.png",
+        title: { en: "Energy Sweep", zh: "频谱扫描" },
+        alt: { en: "T-LoRa Pager Energy Sweep screen", zh: "T-LoRa Pager 频谱扫描界面" },
+      },
+      {
+        src: "./assets/showcase/utility-tracker.png",
+        title: { en: "Tracker", zh: "轨迹" },
+        alt: { en: "T-LoRa Pager tracker screen", zh: "T-LoRa Pager 轨迹界面" },
+      },
+    ],
+  },
+  {
+    id: "tdeck",
+    chip: "ESP32-S3",
+    title: {
+      en: "LilyGo T-Deck",
+      zh: "LilyGo T-Deck",
+    },
+    status: {
+      en: "Capture lane ready",
+      zh: "截图入口已预留",
+    },
+    summary: {
+      en: "Keyboard + touch target. Release and flasher path are present; dedicated UI captures should be added separately.",
+      zh: "键盘 + 触屏目标。发布和刷机路径已存在，后续应补充独立 UI 截图。",
+    },
+    interactions: {
+      en: [
+        "Keep T-Deck screenshots separate from Pager captures so the hardware story stays honest.",
+        "Future captures can cover keyboard navigation, touch gestures, GPS setup, and settings flows.",
+        "The device submenu is already stable, so new screenshots can drop into this lane without changing the site shell.",
+      ],
+      zh: [
+        "T-Deck 截图会与 Pager 截图区分，避免硬件展示混淆。",
+        "后续可以补充键盘导航、触控手势、GPS 设置和系统设置流程。",
+        "设备子菜单已经稳定，新增截图时无需重做官网外壳。",
+      ],
+    },
+    screenshots: [],
+  },
+  {
+    id: "lilygo-twatch-s3",
+    chip: "ESP32-S3",
+    title: {
+      en: "LilyGo T-Watch-S3",
+      zh: "LilyGo T-Watch-S3",
+    },
+    status: {
+      en: "Capture lane ready",
+      zh: "截图入口已预留",
+    },
+    summary: {
+      en: "Touch-first watch target. It needs its own compact-screen capture set rather than reused pager imagery.",
+      zh: "触控优先的手表目标，需要专门的小屏截图集，而不是复用 Pager 截图。",
+    },
+    interactions: {
+      en: [
+        "This lane is reserved for watch-scale UI density, touch targets, and compact navigation patterns.",
+        "Future screenshots should use the watch build so sizing and interaction claims match the device.",
+        "The install card below still exposes the ESP32-S3 web flasher status when release assets are available.",
+      ],
+      zh: [
+        "此入口预留给手表尺寸 UI 密度、触控目标和紧凑导航模式。",
+        "未来截图应来自手表构建，确保尺寸和交互描述匹配设备。",
+        "下方安装卡片仍会根据发布产物展示 ESP32-S3 网页刷机状态。",
+      ],
+    },
+    screenshots: [],
+  },
+  {
+    id: "gat562-mesh-evb-pro",
+    chip: "nRF52",
+    title: {
+      en: "GAT562 Mesh EVB Pro",
+      zh: "GAT562 Mesh EVB Pro",
+    },
+    status: {
+      en: "Manual flashing",
+      zh: "手动刷写",
+    },
+    summary: {
+      en: "nRF52 node target. Browser flashing is not wired yet, and UI screenshots should be captured from that target when available.",
+      zh: "nRF52 节点目标。浏览器刷机暂未接入，后续应从该目标独立捕获 UI 截图。",
+    },
+    interactions: {
+      en: [
+        "Treat this device as a separate product path because its runtime and flashing model differ from ESP32-S3 boards.",
+        "Use this lane later for node status, mesh identity, diagnostics, and provisioning screens.",
+        "The current homepage intentionally avoids showing Pager images here.",
+      ],
+      zh: [
+        "该设备的运行时和刷写模型不同于 ESP32-S3 板卡，应作为独立产品路径处理。",
+        "后续可在这里展示节点状态、Mesh 身份、诊断和配网页面。",
+        "当前官网刻意不在这里展示 Pager 截图。",
+      ],
+    },
+    screenshots: [],
+  },
+];
+
+let currentLanguage = "en";
+let releaseDataCache = null;
+let packDataCache = null;
+let activeDeviceId = "tlora-pager-sx1262";
+let activeShotIndex = 0;
+
+function t(key, params = {}) {
+  const template = I18N[currentLanguage]?.[key] ?? I18N.en[key] ?? key;
+  return Object.entries(params).reduce(
+    (text, [name, value]) => text.replaceAll(`{${name}}`, String(value)),
+    template,
+  );
 }
 
-function setReleaseLinks(url) {
-  releaseLinkEls.forEach((element) => {
-    element.href = url;
-  });
-}
-
-function setStat(elements, value) {
-  elements.forEach((element) => {
-    element.textContent = String(value);
-  });
+function localize(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  return value?.[currentLanguage] ?? value?.en ?? "";
 }
 
 function createElement(tagName, className, text) {
@@ -38,6 +523,41 @@ function createPill(text) {
   return createElement("span", "language-pill", text);
 }
 
+function setStat(elements, value) {
+  elements.forEach((element) => {
+    element.textContent = String(value);
+  });
+}
+
+function setReleaseVersion(text) {
+  releaseVersionEls.forEach((element) => {
+    element.textContent = text;
+  });
+}
+
+function setReleaseLinks(url) {
+  releaseLinkEls.forEach((element) => {
+    element.href = url;
+  });
+}
+
+function applyStaticTranslations() {
+  i18nEls.forEach((element) => {
+    element.textContent = t(element.dataset.i18n);
+  });
+
+  document.documentElement.lang = currentLanguage === "zh" ? "zh-CN" : "en";
+  document.title = currentLanguage === "zh" ? "Trail Mate - 离线现场通信固件" : "Trail Mate";
+}
+
+function updateLanguageButtons() {
+  languageButtons.forEach((button) => {
+    const isActive = button.dataset.langChoice === currentLanguage;
+    button.classList.toggle("is-active", isActive);
+    button.setAttribute("aria-pressed", String(isActive));
+  });
+}
+
 function createInstallButton(manifestPath) {
   const wrapper = document.createElement("div");
   wrapper.className = "install-button-wrap";
@@ -45,9 +565,9 @@ function createInstallButton(manifestPath) {
   const button = document.createElement("esp-web-install-button");
   button.setAttribute("manifest", `./${manifestPath}`);
   button.innerHTML = `
-    <button slot="activate" class="flash-button">Flash In Browser</button>
-    <span slot="unsupported" class="support-note">Use Chrome or Edge on desktop with Web Serial enabled.</span>
-    <span slot="not-allowed" class="support-note">Open this page over HTTPS to use the web flasher.</span>
+    <button slot="activate" class="flash-button">${t("flasher.activate")}</button>
+    <span slot="unsupported" class="support-note">${t("flasher.unsupported")}</span>
+    <span slot="not-allowed" class="support-note">${t("flasher.notAllowed")}</span>
   `;
 
   wrapper.append(button);
@@ -56,6 +576,10 @@ function createInstallButton(manifestPath) {
 
 function renderBoardInstall(card, releaseData) {
   const installSlot = card.querySelector("[data-install-slot]");
+  if (!installSlot) {
+    return;
+  }
+
   const boardId = card.dataset.boardId;
   const target = releaseData.targets?.[boardId];
 
@@ -63,19 +587,55 @@ function renderBoardInstall(card, releaseData) {
 
   if (target?.available) {
     installSlot.append(createInstallButton(target.manifest_path));
-    const note = document.createElement("p");
-    note.className = "board-hint";
-    note.textContent = "Merged firmware image from the latest published release.";
-    installSlot.append(note);
+    installSlot.append(createElement("p", "board-hint", t("flasher.readyNote")));
     return;
   }
 
-  const fallback = document.createElement("p");
-  fallback.className = "board-hint";
-  fallback.textContent = releaseData.available
-    ? "This board is missing web flasher assets in the latest release. Use the manual download for now."
-    : "Web flasher assets will appear here after the first tagged release is published.";
-  installSlot.append(fallback);
+  installSlot.append(
+    createElement(
+      "p",
+      "board-hint",
+      releaseData.available ? t("flasher.missingAsset") : t("flasher.pending"),
+    ),
+  );
+}
+
+function renderReleaseData() {
+  if (!releaseDataCache) {
+    setReleaseVersion(t("release.unavailable"));
+    boardCards.forEach((card) => {
+      const installSlot = card.querySelector("[data-install-slot]");
+      if (installSlot) {
+        installSlot.replaceChildren(createElement("p", "board-hint", t("flasher.error")));
+      }
+    });
+    return;
+  }
+
+  const versionLabel = releaseDataCache.tag_name
+    ? t("release.ready", { tag: releaseDataCache.tag_name })
+    : t("release.waiting");
+
+  setReleaseVersion(versionLabel);
+  if (releaseDataCache.release_url) {
+    setReleaseLinks(releaseDataCache.release_url);
+  }
+
+  boardCards.forEach((card) => renderBoardInstall(card, releaseDataCache));
+}
+
+function localizedPackName(pack) {
+  if (currentLanguage === "zh") {
+    return PACK_NAME_ZH[pack.id] ?? pack.display_name ?? pack.id ?? "语言包";
+  }
+  return pack.display_name || pack.id || "Unnamed package";
+}
+
+function localizedPackSummary(pack, locales, fontCount, imeCount) {
+  if (currentLanguage === "zh") {
+    return `${localizedPackName(pack)}语言包，包含 ${locales.length} ${t(locales.length === 1 ? "pack.locale" : "pack.locales")}、${fontCount} ${t(fontCount === 1 ? "pack.font" : "pack.fonts")}、${imeCount} ${t(imeCount === 1 ? "pack.ime" : "pack.imes")}。`;
+  }
+  return pack.summary || "No summary available.";
 }
 
 function createPackCard(pack) {
@@ -86,16 +646,23 @@ function createPackCard(pack) {
   const statuses = Array.from(
     new Set(locales.map((locale) => locale.translation_status || "release").filter(Boolean)),
   );
+  const hasRelease = statuses.includes("release");
 
   const card = createElement("article", "language-pack-card");
-  card.append(createElement("p", "feature-kicker", statuses.includes("release") ? "Release Bundle" : "Review Bundle"));
-  card.append(createElement("h3", "", pack.display_name || pack.id || "Unnamed package"));
-  card.append(createElement("p", "language-pack-summary", pack.summary || "No summary available."));
+  card.append(createElement("p", "feature-kicker", t(hasRelease ? "pack.release" : "pack.review")));
+  card.append(createElement("h3", "", localizedPackName(pack)));
+  card.append(
+    createElement(
+      "p",
+      "language-pack-summary",
+      localizedPackSummary(pack, locales, fontCount, imeCount),
+    ),
+  );
 
   const meta = createElement("div", "language-pack-meta");
-  meta.append(createPill(`${locales.length} locale${locales.length === 1 ? "" : "s"}`));
-  meta.append(createPill(`${fontCount} font pack${fontCount === 1 ? "" : "s"}`));
-  meta.append(createPill(`${imeCount} IME${imeCount === 1 ? "" : "s"}`));
+  meta.append(createPill(`${locales.length} ${t(locales.length === 1 ? "pack.locale" : "pack.locales")}`));
+  meta.append(createPill(`${fontCount} ${t(fontCount === 1 ? "pack.font" : "pack.fonts")}`));
+  meta.append(createPill(`${imeCount} ${t(imeCount === 1 ? "pack.ime" : "pack.imes")}`));
   statuses.forEach((status) => {
     meta.append(createPill(status));
   });
@@ -105,7 +672,7 @@ function createPackCard(pack) {
     const localeRow = createElement("div", "language-pack-locales");
     locales.slice(0, 7).forEach((locale) => {
       const status = locale.translation_status || "release";
-      const label = locale.display_name || locale.id || "Locale";
+      const label = currentLanguage === "zh" ? PACK_NAME_ZH[pack.id] ?? locale.display_name : locale.display_name;
       localeRow.append(createPill(status === "release" ? label : `${label} (${status})`));
     });
     if (locales.length > 7) {
@@ -123,7 +690,7 @@ function createPackCard(pack) {
   }
 
   if (pack.archive?.path) {
-    const link = createElement("a", "release-link", "Download package");
+    const link = createElement("a", "release-link", t("pack.download"));
     link.href = `./${pack.archive.path}`;
     card.append(link);
   }
@@ -131,6 +698,140 @@ function createPackCard(pack) {
   return card;
 }
 
+function renderPackCatalog() {
+  if (!packGrid) {
+    return;
+  }
+
+  if (!packDataCache) {
+    setStat(packCountEls, 0);
+    setStat(localeCountEls, 0);
+    packGrid.replaceChildren();
+
+    const fallback = createElement("article", "language-pack-card language-pack-empty");
+    fallback.append(createElement("p", "feature-kicker", t("languages.loadingKicker")));
+    fallback.append(createElement("h3", "", t("pack.errorTitle")));
+    fallback.append(createElement("p", "language-pack-summary", t("pack.errorText")));
+    packGrid.append(fallback);
+    return;
+  }
+
+  const packs = (packDataCache.packages ?? []).filter((pack) => pack.package_type === "locale-bundle");
+  const totalLocales = packs.reduce((sum, pack) => {
+    const runtimeLocales = pack.runtime?.locale_count;
+    if (typeof runtimeLocales === "number") {
+      return sum + runtimeLocales;
+    }
+    return sum + (pack.provides?.locales?.length ?? 0);
+  }, 0);
+
+  setStat(packCountEls, packs.length);
+  setStat(localeCountEls, totalLocales);
+  packGrid.replaceChildren();
+
+  if (packs.length === 0) {
+    const emptyCard = createElement("article", "language-pack-card language-pack-empty");
+    emptyCard.append(createElement("p", "feature-kicker", t("languages.loadingKicker")));
+    emptyCard.append(createElement("h3", "", t("pack.emptyTitle")));
+    emptyCard.append(createElement("p", "language-pack-summary", t("pack.emptyText")));
+    packGrid.append(emptyCard);
+    return;
+  }
+
+  packs.forEach((pack) => {
+    packGrid.append(createPackCard(pack));
+  });
+}
+
+function findDevice(deviceId) {
+  return DEVICES.find((device) => device.id === deviceId) ?? DEVICES[0];
+}
+
+function updateDeviceActiveStates() {
+  deviceNavButtons.forEach((button) => {
+    button.classList.toggle("is-active", button.dataset.deviceNav === activeDeviceId);
+  });
+  deviceTabButtons.forEach((button) => {
+    button.classList.toggle("is-active", button.dataset.deviceTarget === activeDeviceId);
+  });
+}
+
+function renderDeviceShot(device, index) {
+  const shot = device.screenshots[index];
+  if (!shot) {
+    deviceMainImage.src = "./assets/showcase/brand-logo.png";
+    deviceMainImage.alt = localize(device.title);
+    deviceMainCaption.textContent = t("device.emptyTitle");
+    return;
+  }
+
+  deviceMainImage.src = shot.src;
+  deviceMainImage.alt = localize(shot.alt);
+  deviceMainCaption.textContent = localize(shot.title);
+}
+
+function renderDevice() {
+  const device = findDevice(activeDeviceId);
+  activeShotIndex = Math.min(activeShotIndex, Math.max(device.screenshots.length - 1, 0));
+
+  deviceKicker.textContent = device.chip;
+  deviceTitle.textContent = localize(device.title);
+  deviceSummary.textContent = localize(device.summary);
+  deviceStatus.textContent = localize(device.status);
+
+  deviceInteractions.replaceChildren();
+  localize(device.interactions).forEach((item) => {
+    deviceInteractions.append(createElement("li", "", item));
+  });
+
+  renderDeviceShot(device, activeShotIndex);
+  deviceThumbGrid.replaceChildren();
+
+  if (device.screenshots.length === 0) {
+    const empty = createElement("div", "device-empty");
+    empty.append(createElement("h4", "", t("device.emptyTitle")));
+    empty.append(createElement("p", "", t("device.emptyText")));
+    deviceThumbGrid.append(empty);
+    return;
+  }
+
+  device.screenshots.forEach((shot, index) => {
+    const button = document.createElement("button");
+    button.className = `device-thumb${index === activeShotIndex ? " is-active" : ""}`;
+    button.type = "button";
+    button.dataset.shotIndex = String(index);
+
+    const image = document.createElement("img");
+    image.src = shot.src;
+    image.alt = localize(shot.alt);
+    image.loading = "lazy";
+
+    button.append(image, createElement("span", "", localize(shot.title)));
+    deviceThumbGrid.append(button);
+  });
+}
+
+function selectDevice(deviceId, shouldScroll = false) {
+  activeDeviceId = deviceId;
+  activeShotIndex = 0;
+  updateDeviceActiveStates();
+  renderDevice();
+
+  if (shouldScroll) {
+    document.querySelector("#devices")?.scrollIntoView({ behavior: "smooth", block: "start" });
+  }
+}
+
+function setLanguage(language) {
+  currentLanguage = language === "zh" ? "zh" : "en";
+  localStorage.setItem("trail-mate-language", currentLanguage);
+  updateLanguageButtons();
+  applyStaticTranslations();
+  renderReleaseData();
+  renderPackCatalog();
+  renderDevice();
+}
+
 async function loadReleaseData() {
   try {
     const response = await fetch("./data/latest-release.json", { cache: "no-store" });
@@ -138,27 +839,11 @@ async function loadReleaseData() {
       throw new Error(`Unexpected status ${response.status}`);
     }
 
-    const releaseData = await response.json();
-    const versionLabel = releaseData.tag_name
-      ? `${releaseData.tag_name} ready for install`
-      : "Waiting for first tagged release";
-
-    setReleaseVersion(versionLabel);
-    if (releaseData.release_url) {
-      setReleaseLinks(releaseData.release_url);
-    }
-
-    boardCards.forEach((card) => renderBoardInstall(card, releaseData));
+    releaseDataCache = await response.json();
+    renderReleaseData();
   } catch (error) {
-    setReleaseVersion("Release metadata unavailable");
-    boardCards.forEach((card) => {
-      const installSlot = card.querySelector("[data-install-slot]");
-      installSlot.replaceChildren();
-      const note = document.createElement("p");
-      note.className = "board-hint";
-      note.textContent = "Could not load release metadata. Open the GitHub release page for manual downloads.";
-      installSlot.append(note);
-    });
+    releaseDataCache = null;
+    renderReleaseData();
   }
 }
 
@@ -173,45 +858,54 @@ async function loadPackCatalog() {
       throw new Error(`Unexpected status ${response.status}`);
     }
 
-    const packData = await response.json();
-    const packs = (packData.packages ?? []).filter((pack) => pack.package_type === "locale-bundle");
-    const totalLocales = packs.reduce((sum, pack) => {
-      const runtimeLocales = pack.runtime?.locale_count;
-      if (typeof runtimeLocales === "number") {
-        return sum + runtimeLocales;
-      }
-      return sum + (pack.provides?.locales?.length ?? 0);
-    }, 0);
-
-    setStat(packCountEls, packs.length);
-    setStat(localeCountEls, totalLocales);
-
-    packGrid.replaceChildren();
-
-    if (packs.length === 0) {
-      const emptyCard = createElement("article", "language-pack-card language-pack-empty");
-      emptyCard.append(createElement("p", "feature-kicker", "Catalog"));
-      emptyCard.append(createElement("h3", "", "No published language bundles yet."));
-      emptyCard.append(createElement("p", "language-pack-summary", "Pages will show locale bundles here after the package catalog is generated."));
-      packGrid.append(emptyCard);
-      return;
-    }
-
-    packs.forEach((pack) => {
-      packGrid.append(createPackCard(pack));
-    });
+    packDataCache = await response.json();
+    renderPackCatalog();
   } catch (error) {
-    setStat(packCountEls, 0);
-    setStat(localeCountEls, 0);
-    packGrid.replaceChildren();
-
-    const fallback = createElement("article", "language-pack-card language-pack-empty");
-    fallback.append(createElement("p", "feature-kicker", "Catalog"));
-    fallback.append(createElement("h3", "", "Language catalog unavailable"));
-    fallback.append(createElement("p", "language-pack-summary", "The homepage could not load the published language-pack metadata right now."));
-    packGrid.append(fallback);
+    packDataCache = null;
+    renderPackCatalog();
   }
 }
 
+languageButtons.forEach((button) => {
+  button.addEventListener("click", () => {
+    setLanguage(button.dataset.langChoice);
+  });
+});
+
+deviceNavButtons.forEach((button) => {
+  button.addEventListener("click", () => {
+    selectDevice(button.dataset.deviceNav, true);
+  });
+});
+
+deviceTabButtons.forEach((button) => {
+  button.addEventListener("click", () => {
+    selectDevice(button.dataset.deviceTarget, false);
+  });
+});
+
+deviceThumbGrid?.addEventListener("click", (event) => {
+  const thumb = event.target.closest("[data-shot-index]");
+  if (!thumb) {
+    return;
+  }
+
+  const device = findDevice(activeDeviceId);
+  activeShotIndex = Number(thumb.dataset.shotIndex);
+  renderDeviceShot(device, activeShotIndex);
+  deviceThumbGrid.querySelectorAll(".device-thumb").forEach((button) => {
+    button.classList.toggle("is-active", button === thumb);
+  });
+});
+
+const urlParams = new URLSearchParams(window.location.search);
+const urlLanguage = urlParams.get("lang");
+const urlDevice = urlParams.get("device");
+const savedLanguage = localStorage.getItem("trail-mate-language");
+if (DEVICES.some((device) => device.id === urlDevice)) {
+  activeDeviceId = urlDevice;
+}
+setLanguage(urlLanguage === "zh" || savedLanguage === "zh" ? "zh" : "en");
+selectDevice(activeDeviceId, false);
 loadReleaseData();
 loadPackCatalog();
diff --git a/site/styles.css b/site/styles.css
index c527f251..8734a1bd 100644
--- a/site/styles.css
+++ b/site/styles.css
@@ -1,32 +1,42 @@
 :root {
   color-scheme: light;
-  --amber: #eba341;
-  --amber-dark: #c98118;
-  --warm-bg: #f6e6c6;
-  --panel-base: #faf0d8;
-  --line-solid: #e7c98f;
-  --text: #6b4a1e;
-  --text-dim: #8a6a3a;
-  --warn: #b94a2c;
-  --ok: #3e7d3e;
-  --info: #2d6fb6;
-  --bg: var(--warm-bg);
-  --bg-deep: #efd5a1;
-  --panel: rgba(250, 240, 216, 0.84);
-  --panel-strong: rgba(250, 240, 216, 0.95);
-  --ink: var(--text);
-  --muted: var(--text-dim);
-  --line: rgba(231, 201, 143, 0.92);
-  --accent: var(--amber-dark);
-  --accent-soft: rgba(235, 163, 65, 0.14);
-  --signal: var(--amber);
-  --shadow: 0 22px 56px rgba(107, 74, 30, 0.14);
-  --radius-xl: 28px;
-  --radius-lg: 20px;
-  --radius-md: 14px;
-  --esp-tools-button-color: var(--amber-dark);
-  --esp-tools-button-text-color: #fff7ea;
-  --esp-tools-button-border-radius: 999px;
+
+  --animal-primary: #19c8b9;
+  --animal-primary-hover: #3dd4c6;
+  --animal-primary-active: #11a89b;
+  --animal-primary-bg: #e6f9f6;
+  --animal-success: #6fba2c;
+  --animal-warning: #f5c31c;
+  --animal-error: #e05a5a;
+  --animal-text: #794f27;
+  --animal-text-body: #725d42;
+  --animal-text-muted: #8a7b66;
+  --animal-text-secondary: #9f927d;
+  --animal-border: #c4b89e;
+  --animal-border-strong: #9f927d;
+  --animal-border-hover: #a89878;
+  --animal-bg: #f8f8f0;
+  --animal-bg-content: #f7f3df;
+  --animal-bg-soft: #fffaf0;
+  --animal-shadow-btn: #bdaea0;
+  --animal-shadow-input: #d4c9b4;
+  --animal-focus: #ffcc00;
+  --trail-sky: #7db7d8;
+  --trail-blue: #4c78a8;
+  --trail-leaf: #7cb342;
+  --trail-coral: #e05a5a;
+  --trail-ink: #2f4b4a;
+  --surface: rgba(255, 252, 244, 0.94);
+  --surface-solid: #fffaf0;
+  --line: rgba(159, 146, 125, 0.48);
+  --radius-sm: 12px;
+  --radius-md: 18px;
+  --radius-lg: 24px;
+  --radius-pill: 50px;
+  --ease: cubic-bezier(0.4, 0, 0.2, 1);
+  --esp-tools-button-color: var(--animal-primary);
+  --esp-tools-button-text-color: #0f3e38;
+  --esp-tools-button-border-radius: 24px;
 }
 
 * {
@@ -40,27 +50,39 @@ html {
 body {
   margin: 0;
   min-height: 100vh;
-  font-family: "Space Grotesk", "Segoe UI", sans-serif;
-  color: var(--ink);
+  color: var(--animal-text-body);
+  font-family:
+    Nunito,
+    "Noto Sans SC",
+    "Zen Maru Gothic",
+    -apple-system,
+    BlinkMacSystemFont,
+    "Segoe UI",
+    sans-serif;
+  font-weight: 500;
   background:
-    radial-gradient(circle at top left, rgba(235, 163, 65, 0.28), transparent 30%),
-    radial-gradient(circle at top right, rgba(45, 111, 182, 0.14), transparent 28%),
-    linear-gradient(180deg, var(--panel-base) 0%, var(--bg) 38%, #f1ddb8 100%);
+    repeating-linear-gradient(
+      90deg,
+      rgba(25, 200, 185, 0.05) 0 1px,
+      transparent 1px 56px
+    ),
+    repeating-linear-gradient(
+      0deg,
+      rgba(124, 179, 66, 0.045) 0 1px,
+      transparent 1px 56px
+    ),
+    linear-gradient(180deg, #e6f9f6 0, var(--animal-bg) 280px, #fff8e7 100%);
 }
 
 body::before {
   content: "";
   position: fixed;
   inset: 0;
+  z-index: -1;
   pointer-events: none;
   background:
-    repeating-radial-gradient(circle at 20% 20%, rgba(201, 129, 24, 0.05) 0 2px, transparent 2px 26px),
-    repeating-linear-gradient(
-      115deg,
-      rgba(107, 74, 30, 0.03) 0 2px,
-      transparent 2px 34px
-    );
-  mask-image: linear-gradient(180deg, rgba(0, 0, 0, 0.85), transparent 92%);
+    linear-gradient(135deg, rgba(245, 195, 28, 0.2), transparent 32%),
+    linear-gradient(315deg, rgba(125, 183, 216, 0.18), transparent 36%);
 }
 
 a {
@@ -68,93 +90,324 @@ a {
   text-decoration: none;
 }
 
+button {
+  font: inherit;
+}
+
 .page-shell {
-  width: min(1180px, calc(100% - 32px));
+  width: min(1320px, calc(100% - 32px));
   margin: 0 auto;
-  padding: 18px 0 56px;
+  padding: 18px 0 64px;
 }
 
 .topbar {
+  position: sticky;
+  top: 10px;
+  z-index: 20;
   display: flex;
   align-items: center;
   justify-content: space-between;
   gap: 20px;
-  padding: 14px 18px;
-  position: sticky;
-  top: 10px;
-  z-index: 5;
-  backdrop-filter: blur(18px);
-  background: rgba(250, 240, 216, 0.82);
-  border: 1px solid var(--line);
-  border-radius: 999px;
-  box-shadow: var(--shadow);
+  padding: 12px 16px;
+  border: 2px solid rgba(159, 146, 125, 0.5);
+  border-radius: var(--radius-lg);
+  background: rgba(255, 252, 244, 0.9);
+  box-shadow: 0 5px 0 0 rgba(189, 174, 160, 0.8);
+  backdrop-filter: blur(14px);
 }
 
 .brand {
   display: inline-flex;
   align-items: center;
   gap: 12px;
-  font-weight: 700;
-  letter-spacing: 0.04em;
-  text-transform: uppercase;
+  min-width: max-content;
+  color: var(--animal-text);
+  font-weight: 900;
 }
 
 .brand-logo {
   display: block;
+  width: 58px;
   height: 38px;
-  width: auto;
-  filter: drop-shadow(0 8px 14px rgba(201, 129, 24, 0.18));
+  object-fit: contain;
+  filter: drop-shadow(0 4px 0 rgba(189, 174, 160, 0.55));
 }
 
 .brand-text {
-  display: inline-block;
-  color: var(--amber-dark);
+  color: var(--animal-text);
+  font-size: 1rem;
 }
 
-.nav {
+.top-actions {
   display: flex;
   flex-wrap: wrap;
-  gap: 16px;
-  color: var(--muted);
-  font-size: 0.95rem;
+  justify-content: flex-end;
+  align-items: center;
+  gap: 8px;
 }
 
-.nav a:hover {
-  color: var(--info);
+.top-link,
+.lang-button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 36px;
+  padding: 0 14px;
+  border: 2px solid transparent;
+  border-radius: var(--radius-pill);
+  color: var(--animal-text-muted);
+  font-weight: 900;
+  line-height: 1;
+  transition:
+    background-color 160ms var(--ease),
+    border-color 160ms var(--ease),
+    box-shadow 160ms var(--ease),
+    color 160ms var(--ease),
+    transform 160ms var(--ease);
+}
+
+.top-link:hover,
+.lang-button:hover {
+  color: var(--trail-ink);
+  background: rgba(25, 200, 185, 0.12);
+  transform: translateY(-1px);
+}
+
+.top-link-strong {
+  color: #083d37;
+  background: var(--animal-primary);
+  border-color: #4de2da;
+  box-shadow: 0 3px 0 0 #0a9189;
+}
+
+.language-toggle {
+  display: inline-flex;
+  gap: 4px;
+  padding: 4px;
+  border: 2px solid rgba(159, 146, 125, 0.32);
+  border-radius: var(--radius-pill);
+  background: rgba(255, 250, 240, 0.86);
+}
+
+.lang-button {
+  min-height: 30px;
+  padding: 0 12px;
+  border: 0;
+  background: transparent;
+  cursor: pointer;
+}
+
+.lang-button.is-active {
+  color: var(--animal-text);
+  background: rgba(245, 195, 28, 0.26);
+  box-shadow: inset 0 -2px 0 rgba(219, 169, 14, 0.35);
+}
+
+.content-shell {
+  display: grid;
+  grid-template-columns: 230px minmax(0, 1fr);
+  gap: 28px;
+  align-items: start;
+  margin-top: 26px;
+  min-width: 0;
+}
+
+.sidebar {
+  position: sticky;
+  top: 94px;
+  max-height: calc(100vh - 112px);
+  overflow: auto;
+  padding: 18px;
+  border: 2px solid rgba(159, 146, 125, 0.42);
+  border-radius: var(--radius-lg);
+  background: rgba(255, 252, 244, 0.82);
+  box-shadow: 0 5px 0 0 rgba(212, 201, 180, 0.72);
+  min-width: 0;
+}
+
+.sidebar-label {
+  margin: 0 0 12px;
+  color: var(--animal-primary-active);
+  font-size: 0.78rem;
+  font-weight: 900;
+  letter-spacing: 0.02em;
+  text-transform: uppercase;
+}
+
+.side-nav {
+  display: grid;
+  gap: 8px;
+}
+
+.side-nav a,
+.nav-group summary,
+.side-device {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  width: 100%;
+  min-height: 40px;
+  padding: 0 13px;
+  border: 2px solid transparent;
+  border-radius: var(--radius-sm);
+  color: var(--animal-text-muted);
+  background: transparent;
+  font-weight: 900;
+  text-align: left;
+  cursor: pointer;
+  transition:
+    background-color 160ms var(--ease),
+    color 160ms var(--ease),
+    transform 160ms var(--ease);
+}
+
+.side-nav a::before,
+.nav-group summary::before,
+.side-device::before {
+  content: "";
+  flex: 0 0 22px;
+  width: 22px;
+  height: 22px;
+  background: url("./assets/animal-island/icons/icon-map.svg") center / contain no-repeat;
+}
+
+.side-nav a[href="#overview"]::before {
+  background-image: url("./assets/animal-island/icons/location.svg");
+}
+
+.side-nav a[href="#capabilities"]::before {
+  background-image: url("./assets/animal-island/icons/icon-design.svg");
+}
+
+.nav-group summary::before {
+  background-image: url("./assets/animal-island/icons/icon-helicopter.svg");
+}
+
+.side-device::before {
+  background-image: url("./assets/animal-island/icons/icon-camera.svg");
+}
+
+.side-nav a[href="#features"]::before {
+  background-image: url("./assets/animal-island/icons/icon-chat.svg");
+}
+
+.side-nav a[href="#languages"]::before {
+  background-image: url("./assets/animal-island/icons/icon-miles.svg");
+}
+
+.side-nav a[href="#webflasher"]::before {
+  background-image: url("./assets/animal-island/icons/icon-shopping.svg");
+}
+
+.side-nav a[href="#docs"]::before {
+  background-image: url("./assets/animal-island/icons/wifi.svg");
+}
+
+.side-nav a:hover,
+.nav-group summary:hover,
+.side-device:hover {
+  color: var(--trail-ink);
+  background: rgba(25, 200, 185, 0.12);
+  transform: translateY(-1px);
+}
+
+.side-nav a {
+  justify-content: flex-start;
+}
+
+.nav-group summary::after {
+  margin-left: auto;
+}
+
+.side-device span {
+  flex: 1;
+  min-width: 0;
+}
+
+.nav-group {
+  display: grid;
+  gap: 6px;
+}
+
+.nav-group summary {
+  list-style: none;
+}
+
+.nav-group summary::-webkit-details-marker {
+  display: none;
+}
+
+.nav-group summary::after {
+  content: "+";
+  color: var(--animal-primary-active);
+}
+
+.nav-group[open] summary::after {
+  content: "-";
+}
+
+.side-device {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 10px;
+  min-height: 44px;
+  margin-top: 4px;
+  padding: 0 12px;
+  border-color: rgba(159, 146, 125, 0.2);
+  background: rgba(255, 250, 240, 0.62);
+}
+
+.side-device small {
+  flex: 0 1 auto;
+  min-width: 0;
+  color: var(--animal-text-secondary);
+  font-size: 0.72rem;
+  font-weight: 900;
+  line-height: 1.12;
+  text-align: left;
+}
+
+.side-device span {
+  overflow-wrap: anywhere;
+}
+
+.side-device.is-active,
+.device-tab.is-active {
+  color: var(--animal-text);
+  background: rgba(245, 195, 28, 0.22);
+  border-color: rgba(219, 169, 14, 0.38);
+  box-shadow: 0 3px 0 0 rgba(219, 169, 14, 0.32);
+}
+
+.main-content {
+  min-width: 0;
 }
 
 .hero {
   display: grid;
-  grid-template-columns: minmax(0, 1.3fr) minmax(280px, 0.8fr);
-  gap: 24px;
-  padding: 54px 0 28px;
-  align-items: stretch;
-}
-
-.hero-copy,
-.hero-visual,
-.story-section,
-.board-card,
-.links-section article {
-  background: var(--panel);
-  border: 1px solid var(--line);
-  border-radius: var(--radius-xl);
-  box-shadow: var(--shadow);
+  grid-template-columns: minmax(0, 1fr) minmax(340px, 0.86fr);
+  gap: 34px;
+  align-items: center;
+  padding: 28px 0 30px;
+  min-width: 0;
 }
 
 .hero-copy {
-  padding: 34px;
+  max-width: 680px;
+  min-width: 0;
 }
 
 .eyebrow,
 .feature-kicker,
 .board-chip {
   margin: 0 0 10px;
-  font-family: "IBM Plex Mono", "Consolas", monospace;
-  font-size: 0.82rem;
-  letter-spacing: 0.08em;
+  color: var(--animal-primary-active);
+  font-size: 0.78rem;
+  font-weight: 900;
+  letter-spacing: 0.02em;
   text-transform: uppercase;
-  color: var(--signal);
 }
 
 h1,
@@ -167,36 +420,54 @@ dt {
 }
 
 h1 {
-  font-size: clamp(2.6rem, 7vw, 4.6rem);
-  line-height: 0.96;
-  letter-spacing: -0.05em;
-  max-width: 11ch;
+  color: var(--animal-text);
+  font-size: 4.8rem;
+  font-weight: 900;
+  line-height: 0.94;
+  letter-spacing: 0;
+  text-shadow: 0 4px 0 rgba(189, 174, 160, 0.7);
+}
+
+.hero-tagline {
+  max-width: 14ch;
+  margin-top: 12px;
+  color: var(--trail-ink);
+  font-size: 2rem;
+  font-weight: 800;
+  line-height: 1.12;
 }
 
 .lede {
-  max-width: 62ch;
+  max-width: 60ch;
   margin-top: 18px;
-  color: var(--muted);
+  color: var(--animal-text-muted);
   font-size: 1.05rem;
-  line-height: 1.7;
+  line-height: 1.72;
 }
 
 .hero-actions {
   display: flex;
   flex-wrap: wrap;
   gap: 12px;
-  margin-top: 24px;
+  margin-top: 26px;
 }
 
-.button {
+.button,
+.flash-button {
   display: inline-flex;
   align-items: center;
   justify-content: center;
   min-height: 48px;
-  padding: 0 18px;
-  border-radius: 999px;
-  font-weight: 500;
-  transition: transform 160ms ease, background-color 160ms ease;
+  padding: 0 22px;
+  border: 2px solid transparent;
+  border-radius: var(--radius-lg);
+  font-weight: 900;
+  line-height: 1;
+  transition:
+    transform 160ms var(--ease),
+    box-shadow 160ms var(--ease),
+    background-color 160ms var(--ease),
+    border-color 160ms var(--ease);
 }
 
 .button:hover,
@@ -204,102 +475,142 @@ h1 {
   transform: translateY(-1px);
 }
 
-.button-primary {
-  background: linear-gradient(180deg, var(--amber), var(--amber-dark));
-  color: #fff8ef;
+.button:active,
+.flash-button:active {
+  transform: translateY(2px);
+}
+
+.button-primary,
+.flash-button {
+  color: #083d37;
+  background: var(--animal-primary);
+  border-color: #4de2da;
+  box-shadow: 0 5px 0 0 #0a9189;
+}
+
+.button-primary:hover,
+.flash-button:hover {
+  background: var(--animal-primary-hover);
+}
+
+.button-primary:active,
+.flash-button:active {
+  box-shadow: 0 1px 0 0 #0a9189;
 }
 
 .button-secondary {
-  background: rgba(235, 163, 65, 0.1);
-  color: var(--ink);
-  border: 1px solid var(--line);
+  color: var(--animal-text);
+  background: var(--animal-bg);
+  border-color: var(--animal-border);
+  box-shadow: 0 5px 0 0 var(--animal-shadow-btn);
 }
 
-dt {
-  color: var(--muted);
-  font-size: 0.95rem;
-  margin-bottom: 6px;
+.button-secondary:hover {
+  border-color: var(--animal-border-hover);
+  box-shadow: 0 6px 0 0 var(--animal-shadow-btn);
 }
 
-dd {
-  font-size: 1.05rem;
-  line-height: 1.45;
+.button-secondary:active {
+  box-shadow: 0 1px 0 0 var(--animal-shadow-btn);
+}
+
+.hero-visual,
+.language-highlight,
+.language-pack-card,
+.capability-card,
+.collapse-panel,
+.board-card,
+.shot,
+.device-stage,
+.links-section article {
+  transition:
+    transform 220ms var(--ease),
+    box-shadow 220ms var(--ease),
+    border-color 220ms var(--ease);
 }
 
 .hero-visual {
-  position: relative;
-  min-height: 420px;
-  padding: 26px;
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 14px;
+  padding: 18px;
+  border: 2px solid var(--animal-border);
+  border-radius: 32px;
   background:
-    linear-gradient(160deg, rgba(235, 163, 65, 0.22), rgba(45, 111, 182, 0.08)),
-    var(--panel-strong);
+    linear-gradient(180deg, rgba(255, 255, 255, 0.62), rgba(255, 248, 231, 0.9)),
+    var(--animal-bg-content);
+  box-shadow: 0 7px 0 0 rgba(189, 174, 160, 0.82);
 }
 
 .hero-screen {
-  height: 100%;
-  min-height: 320px;
-  padding: 22px;
-  border-radius: 22px;
-  background: linear-gradient(180deg, rgba(235, 163, 65, 0.11), rgba(250, 240, 216, 0.9));
-  border: 1px solid var(--line);
+  grid-column: 1 / -1;
+  display: grid;
+  place-items: center;
+  aspect-ratio: 480 / 222;
+  min-height: 0;
+  padding: 12px;
+  overflow: hidden;
+  border: 2px solid rgba(159, 146, 125, 0.5);
+  border-radius: var(--radius-lg);
+  background: #2f4b4a;
+  box-shadow: inset 0 0 0 4px rgba(255, 250, 240, 0.08);
 }
 
-.hero-screen img {
+.hero-screen img,
+.shot img,
+.device-main-shot img,
+.device-thumb img {
   display: block;
   width: 100%;
   height: 100%;
   object-fit: contain;
-  filter: drop-shadow(0 18px 32px rgba(107, 74, 30, 0.16));
+}
+
+.hero-screen img {
+  border-radius: var(--radius-sm);
 }
 
 .hero-note {
-  position: absolute;
-  max-width: 240px;
+  min-height: 118px;
   padding: 14px 16px;
-  border-radius: 18px;
-  backdrop-filter: blur(14px);
-  background: rgba(250, 240, 216, 0.88);
-  border: 1px solid var(--line);
-  box-shadow: 0 16px 32px rgba(107, 74, 30, 0.12);
-}
-
-.hero-note-release {
-  left: 18px;
-  bottom: 18px;
-}
-
-.hero-note-proof {
-  right: 18px;
-  top: 18px;
+  border: 2px solid rgba(159, 146, 125, 0.42);
+  border-radius: var(--radius-md);
+  background: rgba(255, 252, 244, 0.86);
 }
 
 .hero-note-value {
-  color: var(--ink);
+  color: var(--animal-text-body);
   line-height: 1.45;
 }
 
 .overview-ribbon {
   display: grid;
-  grid-template-columns: minmax(0, 1.25fr) minmax(0, 0.95fr);
-  gap: 18px;
+  grid-template-columns: minmax(0, 1.18fr) minmax(0, 0.9fr);
+  gap: 20px;
   align-items: center;
-  margin-top: 8px;
+  margin-top: 18px;
   padding: 24px 28px;
-  border-radius: var(--radius-xl);
-  background: rgba(250, 240, 216, 0.82);
-  border: 1px solid var(--line);
-  box-shadow: var(--shadow);
+  border: 2px dashed rgba(159, 146, 125, 0.55);
+  border-radius: var(--radius-lg);
+  background: rgba(230, 249, 246, 0.72);
 }
 
 .overview-copy,
 .story-lede,
-.links-section p:last-child,
+.links-section p,
 .section-note,
 .board-copy,
 .board-hint,
 .support-note,
-.workflow-note p {
-  color: var(--muted);
+.workflow-note p,
+.capability-card p,
+.language-highlight p:last-child,
+.language-pack-summary,
+.device-summary,
+.device-empty p,
+.collapse-content p,
+.site-footer-card p {
+  color: var(--animal-text-muted);
   line-height: 1.7;
 }
 
@@ -310,35 +621,514 @@ dd {
   justify-content: flex-end;
 }
 
-.overview-tags span {
+.overview-tags span,
+.language-pill,
+.device-status-card,
+.device-meta-chip {
   display: inline-flex;
   align-items: center;
-  min-height: 38px;
-  padding: 0 14px;
-  border-radius: 999px;
-  background: rgba(235, 163, 65, 0.14);
-  border: 1px solid var(--line);
-  color: var(--amber-dark);
-  font-family: "IBM Plex Mono", "Consolas", monospace;
-  font-size: 0.82rem;
+  min-height: 34px;
+  padding: 0 12px;
+  border: 2px solid rgba(159, 146, 125, 0.36);
+  border-radius: var(--radius-pill);
+  background: rgba(255, 250, 240, 0.86);
+  color: var(--animal-text);
+  font-size: 0.78rem;
+  font-weight: 900;
+}
+
+.overview-tags span:nth-child(3n + 1),
+.language-pill:nth-child(3n + 1) {
+  background: rgba(25, 200, 185, 0.12);
+}
+
+.overview-tags span:nth-child(3n + 2),
+.language-pill:nth-child(3n + 2) {
+  background: rgba(245, 195, 28, 0.18);
+}
+
+.overview-tags span:nth-child(3n + 3),
+.language-pill:nth-child(3n + 3) {
+  background: rgba(124, 179, 66, 0.14);
+}
+
+.capability-section,
+.device-section,
+.language-section,
+.install-section {
+  margin-top: 34px;
+  padding: 34px;
+  border: 2px solid rgba(159, 146, 125, 0.42);
+  border-radius: 34px;
+  background:
+    linear-gradient(180deg, rgba(255, 252, 244, 0.92), rgba(247, 243, 223, 0.86)),
+    var(--animal-bg-content);
+}
+
+.section-heading {
+  display: flex;
+  align-items: flex-end;
+  justify-content: space-between;
+  gap: 24px;
+}
+
+.section-heading h2,
+.story-copy h2,
+.capability-card h3,
+.collapse-panel summary,
+.links-section h2,
+.install-section h2,
+.site-footer-card h2 {
+  color: var(--animal-text);
+  font-weight: 900;
+  line-height: 1.08;
+  letter-spacing: 0;
+}
+
+.section-heading h2,
+.story-copy h2,
+.links-section h2,
+.install-section h2,
+.site-footer-card h2 {
+  font-size: 2.12rem;
+}
+
+.section-note {
+  max-width: 52ch;
+}
+
+.animal-divider {
+  width: min(760px, 82%);
+  height: 18px;
+  margin: 34px auto 0;
+  background: url("./assets/animal-island/dividers/divider-line-teal.svg") center / contain no-repeat;
+}
+
+.animal-divider-teal {
+  background-image: url("./assets/animal-island/dividers/divider-line-teal.svg");
+}
+
+.capability-grid {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 14px;
+  margin-top: 24px;
+}
+
+.capability-card {
+  position: relative;
+  min-height: 210px;
+  padding: 24px 22px 22px;
+  border: 2px solid rgba(159, 146, 125, 0.42);
+  border-radius: var(--radius-md);
+  background: rgba(255, 252, 244, 0.86);
+  box-shadow: 0 4px 0 0 rgba(212, 201, 180, 0.8);
+}
+
+.capability-card::before {
+  content: "";
+  display: block;
+  width: 54px;
+  height: 54px;
+  margin-bottom: 12px;
+  background: url("./assets/animal-island/icons/icon-map.svg") center / contain no-repeat;
+  filter: drop-shadow(0 4px 0 rgba(189, 174, 160, 0.42));
+  transition: transform 220ms var(--ease);
+}
+
+.capability-card:hover::before {
+  transform: scale(1.08) rotate(-4deg);
+}
+
+.capability-device::before {
+  background-image: url("./assets/animal-island/icons/icon-helicopter.svg");
+}
+
+.capability-navigation::before {
+  background-image: url("./assets/animal-island/icons/icon-map.svg");
+}
+
+.capability-protocol::before {
+  background-image: url("./assets/animal-island/icons/icon-chat.svg");
+}
+
+.capability-install::before {
+  background-image: url("./assets/animal-island/icons/icon-shopping.svg");
+}
+
+.capability-locale::before {
+  background-image: url("./assets/animal-island/icons/icon-design.svg");
+}
+
+.capability-field::before {
+  background-image: url("./assets/animal-island/icons/icon-diy.svg");
+}
+
+.capability-card:nth-child(6n + 1),
+.capability-card:nth-child(6n + 4) {
+  background: linear-gradient(180deg, rgba(230, 249, 246, 0.9), rgba(255, 252, 244, 0.94));
+}
+
+.capability-card:nth-child(6n + 2),
+.capability-card:nth-child(6n + 5) {
+  background: linear-gradient(180deg, rgba(255, 248, 210, 0.92), rgba(255, 252, 244, 0.94));
+}
+
+.capability-card:nth-child(6n + 3),
+.capability-card:nth-child(6n + 6) {
+  background: linear-gradient(180deg, rgba(232, 246, 218, 0.92), rgba(255, 252, 244, 0.94));
+}
+
+.capability-card:hover,
+.collapse-panel:hover {
+  transform: translateY(-2px);
+  border-color: var(--animal-border-hover);
+  box-shadow: 0 6px 0 0 rgba(212, 201, 180, 0.9);
+}
+
+.capability-card h3 {
+  margin-bottom: 10px;
+  font-size: 1.32rem;
+}
+
+.device-browser {
+  overflow: hidden;
+  margin-top: 24px;
+  border: 2px solid var(--animal-border);
+  border-radius: var(--radius-lg);
+  background: var(--animal-bg);
+}
+
+.device-switcher {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  padding: 16px;
+  border-bottom: 2px solid var(--animal-border);
+  background: rgba(255, 255, 255, 0.6);
+}
+
+.device-tab {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  min-height: 44px;
+  padding: 8px 16px;
+  border: 0;
+  border-radius: var(--radius-lg);
+  background: transparent;
+  color: var(--animal-text);
+  cursor: pointer;
+  text-align: left;
+  transition:
+    background-color 160ms var(--ease),
+    border-color 160ms var(--ease),
+    box-shadow 160ms var(--ease),
+    color 160ms var(--ease),
+    transform 160ms var(--ease);
+}
+
+.device-tab:hover {
+  background: rgba(25, 200, 185, 0.12);
+  color: var(--animal-text);
+}
+
+.device-tab span {
+  position: relative;
+  z-index: 1;
+  font-weight: 700;
+}
+
+.device-tab small {
+  position: relative;
+  z-index: 1;
+  color: inherit;
+  font-size: 0.78rem;
+  font-weight: 800;
+  opacity: 0.72;
+}
+
+.device-tab::before {
+  content: "";
+  position: relative;
+  z-index: 1;
+  flex: 0 0 24px;
+  width: 24px;
+  height: 24px;
+  background: url("./assets/animal-island/icons/icon-camera.svg") center / contain no-repeat;
+  transition: transform 220ms var(--ease);
+}
+
+.device-tab[data-device-target="tlora-pager-sx1262"]::before {
+  background-image: url("./assets/animal-island/icons/icon-chat.svg");
+}
+
+.device-tab[data-device-target="tdeck"]::before {
+  background-image: url("./assets/animal-island/icons/icon-map.svg");
+}
+
+.device-tab[data-device-target="lilygo-twatch-s3"]::before {
+  background-image: url("./assets/animal-island/icons/icon-miles.svg");
+}
+
+.device-tab[data-device-target="gat562-mesh-evb-pro"]::before {
+  background-image: url("./assets/animal-island/icons/wifi.svg");
+}
+
+.device-tab.is-active::before {
+  transform: scale(1.2);
+}
+
+.device-tab.is-active::after {
+  content: "";
+  position: absolute;
+  top: -8px;
+  right: -5px;
+  width: 18px;
+  height: 18px;
+  background: url("./assets/animal-island/icons/icon-leaf.png") center / contain no-repeat;
+  animation: leafWiggle 2s ease-in-out infinite;
+}
+
+.device-tab.is-active {
+  color: #fff9e3;
+  background: #0cc0b5;
+  border-color: transparent;
+  box-shadow: 0 3px 0 0 rgba(61, 52, 40, 0.08);
+}
+
+@keyframes leafWiggle {
+  0%,
+  100% {
+    transform: rotate(0deg);
+  }
+
+  25% {
+    transform: rotate(-10deg);
+  }
+
+  75% {
+    transform: rotate(10deg);
+  }
+}
+
+.device-stage {
+  min-width: 0;
+  padding: 24px;
+  border: 0;
+  border-radius: 0;
+  background: transparent;
+  box-shadow: none;
+  animation: fadeIn 0.25s ease;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(4px);
+  }
+
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.device-stage-header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 18px;
+}
+
+.device-stage-header h3 {
+  color: var(--animal-text);
+  font-size: 2rem;
+  font-weight: 900;
+  line-height: 1.06;
+}
+
+.device-summary {
+  max-width: 64ch;
+  margin-top: 10px;
+}
+
+.device-status-card {
+  min-width: max-content;
+  background: rgba(25, 200, 185, 0.12);
+}
+
+.device-showcase {
+  display: grid;
+  grid-template-columns: minmax(0, 1.45fr) minmax(240px, 0.55fr);
+  gap: 18px;
+  align-items: stretch;
+  margin-top: 18px;
+}
+
+.device-main-shot {
+  display: grid;
+  grid-template-rows: 1fr auto;
+  min-width: 0;
+  margin: 0;
+  overflow: hidden;
+  border: 2px solid rgba(159, 146, 125, 0.46);
+  border-radius: var(--radius-lg);
+  background: #2f4b4a;
+}
+
+.device-main-shot img {
+  aspect-ratio: 480 / 222;
+  min-height: 0;
+  padding: 14px;
+}
+
+.device-main-shot figcaption {
+  padding: 12px 14px;
+  border-top: 2px solid rgba(255, 250, 240, 0.16);
+  color: #fffaf0;
+  font-weight: 900;
+}
+
+.device-detail-panel {
+  padding: 18px;
+  border: 2px dashed rgba(159, 146, 125, 0.46);
+  border-radius: var(--radius-md);
+  background: rgba(230, 249, 246, 0.52);
+}
+
+.device-interactions {
+  display: grid;
+  gap: 12px;
+  margin: 0;
+  padding-left: 20px;
+  color: var(--trail-ink);
+  line-height: 1.58;
+}
+
+.device-interactions li::marker {
+  color: var(--animal-primary-active);
+}
+
+.device-thumb-grid {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 12px;
+  margin-top: 14px;
+}
+
+.device-thumb {
+  display: grid;
+  gap: 8px;
+  min-width: 0;
+  padding: 8px;
+  border: 2px solid rgba(159, 146, 125, 0.32);
+  border-radius: var(--radius-md);
+  background: rgba(255, 250, 240, 0.82);
+  color: var(--animal-text-muted);
+  cursor: pointer;
+  text-align: left;
+  transition:
+    background-color 160ms var(--ease),
+    border-color 160ms var(--ease),
+    box-shadow 160ms var(--ease),
+    color 160ms var(--ease),
+    transform 160ms var(--ease);
+}
+
+.device-thumb:hover,
+.device-thumb.is-active {
+  color: var(--animal-text);
+  border-color: rgba(25, 200, 185, 0.58);
+  background: rgba(230, 249, 246, 0.86);
+  transform: translateY(-1px);
+}
+
+.device-thumb.is-active {
+  box-shadow: 0 3px 0 0 rgba(17, 168, 155, 0.32);
+}
+
+.device-thumb img {
+  aspect-ratio: 480 / 222;
+  border-radius: 10px;
+  background: #f8f4e8;
+}
+
+.device-thumb span {
+  display: block;
+  padding: 0 4px 3px;
+  font-size: 0.86rem;
+  font-weight: 900;
+}
+
+.device-empty {
+  grid-column: 1 / -1;
+  padding: 22px;
+  border: 2px dashed rgba(159, 146, 125, 0.46);
+  border-radius: var(--radius-md);
+  background: rgba(255, 250, 240, 0.7);
+}
+
+.device-empty h4 {
+  margin: 0 0 8px;
+  color: var(--animal-text);
+  font-size: 1.15rem;
+  font-weight: 900;
 }
 
 .story-stack {
   display: grid;
-  gap: 24px;
-  margin-top: 24px;
+  gap: 16px;
+  margin-top: 34px;
 }
 
-.language-section {
-  margin-top: 28px;
-  padding: 32px;
-  border-radius: 36px;
+.story-section {
+  display: grid;
+  grid-template-columns: minmax(260px, 0.72fr) minmax(0, 1.28fr);
+  gap: 28px;
+  align-items: center;
+  padding: 34px 0;
+  border-top: 2px solid rgba(159, 146, 125, 0.28);
+}
+
+.story-lede {
+  margin-top: 12px;
+}
+
+.story-media {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 14px;
+  min-height: 0;
+}
+
+.shot {
+  display: grid;
+  place-items: center;
+  width: 100%;
+  aspect-ratio: 480 / 222;
+  min-width: 0;
+  margin: 0;
+  padding: 10px;
+  overflow: hidden;
+  border: 2px solid rgba(159, 146, 125, 0.46);
+  border-radius: var(--radius-md);
   background:
-    radial-gradient(circle at top left, rgba(45, 111, 182, 0.07), transparent 28%),
-    linear-gradient(145deg, rgba(235, 163, 65, 0.18), rgba(250, 240, 216, 0.98)),
-    rgba(250, 240, 216, 0.98);
-  border: 1px solid var(--line);
-  box-shadow: 0 24px 64px rgba(107, 74, 30, 0.12);
+    linear-gradient(180deg, rgba(255, 255, 255, 0.55), rgba(255, 248, 231, 0.74)),
+    #f8f4e8;
+  box-shadow: 0 4px 0 0 rgba(212, 201, 180, 0.82);
+}
+
+.shot:hover {
+  transform: translateY(-2px);
+  border-color: var(--animal-border-hover);
+  box-shadow: 0 6px 0 0 rgba(212, 201, 180, 0.9);
+}
+
+.shot img {
+  border-radius: 10px;
+  background: #f8f4e8;
 }
 
 .language-highlights {
@@ -349,28 +1139,54 @@ dd {
 }
 
 .language-highlight,
-.language-pack-card {
+.language-pack-card,
+.board-card {
   padding: 22px;
-  border-radius: var(--radius-lg);
-  background:
-    linear-gradient(180deg, rgba(235, 163, 65, 0.12), rgba(250, 240, 216, 0.94)),
-    rgba(250, 240, 216, 0.96);
-  border: 1px solid var(--line);
-  box-shadow: 0 18px 40px rgba(107, 74, 30, 0.1);
+  border: 2px solid rgba(159, 146, 125, 0.42);
+  border-radius: var(--radius-md);
+  background: var(--surface);
+  box-shadow: 0 4px 0 0 rgba(212, 201, 180, 0.8);
+}
+
+.language-highlight:nth-child(4n + 1),
+.language-pack-card:nth-child(4n + 1),
+.board-card:nth-child(4n + 1) {
+  background: linear-gradient(180deg, rgba(230, 249, 246, 0.9), rgba(255, 252, 244, 0.94));
+}
+
+.language-highlight:nth-child(4n + 2),
+.language-pack-card:nth-child(4n + 2),
+.board-card:nth-child(4n + 2) {
+  background: linear-gradient(180deg, rgba(255, 248, 210, 0.92), rgba(255, 252, 244, 0.94));
+}
+
+.language-highlight:nth-child(4n + 3),
+.language-pack-card:nth-child(4n + 3),
+.board-card:nth-child(4n + 3) {
+  background: linear-gradient(180deg, rgba(232, 246, 218, 0.92), rgba(255, 252, 244, 0.94));
+}
+
+.language-highlight:hover,
+.language-pack-card:hover,
+.board-card:hover {
+  transform: translateY(-2px);
+  border-color: var(--animal-border-hover);
+  box-shadow: 0 6px 0 0 rgba(212, 201, 180, 0.9);
 }
 
 .language-highlight h3,
-.language-pack-card h3 {
-  font-size: 1.35rem;
-  line-height: 1.12;
-  letter-spacing: -0.03em;
+.language-pack-card h3,
+.board-card h3 {
+  color: var(--animal-text);
+  font-size: 1.28rem;
+  font-weight: 900;
+  line-height: 1.18;
+  letter-spacing: 0;
 }
 
 .language-highlight p:last-child,
 .language-pack-summary {
   margin-top: 10px;
-  color: var(--muted);
-  line-height: 1.7;
 }
 
 .language-pack-grid {
@@ -389,132 +1205,10 @@ dd {
   margin-top: 14px;
 }
 
-.language-pill {
-  display: inline-flex;
-  align-items: center;
-  min-height: 32px;
-  padding: 0 12px;
-  border-radius: 999px;
-  background: rgba(235, 163, 65, 0.12);
-  border: 1px solid var(--line);
-  color: var(--amber-dark);
-  font-family: "IBM Plex Mono", "Consolas", monospace;
-  font-size: 0.77rem;
-}
-
 .language-pack-empty {
   grid-column: 1 / -1;
 }
 
-.story-section {
-  display: grid;
-  grid-template-columns: minmax(0, 0.9fr) minmax(0, 1.1fr);
-  gap: 22px;
-  padding: 24px;
-}
-
-.story-section-alt {
-  grid-template-columns: minmax(0, 1.1fr) minmax(0, 0.9fr);
-}
-
-.story-copy {
-  align-self: center;
-}
-
-.story-copy h2,
-.links-section h2,
-.install-section h2 {
-  font-size: clamp(1.55rem, 3vw, 2.35rem);
-  line-height: 1.04;
-  letter-spacing: -0.035em;
-  margin-bottom: 12px;
-}
-
-.story-points {
-  margin: 18px 0 0;
-  padding-left: 18px;
-  color: var(--ink);
-  display: grid;
-  gap: 12px;
-  line-height: 1.55;
-}
-
-.story-media {
-  display: grid;
-  gap: 12px;
-  min-height: 360px;
-}
-
-.story-media-navigation {
-  grid-template-columns: 1.35fr 1fr 1fr;
-  grid-template-rows: 1.2fr 0.95fr;
-}
-
-.story-media-communication {
-  grid-template-columns: 0.9fr 1fr 1fr;
-  grid-template-rows: 0.92fr 0.92fr 1.05fr;
-}
-
-.story-media-utilities {
-  grid-template-columns: 1fr 1fr 1.1fr;
-  grid-template-rows: 0.95fr 0.9fr 1.05fr;
-}
-
-.shot {
-  margin: 0;
-  min-width: 0;
-  overflow: hidden;
-  border-radius: 18px;
-  background:
-    linear-gradient(180deg, rgba(250, 240, 216, 0.98), rgba(246, 230, 198, 0.96));
-  border: 1px solid var(--line);
-  box-shadow: 0 18px 40px rgba(107, 74, 30, 0.1);
-}
-
-.shot img {
-  display: block;
-  width: 100%;
-  height: 100%;
-  object-fit: contain;
-}
-
-.shot-wide {
-  grid-column: span 2;
-}
-
-.shot-tall {
-  grid-row: span 2;
-}
-
-.shot-panel {
-  padding: 10px;
-}
-
-.install-section {
-  margin-top: 34px;
-  padding: 32px;
-  border-radius: 36px;
-  background:
-    radial-gradient(circle at top right, rgba(45, 111, 182, 0.07), transparent 28%),
-    linear-gradient(145deg, rgba(235, 163, 65, 0.22), rgba(201, 129, 24, 0.08)),
-    rgba(250, 240, 216, 0.98);
-  color: var(--ink);
-  border: 1px solid var(--line);
-  box-shadow: 0 28px 70px rgba(107, 74, 30, 0.14);
-}
-
-.section-heading {
-  display: flex;
-  align-items: end;
-  justify-content: space-between;
-  gap: 24px;
-}
-
-.section-note {
-  max-width: 52ch;
-  color: var(--muted);
-}
-
 .install-grid {
   display: grid;
   grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -522,39 +1216,23 @@ dd {
   margin-top: 24px;
 }
 
-.board-card {
-  padding: 24px;
-  background:
-    linear-gradient(180deg, rgba(235, 163, 65, 0.14), rgba(250, 240, 216, 0.94)),
-    rgba(250, 240, 216, 0.96);
-  color: var(--ink);
-  border: 1px solid var(--line);
-  border-radius: var(--radius-lg);
-}
-
 .board-card h3 {
-  font-size: 1.5rem;
-  letter-spacing: -0.03em;
   margin-bottom: 8px;
+  font-size: 1.42rem;
 }
 
 .board-copy {
   min-height: 52px;
-  color: var(--muted);
 }
 
 .board-install {
   margin-top: 18px;
-  padding: 16px;
-  border-radius: var(--radius-md);
-  background: rgba(250, 240, 216, 0.72);
-  border: 1px solid var(--line);
+  padding-top: 16px;
+  border-top: 2px dashed rgba(159, 146, 125, 0.38);
 }
 
 .board-card-muted {
-  background:
-    linear-gradient(180deg, rgba(185, 74, 44, 0.08), rgba(250, 240, 216, 0.94)),
-    rgba(250, 240, 216, 0.96);
+  background: linear-gradient(180deg, rgba(224, 90, 90, 0.1), rgba(255, 252, 244, 0.94));
 }
 
 .install-button-wrap {
@@ -565,23 +1243,18 @@ dd {
 
 .flash-button {
   appearance: none;
-  border: 0;
-  min-height: 48px;
-  padding: 0 18px;
-  border-radius: 999px;
-  background: linear-gradient(180deg, var(--amber), var(--amber-dark));
-  color: #fff8ef;
-  box-shadow: 0 12px 24px rgba(201, 129, 24, 0.24);
-  font: inherit;
-  font-weight: 700;
   cursor: pointer;
 }
 
 .release-link {
   display: inline-flex;
   margin-top: 16px;
-  color: var(--info);
-  font-weight: 500;
+  color: var(--animal-primary-active);
+  font-weight: 900;
+}
+
+.release-link:hover {
+  color: var(--trail-ink);
 }
 
 .workflow-note {
@@ -593,10 +1266,63 @@ dd {
 
 .workflow-note p {
   padding: 14px 16px;
+  border: 2px dashed rgba(159, 146, 125, 0.38);
   border-radius: var(--radius-md);
-  background: rgba(235, 163, 65, 0.12);
-  border: 1px solid var(--line);
-  color: var(--muted);
+  background: rgba(255, 252, 244, 0.76);
+}
+
+.collapse-list {
+  display: grid;
+  gap: 12px;
+  margin-top: 24px;
+}
+
+.collapse-panel {
+  overflow: hidden;
+  border: 2px solid var(--animal-border);
+  border-radius: var(--radius-md);
+  background: rgba(255, 252, 244, 0.82);
+  box-shadow: 0 3px 0 0 rgba(212, 201, 180, 0.8);
+}
+
+.collapse-panel summary {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  min-height: 64px;
+  padding: 16px 24px;
+  cursor: pointer;
+  list-style: none;
+  font-size: 1.02rem;
+}
+
+.collapse-panel summary::-webkit-details-marker {
+  display: none;
+}
+
+.collapse-icon {
+  display: inline-flex;
+  flex: 0 0 28px;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
+  background: var(--animal-primary);
+  color: #fff;
+  box-shadow: 0 2px 4px rgba(25, 200, 185, 0.3);
+  font-size: 1.1rem;
+  font-weight: 900;
+  transition: transform 220ms var(--ease);
+}
+
+.collapse-panel[open] .collapse-icon {
+  transform: rotate(45deg);
+}
+
+.collapse-content {
+  padding: 0 24px 24px 64px;
+  animation: fadeIn 0.25s ease;
 }
 
 .links-section {
@@ -604,18 +1330,131 @@ dd {
 }
 
 .links-section article {
-  padding: 26px;
+  padding: 28px;
+  border: 2px solid rgba(159, 146, 125, 0.42);
+  border-radius: var(--radius-lg);
+  background: rgba(230, 249, 246, 0.62);
 }
 
-@media (max-width: 960px) {
+.links-section p {
+  max-width: 74ch;
+  margin-top: 10px;
+}
+
+dt {
+  margin-bottom: 6px;
+  color: var(--animal-text-muted);
+  font-size: 0.95rem;
+}
+
+dd {
+  font-size: 1.05rem;
+  line-height: 1.45;
+}
+
+.site-footer {
+  margin-top: 44px;
+}
+
+.site-footer-card {
+  display: flex;
+  align-items: flex-end;
+  justify-content: space-between;
+  gap: 24px;
+  padding: 28px;
+  border: 2px solid rgba(159, 146, 125, 0.42);
+  border-radius: var(--radius-lg);
+  background: rgba(255, 252, 244, 0.84);
+  box-shadow: 0 5px 0 0 rgba(212, 201, 180, 0.78);
+}
+
+.site-footer-card h2 {
+  max-width: 18ch;
+}
+
+.site-footer-card p:last-child {
+  max-width: 68ch;
+  margin-top: 12px;
+}
+
+.site-footer-links {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  justify-content: flex-end;
+}
+
+.site-footer-links a {
+  display: inline-flex;
+  align-items: center;
+  min-height: 40px;
+  padding: 0 14px;
+  border: 2px solid rgba(159, 146, 125, 0.36);
+  border-radius: var(--radius-pill);
+  background: rgba(230, 249, 246, 0.74);
+  color: var(--animal-text);
+  font-weight: 900;
+  transition:
+    background-color 160ms var(--ease),
+    transform 160ms var(--ease);
+}
+
+.site-footer-links a:hover {
+  background: rgba(25, 200, 185, 0.16);
+  transform: translateY(-1px);
+}
+
+.animal-footer-art {
+  width: 100%;
+  height: 96px;
+  margin-top: 18px;
+  background: url("./assets/animal-island/footer/footer-tree.webp") bottom center / cover no-repeat;
+  border-radius: var(--radius-lg);
+}
+
+@media (max-width: 1120px) {
+  .content-shell {
+    grid-template-columns: 1fr;
+  }
+
+  .sidebar {
+    position: sticky;
+    top: 86px;
+    z-index: 12;
+    max-height: none;
+    overflow: visible;
+  }
+
+  .side-nav {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: flex-start;
+  }
+
+  .side-nav > a,
+  .nav-group {
+    flex: 1 1 160px;
+  }
+
+  .nav-group {
+    min-width: 220px;
+  }
+
+  .side-device {
+    width: 100%;
+    margin-right: 0;
+  }
+}
+
+@media (max-width: 980px) {
   .hero,
   .overview-ribbon,
-  .language-highlights,
-  .language-pack-grid,
+  .device-browser,
+  .device-showcase,
   .story-section,
-  .story-section-alt,
   .install-grid,
-  .workflow-note {
+  .workflow-note,
+  .capability-grid {
     grid-template-columns: 1fr;
   }
 
@@ -623,73 +1462,206 @@ dd {
     justify-content: flex-start;
   }
 
-  .story-media-navigation,
-  .story-media-communication,
-  .story-media-utilities {
-    grid-template-columns: repeat(2, minmax(0, 1fr));
-    grid-template-rows: auto;
-  }
-
-  .shot-wide,
-  .shot-tall {
-    grid-column: auto;
-    grid-row: auto;
-  }
-
-  .section-heading {
-    align-items: start;
+  .section-heading,
+  .device-stage-header {
+    align-items: flex-start;
     flex-direction: column;
   }
+
+  .hero-copy {
+    max-width: none;
+  }
+
+  .hero-tagline {
+    max-width: 20ch;
+  }
+
+  .device-switcher {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+
+  .site-footer-card {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+
+  .site-footer-links {
+    justify-content: flex-start;
+  }
 }
 
-@media (max-width: 720px) {
+@media (max-width: 760px) {
+  html,
+  body {
+    overflow-x: hidden;
+  }
+
   .page-shell {
-    width: min(100% - 24px, 1180px);
+    width: calc(100% - 24px);
     padding-top: 12px;
   }
 
   .topbar {
-    flex-direction: column;
     align-items: stretch;
-    border-radius: 24px;
+    flex-direction: column;
   }
 
-  .brand {
+  .brand,
+  .top-actions {
     justify-content: center;
   }
 
-  .nav {
-    justify-content: space-between;
-    gap: 10px;
+  .top-actions {
+    display: grid;
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+    width: 100%;
   }
 
-  .hero-copy,
-  .hero-visual,
-  .overview-ribbon,
-  .language-section,
-  .story-section,
-  .install-section,
-  .board-card,
-  .links-section article {
-    padding: 22px;
+  .top-link {
+    width: 100%;
+    min-width: 0;
+    padding-inline: 10px;
   }
 
-  .hero-note {
+  .language-toggle {
+    display: grid;
+    grid-column: 1 / -1;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    width: 100%;
+  }
+
+  .lang-button {
+    min-width: 0;
+  }
+
+  .sidebar {
     position: static;
-    max-width: none;
-    margin-top: 12px;
+    padding: 14px;
   }
 
-  .hero-visual {
-    min-height: auto;
+  .side-nav {
+    display: grid;
+    overflow: visible;
+    padding-bottom: 0;
   }
 
-  .hero-screen {
-    min-height: 240px;
+  .side-nav > a,
+  .nav-group {
+    flex: initial;
+    min-width: 0;
+  }
+
+  .side-device {
+    width: 100%;
+    min-height: 40px;
+    padding-inline: 12px;
+  }
+
+  .hero {
+    padding-top: 24px;
   }
 
   h1 {
+    font-size: 3.2rem;
+  }
+
+  .hero-tagline {
     max-width: none;
-    font-size: clamp(2.4rem, 14vw, 3.5rem);
+    font-size: 1.55rem;
+  }
+
+  .hero-visual,
+  .capability-section,
+  .device-section,
+  .language-section,
+  .install-section,
+  .links-section article {
+    padding: 20px;
+    border-radius: var(--radius-lg);
+  }
+
+  .hero-visual,
+  .language-highlights,
+  .language-pack-grid,
+  .story-media,
+  .device-thumb-grid,
+  .device-switcher,
+  .capability-grid {
+    grid-template-columns: 1fr;
+  }
+
+  .device-switcher {
+    display: grid;
+  }
+
+  .hero-screen {
+    grid-column: auto;
+  }
+
+  .section-heading h2,
+  .story-copy h2,
+  .links-section h2,
+  .install-section h2 {
+    font-size: 1.65rem;
+  }
+
+  .device-stage-header h3 {
+    font-size: 1.65rem;
+  }
+
+  .collapse-panel summary {
+    padding: 14px 16px;
+  }
+
+  .collapse-content {
+    padding: 0 16px 18px 56px;
+  }
+}
+
+@media (max-width: 430px) {
+  .page-shell {
+    width: calc(100% - 18px);
+  }
+
+  .topbar,
+  .hero-visual,
+  .capability-section,
+  .device-section,
+  .language-section,
+  .install-section,
+  .links-section article,
+  .capability-card,
+  .language-highlight,
+  .language-pack-card,
+  .board-card,
+  .device-stage,
+  .site-footer-card {
+    padding: 16px;
+  }
+
+  h1 {
+    font-size: 2.72rem;
+  }
+
+  .hero-tagline {
+    font-size: 1.32rem;
+  }
+
+  .button,
+  .flash-button {
+    width: 100%;
+  }
+
+  .overview-ribbon {
+    padding: 18px;
+  }
+
+  .collapse-content {
+    padding-left: 16px;
+  }
+
+  .site-footer-links a {
+    flex: 1 1 100%;
+    justify-content: center;
   }
 }
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6a166060..86862a36 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,3 @@
-# Legacy note:
-# The active ESP-IDF application component now lives in `apps/esp_idf/CMakeLists.txt`.
-# This file is intentionally no longer used as an IDF component root, and `src/` now only keeps the thin PlatformIO Arduino trampoline entry (`src/main.cpp`).
+# PlatformIO Arduino note:
+# The active ESP Arduino runtime entry lives in `apps/esp32_lvgl`.
+# This directory only keeps the thin PlatformIO Arduino trampoline entry (`src/main.cpp`).
diff --git a/src/main.cpp b/src/main.cpp
index a8ce2d92..9a92a779 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,25 +1,25 @@
 #include <Arduino.h>
 
 #if defined(GAT562_MESH_EVB_PRO)
-#include "apps/gat562_mesh_evb_pro/arduino_entry.h"
+#include "nrf52_node_arduino_entry.h"
 #else
-#include "apps/esp_pio/arduino_entry.h"
+#include "esp32_lvgl_arduino_entry.h"
 #endif
 
 void setup()
 {
 #if defined(GAT562_MESH_EVB_PRO)
-    apps::gat562_mesh_evb_pro::arduino_entry::setup();
+    trailmate::apps::nrf52_node::arduino_entry::setup();
 #else
-    apps::esp_pio::arduino_entry::setup();
+    trailmate::apps::esp32_lvgl::arduino_entry::setup();
 #endif
 }
 
 void loop()
 {
 #if defined(GAT562_MESH_EVB_PRO)
-    apps::gat562_mesh_evb_pro::arduino_entry::loop();
+    trailmate::apps::nrf52_node::arduino_entry::loop();
 #else
-    apps::esp_pio::arduino_entry::loop();
+    trailmate::apps::esp32_lvgl::arduino_entry::loop();
 #endif
 }
diff --git a/tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md b/tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md
new file mode 100644
index 00000000..28d25000
--- /dev/null
+++ b/tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md
@@ -0,0 +1,393 @@
+# Known Product Architecture Violations
+
+This file records historical boundary drift that Phase 1 intentionally does not
+fix. The new checker is non-blocking so these can be reduced in later phases
+without turning the architecture baseline PR into a behavior-changing rewrite.
+
+## Current Known Categories
+
+### core_sys still contains platform UI contracts
+
+`modules/core_sys/include/platform/ui/*` currently exposes platform-facing UI
+runtime contracts from inside a `core_*` module. This violates the new wording
+that shared core must not include platform/UI headers. It is historical layout
+from the ongoing migration and should be addressed by a later boundary split.
+
+### BLE runtime still carries historical phone-protocol transport glue
+
+The ESP and nRF52 BLE hosts now construct `modules/core_phone` cores through an
+`AppPhoneFacade`, so GPS/time/config/board reads are no longer owned directly by
+the BLE service classes. Historical transport files still contain compatibility
+glue around Meshtastic reads/notifies and ESP MeshCore NUS command/event
+queues. Later Phase 2 slices should keep reducing these protocol-shaped helpers
+or explicitly move them behind phone-core session APIs.
+
+Current known BLE-host exceptions include:
+
+- `platform/esp/arduino_common/src/ble/meshtastic_ble.cpp` still has
+  Meshtastic characteristic names, queue names, and read/notify compatibility
+  state such as `ToRadio`/`FromRadio` buffers. Phase 4.5.3 moved its
+  Chat/Team observer registration into `MeshtasticBleObserverBridge`.
+- `platform/nrf52/arduino_common/src/ble/meshtastic_ble.cpp` still has the
+  same Meshtastic transport compatibility surface for Bluefruit. Phase 4.5.3
+  moved its Chat observer registration into `MeshtasticBleObserverBridge` and
+  board/settings persistence into `MeshtasticBlePersistenceBridge`.
+- `platform/esp/arduino_common/src/ble/meshcore_ble.cpp` still carries legacy
+  MeshCore NUS fallback parsing, offline queues, manual contacts, and push
+  framing while the shared core coverage is being expanded.
+- ESP/nRF52 MeshCore BLE hosts still register Chat/Team observers directly;
+  those remain BLE-host thinning follow-ups and should move to bridge objects
+  before Phase 5 starts depending on MeshCore BLE status projection.
+- `platform/esp/arduino_common/include/ble/meshcore_ble.h` still implements
+  `MeshCorePhoneHooks` for BLE-local state such as connection, PIN, telemetry
+  mode, and manual contacts.
+
+### Radio runtime and chat protocol adapters are still partially coupled
+
+Existing ESP and nRF52 radio adapter code still lives close to Meshtastic and
+MeshCore adapter logic. Later phases should move direct-message, peer-key, PKI,
+and protocol mapping decisions out of platform/radio files and into shared
+protocol/use-case cores.
+
+Phase 4 introduces the shared `modules/core_mesh` boundary for this split:
+`IPacketRadio`, identity/key store ports, `PeerIdentityService`,
+`DirectMessageService`, `ReceivePacketService`, `MeshSession`, and initial
+Meshtastic/MeshCore protocol strategy shells. The legacy adapters remain known
+violations until their behavior is migrated behind those ports/use cases.
+Phase 4 PR 4.2/4.3 also adds platform store adapters for Meshtastic-compatible
+32-byte local identities and peer public keys:
+`EspPreferencesLocalIdentityStore`, `EspPreferencesPeerKeyStore`,
+`Nrf52SettingsLocalIdentityStore`, `Nrf52SettingsPeerKeyStore`,
+`LinuxSqliteLocalIdentityStore`, and `LinuxSqlitePeerKeyStore`. ESP, nRF52, and
+Linux Meshtastic adapters now route PKI identity/key persistence through those
+adapters, but their protocol PKI flow, direct encryption/decryption, and runtime
+packet behavior are still historical adapter responsibilities until the
+protocol strategy and use-case migration slices take over.
+
+Phase 4 PR 4.8 starts thinning the ESP compatibility adapters by routing ESP
+Meshtastic non-PKI app-data packet construction through
+`MeshtasticProtocolStrategy` and ESP MeshCore direct/group app-data frame
+construction through `MeshCoreProtocolStrategy`. Radio TX, route selection,
+legacy ACK tracking, PKI compatibility paths, receive parsing, and platform
+event bridging remain in the adapters as known follow-up violations until the
+full `DirectMessageService`/`ReceivePacketService` bridge can take ownership
+without changing on-air behavior.
+
+Phase 4.5 turns this category into a burn-down list rather than a generic
+exception. The already-established boundaries are:
+
+- Target manifests now name `core_mesh` as the Meshtastic/MeshCore radio
+  profile source and `core_phone` as the BLE phone protocol owner where BLE is
+  present.
+- Store persistence is wrapped by platform store adapters; stores should not
+  decide peer trust, fallback, or key overwrite policy.
+- ESP Meshtastic non-PKI app-data packet construction has a
+  `MeshtasticProtocolStrategy` path. Phase 4.5.4 routes the actual ESP
+  Meshtastic channel-key app-data send path through
+  `MeshSession::sendDirect` -> `DirectMessageService` -> `MeshtasticProtocolStrategy`
+  -> `IPacketRadio` via `EspMeshtasticAdapterBridge`.
+- Phase 4.5.5 routes the actual ESP Meshtastic raw receive entry through
+  `EspMeshtasticAdapterBridge::onRadioPacket` -> `ReceivePacketService` ->
+  `MeshtasticProtocolStrategy::parseRadioPacket` for shared parse/event
+  observation before the legacy compatibility receive logic continues.
+- ESP MeshCore direct/group app-data frame construction has a
+  `MeshCoreProtocolStrategy` path.
+
+Remaining Phase 4.5 mesh ownership items:
+
+- ESP Meshtastic channel-key app-data direct send now routes through
+  `MeshSession::sendDirect` -> `DirectMessageService` -> `MeshtasticProtocolStrategy`
+  -> `IPacketRadio`. PKI direct send remains legacy-owned.
+- ESP Meshtastic raw receive now also routes through `ReceivePacketService`
+  for the shared parse/event path. Legacy receive remains authoritative for
+  channel/PKI decrypt, self/drop handling, app queues, ACK/retry, MQTT proxy,
+  node info, position, and compatibility event publishing.
+- Meshtastic PKI flow, direct encryption/decryption, route selection,
+  retransmit/ACK behavior, and decrypted receive routing remain legacy-owned
+  until moved behind `core_mesh`.
+- MeshCore identity routing, peer-key behavior, direct/group payload
+  encryption/decryption, ACK/retry behavior, and receive parsing remain
+  legacy-owned until moved behind `core_mesh`.
+- nRF52 and Linux active radio paths still need the same MeshSession bridge
+  treatment; platform-specific fixes must not add new protocol policy.
+
+Current known LoRa/Mesh exceptions include:
+
+- `platform/esp/arduino_common/src/chat/infra/meshtastic/mt_adapter.cpp`
+  still owns Meshtastic PKI flow, direct encryption/decryption, packet
+  build/parse, retransmit policy, and radio transmit bridging. PKI persistence
+  has been wrapped by platform store adapters, but protocol behavior has not
+  moved yet.
+- `platform/esp/arduino_common/src/chat/infra/meshcore/meshcore_adapter.cpp`
+  still owns MeshCore peer public-key persistence, identity routing, direct
+  payload encryption/decryption, frame build/parse, ACK/retry behavior, and
+  radio transmit bridging.
+- `platform/nrf52/arduino_common/src/chat/infra/meshtastic/meshtastic_radio_adapter.cpp`
+  still owns Meshtastic direct-message/PKI behavior, peer key memory, and
+  retransmit behavior next to radio I/O. PKI persistence has been wrapped by
+  platform store adapters, but protocol behavior has not moved yet.
+- `platform/nrf52/arduino_common/src/chat/infra/meshcore/meshcore_radio_adapter.cpp`
+  still owns MeshCore direct/group payload framing and identity behavior next
+  to radio I/O.
+- `platform/linux/common/src/chat/linux_raw_lora_mesh_adapter.cpp` still owns
+  Meshtastic direct-message/PKI behavior and packet build/parse next to Linux
+  radio I/O. PKI persistence has been wrapped by the Linux store adapter, but
+  protocol behavior has not moved yet.
+
+During Phase 4, new direct-send and receive paths should be added to
+`modules/core_mesh` first, then the legacy adapters should be thinned into
+compatibility shells instead of receiving new protocol-specific policy.
+
+### GPS runtime still exposes platform UI service surfaces
+
+Existing GPS runtime APIs are consumed directly by parts of the current UI and
+Linux uConsole presentation code. Later phases should route GPS facts through a
+LocationService, TimeAuthority, and presentation snapshots.
+
+Phase 3 introduces the shared `core_gps` ports and use cases for this split:
+`IGnssByteStream`, `ILocationSource`, `ITimeAuthority`, `NmeaParser`,
+`LocationService`, and `TimeAuthority`. ESP BLE and Team track sampling now have
+adapter paths that consume `ILocationSource` rather than reading GPS state as
+their own domain fact. The older platform/UI GPS runtime remains in place as a
+compatibility surface for existing pages and Linux simulator behavior until the
+presentation-model phase can replace those direct reads.
+
+Phase 4.5 records the current GPS consumer inventory in
+`docs/audits/GPS_CONSUMER_BOUNDARY_AUDIT.md`. New non-UI consumers should use
+`ILocationSource`, `ITimeAuthority`, or a device/status snapshot. Existing UI
+consumers may stay on `platform/ui/gps_runtime.h` only as Phase 5 replacement
+inputs.
+
+Current known GPS/time exceptions include:
+
+- `platform/ui/gps_runtime.h` is still the UI compatibility facade for existing
+  LVGL, mono, GTK, and Linux simulator surfaces.
+- ESP `GpsService` still owns the current Arduino task shell, receiver config
+  application, TinyGPS-backed parsing, and track-recorder append path.
+- Some board packages still perform direct `settimeofday` or RTC synchronization
+  as historical hardware runtime behavior.
+- Host/UI runtime code may still read system time directly for display or legacy
+  status until those surfaces consume `ITimeAuthority`/device snapshots.
+
+### LVGL/shared UI code still contains product and platform coupling
+
+Some current LVGL/shared UI files still call app facades and platform UI
+runtime APIs directly. Later phases should introduce presentation models that
+consume app snapshots and send UI actions without owning business state.
+
+### GTK uConsole workbench still mixes presentation and platform probes
+
+The current uConsole GTK workbench and models still reach into hardware probe
+and platform UI runtime APIs. Later phases should separate board/platform
+capability probing from GTK rendering and presentation state.
+
+### Target/board preprocessor macros remain outside final composition roots
+
+The current repo still uses board and target macros in build adapters and
+runtime selection files. Later phases should keep product choice in explicit
+composition roots and target manifests.
+
+### Phase 5.6 Chat Presentation Remaining Legacy Ownership
+
+Status: known, bounded.
+
+Phase 5.6 introduced:
+
+- `ui_presentation` chat identity/snapshot/model
+- `chat_presentation_adapters` mapper
+- `ChatPresentationSource`
+- `LegacyChatActionSink`
+- partial `ChatUiController` integration
+
+Remaining legacy ownership:
+
+- `ChatUiController` still owns LVGL state machine.
+- `ChatUiController` still depends on `ChatService` for event processing and
+  compatibility flows.
+- Team text projection migrated to `TeamChatPresentationSource`.
+- Team text send migrated to `TeamChatActionSink`.
+- Team location/command entries are currently projected as textual
+  `MessageRow` summaries.
+- Team location/command picker remains legacy-owned.
+- Team richer payload UI remains future work.
+- Team structured pending/failure remains future work.
+- Key verification remains legacy-owned.
+- Team position picker remains legacy-owned.
+- Conversation list cache remains legacy-owned.
+- Structured send failure is not yet preserved in `ChatMessage`.
+
+Rules:
+
+- New non-team chat presentation should use `ChatWorkspaceModel`.
+- New Team text presentation should use the dedicated Team ChatWorkspaceModel
+  backed by `TeamChatPresentationSource` and `TeamChatActionSink`.
+- Renderer must not infer pending/failure state.
+
+### Phase 5.7 Map Presentation Remaining Legacy Ownership
+
+Status: known, bounded.
+
+Phase 5.7 introduced:
+
+- `ui_presentation/map` snapshot/source/sink/model.
+- `LegacyMapPresentationSource`.
+- `LegacyMapActionSink`.
+- compact LVGL map runtime consumption of `MapWorkspaceModel`.
+- uConsole `presentation_workspace` bridge.
+- ASCII/headless `MapWorkspaceSnapshot` probe.
+
+Migrated surfaces:
+
+- Map self-location projection now flows through `MapWorkspaceModel` on the
+  compact LVGL map runtime.
+- Center-on-self action now flows through `MapWorkspaceModel` on the compact
+  LVGL map runtime.
+- uConsole map center fix projection now consumes `LegacyGpsStatusSource`
+  rather than including `platform/ui/gps_runtime.h` directly in the map model.
+- uConsole exposes portable `presentation_workspace` inside its legacy
+  tile/cache map snapshot.
+- Headless map presentation is covered by `trailmate_map_workspace_ascii_probe`.
+
+Remaining legacy ownership:
+
+- ESP/LVGL `GPSPageState` still owns LVGL widgets, tile context, map anchors,
+  pan/zoom/follow state, route/tracker overlays, Team marker widgets, timers,
+  and input/edit mode.
+- Shared LVGL `ui/widgets/map/map_viewport.*` still owns tile rendering, tile
+  loader timers, gesture runtime, map source config reads, and tile availability
+  checks.
+- ESP/Linux map tile loaders still own tile image loading, SD/cache paths,
+  contour tile rendering, and missing tile notices.
+- GTK/uConsole still owns tile path enumeration, cache stats, contour store and
+  generator access, MQTT/contact node projection, click-to-coordinate math, and
+  pan/zoom persistence.
+- Rich Team map markers remain legacy-owned.
+- Route/tracker overlays remain legacy-owned.
+- Advanced measurement tools remain legacy-owned or unimplemented.
+- Offline map package scanning and repair remain legacy-owned.
+- Tile download retry state remains legacy-owned.
+
+Rules:
+
+- New map workspace status/actions should use `MapWorkspaceModel`.
+- Renderer must not infer GPS fix, layer state, or Team summary from tile/cache
+  side effects.
+- Tile/cache/route/rich overlay cleanup must be handled in later bounded
+  phases, not by expanding `MapWorkspaceModel`.
+
+### Phase 5 Final Presentation Boundary Status
+
+Status: ready-with-legacy.
+
+Phase 5 established presentation boundaries for:
+
+- Device
+- GPS
+- Mesh
+- Settings
+- Chat
+- Team Chat
+- Map
+- PresentationWorkspace
+- Renderer hardening
+
+Remaining UI legacy islands are recorded in:
+
+- `docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md`
+- `docs/audits/PHASE5_FINAL_READINESS_REPORT.md`
+- `docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md`
+- `tools/architecture/phase5_renderer_legacy_baseline.json`
+
+These are no longer uncontrolled architecture violations. They are bounded
+legacy islands.
+
+Phase 5 final readiness is guarded by:
+
+- `tools/architecture/check_phase5_ready.py`
+- `tools/architecture/check_phase5_workspace_ready.py`
+- `tools/architecture/check_phase5_renderer_ready.py`
+- `tools/architecture/check_phase5_final_ready.py`
+
+Future phases must either:
+
+- preserve the presentation boundary, or
+- explicitly migrate a legacy island behind a stricter adapter/model.
+
+Future phases must not:
+
+- bypass `ChatWorkspaceModel` for new chat UI paths
+- bypass `MapWorkspaceModel` for new map workspace state
+- map Team chat to DirectPeer or Channel
+- put tile/cache into `MapWorkspaceSnapshot`
+- let renderers infer pending/failure state
+
+### Phase 6 Product Composition Boundary Status
+
+Status: ready-with-legacy.
+
+Phase 6 established product composition and app shell boundaries for:
+
+- product composition contracts
+- Linux simulator composition root
+- uConsole composition root pilot
+- ESP LVGL composition bridge audit
+- AppContext legacy bridge audit
+- Phase 6 composition legacy baseline
+- Phase 6 composition readiness checker
+
+Remaining composition legacy surfaces are recorded in:
+
+- `docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md`
+- `docs/audits/ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md`
+- `docs/audits/PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md`
+- `docs/audits/PHASE6_COMPOSITION_READINESS_REPORT.md`
+- `tools/architecture/phase6_composition_legacy_baseline.json`
+
+These are no longer uncontrolled object graph construction violations. They are
+bounded legacy composition surfaces.
+
+Future phases must either:
+
+- preserve the composition root boundary, or
+- explicitly migrate a legacy composition surface behind a target/app shell
+  root.
+
+Future phases must not:
+
+- add dynamic service lookup to `AppServicesBundle`
+- construct source/sink/model objects inside `ui_presentation`
+- create app services from renderer/page code
+- expand `AppContext` for new unrelated dependencies
+- put board or target product selection into renderers
+
+### Phase 7.1 Chat Delivery Runtime Ownership Status
+
+Status: in progress / bounded.
+
+Phase 7.1 establishes runtime ownership for chat delivery, pending, and
+failure state:
+
+- `ChatDeliveryReadModel`
+- `ChatDeliveryEventProjector`
+- `LegacyChatDeliveryBridge`
+- optional delivery enrichment in `ChatPresentationSource`
+- composition-root ownership in Linux simulator and uConsole pilots
+
+Remaining delivery/runtime legacy work is recorded in:
+
+- `docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md`
+- `docs/specification/CHAT_DELIVERY_RUNTIME_SPEC.md`
+- `docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md`
+
+Future phases must not:
+
+- put pending queues into `ChatWorkspaceModel`
+- let renderers infer failure from labels, colors, or button state
+- move chat delivery runtime into `ui_presentation`
+- make `ChatPresentationSource` receive send events or own retry policy
+
+## Operating Rule
+
+Do not fix these categories opportunistically inside unrelated feature PRs.
+When a later phase removes one category, update this file and consider enabling
+the relevant checker rule in `--strict` mode for that area.
diff --git a/tools/architecture/check_all_target_architecture_ready.py b/tools/architecture/check_all_target_architecture_ready.py
new file mode 100644
index 00000000..14560481
--- /dev/null
+++ b/tools/architecture/check_all_target_architecture_ready.py
@@ -0,0 +1,181 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+TARGETS = [
+    "tab5",
+    "tdisplayp4_tft",
+    "tdisplayp4_amoled",
+    "tlora_pager",
+    "tdeck",
+    "twatch",
+    "uconsole",
+    "cardputerzero",
+    "gat562_mesh_evb_pro",
+]
+
+BOARD_DIRS = [
+    "boards/tab5",
+    "boards/tdisplayp4",
+    "boards/tlora_pager",
+    "boards/tdeck",
+    "boards/twatch",
+    "boards/uconsole",
+    "boards/cardputerzero",
+    "boards/gat562_mesh_evb_pro",
+]
+
+UI_PROFILES = [
+    "tab5_touch_ui",
+    "tdisplayp4_touch_ui",
+    "pager_compact_ui",
+    "deck_wide_ui",
+    "watch_compact_ui",
+    "uconsole_desktop_ui",
+    "cardputer_compact_ui",
+    "node_headless_ui",
+]
+
+PAGE_MANIFESTS = [
+    "tab5_touch_manifest",
+    "tdisplayp4_touch_manifest",
+    "pager_compact_manifest",
+    "deck_full_manifest",
+    "watch_compact_manifest",
+    "uconsole_desktop_manifest",
+    "cardputer_compact_manifest",
+    "node_headless_manifest",
+]
+
+LAYOUT_PROFILES = [
+    "tab5_large_touch",
+    "tdisplayp4_touch",
+    "pager_compact",
+    "deck_wide",
+    "watch_compact",
+    "uconsole_desktop",
+    "cardputer_compact",
+    "headless_node",
+]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    required_files = [
+        "modules/product_composition/include/product_composition/target_profile.h",
+        "modules/product_composition/src/target_profile.cpp",
+        "modules/product_composition/tests/test_target_profile.cpp",
+        "modules/product_composition/include/product_composition/target_build_binding.h",
+        "modules/product_composition/src/target_build_binding.cpp",
+        "modules/product_composition/tests/test_target_build_binding.cpp",
+        "modules/product_composition/include/product_composition/target_ux_binding.h",
+        "modules/product_composition/src/target_ux_binding.cpp",
+        "modules/product_composition/tests/test_target_ux_binding.cpp",
+        "modules/ui_presentation/include/ui_presentation/target_ui_profile.h",
+        "modules/ui_presentation/src/target_ui_profile.cpp",
+        "modules/ui_presentation/tests/test_target_ui_profile.cpp",
+        "modules/ui_presentation/include/ui_presentation/page/page_manifest.h",
+        "modules/ui_presentation/src/page/page_manifest.cpp",
+        "modules/ui_presentation/tests/test_page_manifest.cpp",
+        "modules/ui_presentation/include/ui_presentation/layout/layout_profile.h",
+        "modules/ui_presentation/src/layout/layout_profile.cpp",
+        "modules/ui_presentation/tests/test_layout_profile.cpp",
+        "docs/targets/TARGET_MATRIX.md",
+        "docs/audits/TARGET_UI_FINAL_OWNERSHIP_REPORT.md",
+        "docs/audits/TARGET_UX_PACK_GAP_REPORT.md",
+    ]
+    for rel in required_files:
+        require_file(rel, failures)
+
+    for rel in [
+        "modules/product_composition/src/target_profile.cpp",
+        "modules/product_composition/src/target_build_binding.cpp",
+        "modules/product_composition/src/target_ux_binding.cpp",
+        "docs/targets/TARGET_MATRIX.md",
+    ]:
+        require_tokens(rel, TARGETS, failures)
+
+    require_tokens(
+        "modules/ui_presentation/src/target_ui_profile.cpp",
+        UI_PROFILES,
+        failures,
+    )
+    require_tokens(
+        "modules/ui_presentation/src/page/page_manifest.cpp",
+        PAGE_MANIFESTS,
+        failures,
+    )
+    require_tokens(
+        "modules/ui_presentation/src/layout/layout_profile.cpp",
+        LAYOUT_PROFILES,
+        failures,
+    )
+
+    for board_dir in BOARD_DIRS:
+        require_file(f"{board_dir}/BOARD.md", failures)
+        require_file(f"{board_dir}/board_facts.h", failures)
+
+    require_tokens(
+        "docs/audits/TARGET_UI_FINAL_OWNERSHIP_REPORT.md",
+        [
+            "No intermediate UI layer introduced.",
+            "No transitional UI adapter introduced.",
+            "No legacy UI extraction layer introduced.",
+            "TargetProfile",
+            "TargetBuildBinding",
+            "TargetUxBinding",
+            "PageManifest",
+            "LayoutProfile",
+            "root",
+        ],
+        failures,
+    )
+
+    for rel in [
+        "apps/esp32_lvgl/src/esp32_lvgl_app_shell.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.h",
+        "apps/linux_sim_shell/src/linux_sim_app_shell.h",
+        "apps/nrf52_node/src/nrf52_node_app_shell.h",
+    ]:
+        require_tokens(
+            rel,
+            ["targetId", "targetProfile", "activeUxPackId", "TargetProfile"],
+            failures,
+        )
+
+    if failures:
+        for failure in failures:
+            print(f"[all-target-architecture] {failure}")
+        return 1
+
+    print("[all-target-architecture] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_board_facts_boundary_ready.py b/tools/architecture/check_board_facts_boundary_ready.py
new file mode 100644
index 00000000..042e310e
--- /dev/null
+++ b/tools/architecture/check_board_facts_boundary_ready.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+FORBIDDEN_TOKENS = [
+    "ux_pack",
+    "page_manifest",
+    "layout_profile",
+    "app_shell",
+    "renderer",
+    "TargetProfile",
+    "product_composition",
+]
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    boards_root = ROOT / "boards"
+    for path in boards_root.rglob("*"):
+        if not path.is_file() or path.suffix not in {".h", ".hpp", ".cpp", ".md"}:
+            continue
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for token in FORBIDDEN_TOKENS:
+            if token in text:
+                rel = path.relative_to(ROOT).as_posix()
+                failures.append(f"{rel} contains board boundary violation token: {token}")
+
+    if failures:
+        for failure in failures:
+            print(f"[board-facts-boundary] {failure}")
+        return 1
+
+    print("[board-facts-boundary] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_esp_arduino_real_targets_restored.py b/tools/architecture/check_esp_arduino_real_targets_restored.py
new file mode 100644
index 00000000..83d15581
--- /dev/null
+++ b/tools/architecture/check_esp_arduino_real_targets_restored.py
@@ -0,0 +1,205 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+ACTIVE_ROOTS = [
+    "src",
+    "apps",
+    "builds",
+    "modules",
+    "platform",
+    "boards",
+    "variants",
+    "cmake",
+]
+
+FORBIDDEN_ACTIVE_TOKENS = [
+    "apps/esp_pio",
+    "apps\\esp_pio",
+    "apps/gat562_mesh_evb_pro",
+    "apps\\gat562_mesh_evb_pro",
+]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def iter_files(root: Path):
+    if not root.exists():
+        return
+    for path in root.rglob("*"):
+        if path.is_file():
+            yield path
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required ESP Arduino owner file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def forbid_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        return
+    text = read(rel)
+    for token in tokens:
+        if token in text:
+            failures.append(f"{rel} contains forbidden token: {token}")
+
+
+def check_active_code_has_no_deleted_app_root_references(failures: list[str]) -> None:
+    for root_name in ACTIVE_ROOTS:
+        for path in iter_files(ROOT / root_name):
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in FORBIDDEN_ACTIVE_TOKENS:
+                if token in text:
+                    failures.append(
+                        f"{path.relative_to(ROOT).as_posix()} contains deleted app root reference: {token}"
+                    )
+
+
+def check_tlora_pager_has_no_sx1280_surface(failures: list[str]) -> None:
+    roots = [
+        "variants/lilygo_tlora_pager",
+        "boards/tlora_pager",
+        "docs/devices/lilygo-t-lora-pager.md",
+        "docs/targets/esp-t-lora-pager-lvgl.capabilities.yaml",
+        "docs/boards/t-lora-pager.board.yaml",
+    ]
+    tokens = [
+        "tlora_pager_sx1280",
+        "ARDUINO_LILYGO_LORA_SX1280",
+        "sx1262_or_sx1280_by_build_env",
+        "SX1280 env",
+    ]
+    for root_name in roots:
+        root = ROOT / root_name
+        files = [root] if root.is_file() else list(iter_files(root))
+        for path in files:
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in tokens:
+                if token in text:
+                    failures.append(
+                        f"{path.relative_to(ROOT).as_posix()} contains removed pager SX1280 surface: {token}"
+                    )
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    for forbidden_dir in [
+        "apps/esp_pio",
+        "apps/gat562_mesh_evb_pro",
+    ]:
+        if (ROOT / forbidden_dir).exists():
+            failures.append(f"{forbidden_dir}/ must not be restored")
+
+    for rel in [
+        "apps/esp32_lvgl/library.json",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_app_registry.cpp",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.cpp",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_app_runtime_access.h",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.cpp",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_entry.h",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.cpp",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_loop_runtime.h",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.cpp",
+        "apps/esp32_lvgl/src/esp32_lvgl_arduino_startup_runtime.h",
+        "platform/esp/arduino_common/include/app/app_context.h",
+        "platform/esp/arduino_common/src/app_context.cpp",
+        "platform/esp/arduino_common/src/app_context_time_sync.cpp",
+    ]:
+        require_file(rel, failures)
+
+    require_tokens(
+        "src/main.cpp",
+        [
+            '#include "esp32_lvgl_arduino_entry.h"',
+            '#include "nrf52_node_arduino_entry.h"',
+            "trailmate::apps::esp32_lvgl::arduino_entry::setup()",
+            "trailmate::apps::esp32_lvgl::arduino_entry::loop()",
+            "trailmate::apps::nrf52_node::arduino_entry::setup()",
+            "trailmate::apps::nrf52_node::arduino_entry::loop()",
+        ],
+        failures,
+    )
+    forbid_tokens("src/main.cpp", FORBIDDEN_ACTIVE_TOKENS, failures)
+
+    require_tokens(
+        "apps/esp32_lvgl/library.json",
+        [
+            '"name": "trailmate_esp32_lvgl_app_shell"',
+            "+<esp32_lvgl_arduino_app_registry.cpp>",
+            "+<esp32_lvgl_arduino_app_runtime_access.cpp>",
+            "+<esp32_lvgl_arduino_entry.cpp>",
+            "+<esp32_lvgl_arduino_loop_runtime.cpp>",
+            "+<esp32_lvgl_arduino_startup_runtime.cpp>",
+            '"name": "esp_arduino_common"',
+        ],
+        failures,
+    )
+
+    require_tokens(
+        "platform/esp/arduino_common/src/app_runtime_bootstrap_support.cpp",
+        ['#include "app/app_context.h"'],
+        failures,
+    )
+    forbid_tokens(
+        "platform/esp/arduino_common/src/app_runtime_bootstrap_support.cpp",
+        ['#include "apps/esp_pio/app_context.h"'],
+        failures,
+    )
+
+    require_tokens(
+        "platformio.ini",
+        [
+            "trailmate-nrf52-node-app-shell",
+            "ui_mono_128x64",
+        ],
+        failures,
+    )
+    forbid_tokens(
+        "platformio.ini",
+        [
+            "-I${PROJECT_DIR}/modules/",
+            "-I${PROJECT_DIR}/platform/esp/arduino_common/include",
+        ],
+        failures,
+    )
+
+    require_tokens(
+        "variants/lilygo_twatch_s3/envs/lilygo_twatch_s3.ini",
+        ["-<modules/ui_shared/src/ui/screens/chat/>"],
+        failures,
+    )
+
+    check_active_code_has_no_deleted_app_root_references(failures)
+    check_tlora_pager_has_no_sx1280_surface(failures)
+
+    if failures:
+        for failure in failures:
+            print(f"[esp-arduino-real-targets] {failure}")
+        return 1
+
+    print("[esp-arduino-real-targets] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_esp_idf_final_owner_extraction_ready.py b/tools/architecture/check_esp_idf_final_owner_extraction_ready.py
new file mode 100644
index 00000000..b0ac0d42
--- /dev/null
+++ b/tools/architecture/check_esp_idf_final_owner_extraction_ready.py
@@ -0,0 +1,150 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def forbid_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        return
+    text = read(rel)
+    for token in tokens:
+        if token in text:
+            failures.append(f"{rel} contains forbidden token: {token}")
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    forbid_tokens(
+        "apps/esp32_lvgl/CMakeLists.txt",
+        [
+            "trailmate_esp_idf_legacy_adapter",
+            "esp_idf_legacy_implementation_adapter.cpp",
+        ],
+        failures,
+    )
+    for rel in [
+        "apps/esp32_lvgl/src/esp32_lvgl_app_shell.h",
+        "apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp",
+        "apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp",
+    ]:
+        forbid_tokens(rel, ["esp_idf_legacy_implementation_adapter.h", "legacy_adapter_target"], failures)
+
+    for rel in [
+        "apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.h",
+        "apps/esp32_lvgl/src/esp32_lvgl_startup_runtime.cpp",
+        "apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.h",
+        "apps/esp32_lvgl/src/esp32_lvgl_loop_runtime.cpp",
+        "apps/esp32_lvgl/src/esp32_lvgl_runtime_config.h",
+        "apps/esp32_lvgl/src/esp32_lvgl_runtime_config.cpp",
+        "builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake",
+        "builds/esp_idf/targets/tab5/sdkconfig.defaults",
+        "platform/esp/radio/meshtastic_radio_adapter.h",
+        "platform/esp/radio/meshtastic_radio_adapter.cpp",
+        "docs/audits/ESP_IDF_RUNTIME_SOURCE_OWNER_EXTRACTION_AUDIT.md",
+        "docs/audits/ESP_IDF_TARGET_DEFAULTS_MIGRATION_AUDIT.md",
+    ]:
+        require_file(rel, failures)
+
+    if not (ROOT / "builds/esp_idf/targets/tdisplayp4_tft/sdkconfig.defaults").is_file():
+        require_tokens(
+            "docs/audits/ESP_IDF_TARGET_DEFAULTS_MIGRATION_AUDIT.md",
+            ["tdisplayp4_tft", "missing / deferred"],
+            failures,
+        )
+
+    require_tokens(
+        "builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake",
+        [
+            "TRAILMATE_ESP_IDF_APP_SHELL_SOURCES",
+            "esp32_lvgl_startup_runtime.cpp",
+            "esp32_lvgl_loop_runtime.cpp",
+            "esp32_lvgl_runtime_config.cpp",
+            "TRAILMATE_ESP_IDF_PLATFORM_SOURCES",
+            "platform/esp/radio/meshtastic_radio_adapter.cpp",
+        ],
+        failures,
+    )
+    if (ROOT / "legacy").exists():
+        require_tokens(
+            "legacy/app_implementations/esp_idf/CMakeLists.txt",
+            [
+                "ESP_IDF_COMPONENT_SOURCES.cmake",
+                "src/startup_runtime\\.cpp",
+                "src/loop_runtime\\.cpp",
+                "src/runtime_config\\.cpp",
+                "src/meshtastic_radio_adapter\\.cpp",
+            ],
+            failures,
+        )
+        require_tokens(
+            "legacy/app_implementations/esp_idf/src/app_facade_runtime.cpp",
+            [
+                "platform/esp/radio/meshtastic_radio_adapter.h",
+                "platform::esp::radio::MeshtasticRadioAdapter",
+            ],
+            failures,
+        )
+        forbid_tokens(
+            "legacy/app_implementations/esp_idf/src/app_facade_runtime.cpp",
+            [
+                "apps/esp_idf/meshtastic_radio_adapter.h",
+                "apps::esp_idf::MeshtasticRadioAdapter",
+            ],
+            failures,
+        )
+    else:
+        require_file("docs/archive/REMOVED_LEGACY_ROOTS.md", failures)
+
+    require_tokens(
+        "docs/audits/ESP_IDF_RUNTIME_SOURCE_OWNER_EXTRACTION_AUDIT.md",
+        [
+            "startup runtime",
+            "loop runtime",
+            "runtime config",
+            "Meshtastic radio adapter",
+            "GPS service API",
+            "GPS tracker overlay",
+            "Team UI store",
+            "Final owner",
+            "Delete condition",
+        ],
+        failures,
+    )
+
+    if failures:
+        for failure in failures:
+            print(f"[esp-idf-final-owner-extraction] {failure}")
+        return 1
+
+    print("[esp-idf-final-owner-extraction] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_esp_idf_real_targets_restored.py b/tools/architecture/check_esp_idf_real_targets_restored.py
new file mode 100644
index 00000000..d1a4e3ce
--- /dev/null
+++ b/tools/architecture/check_esp_idf_real_targets_restored.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+TARGETS = [
+    "tab5",
+    "tdisplayp4_tft",
+    "tdisplayp4_amoled",
+    "tdeck",
+    "tlora_pager",
+    "twatch",
+]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    for target in TARGETS:
+        rel = f"builds/esp_idf/targets/{target}/sdkconfig.defaults"
+        if not (ROOT / rel).is_file():
+            failures.append(f"missing ESP-IDF target defaults: {rel}")
+
+    readme = read("builds/esp_idf/targets/README.md")
+    if "Deferred targets such as `tdeck`, `tlora_pager`, and `twatch`" in readme:
+        failures.append("ESP-IDF targets README still marks tdeck/pager/twatch deferred")
+
+    profiles = read("modules/product_composition/src/target_profile.cpp")
+    for target in TARGETS:
+        if f'"{target}"' not in profiles:
+            failures.append(f"TargetProfile missing ESP-IDF target: {target}")
+
+    target_profiles = read("builds/esp_idf/target_profiles.cmake")
+    for target in TARGETS:
+        if target not in target_profiles:
+            failures.append(f"builds/esp_idf/target_profiles.cmake missing {target}")
+
+    if failures:
+        for failure in failures:
+            print(f"[esp-idf-real-targets] {failure}")
+        return 1
+
+    print("[esp-idf-real-targets] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_legacy_app_roots_burndown_ready.py b/tools/architecture/check_legacy_app_roots_burndown_ready.py
new file mode 100644
index 00000000..07a4cfbc
--- /dev/null
+++ b/tools/architecture/check_legacy_app_roots_burndown_ready.py
@@ -0,0 +1,456 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+AUDIT = "docs/audits/LEGACY_APP_IMPLEMENTATION_ROOT_BURN_DOWN_AUDIT.md"
+INDEX = "legacy/app_implementations/LEGACY_IMPLEMENTATION_INDEX.md"
+LINUX_COLLAPSE_AUDIT = "docs/audits/LEGACY_LINUX_LOCAL_ROOT_COLLAPSE_AUDIT.md"
+
+LEGACY_ROOTS = [
+    "legacy/app_implementations/esp_idf",
+    "legacy/app_implementations/esp_pio",
+    "legacy/app_implementations/gat562_mesh_evb_pro",
+    "legacy/app_implementations/linux_rpi",
+    "legacy/app_implementations/linux_sim",
+    "legacy/app_implementations/linux_uconsole",
+    "legacy/app_implementations/linux_unoq",
+]
+
+REQUIRED_AUDIT_FIELDS = [
+    "Current purpose:",
+    "Current build callers:",
+    "Current app shell callers:",
+    "Current CMake / PlatformIO callers:",
+    "Current include callers:",
+    "Runtime ownership status:",
+    "Safe to delete now?",
+    "First deletion blocker:",
+    "Target replacement owner:",
+    "Burn-down step:",
+    "Deletion blocker:",
+    "Replacement owner:",
+]
+
+REQUIRED_INDEX_FIELDS = [
+    "Burn-down status:",
+    "Deletion blocker:",
+    "Replacement owner:",
+    "Next deletion task:",
+]
+
+POST_REFACTOR_TOKENS = [
+    "RuntimeEntryAdoption",
+    "DescriptorRenderer",
+    "ScreenGraphPresenter",
+]
+
+CODE_SUFFIXES = {".c", ".cc", ".cpp", ".cxx", ".h", ".hpp"}
+CMAKE_SOURCE_NAMES = {"CMakeLists.txt", "platformio.ini"}
+CMAKE_SOURCE_SUFFIXES = {".cmake"}
+
+SKIP_DIRS = {
+    ".git",
+    ".vs",
+    ".vscode",
+    "build",
+    "builds-out",
+    "cmake-build-debug",
+    "cmake-build-release",
+    "_deps",
+}
+
+DECLARED_TRANSITIONAL_APP_HEADERS = {
+    "esp_idf_legacy_implementation_adapter.h",
+    "nrf52_pio_legacy_implementation_adapter.h",
+}
+
+LINUX_LEGACY_ADAPTER_TOKENS = [
+    "linux_sim_legacy_implementation_adapter",
+    "uconsole_legacy_implementation_adapter",
+    "trailmate_linux_sim_legacy_adapter",
+    "trailmate_linux_uconsole_legacy_adapter",
+    "legacy_adapter_target",
+]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def iter_files(base: Path):
+    if not base.exists():
+        return
+    for path in base.rglob("*"):
+        if not path.is_file():
+            continue
+        parts = set(path.relative_to(ROOT).parts)
+        if parts.intersection(SKIP_DIRS):
+            continue
+        yield path
+
+
+def iter_code_files(base: Path):
+    for path in iter_files(base):
+        if path.suffix in CODE_SUFFIXES:
+            yield path
+
+
+def check_audit_completeness(failures: list[str]) -> None:
+    require_file(AUDIT, failures)
+    require_file(INDEX, failures)
+    if not (ROOT / AUDIT).is_file():
+        return
+
+    audit_text = read(AUDIT)
+    for root in LEGACY_ROOTS:
+        if root not in audit_text:
+            failures.append(f"{AUDIT} missing legacy root: {root}")
+
+    for field in REQUIRED_AUDIT_FIELDS:
+        count = audit_text.count(field)
+        if count < len(LEGACY_ROOTS):
+            failures.append(
+                f"{AUDIT} has {count} occurrences of '{field}', expected at least {len(LEGACY_ROOTS)}"
+            )
+
+    require_tokens(
+        AUDIT,
+        [
+            "CMake And PlatformIO References Listed For Checker",
+            "Linux Root Burn-Down Baseline",
+            "`legacy/app_implementations/linux_sim`",
+            "`legacy/app_implementations/linux_uconsole`",
+            "no `RuntimeEntryAdoption`, `DescriptorRenderer`, or",
+            "`ScreenGraphPresenter` ownership remains under the root",
+        ],
+        failures,
+    )
+
+
+def check_index_burndown_fields(failures: list[str]) -> None:
+    if not (ROOT / INDEX).is_file():
+        return
+    index_text = read(INDEX)
+    for root in LEGACY_ROOTS:
+        if root not in index_text:
+            failures.append(f"{INDEX} missing legacy root: {root}")
+    for field in REQUIRED_INDEX_FIELDS:
+        count = index_text.count(field)
+        if count < len(LEGACY_ROOTS):
+            failures.append(
+                f"{INDEX} has {count} occurrences of '{field}', expected at least {len(LEGACY_ROOTS)}"
+            )
+
+
+def check_apps_do_not_directly_include_legacy_roots(failures: list[str]) -> None:
+    include_re = re.compile(r"#\s*include\s*[<\"]([^>\"]+)[>\"]")
+    for path in iter_code_files(ROOT / "apps"):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for match in include_re.finditer(text):
+            include_path = match.group(1)
+            if "legacy/app_implementations" not in include_path:
+                continue
+            if Path(include_path).name in DECLARED_TRANSITIONAL_APP_HEADERS:
+                continue
+            failures.append(
+                f"{path.relative_to(ROOT).as_posix()} directly includes legacy app implementation header: {include_path}"
+            )
+
+
+def check_final_linux_apps_do_not_reference_legacy_adapters(
+    failures: list[str],
+) -> None:
+    for root_name in ["apps/linux_sim_shell", "apps/linux_uconsole_gtk"]:
+        for path in iter_files(ROOT / root_name):
+            if path.suffix not in CODE_SUFFIXES and path.name != "CMakeLists.txt":
+                continue
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in LINUX_LEGACY_ADAPTER_TOKENS:
+                if token in text:
+                    failures.append(
+                        f"{path.relative_to(ROOT).as_posix()} references burned-down Linux legacy adapter token: {token}"
+                    )
+
+
+def check_final_shell_owned_descriptors(failures: list[str]) -> None:
+    required_files = [
+        "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h",
+        "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp",
+        "docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md",
+    ]
+    for rel in required_files:
+        require_file(rel, failures)
+
+    require_tokens(
+        "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h",
+        [
+            "LinuxSimHistoricalSourceDescriptor",
+            "historical_root_name = \"legacy/app_implementations/linux_sim\"",
+            "historical_role = \"pre-refactor Linux simulator implementation root\"",
+            "replacement_owner = \"apps/linux_sim_shell + modules/ui_ascii_runtime\"",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h",
+        [
+            "LinuxUConsoleGtkHistoricalSourceDescriptor",
+            "historical_root_name = \"legacy/app_implementations/linux_uconsole\"",
+            "historical_role = \"pre-refactor uConsole GTK implementation root\"",
+            "replacement_owner = \"apps/linux_uconsole_gtk + modules/ui_gtk_runtime\"",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/LEGACY_LINUX_APP_ADAPTER_BURN_DOWN_AUDIT.md",
+        [
+            "linux_sim_legacy_implementation_adapter",
+            "uconsole_legacy_implementation_adapter",
+            "replacement owner",
+            "migration decision",
+            "legacy-local compatibility only",
+        ],
+        failures,
+    )
+
+
+def check_linux_local_root_collapse(failures: list[str]) -> None:
+    require_file(LINUX_COLLAPSE_AUDIT, failures)
+    require_tokens(
+        LINUX_COLLAPSE_AUDIT,
+        [
+            "legacy/app_implementations/linux_sim",
+            "legacy/app_implementations/linux_uconsole",
+            "Current local CMake targets",
+            "Current smoke targets",
+            "Current composition root files",
+            "Current old runtime/widget files",
+            "Which targets are still referenced by final app shells",
+            "Which targets can be removed from normal build",
+            "Which files must remain as archive",
+            "Which files can move to tests/compatibility",
+            "Collapse decision",
+            "local CMake root should become archive-only",
+            "validation lives in `apps/linux_sim_shell`",
+            "validation lives in `apps/linux_uconsole_gtk`",
+        ],
+        failures,
+    )
+
+    marker_files = [
+        "legacy/app_implementations/linux_sim/ARCHIVE.md",
+        "legacy/app_implementations/linux_uconsole/ARCHIVE.md",
+    ]
+    for rel in marker_files:
+        require_tokens(
+            rel,
+            [
+                "archive-only",
+                "Replacement owner",
+                "Do not use from final app shells",
+            ],
+            failures,
+        )
+
+    cmake_files = [
+        "legacy/app_implementations/linux_sim/CMakeLists.txt",
+        "legacy/app_implementations/linux_uconsole/CMakeLists.txt",
+    ]
+    forbidden_cmake_tokens = ["add_library(", "add_executable(", "add_test("]
+    for rel in cmake_files:
+        require_file(rel, failures)
+        text = read(rel) if (ROOT / rel).is_file() else ""
+        for token in forbidden_cmake_tokens:
+            if token in text:
+                failures.append(f"{rel} contains active CMake target token: {token}")
+        require_tokens(
+            rel,
+            [
+                "archive-only",
+                "Use apps/",
+            ],
+            failures,
+        )
+
+    forbidden_active_paths = [
+        "legacy/app_implementations/linux_sim/src/linux_sim_composition_root.cpp",
+        "legacy/app_implementations/linux_sim/src/linux_sim_composition_root.h",
+        "legacy/app_implementations/linux_uconsole/src/uconsole_composition_root.cpp",
+        "legacy/app_implementations/linux_uconsole/src/uconsole_composition_root.h",
+        "legacy/app_implementations/linux_sim/src/linux_sim_legacy_implementation_adapter.cpp",
+        "legacy/app_implementations/linux_uconsole/src/uconsole_legacy_implementation_adapter.cpp",
+    ]
+    for rel in forbidden_active_paths:
+        if (ROOT / rel).exists():
+            failures.append(f"active legacy Linux source should be archived, not present: {rel}")
+
+    required_archive_paths = [
+        "legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.cpp",
+        "legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.h",
+        "legacy/app_implementations/linux_sim/archive/simulator/sdl_simulator.cpp",
+        "legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.cpp",
+        "legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.h",
+        "legacy/app_implementations/linux_uconsole/archive/gtk/gtk/gtk_uconsole_pages.cpp",
+    ]
+    for rel in required_archive_paths:
+        require_file(rel, failures)
+
+    deleted_smokes = [
+        "legacy/app_implementations/linux_sim/tests/linux_sim_legacy_implementation_adapter_smoke.cpp",
+        "legacy/app_implementations/linux_uconsole/tests/uconsole_legacy_implementation_adapter_smoke.cpp",
+        "legacy/app_implementations/linux_sim/archive/tests/linux_sim_composition_root_smoke.cpp",
+        "legacy/app_implementations/linux_uconsole/archive/tests/uconsole_composition_root_smoke.cpp",
+    ]
+    for rel in deleted_smokes:
+        if (ROOT / rel).exists():
+            failures.append(f"old legacy adapter smoke should not remain active: {rel}")
+
+    deleted_archive_adapters = [
+        "legacy/app_implementations/linux_sim/archive/adapters/linux_sim_legacy_implementation_adapter.cpp",
+        "legacy/app_implementations/linux_sim/archive/adapters/linux_sim_legacy_implementation_adapter.h",
+        "legacy/app_implementations/linux_uconsole/archive/adapters/uconsole_legacy_implementation_adapter.cpp",
+        "legacy/app_implementations/linux_uconsole/archive/adapters/uconsole_legacy_implementation_adapter.h",
+    ]
+    for rel in deleted_archive_adapters:
+        if (ROOT / rel).exists():
+            failures.append(f"deleted archive adapter should not remain: {rel}")
+
+    final_shell_archive_tokens = [
+        "legacy/app_implementations/linux_sim/archive",
+        "legacy/app_implementations/linux_uconsole/archive",
+    ]
+    for root_name in ["apps/linux_sim_shell", "apps/linux_uconsole_gtk"]:
+        for path in iter_files(ROOT / root_name):
+            if path.suffix not in CODE_SUFFIXES and path.name != "CMakeLists.txt":
+                continue
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in final_shell_archive_tokens:
+                if token in text:
+                    failures.append(
+                        f"{path.relative_to(ROOT).as_posix()} references archived legacy root: {token}"
+                    )
+
+
+def check_modules_do_not_reference_legacy_roots(failures: list[str]) -> None:
+    for path in iter_code_files(ROOT / "modules"):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        if "legacy/app_implementations" in text:
+            failures.append(
+                f"{path.relative_to(ROOT).as_posix()} references legacy/app_implementations"
+            )
+
+
+def check_legacy_roots_do_not_own_post_refactor_runtime(failures: list[str]) -> None:
+    legacy_root = ROOT / "legacy" / "app_implementations"
+    for path in iter_code_files(legacy_root):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for token in POST_REFACTOR_TOKENS:
+            if token in text:
+                failures.append(
+                    f"{path.relative_to(ROOT).as_posix()} contains post-refactor ownership token: {token}"
+                )
+
+
+def is_cmake_or_platformio_file(path: Path) -> bool:
+    return path.name in CMAKE_SOURCE_NAMES or path.suffix in CMAKE_SOURCE_SUFFIXES
+
+
+def check_build_references_are_listed(failures: list[str]) -> None:
+    if not (ROOT / AUDIT).is_file():
+        return
+    audit_text = read(AUDIT)
+    scan_roots = [
+        ROOT / "CMakeLists.txt",
+        ROOT / "apps",
+        ROOT / "builds",
+        ROOT / "cmake",
+        ROOT / "legacy" / "app_implementations",
+    ]
+    checked: set[Path] = set()
+    for scan_root in scan_roots:
+        if scan_root.is_file():
+            candidate_files = [scan_root]
+        else:
+            candidate_files = list(iter_files(scan_root))
+        for path in candidate_files:
+            if path in checked or not is_cmake_or_platformio_file(path):
+                continue
+            checked.add(path)
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            if "legacy/app_implementations" not in text:
+                continue
+            rel = path.relative_to(ROOT).as_posix()
+            if rel not in audit_text:
+                failures.append(f"{AUDIT} does not list CMake/PIO reference file: {rel}")
+            for root in LEGACY_ROOTS:
+                if root in text and root not in audit_text:
+                    failures.append(
+                        f"{AUDIT} does not list legacy root {root} referenced by {rel}"
+                    )
+
+
+def main() -> int:
+    if not (ROOT / "legacy").exists():
+        result = subprocess.run(
+            [sys.executable, str(ROOT / "tools/architecture/check_no_root_legacy_ready.py")],
+            cwd=ROOT,
+            text=True,
+            capture_output=True,
+        )
+        if result.returncode != 0:
+            output = (result.stdout + result.stderr).strip()
+            print(f"[legacy-app-roots-burndown] {output}")
+            return 1
+        print("[legacy-app-roots-burndown] historical helper: root legacy removed")
+        return 0
+
+    failures: list[str] = []
+
+    check_audit_completeness(failures)
+    check_index_burndown_fields(failures)
+    check_apps_do_not_directly_include_legacy_roots(failures)
+    check_final_linux_apps_do_not_reference_legacy_adapters(failures)
+    check_final_shell_owned_descriptors(failures)
+    check_linux_local_root_collapse(failures)
+    check_modules_do_not_reference_legacy_roots(failures)
+    check_legacy_roots_do_not_own_post_refactor_runtime(failures)
+    check_build_references_are_listed(failures)
+
+    if failures:
+        for failure in failures:
+            print(f"[legacy-app-roots-burndown] {failure}")
+        return 1
+
+    print("[legacy-app-roots-burndown] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_legacy_compat_temp_inventory_ready.py b/tools/architecture/check_legacy_compat_temp_inventory_ready.py
new file mode 100644
index 00000000..3359340c
--- /dev/null
+++ b/tools/architecture/check_legacy_compat_temp_inventory_ready.py
@@ -0,0 +1,176 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import re
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+INVENTORY = "docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md"
+SCAN = "docs/audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md"
+
+REQUIRED_CATEGORIES = [
+    "root legacy source roots",
+    "compatibility shims",
+    "deprecated aliases",
+    "transitional descriptors",
+    "fallback-only paths",
+    "archive-only roots",
+    "legacy build entries",
+    "old build entrypoints",
+    "legacy app shells",
+    "adapter / bridge / facade layers",
+    "probe / smoke-only runtime",
+    "historical debt docs",
+    "legacy-governing checkers",
+    "legacy/transitional/compatibility/shim/fallback names",
+]
+
+REQUIRED_SURFACES = [
+    "root legacy/",
+    "legacy/app_implementations/esp_idf",
+    "legacy/app_implementations/esp_pio",
+    "legacy/app_implementations/gat562_mesh_evb_pro",
+    "legacy/app_implementations/linux_rpi",
+    "legacy/app_implementations/linux_sim",
+    "legacy/app_implementations/linux_uconsole",
+    "legacy/app_implementations/linux_unoq",
+    "esp_idf_legacy_implementation_adapter",
+    "nrf52_pio_legacy_implementation_adapter",
+    "linux_sim_legacy_implementation_adapter",
+    "uconsole_legacy_implementation_adapter",
+    "linux_sim_legacy_source_descriptor",
+    "linux_uconsole_gtk_legacy_source_descriptor",
+    "ui_shared compatibility shims",
+    "LegacyChatDeliveryActionBridge",
+    "LegacyChatDeliveryEventBridge",
+    "LegacyKeyVerificationSource",
+    "LegacyKeyVerificationActionSink",
+    "LegacyKeyVerificationSession",
+    "LegacyMapOverlaySource",
+    "LinuxSim hardcoded runtime routing",
+    "GTK hardcoded page registry",
+    "LVGL hardcoded menu/page creation",
+    "legacy/app_implementations/linux_sim/archive",
+    "legacy/app_implementations/linux_uconsole/archive",
+    "legacy build CMake and library manifests",
+    "legacy app shell roots",
+    "adapter / bridge / facade naming surface",
+    "probe and smoke runtime surface",
+    "legacy-governing checker surface",
+]
+
+REQUIRED_FIELDS = [
+    "Category:",
+    "Current location:",
+    "Current callers:",
+    "Current responsibility:",
+    "Final owner:",
+    "Disposition:",
+    "Delete condition:",
+    "Risk:",
+]
+
+ALLOWED_DISPOSITIONS = [
+    "Must Delete",
+    "Must Rename",
+    "Must Migrate",
+    "Deleted",
+    "Keep as Final Adapter",
+    "Keep as Deprecated Alias Temporarily",
+    "Test-only / Smoke-only",
+]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def surface_blocks(text: str) -> list[tuple[str, str]]:
+    matches = list(re.finditer(r"^## Surface: (.+)$", text, flags=re.MULTILINE))
+    blocks: list[tuple[str, str]] = []
+    for index, match in enumerate(matches):
+        start = match.start()
+        end = matches[index + 1].start() if index + 1 < len(matches) else len(text)
+        blocks.append((match.group(1).strip(), text[start:end]))
+    return blocks
+
+
+def check_inventory_shape(text: str, failures: list[str]) -> None:
+    lower = text.lower()
+    for category in REQUIRED_CATEGORIES:
+        if category.lower() not in lower:
+            failures.append(f"{INVENTORY} missing category: {category}")
+
+    for surface in REQUIRED_SURFACES:
+        if surface not in text:
+            failures.append(f"{INVENTORY} missing required surface/token: {surface}")
+
+    blocks = surface_blocks(text)
+    if len(blocks) < len(REQUIRED_SURFACES):
+        failures.append(
+            f"{INVENTORY} has {len(blocks)} surface blocks; expected at least {len(REQUIRED_SURFACES)}"
+        )
+
+    for surface_name, block in blocks:
+        for field in REQUIRED_FIELDS:
+            if field not in block:
+                failures.append(f"surface '{surface_name}' missing field: {field}")
+        if not any(disposition in block for disposition in ALLOWED_DISPOSITIONS):
+            failures.append(
+                f"surface '{surface_name}' missing allowed disposition value"
+            )
+        for field in ["Final owner:", "Disposition:", "Delete condition:"]:
+            pattern = re.compile(rf"{re.escape(field)}\s*\n-\s*(.+)")
+            match = pattern.search(block)
+            if not match or not match.group(1).strip():
+                failures.append(f"surface '{surface_name}' has empty {field}")
+
+    if "TBD" in text:
+        for line_no, line in enumerate(text.splitlines(), start=1):
+            if "TBD" in line and "owner" not in line.lower():
+                failures.append(f"{INVENTORY}:{line_no} contains TBD without owner: {line}")
+
+
+def check_scan_shape(text: str, failures: list[str]) -> None:
+    for token in [
+        "Generated by `tools/architecture/scan_legacy_compat_temp_surfaces.py`",
+        "## Keyword Counts",
+        "## Matched Paths",
+        "`legacy`",
+        "`compatibility`",
+        "`fallback`",
+        "`adapter`",
+        "`probe`",
+        "`smoke`",
+    ]:
+        if token not in text:
+            failures.append(f"{SCAN} missing token: {token}")
+
+
+def main() -> int:
+    failures: list[str] = []
+    require_file(INVENTORY, failures)
+    require_file(SCAN, failures)
+
+    if (ROOT / INVENTORY).is_file():
+        check_inventory_shape(read(INVENTORY), failures)
+    if (ROOT / SCAN).is_file():
+        check_scan_shape(read(SCAN), failures)
+
+    if failures:
+        for failure in failures:
+            print(f"[legacy-compat-temp-inventory] {failure}")
+        return 1
+
+    print("[legacy-compat-temp-inventory] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_legacy_disposition_execution_ready.py b/tools/architecture/check_legacy_disposition_execution_ready.py
new file mode 100644
index 00000000..ea7d305f
--- /dev/null
+++ b/tools/architecture/check_legacy_disposition_execution_ready.py
@@ -0,0 +1,285 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+INVENTORY = "docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md"
+
+
+HISTORICAL_DESCRIPTOR_FILES = [
+    "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h",
+    "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.cpp",
+    "apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp",
+    "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h",
+    "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.cpp",
+    "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp",
+    "apps/nrf52_node/src/nrf52_historical_source_descriptor.h",
+    "apps/nrf52_node/src/nrf52_historical_source_descriptor.cpp",
+    "apps/nrf52_node/tests/nrf52_historical_source_descriptor_smoke.cpp",
+    "apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.h",
+    "apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.cpp",
+    "apps/esp32_lvgl/tests/esp32_lvgl_historical_source_descriptor_smoke.cpp",
+]
+
+
+HEADLESS_RUNTIME_FILES = [
+    "modules/ui_headless_runtime/include/ui_headless_runtime/headless_descriptor_consumer.h",
+    "modules/ui_headless_runtime/src/headless_descriptor_consumer.cpp",
+    "modules/ui_headless_runtime/tests/test_headless_descriptor_consumer.cpp",
+]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def iter_files(base: Path):
+    if not base.exists():
+        return
+    for path in base.rglob("*"):
+        if path.is_file():
+            yield path
+
+
+def check_no_legacy_source_descriptor_files(failures: list[str]) -> None:
+    for path in iter_files(ROOT / "apps"):
+        rel = path.relative_to(ROOT).as_posix()
+        if "legacy_source_descriptor" in rel:
+            failures.append(f"apps/ still contains legacy_source_descriptor file: {rel}")
+
+
+def check_historical_descriptors(failures: list[str]) -> None:
+    for rel in HISTORICAL_DESCRIPTOR_FILES:
+        require_file(rel, failures)
+
+    forbidden = [
+        'root_path = "legacy/',
+        "active_root",
+        "source_root_path",
+    ]
+    for rel in HISTORICAL_DESCRIPTOR_FILES:
+        path = ROOT / rel
+        if not path.is_file():
+            continue
+        text = read(rel)
+        for token in forbidden:
+            if token in text:
+                failures.append(f"{rel} contains forbidden historical descriptor token: {token}")
+
+    require_tokens(
+        "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h",
+        [
+            "LinuxSimHistoricalSourceDescriptor",
+            "historical_root_name",
+            "historical_role",
+            "replacement_owner",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h",
+        [
+            "LinuxUConsoleGtkHistoricalSourceDescriptor",
+            "historical_root_name",
+            "historical_role",
+            "replacement_owner",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/nrf52_node/src/nrf52_historical_source_descriptor.h",
+        [
+            "Nrf52HistoricalSourceDescriptor",
+            "historical_generic_root_name",
+            "historical_board_root_name",
+            "replacement_owner",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/esp32_lvgl/src/esp32_lvgl_historical_source_descriptor.h",
+        [
+            "Esp32LvglHistoricalSourceDescriptor",
+            "historical_root_name",
+            "historical_role",
+            "replacement_owner",
+        ],
+        failures,
+    )
+
+
+def check_nrf52_gat562_final_owner_surface(failures: list[str]) -> None:
+    for rel in [
+        "boards/gat562_mesh_evb_pro/BOARD.md",
+        "boards/gat562_mesh_evb_pro/board_facts.h",
+    ]:
+        require_file(rel, failures)
+    for rel in HEADLESS_RUNTIME_FILES:
+        require_file(rel, failures)
+
+    require_tokens(
+        "boards/gat562_mesh_evb_pro/board_facts.h",
+        [
+            "Gat562BoardFacts",
+            "board_id = \"gat562\"",
+            "display_present = true",
+            "display_width = 128",
+            "display_height = 64",
+            "lora_present = true",
+            "gnss_present = true",
+            "keyboard_present = false",
+            "touch_present = false",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_headless_runtime/include/ui_headless_runtime/headless_descriptor_consumer.h",
+        [
+            "HeadlessRuntimeDescriptorConsumer",
+            "HeadlessPageManifestConsumer",
+            "NodeStatusDescriptor",
+        ],
+        failures,
+    )
+
+
+def check_pio_nrf52_legacy_dependency_extracted(failures: list[str]) -> None:
+    for rel in [
+        "builds/pio_nrf52/platformio.ini",
+        "builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp",
+        "apps/nrf52_node/library.json",
+    ]:
+        require_file(rel, failures)
+
+    forbidden_by_file = {
+        "builds/pio_nrf52/platformio.ini": [
+            "legacy/app_implementations/esp_pio/include",
+            "legacy/app_implementations/esp_pio/src",
+            "legacy/app_implementations/gat562_mesh_evb_pro/include",
+            "legacy/app_implementations/gat562_mesh_evb_pro/src",
+            "nrf52_pio_legacy_implementation_adapter.h",
+        ],
+        "builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp": [
+            "nrf52_pio_legacy_implementation_adapter.h",
+            "Nrf52PioLegacyImplementationDescriptor",
+        ],
+        "apps/nrf52_node/library.json": [
+            "legacy/app_implementations/esp_pio/include",
+            "legacy/app_implementations/esp_pio/src",
+            "legacy/app_implementations/gat562_mesh_evb_pro/include",
+            "legacy/app_implementations/gat562_mesh_evb_pro/src",
+        ],
+    }
+    for rel, tokens in forbidden_by_file.items():
+        if not (ROOT / rel).is_file():
+            continue
+        text = read(rel)
+        for token in tokens:
+            if token in text:
+                failures.append(f"{rel} contains forbidden active PIO dependency token: {token}")
+
+
+def check_esp_idf_landing_plan(failures: list[str]) -> None:
+    rel = "docs/audits/ESP_IDF_FINAL_OWNER_MIGRATION_PLAN.md"
+    require_file(rel, failures)
+    require_tokens(
+        rel,
+        [
+            "idf_component.yml",
+            "CMakeLists.txt",
+            "targets/*/sdkconfig.defaults",
+            "startup_runtime",
+            "loop_runtime",
+            "runtime_config",
+            "meshtastic_radio_adapter",
+            "gps_service_api",
+            "gps_tracker_overlay",
+            "team_ui_store",
+            "idf_entry",
+            "esp_idf_legacy_implementation_adapter",
+            "no ESP-IDF legacy root is deleted",
+        ],
+        failures,
+    )
+
+
+def check_inventory_updated(failures: list[str]) -> None:
+    require_file(INVENTORY, failures)
+    if not (ROOT / INVENTORY).is_file():
+        return
+    text = read(INVENTORY)
+    for token in [
+        "linux_sim_historical_source_descriptor (formerly linux_sim_legacy_source_descriptor)",
+        "linux_uconsole_gtk_historical_source_descriptor (formerly linux_uconsole_gtk_legacy_source_descriptor)",
+        "Batch 1 completed the rename and removed the `root_path` field",
+        "nrf52_historical_source_descriptor",
+        "esp32_lvgl_historical_source_descriptor",
+        "ui_headless_runtime descriptor consumer",
+    ]:
+        if token not in text:
+            failures.append(f"{INVENTORY} missing Batch 1 inventory token: {token}")
+
+
+def run_checker(rel: str, failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing checker: {rel}")
+        return
+    result = subprocess.run(
+        [sys.executable, str(path)],
+        cwd=ROOT,
+        text=True,
+        encoding="utf-8",
+        errors="ignore",
+        capture_output=True,
+    )
+    if result.returncode != 0:
+        output = (result.stdout + result.stderr).strip()
+        failures.append(f"{rel} failed:\n{output}")
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    check_no_legacy_source_descriptor_files(failures)
+    check_historical_descriptors(failures)
+    check_nrf52_gat562_final_owner_surface(failures)
+    check_pio_nrf52_legacy_dependency_extracted(failures)
+    check_esp_idf_landing_plan(failures)
+    check_inventory_updated(failures)
+    if (ROOT / "legacy").exists():
+        run_checker("tools/architecture/check_no_root_legacy_preflight_ready.py", failures)
+    else:
+        run_checker("tools/architecture/check_no_root_legacy_ready.py", failures)
+
+    if failures:
+        for failure in failures:
+            print(f"[legacy-disposition-execution] {failure}")
+        return 1
+
+    print("[legacy-disposition-execution] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_no_intermediate_ui_layer_ready.py b/tools/architecture/check_no_intermediate_ui_layer_ready.py
new file mode 100644
index 00000000..330c7f48
--- /dev/null
+++ b/tools/architecture/check_no_intermediate_ui_layer_ready.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+FORBIDDEN_PATH_PARTS = [
+    "intermediate_ui",
+    "transitional_ui",
+    "legacy_ui_extraction",
+    "ui_migration_adapter",
+    "temporary_ui_profile",
+    "modules/ui_transition_",
+    "modules/ui_intermediate_",
+]
+
+FORBIDDEN_CONTENT = [
+    "intermediate_ui",
+    "transitional_ui",
+    "legacy_ui_extraction",
+    "ui_migration_adapter",
+    "temporary_ui_profile",
+]
+
+CONTENT_ROOTS = ["apps", "builds", "modules", "platform", "boards", "cmake"]
+CODE_SUFFIXES = {".h", ".hpp", ".cpp", ".cc", ".cxx", ".c", ".cmake", ".txt", ".json"}
+
+
+def rel(path: Path) -> str:
+    return path.relative_to(ROOT).as_posix()
+
+
+def is_allowed_existing_deprecated_alias(path: Path) -> bool:
+    return rel(path).startswith("modules/ui_legacy_adapters/")
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    for path in ROOT.rglob("*"):
+        path_rel = rel(path)
+        normalized = path_rel.lower()
+        if is_allowed_existing_deprecated_alias(path):
+            continue
+        if normalized.startswith("docs/") or normalized.startswith("tools/"):
+            continue
+        for token in FORBIDDEN_PATH_PARTS:
+            if token in normalized:
+                failures.append(f"forbidden intermediate UI path token `{token}` in {path_rel}")
+
+    for root_name in CONTENT_ROOTS:
+        root = ROOT / root_name
+        if not root.exists():
+            continue
+        for path in root.rglob("*"):
+            if not path.is_file() or path.suffix not in CODE_SUFFIXES:
+                continue
+            if is_allowed_existing_deprecated_alias(path):
+                continue
+            text = path.read_text(encoding="utf-8", errors="ignore").lower()
+            for token in FORBIDDEN_CONTENT:
+                if token in text:
+                    failures.append(f"{rel(path)} contains forbidden token: {token}")
+
+    if failures:
+        for failure in failures:
+            print(f"[no-intermediate-ui-layer] {failure}")
+        return 1
+
+    print("[no-intermediate-ui-layer] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_no_root_legacy_preflight_ready.py b/tools/architecture/check_no_root_legacy_preflight_ready.py
new file mode 100644
index 00000000..2ba67cda
--- /dev/null
+++ b/tools/architecture/check_no_root_legacy_preflight_ready.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+import subprocess
+import sys
+
+
+ROOT = Path(__file__).resolve().parents[2]
+INVENTORY = "docs/audits/LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md"
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def iter_files(base: Path):
+    if not base.exists():
+        return
+    for path in base.rglob("*"):
+        if path.is_file():
+            yield path
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    if not (ROOT / "legacy").is_dir():
+        result = subprocess.run(
+            [sys.executable, str(ROOT / "tools/architecture/check_no_root_legacy_ready.py")],
+            cwd=ROOT,
+            text=True,
+            capture_output=True,
+        )
+        if result.returncode != 0:
+            output = (result.stdout + result.stderr).strip()
+            print(f"[no-root-legacy-preflight] historical helper failed final checker:\n{output}")
+            return 1
+        print("[no-root-legacy-preflight] historical helper: root legacy already removed")
+        return 0
+
+    inventory_path = ROOT / INVENTORY
+    if not inventory_path.is_file():
+        failures.append(f"missing inventory: {INVENTORY}")
+    else:
+        inventory = read(INVENTORY)
+        for token in [
+            "## Surface: root legacy/",
+            "Disposition:\n- Must Delete",
+            "Delete condition:",
+            "docs/archive",
+        ]:
+            if token not in inventory:
+                failures.append(f"{INVENTORY} missing preflight token: {token}")
+
+    for root_name in ["apps", "builds", "modules", "platform", "boards", "cmake"]:
+        for path in iter_files(ROOT / root_name):
+            rel = path.relative_to(ROOT).as_posix()
+            if "legacy_source_descriptor" in rel:
+                failures.append(f"{rel} still has legacy_source_descriptor filename")
+
+    pio_text = read("builds/pio_nrf52/platformio.ini")
+    for token in [
+        "legacy/app_implementations/esp_pio/include",
+        "legacy/app_implementations/esp_pio/src",
+        "legacy/app_implementations/gat562_mesh_evb_pro/include",
+        "legacy/app_implementations/gat562_mesh_evb_pro/src",
+    ]:
+        if token in pio_text:
+            failures.append(f"builds/pio_nrf52/platformio.ini still has active legacy include/src token: {token}")
+
+    if failures:
+        for failure in failures:
+            print(f"[no-root-legacy-preflight] {failure}")
+        return 1
+
+    print("[no-root-legacy-preflight] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_no_root_legacy_ready.py b/tools/architecture/check_no_root_legacy_ready.py
new file mode 100644
index 00000000..a517fd46
--- /dev/null
+++ b/tools/architecture/check_no_root_legacy_ready.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+ACTIVE_ROOTS = [
+    "apps",
+    "builds",
+    "modules",
+    "platform",
+    "boards",
+    "cmake",
+]
+
+
+def iter_files(base: Path):
+    if not base.exists():
+        return
+    for path in base.rglob("*"):
+        if path.is_file():
+            yield path
+
+
+def read(path: Path) -> str:
+    return path.read_text(encoding="utf-8", errors="ignore")
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    if (ROOT / "legacy").exists():
+        failures.append("root legacy/ directory must not exist")
+
+    for root_name in ACTIVE_ROOTS:
+        for path in iter_files(ROOT / root_name):
+            text = read(path)
+            rel = path.relative_to(ROOT).as_posix()
+            if "legacy/app_implementations" in text:
+                failures.append(
+                    f"{rel} contains forbidden legacy/app_implementations reference"
+                )
+            if root_name == "apps" and "legacy_source_descriptor" in rel:
+                failures.append(
+                    f"{rel} contains forbidden legacy_source_descriptor filename"
+                )
+
+    if not (ROOT / "docs/archive/REMOVED_LEGACY_ROOTS.md").is_file():
+        failures.append("missing docs/archive/REMOVED_LEGACY_ROOTS.md")
+
+    archive_root = ROOT / "docs/archive"
+    if archive_root.exists():
+        for path in archive_root.rglob("*"):
+            if path.is_dir() and path.name in {"legacy", "app_implementations"}:
+                failures.append(
+                    f"docs/archive must not retain source archive directory: {path.relative_to(ROOT).as_posix()}"
+                )
+
+    if failures:
+        for failure in failures:
+            print(f"[no-root-legacy] {failure}")
+        return 1
+
+    print("[no-root-legacy] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_phase10_primary_path_ready.py b/tools/architecture/check_phase10_primary_path_ready.py
new file mode 100644
index 00000000..c18a0c2d
--- /dev/null
+++ b/tools/architecture/check_phase10_primary_path_ready.py
@@ -0,0 +1,306 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def forbid_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        return
+    text = read(rel)
+    for token in tokens:
+        if token in text:
+            failures.append(f"{rel} contains forbidden token: {token}")
+
+
+def check_primary_file(
+    rel: str,
+    required: list[str],
+    forbidden: list[str],
+    failures: list[str],
+) -> None:
+    require_tokens(rel, required, failures)
+    forbid_tokens(rel, forbidden, failures)
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    required_files = [
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry.h",
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_primary_screen_graph_runtime.cpp",
+        "docs/audits/PHASE10_PRIMARY_PATH_MIGRATION_REPORT.md",
+        "docs/audits/PHASE10_FINAL_PRIMARY_PATH_REPORT.md",
+    ]
+    for rel in required_files:
+        require_file(rel, failures)
+
+    check_primary_file(
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry.h",
+        [
+            "LinuxSimRuntimeSource",
+            "ScreenGraphAdoption",
+            "HardcodedFallback",
+            "usingPrimaryScreenGraph",
+            "runtimeSource",
+            "fallbackUsed",
+        ],
+        [
+            "findUxPackById",
+            "UxPackRegistry",
+            "buildMenuForUxPack",
+            "ui::menu::MenuModel",
+            "GtkWidget",
+            "lv_obj_t",
+        ],
+        failures,
+    )
+    check_primary_file(
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp",
+        [
+            "LinuxSimRuntimeSource::ScreenGraphAdoption",
+            "LinuxSimRuntimeSource::HardcodedFallback",
+            "usingPrimaryScreenGraph",
+            "startFallback",
+            "Phase 10 fallback containment",
+        ],
+        [
+            "findUxPackById",
+            "UxPackRegistry",
+            "buildMenuForUxPack",
+            "ui::menu::MenuModel",
+            "GtkWidget",
+            "lv_obj_t",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp",
+        [
+            "usingPrimaryScreenGraph",
+            "runtimeSource",
+            "LinuxSimRuntimeSource::",
+            "ScreenGraphAdoption",
+            "fallbackUsed",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_sim_shell/tests/linux_sim_runtime_entry_fallback_smoke.cpp",
+        [
+            "HardcodedFallback",
+            "fallbackUsed",
+            "missing_phase10_pack",
+        ],
+        failures,
+    )
+
+    check_primary_file(
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h",
+        [
+            "LinuxUConsoleGtkPageRegistrySource",
+            "ScreenGraphAdoption",
+            "HardcodedFallback",
+            "usingPrimaryScreenGraph",
+            "registrySource",
+            "fallbackUsed",
+        ],
+        [
+            "findUxPackById",
+            "UxPackRegistry",
+            "buildMenuForUxPack",
+            "GtkWidget",
+            "lv_obj_t",
+        ],
+        failures,
+    )
+    check_primary_file(
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp",
+        [
+            "LinuxUConsoleGtkPageRegistrySource::ScreenGraphAdoption",
+            "LinuxUConsoleGtkPageRegistrySource::HardcodedFallback",
+            "usingPrimaryScreenGraph",
+            "loadFallback",
+            "Phase 10 fallback containment",
+        ],
+        [
+            "findUxPackById",
+            "UxPackRegistry",
+            "buildMenuForUxPack",
+            "GtkWidget",
+            "lv_obj_t",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp",
+        [
+            "usingPrimaryScreenGraph",
+            "registrySource",
+            "LinuxUConsoleGtkPageRegistrySource::ScreenGraphAdoption",
+            "fallbackUsed",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_fallback_smoke.cpp",
+        [
+            "HardcodedFallback",
+            "fallbackUsed",
+            "missing_phase10_pack",
+        ],
+        failures,
+    )
+
+    check_primary_file(
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_primary_screen_graph_runtime.h",
+        [
+            "LvglPrimaryScreenGraphRuntime",
+            "LvglScreenGraphRuntimeSource",
+            "ScreenGraphAdoption",
+            "HardcodedFallback",
+            "usingPrimaryScreenGraph",
+            "runtimeSource",
+            "fallbackUsed",
+        ],
+        [
+            "lvgl.h",
+            "lv_obj_t",
+            "BOARD_",
+            "findUxPackById",
+            "UxPackRegistry",
+            "buildMenuForUxPack",
+        ],
+        failures,
+    )
+    check_primary_file(
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_primary_screen_graph_runtime.cpp",
+        [
+            "LvglScreenGraphRuntimeSource::ScreenGraphAdoption",
+            "LvglScreenGraphRuntimeSource::HardcodedFallback",
+            "usingPrimaryScreenGraph",
+            "loadFallback",
+            "Phase 10 fallback containment",
+        ],
+        [
+            "lvgl.h",
+            "lv_obj_t",
+            "BOARD_",
+            "findUxPackById",
+            "UxPackRegistry",
+            "buildMenuForUxPack",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_primary_screen_graph_runtime.cpp",
+        [
+            "LvglPrimaryScreenGraphRuntime",
+            "LvglScreenGraphRuntimeSource::ScreenGraphAdoption",
+            "LvglScreenGraphRuntimeSource::HardcodedFallback",
+            "usingPrimaryScreenGraph",
+            "fallbackUsed",
+            "route.valid",
+        ],
+        failures,
+    )
+    require_tokens(
+        "cmake/TrailMateUxPacks.cmake",
+        ["lvgl_primary_screen_graph_runtime.cpp"],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_sim_shell/CMakeLists.txt",
+        [
+            "linux_sim_runtime_entry_fallback_smoke.cpp",
+            "lvgl_primary_screen_graph_runtime",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/CMakeLists.txt",
+        ["linux_uconsole_gtk_page_registry_fallback_smoke.cpp"],
+        failures,
+    )
+
+    require_tokens(
+        "docs/audits/PHASE10_PRIMARY_PATH_MIGRATION_REPORT.md",
+        [
+            "LinuxSim Primary Path",
+            "GTK Primary Path",
+            "LVGL Primary Descriptor Path",
+            "fallback-only",
+            "Phase 11 Recommendation",
+            "AsciiRuntimeEntryAdoption",
+            "GtkRuntimeEntryAdoption",
+            "LvglPrimaryScreenGraphRuntime",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE10_FINAL_PRIMARY_PATH_REPORT.md",
+        [
+            "Primary Path Status",
+            "fallback-only",
+            "fallback-only descriptor fallback",
+            "Not Done",
+            "Phase 11 Recommendation",
+            "Real Renderer Descriptor Consumption",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md",
+        [
+            "fallback-only after Phase 10.1",
+            "fallback-only after Phase 10.2",
+            "fallback-only after Phase 10.3",
+            "LvglPrimaryScreenGraphRuntime",
+        ],
+        failures,
+    )
+
+    if failures:
+        for failure in failures:
+            print(f"[phase10-primary-path] {failure}")
+        return 1
+
+    print("[phase10-primary-path] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_phase11_renderer_consumption_ready.py b/tools/architecture/check_phase11_renderer_consumption_ready.py
new file mode 100644
index 00000000..f31324bf
--- /dev/null
+++ b/tools/architecture/check_phase11_renderer_consumption_ready.py
@@ -0,0 +1,278 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def forbid_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        return
+    text = read(rel)
+    for token in tokens:
+        if token in text:
+            failures.append(f"{rel} contains forbidden token: {token}")
+
+
+def check_renderer_file(
+    rel: str,
+    required: list[str],
+    forbidden: list[str],
+    failures: list[str],
+) -> None:
+    require_tokens(rel, required, failures)
+    forbid_tokens(rel, forbidden, failures)
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    required_files = [
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_descriptor_renderer.h",
+        "modules/ui_ascii_runtime/src/ascii_descriptor_renderer.cpp",
+        "modules/ui_ascii_runtime/tests/test_ascii_descriptor_renderer.cpp",
+        "apps/linux_sim_shell/src/linux_sim_runtime_renderer.h",
+        "apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_descriptor_page_registry.h",
+        "modules/ui_gtk_runtime/src/gtk_descriptor_page_registry.cpp",
+        "modules/ui_gtk_runtime/tests/test_gtk_descriptor_page_registry.cpp",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_renderer_smoke.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_menu_model.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_menu_model.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_menu_model.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_descriptor_renderer_probe.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_renderer_probe.cpp",
+        "docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md",
+    ]
+    for rel in required_files:
+        require_file(rel, failures)
+
+    renderer_forbidden = [
+        "UxPackRegistry",
+        "findUxPackById",
+        "buildMenuForUxPack",
+        "activeUxPackId",
+        "ui::menu::MenuModel menu",
+        "GtkWidget",
+        "gtk/gtk.h",
+        "lv_obj_t",
+        "lvgl.h",
+        "BOARD_",
+    ]
+
+    check_renderer_file(
+        "modules/ui_ascii_runtime/src/ascii_descriptor_renderer.cpp",
+        [
+            "AsciiDescriptorRenderer",
+            "AsciiRenderLine",
+            "AsciiRuntimeEntryAdoption",
+            "adoption.presenter()",
+            "presenter.menuLines()",
+            "presenter.screens()",
+            "lines()",
+        ],
+        renderer_forbidden,
+        failures,
+    )
+    check_renderer_file(
+        "apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp",
+        [
+            "LinuxSimRuntimeRenderer",
+            "LinuxSimRuntimeEntry",
+            "entry.usingPrimaryScreenGraph()",
+            "entry.adoption()",
+            "entry.fallbackUsed()",
+            "usedPrimaryScreenGraph",
+            "usedFallback",
+            "renderFallback",
+        ],
+        renderer_forbidden + ["ui::menu::MenuModel"],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_sim_shell/tests/linux_sim_runtime_renderer_smoke.cpp",
+        [
+            "LinuxSimRuntimeRenderer",
+            "LinuxSimRuntimeEntry",
+            "usingPrimaryScreenGraph",
+            "usedPrimaryScreenGraph",
+            "fallbackUsed",
+            "usedFallback",
+        ],
+        failures,
+    )
+
+    check_renderer_file(
+        "modules/ui_gtk_runtime/src/gtk_descriptor_page_registry.cpp",
+        [
+            "GtkDescriptorPageRegistry",
+            "GtkRuntimeEntryAdoption",
+            "adoption.presenter()",
+            "presenter.menuDescriptors()",
+            "presenter.screenDescriptors()",
+        ],
+        renderer_forbidden,
+        failures,
+    )
+    check_renderer_file(
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.cpp",
+        [
+            "LinuxUConsoleGtkPageRegistryRenderer",
+            "LinuxUConsoleGtkPageRegistryAdoption",
+            "adoption.usingPrimaryScreenGraph()",
+            "adoption.adoption()",
+            "adoption.fallbackUsed()",
+            "usedPrimaryScreenGraph",
+            "usedFallback",
+            "renderFallback",
+        ],
+        renderer_forbidden + ["ui::menu::MenuModel"],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_renderer_smoke.cpp",
+        [
+            "LinuxUConsoleGtkPageRegistryRenderer",
+            "LinuxUConsoleGtkPageRegistryAdoption",
+            "usingPrimaryScreenGraph",
+            "usedPrimaryScreenGraph",
+            "fallbackUsed",
+            "usedFallback",
+        ],
+        failures,
+    )
+
+    check_renderer_file(
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_menu_model.cpp",
+        [
+            "LvglDescriptorMenuModel",
+            "LvglPrimaryScreenGraphRuntime",
+            "runtime.usingPrimaryScreenGraph()",
+            "runtime.adoption().presenter()",
+            "presenter.menuEntries()",
+            "presenter.screenEntries()",
+        ],
+        renderer_forbidden,
+        failures,
+    )
+    check_renderer_file(
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp",
+        [
+            "LvglDescriptorRendererProbe",
+            "LvglPrimaryScreenGraphRuntime",
+            "runtime.usingPrimaryScreenGraph()",
+            "runtime.fallbackUsed()",
+            "usedPrimaryScreenGraph",
+            "usedFallback",
+            "render",
+            "loadFallback",
+        ],
+        renderer_forbidden,
+        failures,
+    )
+    require_tokens(
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_descriptor_renderer_probe.cpp",
+        [
+            "LvglDescriptorRendererProbe",
+            "LvglPrimaryScreenGraphRuntime",
+            "usingPrimaryScreenGraph",
+            "usedPrimaryScreenGraph",
+            "fallbackUsed",
+            "usedFallback",
+        ],
+        failures,
+    )
+
+    require_tokens(
+        "apps/linux_sim_shell/CMakeLists.txt",
+        [
+            "linux_sim_runtime_renderer.cpp",
+            "linux_sim_runtime_renderer_smoke.cpp",
+            "ascii_descriptor_renderer.cpp",
+            "test_ascii_descriptor_renderer.cpp",
+            "lvgl_descriptor_menu_model",
+            "lvgl_descriptor_renderer_probe",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/CMakeLists.txt",
+        [
+            "linux_uconsole_gtk_page_registry_renderer.cpp",
+            "linux_uconsole_gtk_page_registry_renderer_smoke.cpp",
+            "gtk_descriptor_page_registry.cpp",
+            "test_gtk_descriptor_page_registry.cpp",
+        ],
+        failures,
+    )
+    require_tokens(
+        "cmake/TrailMateUxPacks.cmake",
+        [
+            "lvgl_descriptor_menu_model.cpp",
+            "lvgl_descriptor_renderer_probe.cpp",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md",
+        [
+            "LinuxSim",
+            "renderer descriptor path",
+            "GTK",
+            "Page registry descriptor path",
+            "LVGL",
+            "Descriptor renderer path",
+            "fallback",
+            "descriptor source",
+            "fallback status",
+            "Not done",
+            "Phase 12 Recommendation",
+            "Phase 11 does not rewrite real GTK widgets",
+            "Phase 11 does not create LVGL widgets",
+            "Phase 11 does not delete fallback",
+            "UxPackRegistry",
+            "buildMenuForUxPack",
+            "GtkWidget",
+            "lv_obj_t",
+        ],
+        failures,
+    )
+
+    if failures:
+        for failure in failures:
+            print(f"[phase11-renderer-consumption] {failure}")
+        return 1
+
+    print("[phase11-renderer-consumption] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_phase45_ready.py b/tools/architecture/check_phase45_ready.py
new file mode 100644
index 00000000..f40ed9e9
--- /dev/null
+++ b/tools/architecture/check_phase45_ready.py
@@ -0,0 +1,408 @@
+#!/usr/bin/env python3
+"""Check the strict Phase 4.5 exit gate before Phase 5 UI work starts.
+
+This checker is intentionally narrower than check_product_architecture_boundaries.py.
+The global checker still reports historical Phase 1-4 drift. This script only
+guards the minimum architecture facts that Phase 4.5 is meant to solidify.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from pathlib import Path
+import os
+import re
+import sys
+
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+
+SOURCE_SUFFIXES = {
+    ".c",
+    ".cc",
+    ".cpp",
+    ".cxx",
+    ".h",
+    ".hh",
+    ".hpp",
+    ".ipp",
+}
+
+EXCLUDED_DIR_NAMES = {
+    ".git",
+    ".pio",
+    ".pytest_cache",
+    ".tmp",
+    ".venv",
+    "__pycache__",
+    "build",
+    "build-debug",
+    "build-release",
+    "cmake-build-debug",
+    "dist",
+    "managed_components",
+}
+
+
+@dataclass(frozen=True)
+class Failure:
+    check: str
+    path: Path | None
+    detail: str
+
+
+def rel(path: Path | None) -> str:
+    if path is None:
+        return "-"
+    try:
+        return path.relative_to(REPO_ROOT).as_posix()
+    except ValueError:
+        return path.as_posix()
+
+
+def read_text(path: Path) -> str:
+    return path.read_text(encoding="utf-8", errors="ignore")
+
+
+def iter_source_files(root: Path):
+    if not root.exists():
+        return
+    for current_root, dir_names, file_names in os.walk(root):
+        dir_names[:] = [
+            name for name in dir_names if name not in EXCLUDED_DIR_NAMES
+        ]
+        current_root_path = Path(current_root)
+        for file_name in file_names:
+            path = current_root_path / file_name
+            if path.suffix.lower() in SOURCE_SUFFIXES:
+                yield path
+
+
+def parse_inline_yaml_list(value: str) -> list[str]:
+    value = value.strip()
+    if not (value.startswith("[") and value.endswith("]")):
+        return []
+    inner = value[1:-1].strip()
+    if not inner:
+        return []
+    return [
+        item.strip().strip("'\"")
+        for item in inner.split(",")
+        if item.strip()
+    ]
+
+
+def extract_yaml_list(text: str, key: str) -> list[str]:
+    lines = text.splitlines()
+    for index, line in enumerate(lines):
+        stripped = line.strip()
+        if not stripped.startswith(f"{key}:"):
+            continue
+
+        indent = len(line) - len(line.lstrip())
+        after_colon = line.split(":", 1)[1].strip()
+        if after_colon.startswith("["):
+            return parse_inline_yaml_list(after_colon)
+
+        values: list[str] = []
+        for next_line in lines[index + 1 :]:
+            if not next_line.strip() or next_line.lstrip().startswith("#"):
+                continue
+            next_indent = len(next_line) - len(next_line.lstrip())
+            next_stripped = next_line.strip()
+            if next_indent <= indent and not next_stripped.startswith("-"):
+                break
+            if next_stripped.startswith("-"):
+                values.append(next_stripped[1:].strip().strip("'\""))
+        return values
+
+    return []
+
+
+def check_target_manifests(failures: list[Failure]) -> None:
+    target_dir = REPO_ROOT / "docs" / "targets"
+    manifests = sorted(target_dir.glob("*.capabilities.yaml"))
+    template = target_dir / "TARGET_MANIFEST_TEMPLATE.yaml"
+    if template.exists():
+        manifests.append(template)
+
+    if not manifests:
+        failures.append(Failure("target-manifests", target_dir, "no target manifests found"))
+        return
+
+    required_modules = {"core_phone", "core_mesh"}
+    required_lora_consumers = {"core_mesh.meshtastic", "core_mesh.meshcore"}
+    required_gps_consumers = {
+        "core_gps.nmea",
+        "core_gps.location_service",
+        "core_gps.time_authority",
+    }
+    required_ble_consumers = {"core_phone.meshtastic", "core_phone.meshcore"}
+
+    for manifest in manifests:
+        text = read_text(manifest)
+        modules = set(extract_yaml_list(text, "enabled_modules"))
+        missing_modules = sorted(required_modules - modules)
+        if missing_modules:
+            failures.append(
+                Failure(
+                    "target-manifest-enabled-modules",
+                    manifest,
+                    f"missing enabled_modules entries: {', '.join(missing_modules)}",
+                )
+            )
+
+        for token in sorted(required_lora_consumers | required_gps_consumers):
+            if token not in text:
+                failures.append(
+                    Failure("target-manifest-capability-bindings", manifest, f"missing {token}")
+                )
+
+        if text.count('radio_profile_source: "core_mesh"') < 2:
+            failures.append(
+                Failure(
+                    "target-manifest-protocols",
+                    manifest,
+                    "Meshtastic and MeshCore must both use core_mesh as radio_profile_source",
+                )
+            )
+
+        ble_core_count = text.count('ble_phone_core: "core_phone"')
+        ble_disabled_count = text.count('ble_phone_core: "disabled_no_ble_stack"')
+        if ble_core_count + ble_disabled_count < 2:
+            failures.append(
+                Failure(
+                    "target-manifest-protocols",
+                    manifest,
+                    "Meshtastic and MeshCore must declare ble_phone_core ownership or no-BLE status",
+                )
+            )
+
+        if ble_core_count > 0:
+            for token in sorted(required_ble_consumers):
+                if token not in text:
+                    failures.append(
+                        Failure("target-manifest-capability-bindings", manifest, f"missing {token}")
+                    )
+
+
+def check_core_phone_facade(failures: list[Failure]) -> None:
+    forbidden = {
+        "ChatService",
+        "ContactService",
+        "IMeshAdapter",
+        "INodeStore",
+        "getChatService",
+        "getContactService",
+        "getMeshAdapter",
+        "getNodeStore",
+    }
+    roots = [
+        REPO_ROOT / "modules" / "core_phone" / "include",
+        REPO_ROOT / "modules" / "core_phone" / "src",
+    ]
+    for root in roots:
+        for path in iter_source_files(root) or []:
+            text = read_text(path)
+            for token in forbidden:
+                if token in text:
+                    failures.append(
+                        Failure(
+                            "core-phone-facade-narrowing",
+                            path,
+                            f"core_phone must not expose app service object token {token}",
+                        )
+                    )
+
+    fake_facade = REPO_ROOT / "modules" / "core_phone" / "tests" / "fake_phone_runtime_context.h"
+    if not fake_facade.exists() or "public IPhoneAppFacade" not in read_text(fake_facade):
+        failures.append(
+            Failure(
+                "core-phone-facade-tests",
+                fake_facade,
+                "fake phone runtime context must implement IPhoneAppFacade",
+            )
+        )
+
+
+def check_core_mesh_platform_pollution(failures: list[Failure]) -> None:
+    banned_include_prefixes = (
+        "arduino.h",
+        "preferences.h",
+        "sqlite3.h",
+        "freertos/",
+        "zephyr/",
+        "nrf_",
+        "esp_",
+        "radiolib",
+        "lvgl.h",
+        "gtk/",
+        "bluefruit",
+        "nimble",
+        "platform/",
+        "board/",
+        "boards/",
+    )
+    include_re = re.compile(r"^\s*#\s*include\s*[<\"]([^>\"]+)[>\"]", re.MULTILINE)
+    root = REPO_ROOT / "modules" / "core_mesh"
+    for path in iter_source_files(root) or []:
+        text = read_text(path)
+        for match in include_re.finditer(text):
+            include = match.group(1).lower()
+            if include.startswith(banned_include_prefixes):
+                failures.append(
+                    Failure(
+                        "core-mesh-platform-include",
+                        path,
+                        f"forbidden core_mesh include: {match.group(1)}",
+                    )
+                )
+
+
+def check_required_tests(failures: list[Failure]) -> None:
+    required = [
+        "modules/core_mesh/tests/test_peer_identity_service.cpp",
+        "modules/core_mesh/tests/test_direct_message_service.cpp",
+        "modules/core_mesh/tests/test_receive_packet_service.cpp",
+        "modules/core_mesh/tests/test_meshtastic_protocol_strategy.cpp",
+        "modules/core_mesh/tests/test_meshcore_protocol_strategy.cpp",
+        "modules/core_phone/tests/test_phone_core_smoke.cpp",
+        "modules/core_gps/tests/test_location_service.cpp",
+        "modules/core_gps/tests/test_time_authority.cpp",
+    ]
+    for relative in required:
+        path = REPO_ROOT / relative
+        if not path.exists():
+            failures.append(Failure("required-tests", path, "required Phase 4.5 test file missing"))
+
+
+def check_active_mesh_paths(failures: list[Failure]) -> None:
+    bridge = (
+        REPO_ROOT
+        / "platform"
+        / "esp"
+        / "arduino_common"
+        / "src"
+        / "mesh"
+        / "esp_meshtastic_adapter_bridge.cpp"
+    )
+    adapter = (
+        REPO_ROOT
+        / "platform"
+        / "esp"
+        / "arduino_common"
+        / "src"
+        / "chat"
+        / "infra"
+        / "meshtastic"
+        / "mt_adapter.cpp"
+    )
+    bridge_text = read_text(bridge) if bridge.exists() else ""
+    adapter_text = read_text(adapter) if adapter.exists() else ""
+
+    if "session_.sendDirect" not in bridge_text:
+        failures.append(
+            Failure(
+                "mesh-active-send-path",
+                bridge,
+                "at least one adapter bridge must call MeshSession::sendDirect/session_.sendDirect",
+            )
+        )
+
+    if "core_bridge_->sendDirect" not in adapter_text:
+        failures.append(
+            Failure(
+                "mesh-active-send-entry",
+                adapter,
+                "at least one actual adapter entry must route sendDirect through the core bridge",
+            )
+        )
+
+    if "receive_.onRadioPacket" not in bridge_text:
+        failures.append(
+            Failure(
+                "mesh-active-receive-path",
+                bridge,
+                "at least one adapter bridge must call ReceivePacketService::onRadioPacket/receive_.onRadioPacket",
+            )
+        )
+
+    if "core_bridge_->onRadioPacket" not in adapter_text:
+        failures.append(
+            Failure(
+                "mesh-active-receive-entry",
+                adapter,
+                "at least one actual receive entry must route raw radio packets through the core bridge",
+            )
+        )
+
+
+def check_burndown_docs(failures: list[Failure]) -> None:
+    known = REPO_ROOT / "tools" / "architecture" / "KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md"
+    known_text = read_text(known) if known.exists() else ""
+    required_known_tokens = [
+        "Remaining Phase 4.5 mesh ownership items",
+        "PKI direct send remains legacy-owned",
+        "Legacy receive remains authoritative",
+    ]
+    for token in required_known_tokens:
+        if token not in known_text:
+            failures.append(Failure("known-violations-burndown", known, f"missing explicit item: {token}"))
+
+    if "nRF52 and Linux active radio paths" not in known_text or "MeshSession bridge" not in known_text:
+        failures.append(
+            Failure(
+                "known-violations-burndown",
+                known,
+                "missing explicit nRF52/Linux MeshSession bridge remaining item",
+            )
+        )
+
+    stale_tokens = [
+        "At least one actual receive path must route through `ReceivePacketService`",
+    ]
+    for token in stale_tokens:
+        if token in known_text:
+            failures.append(Failure("known-violations-burndown", known, f"stale generic item remains: {token}"))
+
+    gps_audit = REPO_ROOT / "docs" / "audits" / "GPS_CONSUMER_BOUNDARY_AUDIT.md"
+    gps_text = read_text(gps_audit) if gps_audit.exists() else ""
+    for token in ("ILocationSource", "ITimeAuthority", "Phase 5"):
+        if token not in gps_text:
+            failures.append(Failure("gps-consumer-audit", gps_audit, f"missing {token}"))
+
+
+def run_checks() -> list[Failure]:
+    failures: list[Failure] = []
+    check_target_manifests(failures)
+    check_core_phone_facade(failures)
+    check_core_mesh_platform_pollution(failures)
+    check_required_tests(failures)
+    check_active_mesh_paths(failures)
+    check_burndown_docs(failures)
+    return failures
+
+
+def main() -> int:
+    failures = run_checks()
+    if failures:
+        print("Phase 4.5 readiness check: FAIL")
+        print(f"Failures: {len(failures)}")
+        print()
+        for failure in failures:
+            print(f"- [{failure.check}] {rel(failure.path)}")
+            print(f"  {failure.detail}")
+        return 1
+
+    print("Phase 4.5 readiness check: PASS")
+    print("- target manifests name core_phone/core_mesh ownership")
+    print("- core_phone facade no longer exposes app service objects")
+    print("- core_mesh has no platform SDK/UI/board includes")
+    print("- required Phase 4.5 core tests are present")
+    print("- at least one ESP Meshtastic send and receive active path enters core_mesh")
+    print("- known violations are explicit burn-down items")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/architecture/check_phase5_final_ready.py b/tools/architecture/check_phase5_final_ready.py
new file mode 100644
index 00000000..2eb36bc2
--- /dev/null
+++ b/tools/architecture/check_phase5_final_ready.py
@@ -0,0 +1,153 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import subprocess
+import sys
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def exists(path: str) -> bool:
+    return (ROOT / path).exists()
+
+
+def read_text(path: str) -> str:
+    return (ROOT / path).read_text(encoding="utf-8", errors="ignore")
+
+
+def fail(message: str) -> int:
+    print(f"[phase5-final] FAIL: {message}")
+    return 1
+
+
+def run_checker(path: str) -> int:
+    checker = ROOT / path
+    if not checker.exists():
+        print(f"[phase5-final] SKIP missing checker: {path}")
+        return 1
+
+    result = subprocess.run(
+        [sys.executable, str(checker)],
+        cwd=str(ROOT),
+        text=True,
+    )
+    return result.returncode
+
+
+def check_required_files() -> int:
+    required = [
+        "docs/specification/UI_PRESENTATION_ARCHITECTURE_SPEC.md",
+        "docs/specification/PRESENTATION_WORKSPACE_SPEC.md",
+        "docs/audits/PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md",
+        "docs/audits/PHASE5_PRESENTATION_CONFORMANCE_MATRIX.md",
+        "docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md",
+        "docs/audits/PHASE5_FINAL_READINESS_REPORT.md",
+        "docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md",
+        "docs/audits/PHASE6_INPUT_PLAN.md",
+        "tools/architecture/check_phase5_ready.py",
+        "tools/architecture/check_phase5_workspace_ready.py",
+        "tools/architecture/check_phase5_renderer_ready.py",
+        "tools/architecture/check_phase5_final_ready.py",
+        "tools/architecture/phase5_renderer_legacy_baseline.json",
+        "modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace.h",
+        "modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_snapshot.h",
+        "modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_probe.h",
+    ]
+
+    failures = 0
+    for path in required:
+        if not exists(path):
+            failures += fail(f"missing required file: {path}")
+    return failures
+
+
+def check_known_domain_files() -> int:
+    required = [
+        "modules/ui_presentation/include/ui_presentation/device/device_status_model.h",
+        "modules/ui_presentation/include/ui_presentation/gps/gps_status_model.h",
+        "modules/ui_presentation/include/ui_presentation/mesh/mesh_status_model.h",
+        "modules/ui_presentation/include/ui_presentation/settings/settings_model.h",
+        "modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h",
+        "modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_action_sink.h",
+        "modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h",
+        "modules/ui_presentation/include/ui_presentation/map/map_workspace_model.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h",
+    ]
+
+    failures = 0
+    for path in required:
+        if not exists(path):
+            failures += fail(f"missing domain boundary file: {path}")
+    return failures
+
+
+def check_final_docs_have_decision_language() -> int:
+    docs = {
+        "docs/audits/PHASE5_PRESENTATION_CONFORMANCE_MATRIX.md": [
+            "Phase 5-ready does not mean fully clean",
+            "ready-with-legacy",
+            "No domain may remain blocked",
+        ],
+        "docs/audits/PHASE5_LEGACY_ISLAND_REGISTER.md": [
+            "not Phase 5 blockers",
+            "bounded legacy",
+            "Future cleanup",
+        ],
+        "docs/audits/PHASE5_FINAL_READINESS_REPORT.md": [
+            "Phase 5 is ready to close",
+            "This decision does not mean the UI is fully clean",
+            "Phase 6 may start",
+        ],
+        "docs/audits/PHASE6_INPUT_PLAN.md": [
+            "Phase 6 may assume",
+            "Phase 6 must not",
+            "check_phase5_final_ready.py",
+        ],
+    }
+
+    failures = 0
+    for path, tokens in docs.items():
+        if not exists(path):
+            continue
+        text = read_text(path)
+        for token in tokens:
+            if token not in text:
+                failures += fail(f"{path} missing final readiness token: {token}")
+    return failures
+
+
+def run_existing_fitness_functions() -> int:
+    failures = 0
+    for checker in [
+        "tools/architecture/check_phase5_ready.py",
+        "tools/architecture/check_phase5_workspace_ready.py",
+        "tools/architecture/check_phase5_renderer_ready.py",
+    ]:
+        if not exists(checker):
+            failures += fail(f"missing checker: {checker}")
+            continue
+        rc = run_checker(checker)
+        if rc != 0:
+            failures += fail(f"{checker} failed")
+    return failures
+
+
+def main() -> int:
+    failures = 0
+    failures += check_required_files()
+    failures += check_known_domain_files()
+    failures += check_final_docs_have_decision_language()
+    failures += run_existing_fitness_functions()
+
+    if failures == 0:
+        print("[phase5-final] OK")
+        return 0
+
+    print(f"[phase5-final] {failures} failure(s)")
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/architecture/check_phase5_ready.py b/tools/architecture/check_phase5_ready.py
new file mode 100644
index 00000000..7cb1db6e
--- /dev/null
+++ b/tools/architecture/check_phase5_ready.py
@@ -0,0 +1,664 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import re
+import sys
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read_text(path: str) -> str:
+    return (ROOT / path).read_text(encoding="utf-8", errors="ignore")
+
+
+def exists(path: str) -> bool:
+    return (ROOT / path).exists()
+
+
+def fail(message: str) -> int:
+    print(f"[phase5-ready] FAIL: {message}")
+    return 1
+
+
+def iter_code_files(*roots: Path):
+    for root in roots:
+        if not root.exists():
+            continue
+        for path in root.rglob("*"):
+            if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+                yield path
+
+
+def strip_cpp_comments(text: str) -> str:
+    text = re.sub(r"/\*.*?\*/", "", text, flags=re.DOTALL)
+    return re.sub(r"//.*", "", text)
+
+
+def check_required_files() -> int:
+    required = [
+        "docs/specification/CHAT_PRESENTATION_IDENTITY_SPEC.md",
+        "docs/specification/CHAT_WORKSPACE_MODEL_SPEC.md",
+        "docs/audits/CHAT_PENDING_FAILURE_AUDIT.md",
+        "docs/audits/CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md",
+        "docs/audits/TEAM_CHAT_PRESENTATION_AUDIT.md",
+        "modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h",
+        "modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h",
+        "modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp",
+        "modules/ui_shared/tests/test_chat_presentation_source.cpp",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_action_sink.h",
+        "modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/team_chat_action_sink.cpp",
+        "modules/ui_shared/tests/test_team_chat_presentation_source.cpp",
+        "modules/ui_shared/tests/test_team_chat_action_sink.cpp",
+        "modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_conversation_mapper.h",
+        "docs/audits/MAP_PRESENTATION_BOUNDARY_AUDIT.md",
+        "docs/specification/MAP_WORKSPACE_MODEL_SPEC.md",
+        "docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md",
+        "modules/ui_presentation/include/ui_presentation/map/map_workspace_snapshot.h",
+        "modules/ui_presentation/include/ui_presentation/map/map_presentation_source.h",
+        "modules/ui_presentation/include/ui_presentation/map/map_action_sink.h",
+        "modules/ui_presentation/include/ui_presentation/map/map_workspace_model.h",
+        "modules/ui_presentation/src/map/map_workspace_model.cpp",
+        "modules/ui_presentation/tests/test_map_workspace_model.cpp",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_state.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp",
+        "modules/ui_shared/tests/test_legacy_map_presentation_adapters.cpp",
+        "legacy/app_implementations/linux_sim/tests/map_workspace_ascii_probe.cpp",
+    ]
+
+    failures = 0
+    for path in required:
+        if not exists(path):
+            failures += fail(f"missing required file: {path}")
+    return failures
+
+
+def check_removed_chat_read_projection_not_reintroduced() -> int:
+    legacy_type = "Legacy" + "ChatPresentationSource"
+    legacy_file_stem = "legacy_chat" + "_presentation_source"
+    removed_paths = [
+        "modules/ui_shared/include/ui/presentation_sources/" + legacy_file_stem + ".h",
+        "modules/ui_shared/src/ui/presentation_sources/" + legacy_file_stem + ".cpp",
+        "modules/ui_shared/tests/test_" + legacy_file_stem + ".cpp",
+    ]
+
+    failures = 0
+    for path in removed_paths:
+        if exists(path):
+            failures += fail(f"removed chat presentation source path still exists: {path}")
+
+    search_roots = [
+        ROOT / "apps",
+        ROOT / "cmake",
+        ROOT / "docs",
+        ROOT / "modules",
+        ROOT / "tools" / "architecture",
+    ]
+    text_suffixes = {
+        ".c",
+        ".cc",
+        ".cpp",
+        ".cxx",
+        ".h",
+        ".hpp",
+        ".cmake",
+        ".ini",
+        ".json",
+        ".md",
+        ".py",
+        ".txt",
+    }
+    this_file = Path(__file__).resolve()
+    for root in search_roots:
+        if not root.exists():
+            continue
+        for path in root.rglob("*"):
+            if not path.is_file() or path.resolve() == this_file:
+                continue
+            if path.suffix not in text_suffixes and path.name != "CMakeLists.txt":
+                continue
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            if legacy_type in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} references removed {legacy_type}"
+                )
+            if legacy_file_stem in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} references removed {legacy_file_stem}"
+                )
+    return failures
+
+
+def check_ui_presentation_chat_is_portable() -> int:
+    forbidden_tokens = [
+        "chat/domain/",
+        "chat/usecase/",
+        "chat/ports/",
+        "platform/",
+        "lvgl.h",
+        "gtk",
+        "app_context",
+        "app_facade",
+        "ChatService",
+        "ContactService",
+        "MeshSession",
+        "IMeshAdapter",
+    ]
+
+    failures = 0
+    roots = [
+        ROOT / "modules/ui_presentation/include/ui_presentation/chat",
+        ROOT / "modules/ui_presentation/src/chat",
+    ]
+    for path in iter_code_files(*roots):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden token {token}"
+                )
+    return failures
+
+
+def check_ui_presentation_map_is_portable() -> int:
+    forbidden_tokens = [
+        "platform/",
+        "platform\\",
+        "gps_runtime",
+        "lvgl.h",
+        "gtk",
+        "app_context",
+        "app_facade",
+        "TeamUiStore",
+        "team_ui_get_store",
+        "MapTileCache",
+        "map_tiles",
+        "route_storage",
+        "Store",
+    ]
+
+    failures = 0
+    roots = [
+        ROOT / "modules/ui_presentation/include/ui_presentation/map",
+        ROOT / "modules/ui_presentation/src/map",
+    ]
+    for path in iter_code_files(*roots):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden map token {token}"
+                )
+
+    model_header = "modules/ui_presentation/include/ui_presentation/map/map_workspace_model.h"
+    if exists(model_header):
+        text = read_text(model_header)
+        if "map_action_sink.h" not in text:
+            failures += fail("MapWorkspaceModel does not include MapActionSink")
+        if "map_presentation_source.h" not in text:
+            failures += fail("MapWorkspaceModel does not include MapPresentationSource")
+
+    audit = "docs/audits/MAP_PRESENTATION_BOUNDARY_AUDIT.md"
+    if exists(audit):
+        text = read_text(audit)
+        for token in [
+            "MapWorkspaceModel minimal",
+            "does not rewrite tile loading",
+            "Renderer must not directly read",
+            "MapWorkspaceModel::snapshot()",
+            "MapWorkspaceModel actions",
+            "must not derive from LVGL",
+        ]:
+            if token not in text:
+                failures += fail(f"map boundary audit missing token: {token}")
+
+    return failures
+
+
+def check_map_presentation_sources_are_bounded() -> int:
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk/",
+        "MapTileCache",
+        "map_tiles",
+        "route_storage",
+        "map_contour",
+        "RadioLib",
+        "Arduino.h",
+        "sendDirect",
+        "sqlite3",
+    ]
+
+    failures = 0
+    paths = [
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp",
+    ]
+    for path in paths:
+        if not exists(path):
+            continue
+        text = read_text(path)
+        code_text = strip_cpp_comments(text)
+        for token in forbidden_tokens:
+            if token in code_text:
+                failures += fail(
+                    f"{path} contains forbidden legacy map adapter token {token}"
+                )
+
+    source = "modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp"
+    if exists(source):
+        text = read_text(source)
+        if "buildMapWorkspaceSnapshot" not in text:
+            failures += fail("LegacyMapPresentationSource does not build map snapshots")
+        for token in ["setLayer(", "setViewport(", "setActiveTool(", "clearMeasurement("]:
+            if token in text:
+                failures += fail(f"LegacyMapPresentationSource contains action token {token}")
+
+    sink = "modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp"
+    if exists(sink):
+        text = read_text(sink)
+        if "MapWorkspaceSnapshot" in text:
+            failures += fail("LegacyMapActionSink builds or references MapWorkspaceSnapshot")
+        for token in ["buildMapWorkspaceSnapshot", "status_line", "TeamOverlaySummary"]:
+            if token in text:
+                failures += fail(f"LegacyMapActionSink contains projection token {token}")
+
+    return failures
+
+
+def check_lvgl_map_surface_uses_workspace_model() -> int:
+    path = "modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp"
+    if not exists(path):
+        return fail("GPS page runtime is missing")
+
+    text = read_text(path)
+    failures = 0
+    for token in [
+        "ui_presentation/map/map_workspace_model.h",
+        "LegacyMapPresentationSource",
+        "LegacyMapActionSink",
+        "map_workspace_model().snapshot()",
+        "map_workspace_model().centerOnSelf()",
+    ]:
+        if token not in text:
+            failures += fail(f"LVGL map runtime missing MapWorkspaceModel token: {token}")
+    return failures
+
+
+def check_uconsole_map_surface_uses_workspace_model() -> int:
+    header = "platform/linux/uconsole/include/uconsole/uconsole_map_workspace_model.h"
+    source = "platform/linux/uconsole/src/uconsole_map_workspace_model.cpp"
+    failures = 0
+
+    if not exists(header):
+        failures += fail("uConsole map model header is missing")
+    else:
+        text = read_text(header)
+        for token in [
+            "ui_presentation/map/map_workspace_model.h",
+            "presentation_workspace",
+            "MapWorkspaceModel presentation_model_",
+            "LegacyMapPresentationSource",
+            "LegacyMapActionSink",
+            "LegacyGpsStatusSource",
+        ]:
+            if token not in text:
+                failures += fail(f"uConsole map header missing token: {token}")
+
+    if not exists(source):
+        failures += fail("uConsole map model source is missing")
+    else:
+        text = read_text(source)
+        for token in [
+            "presentation_model_.snapshot()",
+            "legacy_gps_source_.buildGpsStatusSnapshot",
+            "syncPresentationWorkspace",
+        ]:
+            if token not in text:
+                failures += fail(f"uConsole map source missing token: {token}")
+        if "#include \"platform/ui/gps_runtime.h\"" in text:
+            failures += fail("uConsole map model still includes gps_runtime directly")
+
+    return failures
+
+
+def check_map_ascii_probe_exists() -> int:
+    path = "legacy/app_implementations/linux_sim/tests/map_workspace_ascii_probe.cpp"
+    if not exists(path):
+        return fail("Map ASCII/headless probe is missing")
+
+    text = read_text(path)
+    failures = 0
+    for token in [
+        "MapWorkspaceModel",
+        "MAP CENTER:",
+        "SELF:",
+        "LAYERS:",
+        "TEAM:",
+    ]:
+        if token not in text:
+            failures += fail(f"Map ASCII/headless probe missing token: {token}")
+
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk/",
+        "gps_runtime",
+        "MapTileCache",
+        "map_tiles",
+        "TeamUiStore",
+    ]
+    for token in forbidden_tokens:
+        if token in text:
+            failures += fail(f"Map ASCII/headless probe contains forbidden token {token}")
+    return failures
+
+
+def check_map_closeout_docs() -> int:
+    failures = 0
+
+    spec = "docs/specification/MAP_WORKSPACE_MODEL_SPEC.md"
+    if not exists(spec):
+        failures += fail("Map workspace model specification is missing")
+    else:
+        text = read_text(spec)
+        for token in [
+            "confirmed update semantics",
+            "Tile availability remains owned by the legacy tile/cache runtime",
+            "Full GPS receiver status belongs to `GpsStatusModel`",
+            "TeamOverlaySummary is a projection summary only",
+            "Phase 5.7 establishes the presentation boundary",
+        ]:
+            if token not in text:
+                failures += fail(f"Map workspace model spec missing token: {token}")
+
+    audit = "docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md"
+    if not exists(audit):
+        failures += fail("Map UI legacy ownership audit is missing")
+    else:
+        text = read_text(audit)
+        for token in [
+            "Migrated in Phase 5.7",
+            "compact LVGL map runtime consumes `MapWorkspaceModel::snapshot()`",
+            "`UConsoleMapWorkspaceModel` exposes a portable",
+            "Remaining Legacy Ownership",
+            "Route/tracker overlays remain legacy-owned",
+            "Phase 5.7 does not remove",
+        ]:
+            if token not in text:
+                failures += fail(f"Map UI legacy audit missing token: {token}")
+
+    known = "tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md"
+    if exists(known):
+        text = read_text(known)
+        for token in [
+            "Phase 5.7 Map Presentation Remaining Legacy Ownership",
+            "`ui_presentation/map` snapshot/source/sink/model",
+            "uConsole `presentation_workspace` bridge",
+            "Rich Team map markers remain legacy-owned",
+            "Tile/cache/route/rich overlay cleanup must be handled in later bounded",
+        ]:
+            if token not in text:
+                failures += fail(f"known violations missing map token: {token}")
+
+    return failures
+
+
+def check_chat_presentation_adapters_are_pure_mappers() -> int:
+    forbidden_tokens = [
+        "ChatService",
+        "ContactService",
+        "TeamService",
+        "MeshSession",
+        "IMeshAdapter",
+        "AppContext",
+        "#include \"platform/",
+        "#include <platform/",
+        "lvgl.h",
+        "gtk/",
+        "sqlite3",
+        "Preferences",
+        "RadioLib",
+        "Arduino.h",
+        "board/",
+        "boards/",
+    ]
+
+    failures = 0
+    root = ROOT / "modules/chat_presentation_adapters"
+    for path in iter_code_files(root):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden mapper token {token}"
+                )
+
+    header = "modules/chat_presentation_adapters/include/chat_presentation_adapters/chat_conversation_mapper.h"
+    if exists(header):
+        text = read_text(header)
+        if "tryMapProtocol(ui::chat::ChatProtocolKind protocol" not in text:
+            failures += fail("chat conversation mapper does not expose tryMapProtocol")
+        if "chat::MeshProtocol mapProtocol(ui::chat::ChatProtocolKind" in text:
+            failures += fail("chat conversation mapper still exposes unsafe UI protocol fallback")
+    return failures
+
+
+def check_chat_presentation_sources_are_bounded() -> int:
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk/",
+        "RadioLib",
+        "Arduino.h",
+        "board/",
+        "boards/",
+        "IMeshAdapter",
+        "MeshSession",
+        "DirectMessageService",
+        "PeerIdentityService",
+        "sendDirect",
+    ]
+
+    failures = 0
+    roots = [
+        ROOT / "modules/ui_shared/include/ui/presentation_sources",
+        ROOT / "modules/ui_shared/src/ui/presentation_sources",
+        ROOT / "platform",
+    ]
+    for path in iter_code_files(*roots):
+        path_text = str(path).lower()
+        if "presentation_sources" not in path_text or "chat" not in path.name.lower():
+            continue
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden source/sink token {token}"
+                )
+
+    source = "modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp"
+    if exists(source):
+        text = read_text(source)
+        for token in ["sendText(", "markConversationRead(", "switchChannel("]:
+            if token in text:
+                failures += fail(f"ChatPresentationSource contains action token {token}")
+        for token in [
+            "out = ui::chat::ChatWorkspaceSnapshot{}",
+            "out = ChatWorkspaceSnapshot{}",
+        ]:
+            if token in text:
+                failures += fail(f"ChatPresentationSource uses stack-heavy snapshot reset: {token}")
+        if "(void)request.message_offset;" not in text:
+            failures += fail("ChatPresentationSource does not explicitly ignore message_offset")
+    return failures
+
+
+def check_team_chat_presentation_context() -> int:
+    failures = 0
+
+    team_paths = [
+        "modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/team_chat_action_sink.cpp",
+    ]
+
+    forbidden_tokens = [
+        "toCoreConversationId",
+        "LegacyChatActionSink",
+        "#include \"chat/domain/chat_types.h\"",
+        "#include <chat/domain/chat_types.h>",
+        "sendDirect",
+        "IMeshAdapter",
+        "MeshSession",
+        "lvgl.h",
+        "gtk/",
+    ]
+    forbidden_patterns = [
+        r"(?<!ui::)chat::ConversationId",
+    ]
+
+    for path in team_paths:
+        if not exists(path):
+            continue
+        text = read_text(path)
+        code_text = strip_cpp_comments(text)
+        if "ConversationKind::Team" not in text:
+            failures += fail(f"{path} does not explicitly use ConversationKind::Team")
+        for token in forbidden_tokens:
+            if token in code_text:
+                failures += fail(
+                    f"{path} contains forbidden Team presentation token {token}"
+                )
+        for pattern in forbidden_patterns:
+            if re.search(pattern, code_text):
+                failures += fail(
+                    f"{path} contains forbidden Team presentation pattern {pattern}"
+                )
+
+    source = "modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp"
+    if exists(source):
+        text = read_text(source)
+        for token in ["TeamRichPayloadProjector", "TeamRichPayloadDisplay", "display.summary"]:
+            if token not in text:
+                failures += fail(f"TeamChatPresentationSource missing projection token {token}")
+
+    rich_projector = "modules/ui_shared/src/ui/team_presentation/team_rich_payload_projector.cpp"
+    if exists(rich_projector):
+        text = read_text(rich_projector)
+        for token in ["TeamChatType::Text", "TeamChatType::Location", "TeamChatType::Command"]:
+            if token not in text:
+                failures += fail(f"TeamRichPayloadProjector missing projection token {token}")
+
+    sink = "modules/ui_shared/src/ui/presentation_sources/team_chat_action_sink.cpp"
+    if exists(sink):
+        text = read_text(sink)
+        if "ITeamChatCommandPort" not in text:
+            failures += fail("TeamChatActionSink does not use ITeamChatCommandPort")
+        if "team_ui_chatlog_append_structured" not in text:
+            failures += fail("TeamChatActionSink does not append outgoing Team text projection")
+
+    audit = "docs/audits/TEAM_CHAT_PRESENTATION_AUDIT.md"
+    if exists(audit):
+        text = read_text(audit)
+        for token in [
+            "Migrated in Phase 5.6-f",
+            "Team text projection migrated to `TeamChatPresentationSource`",
+            "Team text send migrated to `TeamChatActionSink`",
+            "Team location entries are projected as textual `MessageRow` summaries",
+            "Team command entries are projected as textual `MessageRow` summaries",
+            "Team read/unread clear can be handled by `TeamChatActionSink::markRead`",
+            "Remaining Legacy Ownership",
+            "Team pending/failure structured delivery",
+        ]:
+            if token not in text:
+                failures += fail(f"Team audit missing token: {token}")
+
+    return failures
+
+
+def check_chat_ui_controller_closeout() -> int:
+    failures = 0
+    controller = "modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h"
+    if exists(controller):
+        text = read_text(controller)
+        if "ui_presentation/chat/chat_workspace_model.h" not in text:
+            failures += fail("ChatUiController does not include ChatWorkspaceModel")
+        if "ChatWorkspaceModel&" not in text:
+            failures += fail("ChatUiController constructor does not receive ChatWorkspaceModel&")
+        if "legacy application controller" not in text:
+            failures += fail("ChatUiController is not marked as a legacy controller")
+        if "Phase 5.6-f" not in text:
+            failures += fail("ChatUiController does not mark Team path for Phase 5.6-f")
+        if "team_chat_model_" not in text:
+            failures += fail("ChatUiController does not retain a dedicated team_chat_model_")
+
+    audit = "docs/audits/CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md"
+    if exists(audit):
+        text = read_text(audit)
+        for token in [
+            "Team text projection/send has started migrating to",
+            "TeamChatPresentationSource` / `TeamChatActionSink",
+            "Team structured pending/failure delivery",
+        ]:
+            if token not in text:
+                failures += fail(f"Chat UI controller audit missing token: {token}")
+    return failures
+
+
+def check_known_violations_recorded() -> int:
+    path = "tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md"
+    if not exists(path):
+        return fail("known architecture violations file is missing")
+
+    text = read_text(path)
+    required_tokens = [
+        "Phase 5.6 Chat Presentation Remaining Legacy Ownership",
+        "still owns LVGL state machine",
+        "Team text projection migrated to `TeamChatPresentationSource`",
+        "Team text send migrated to `TeamChatActionSink`",
+        "Team location/command entries are currently projected as textual",
+        "Team location/command picker remains legacy-owned",
+        "Team richer payload UI remains future work",
+        "Team structured pending/failure remains future work",
+        "Structured send failure is not yet preserved",
+    ]
+    failures = 0
+    for token in required_tokens:
+        if token not in text:
+            failures += fail(f"known violations missing token: {token}")
+    return failures
+
+
+def main() -> int:
+    failures = 0
+    failures += check_required_files()
+    failures += check_removed_chat_read_projection_not_reintroduced()
+    failures += check_ui_presentation_chat_is_portable()
+    failures += check_ui_presentation_map_is_portable()
+    failures += check_map_presentation_sources_are_bounded()
+    failures += check_lvgl_map_surface_uses_workspace_model()
+    failures += check_uconsole_map_surface_uses_workspace_model()
+    failures += check_map_ascii_probe_exists()
+    failures += check_map_closeout_docs()
+    failures += check_chat_presentation_adapters_are_pure_mappers()
+    failures += check_chat_presentation_sources_are_bounded()
+    failures += check_team_chat_presentation_context()
+    failures += check_chat_ui_controller_closeout()
+    failures += check_known_violations_recorded()
+
+    if failures == 0:
+        print("[phase5-ready] OK")
+        return 0
+
+    print(f"[phase5-ready] {failures} failure(s)")
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/architecture/check_phase5_renderer_ready.py b/tools/architecture/check_phase5_renderer_ready.py
new file mode 100644
index 00000000..f2047003
--- /dev/null
+++ b/tools/architecture/check_phase5_renderer_ready.py
@@ -0,0 +1,548 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import argparse
+import json
+import re
+import sys
+
+ROOT = Path(__file__).resolve().parents[2]
+BASELINE_PATH = ROOT / "tools/architecture/phase5_renderer_legacy_baseline.json"
+
+
+def read_text(path: str) -> str:
+    return (ROOT / path).read_text(encoding="utf-8", errors="ignore")
+
+
+def exists(path: str) -> bool:
+    return (ROOT / path).exists()
+
+
+def fail(message: str) -> int:
+    print(f"[phase5-renderer-ready] FAIL: {message}")
+    return 1
+
+
+def warn(message: str) -> None:
+    print(f"[phase5-renderer-ready] baseline: {message}")
+
+
+def iter_code_files(*roots: Path):
+    for root in roots:
+        if not root.exists():
+            continue
+        for path in root.rglob("*"):
+            if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+                yield path
+
+
+def strip_cpp_comments(text: str) -> str:
+    text = re.sub(r"/\*.*?\*/", "", text, flags=re.DOTALL)
+    return re.sub(r"//.*", "", text)
+
+
+def check_required_files() -> int:
+    required = [
+        "docs/audits/RENDERER_BOUNDARY_AUDIT.md",
+        "docs/audits/RENDERER_HARDENING_BASELINE.md",
+        "docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md",
+        "tools/architecture/check_phase5_renderer_ready.py",
+        "tools/architecture/phase5_renderer_legacy_baseline.json",
+    ]
+
+    failures = 0
+    for path in required:
+        if not exists(path):
+            failures += fail(f"missing required file: {path}")
+    return failures
+
+
+def check_ui_presentation_is_renderer_portable() -> int:
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk",
+        "platform/",
+        "platform\\",
+        "gps_runtime",
+        "ChatService",
+        "ContactService",
+        "TeamUiStore",
+        "MapTileCache",
+        "RadioLib",
+        "sqlite3",
+        "Preferences",
+        "Arduino.h",
+    ]
+
+    failures = 0
+    roots = [
+        ROOT / "modules/ui_presentation/include",
+        ROOT / "modules/ui_presentation/src",
+    ]
+    for path in iter_code_files(*roots):
+        text = strip_cpp_comments(path.read_text(encoding="utf-8", errors="ignore"))
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden renderer token {token}"
+                )
+    return failures
+
+
+def check_ascii_probes_are_strict() -> int:
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk",
+        "platform/ui/gps_runtime.h",
+        "ChatService",
+        "TeamUiStore",
+        "MapTileCache",
+        "RadioLib",
+        "sqlite3",
+        "Preferences",
+    ]
+
+    failures = 0
+    root = ROOT / "legacy/app_implementations/linux_sim/tests"
+    for path in root.glob("*ascii_probe*.cpp"):
+        text = strip_cpp_comments(path.read_text(encoding="utf-8", errors="ignore"))
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden probe token {token}"
+                )
+        if "ui_presentation/" not in text:
+            failures += fail(
+                f"{path.relative_to(ROOT)} does not consume ui_presentation"
+            )
+
+    required_probe_tokens = {
+        "legacy/app_implementations/linux_sim/tests/map_workspace_ascii_probe.cpp": [
+            "MapWorkspaceModel",
+            "MAP CENTER:",
+            "SELF:",
+            "LAYERS:",
+            "TEAM:",
+        ],
+        "legacy/app_implementations/linux_sim/tests/presentation_workspace_ascii_probe.cpp": [
+            "PresentationWorkspaceProbe::snapshot",
+            "PRESENTATION WORKSPACE",
+            "DEVICE:",
+            "GPS:",
+            "MESH:",
+            "SETTINGS:",
+            "CHAT:",
+            "TEAM_CHAT:",
+            "MAP:",
+        ],
+    }
+    for probe, tokens in required_probe_tokens.items():
+        if not exists(probe):
+            failures += fail(f"missing ASCII/headless probe: {probe}")
+            continue
+        text = read_text(probe)
+        for token in tokens:
+            if token not in text:
+                failures += fail(f"{probe} missing probe output token: {token}")
+    return failures
+
+
+def check_chat_presentation_adapters_are_renderer_free() -> int:
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk",
+        "sendDirect",
+        "MeshSession",
+        "IMeshAdapter",
+        "RadioLib",
+        "Arduino.h",
+    ]
+
+    paths = [
+        "modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_chat_action_sink.cpp",
+    ]
+
+    failures = 0
+    for path in paths:
+        if not exists(path):
+            failures += fail(f"missing chat presentation adapter: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(f"{path} contains forbidden chat adapter token {token}")
+    return failures
+
+
+def check_map_presentation_adapters_are_renderer_free() -> int:
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk",
+        "MapTileCache",
+        "map_tiles",
+        "route_storage",
+        "sendDirect",
+        "RadioLib",
+        "sqlite3",
+    ]
+
+    paths = [
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_map_presentation_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_map_action_sink.cpp",
+    ]
+
+    failures = 0
+    for path in paths:
+        if not exists(path):
+            failures += fail(f"missing map presentation adapter: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(f"{path} contains forbidden map adapter token {token}")
+    return failures
+
+
+def check_team_chat_adapters_are_bounded() -> int:
+    forbidden_tokens = [
+        "toCoreConversationId",
+        "LegacyChatActionSink",
+        "chat/domain/chat_types.h",
+        "MeshSession",
+        "IMeshAdapter",
+        "lvgl.h",
+        "gtk",
+    ]
+
+    paths = [
+        "modules/ui_shared/include/ui/presentation_sources/team_chat_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/team_chat_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/team_chat_action_sink.cpp",
+    ]
+
+    failures = 0
+    for path in paths:
+        if not exists(path):
+            failures += fail(f"missing Team chat adapter: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(f"{path} contains forbidden Team adapter token {token}")
+    return failures
+
+
+def check_migrated_chat_path_is_locked() -> int:
+    failures = 0
+    header = "modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h"
+    source = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+
+    if not exists(header):
+        failures += fail("ChatUiController header is missing")
+    else:
+        text = read_text(header)
+        for token in [
+            "ChatWorkspaceModel& chat_model",
+            "ChatWorkspaceModel& team_chat_model",
+            "chat_model_",
+            "team_chat_model_",
+            "chat_snapshot_buffer_",
+            "team_chat_snapshot_buffer_",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatUiController header missing migrated token: {token}")
+
+    if not exists(source):
+        failures += fail("ChatUiController source is missing")
+    else:
+        text = read_text(source)
+        for token in [
+            "chat_model_.selectConversation",
+            "chat_model_.buildSnapshot",
+            "chat_model_.markRead",
+            "chat_model_.sendMessage",
+            "team_chat_model_.buildSnapshot",
+            "team_chat_model_.markRead",
+            "team_chat_model_.sendMessage",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatUiController source missing migrated token: {token}")
+        for token in ["chat_model_.snapshot()", "team_chat_model_.snapshot()"]:
+            if token in text:
+                failures += fail(
+                    f"ChatUiController uses stack-heavy snapshot API: {token}"
+                )
+        for token in ["service_.sendText", "service_.sendMessage", "service_.markConversationRead"]:
+            if token in text:
+                failures += fail(
+                    f"ChatUiController migrated send/read path regressed to {token}"
+                )
+    return failures
+
+
+def check_migrated_map_path_is_locked() -> int:
+    failures = 0
+
+    lvgl_path = "modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp"
+    if not exists(lvgl_path):
+        failures += fail("LVGL GPS page runtime is missing")
+    else:
+        text = read_text(lvgl_path)
+        for token in [
+            "ui_presentation/map/map_workspace_model.h",
+            "MapWorkspaceModel",
+            "map_workspace_model().snapshot()",
+            "map_workspace_model().centerOnSelf()",
+        ]:
+            if token not in text:
+                failures += fail(f"LVGL GPS/map migrated path missing token: {token}")
+
+    uconsole_header = "platform/linux/uconsole/include/uconsole/uconsole_map_workspace_model.h"
+    uconsole_source = "platform/linux/uconsole/src/uconsole_map_workspace_model.cpp"
+    if not exists(uconsole_header):
+        failures += fail("uConsole map model header is missing")
+    else:
+        text = read_text(uconsole_header)
+        for token in [
+            "presentation_workspace",
+            "MapWorkspaceModel presentation_model_",
+            "LegacyMapPresentationSource",
+            "LegacyMapActionSink",
+        ]:
+            if token not in text:
+                failures += fail(f"uConsole map header missing migrated token: {token}")
+
+    if not exists(uconsole_source):
+        failures += fail("uConsole map model source is missing")
+    else:
+        text = read_text(uconsole_source)
+        for token in [
+            "presentation_model_.snapshot()",
+            "syncPresentationWorkspace",
+            "out.presentation_workspace",
+        ]:
+            if token not in text:
+                failures += fail(f"uConsole map source missing migrated token: {token}")
+        if "#include \"platform/ui/gps_runtime.h\"" in text:
+            failures += fail("uConsole map model reintroduced direct gps_runtime include")
+
+    return failures
+
+
+def check_migrated_dashboard_status_is_locked() -> int:
+    path = "modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp"
+    if not exists(path):
+        return fail("LVGL dashboard GPS widget is missing")
+
+    text = read_text(path)
+    failures = 0
+    for token in [
+        "ui_presentation/gps/gps_status_model.h",
+        "legacy_gps_status_source",
+        "dashboard_gps_status_model().snapshot()",
+        "status_snapshot.fix_valid",
+        "status_snapshot.fix_label",
+        "status_snapshot.satellites",
+    ]:
+        if token not in text:
+            failures += fail(f"dashboard GPS migrated status path missing token: {token}")
+    return failures
+
+
+def check_uconsole_renderer_bridge_is_locked() -> int:
+    failures = 0
+
+    smoke = "legacy/app_implementations/linux_uconsole/tests/uconsole_presentation_workspace_smoke.cpp"
+    if exists(smoke):
+        text = read_text(smoke)
+        for token in [
+            "PresentationWorkspace",
+            "PresentationWorkspaceProbe::snapshot",
+            "workspace.map",
+            "workspace.chat",
+            "workspace.team_chat",
+        ]:
+            if token not in text:
+                failures += fail(f"uConsole presentation workspace smoke missing token: {token}")
+    else:
+        failures += fail("uConsole presentation workspace smoke is missing")
+
+    app_state = "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_uconsole_app_state.h"
+    if exists(app_state):
+        text = read_text(app_state)
+        for token in [
+            "UConsoleChatWorkspaceModel chat_model",
+            "UConsoleMapWorkspaceModel map_model",
+        ]:
+            if token not in text:
+                failures += fail(f"uConsole GTK app state missing model token: {token}")
+    else:
+        failures += fail("uConsole GTK app state is missing")
+
+    return failures
+
+
+def load_baseline() -> dict:
+    if not BASELINE_PATH.exists():
+        return {}
+    return json.loads(BASELINE_PATH.read_text(encoding="utf-8"))
+
+
+def check_legacy_baseline(strict_baseline: bool) -> int:
+    baseline = load_baseline()
+    islands = baseline.get("known_legacy_islands", [])
+    failures = 0
+
+    for island in islands:
+        island_id = island.get("id", "<missing-id>")
+        path_value = island.get("path", "")
+        allowed_tokens = island.get("allowed_tokens", [])
+        reason = island.get("reason", "")
+        future_phase = island.get("future_phase", "")
+        path = ROOT / path_value
+
+        if not path.exists():
+            failures += fail(f"baseline island {island_id} path missing: {path_value}")
+            continue
+        if not reason:
+            failures += fail(f"baseline island {island_id} missing reason")
+        if not future_phase:
+            failures += fail(f"baseline island {island_id} missing future_phase")
+
+        files = [path] if path.is_file() else list(iter_code_files(path))
+        combined = "\n".join(
+            file.read_text(encoding="utf-8", errors="ignore") for file in files
+        )
+        present = [token for token in allowed_tokens if token in combined]
+        warn(
+            f"{island_id}: {len(present)}/{len(allowed_tokens)} baseline tokens present"
+        )
+        if strict_baseline:
+            missing = [token for token in allowed_tokens if token not in combined]
+            for token in missing:
+                failures += fail(f"baseline island {island_id} missing token: {token}")
+
+    return failures
+
+
+def check_docs() -> int:
+    failures = 0
+
+    audit = "docs/audits/RENDERER_BOUNDARY_AUDIT.md"
+    if exists(audit):
+        text = read_text(audit)
+        for token in [
+            "Renderer Rule",
+            "Known Legacy Islands",
+            "Strict Surfaces",
+            "Migrated Path Locks",
+            "Historical renderer couplings are recorded as a baseline",
+        ]:
+            if token not in text:
+                failures += fail(f"renderer boundary audit missing token: {token}")
+
+    baseline_doc = "docs/audits/RENDERER_HARDENING_BASELINE.md"
+    if exists(baseline_doc):
+        text = read_text(baseline_doc)
+        for token in [
+            "fail on strict surface violations",
+            "report baseline legacy islands without failing",
+            "tools/architecture/phase5_renderer_legacy_baseline.json",
+            "Adding a new baseline entry is an architecture decision",
+        ]:
+            if token not in text:
+                failures += fail(f"renderer hardening baseline doc missing token: {token}")
+
+    summary = "docs/audits/PHASE5_RENDERER_HARDENING_SUMMARY.md"
+    if exists(summary):
+        text = read_text(summary)
+        for token in [
+            "Strict Surfaces",
+            "Legacy Islands",
+            "Thin Slices Migrated or Locked",
+            "LVGL dashboard GPS fix chip",
+            "phase5_renderer_legacy_baseline.json",
+            "New renderer code must prefer presentation models",
+        ]:
+            if token not in text:
+                failures += fail(f"renderer hardening summary missing token: {token}")
+
+    chat_audit = "docs/audits/CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md"
+    if exists(chat_audit):
+        text = read_text(chat_audit)
+        for token in [
+            "Renderer Hardening in Phase 5.9",
+            "chat_model_.selectConversation",
+            "chat_model_.buildSnapshot",
+            "chat_model_.sendMessage",
+            "team_chat_model_",
+            "Do not add new renderer send/read logic",
+        ]:
+            if token not in text:
+                failures += fail(f"Chat UI legacy audit missing renderer lock token: {token}")
+
+    map_audit = "docs/audits/MAP_UI_LEGACY_OWNERSHIP_AUDIT.md"
+    if exists(map_audit):
+        text = read_text(map_audit)
+        for token in [
+            "Renderer Hardening in Phase 5.9",
+            "map_workspace_model().snapshot()",
+            "map_workspace_model().centerOnSelf()",
+            "presentation_workspace",
+            "platform/ui/gps_runtime.h",
+            "tile/cache/contour loading and rendering",
+        ]:
+            if token not in text:
+                failures += fail(f"Map UI legacy audit missing renderer lock token: {token}")
+
+    return failures
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(
+        description="Check Phase 5.9 renderer hardening boundaries."
+    )
+    parser.add_argument(
+        "--strict",
+        action="store_true",
+        help="Also require every baseline token to remain present.",
+    )
+    parser.add_argument(
+        "--new-only",
+        action="store_true",
+        help="Reserved for future diff-aware checks; strict surfaces are still checked.",
+    )
+    args = parser.parse_args()
+
+    failures = 0
+    failures += check_required_files()
+    failures += check_ui_presentation_is_renderer_portable()
+    failures += check_ascii_probes_are_strict()
+    failures += check_chat_presentation_adapters_are_renderer_free()
+    failures += check_map_presentation_adapters_are_renderer_free()
+    failures += check_team_chat_adapters_are_bounded()
+    failures += check_migrated_chat_path_is_locked()
+    failures += check_migrated_map_path_is_locked()
+    failures += check_migrated_dashboard_status_is_locked()
+    failures += check_uconsole_renderer_bridge_is_locked()
+    failures += check_legacy_baseline(strict_baseline=args.strict)
+    failures += check_docs()
+
+    if args.new_only:
+        print("[phase5-renderer-ready] --new-only currently checks strict surfaces")
+
+    if failures == 0:
+        print("[phase5-renderer-ready] OK")
+        return 0
+
+    print(f"[phase5-renderer-ready] {failures} failure(s)")
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/architecture/check_phase5_workspace_ready.py b/tools/architecture/check_phase5_workspace_ready.py
new file mode 100644
index 00000000..3ae3d412
--- /dev/null
+++ b/tools/architecture/check_phase5_workspace_ready.py
@@ -0,0 +1,340 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import sys
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read_text(path: str) -> str:
+    return (ROOT / path).read_text(encoding="utf-8", errors="ignore")
+
+
+def exists(path: str) -> bool:
+    return (ROOT / path).exists()
+
+
+def fail(message: str) -> int:
+    print(f"[phase5-workspace-ready] FAIL: {message}")
+    return 1
+
+
+def iter_code_files(*roots: Path):
+    for root in roots:
+        if not root.exists():
+            continue
+        for path in root.rglob("*"):
+            if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+                yield path
+
+
+def check_required_files() -> int:
+    required = [
+        "docs/specification/PRESENTATION_WORKSPACE_SPEC.md",
+        "docs/audits/PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md",
+        "modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace.h",
+        "modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_snapshot.h",
+        "modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_probe.h",
+        "modules/ui_presentation/src/workspace/presentation_workspace_probe.cpp",
+        "modules/ui_presentation/tests/test_presentation_workspace.cpp",
+        "modules/ui_presentation/tests/test_presentation_workspace_probe.cpp",
+        "legacy/app_implementations/linux_sim/tests/presentation_workspace_ascii_probe.cpp",
+        "legacy/app_implementations/linux_uconsole/tests/uconsole_presentation_workspace_smoke.cpp",
+    ]
+
+    failures = 0
+    for path in required:
+        if not exists(path):
+            failures += fail(f"missing required file: {path}")
+    return failures
+
+
+def check_workspace_portability() -> int:
+    forbidden_tokens = [
+        "platform/",
+        "platform\\",
+        "lvgl.h",
+        "gtk",
+        "ChatService",
+        "ContactService",
+        "GpsService",
+        "MeshSession",
+        "MapTileCache",
+        "gps_runtime",
+        "TeamUiStore",
+        "sqlite3",
+        "Preferences",
+        "RadioLib",
+        "Arduino.h",
+    ]
+
+    failures = 0
+    roots = [
+        ROOT / "modules/ui_presentation/include/ui_presentation/workspace",
+        ROOT / "modules/ui_presentation/src/workspace",
+    ]
+    for path in iter_code_files(*roots):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden token {token}"
+                )
+    return failures
+
+
+def check_workspace_graph_shape() -> int:
+    path = "modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace.h"
+    if not exists(path):
+        return 0
+
+    text = read_text(path)
+    required_tokens = [
+        "DeviceStatusModel",
+        "GpsStatusModel",
+        "MeshStatusModel",
+        "SettingsModel",
+        "ChatWorkspaceModel",
+        "MapWorkspaceModel",
+        "team_chat",
+        "hasCoreStatusModels",
+        "hasInteractiveWorkspaceModels",
+    ]
+
+    forbidden_tokens = [
+        "new ",
+        "delete ",
+        "Legacy",
+        "Service&",
+        "Service*",
+        "Source ",
+        "Sink ",
+        "get(",
+        "resolve",
+    ]
+
+    failures = 0
+    for token in required_tokens:
+        if token not in text:
+            failures += fail(f"PresentationWorkspace missing token: {token}")
+    for token in forbidden_tokens:
+        if token in text:
+            failures += fail(f"PresentationWorkspace contains factory/locator token: {token}")
+    return failures
+
+
+def check_workspace_snapshot_is_summary() -> int:
+    path = "modules/ui_presentation/include/ui_presentation/workspace/presentation_workspace_snapshot.h"
+    if not exists(path):
+        return 0
+
+    text = read_text(path)
+    required_tokens = [
+        "DeviceStatusSnapshot",
+        "GpsStatusSnapshot",
+        "MeshStatusSnapshot",
+        "MapWorkspaceSnapshot",
+        "has_settings",
+        "has_chat",
+        "has_team_chat",
+    ]
+    forbidden_tokens = [
+        "ChatWorkspaceSnapshot",
+        "SettingsSnapshot",
+        "TeamUiStore",
+        "MapTileCache",
+        "std::vector",
+        "std::string",
+    ]
+
+    failures = 0
+    for token in required_tokens:
+        if token not in text:
+            failures += fail(f"PresentationWorkspaceSnapshot missing token: {token}")
+    for token in forbidden_tokens:
+        if token in text:
+            failures += fail(
+                f"PresentationWorkspaceSnapshot contains non-summary token: {token}"
+            )
+    return failures
+
+
+def check_workspace_probe_is_read_only_summary() -> int:
+    path = "modules/ui_presentation/src/workspace/presentation_workspace_probe.cpp"
+    if not exists(path):
+        return 0
+
+    text = read_text(path)
+    required_tokens = [
+        "PresentationWorkspaceProbe",
+        "has_device",
+        "has_gps",
+        "has_mesh",
+        "has_map",
+        "has_chat",
+        "has_team_chat",
+        "device->snapshot()",
+        "gps->snapshot()",
+        "mesh->snapshot()",
+        "map->snapshot()",
+    ]
+    forbidden_tokens = [
+        "sendMessage",
+        "selectConversation",
+        "markRead",
+        "centerOnSelf",
+        "setLayer",
+        "setViewport",
+        "setActiveTool",
+        "apply(",
+        "chat->snapshot()",
+        "team_chat->snapshot()",
+        "settings->snapshot()",
+    ]
+
+    failures = 0
+    for token in required_tokens:
+        if token not in text:
+            failures += fail(f"PresentationWorkspaceProbe missing token: {token}")
+    for token in forbidden_tokens:
+        if token in text:
+            failures += fail(f"PresentationWorkspaceProbe contains action/full-read token: {token}")
+    return failures
+
+
+def check_ascii_probe() -> int:
+    path = "legacy/app_implementations/linux_sim/tests/presentation_workspace_ascii_probe.cpp"
+    if not exists(path):
+        return 0
+
+    text = read_text(path)
+    required_tokens = [
+        "PRESENTATION WORKSPACE",
+        "DEVICE:",
+        "GPS:",
+        "MESH:",
+        "SETTINGS:",
+        "CHAT:",
+        "TEAM_CHAT:",
+        "MAP:",
+        "PresentationWorkspaceProbe::snapshot",
+    ]
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk",
+        "platform/ui/gps_runtime.h",
+        "ChatService",
+        "TeamUiStore",
+        "MapTileCache",
+        "RadioLib",
+        "sqlite",
+        "Preferences",
+    ]
+
+    failures = 0
+    for token in required_tokens:
+        if token not in text:
+            failures += fail(f"workspace ASCII probe missing token: {token}")
+    for token in forbidden_tokens:
+        if token in text:
+            failures += fail(f"workspace ASCII probe contains forbidden token: {token}")
+    return failures
+
+
+def check_uconsole_smoke() -> int:
+    path = "legacy/app_implementations/linux_uconsole/tests/uconsole_presentation_workspace_smoke.cpp"
+    if not exists(path):
+        return 0
+
+    text = read_text(path)
+    required_tokens = [
+        "PresentationWorkspace",
+        "PresentationWorkspaceProbe::snapshot",
+        "workspace.device",
+        "workspace.gps",
+        "workspace.mesh",
+        "workspace.settings",
+        "workspace.chat",
+        "workspace.team_chat",
+        "workspace.map",
+    ]
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk",
+        "platform/ui/gps_runtime.h",
+        "ChatService",
+        "TeamUiStore",
+        "MapTileCache",
+        "RadioLib",
+        "sqlite",
+        "Preferences",
+    ]
+
+    failures = 0
+    for token in required_tokens:
+        if token not in text:
+            failures += fail(f"uConsole workspace smoke missing token: {token}")
+    for token in forbidden_tokens:
+        if token in text:
+            failures += fail(f"uConsole workspace smoke contains forbidden token: {token}")
+    return failures
+
+
+def check_docs() -> int:
+    failures = 0
+
+    spec = "docs/specification/PRESENTATION_WORKSPACE_SPEC.md"
+    if exists(spec):
+        text = read_text(spec)
+        for token in [
+            "Typed Presentation Graph",
+            "Optional Capability Set",
+            "service locator",
+            "does not own",
+            "All fields are nullable",
+            "composite snapshot is for readiness and probe output only",
+            "must not construct models",
+        ]:
+            if token not in text:
+                failures += fail(f"Presentation workspace spec missing token: {token}")
+
+    summary = "docs/audits/PHASE5_PRESENTATION_BOUNDARY_SUMMARY.md"
+    if exists(summary):
+        text = read_text(summary)
+        for token in [
+            "DeviceStatusModel",
+            "GpsStatusModel",
+            "MeshStatusModel",
+            "SettingsModel",
+            "ChatWorkspaceModel",
+            "TeamChatPresentationSource",
+            "MapWorkspaceModel",
+            "PresentationWorkspace",
+            "does not fully clean every legacy UI island",
+        ]:
+            if token not in text:
+                failures += fail(f"Phase 5 boundary summary missing token: {token}")
+
+    return failures
+
+
+def main() -> int:
+    failures = 0
+    failures += check_required_files()
+    failures += check_workspace_portability()
+    failures += check_workspace_graph_shape()
+    failures += check_workspace_snapshot_is_summary()
+    failures += check_workspace_probe_is_read_only_summary()
+    failures += check_ascii_probe()
+    failures += check_uconsole_smoke()
+    failures += check_docs()
+
+    if failures == 0:
+        print("[phase5-workspace-ready] OK")
+        return 0
+
+    print(f"[phase5-workspace-ready] {failures} failure(s)")
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/architecture/check_phase6_composition_ready.py b/tools/architecture/check_phase6_composition_ready.py
new file mode 100644
index 00000000..2c2f9bfd
--- /dev/null
+++ b/tools/architecture/check_phase6_composition_ready.py
@@ -0,0 +1,388 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import json
+import re
+import sys
+
+ROOT = Path(__file__).resolve().parents[2]
+BASELINE_PATH = ROOT / "tools/architecture/phase6_composition_legacy_baseline.json"
+
+
+def exists(path: str) -> bool:
+    return (ROOT / path).exists()
+
+
+def read_text(path: str) -> str:
+    return (ROOT / path).read_text(encoding="utf-8", errors="ignore")
+
+
+def strip_cpp_comments(text: str) -> str:
+    text = re.sub(r"/\*.*?\*/", "", text, flags=re.DOTALL)
+    return re.sub(r"//.*", "", text)
+
+
+def fail(message: str) -> int:
+    print(f"[phase6-composition-ready] FAIL: {message}")
+    return 1
+
+
+def note(message: str) -> None:
+    print(f"[phase6-composition-ready] baseline: {message}")
+
+
+def iter_code_files(*roots: Path):
+    for root in roots:
+        if not root.exists():
+            continue
+        for path in root.rglob("*"):
+            if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+                yield path
+
+
+def check_required_files() -> int:
+    required = [
+        "docs/specification/PRODUCT_COMPOSITION_ARCHITECTURE_SPEC.md",
+        "docs/audits/PRODUCT_COMPOSITION_BOUNDARY_AUDIT.md",
+        "docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md",
+        "docs/audits/ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md",
+        "docs/audits/PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md",
+        "docs/audits/PHASE6_COMPOSITION_READINESS_REPORT.md",
+        "modules/product_composition/include/product_composition/app_services_bundle.h",
+        "modules/product_composition/include/product_composition/presentation_bundle.h",
+        "modules/product_composition/include/product_composition/target_app_shell.h",
+        "modules/product_composition/include/product_composition/composition_status.h",
+        "modules/product_composition/tests/test_presentation_bundle_shape.cpp",
+        "legacy/app_implementations/linux_sim/src/linux_sim_composition_root.h",
+        "legacy/app_implementations/linux_sim/src/linux_sim_composition_root.cpp",
+        "legacy/app_implementations/linux_sim/tests/linux_sim_composition_root_smoke.cpp",
+        "legacy/app_implementations/linux_uconsole/src/uconsole_composition_root.h",
+        "legacy/app_implementations/linux_uconsole/src/uconsole_composition_root.cpp",
+        "legacy/app_implementations/linux_uconsole/tests/uconsole_composition_root_smoke.cpp",
+        "tools/architecture/check_phase6_composition_ready.py",
+        "tools/architecture/phase6_composition_legacy_baseline.json",
+    ]
+
+    failures = 0
+    for path in required:
+        if not exists(path):
+            failures += fail(f"missing required file: {path}")
+    return failures
+
+
+def check_specification_language() -> int:
+    docs = {
+        "docs/specification/PRODUCT_COMPOSITION_ARCHITECTURE_SPEC.md": [
+            "CompositionRoot wires",
+            "Target chooses.",
+            "Board describes.",
+            "Platform adapts.",
+            "Runtime schedules",
+            "PresentationModel projects",
+            "Renderer draws",
+            "A composition root must not",
+            "Existing `AppContext` is a legacy service locator",
+            "No renderer may create app services",
+        ],
+        "docs/audits/PRODUCT_COMPOSITION_BOUNDARY_AUDIT.md": [
+            "Object Graph Inventory",
+            "Linux simulator",
+            "uConsole",
+            "ESP LVGL",
+            "LegacyAppContextBridge",
+        ],
+        "docs/audits/APPCONTEXT_LEGACY_BRIDGE_AUDIT.md": [
+            "legacy service locator",
+            "Forbidden New Use",
+            "New code must not",
+            "AppServicesBundle",
+            "PresentationBundle",
+        ],
+        "docs/audits/ESP_LVGL_COMPOSITION_BRIDGE_AUDIT.md": [
+            "does not split the ESP boot chain yet",
+            "LegacyAppContextBridge",
+            "New ESP code must not",
+            "Phase 6 Acceptance",
+        ],
+        "docs/audits/PHASE6_COMPOSITION_CONFORMANCE_MATRIX.md": [
+            "Phase 6-ready does not mean all global state",
+            "ready-with-legacy",
+            "No area may remain blocked",
+        ],
+        "docs/audits/PHASE6_COMPOSITION_READINESS_REPORT.md": [
+            "Phase 6 is ready to close",
+            "This decision does not mean every target startup path is fully clean",
+            "CompositionRoot wires",
+            "Phase 6 composition checker exists and passes",
+            "`AppContext` is compatibility-only",
+        ],
+    }
+
+    failures = 0
+    for path, tokens in docs.items():
+        if not exists(path):
+            continue
+        text = read_text(path)
+        for token in tokens:
+            if token not in text:
+                failures += fail(f"{path} missing composition token: {token}")
+    return failures
+
+
+def check_product_composition_contracts_are_pure() -> int:
+    forbidden_tokens = [
+        "lvgl.h",
+        "gtk",
+        "platform/",
+        "platform\\",
+        "app/app_facade",
+        "app_facade_access",
+        "app_context",
+        "AppContext::",
+        "Arduino.h",
+        "Preferences",
+        "RadioLib",
+        "sqlite3",
+        "MapTileCache",
+    ]
+
+    failures = 0
+    root = ROOT / "modules/product_composition/include/product_composition"
+    for path in iter_code_files(root):
+        text = strip_cpp_comments(path.read_text(encoding="utf-8", errors="ignore"))
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden contract token {token}"
+                )
+    return failures
+
+
+def check_bundles_are_explicit_not_locators() -> int:
+    failures = 0
+
+    app_bundle = "modules/product_composition/include/product_composition/app_services_bundle.h"
+    if exists(app_bundle):
+        text = strip_cpp_comments(read_text(app_bundle))
+        for token in ["ChatService", "ContactService", "chat =", "contacts ="]:
+            if token not in text:
+                failures += fail(f"AppServicesBundle missing explicit field token: {token}")
+        for token in ["get<", "template", "unordered_map", "std::map", "void*"]:
+            if token in text:
+                failures += fail(f"AppServicesBundle looks like a service locator: {token}")
+
+    presentation_bundle = (
+        "modules/product_composition/include/product_composition/presentation_bundle.h"
+    )
+    if exists(presentation_bundle):
+        text = strip_cpp_comments(read_text(presentation_bundle))
+        for token in ["PresentationWorkspace", "workspace", "hasInteractivePresentation"]:
+            if token not in text:
+                failures += fail(f"PresentationBundle missing graph token: {token}")
+        for token in [
+            "new ",
+            "make_unique",
+            "Legacy",
+            "Source",
+            "Sink",
+            "ChatService",
+            "MapTileCache",
+        ]:
+            if token in text:
+                failures += fail(f"PresentationBundle constructs or imports dependencies: {token}")
+
+    shell_contract = "modules/product_composition/include/product_composition/target_app_shell.h"
+    if exists(shell_contract):
+        text = strip_cpp_comments(read_text(shell_contract))
+        for token in ["initialize()", "tick()", "shutdown()"]:
+            if token not in text:
+                failures += fail(f"ITargetAppShell missing lifecycle token: {token}")
+
+    return failures
+
+
+def check_ui_presentation_does_not_import_composition() -> int:
+    failures = 0
+    roots = [
+        ROOT / "modules/ui_presentation/include",
+        ROOT / "modules/ui_presentation/src",
+    ]
+    forbidden_tokens = [
+        "product_composition/",
+        "AppServicesBundle",
+        "PresentationBundle",
+        "CompositionRoot",
+        "ITargetAppShell",
+    ]
+    for path in iter_code_files(*roots):
+        text = strip_cpp_comments(path.read_text(encoding="utf-8", errors="ignore"))
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} imports product composition token {token}"
+                )
+    return failures
+
+
+def check_linux_sim_root_shape() -> int:
+    failures = 0
+    header = "legacy/app_implementations/linux_sim/src/linux_sim_composition_root.h"
+    source = "legacy/app_implementations/linux_sim/src/linux_sim_composition_root.cpp"
+    smoke = "legacy/app_implementations/linux_sim/tests/linux_sim_composition_root_smoke.cpp"
+
+    if exists(header):
+        text = read_text(header)
+        for token in [
+            "LinuxSimCompositionRoot",
+            "PresentationBundle",
+            "DeviceStatusModel",
+            "GpsStatusModel",
+            "MeshStatusModel",
+            "SettingsModel",
+            "ChatWorkspaceModel",
+            "MapWorkspaceModel",
+        ]:
+            if token not in text:
+                failures += fail(f"LinuxSimCompositionRoot missing token: {token}")
+    if exists(source):
+        text = read_text(source)
+        for token in [
+            "workspace.device",
+            "workspace.gps",
+            "workspace.mesh",
+            "workspace.settings",
+            "workspace.chat",
+            "workspace.team_chat",
+            "workspace.map",
+        ]:
+            if token not in text:
+                failures += fail(f"LinuxSimCompositionRoot does not wire: {token}")
+        for token in ["AppContext", "appFacade", "platform/ui/gps_runtime.h", "lvgl.h", "gtk"]:
+            if token in text:
+                failures += fail(f"LinuxSimCompositionRoot contains forbidden token: {token}")
+    if exists(smoke):
+        text = read_text(smoke)
+        for token in [
+            "root.initialize()",
+            "root.presentation()",
+            "hasCoreStatusModels",
+            "hasInteractivePresentation",
+        ]:
+            if token not in text:
+                failures += fail(f"linux_sim composition smoke missing token: {token}")
+    return failures
+
+
+def check_uconsole_root_shape() -> int:
+    failures = 0
+    header = "legacy/app_implementations/linux_uconsole/src/uconsole_composition_root.h"
+    source = "legacy/app_implementations/linux_uconsole/src/uconsole_composition_root.cpp"
+    smoke = "legacy/app_implementations/linux_uconsole/tests/uconsole_composition_root_smoke.cpp"
+
+    if exists(header):
+        text = read_text(header)
+        for token in [
+            "UConsoleCompositionRoot",
+            "LinuxAppServices",
+            "UConsoleChatWorkspaceModel",
+            "UConsoleMapWorkspaceModel",
+            "AppServicesBundle",
+            "PresentationBundle",
+        ]:
+            if token not in text:
+                failures += fail(f"UConsoleCompositionRoot header missing token: {token}")
+    if exists(source):
+        text = read_text(source)
+        for token in [
+            "services_.initialize()",
+            "app_services_.chat",
+            "app_services_.contacts",
+            "ChatPresentationSource",
+            "LegacyChatActionSink",
+            "ChatWorkspaceModel",
+            "presentation_.workspace.chat",
+            "presentation_.workspace.map",
+            "map_model_.presentationModel()",
+        ]:
+            if token not in text:
+                failures += fail(f"UConsoleCompositionRoot source missing token: {token}")
+        for token in ["gtk", "lvgl.h", "MapTileCache", "platform/ui/gps_runtime.h"]:
+            if token in text:
+                failures += fail(f"UConsoleCompositionRoot source contains renderer/runtime token: {token}")
+    if exists(smoke):
+        text = read_text(smoke)
+        for token in [
+            "root.initialize()",
+            "root.presentation()",
+            "hasChatServices",
+            "hasInteractivePresentation",
+            "workspace.hasChat()",
+            "workspace.hasMap()",
+        ]:
+            if token not in text:
+                failures += fail(f"uConsole composition smoke missing token: {token}")
+    return failures
+
+
+def check_baseline() -> int:
+    if not BASELINE_PATH.exists():
+        return fail("missing phase6 composition legacy baseline")
+
+    try:
+        data = json.loads(BASELINE_PATH.read_text(encoding="utf-8"))
+    except json.JSONDecodeError as exc:
+        return fail(f"invalid phase6 baseline JSON: {exc}")
+
+    surfaces = data.get("known_legacy_composition_surfaces", [])
+    failures = 0
+    if not surfaces:
+        failures += fail("phase6 baseline has no known legacy composition surfaces")
+
+    required_ids = {
+        "esp-pio-app-context",
+        "esp-idf-app-facade-runtime",
+        "global-app-facade-access",
+        "chat-page-runtime-presentation-bridge",
+        "gps-page-runtime-presentation-bridge",
+        "gtk-uconsole-app-state-legacy",
+    }
+    seen = {item.get("id") for item in surfaces}
+    for required in sorted(required_ids):
+        if required not in seen:
+            failures += fail(f"phase6 baseline missing legacy surface id: {required}")
+
+    for item in surfaces:
+        path = item.get("path", "")
+        if not path:
+            failures += fail(f"baseline item {item.get('id', '<unknown>')} missing path")
+            continue
+        if not exists(path):
+            failures += fail(f"baseline path does not exist: {path}")
+        if not item.get("reason"):
+            failures += fail(f"baseline item {item.get('id', path)} missing reason")
+
+    if failures == 0:
+        note(f"{len(surfaces)} known legacy composition surface(s)")
+    return failures
+
+
+def main() -> int:
+    failures = 0
+    failures += check_required_files()
+    failures += check_specification_language()
+    failures += check_product_composition_contracts_are_pure()
+    failures += check_bundles_are_explicit_not_locators()
+    failures += check_ui_presentation_does_not_import_composition()
+    failures += check_linux_sim_root_shape()
+    failures += check_uconsole_root_shape()
+    failures += check_baseline()
+
+    if failures == 0:
+        print("[phase6-composition-ready] OK")
+        return 0
+
+    print(f"[phase6-composition-ready] {failures} failure(s)")
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/architecture/check_phase7_runtime_ownership_ready.py b/tools/architecture/check_phase7_runtime_ownership_ready.py
new file mode 100644
index 00000000..0a0e896c
--- /dev/null
+++ b/tools/architecture/check_phase7_runtime_ownership_ready.py
@@ -0,0 +1,2909 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import re
+import sys
+
+ROOT = Path(__file__).resolve().parents[2]
+
+PATH_ALIASES = {
+    "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h":
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h",
+    "modules/ui_shared/src/ui/presentation_sources/legacy_chat_delivery_action_bridge.cpp":
+        "modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp",
+    "modules/ui_shared/tests/test_legacy_chat_delivery_action_bridge.cpp":
+        "modules/ui_chat_runtime/tests/test_chat_delivery_action_port_adapter.cpp",
+    "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h":
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h",
+    "modules/ui_shared/src/ui/presentation_sources/legacy_chat_delivery_event_bridge.cpp":
+        "modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp",
+    "modules/ui_shared/tests/test_legacy_chat_delivery_event_bridge.cpp":
+        "modules/ui_chat_runtime/tests/test_chat_delivery_event_projection_adapter.cpp",
+    "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h":
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h",
+    "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h":
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h",
+    "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h":
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h",
+    "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_source.cpp":
+        "modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp",
+    "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_action_sink.cpp":
+        "modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp",
+    "modules/ui_shared/tests/test_legacy_key_verification_adapters.cpp":
+        "modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp",
+    "modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h":
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h",
+    "modules/ui_shared/src/ui/presentation_sources/legacy_map_overlay_source.cpp":
+        "modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp",
+    "modules/ui_shared/tests/test_legacy_map_overlay_source.cpp":
+        "modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp",
+    "modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h":
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/key_verification_modal_renderer.h",
+    "modules/ui_shared/src/ui/screens/chat/key_verification_modal_renderer.cpp":
+        "modules/ui_lvgl_ux_packs/src/common/key_verification_modal_renderer.cpp",
+    "modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h":
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/team_position_picker_renderer.h",
+    "modules/ui_shared/src/ui/screens/chat/team_position_picker_renderer.cpp":
+        "modules/ui_lvgl_ux_packs/src/common/team_position_picker_renderer.cpp",
+    "modules/ui_shared/include/ui/map_tiles/map_tile_types.h":
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_types.h",
+    "modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h":
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_resolver.h",
+    "modules/ui_shared/include/ui/map_tiles/map_tile_source.h":
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_source.h",
+    "modules/ui_shared/include/ui/map_tiles/map_tile_cache.h":
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_cache.h",
+    "modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h":
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_decoder_cache.h",
+    "modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h":
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_render_queue.h",
+    "modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h":
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h",
+    "modules/ui_shared/src/ui/map_tiles/map_tile_render_queue.cpp":
+        "modules/ui_map_runtime/src/map_tiles/map_tile_render_queue.cpp",
+    "modules/ui_shared/src/ui/map_tiles/map_tile_resolver.cpp":
+        "modules/ui_map_runtime/src/map_tiles/map_tile_resolver.cpp",
+    "modules/ui_shared/src/ui/map_tiles/legacy_filesystem_map_tile_source.cpp":
+        "modules/ui_map_runtime/src/map_tiles/filesystem_map_tile_source.cpp",
+    "modules/ui_shared/tests/test_map_tile_render_queue.cpp":
+        "modules/ui_map_runtime/tests/test_map_tile_render_queue.cpp",
+    "modules/ui_shared/tests/test_map_tile_resolver.cpp":
+        "modules/ui_map_runtime/tests/test_map_tile_resolver.cpp",
+    "modules/ui_shared/tests/test_legacy_filesystem_map_tile_source.cpp":
+        "modules/ui_map_runtime/tests/test_filesystem_map_tile_source.cpp",
+    "modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h":
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay/map_overlay_projector.h",
+    "modules/ui_shared/src/ui/map_overlay/map_overlay_projector.cpp":
+        "modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp",
+    "modules/ui_shared/tests/test_map_overlay_projector.cpp":
+        "modules/ui_map_runtime/tests/test_map_overlay_projector.cpp",
+    "modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h":
+        "modules/ui_gps_runtime/include/ui_gps_runtime/gps_ui_refresh_sink.h",
+    "modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h":
+        "modules/ui_gps_runtime/include/ui_gps_runtime/gps_page_runtime_pump.h",
+    "modules/ui_shared/src/ui/screens/gps/gps_page_runtime_pump.cpp":
+        "modules/ui_gps_runtime/src/gps_page_runtime_pump.cpp",
+    "modules/ui_shared/tests/test_gps_page_runtime_pump.cpp":
+        "modules/ui_gps_runtime/tests/test_gps_page_runtime_pump.cpp",
+    "modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h":
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_ui_refresh_sink.h",
+    "modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h":
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_page_runtime_event_pump.h",
+    "modules/ui_shared/src/ui/screens/chat/chat_page_runtime_event_pump.cpp":
+        "modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp",
+}
+
+
+def resolve_path(path: str) -> Path:
+    direct = ROOT / path
+    if direct.exists() and path not in PATH_ALIASES:
+        return direct
+    alias = PATH_ALIASES.get(path)
+    if alias:
+        return ROOT / alias
+    return direct
+
+
+def exists(path: str) -> bool:
+    return resolve_path(path).exists()
+
+
+def read_text(path: str) -> str:
+    return resolve_path(path).read_text(encoding="utf-8", errors="ignore")
+
+
+def strip_cpp_comments(text: str) -> str:
+    text = re.sub(r"/\*.*?\*/", "", text, flags=re.DOTALL)
+    return re.sub(r"//.*", "", text)
+
+
+def fail(message: str) -> int:
+    print(f"[phase7-runtime-ready] FAIL: {message}")
+    return 1
+
+
+def iter_code_files(*roots: Path):
+    for root in roots:
+        if not root.exists():
+            continue
+        for path in root.rglob("*"):
+            if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+                yield path
+
+
+def check_required_files() -> int:
+    required = [
+        "docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md",
+        "docs/audits/CHAT_DELIVERY_EVENT_PROJECTION_AUDIT.md",
+        "docs/audits/CHAT_DELIVERY_ACTION_OWNERSHIP_AUDIT.md",
+        "docs/audits/KEY_VERIFICATION_OWNERSHIP_AUDIT.md",
+        "docs/audits/CHAT_RUNTIME_EVENT_PUMP_AUDIT.md",
+        "docs/audits/TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md",
+        "docs/audits/TEAM_POSITION_PICKER_RENDERER_AUDIT.md",
+        "docs/audits/LEGACY_BURNDOWN_REGISTER.md",
+        "docs/audits/CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md",
+        "docs/audits/PHASE7_6_LEGACY_BURNDOWN_REPORT.md",
+        "docs/audits/PHASE7_7_EVENT_PUMP_BURNDOWN_REPORT.md",
+        "docs/audits/PHASE7_8_TEAM_RICH_PAYLOAD_BURNDOWN_REPORT.md",
+        "docs/audits/PHASE7_9_TEAM_POSITION_PICKER_BURNDOWN_REPORT.md",
+        "docs/audits/MAP_TILE_SOURCE_CACHE_OWNERSHIP_AUDIT.md",
+        "docs/audits/PHASE7_10_MAP_TILE_SOURCE_CACHE_BURNDOWN_REPORT.md",
+        "docs/audits/MAP_TILE_RENDER_QUEUE_CACHE_AUDIT.md",
+        "docs/audits/PHASE7_11_MAP_TILE_RENDER_QUEUE_CACHE_REPORT.md",
+        "docs/audits/MAP_OVERLAY_ROUTE_TRACKER_OWNERSHIP_AUDIT.md",
+        "docs/audits/PHASE7_12_MAP_OVERLAY_ROUTE_TRACKER_REPORT.md",
+        "docs/audits/GPS_RUNTIME_SCHEDULING_OWNERSHIP_AUDIT.md",
+        "docs/audits/PHASE7_13_GPS_RUNTIME_SCHEDULING_REPORT.md",
+        "docs/audits/PHASE7_FINAL_RUNTIME_OWNERSHIP_READINESS_REPORT.md",
+        "docs/audits/PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md",
+        "docs/specification/CHAT_DELIVERY_RUNTIME_SPEC.md",
+        "docs/specification/CHAT_DELIVERY_ACTION_RUNTIME_SPEC.md",
+        "docs/specification/KEY_VERIFICATION_RUNTIME_SPEC.md",
+        "docs/specification/CHAT_RUNTIME_EVENT_PUMP_SPEC.md",
+        "docs/specification/TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md",
+        "docs/specification/TEAM_POSITION_PICKER_RENDERER_SPEC.md",
+        "docs/specification/MAP_TILE_SOURCE_CACHE_RUNTIME_SPEC.md",
+        "docs/specification/MAP_TILE_RENDER_QUEUE_CACHE_SPEC.md",
+        "docs/specification/MAP_OVERLAY_ROUTE_TRACKER_RUNTIME_SPEC.md",
+        "docs/specification/GPS_RUNTIME_SCHEDULING_SPEC.md",
+        "docs/audits/TEAM_ACTION_OWNERSHIP_AUDIT.md",
+        "docs/specification/TEAM_ACTION_RUNTIME_SPEC.md",
+        "docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md",
+        "modules/core_chat/include/chat/delivery/chat_delivery_types.h",
+        "modules/core_chat/include/chat/delivery/chat_delivery_read_model.h",
+        "modules/core_chat/include/chat/delivery/chat_delivery_event_projector.h",
+        "modules/core_chat/include/chat/delivery/chat_delivery_event_port.h",
+        "modules/core_chat/include/chat/delivery/chat_delivery_action_types.h",
+        "modules/core_chat/include/chat/delivery/chat_delivery_action_sink.h",
+        "modules/core_chat/include/chat/delivery/chat_delivery_action_service.h",
+        "modules/core_chat/include/chat/delivery/legacy_chat_delivery_bridge.h",
+        "modules/core_chat/include/chat/delivery/legacy_chat_send_result_mapper.h",
+        "modules/core_chat/src/delivery/chat_delivery_read_model.cpp",
+        "modules/core_chat/src/delivery/chat_delivery_event_projector.cpp",
+        "modules/core_chat/src/delivery/chat_delivery_event_port.cpp",
+        "modules/core_chat/src/delivery/chat_delivery_action_service.cpp",
+        "modules/core_chat/src/delivery/legacy_chat_delivery_bridge.cpp",
+        "modules/core_chat/src/delivery/legacy_chat_send_result_mapper.cpp",
+        "modules/core_chat/tests/test_chat_delivery_read_model.cpp",
+        "modules/core_chat/tests/test_chat_delivery_event_projector.cpp",
+        "modules/core_chat/tests/test_chat_delivery_event_port.cpp",
+        "modules/core_chat/tests/test_chat_delivery_action_service.cpp",
+        "modules/core_chat/tests/test_legacy_chat_delivery_bridge.cpp",
+        "modules/core_chat/tests/test_legacy_chat_send_result_mapper.cpp",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_chat_delivery_action_bridge.cpp",
+        "modules/ui_shared/tests/test_legacy_chat_delivery_action_bridge.cpp",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_chat_delivery_event_bridge.cpp",
+        "modules/ui_shared/tests/test_legacy_chat_delivery_event_bridge.cpp",
+        "modules/ui_shared/include/ui/team_actions/team_action_types.h",
+        "modules/ui_shared/include/ui/team_actions/team_action_sink.h",
+        "modules/ui_shared/include/ui/team_actions/legacy_team_action_bridge.h",
+        "modules/ui_shared/src/ui/team_actions/legacy_team_action_bridge.cpp",
+        "modules/ui_shared/tests/test_team_action_types.cpp",
+        "modules/ui_shared/tests/test_legacy_team_action_bridge.cpp",
+        "modules/ui_shared/include/ui/team_presentation/team_rich_payload_display.h",
+        "modules/ui_shared/include/ui/team_presentation/team_rich_payload_projector.h",
+        "modules/ui_shared/src/ui/team_presentation/team_rich_payload_projector.cpp",
+        "modules/ui_shared/tests/test_team_rich_payload_projector.cpp",
+        "modules/ui_presentation/include/ui_presentation/key_verification/key_verification_snapshot.h",
+        "modules/ui_presentation/include/ui_presentation/key_verification/key_verification_source.h",
+        "modules/ui_presentation/include/ui_presentation/key_verification/key_verification_action_sink.h",
+        "modules/ui_presentation/include/ui_presentation/key_verification/key_verification_model.h",
+        "modules/ui_presentation/src/key_verification/key_verification_model.cpp",
+        "modules/ui_presentation/tests/test_key_verification_model.cpp",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_action_sink.cpp",
+        "modules/ui_shared/tests/test_legacy_key_verification_adapters.cpp",
+        "modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h",
+        "modules/ui_shared/src/ui/screens/chat/key_verification_modal_renderer.cpp",
+        "modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h",
+        "modules/ui_shared/src/ui/screens/chat/team_position_picker_renderer.cpp",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_types.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_source.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_cache.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h",
+        "modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h",
+        "modules/ui_shared/src/ui/map_tiles/map_tile_render_queue.cpp",
+        "modules/ui_shared/src/ui/map_tiles/map_tile_resolver.cpp",
+        "modules/ui_shared/src/ui/map_tiles/legacy_filesystem_map_tile_source.cpp",
+        "modules/ui_shared/tests/test_map_tile_render_queue.cpp",
+        "modules/ui_shared/tests/test_map_tile_resolver.cpp",
+        "modules/ui_shared/tests/test_legacy_filesystem_map_tile_source.cpp",
+        "modules/ui_presentation/include/ui_presentation/map/map_overlay_snapshot.h",
+        "modules/ui_presentation/include/ui_presentation/map/map_overlay_source.h",
+        "modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h",
+        "modules/ui_shared/src/ui/map_overlay/map_overlay_projector.cpp",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_map_overlay_source.cpp",
+        "modules/ui_shared/tests/test_map_overlay_projector.cpp",
+        "modules/ui_shared/tests/test_legacy_map_overlay_source.cpp",
+        "modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h",
+        "modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h",
+        "modules/ui_shared/src/ui/screens/gps/gps_page_runtime_pump.cpp",
+        "modules/ui_shared/tests/test_gps_page_runtime_pump.cpp",
+        "modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h",
+        "modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h",
+        "modules/ui_shared/src/ui/screens/chat/chat_page_runtime_event_pump.cpp",
+        "tools/architecture/check_phase7_runtime_ownership_ready.py",
+    ]
+
+    failures = 0
+    for path in required:
+        if not exists(path):
+            failures += fail(f"missing required file: {path}")
+    return failures
+
+
+def check_removed_chat_read_projection_not_reintroduced() -> int:
+    legacy_type = "Legacy" + "ChatPresentationSource"
+    legacy_file_stem = "legacy_chat" + "_presentation_source"
+    removed_paths = [
+        "modules/ui_shared/include/ui/presentation_sources/" + legacy_file_stem + ".h",
+        "modules/ui_shared/src/ui/presentation_sources/" + legacy_file_stem + ".cpp",
+        "modules/ui_shared/tests/test_" + legacy_file_stem + ".cpp",
+    ]
+
+    failures = 0
+    for path in removed_paths:
+        if exists(path):
+            failures += fail(f"removed chat presentation source path still exists: {path}")
+
+    search_roots = [
+        ROOT / "apps",
+        ROOT / "cmake",
+        ROOT / "docs",
+        ROOT / "modules",
+        ROOT / "tools" / "architecture",
+    ]
+    text_suffixes = {
+        ".c",
+        ".cc",
+        ".cpp",
+        ".cxx",
+        ".h",
+        ".hpp",
+        ".cmake",
+        ".ini",
+        ".json",
+        ".md",
+        ".py",
+        ".txt",
+    }
+    this_file = Path(__file__).resolve()
+    for root in search_roots:
+        if not root.exists():
+            continue
+        for path in root.rglob("*"):
+            if not path.is_file() or path.resolve() == this_file:
+                continue
+            if path.suffix not in text_suffixes and path.name != "CMakeLists.txt":
+                continue
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            if legacy_type in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} references removed {legacy_type}"
+                )
+            if legacy_file_stem in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} references removed {legacy_file_stem}"
+                )
+    return failures
+
+
+def check_docs() -> int:
+    docs = {
+        "docs/audits/CHAT_DELIVERY_OWNERSHIP_AUDIT.md": [
+            "`ChatWorkspaceModel` must not own pending/failure",
+            "Renderer must not infer delivery/failure",
+            "ChatDeliveryReadModel / ChatDeliveryStateStore",
+            "dedicated delivery read model",
+        ],
+        "docs/specification/CHAT_DELIVERY_RUNTIME_SPEC.md": [
+            "Delivery state is runtime state, not UI state",
+            "ChatDeliveryEventProjector",
+            "ChatDeliveryReadModel",
+            "IChatDeliveryEventPort",
+            "ProjectingChatDeliveryEventPort",
+            "LegacyChatDeliveryEventBridge",
+            "ChatPresentationSource",
+            "Phase 7.1 does not make `ChatWorkspaceModel` own delivery state",
+        ],
+        "docs/audits/CHAT_DELIVERY_ACTION_OWNERSHIP_AUDIT.md": [
+            "retry",
+            "cancel pending",
+            "clear failure",
+            "ChatDeliveryActionRequest",
+            "ChatDeliveryActionService",
+            "Renderers and controllers must not directly clear delivery records",
+        ],
+        "docs/specification/CHAT_DELIVERY_ACTION_RUNTIME_SPEC.md": [
+            "Delivery actions belong to runtime/action sinks",
+            "ChatDeliveryActionRequest",
+            "IChatDeliveryActionSink",
+            "IRetryChatMessagePort",
+            "ChatDeliveryActionService",
+            "LegacyChatDeliveryActionBridge",
+            "`ChatWorkspaceModel` must not own retry, cancel, or clear-failure state",
+        ],
+        "docs/audits/CHAT_DELIVERY_EVENT_PROJECTION_AUDIT.md": [
+            "ChatSendResultEvent",
+            "`msg_id`",
+            "`success`",
+            "success=false",
+            "AckTimeout",
+            "LegacyChatDeliveryEventBridge",
+        ],
+        "docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md": [
+            "Chat delivery / pending / failure",
+            "runtime state",
+            "not owned by",
+            "composition-root ownership",
+            "Team location/command action ownership",
+            "LegacyTeamActionBridge",
+            "Team rich payload display ownership",
+            "TeamRichPayloadProjector",
+            "Chat retry/cancel/clear failure actions",
+            "ChatDeliveryActionService",
+            "key verification workflow",
+            "KeyVerificationModel",
+            "Map tile/cache ownership",
+            "MapTileResolver",
+            "LegacyFilesystemMapTileSource",
+        ],
+        "docs/audits/KEY_VERIFICATION_OWNERSHIP_AUDIT.md": [
+            "Key verification is a standalone runtime/presentation workflow",
+            "`ChatWorkspaceModel`",
+            "`MessageRow`",
+            "renderer-local modal state",
+            "`IMeshAdapter::submitKeyVerificationNumber(...)`",
+            "`ContactService::setNodeKeyManuallyVerified(...)`",
+            "LegacyKeyVerificationSource",
+            "LegacyKeyVerificationActionSink",
+        ],
+        "docs/specification/KEY_VERIFICATION_RUNTIME_SPEC.md": [
+            "Key verification is an independent runtime/presentation workflow",
+            "KeyVerificationSnapshot",
+            "IKeyVerificationPresentationSource",
+            "IKeyVerificationActionSink",
+            "KeyVerificationModel",
+            "LegacyKeyVerificationSource",
+            "LegacyKeyVerificationActionSink",
+            "Phase 7.5 does not add key verification to `ChatWorkspaceModel` or",
+        ],
+        "docs/audits/TEAM_ACTION_OWNERSHIP_AUDIT.md": [
+            "Team actions are command ownership",
+            "Renderer/controller code may collect user input",
+            "must not",
+            "encode Team payloads",
+            "LegacyTeamActionBridge",
+        ],
+        "docs/specification/TEAM_ACTION_RUNTIME_SPEC.md": [
+            "Team action payload encoding belongs to Team action/runtime adapters",
+            "TeamActionRequest",
+            "ITeamActionSink",
+            "ITeamLocationSource",
+            "LegacyTeamActionBridge",
+            "Phase 7.2 does not turn Team into DirectPeer or Channel chat",
+        ],
+        "docs/audits/CHAT_RUNTIME_EVENT_PUMP_AUDIT.md": [
+            "Phase 7.7 moves Chat runtime scheduling and event projection out of `ChatUiController`",
+            "ChatSendResultEvent",
+            "LegacyChatDeliveryEventBridge",
+            "LegacyKeyVerificationSource",
+            "ChatService::processIncoming()",
+            "ChatService::flushStore()",
+            "IChatUiRefreshSink",
+            "ChatPageRuntimeEventPump",
+        ],
+        "docs/specification/CHAT_RUNTIME_EVENT_PUMP_SPEC.md": [
+            "Runtime event projection belongs to the event pump",
+            "UI refresh belongs to the controller",
+            "IChatUiRefreshSink",
+            "ChatPageRuntimeEventPump",
+            "ChatPageRuntimeFacade",
+            "ChatSendResultEvent",
+            "ChatService::processIncoming()",
+            "ChatService::flushStore()",
+        ],
+        "docs/audits/TEAM_RICH_PAYLOAD_PRESENTATION_AUDIT.md": [
+            "Team rich payload display is presentation projection",
+            "TeamRichPayloadProjector",
+            "TeamRichPayloadDisplay",
+            "TeamChatPresentationSource",
+            "ChatUiController",
+            "decodeTeamChatLocation",
+            "decodeTeamChatCommand",
+            "The chat controller no longer formats or decodes Team location/command display payloads",
+        ],
+        "docs/audits/TEAM_POSITION_PICKER_RENDERER_AUDIT.md": [
+            "Phase 7.9 burns down Team position picker widget lifecycle from `ChatUiController`",
+            "renderer / widget lifecycle boundary",
+            "TeamPositionPickerRenderer",
+            "overlay",
+            "panel",
+            "description label",
+            "focus group",
+            "icon event contexts",
+            "`ChatUiController` owns only",
+            "`TeamPositionPickerRenderer` must not",
+            "send Team actions",
+        ],
+        "docs/specification/TEAM_RICH_PAYLOAD_PRESENTATION_SPEC.md": [
+            "Team rich payload display is presentation projection, not controller formatting",
+            "TeamRichPayloadKind",
+            "TeamCommandDisplayKind",
+            "TeamRichPayloadDisplay",
+            "TeamRichPayloadProjector",
+            "TeamChatLogEntry -> TeamRichPayloadDisplay",
+            "TeamChatPresentationSource",
+            "Phase 7.8 does not",
+        ],
+        "docs/specification/TEAM_POSITION_PICKER_RENDERER_SPEC.md": [
+            "Picker rendering belongs to `TeamPositionPickerRenderer`",
+            "Team action sending belongs to `ITeamActionSink`",
+            "TeamPositionPickerRenderer::Callbacks",
+            "bool open()",
+            "void close(bool restore_group)",
+            "bool isOpen() const",
+            "void updateHint(uint8_t icon_id)",
+            "must not interpret the result as a Team send operation",
+            "Phase 7.9 does not",
+        ],
+        "docs/audits/LEGACY_BURNDOWN_REGISTER.md": [
+            "Remaining callers",
+            "Removal condition",
+            "Target phase",
+            "Status",
+            "LegacyChatDeliveryEventBridge",
+            "LegacyChatDeliveryActionBridge",
+            "LegacyTeamActionBridge",
+            "LegacyKeyVerificationSource",
+            "LegacyKeyVerificationActionSink",
+            "ChatUiController` key verification modal rendering",
+            "ChatUiController` Team payload encoding",
+            "ChatUiController` delivery mutation",
+            "ChatUiController` runtime event pump",
+            "ChatUiController` Team rich payload formatting",
+            "ChatUiController` Team position picker renderer",
+            "MessageRow` Team rich display limitations",
+            "Map tile path/cache legacy runtime",
+            "Map tile visible plan in platform renderer",
+            "ESP decoded LVGL tile cache",
+        ],
+        "docs/audits/CHAT_UI_CONTROLLER_BURNDOWN_AUDIT.md": [
+            "Temporary UI Responsibilities",
+            "Migrated Runtime Responsibilities",
+            "Remaining Legacy Responsibilities",
+            "Team location/command payload encoding",
+            "Team rich payload display projection",
+            "Key verification modal rendering",
+            "ChatDeliveryReadModel",
+            "ChatDeliveryEventProjector",
+            "ChatDeliveryActionService",
+            "TeamRichPayloadProjector",
+            "TeamPositionPickerRenderer",
+        ],
+        "docs/audits/PHASE7_6_LEGACY_BURNDOWN_REPORT.md": [
+            "Phase 7.6 reduced Chat / Team / key-verification legacy ownership surfaces",
+            "Burned Down",
+            "Still Contained",
+            "Checker Changes",
+            "Remaining Work",
+        ],
+        "docs/audits/PHASE7_7_EVENT_PUMP_BURNDOWN_REPORT.md": [
+            "Phase 7.7 moved Chat runtime event projection and ChatService scheduling out of `ChatUiController`",
+            "ChatPageRuntimeEventPump",
+            "ChatPageRuntimeFacade",
+            "ChatService::processIncoming()",
+            "ChatService::flushStore()",
+            "Burned Down",
+            "Still Contained",
+        ],
+        "docs/audits/PHASE7_8_TEAM_RICH_PAYLOAD_BURNDOWN_REPORT.md": [
+            "Phase 7.8 moved Team location/command display decoding out of `ChatUiController`",
+            "TeamRichPayloadProjector",
+            "TeamChatPresentationSource",
+            "format_team_chat_entry",
+            "decodeTeamChatLocation",
+            "decodeTeamChatCommand",
+            "Burned Down",
+            "Still Contained",
+        ],
+        "docs/audits/PHASE7_9_TEAM_POSITION_PICKER_BURNDOWN_REPORT.md": [
+            "Phase 7.9 moved Team position picker LVGL widget lifecycle out of `ChatUiController`",
+            "TeamPositionPickerRenderer",
+            "team_position_picker_overlay_",
+            "team_position_picker_panel_",
+            "team_position_picker_desc_",
+            "team_position_picker_group_",
+            "team_position_prev_group_",
+            "team_position_icon_ctxs_",
+            "TeamPositionIconEventCtx",
+            "team_position_icon_event_cb",
+            "team_position_cancel_event_cb",
+            "Burned Down",
+            "Still Contained",
+        ],
+        "docs/audits/MAP_TILE_SOURCE_CACHE_OWNERSHIP_AUDIT.md": [
+            "Phase 7.10 establishes ownership for map tile source, path resolution, and tile availability lookup",
+            "MapTileRef",
+            "MapTileResolver",
+            "LegacyFilesystemMapTileSource",
+            "IMapTileSource::lookup(...)",
+            "MapWorkspaceSnapshot",
+            "/maps/base/osm/{z}/{x}/{y}.png",
+            "/maps/contour/major-500/{z}/{x}/{y}.png",
+            "ESP decoded LVGL tile cache",
+            "Linux `MapTileCache` downloader",
+        ],
+        "docs/specification/MAP_TILE_SOURCE_CACHE_RUNTIME_SPEC.md": [
+            "Tile lookup and cache ownership belong to map runtime/source adapters",
+            "MapTileRef",
+            "MapTileLayer",
+            "MapTileFormat",
+            "MapTilePayload",
+            "IMapTileSource",
+            "IMapTileCache",
+            "MapTileResolver",
+            "LegacyFilesystemMapTileSource",
+            "Phase 7.10 does not",
+        ],
+        "docs/audits/PHASE7_10_MAP_TILE_SOURCE_CACHE_BURNDOWN_REPORT.md": [
+            "Phase 7.10 moved Trail Mate map tile path mapping and filesystem-backed availability lookup",
+            "MapTileResolver",
+            "LegacyFilesystemMapTileSource",
+            "MapTileRef",
+            "Burned Down",
+            "Still Contained",
+            "ESP decoded LVGL tile cache",
+            "Linux `platform::linux_runtime::MapTileCache` downloader",
+            "uConsole workspace path fields",
+        ],
+        "docs/audits/MAP_TILE_RENDER_QUEUE_CACHE_AUDIT.md": [
+            "Phase 7.11 establishes explicit ownership boundaries for map tile visible render planning and decoded tile cache lifetime",
+            "MapTileRenderQueue",
+            "MapTileRenderRef",
+            "MapTileRenderState",
+            "IMapTileDecoderCache",
+            "LvglDecodedTileCache",
+            "LVGL tile widget records",
+            "Platform tile loader cadence",
+        ],
+        "docs/specification/MAP_TILE_RENDER_QUEUE_CACHE_SPEC.md": [
+            "Source owns tile bytes",
+            "Decoder cache owns decoded image lifetime",
+            "Render queue owns the current visible tile plan",
+            "MapTileScreenRect",
+            "MapTileRenderState",
+            "MapTileRenderRef",
+            "MapTileRenderQueue",
+            "IMapTileDecoderCache",
+            "LvglDecodedTileCache",
+            "Phase 7.11 does not",
+        ],
+        "docs/audits/PHASE7_11_MAP_TILE_RENDER_QUEUE_CACHE_REPORT.md": [
+            "Phase 7.11 made the current map tile render plan and ESP decoded tile cache ownership explicit",
+            "MapTileRenderQueue",
+            "MapTileRenderState",
+            "LvglDecodedTileCache",
+            "IMapTileDecoderCache",
+            "Burned Down",
+            "Still Contained",
+            "Platform tile loading cadence",
+        ],
+    }
+
+    failures = 0
+    for path, tokens in docs.items():
+        if not exists(path):
+            continue
+        text = read_text(path)
+        for token in tokens:
+            if token not in text:
+                failures += fail(f"{path} missing runtime ownership token: {token}")
+    return failures
+
+
+def check_legacy_burndown_register() -> int:
+    failures = 0
+    path = "docs/audits/LEGACY_BURNDOWN_REGISTER.md"
+    if not exists(path):
+        return failures
+
+    text = read_text(path)
+    header = (
+        "| Legacy surface | New owner | Remaining callers | Removal condition | "
+        "Target phase | Status |"
+    )
+    if header not in text:
+        failures += fail("LEGACY_BURNDOWN_REGISTER.md missing required table header")
+
+    required_surfaces = [
+        "LegacyChatDeliveryEventBridge",
+        "LegacyChatDeliveryActionBridge",
+        "LegacyTeamActionBridge",
+        "LegacyKeyVerificationSource",
+        "LegacyKeyVerificationActionSink",
+        "ChatUiController` key verification modal rendering",
+        "ChatUiController` Team payload encoding",
+        "ChatUiController` delivery mutation",
+        "ChatUiController` runtime event pump",
+        "ChatUiController` Team rich payload formatting",
+        "ChatUiController` Team position picker renderer",
+        "MessageRow` Team rich display limitations",
+        "Map tile path/cache legacy runtime",
+        "Map tile visible plan in platform renderer",
+        "ESP decoded LVGL tile cache",
+        "Map overlay current/team marker projection",
+        "Map route/tracker overlay projection",
+        "GPS page refresh cadence",
+    ]
+    for surface in required_surfaces:
+        if surface not in text:
+            failures += fail(f"LEGACY_BURNDOWN_REGISTER.md missing surface: {surface}")
+
+    for line in text.splitlines():
+        if not line.startswith("| `") or line.startswith("| ---"):
+            continue
+        cells = [cell.strip() for cell in line.strip().strip("|").split("|")]
+        if len(cells) < 6:
+            failures += fail(f"legacy burn-down row has too few cells: {line}")
+            continue
+        surface, _owner, callers, removal_condition, target_phase, status = cells[:6]
+        if not callers or callers.lower() in {"none", "n/a"}:
+            failures += fail(f"{surface} missing remaining caller/none rationale")
+        if not removal_condition or removal_condition.lower() in {"none", "n/a"}:
+            failures += fail(f"{surface} missing removal condition")
+        if not target_phase or target_phase.lower() in {"none", "n/a"}:
+            failures += fail(f"{surface} missing target phase")
+        if status not in {
+            "contained",
+            "burned-down",
+            "burned-down to deprecated alias",
+            "remaining legacy",
+        }:
+            failures += fail(f"{surface} has unsupported burn-down status: {status}")
+
+    return failures
+
+
+def check_core_delivery_is_runtime_only() -> int:
+    forbidden_tokens = [
+        "ui_presentation",
+        "ui/",
+        "lvgl.h",
+        "gtk",
+        "ChatWorkspaceModel",
+        "MessageRow",
+        "Renderer",
+        "MeshSession",
+        "IMeshAdapter",
+        "RadioLib",
+        "Arduino.h",
+        "Preferences",
+    ]
+
+    failures = 0
+    roots = [
+        ROOT / "modules/core_chat/include/chat/delivery",
+        ROOT / "modules/core_chat/src/delivery",
+    ]
+    for path in iter_code_files(*roots):
+        text = strip_cpp_comments(path.read_text(encoding="utf-8", errors="ignore"))
+        for token in forbidden_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden delivery token {token}"
+                )
+    return failures
+
+
+def check_delivery_type_shape() -> int:
+    failures = 0
+
+    types = "modules/core_chat/include/chat/delivery/chat_delivery_types.h"
+    if exists(types):
+        text = read_text(types)
+        for token in [
+            "enum class DeliveryState",
+            "Queued",
+            "Sending",
+            "Delivered",
+            "enum class DeliveryFailureKind",
+            "PeerKeyMissing",
+            "LocalIdentityMissing",
+            "RadioSendFailed",
+            "AckTimeout",
+            "ChatDeliveryRef",
+            "ChatDeliveryRecord",
+        ]:
+            if token not in text:
+                failures += fail(f"chat delivery types missing token: {token}")
+
+    read_model = "modules/core_chat/include/chat/delivery/chat_delivery_read_model.h"
+    if exists(read_model):
+        text = read_text(read_model)
+        for token in ["kMaxRecords", "upsert", "find", "clear", "clearAll"]:
+            if token not in text:
+                failures += fail(f"ChatDeliveryReadModel missing token: {token}")
+        for token in ["std::vector", "sendText", "retry", "cancel"]:
+            if token in text:
+                failures += fail(f"ChatDeliveryReadModel owns behavior token: {token}")
+
+    projector = (
+        "modules/core_chat/include/chat/delivery/chat_delivery_event_projector.h"
+    )
+    if exists(projector):
+        text = read_text(projector)
+        for token in [
+            "onQueued",
+            "onSending",
+            "onSent",
+            "onDelivered",
+            "onFailed",
+            "onReceived",
+            "SendFailureKind",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatDeliveryEventProjector missing token: {token}")
+
+    event_port = "modules/core_chat/include/chat/delivery/chat_delivery_event_port.h"
+    if exists(event_port):
+        text = read_text(event_port)
+        for token in [
+            "ChatDeliveryEvent",
+            "IChatDeliveryEventPort",
+            "publishDeliveryEvent",
+            "ProjectingChatDeliveryEventPort",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatDeliveryEventPort missing token: {token}")
+        for token in ["ChatWorkspaceModel", "MessageRow", "lvgl.h", "sendText"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"ChatDeliveryEventPort owns forbidden token: {token}")
+
+    action_types = "modules/core_chat/include/chat/delivery/chat_delivery_action_types.h"
+    if exists(action_types):
+        text = read_text(action_types)
+        for token in [
+            "enum class ChatDeliveryActionKind",
+            "Retry",
+            "CancelPending",
+            "ClearFailure",
+            "ChatDeliveryActionRequest",
+            "ChatDeliveryActionFailure",
+            "InvalidRef",
+            "Unsupported",
+            "NotRetryable",
+            "ChatDeliveryActionResult",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatDeliveryActionTypes missing token: {token}")
+        for token in ["UiActionResult", "lvgl.h", "ChatWorkspaceModel", "MessageRow"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"ChatDeliveryActionTypes owns forbidden token: {token}")
+
+    action_sink = "modules/core_chat/include/chat/delivery/chat_delivery_action_sink.h"
+    if exists(action_sink):
+        text = read_text(action_sink)
+        for token in ["IChatDeliveryActionSink", "handleDeliveryAction"]:
+            if token not in text:
+                failures += fail(f"ChatDeliveryActionSink missing token: {token}")
+
+    action_service_header = (
+        "modules/core_chat/include/chat/delivery/chat_delivery_action_service.h"
+    )
+    action_service_source = (
+        "modules/core_chat/src/delivery/chat_delivery_action_service.cpp"
+    )
+    for path in [action_service_header, action_service_source]:
+        if exists(path):
+            text = strip_cpp_comments(read_text(path))
+            for token in ["lvgl.h", "gtk", "ChatWorkspaceModel", "MessageRow", "ui_presentation", "UiActionResult"]:
+                if token in text:
+                    failures += fail(
+                        f"{path} contains forbidden delivery action token: {token}"
+                    )
+    if exists(action_service_header):
+        text = read_text(action_service_header)
+        for token in [
+            "IRetryChatMessagePort",
+            "retryMessage",
+            "ChatDeliveryActionService",
+            "IChatDeliveryActionSink",
+            "ChatDeliveryReadModel& read_model_",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatDeliveryActionService header missing token: {token}")
+    if exists(action_service_source):
+        text = read_text(action_service_source)
+        for token in [
+            "ChatDeliveryActionKind::Retry",
+            "ChatDeliveryActionKind::CancelPending",
+            "ChatDeliveryActionKind::ClearFailure",
+            "read_model_.clear",
+            "retry_port_->retryMessage",
+            "DeliveryState::Queued",
+            "DeliveryState::Sending",
+            "DeliveryState::Failed",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatDeliveryActionService source missing token: {token}")
+
+    mapper = "modules/core_chat/include/chat/delivery/legacy_chat_send_result_mapper.h"
+    if exists(mapper):
+        text = read_text(mapper)
+        for token in [
+            "LegacyChatSendFailure",
+            "PeerKeyMissing",
+            "LocalIdentityMissing",
+            "RadioSendFailed",
+            "AckTimeout",
+            "UnsupportedProtocol",
+            "Rejected",
+            "mapLegacyChatSendResult",
+            "makeAckTimeoutDeliveryEvent",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyChatSendResultMapper missing token: {token}")
+
+    return failures
+
+
+def check_presentation_source_enrichment() -> int:
+    failures = 0
+    header = "modules/ui_shared/include/ui/presentation_sources/chat_presentation_source.h"
+    source = "modules/ui_shared/src/ui/presentation_sources/chat_presentation_source.cpp"
+
+    if exists(header):
+        text = read_text(header)
+        for token in [
+            "ChatDeliveryReadModel",
+            "delivery_read_model = nullptr",
+            "delivery_read_model_",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatPresentationSource header missing token: {token}")
+
+    if exists(source):
+        text = read_text(source)
+        for token in [
+            "delivery_read_model_->find",
+            "toDeliveryRef(message)",
+            "mapDeliveryState",
+            "mapDeliveryFailure",
+            "row.delivery",
+            "row.failure",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatPresentationSource source missing token: {token}")
+        for token in [
+            "out = ui::chat::ChatWorkspaceSnapshot{}",
+            "out = ChatWorkspaceSnapshot{}",
+        ]:
+            if token in text:
+                failures += fail(
+                    f"ChatPresentationSource uses stack-heavy snapshot reset: {token}"
+                )
+        for token in ["onQueued", "onFailed", "ChatDeliveryEventProjector"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(
+                    f"ChatPresentationSource must not project events: {token}"
+                )
+    return failures
+
+
+def check_composition_roots_own_delivery() -> int:
+    failures = 0
+    roots = {
+        "legacy/app_implementations/linux_sim/src/linux_sim_composition_root.h": [
+            "ChatDeliveryReadModel delivery_read_model_",
+            "ChatDeliveryEventProjector delivery_projector_",
+            "ProjectingChatDeliveryEventPort delivery_event_port_",
+            "ChatDeliveryActionService delivery_action_service_",
+            "deliveryReadModel()",
+            "deliveryProjector()",
+            "deliveryEventPort()",
+            "deliveryActionSink()",
+        ],
+        "legacy/app_implementations/linux_uconsole/src/uconsole_composition_root.h": [
+            "ChatDeliveryReadModel delivery_read_model_",
+            "ChatDeliveryEventProjector delivery_projector_",
+            "ProjectingChatDeliveryEventPort delivery_event_port_",
+            "ChatDeliveryActionService delivery_action_service_",
+            "deliveryReadModel()",
+            "deliveryProjector()",
+            "deliveryEventPort()",
+            "deliveryActionSink()",
+        ],
+        "legacy/app_implementations/linux_uconsole/src/uconsole_composition_root.cpp": [
+            "&delivery_read_model_",
+            "ChatPresentationSource",
+            "deliveryEventPort()",
+        ],
+    }
+
+    for path, tokens in roots.items():
+        if not exists(path):
+            failures += fail(f"missing composition root file: {path}")
+            continue
+        text = read_text(path)
+        for token in tokens:
+            if token not in text:
+                failures += fail(f"{path} missing delivery ownership token: {token}")
+    return failures
+
+
+def check_ui_presentation_and_renderers_do_not_own_delivery() -> int:
+    failures = 0
+
+    for path in iter_code_files(
+        ROOT / "modules/ui_presentation/include",
+        ROOT / "modules/ui_presentation/src",
+    ):
+        text = strip_cpp_comments(path.read_text(encoding="utf-8", errors="ignore"))
+        if "chat/delivery" in text or "ChatDelivery" in text:
+            failures += fail(
+                f"{path.relative_to(ROOT)} imports chat delivery runtime"
+            )
+
+    renderer_roots = [
+        ROOT / "modules/ui_shared/src/ui/screens",
+        ROOT / "modules/ui_shared/src/ui/widgets",
+        ROOT / "modules/ui_shared/src/ui/menu",
+        ROOT / "legacy/app_implementations/linux_uconsole/src/platform/gtk",
+    ]
+    for path in iter_code_files(*renderer_roots):
+        if path.name == "chat_page_runtime.cpp":
+            continue
+        text = strip_cpp_comments(path.read_text(encoding="utf-8", errors="ignore"))
+        forbidden_delivery_tokens = [
+            '#include "chat/delivery',
+            "ChatDeliveryReadModel",
+            "ChatDeliveryEventProjector",
+            "ProjectingChatDeliveryEventPort",
+        ]
+        for token in forbidden_delivery_tokens:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} must not own chat delivery runtime token {token}"
+                )
+        if (
+            "LegacyChatDeliveryEventBridge" in text
+            and path.name != "chat_page_runtime_event_pump.cpp"
+        ):
+            failures += fail(
+                f"{path.relative_to(ROOT)} contains delivery event bridge outside approved event pump"
+            )
+    return failures
+
+
+def check_delivery_event_bridge_boundary() -> int:
+    failures = 0
+    bridge_files = [
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h",
+        "modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp",
+    ]
+    for path in bridge_files:
+        if not exists(path):
+            failures += fail(f"missing delivery event bridge file: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "lvgl.h",
+            "gtk",
+            "ChatWorkspaceModel",
+            "MessageRow",
+            "sendText(",
+            "sendMessage(",
+            "retry",
+            "Renderer",
+        ]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden delivery bridge token {token}")
+
+    source = "modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp"
+    if exists(source):
+        text = read_text(source)
+        for token in [
+            "onChatSendResult",
+            "onAckTimeout",
+            "mapLegacyChatSendResult",
+            "publishDeliveryEvent",
+            "toDeliveryRef",
+            "getMessage",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyChatDeliveryEventBridge missing token: {token}")
+
+    controller = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+    if exists(controller):
+        text = strip_cpp_comments(read_text(controller))
+        for token in [
+            "LegacyChatDeliveryEventBridge",
+            "ChatDeliveryReadModel",
+            "ChatDeliveryEventProjector",
+            "ProjectingChatDeliveryEventPort",
+            "delivery_event_bridge",
+            "delivery_read_model",
+            "delivery_projector",
+        ]:
+            if token in text:
+                failures += fail(f"ChatUiController owns delivery runtime token: {token}")
+
+    event_pump = "modules/ui_shared/src/ui/screens/chat/chat_page_runtime_event_pump.cpp"
+    if exists(event_pump):
+        text = read_text(event_pump)
+        for token in [
+            "ChatDeliveryEventProjectionAdapter",
+            "delivery_adapter_->onChatSendResult",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatPageRuntimeEventPump missing delivery projection token: {token}")
+
+    runtime = "modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp"
+    if exists(runtime):
+        text = read_text(runtime)
+        for token in [
+            "ChatDeliveryReadModel",
+            "ChatDeliveryEventProjector",
+            "ProjectingChatDeliveryEventPort",
+            "ChatDeliveryEventProjectionAdapter",
+            "s_delivery_event_adapter",
+            "s_delivery_read_model",
+        ]:
+            if token not in text:
+                failures += fail(f"chat_page_runtime.cpp missing delivery runtime wiring token: {token}")
+
+    return failures
+
+
+def check_delivery_action_bridge_boundary() -> int:
+    failures = 0
+    bridge_files = [
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h",
+        "modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp",
+    ]
+    for path in bridge_files:
+        if not exists(path):
+            failures += fail(f"missing delivery action bridge file: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "lvgl.h",
+            "gtk",
+            "ChatWorkspaceModel",
+            "MessageRow",
+            "ChatDeliveryReadModel",
+            "read_model",
+            "sendText(",
+            "sendMessage(",
+            "Renderer",
+        ]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden delivery action bridge token {token}")
+
+    header = "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h"
+    if exists(header):
+        text = read_text(header)
+        for token in [
+            "LegacyChatDeliveryActionBridge",
+            "ChatDeliveryActionPortAdapter",
+            "[[deprecated",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyChatDeliveryActionBridge header missing token: {token}")
+
+    source = "modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp"
+    if exists(source):
+        text = read_text(source)
+        for token in [
+            "toDeliveryRef",
+            "MessageRef",
+            "ChatDeliveryActionRequest",
+            "handleDeliveryAction",
+            "ChatDeliveryActionKind::Retry",
+            "ChatDeliveryActionKind::CancelPending",
+            "ChatDeliveryActionKind::ClearFailure",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyChatDeliveryActionBridge source missing token: {token}")
+
+    runtime = "modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp"
+    if exists(runtime):
+        text = read_text(runtime)
+        for token in [
+            "ChatDeliveryActionService",
+            "ChatDeliveryActionPortAdapter",
+            "s_delivery_action_service",
+            "s_delivery_action_adapter",
+        ]:
+            if token not in text:
+                failures += fail(f"chat_page_runtime.cpp missing delivery action wiring token: {token}")
+
+    controller = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+    if exists(controller):
+        text = strip_cpp_comments(read_text(controller))
+        for token in [
+            "ChatDeliveryActionService",
+            "ChatDeliveryActionRequest",
+            "IChatDeliveryActionSink",
+            "LegacyChatDeliveryActionBridge",
+            "s_delivery_action",
+        ]:
+            if token in text:
+                failures += fail(f"ChatUiController owns delivery action token: {token}")
+
+    for path in [
+        "modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h",
+        "modules/ui_presentation/src/chat/chat_workspace_model.cpp",
+        "modules/ui_presentation/include/ui_presentation/chat/chat_workspace_snapshot.h",
+    ]:
+        if not exists(path):
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "ChatDeliveryAction",
+            "IChatDeliveryActionSink",
+            "Retry",
+            "CancelPending",
+            "ClearFailure",
+        ]:
+            if token in text:
+                failures += fail(f"{path} owns delivery action token: {token}")
+
+    return failures
+
+
+def check_team_action_type_shape() -> int:
+    failures = 0
+
+    types = "modules/ui_shared/include/ui/team_actions/team_action_types.h"
+    if exists(types):
+        text = read_text(types)
+        for token in [
+            "enum class TeamActionKind",
+            "LocationMarker",
+            "Command",
+            "enum class TeamCommandKind",
+            "TeamLocationMarkerRequest",
+            "use_current_location",
+            "TeamLocationSnapshot",
+            "TeamCommandRequest",
+            "TeamActionRequest",
+        ]:
+            if token not in text:
+                failures += fail(f"Team action types missing token: {token}")
+        for token in ["lv_obj_t", "lvgl.h", "TeamChatMessage", "DirectPeer"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"TeamActionRequest contains forbidden token: {token}")
+
+    sink = "modules/ui_shared/include/ui/team_actions/team_action_sink.h"
+    if exists(sink):
+        text = read_text(sink)
+        for token in ["ITeamActionSink", "sendTeamAction", "ITeamLocationSource", "currentTeamLocation"]:
+            if token not in text:
+                failures += fail(f"Team action sink missing token: {token}")
+        for token in ["ChatWorkspaceModel", "lvgl.h", "LegacyChatActionSink"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"Team action sink contains forbidden token: {token}")
+
+    return failures
+
+
+def check_team_action_bridge_boundary() -> int:
+    failures = 0
+    bridge_files = [
+        "modules/ui_shared/include/ui/team_actions/legacy_team_action_bridge.h",
+        "modules/ui_shared/src/ui/team_actions/legacy_team_action_bridge.cpp",
+    ]
+
+    for path in bridge_files:
+        if not exists(path):
+            failures += fail(f"missing Team action bridge file: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "lvgl.h",
+            "lv_obj_t",
+            "LegacyChatActionSink",
+            "DirectPeer",
+            "ConversationKind::Direct",
+            "ConversationKind::Channel",
+            "ChatWorkspaceModel",
+            "MapWorkspaceModel",
+        ]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden Team action token: {token}")
+
+    source = "modules/ui_shared/src/ui/team_actions/legacy_team_action_bridge.cpp"
+    if exists(source):
+        text = read_text(source)
+        for token in [
+            "ITeamLocationSource",
+            "currentTeamLocation",
+            "encodeTeamChatLocation",
+            "encodeTeamChatCommand",
+            "team_ui_chatlog_append_structured",
+            "sendTeamChat",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyTeamActionBridge source missing token: {token}")
+
+    return failures
+
+
+def _function_body(text: str, start_marker: str, end_marker: str) -> str:
+    start = text.find(start_marker)
+    if start < 0:
+        return ""
+    end = text.find(end_marker, start)
+    if end < 0:
+        return text[start:]
+    return text[start:end]
+
+
+def check_chat_ui_team_action_migration() -> int:
+    failures = 0
+    header = "modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h"
+    source = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+
+    if exists(header):
+        text = read_text(header)
+        for token in ["ITeamActionSink", "team_action_sink_"]:
+            if token not in text:
+                failures += fail(f"ChatUiController header missing Team action token: {token}")
+    else:
+        failures += fail("ChatUiController header is missing")
+
+    if exists(source):
+        text = read_text(source)
+        for token in [
+            "TeamActionRequest",
+            "TeamActionKind::LocationMarker",
+            "sendTeamAction",
+            "team_chat_model_.sendMessage",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatUiController source missing Team action token: {token}")
+        for token in [
+            '#include "platform/ui/gps_runtime.h"',
+            '#include "team/usecase/team_controller.h"',
+        ]:
+            if token in text:
+                failures += fail(f"ChatUiController source reintroduced runtime include: {token}")
+
+        body = strip_cpp_comments(
+            _function_body(
+                text,
+                "bool UiController::sendTeamLocationWithIcon",
+                "void UiController::onTeamPositionIconSelected",
+            )
+        )
+        if not body:
+            failures += fail("ChatUiController sendTeamLocationWithIcon body missing")
+        else:
+            for token in [
+                "encodeTeamChatLocation",
+                "TeamChatMessage",
+                "TeamChatLocation",
+                "team_ui_chatlog_append_structured",
+                "controller->onChat",
+                "setKeysFromPsk",
+                "platform::ui::gps::get_data",
+                "app::teamFacade",
+                "team_ui_get_store",
+                "TeamController",
+            ]:
+                if token in body:
+                    failures += fail(
+                        f"ChatUiController location send still owns Team runtime token: {token}"
+                    )
+    else:
+        failures += fail("ChatUiController source is missing")
+
+    return failures
+
+
+def check_chat_ui_legacy_burndown() -> int:
+    failures = 0
+    header = "modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h"
+    source = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+
+    controller_forbidden = [
+        "encodeTeamChatLocation",
+        "encodeTeamChatCommand",
+        "TeamChatMessage",
+        "setKeysFromPsk",
+        "team_ui_chatlog_append_structured",
+        "platform::ui::gps::get_data",
+        "app::messagingFacade().getMeshAdapter()",
+        "submitKeyVerificationNumber",
+        "setNodeKeyManuallyVerified",
+        "ChatDeliveryReadModel",
+        "ChatDeliveryEventProjector",
+        "ChatDeliveryActionService",
+    ]
+
+    for path in [header, source]:
+        if not exists(path):
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in controller_forbidden:
+            if token in text:
+                failures += fail(
+                    f"{path} contains forbidden Phase 7.6 legacy ownership token: {token}"
+                )
+
+    if exists(source):
+        text = strip_cpp_comments(read_text(source))
+        required = [
+            "KeyVerificationModalCallbacks",
+            "key_verify_modal_",
+            "submitKeyVerificationInput",
+            "key_verification_model_->submitNumber",
+            "key_verification_model_->accept",
+        ]
+        for token in required:
+            if token not in text:
+                failures += fail(f"ChatUiController missing burn-down token: {token}")
+
+    renderer_header = "modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h"
+    renderer_source = "modules/ui_shared/src/ui/screens/chat/key_verification_modal_renderer.cpp"
+    for path in [renderer_header, renderer_source]:
+        if not exists(path):
+            failures += fail(f"missing key verification modal renderer file: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "ContactService",
+            "IMeshAdapter",
+            "LegacyKeyVerificationSession",
+            "ChatService",
+            "ChatWorkspaceModel",
+            "MessageRow",
+            "submitKeyVerificationNumber",
+            "setNodeKeyManuallyVerified",
+            "accept(",
+            "reject(",
+            "refresh(",
+            "submitNumber",
+        ]:
+            if token in text:
+                failures += fail(
+                    f"{path} contains forbidden modal renderer ownership token: {token}"
+                )
+    if exists(renderer_header):
+        text = read_text(renderer_header)
+        for token in [
+            "KeyVerificationModalRefs",
+            "KeyVerificationModalCallbacks",
+            "renderKeyVerificationModal",
+            "destroyKeyVerificationModal",
+            "clearKeyVerificationError",
+        ]:
+            if token not in text:
+                failures += fail(f"key verification modal renderer missing token: {token}")
+
+    return failures
+
+
+def check_team_rich_payload_presentation_boundary() -> int:
+    failures = 0
+    controller = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+    presentation = "modules/ui_shared/src/ui/presentation_sources/team_chat_presentation_source.cpp"
+    display_header = "modules/ui_shared/include/ui/team_presentation/team_rich_payload_display.h"
+    projector_header = "modules/ui_shared/include/ui/team_presentation/team_rich_payload_projector.h"
+    projector_source = "modules/ui_shared/src/ui/team_presentation/team_rich_payload_projector.cpp"
+
+    if exists(display_header):
+        text = read_text(display_header)
+        for token in [
+            "enum class TeamRichPayloadKind",
+            "Text",
+            "Location",
+            "Command",
+            "Unsupported",
+            "enum class TeamCommandDisplayKind",
+            "MoveTo",
+            "RallyPoint",
+            "Hold",
+            "TeamLocationDisplay",
+            "TeamCommandDisplay",
+            "TeamRichPayloadDisplay",
+            "summary",
+            "badge",
+        ]:
+            if token not in text:
+                failures += fail(f"TeamRichPayloadDisplay missing token: {token}")
+        for token in [
+            "lvgl.h",
+            "lv_obj_t",
+            "ChatWorkspaceModel",
+            "ChatUiController",
+            "TeamChatMessage",
+            "sendTeamAction",
+        ]:
+            if token in strip_cpp_comments(text):
+                failures += fail(
+                    f"TeamRichPayloadDisplay contains forbidden ownership token: {token}"
+                )
+
+    if exists(projector_header):
+        text = read_text(projector_header)
+        for token in ["TeamRichPayloadProjector", "project", "TeamRichPayloadDisplay"]:
+            if token not in text:
+                failures += fail(f"TeamRichPayloadProjector header missing token: {token}")
+
+    if exists(projector_source):
+        text = strip_cpp_comments(read_text(projector_source))
+        for token in [
+            "TeamRichPayloadProjector::project",
+            "decodeTeamChatLocation",
+            "decodeTeamChatCommand",
+            "TeamRichPayloadKind::Location",
+            "TeamRichPayloadKind::Command",
+            "TeamRichPayloadKind::Unsupported",
+            "TeamCommandDisplayKind::MoveTo",
+            "TeamCommandDisplayKind::Hold",
+            "team_location_marker_icon_name",
+        ]:
+            if token not in text:
+                failures += fail(f"TeamRichPayloadProjector source missing token: {token}")
+        for token in [
+            "lvgl.h",
+            "lv_obj_t",
+            "ChatUiController",
+            "ChatWorkspaceModel",
+            "LegacyTeamActionBridge",
+            "sendTeamAction",
+            "encodeTeamChatLocation",
+            "encodeTeamChatCommand",
+            "team_ui_chatlog_append_structured",
+            "buildChatWorkspaceSnapshot",
+            "#include <string>",
+            "#include <vector>",
+            "#include <iostream>",
+            "#include <sstream>",
+            "#include <format>",
+            "std::string",
+            "std::vector",
+            "std::format",
+            "std::stringstream",
+            "std::ostringstream",
+        ]:
+            if token in text:
+                failures += fail(
+                    f"TeamRichPayloadProjector owns forbidden token: {token}"
+                )
+
+    if exists(presentation):
+        text = strip_cpp_comments(read_text(presentation))
+        for token in [
+            "TeamRichPayloadProjector",
+            "TeamRichPayloadDisplay",
+            "display.summary",
+        ]:
+            if token not in text:
+                failures += fail(
+                    f"TeamChatPresentationSource missing Team rich projection token: {token}"
+                )
+        for token in [
+            "formatTeamChatEntry",
+            "teamCommandName",
+            "decodeTeamChatLocation",
+            "decodeTeamChatCommand",
+            "TeamChatLocation",
+            "TeamChatCommand",
+        ]:
+            if token in text:
+                failures += fail(
+                    f"TeamChatPresentationSource still owns inline rich payload formatter token: {token}"
+                )
+
+    if exists(controller):
+        text = strip_cpp_comments(read_text(controller))
+        for token in [
+            "format_team_chat_entry",
+            "team_command_name",
+            "decodeTeamChatLocation",
+            "decodeTeamChatCommand",
+            "TeamChatLocation",
+            "TeamChatCommand",
+        ]:
+            if token in text:
+                failures += fail(
+                    f"ChatUiController still owns Team rich payload display token: {token}"
+                )
+
+    return failures
+
+
+def check_team_position_picker_renderer_boundary() -> int:
+    failures = 0
+    header = "modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h"
+    source = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+    renderer_header = "modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h"
+    renderer_source = "modules/ui_shared/src/ui/screens/chat/team_position_picker_renderer.cpp"
+
+    controller_forbidden = [
+        "team_position_picker_overlay_",
+        "team_position_picker_panel_",
+        "team_position_picker_desc_",
+        "team_position_picker_group_",
+        "team_position_prev_group_",
+        "team_position_icon_ctxs_",
+        "TeamPositionIconEventCtx",
+        "team_position_icon_event_cb",
+        "team_position_cancel_event_cb",
+        "lv_obj_create(parent_)",
+    ]
+
+    for path in [header, source]:
+        if not exists(path):
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in controller_forbidden:
+            if token in text:
+                failures += fail(
+                    f"{path} still owns Team position picker widget token: {token}"
+                )
+
+    if exists(header):
+        text = strip_cpp_comments(read_text(header))
+        for token in [
+            "TeamPositionPickerRenderer",
+            "team_position_picker_",
+            "openTeamPositionPicker",
+            "closeTeamPositionPicker",
+            "updateTeamPositionPickerHint",
+            "onTeamPositionIconSelected",
+            "onTeamPositionCancel",
+            "isTeamPositionPickerOpen",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatUiController missing Team picker workflow token: {token}")
+
+    if exists(source):
+        text = strip_cpp_comments(read_text(source))
+        for token in [
+            "TeamPositionPickerRenderer::Callbacks",
+            "team_position_picker_->open()",
+            "team_position_picker_->close(restore_group)",
+            "team_position_picker_->updateHint(icon_id)",
+            "team_position_picker_->isOpen()",
+            "sendTeamLocationWithIcon",
+            "team_action_sink_->sendTeamAction",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatUiController missing Team picker delegation token: {token}")
+
+    for path in [renderer_header, renderer_source]:
+        if not exists(path):
+            failures += fail(f"missing Team position picker renderer file: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "ChatService",
+            "TeamUiStore",
+            "ITeamActionSink",
+            "TeamActionRequest",
+            "sendTeamAction",
+            "encodeTeamChatLocation",
+            "decodeTeamChatLocation",
+            "platform::ui::gps::get_data",
+            "ChatWorkspaceModel",
+            "team_ui_chatlog_append_structured",
+        ]:
+            if token in text:
+                failures += fail(
+                    f"{path} contains forbidden Team picker renderer token: {token}"
+                )
+
+    if exists(renderer_header):
+        text = read_text(renderer_header)
+        for token in [
+            "TeamPositionPickerRenderer",
+            "struct Callbacks",
+            "on_icon_selected",
+            "on_cancel",
+            "bool open()",
+            "void close(bool restore_group)",
+            "bool isOpen() const",
+            "void updateHint(uint8_t icon_id)",
+            "IconEventCtx",
+            "iconEventCb",
+            "cancelEventCb",
+        ]:
+            if token not in text:
+                failures += fail(f"TeamPositionPickerRenderer header missing token: {token}")
+
+    if exists(renderer_source):
+        text = strip_cpp_comments(read_text(renderer_source))
+        for token in [
+            "TeamPositionPickerRenderer::open",
+            "TeamPositionPickerRenderer::close",
+            "TeamPositionPickerRenderer::updateHint",
+            "TeamPositionPickerRenderer::iconEventCb",
+            "TeamPositionPickerRenderer::cancelEventCb",
+            "lv_obj_create",
+            "lv_group_create",
+            "set_default_group",
+            "callbacks_.on_icon_selected",
+            "callbacks_.on_cancel",
+        ]:
+            if token not in text:
+                failures += fail(f"TeamPositionPickerRenderer source missing token: {token}")
+
+    return failures
+
+
+def check_map_tile_source_cache_boundary() -> int:
+    failures = 0
+
+    types_header = "modules/ui_shared/include/ui/map_tiles/map_tile_types.h"
+    source_header = "modules/ui_shared/include/ui/map_tiles/map_tile_source.h"
+    cache_header = "modules/ui_shared/include/ui/map_tiles/map_tile_cache.h"
+    resolver_header = "modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h"
+    resolver_source = "modules/ui_shared/src/ui/map_tiles/map_tile_resolver.cpp"
+    legacy_header = "modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h"
+    legacy_source = "modules/ui_shared/src/ui/map_tiles/legacy_filesystem_map_tile_source.cpp"
+    viewport_source = "modules/ui_shared/src/ui/widgets/map/map_viewport.cpp"
+    snapshot_header = "modules/ui_presentation/include/ui_presentation/map/map_workspace_snapshot.h"
+    esp_tiles = "platform/esp/arduino_common/src/ui/widgets/map/map_tiles.cpp"
+    linux_tiles = "platform/linux/common/src/ui/widgets/map/map_tiles.cpp"
+    runtime_register = "docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md"
+    burndown_register = "docs/audits/LEGACY_BURNDOWN_REGISTER.md"
+
+    if exists(types_header):
+        text = read_text(types_header)
+        for token in [
+            "enum class MapTileLayer",
+            "Osm",
+            "Terrain",
+            "Satellite",
+            "ContourMajor500",
+            "ContourMajor25",
+            "enum class MapTileFormat",
+            "enum class MapTileStatus",
+            "struct MapTileRef",
+            "struct MapTilePayload",
+            "struct MapTileLookupResult",
+            "mapTileLayerFromBaseSource",
+            "mapTileContourLayerForZoom",
+            "mapTileFormatForLayer",
+            "mapTileLayerIsContour",
+        ]:
+            if token not in text:
+                failures += fail(f"Map tile types missing token: {token}")
+        for token in ["lvgl.h", "lv_obj_t", "std::string", "std::vector", "filesystem"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"Map tile types contain forbidden dependency token: {token}")
+
+    if exists(source_header):
+        text = read_text(source_header)
+        for token in [
+            "class IMapTileSource",
+            "lookup",
+            "read",
+            "class IMapTileFileSystem",
+            "exists",
+            "isDirectory",
+            "readFile",
+        ]:
+            if token not in text:
+                failures += fail(f"Map tile source header missing token: {token}")
+        for token in ["lvgl.h", "lv_obj_t", "std::filesystem", "FILE*", "SD.open", "LittleFS", "SPIFFS"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"Map tile source header contains forbidden token: {token}")
+
+    if exists(cache_header):
+        text = read_text(cache_header)
+        for token in ["class IMapTileCache", "clear", "has"]:
+            if token not in text:
+                failures += fail(f"Map tile cache header missing token: {token}")
+        for token in ["lvgl.h", "lv_obj_t", "MapWorkspaceSnapshot", "std::vector", "filesystem"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"Map tile cache header contains forbidden token: {token}")
+
+    if exists(resolver_header):
+        text = read_text(resolver_header)
+        for token in ["class MapTileResolver", "setRootPrefix", "resolvePath", "resolveDirectory"]:
+            if token not in text:
+                failures += fail(f"MapTileResolver header missing token: {token}")
+
+    if exists(resolver_source):
+        text = strip_cpp_comments(read_text(resolver_source))
+        for token in [
+            "maps/base",
+            "maps/contour",
+            "major-500",
+            "major-200",
+            "major-100",
+            "major-50",
+            "major-25",
+            "MapTileResolver::resolvePath",
+            "MapTileResolver::resolveDirectory",
+            "std::snprintf",
+        ]:
+            if token not in text:
+                failures += fail(f"MapTileResolver source missing token: {token}")
+        for token in ["lvgl.h", "lv_obj_t", "std::filesystem", "FILE*", "fopen", "SD.open", "LittleFS", "SPIFFS"]:
+            if token in text:
+                failures += fail(f"MapTileResolver owns forbidden storage/render token: {token}")
+
+    if exists(legacy_header):
+        text = read_text(legacy_header)
+        for token in [
+            "LegacyFilesystemMapTileSource",
+            "IMapTileSource",
+            "MapTileResolver",
+            "lookup",
+            "read",
+            "resolvePath",
+            "resolveDirectory",
+            "layerDirectoryAvailable",
+            "anyContourDirectoryAvailable",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyFilesystemMapTileSource header missing token: {token}")
+
+    if exists(legacy_source):
+        text = strip_cpp_comments(read_text(legacy_source))
+        for token in [
+            "MapTileStatus::Available",
+            "MapTileStatus::Missing",
+            "file_system_.readFile",
+            "file_system_.isDirectory",
+            "MapTileLayer::ContourMajor500",
+            "MapTileLayer::ContourMajor25",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyFilesystemMapTileSource source missing token: {token}")
+        if (
+            "LegacyFilesystemMapTileSource::lookup" not in text
+            and "FilesystemMapTileSource::lookup" not in text
+        ):
+            failures += fail("LegacyFilesystemMapTileSource source missing lookup implementation token")
+        if (
+            "LegacyFilesystemMapTileSource::read" not in text
+            and "FilesystemMapTileSource::read" not in text
+        ):
+            failures += fail("LegacyFilesystemMapTileSource source missing read implementation token")
+        for token in ["lvgl.h", "lv_obj_t", "std::filesystem", "FILE*", "fopen", "SD.open", "LittleFS", "SPIFFS"]:
+            if token in text:
+                failures += fail(f"LegacyFilesystemMapTileSource owns forbidden platform token: {token}")
+
+    if exists(snapshot_header):
+        text = strip_cpp_comments(read_text(snapshot_header))
+        for token in [
+            "MapTilePayload",
+            "IMapTileSource",
+            "IMapTileCache",
+            "lv_image_dsc_t",
+            "bitmap",
+            "uint8_t*",
+            "std::vector<MapTile",
+            "filesystem",
+            "path",
+        ]:
+            if token in text:
+                failures += fail(f"MapWorkspaceSnapshot owns forbidden tile cache/payload token: {token}")
+
+    if exists(viewport_source):
+        text = strip_cpp_comments(read_text(viewport_source))
+        for token in [
+            "/maps/",
+            "maps/base",
+            "maps/contour",
+            "major-500",
+            "major-200",
+            "major-100",
+            "major-50",
+            "major-25",
+            "fopen",
+            "FILE*",
+            "SD.open",
+            "LittleFS",
+            "SPIFFS",
+        ]:
+            if token in text:
+                failures += fail(f"Map viewport owns forbidden tile path/storage token: {token}")
+
+    for path in [esp_tiles, linux_tiles]:
+        if not exists(path):
+            failures += fail(f"missing platform map tile runtime: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "IMapTileFileSystem",
+            "MapTileRef",
+            "tile_source().resolvePath",
+            "tile_source().lookup",
+            "layerDirectoryAvailable",
+            "anyContourDirectoryAvailable",
+        ]:
+            if token not in text:
+                failures += fail(f"{path} missing map tile source ownership token: {token}")
+        if "LegacyFilesystemMapTileSource" not in text and "FilesystemMapTileSource" not in text:
+            failures += fail(f"{path} missing map tile source ownership token: FilesystemMapTileSource")
+        for token in [
+            "base_source_dir",
+            "base_source_ext",
+            "major_contour_profile_for_zoom",
+            "maps/base/",
+            "maps/contour/",
+            "/maps/base",
+            "/maps/contour",
+        ]:
+            if token in text:
+                failures += fail(f"{path} still owns direct tile path policy token: {token}")
+
+    if exists(runtime_register):
+        text = read_text(runtime_register)
+        for token in [
+            "Map tile/cache ownership",
+            "contained",
+            "7.10",
+            "MapTileResolver",
+            "LegacyFilesystemMapTileSource",
+            "decoded image cache remains contained legacy",
+        ]:
+            if token not in text:
+                failures += fail(f"PHASE7_RUNTIME_OWNERSHIP_REGISTER missing map tile token: {token}")
+
+    if exists(burndown_register):
+        text = read_text(burndown_register)
+        for token in [
+            "Map tile path/cache legacy runtime",
+            "MapTileResolver",
+            "LegacyFilesystemMapTileSource",
+            "ESP decoded cache",
+            "Linux downloader cache",
+            "uConsole path fields",
+            "Renderer consumes tile refs/source without direct path/cache ownership",
+        ]:
+            if token not in text:
+                failures += fail(f"LEGACY_BURNDOWN_REGISTER missing map tile token: {token}")
+
+    return failures
+
+
+def check_map_tile_render_queue_cache_boundary() -> int:
+    failures = 0
+
+    queue_header = "modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h"
+    queue_source = "modules/ui_shared/src/ui/map_tiles/map_tile_render_queue.cpp"
+    decoder_header = "modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h"
+    viewport_source = "modules/ui_shared/src/ui/widgets/map/map_viewport.cpp"
+    snapshot_header = "modules/ui_presentation/include/ui_presentation/map/map_workspace_snapshot.h"
+    esp_tiles = "platform/esp/arduino_common/src/ui/widgets/map/map_tiles.cpp"
+    esp_header = "platform/esp/arduino_common/include/ui/widgets/map/map_tiles.h"
+    linux_tiles = "platform/linux/common/src/ui/widgets/map/map_tiles.cpp"
+    linux_header = "platform/linux/common/include/ui/widgets/map/map_tiles.h"
+    runtime_register = "docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md"
+    burndown_register = "docs/audits/LEGACY_BURNDOWN_REGISTER.md"
+
+    if exists(queue_header):
+        text = strip_cpp_comments(read_text(queue_header))
+        for token in [
+            "struct MapTileScreenRect",
+            "enum class MapTileRenderState",
+            "Missing",
+            "Loading",
+            "Ready",
+            "struct MapTileRenderRef",
+            "class MapTileRenderQueue",
+            "kMaxTiles",
+            "void clear()",
+            "bool push",
+            "std::size_t size() const",
+            "const MapTileRenderRef* items() const",
+            "MapTileRenderRef items_[kMaxTiles]",
+        ]:
+            if token not in text:
+                failures += fail(f"MapTileRenderQueue header missing token: {token}")
+        for token in ["std::vector", "std::string", "lvgl.h", "lv_obj_t", "filesystem", "FILE*"]:
+            if token in text:
+                failures += fail(f"MapTileRenderQueue owns forbidden dependency token: {token}")
+
+    if exists(queue_source):
+        text = strip_cpp_comments(read_text(queue_source))
+        for token in [
+            "MapTileRenderQueue::clear",
+            "MapTileRenderQueue::push",
+            "MapTileRenderQueue::size",
+            "MapTileRenderQueue::items",
+        ]:
+            if token not in text:
+                failures += fail(f"MapTileRenderQueue source missing token: {token}")
+        for token in ["std::vector", "std::string", "lvgl.h", "lv_obj_t", "filesystem", "FILE*"]:
+            if token in text:
+                failures += fail(f"MapTileRenderQueue source owns forbidden dependency token: {token}")
+
+    if exists(decoder_header):
+        text = strip_cpp_comments(read_text(decoder_header))
+        for token in ["class IMapTileDecoderCache", "clear", "hasDecoded"]:
+            if token not in text:
+                failures += fail(f"IMapTileDecoderCache missing token: {token}")
+        for token in ["lvgl.h", "lv_obj_t", "lv_image_dsc_t", "filesystem", "FILE*", "MapWorkspaceSnapshot"]:
+            if token in text:
+                failures += fail(f"IMapTileDecoderCache exposes forbidden token: {token}")
+
+    for path in [esp_header, linux_header]:
+        if not exists(path):
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in ["map_tile_render_queue.h", "MapTileRenderQueue* render_queue"]:
+            if token not in text:
+                failures += fail(f"{path} missing render queue context token: {token}")
+
+    for path in [esp_tiles, linux_tiles]:
+        if not exists(path):
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "rebuild_render_queue",
+            "MapTileRenderRef",
+            "MapTileRenderState::Ready",
+            "MapTileRenderState::Missing",
+            "MapTileRenderState::Loading",
+            "ctx.render_queue->clear()",
+            "ctx.render_queue->push(item)",
+        ]:
+            if token not in text:
+                failures += fail(f"{path} missing render queue projection token: {token}")
+
+    if exists(esp_tiles):
+        text = strip_cpp_comments(read_text(esp_tiles))
+        for token in [
+            "class LvglDecodedTileCache",
+            "IMapTileDecoderCache",
+            "hasDecoded",
+            "acquireSlot",
+            "releaseUsage",
+            "decoded_tile_cache()",
+            "decoded_tile_cache().clear()",
+            "decoded_tile_cache().find",
+            "decoded_tile_cache().acquireSlot",
+        ]:
+            if token not in text:
+                failures += fail(f"ESP map tiles missing decoded cache owner token: {token}")
+        for token in ["g_tile_decode_cache", "g_tile_cache_initialized", "TILE_DECODE_CACHE_SIZE"]:
+            if token in text:
+                failures += fail(f"ESP map tiles still owns loose decoded cache global token: {token}")
+
+    if exists(viewport_source):
+        text = strip_cpp_comments(read_text(viewport_source))
+        for token in ["MapTileRenderQueue render_queue", "&impl->render_queue"]:
+            if token not in text:
+                failures += fail(f"Map viewport missing render queue runtime token: {token}")
+        for token in ["lv_image_dsc_t", "DecodedTileCache", "IMapTileDecoderCache", "LvglDecodedTileCache"]:
+            if token in text:
+                failures += fail(f"Map viewport owns decoded cache token: {token}")
+
+    if exists(snapshot_header):
+        text = strip_cpp_comments(read_text(snapshot_header))
+        for token in [
+            "MapTileRenderQueue",
+            "MapTileRenderRef",
+            "IMapTileDecoderCache",
+            "LvglDecodedTileCache",
+            "DecodedTileCache",
+            "lv_image_dsc_t",
+        ]:
+            if token in text:
+                failures += fail(f"MapWorkspaceSnapshot owns render queue/cache token: {token}")
+
+    if exists(runtime_register):
+        text = read_text(runtime_register)
+        for token in [
+            "Map tile render queue / decoded cache ownership",
+            "7.11",
+            "MapTileRenderQueue",
+            "LvglDecodedTileCache",
+            "LVGL widget records remain contained legacy",
+        ]:
+            if token not in text:
+                failures += fail(f"PHASE7_RUNTIME_OWNERSHIP_REGISTER missing 7.11 map token: {token}")
+
+    if exists(burndown_register):
+        text = read_text(burndown_register)
+        for token in [
+            "Map tile visible plan in platform renderer",
+            "ESP decoded LVGL tile cache",
+            "MapTileRenderQueue",
+            "LvglDecodedTileCache",
+            "IMapTileDecoderCache",
+            "Runtime-owned decoder cache is injected",
+        ]:
+            if token not in text:
+                failures += fail(f"LEGACY_BURNDOWN_REGISTER missing 7.11 map token: {token}")
+
+    return failures
+
+
+def check_map_overlay_route_tracker_boundary() -> int:
+    failures = 0
+
+    snapshot_header = "modules/ui_presentation/include/ui_presentation/map/map_overlay_snapshot.h"
+    source_header = "modules/ui_presentation/include/ui_presentation/map/map_overlay_source.h"
+    projector_header = "modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h"
+    projector_source = "modules/ui_shared/src/ui/map_overlay/map_overlay_projector.cpp"
+    legacy_header = "modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h"
+    legacy_source = "modules/ui_shared/src/ui/presentation_sources/legacy_map_overlay_source.cpp"
+    projector_test = "modules/ui_shared/tests/test_map_overlay_projector.cpp"
+    legacy_test = "modules/ui_shared/tests/test_legacy_map_overlay_source.cpp"
+    viewport_source = "modules/ui_shared/src/ui/widgets/map/map_viewport.cpp"
+    runtime_source = "modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp"
+    runtime_register = "docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md"
+    burndown_register = "docs/audits/LEGACY_BURNDOWN_REGISTER.md"
+
+    if exists(snapshot_header):
+        text = strip_cpp_comments(read_text(snapshot_header))
+        for token in [
+            "enum class MapOverlayKind",
+            "CurrentPosition",
+            "TeamMember",
+            "RoutePoint",
+            "TrackPoint",
+            "MeasurementPoint",
+            "SelectedTarget",
+            "Warning",
+            "enum class MapOverlayStyle",
+            "struct MapGeoPoint",
+            "struct MapOverlayItem",
+            "FixedText<32> label",
+            "FixedText<64> detail",
+            "uint32_t stable_id",
+            "struct MapOverlaySnapshot",
+            "kMaxItems",
+            "MapOverlayItem items[kMaxItems]",
+            "bool truncated",
+        ]:
+            if token not in text:
+                failures += fail(f"MapOverlaySnapshot missing token: {token}")
+        for token in [
+            "lvgl.h",
+            "lv_obj_t",
+            "MapTilePayload",
+            "IMapTileSource",
+            "IMapTileCache",
+            "bitmap",
+            "filesystem",
+            "path",
+            "GpsStatusSource",
+            "ITeamUiStore",
+            "TeamUiStore",
+            "route store",
+        ]:
+            if token in text:
+                failures += fail(f"MapOverlaySnapshot owns forbidden runtime/render token: {token}")
+
+    if exists(source_header):
+        text = strip_cpp_comments(read_text(source_header))
+        for token in ["IMapOverlayPresentationSource", "buildMapOverlaySnapshot"]:
+            if token not in text:
+                failures += fail(f"Map overlay source header missing token: {token}")
+        for token in ["lvgl.h", "platform::ui::gps", "team_ui_chatlog_load_recent", "ITeamUiStore", "filesystem"]:
+            if token in text:
+                failures += fail(f"Map overlay source port exposes forbidden token: {token}")
+
+    for path in [projector_header, projector_source]:
+        if exists(path):
+            text = strip_cpp_comments(read_text(path))
+            for token in [
+                "platform::ui::gps::get_data",
+                "team_ui_chatlog_load_recent",
+                "team_ui_posring_load_latest",
+                "decodeTeamChatLocation",
+                "lvgl.h",
+                "lv_obj_t",
+                "IMapTileSource",
+                "filesystem",
+                "fopen",
+            ]:
+                if token in text:
+                    failures += fail(f"{path} contains forbidden overlay projector token: {token}")
+
+    if exists(projector_header):
+        text = read_text(projector_header)
+        for token in ["MapOverlayProjector", "projectCurrentPosition", "projectTeamMember"]:
+            if token not in text:
+                failures += fail(f"MapOverlayProjector header missing token: {token}")
+
+    if exists(projector_source):
+        text = read_text(projector_source)
+        for token in [
+            "MapOverlayProjector::projectCurrentPosition",
+            "MapOverlayKind::CurrentPosition",
+            "MapOverlayStyle::OwnPosition",
+            "MapOverlayProjector::projectTeamMember",
+            "MapOverlayKind::TeamMember",
+            "MapOverlayStyle::Team",
+        ]:
+            if token not in text:
+                failures += fail(f"MapOverlayProjector source missing token: {token}")
+
+    if exists(legacy_header):
+        text = strip_cpp_comments(read_text(legacy_header))
+        for token in [
+            "IMapOverlayGpsSource",
+            "IMapOverlayTeamSource",
+            "LegacyMapOverlaySource",
+            "MapOverlaySnapshotSource",
+            "[[deprecated",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyMapOverlaySource header missing token: {token}")
+        for token in ["lvgl.h", "lv_obj_t", "platform::ui::gps::get_data", "team_ui_chatlog_load_recent", "decodeTeamChatLocation"]:
+            if token in text:
+                failures += fail(f"LegacyMapOverlaySource header exposes forbidden token: {token}")
+
+    if exists(legacy_source):
+        text = strip_cpp_comments(read_text(legacy_source))
+        for token in [
+            "MapOverlaySnapshotSource::buildMapOverlaySnapshot",
+            "adapter_.project",
+        ]:
+            if token not in text:
+                failures += fail(f"MapOverlaySnapshotSource source missing token: {token}")
+        for token in ["lvgl.h", "lv_obj_t", "platform::ui::gps::get_data", "team_ui_chatlog_load_recent", "decodeTeamChatLocation", "IMapTileSource"]:
+            if token in text:
+                failures += fail(f"MapOverlaySnapshotSource source owns forbidden render/source token: {token}")
+
+    for path in [projector_test, legacy_test]:
+        if exists(path):
+            text = read_text(path)
+            if "MapOverlay" not in text:
+                failures += fail(f"{path} does not exercise map overlay boundary")
+
+    if exists(viewport_source):
+        text = strip_cpp_comments(read_text(viewport_source))
+        for token in [
+            "platform::ui::gps::get_data",
+            "team_ui_chatlog_load_recent",
+            "team_ui_posring_load_latest",
+            "decodeTeamChatLocation",
+            "ITeamUiStore",
+            "TeamUiStore",
+        ]:
+            if token in text:
+                failures += fail(f"Map viewport owns forbidden overlay source token: {token}")
+
+    if exists(runtime_source):
+        text = read_text(runtime_source)
+        for token in [
+            "MapOverlaySnapshotSource",
+            "IMapOverlayGpsSource",
+            "IMapOverlayTeamSource",
+            "buildMapOverlaySnapshot",
+        ]:
+            if token not in text:
+                failures += fail(f"gps_page_runtime.cpp missing overlay runtime wiring token: {token}")
+
+    if exists(runtime_register):
+        text = read_text(runtime_register)
+        for token in [
+            "Map overlay/route/tracker ownership",
+            "7.12",
+            "MapOverlaySnapshot",
+            "LegacyMapOverlaySource",
+            "route/tracker overlay sources have exit conditions",
+        ]:
+            if token not in text:
+                failures += fail(f"PHASE7_RUNTIME_OWNERSHIP_REGISTER missing map overlay token: {token}")
+
+    if exists(burndown_register):
+        text = read_text(burndown_register)
+        for token in [
+            "Map overlay current/team marker projection",
+            "Map route/tracker overlay projection",
+            "MapOverlayProjector",
+            "map renderers consume `MapOverlaySnapshotSource` only",
+        ]:
+            if token not in text:
+                failures += fail(f"LEGACY_BURNDOWN_REGISTER missing map overlay token: {token}")
+
+    return failures
+
+
+def check_gps_runtime_scheduling_boundary() -> int:
+    failures = 0
+
+    sink_header = "modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h"
+    pump_header = "modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h"
+    pump_source = "modules/ui_shared/src/ui/screens/gps/gps_page_runtime_pump.cpp"
+    pump_test = "modules/ui_shared/tests/test_gps_page_runtime_pump.cpp"
+    runtime_source = "modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp"
+    runtime_register = "docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md"
+    burndown_register = "docs/audits/LEGACY_BURNDOWN_REGISTER.md"
+
+    if exists(sink_header):
+        text = strip_cpp_comments(read_text(sink_header))
+        for token in ["class IGpsUiRefreshSink", "onGpsRuntimeUpdated"]:
+            if token not in text:
+                failures += fail(f"IGpsUiRefreshSink missing token: {token}")
+        for token in ["platform::ui::gps", "GpsState", "GpsStatusSnapshot", "lvgl.h", "lv_obj_t"]:
+            if token in text:
+                failures += fail(f"IGpsUiRefreshSink exposes forbidden runtime/render token: {token}")
+
+    if exists(pump_header):
+        text = strip_cpp_comments(read_text(pump_header))
+        for token in [
+            "class IGpsStatusRefreshModel",
+            "virtual void refresh()",
+            "class GpsPageRuntimePump",
+            "setActive",
+            "active() const",
+            "update(uint32_t now_ms)",
+            "interval_ms_",
+            "last_update_ms_",
+            "has_last_update_",
+        ]:
+            if token not in text:
+                failures += fail(f"GpsPageRuntimePump header missing token: {token}")
+        for token in ["platform::ui::gps", "lvgl.h", "lv_obj_t", "GpsStatusSnapshot", "MapWorkspaceModel"]:
+            if token in text:
+                failures += fail(f"GpsPageRuntimePump header owns forbidden token: {token}")
+
+    if exists(pump_source):
+        text = strip_cpp_comments(read_text(pump_source))
+        for token in [
+            "GpsPageRuntimePump::setActive",
+            "GpsPageRuntimePump::active",
+            "GpsPageRuntimePump::update",
+            "model_.refresh()",
+            "ui_->onGpsRuntimeUpdated()",
+            "has_last_update_",
+        ]:
+            if token not in text:
+                failures += fail(f"GpsPageRuntimePump source missing token: {token}")
+        for token in ["platform::ui::gps", "lvgl.h", "lv_obj_t", "millis()", "MapWorkspaceModel"]:
+            if token in text:
+                failures += fail(f"GpsPageRuntimePump source owns forbidden token: {token}")
+
+    if exists(pump_test):
+        text = read_text(pump_test)
+        for token in ["GpsPageRuntimePump", "setActive(true)", "setActive(false)", "update"]:
+            if token not in text:
+                failures += fail(f"GPS pump test missing token: {token}")
+
+    if exists(runtime_source):
+        text = read_text(runtime_source)
+        for token in [
+            "GpsPageRuntimePump",
+            "IGpsStatusRefreshModel",
+            "IGpsUiRefreshSink",
+            "gps_runtime_pump().update(sys::millis_now())",
+            "gps_runtime_pump().setActive(true)",
+            "gps_runtime_pump().setActive(false)",
+        ]:
+            if token not in text:
+                failures += fail(f"gps_page_runtime.cpp missing GPS pump wiring token: {token}")
+
+    if exists(runtime_register):
+        text = read_text(runtime_register)
+        for token in [
+            "GPS page timers/tasks",
+            "contained",
+            "7.13",
+            "GpsPageRuntimePump",
+            "LVGL timers are tick hooks only",
+        ]:
+            if token not in text:
+                failures += fail(f"PHASE7_RUNTIME_OWNERSHIP_REGISTER missing GPS scheduling token: {token}")
+
+    if exists(burndown_register):
+        text = read_text(burndown_register)
+        for token in [
+            "GPS page refresh cadence",
+            "GpsPageRuntimePump",
+            "Page-local adapters are replaced by GPS presentation refresh models",
+        ]:
+            if token not in text:
+                failures += fail(f"LEGACY_BURNDOWN_REGISTER missing GPS scheduling token: {token}")
+
+    return failures
+
+
+def check_phase7_final_readiness() -> int:
+    failures = 0
+
+    runtime_register = "docs/audits/PHASE7_RUNTIME_OWNERSHIP_REGISTER.md"
+    burndown_register = "docs/audits/LEGACY_BURNDOWN_REGISTER.md"
+    final_report = "docs/audits/PHASE7_FINAL_RUNTIME_OWNERSHIP_READINESS_REPORT.md"
+    final_matrix = "docs/audits/PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md"
+    map_snapshot = "modules/ui_presentation/include/ui_presentation/map/map_workspace_snapshot.h"
+    chat_model_header = "modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h"
+    chat_model_source = "modules/ui_presentation/src/chat/chat_workspace_model.cpp"
+
+    if exists(runtime_register):
+        text = read_text(runtime_register)
+        for token in ["future", "later", "TBD"]:
+            if re.search(rf"\b{re.escape(token)}\b", text, flags=re.IGNORECASE):
+                failures += fail(f"PHASE7_RUNTIME_OWNERSHIP_REGISTER contains naked deferred token: {token}")
+        in_runtime_items = False
+        for line in text.splitlines():
+            if line.strip() == "## Runtime Ownership Items":
+                in_runtime_items = True
+                continue
+            if in_runtime_items and line.startswith("## "):
+                break
+            if not in_runtime_items or not line.startswith("| ") or line.startswith("| ---") or line.startswith("| Runtime item"):
+                continue
+            cells = [cell.strip() for cell in line.strip().strip("|").split("|")]
+            if len(cells) < 4:
+                failures += fail(f"runtime ownership row has too few cells: {line}")
+                continue
+            status = cells[1].lower()
+            for token in ["in progress", "future", "later", "tbd"]:
+                if token in status:
+                    failures += fail(
+                        f"Runtime Ownership Items row has non-final status '{cells[1]}': {cells[0]}"
+                    )
+
+    if exists(burndown_register):
+        text = read_text(burndown_register)
+        for token in ["future", "later", "TBD"]:
+            if re.search(rf"\b{re.escape(token)}\b", text, flags=re.IGNORECASE):
+                failures += fail(f"LEGACY_BURNDOWN_REGISTER contains naked deferred token: {token}")
+
+    if exists(final_report):
+        text = read_text(final_report)
+        for token in [
+            "Chat delivery",
+            "Chat event pump",
+            "Team action sends",
+            "Team rich payload display",
+            "Team position picker",
+            "Key verification",
+            "Map tile source/cache",
+            "Map render queue/cache",
+            "Map overlay/route/tracker",
+            "GPS runtime scheduling",
+            "PHASE7_FINAL_LEGACY_SURFACE_MATRIX.md",
+        ]:
+            if token not in text:
+                failures += fail(f"final readiness report missing token: {token}")
+
+    if exists(final_matrix):
+        text = read_text(final_matrix)
+        header = "| Surface | Current owner | New owner | Status | Removal condition | Blocking reason | Future phase |"
+        if header not in text:
+            failures += fail("final legacy surface matrix missing required header")
+        for token in [
+            "Chat delivery send-result bridge",
+            "Map overlay current position",
+            "Map route/tracker overlay",
+            "GPS page refresh cadence",
+            "ACK timeout projection",
+        ]:
+            if token not in text:
+                failures += fail(f"final legacy surface matrix missing token: {token}")
+        for line in text.splitlines():
+            if not line.startswith("| ") or line.startswith("| ---") or line.startswith("| Surface"):
+                continue
+            cells = [cell.strip() for cell in line.strip().strip("|").split("|")]
+            if len(cells) < 7:
+                failures += fail(f"final legacy matrix row has too few cells: {line}")
+                continue
+            if not cells[4]:
+                failures += fail(f"final legacy matrix row missing removal condition: {line}")
+            if not cells[5]:
+                failures += fail(f"final legacy matrix row missing blocking reason: {line}")
+
+    if exists(map_snapshot):
+        text = strip_cpp_comments(read_text(map_snapshot))
+        for token in [
+            "MapTilePayload",
+            "IMapTileSource",
+            "IMapTileCache",
+            "IMapTileDecoderCache",
+            "lv_image_dsc_t",
+            "bitmap",
+            "cache object",
+            "filesystem path",
+        ]:
+            if token in text:
+                failures += fail(f"MapWorkspaceSnapshot owns forbidden final map token: {token}")
+
+    for path in [chat_model_header, chat_model_source]:
+        if exists(path):
+            text = strip_cpp_comments(read_text(path))
+            for token in [
+                "ChatDeliveryReadModel",
+                "KeyVerificationModel",
+                "ChatDeliveryActionService",
+            ]:
+                if token in text:
+                    failures += fail(f"{path} owns forbidden final chat runtime token: {token}")
+
+    return failures
+
+
+def check_chat_runtime_event_pump_boundary() -> int:
+    failures = 0
+    header = "modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h"
+    source = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+    runtime = "modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp"
+    pump_header = "modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h"
+    pump_source = "modules/ui_shared/src/ui/screens/chat/chat_page_runtime_event_pump.cpp"
+    refresh_sink = "modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h"
+
+    for path in [header, source]:
+        if not exists(path):
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "public IChatUiRuntime",
+            "onChatEvent",
+            "processIncoming(",
+            "flushStore(",
+            "delivery_event_bridge_",
+            "LegacyChatDeliveryEventBridge",
+            "key_verification_source_",
+            "LegacyKeyVerificationSource",
+            "onNumberRequest",
+            "onNumberInform",
+            "onFinal",
+            "KeyVerificationNumberRequestEvent",
+            "KeyVerificationNumberInformEvent",
+            "KeyVerificationFinalEvent",
+        ]:
+            if token in text:
+                failures += fail(
+                    f"{path} still owns runtime event pump token: {token}"
+                )
+
+    if exists(header):
+        text = read_text(header)
+        for token in [
+            "public IChatUiRefreshSink",
+            "onRuntimeMessageArrived",
+            "onRuntimeSendResult",
+            "onRuntimeUnreadChanged",
+            "showKeyVerification",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatUiController header missing refresh sink token: {token}")
+
+    if exists(refresh_sink):
+        text = strip_cpp_comments(read_text(refresh_sink))
+        for token in [
+            "IChatUiRefreshSink",
+            "onRuntimeMessageArrived",
+            "onRuntimeSendResult",
+            "onRuntimeUnreadChanged",
+            "showKeyVerification",
+        ]:
+            if token not in text:
+                failures += fail(f"IChatUiRefreshSink missing token: {token}")
+        for token in [
+            "ChatService",
+            "ChatDeliveryReadModel",
+            "ChatDeliveryEventProjector",
+            "LegacyKeyVerificationSource",
+            "sys::Event",
+        ]:
+            if token in text:
+                failures += fail(f"IChatUiRefreshSink exposes runtime token: {token}")
+
+    for path in [pump_header, pump_source]:
+        if not exists(path):
+            failures += fail(f"missing ChatPageRuntimeEventPump file: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in ["lvgl.h", "lv_obj_t", "ChatWorkspaceModel", "MessageRow", "encodeTeamChat"]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden event pump UI token: {token}")
+
+    if exists(pump_source):
+        text = read_text(pump_source)
+        for token in [
+            "service_.processIncoming()",
+            "service_.flushStore()",
+            "delivery_adapter_->onChatSendResult",
+            "key_verification_source_->onNumberRequest",
+            "key_verification_source_->onNumberInform",
+            "key_verification_source_->onFinal",
+            "ui_->onRuntimeMessageArrived",
+            "ui_->onRuntimeSendResult",
+            "ui_->onRuntimeUnreadChanged",
+            "ui_->showKeyVerification",
+            "delete event",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatPageRuntimeEventPump source missing token: {token}")
+
+    if exists(runtime):
+        text = read_text(runtime)
+        for token in [
+            "ChatPageRuntimeFacade",
+            "s_event_pump",
+            "s_runtime_facade",
+            "ChatPageRuntimeEventPump",
+            "event_pump_.update();",
+            "controller_.update();",
+            "event_pump_.handleEvent(event);",
+            "setChatUiRuntime(s_runtime_facade.get())",
+        ]:
+            if token not in text:
+                failures += fail(f"chat_page_runtime.cpp missing event pump wiring token: {token}")
+        if "setChatUiRuntime(s_ui_controller.get())" in text:
+            failures += fail("chat_page_runtime.cpp still registers controller directly")
+
+    return failures
+
+
+def check_chat_runtime_wires_team_action_sink() -> int:
+    failures = 0
+    path = "modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp"
+    if not exists(path):
+        failures += fail("chat_page_runtime.cpp is missing")
+        return failures
+
+    text = read_text(path)
+    for token in [
+        "LegacyTeamActionBridge",
+        "GpsTeamLocationSource",
+        "s_team_action_sink",
+        "s_team_location_source",
+        "s_team_action_sink.get()",
+        "platform/ui/gps_runtime.h",
+    ]:
+        if token not in text:
+            failures += fail(f"chat_page_runtime.cpp missing Team action wiring token: {token}")
+    return failures
+
+
+def check_ui_presentation_does_not_own_team_actions() -> int:
+    failures = 0
+    for path in iter_code_files(
+        ROOT / "modules/ui_presentation/include",
+        ROOT / "modules/ui_presentation/src",
+    ):
+        text = strip_cpp_comments(path.read_text(encoding="utf-8", errors="ignore"))
+        if "team_actions" in text or "TeamActionRequest" in text:
+            failures += fail(
+                f"{path.relative_to(ROOT)} imports Team action runtime"
+            )
+    return failures
+
+
+def check_key_verification_type_shape() -> int:
+    failures = 0
+
+    snapshot = "modules/ui_presentation/include/ui_presentation/key_verification/key_verification_snapshot.h"
+    if exists(snapshot):
+        text = read_text(snapshot)
+        for token in [
+            "enum class VerificationProtocol",
+            "Meshtastic",
+            "MeshCore",
+            "enum class VerificationState",
+            "Pending",
+            "Verified",
+            "enum class VerificationFailureKind",
+            "MissingPeerKey",
+            "MissingLocalIdentity",
+            "enum class VerificationPromptKind",
+            "EnterNumber",
+            "ShowNumber",
+            "CompareCode",
+            "KeyVerificationSnapshot",
+            "can_accept",
+            "can_reject",
+            "can_refresh",
+            "can_copy_code",
+            "requires_number",
+        ]:
+            if token not in text:
+                failures += fail(f"KeyVerificationSnapshot missing token: {token}")
+        for token in ["private", "public_key", "PSK", "packet", "ChatWorkspaceModel", "MessageRow"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"KeyVerificationSnapshot owns forbidden token: {token}")
+
+    model_header = "modules/ui_presentation/include/ui_presentation/key_verification/key_verification_model.h"
+    model_source = "modules/ui_presentation/src/key_verification/key_verification_model.cpp"
+    for path in [model_header, model_source]:
+        if exists(path):
+            text = strip_cpp_comments(read_text(path))
+            for token in [
+                "ChatService",
+                "IMeshAdapter",
+                "ContactService",
+                "lvgl.h",
+                "gtk",
+                "sys/event_bus",
+                "ChatWorkspaceModel",
+                "MessageRow",
+                "platform/",
+                "setNodeKeyManuallyVerified",
+                "submitKeyVerificationNumber",
+            ]:
+                if token in text:
+                    failures += fail(f"{path} contains forbidden key verification model token: {token}")
+
+    if exists(model_header):
+        text = read_text(model_header)
+        for token in [
+            "KeyVerificationModel",
+            "selectPeer",
+            "clearSelection",
+            "snapshot",
+            "accept",
+            "reject",
+            "refresh",
+            "copyCode",
+            "submitNumber",
+            "IKeyVerificationPresentationSource& source_",
+            "IKeyVerificationActionSink& sink_",
+        ]:
+            if token not in text:
+                failures += fail(f"KeyVerificationModel missing token: {token}")
+
+    source = "modules/ui_presentation/include/ui_presentation/key_verification/key_verification_source.h"
+    if exists(source):
+        text = read_text(source)
+        for token in ["KeyVerificationRequest", "IKeyVerificationPresentationSource", "buildKeyVerificationSnapshot"]:
+            if token not in text:
+                failures += fail(f"KeyVerificationSource missing token: {token}")
+
+    sink = "modules/ui_presentation/include/ui_presentation/key_verification/key_verification_action_sink.h"
+    if exists(sink):
+        text = read_text(sink)
+        for token in ["IKeyVerificationActionSink", "accept", "reject", "refresh", "copyCode", "submitNumber"]:
+            if token not in text:
+                failures += fail(f"KeyVerificationActionSink missing token: {token}")
+
+    return failures
+
+
+def check_key_verification_bridge_boundary() -> int:
+    failures = 0
+    bridge_files = [
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_source.cpp",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_action_sink.cpp",
+    ]
+    for path in bridge_files:
+        if not exists(path):
+            failures += fail(f"missing key verification bridge file: {path}")
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "lvgl.h",
+            "gtk",
+            "ChatWorkspaceModel",
+            "MessageRow",
+            "ChatDeliveryReadModel",
+            "LegacyChatActionSink",
+            "sendMessage(",
+            "sendText(",
+            "Renderer",
+        ]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden key verification bridge token {token}")
+
+    source_header = "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h"
+    source_impl = "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_source.cpp"
+    if exists(source_header):
+        text = read_text(source_header)
+        for token in [
+            "LegacyKeyVerificationSource",
+            "KeyVerificationPresentationSource",
+            "[[deprecated",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyKeyVerificationSource header missing token: {token}")
+    if exists(source_impl):
+        text = read_text(source_impl)
+        for token in [
+            "buildKeyVerificationSnapshot",
+            "VerificationPromptKind::EnterNumber",
+            "VerificationPromptKind::ShowNumber",
+            "VerificationPromptKind::CompareCode",
+            "getContactName",
+            "backendProtocol",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyKeyVerificationSource source missing token: {token}")
+        for token in ["submitKeyVerificationNumber", "setNodeKeyManuallyVerified"]:
+            if token in strip_cpp_comments(text):
+                failures += fail(f"LegacyKeyVerificationSource mutates key verification runtime: {token}")
+
+    sink_header = "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h"
+    sink_impl = "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_action_sink.cpp"
+    if exists(sink_header):
+        text = read_text(sink_header)
+        for token in [
+            "LegacyKeyVerificationActionSink",
+            "KeyVerificationActionSink",
+            "[[deprecated",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyKeyVerificationActionSink header missing token: {token}")
+    if exists(sink_impl):
+        text = read_text(sink_impl)
+        for token in [
+            "startKeyVerification",
+            "submitKeyVerificationNumber",
+            "setNodeKeyManuallyVerified",
+            "VerificationState::Verified",
+            "VerificationState::Rejected",
+        ]:
+            if token not in text:
+                failures += fail(f"LegacyKeyVerificationActionSink source missing token: {token}")
+
+    return failures
+
+
+def check_chat_ui_key_verification_migration() -> int:
+    failures = 0
+
+    header = "modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h"
+    source = "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp"
+
+    if exists(header):
+        text = strip_cpp_comments(read_text(header))
+        for token in ["KeyVerificationModel", "key_verification_model_"]:
+            if token not in text:
+                failures += fail(f"ChatUiController header missing key verification token: {token}")
+        for token in ["LegacyKeyVerificationSource", "key_verification_source_"]:
+            if token in text:
+                failures += fail(f"ChatUiController header still owns key verification source token: {token}")
+        for token in [
+            "key_verify_node_id_",
+            "key_verify_nonce_",
+            "key_verify_expects_number_",
+            "key_verify_can_trust_",
+            "openKeyVerificationNumberModal",
+            "openKeyVerificationInfoModal",
+            "openKeyVerificationFinalModal",
+        ]:
+            if token in text:
+                failures += fail(f"ChatUiController header still owns key verification token: {token}")
+    else:
+        failures += fail("ChatUiController header is missing")
+
+    if exists(source):
+        text = strip_cpp_comments(read_text(source))
+        for token in [
+            "renderKeyVerificationModal",
+            "KeyVerificationModalCallbacks",
+            "key_verification_model_->submitNumber",
+            "key_verification_model_->accept",
+            "submitKeyVerificationInput",
+            "showKeyVerification",
+        ]:
+            if token not in text:
+                failures += fail(f"ChatUiController source missing key verification token: {token}")
+        for token in [
+            "key_verify_node_id_",
+            "key_verify_nonce_",
+            "key_verify_expects_number_",
+            "key_verify_can_trust_",
+            "submitKeyVerificationNumber",
+            "setNodeKeyManuallyVerified",
+            "KeyVerificationNumberRequestEvent",
+            "KeyVerificationNumberInformEvent",
+            "KeyVerificationFinalEvent",
+            "key_verification_source_->onNumberRequest",
+            "key_verification_source_->onNumberInform",
+            "key_verification_source_->onFinal",
+            "key_verification_model_->selectPeer",
+        ]:
+            if token in text:
+                failures += fail(f"ChatUiController source still owns key verification token: {token}")
+        if "getMeshAdapter()" in text:
+            failures += fail("ChatUiController key verification path still reads mesh adapter directly")
+    else:
+        failures += fail("ChatUiController source is missing")
+
+    runtime = "modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp"
+    if exists(runtime):
+        text = read_text(runtime)
+        for token in [
+            "KeyVerificationSessionAdapter",
+            "KeyVerificationPresentationSource",
+            "KeyVerificationActionSink",
+            "KeyVerificationModel",
+            "s_key_verification_session",
+            "s_key_verification_source",
+            "s_key_verification_sink",
+            "s_key_verification_model",
+        ]:
+            if token not in text:
+                failures += fail(f"chat_page_runtime.cpp missing key verification wiring token: {token}")
+    else:
+        failures += fail("chat_page_runtime.cpp is missing")
+
+    for path in [
+        "modules/ui_presentation/include/ui_presentation/chat/chat_workspace_model.h",
+        "modules/ui_presentation/src/chat/chat_workspace_model.cpp",
+        "modules/ui_presentation/include/ui_presentation/chat/chat_workspace_snapshot.h",
+    ]:
+        if not exists(path):
+            continue
+        text = strip_cpp_comments(read_text(path))
+        for token in [
+            "KeyVerification",
+            "VerificationPrompt",
+            "verification_code",
+            "can_accept_key",
+            "MessageKeyVerification",
+        ]:
+            if token in text:
+                failures += fail(f"{path} owns key verification token: {token}")
+
+    return failures
+
+
+def main() -> int:
+    failures = 0
+    failures += check_required_files()
+    failures += check_removed_chat_read_projection_not_reintroduced()
+    failures += check_docs()
+    failures += check_legacy_burndown_register()
+    failures += check_core_delivery_is_runtime_only()
+    failures += check_delivery_type_shape()
+    failures += check_presentation_source_enrichment()
+    failures += check_composition_roots_own_delivery()
+    failures += check_ui_presentation_and_renderers_do_not_own_delivery()
+    failures += check_delivery_event_bridge_boundary()
+    failures += check_delivery_action_bridge_boundary()
+    failures += check_team_action_type_shape()
+    failures += check_team_action_bridge_boundary()
+    failures += check_chat_ui_team_action_migration()
+    failures += check_chat_ui_legacy_burndown()
+    failures += check_team_rich_payload_presentation_boundary()
+    failures += check_team_position_picker_renderer_boundary()
+    failures += check_map_tile_source_cache_boundary()
+    failures += check_map_tile_render_queue_cache_boundary()
+    failures += check_map_overlay_route_tracker_boundary()
+    failures += check_gps_runtime_scheduling_boundary()
+    failures += check_phase7_final_readiness()
+    failures += check_chat_runtime_event_pump_boundary()
+    failures += check_chat_runtime_wires_team_action_sink()
+    failures += check_ui_presentation_does_not_own_team_actions()
+    failures += check_key_verification_type_shape()
+    failures += check_key_verification_bridge_boundary()
+    failures += check_chat_ui_key_verification_migration()
+
+    if failures == 0:
+        print("[phase7-runtime-ready] OK")
+        return 0
+
+    print(f"[phase7-runtime-ready] {failures} failure(s)")
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/architecture/check_phase8_layout_ready.py b/tools/architecture/check_phase8_layout_ready.py
new file mode 100644
index 00000000..c6c605f1
--- /dev/null
+++ b/tools/architecture/check_phase8_layout_ready.py
@@ -0,0 +1,2549 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import subprocess
+import sys
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def exists(path: str) -> bool:
+    return (ROOT / path).exists()
+
+
+def read_text(path: str) -> str:
+    return (ROOT / path).read_text(encoding="utf-8", errors="ignore")
+
+
+def fail(message: str) -> int:
+    print(f"[phase8-layout-ready] FAIL: {message}")
+    return 1
+
+
+def check_post_root_legacy_removed() -> int:
+    result = subprocess.run(
+        [sys.executable, str(ROOT / "tools/architecture/check_no_root_legacy_ready.py")],
+        cwd=ROOT,
+        text=True,
+        capture_output=True,
+    )
+    if result.returncode != 0:
+        output = (result.stdout + result.stderr).strip()
+        return fail(f"post-root legacy removal check failed:\n{output}")
+    print("[phase8-layout-ready] OK (root legacy removed)")
+    return 0
+
+
+def iter_code_files(root: Path):
+    if not root.exists():
+        return
+    for path in root.rglob("*"):
+        if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+            yield path
+
+
+def check_required_files() -> int:
+    required = [
+        "docs/specification/REPOSITORY_LAYOUT_ARCHITECTURE_SPEC.md",
+        "docs/specification/DEVICE_UX_PACK_ARCHITECTURE_SPEC.md",
+        "docs/audits/REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md",
+        "docs/audits/UI_SHARED_SPLIT_AUDIT.md",
+        "docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md",
+        "docs/decisions/ADR_BUILD_ENTRYPOINTS.md",
+        "docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md",
+        "docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md",
+        "docs/audits/PHASE8_RUNTIME_UI_ADOPTION_REPORT.md",
+        "docs/specification/APP_SHELL_ARCHITECTURE_SPEC.md",
+        "docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md",
+        "legacy/LEGACY_GOVERNANCE.md",
+        "legacy/app_implementations/LEGACY_IMPLEMENTATION_INDEX.md",
+        "cmake/TrailMateUxPacks.cmake",
+        "builds/README.md",
+        "builds/esp_idf/README.md",
+        "builds/esp_idf/CMakeLists.txt",
+        "builds/pio_nrf52/README.md",
+        "builds/pio_nrf52/platformio.ini",
+        "builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp",
+        "builds/linux_cmake/README.md",
+        "builds/linux_cmake/CMakeLists.txt",
+        "apps/esp32_lvgl/README.md",
+        "apps/esp32_lvgl/APP_SHELL_MANIFEST.md",
+        "apps/esp32_lvgl/CMakeLists.txt",
+        "apps/esp32_lvgl/src/esp32_lvgl_app_shell.h",
+        "apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp",
+        "apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp",
+        "apps/nrf52_node/README.md",
+        "apps/nrf52_node/APP_SHELL_MANIFEST.md",
+        "apps/nrf52_node/library.json",
+        "apps/nrf52_node/src/nrf52_node_app_shell.h",
+        "apps/nrf52_node/src/nrf52_node_app_shell.cpp",
+        "apps/nrf52_node/tests/nrf52_node_app_shell_smoke.cpp",
+        "apps/linux_uconsole_gtk/README.md",
+        "apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md",
+        "apps/linux_uconsole_gtk/CMakeLists.txt",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.cpp",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_app_shell_smoke.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_historical_source_descriptor_smoke.cpp",
+        "apps/linux_sim_shell/README.md",
+        "apps/linux_sim_shell/APP_SHELL_MANIFEST.md",
+        "apps/linux_sim_shell/CMakeLists.txt",
+        "apps/linux_sim_shell/src/linux_sim_app_shell.h",
+        "apps/linux_sim_shell/src/linux_sim_app_shell.cpp",
+        "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h",
+        "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_app_shell_smoke.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_historical_source_descriptor_smoke.cpp",
+        "legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.h",
+        "legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.cpp",
+        "legacy/app_implementations/linux_uconsole/TRANSITIONAL_IMPLEMENTATION_ROOT.md",
+        "legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.h",
+        "legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.cpp",
+        "legacy/app_implementations/linux_sim/TRANSITIONAL_IMPLEMENTATION_ROOT.md",
+        "legacy/app_implementations/esp_idf/src/esp_idf_legacy_implementation_adapter.h",
+        "legacy/app_implementations/esp_idf/src/esp_idf_legacy_implementation_adapter.cpp",
+        "legacy/app_implementations/esp_idf/TRANSITIONAL_IMPLEMENTATION_ROOT.md",
+        "legacy/app_implementations/esp_pio/src/nrf52_pio_legacy_implementation_adapter.h",
+        "legacy/app_implementations/esp_pio/TRANSITIONAL_IMPLEMENTATION_ROOT.md",
+        "legacy/app_implementations/gat562_mesh_evb_pro/TRANSITIONAL_IMPLEMENTATION_ROOT.md",
+        "docs/targets/README.md",
+        "docs/targets/esp32_lvgl_targets.md",
+        "docs/targets/nrf52_node_targets.md",
+        "docs/targets/linux_targets.md",
+        "docs/ux_profiles/README.md",
+        "docs/ux_profiles/deck_full.md",
+        "docs/ux_profiles/pager_compact.md",
+        "docs/ux_profiles/watch_quick.md",
+        "docs/ux_profiles/cardputer_wide.md",
+        "docs/ux_profiles/tab5_touch.md",
+        "docs/ux_profiles/tiny_node_status.md",
+        "docs/ux_profiles/uconsole_desktop.md",
+        "modules/ui_chat_runtime/README.md",
+        "modules/ui_chat_runtime/library.json",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_page_runtime_event_pump.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_ui_refresh_sink.h",
+        "modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp",
+        "modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp",
+        "modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp",
+        "modules/ui_map_runtime/README.md",
+        "modules/ui_map_runtime/library.json",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_types.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_resolver.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_source.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_cache.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_render_queue.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/map_tile_decoder_cache.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay/map_overlay_projector.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h",
+        "modules/ui_map_runtime/src/map_tiles/map_tile_resolver.cpp",
+        "modules/ui_map_runtime/src/map_tiles/map_tile_render_queue.cpp",
+        "modules/ui_map_runtime/src/map_tiles/filesystem_map_tile_source.cpp",
+        "modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp",
+        "modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp",
+        "modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp",
+        "modules/ui_map_runtime/tests/test_map_tile_resolver.cpp",
+        "modules/ui_map_runtime/tests/test_map_tile_render_queue.cpp",
+        "modules/ui_map_runtime/tests/test_filesystem_map_tile_source.cpp",
+        "modules/ui_map_runtime/tests/test_map_overlay_projector.cpp",
+        "modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp",
+        "modules/ui_gps_runtime/README.md",
+        "modules/ui_gps_runtime/library.json",
+        "modules/ui_gps_runtime/include/ui_gps_runtime/gps_page_runtime_pump.h",
+        "modules/ui_gps_runtime/include/ui_gps_runtime/gps_ui_refresh_sink.h",
+        "modules/ui_gps_runtime/src/gps_page_runtime_pump.cpp",
+        "modules/ui_gps_runtime/tests/test_gps_page_runtime_pump.cpp",
+        "modules/ui_key_verification_runtime/README.md",
+        "modules/ui_key_verification_runtime/library.json",
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h",
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h",
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h",
+        "modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp",
+        "modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp",
+        "modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp",
+        "modules/ui_legacy_adapters/README.md",
+        "modules/ui_legacy_adapters/library.json",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h",
+        "modules/ui_chat_runtime/tests/test_chat_delivery_event_projection_adapter.cpp",
+        "modules/ui_chat_runtime/tests/test_chat_delivery_action_port_adapter.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp",
+        "modules/ui_lvgl_core/README.md",
+        "modules/ui_lvgl_core/library.json",
+        "modules/ui_lvgl_core/include/ui_lvgl_core/lvgl_focus_group.h",
+        "modules/ui_lvgl_core/include/ui_lvgl_core/.gitkeep",
+        "modules/ui_lvgl_core/src/.gitkeep",
+        "modules/ui_presentation/library.json",
+        "modules/ui_presentation/include/ui_presentation/menu/menu_model.h",
+        "modules/ui_presentation/src/menu/menu_model.cpp",
+        "modules/ui_presentation/include/ui_presentation/screen/screen_route.h",
+        "modules/ui_presentation/include/ui_presentation/screen/screen_binding_registry.h",
+        "modules/ui_presentation/src/screen/screen_binding_registry.cpp",
+        "modules/ui_presentation/tests/test_screen_binding_registry.cpp",
+        "modules/ui_lvgl_ux_packs/README.md",
+        "modules/ui_lvgl_ux_packs/library.json",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/team_position_picker_renderer.h",
+        "modules/ui_lvgl_ux_packs/src/common/team_position_picker_renderer.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/common/key_verification_modal_renderer.h",
+        "modules/ui_lvgl_ux_packs/src/common/key_verification_modal_renderer.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/device_ux_profile.h",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_feature_set.h",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/screen_registry.h",
+        "modules/ui_lvgl_ux_packs/src/ux/screen_registry.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/input_binding_set.h",
+        "modules/ui_lvgl_ux_packs/src/ux/input_binding_set.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_model.h",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_provider.h",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack.h",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack_registry.h",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/compatibility_ux_pack.h",
+        "modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/uconsole_desktop_ux_pack.h",
+        "modules/ui_lvgl_ux_packs/src/packs/uconsole_desktop_ux_pack.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/tiny_node_status_ux_pack.h",
+        "modules/ui_lvgl_ux_packs/src/packs/tiny_node_status_ux_pack.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/packs/simulator_full_ux_pack.h",
+        "modules/ui_lvgl_ux_packs/src/packs/simulator_full_ux_pack.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_screen_registry.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_input_binding_set.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_ux_screen_menu_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_ux_menu_provider.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_menu_runtime_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_compatibility_screen_factory.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_host_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_graph_bridge.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_compatibility_menu_binding.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_compatibility_ux_pack.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_uconsole_desktop_ux_pack.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_tiny_node_status_ux_pack.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_simulator_full_ux_pack.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_ux_pack_registry.cpp",
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_menu_runtime_adapter.h",
+        "modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp",
+        "modules/ui_ascii_runtime/tests/ascii_menu_runtime_adapter_smoke.cpp",
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_host_adapter.h",
+        "modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp",
+        "modules/ui_ascii_runtime/tests/ascii_screen_host_adapter_smoke.cpp",
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h",
+        "modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp",
+        "modules/ui_ascii_runtime/tests/ascii_screen_graph_bridge_smoke.cpp",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_menu_runtime_adapter.h",
+        "modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp",
+        "modules/ui_gtk_runtime/tests/gtk_menu_runtime_adapter_smoke.cpp",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_screen_host_adapter.h",
+        "modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp",
+        "modules/ui_gtk_runtime/tests/gtk_screen_host_adapter_smoke.cpp",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h",
+        "modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp",
+        "modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_bridge_smoke.cpp",
+        "tools/architecture/check_phase8_layout_ready.py",
+    ]
+
+    failures = 0
+    for path in required:
+        if not exists(path):
+            failures += fail(f"missing required file: {path}")
+    return failures
+
+
+def check_tokens(path: str, tokens: list[str], label: str) -> int:
+    if not exists(path):
+        return 0
+
+    text = read_text(path)
+    failures = 0
+    for token in tokens:
+        if token not in text:
+            failures += fail(f"{path} missing {label} token: {token}")
+    return failures
+
+
+def check_specification_language() -> int:
+    failures = 0
+
+    failures += check_tokens(
+        "docs/specification/REPOSITORY_LAYOUT_ARCHITECTURE_SPEC.md",
+        [
+            "apps/",
+            "builds/",
+            "modules/",
+            "platform/",
+            "boards/",
+            "docs/targets/",
+            "docs/ux_profiles/",
+            "builds -> apps",
+            "apps -> modules + platform + boards",
+            "modules -> modules only",
+            "platform -> SDK/HAL/runtime only",
+            "boards -> facts only",
+            "modules -> builds",
+            "modules -> apps",
+            "platform -> apps",
+            "boards -> apps",
+            "ui_presentation -> platform",
+            "ui_presentation -> LVGL",
+            "ui_presentation -> filesystem",
+            "apps cannot be named by build system",
+            "builds cannot carry product app shell",
+            "platform cannot carry product behavior",
+            "boards cannot decide UX",
+            "modules cannot depend on builds",
+            "Phase 8.2 establishes builds/ skeleton",
+            "builds/esp_idf",
+            "builds/pio_nrf52",
+            "builds/linux_cmake",
+            "`legacy/app_implementations/esp_idf` and `legacy/app_implementations/esp_pio` remain transitional",
+            "Phase 8.3 establishes app shell skeletons",
+            "apps/esp32_lvgl",
+            "apps/nrf52_node",
+            "apps/linux_uconsole_gtk",
+            "apps/linux_sim_shell",
+            "modules/ui_chat_runtime",
+            "modules/ui_map_runtime",
+            "modules/ui_gps_runtime",
+            "modules/ui_legacy_adapters",
+            "modules/ui_lvgl_core",
+            "modules/ui_lvgl_ux_packs",
+        ],
+        "repository layout",
+    )
+
+    failures += check_tokens(
+        "docs/specification/DEVICE_UX_PACK_ARCHITECTURE_SPEC.md",
+        [
+            "DeviceUxProfile",
+            "UxPack",
+            "UxFeatureSet",
+            "ScreenSet",
+            "InputBindingSet",
+            "ScreenFactory",
+            "LayoutProfile",
+            "Board describes",
+            "Target chooses",
+            "UX Pack presents",
+            "Renderer draws",
+            "ui_presentation",
+            "ui_lvgl_core",
+            "ui_lvgl_ux_packs",
+            "apps/target",
+            "boards",
+            "Do not branch inside pages on `BOARD_xxx` macros",
+            "Renderer must not detect concrete device",
+            "Board facts must not decide product features",
+            "Do not put all device UI in one `chat_page.cpp` / `map_page.cpp`",
+        ],
+        "device UX pack",
+    )
+
+    return failures
+
+
+def check_audit_language() -> int:
+    failures = 0
+
+    failures += check_tokens(
+        "docs/audits/REPOSITORY_LAYOUT_CURRENT_STATE_AUDIT.md",
+        [
+            "legacy/app_implementations/esp_idf",
+            "legacy/app_implementations/esp_pio",
+            "build entrypoints, not final app shells",
+            "ui_shared",
+            "LVGL core/widgets/screens/runtime bridges/adapters",
+            "ESP/nRF UI appears in modules while uConsole is in apps",
+            "device-specific UX",
+            "Legacy*",
+            "Legacy* adapters remain bounded but not renamed/deleted",
+        ],
+        "repository audit",
+    )
+
+    failures += check_tokens(
+        "docs/audits/UI_SHARED_SPLIT_AUDIT.md",
+        [
+            "LVGL core widgets",
+            "LVGL screens",
+            "legacy presentation sources",
+            "legacy action bridges",
+            "chat screen runtime helpers",
+            "map tile helpers",
+            "team picker renderer",
+            "key verification modal renderer",
+            "GPS page runtime pump",
+            "ui_lvgl_core",
+            "ui_lvgl_ux_packs",
+            "ui_legacy_adapters",
+            "ui_map_runtime",
+            "ui_chat_runtime",
+            "ui_gps_runtime",
+            "UI_SHARED_COMPATIBILITY_SHIM_POLICY.md",
+            "transitional umbrella",
+            "Forwarding headers",
+            "authoritative new module paths",
+        ],
+        "ui_shared split audit",
+    )
+
+    failures += check_tokens(
+        "docs/audits/UI_SHARED_COMPATIBILITY_SHIM_POLICY.md",
+        [
+            "transitional umbrella",
+            "compatibility shims only",
+            "Authoritative include paths live in the owning module",
+            "Forwarding Header Pattern",
+            "ui_chat_runtime",
+            "ui_map_runtime",
+            "ui_gps_runtime",
+            "ui_legacy_adapters",
+            "ui_lvgl_core",
+            "ui_lvgl_ux_packs",
+            "ui_shared Must Not Receive",
+            "new runtime helpers",
+            "new legacy adapters",
+            "new map tile helpers",
+            "new GPS runtime helpers",
+            "new chat runtime helpers",
+            "new LVGL UX pack renderers",
+            "LegacyFilesystemMapTileSource",
+            "deprecated compatibility alias",
+            "FilesystemMapTileSource",
+            "check_phase8_layout_ready.py",
+        ],
+        "ui_shared compatibility shim policy",
+    )
+
+    return failures
+
+
+def check_app_shell_language() -> int:
+    failures = 0
+
+    app_shell_tokens = [
+        "AppShell",
+        "AppShellManifest",
+        "TargetProfile",
+        "AppShellLifecycle",
+        "AppShellCompatibilityAdapter",
+        "Build Entrypoint invokes",
+        "App Shell composes",
+        "Target chooses",
+        "Board describes",
+        "UX Pack presents",
+        "select target profile",
+        "select board package",
+        "select platform family",
+        "select UX profile / UX pack",
+        "hand off to product composition",
+        "start runtime facade",
+        "own build host files",
+        "define board facts",
+        "contain SDK/HAL implementation",
+        "implement screen internals",
+        "assemble Chat/Map/GPS details behind hidden globals",
+    ]
+
+    failures += check_tokens(
+        "docs/specification/APP_SHELL_ARCHITECTURE_SPEC.md",
+        app_shell_tokens
+        + [
+            "apps/esp32_lvgl",
+            "apps/nrf52_node",
+            "apps/linux_uconsole_gtk",
+            "apps/linux_sim_shell",
+            "trail_mate_esp32_lvgl_start",
+            "trail_mate_nrf52_node_start",
+            "trail_mate_linux_uconsole_gtk_start",
+            "trail_mate_linux_sim_shell_start",
+            "No behavior change",
+        ],
+        "app shell specification",
+    )
+
+    failures += check_tokens(
+        "docs/audits/APP_SHELL_CURRENT_STATE_AUDIT.md",
+        [
+            "legacy/app_implementations/esp_idf",
+            "legacy/app_implementations/esp_pio",
+            "legacy/app_implementations/linux_sim",
+            "legacy/app_implementations/linux_uconsole",
+            "legacy/app_implementations/linux_rpi",
+            "legacy/app_implementations/linux_unoq",
+            "legacy/app_implementations/gat562_mesh_evb_pro",
+            "Current role",
+            "App shell part",
+            "Build entrypoint part",
+            "Platform part",
+            "Board-specific part",
+            "Future app shell direction",
+            "Migration risk",
+            "apps/esp32_lvgl",
+            "apps/nrf52_node",
+            "apps/linux_uconsole_gtk",
+            "apps/linux_sim_shell",
+            "executable app shell baseline",
+            "Phase 8 Build/AppShell Executable Convergence",
+            "trailmate_esp32_lvgl_app_shell",
+            "trailmate-nrf52-node-app-shell",
+            "trailmate_linux_uconsole_gtk_shell",
+            "trailmate_linux_sim_shell",
+            "esp32_lvgl_historical_source_descriptor",
+            "ESP_IDF_COMPONENT_SOURCES.cmake",
+            "trailmate_nrf52_pio_legacy_adapter",
+            "TRANSITIONAL_IMPLEMENTATION_ROOT.md",
+        ],
+        "app shell audit",
+    )
+
+    shell_docs = {
+        "apps/esp32_lvgl/README.md": [
+            "Role = product app shell / target app shell",
+            "Build entrypoint = `builds/esp_idf`",
+            "Historical source identity = `legacy/app_implementations/esp_idf`",
+            "must not",
+            "own build host files",
+            "src/esp32_lvgl_app_shell.h",
+            "target_family = esp32_lvgl",
+            "default_ux_pack_id = compatibility",
+            "historical_root_name = legacy/app_implementations/esp_idf",
+            "component_sources = builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake",
+            "src/esp32_lvgl_startup_runtime.*",
+            "src/esp32_lvgl_loop_runtime.*",
+            "src/esp32_lvgl_runtime_config.*",
+        ],
+        "apps/esp32_lvgl/APP_SHELL_MANIFEST.md": [
+            "Product app shell / target app shell",
+            "ESP / ESP32-P4",
+            "LVGL",
+            "`builds/esp_idf`",
+            "`legacy/app_implementations/esp_idf`",
+            "own build host files",
+            "Executable app shell baseline",
+            "esp32_lvgl_app_shell.cpp",
+            "Default UX Pack",
+            "`compatibility`",
+            "esp32_lvgl_startup_runtime.*",
+            "esp32_lvgl_loop_runtime.*",
+            "esp32_lvgl_runtime_config.*",
+            "ESP_IDF_COMPONENT_SOURCES.cmake",
+        ],
+        "apps/nrf52_node/README.md": [
+            "Role = product app shell / target app shell",
+            "Build entrypoint = `builds/pio_nrf52`",
+            "Historical source identity = `legacy/app_implementations/esp_pio`",
+            "legacy/app_implementations/gat562_mesh_evb_pro",
+            "own build host files",
+            "src/nrf52_node_app_shell.h",
+            "target_family = nrf52_node",
+            "default_ux_pack_id = tiny_node_status",
+            "historical_generic_root_name = legacy/app_implementations/esp_pio",
+            "historical_board_root_name = legacy/app_implementations/gat562_mesh_evb_pro",
+            "replacement_owner = apps/nrf52_node + builds/pio_nrf52 + boards/gat562_mesh_evb_pro",
+            "No behavior change in Phase 8 Build/AppShell Executable Convergence",
+        ],
+        "apps/nrf52_node/APP_SHELL_MANIFEST.md": [
+            "Product app shell / target app shell",
+            "nRF52",
+            "`builds/pio_nrf52`",
+            "`legacy/app_implementations/esp_pio`",
+            "`legacy/app_implementations/gat562_mesh_evb_pro`",
+            "own build host files",
+            "Executable app shell baseline",
+            "nrf52_node_app_shell.cpp",
+            "Default UX Pack",
+            "`tiny_node_status`",
+            "nrf52_historical_source_descriptor",
+            "No behavior change in Phase 8 Build/AppShell Executable Convergence",
+        ],
+        "apps/linux_uconsole_gtk/README.md": [
+            "Role = product app shell / target app shell",
+            "Build entrypoint = `builds/linux_cmake`",
+            "Historical source identity = `legacy/app_implementations/linux_uconsole`",
+            "own build host files",
+            "src/linux_uconsole_gtk_app_shell.h",
+            "target_id = uconsole",
+            "ux_pack_id = uconsole_desktop",
+            "historical_source = legacy/app_implementations/linux_uconsole",
+            "No GTK runtime behavior changes in Phase 8 Correction",
+        ],
+        "apps/linux_uconsole_gtk/APP_SHELL_MANIFEST.md": [
+            "Product app shell / target app shell",
+            "Linux uConsole",
+            "GTK",
+            "`builds/linux_cmake`",
+            "`legacy/app_implementations/linux_uconsole`",
+            "own build host files",
+            "Executable app shell baseline",
+            "linux_uconsole_gtk_app_shell.cpp",
+            "Selected UX Pack",
+            "`uconsole_desktop`",
+            "No GTK runtime behavior change in Phase 8 Correction",
+        ],
+        "apps/linux_sim_shell/README.md": [
+            "Role = product app shell / target app shell",
+            "Build entrypoint = `builds/linux_cmake`",
+            "Historical source identity = `legacy/app_implementations/linux_sim`",
+            "own build host files",
+            "src/linux_sim_app_shell.h",
+            "target_id = linux_sim",
+            "ux_pack_id = simulator_full",
+            "historical_source = legacy/app_implementations/linux_sim",
+            "No simulator runtime behavior changes in Phase 8 Correction",
+        ],
+        "apps/linux_sim_shell/APP_SHELL_MANIFEST.md": [
+            "Product app shell / target app shell",
+            "Linux simulator",
+            "`builds/linux_cmake`",
+            "`legacy/app_implementations/linux_sim`",
+            "own build host files",
+            "Executable app shell baseline",
+            "linux_sim_app_shell.cpp",
+            "Selected UX Pack",
+            "`simulator_full`",
+            "No simulator runtime behavior change in Phase 8 Correction",
+        ],
+    }
+
+    for path, tokens in shell_docs.items():
+        failures += check_tokens(path, tokens, "app shell skeleton")
+
+    target_docs = {
+        "docs/targets/README.md": [
+            "Target profiles",
+            "Build Entrypoint invokes",
+            "App Shell composes",
+            "Target chooses",
+            "Board describes",
+            "UX Pack presents",
+            "esp32_lvgl_targets.md",
+            "nrf52_node_targets.md",
+            "linux_targets.md",
+        ],
+        "docs/targets/esp32_lvgl_targets.md": [
+            "tab5",
+            "tdeck",
+            "builds/esp_idf",
+            "apps/esp32_lvgl",
+            "tab5_touch",
+            "deck_full",
+            "transitional",
+            "No behavior change in Phase 8.3",
+        ],
+        "docs/targets/nrf52_node_targets.md": [
+            "gat562",
+            "gat562_mesh_evb_pro",
+            "builds/pio_nrf52",
+            "apps/nrf52_node",
+            "tiny_node_status",
+            "transitional",
+            "legacy/app_implementations/esp_pio",
+            "No behavior change in Phase 8.3",
+        ],
+        "docs/targets/linux_targets.md": [
+            "uconsole",
+            "linux_sim",
+            "builds/linux_cmake",
+            "apps/linux_uconsole_gtk",
+            "apps/linux_sim_shell",
+            "uconsole_desktop",
+            "simulator_full",
+            "transitional",
+            "No behavior change in Phase 8.3",
+        ],
+    }
+
+    for path, tokens in target_docs.items():
+        failures += check_tokens(path, tokens, "target profile")
+
+    return failures
+
+
+def check_ux_profile_language() -> int:
+    failures = 0
+    common = [
+        "Screen Class",
+        "Input Model",
+        "Feature Set",
+        "Screen Set",
+        "Map Mode",
+        "Chat Mode",
+        "Team Action Mode",
+        "GPS Mode",
+        "Modal/Picker Strategy",
+        "Renderer Family",
+        "Deferred Decisions",
+        "Board describes. Target chooses. UX Pack presents. Renderer draws.",
+    ]
+    profiles = [
+        "docs/ux_profiles/deck_full.md",
+        "docs/ux_profiles/pager_compact.md",
+        "docs/ux_profiles/watch_quick.md",
+        "docs/ux_profiles/cardputer_wide.md",
+        "docs/ux_profiles/tab5_touch.md",
+        "docs/ux_profiles/tiny_node_status.md",
+        "docs/ux_profiles/uconsole_desktop.md",
+    ]
+    for path in profiles:
+        failures += check_tokens(path, common, "UX profile")
+
+    failures += check_tokens(
+        "docs/ux_profiles/README.md",
+        [
+            "Board describes",
+            "Target chooses",
+            "UX Pack presents",
+            "Renderer draws",
+            "deck_full.md",
+            "pager_compact.md",
+            "watch_quick.md",
+            "cardputer_wide.md",
+            "tab5_touch.md",
+            "tiny_node_status.md",
+            "uconsole_desktop.md",
+        ],
+        "UX profile index",
+    )
+    return failures
+
+
+def check_build_entrypoint_language() -> int:
+    failures = 0
+
+    build_tokens = [
+        "ESP-IDF",
+        "PlatformIO",
+        "nRF52",
+        "Linux",
+        "CMake",
+        "legacy/app_implementations/esp_idf",
+        "legacy/app_implementations/esp_pio",
+        "transitional",
+        "thin wrapper",
+        "App Shell composes",
+        "Build Entrypoint invokes",
+    ]
+
+    failures += check_tokens(
+        "docs/decisions/ADR_BUILD_ENTRYPOINTS.md",
+        build_tokens
+        + [
+            "ESP / ESP32-P4",
+            "BuildEntrypointManifest",
+            "They are not final product app shells",
+        ],
+        "build entrypoint ADR",
+    )
+
+    failures += check_tokens(
+        "docs/audits/BUILD_ENTRYPOINT_NORMALIZATION_AUDIT.md",
+        build_tokens
+        + [
+            "legacy/app_implementations/linux_sim",
+            "legacy/app_implementations/linux_uconsole",
+            "legacy/app_implementations/linux_rpi",
+            "legacy/app_implementations/linux_unoq",
+            "legacy/app_implementations/gat562_mesh_evb_pro",
+            "root `build/`",
+            "build.cardputer",
+            "build.tab5",
+            "BuildEntrypoint Constraints",
+            "No build behavior changes in this phase",
+            "Phase 8 Correction",
+            "Linux Executable Wrapper Baseline",
+            "executable wrapper baseline",
+            "trailmate_linux_uconsole_gtk_shell",
+            "trailmate_linux_sim_shell",
+            "Phase 8 Build/AppShell Executable Convergence",
+            "builds/esp_idf",
+            "builds/pio_nrf52",
+            "trailmate_esp32_lvgl_app_shell",
+            "trailmate-nrf52-node-app-shell",
+            "linux_uconsole_gtk_historical_source_descriptor",
+            "linux_sim_historical_source_descriptor",
+            "ESP_IDF_COMPONENT_SOURCES.cmake",
+            "trailmate_nrf52_pio_legacy_adapter",
+            "Transitional Adapter delegates",
+            "Legacy implementation still runs",
+            "TRANSITIONAL_IMPLEMENTATION_ROOT.md",
+        ],
+        "build entrypoint audit",
+    )
+
+    failures += check_tokens(
+        "docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md",
+        [
+            "legacy/app_implementations/esp_idf",
+            "legacy/app_implementations/esp_pio",
+            "transitional historical build entrypoints",
+            "They are not final product app shells",
+            "New code must not treat this as final app shell semantics",
+            "Build Entrypoint invokes",
+            "App Shell composes",
+        ],
+        "transitional build entrypoint marker",
+    )
+
+    failures += check_tokens(
+        "builds/README.md",
+        [
+            "build system entrypoints",
+            "It does not contain product app shells",
+            "Build Entrypoint invokes",
+            "App Shell composes",
+            "thin wrappers",
+            "legacy/app_implementations/esp_idf",
+            "legacy/app_implementations/esp_pio",
+        ],
+        "builds README",
+    )
+
+    failures += check_tokens(
+        "builds/esp_idf/README.md",
+        [
+            "Authoritative ESP build entrypoint",
+            "ESP / ESP32-P4 -> ESP-IDF",
+            "Current transitional path",
+            "legacy/app_implementations/esp_idf",
+            "apps/esp32_lvgl",
+            "thin wrapper",
+            "Build Entrypoint invokes",
+            "App Shell composes",
+        ],
+        "ESP-IDF build README",
+    )
+
+    failures += check_tokens(
+        "builds/pio_nrf52/README.md",
+        [
+            "Authoritative nRF52 build entrypoint",
+            "nRF52 -> PlatformIO",
+            "legacy/app_implementations/esp_pio",
+            "root platformio.ini",
+            "apps/nrf52_node",
+            "thin wrapper",
+            "Build Entrypoint invokes",
+            "App Shell composes",
+        ],
+        "PIO nRF52 build README",
+    )
+
+    failures += check_tokens(
+        "builds/linux_cmake/README.md",
+        [
+            "Authoritative Linux build entrypoint",
+            "Linux -> CMake",
+            "legacy/app_implementations/linux_sim",
+            "legacy/app_implementations/linux_uconsole",
+            "legacy/app_implementations/linux_rpi",
+            "legacy/app_implementations/linux_unoq",
+            "selected Linux app shell",
+            "thin wrapper",
+            "Build Entrypoint invokes",
+            "App Shell composes",
+        ],
+        "Linux CMake build README",
+    )
+
+    return failures
+
+
+def check_executable_layout_convergence() -> int:
+    failures = 0
+
+    failures += check_tokens(
+        "builds/linux_cmake/CMakeLists.txt",
+        [
+            "Build Entrypoint invokes; App Shell composes.",
+            "TRAIL_MATE_BUILD_LINUX_UCONSOLE_GTK",
+            "TRAIL_MATE_BUILD_LINUX_SIM_SHELL",
+            "add_subdirectory",
+            "apps/linux_uconsole_gtk",
+            "apps/linux_sim_shell",
+        ],
+        "Linux executable build wrapper",
+    )
+
+    wrapper_text = read_text("builds/linux_cmake/CMakeLists.txt")
+    for token in [
+        "ChatService",
+        "MapWorkspaceModel",
+        "GpsStatusModel",
+        "trailmate_add_linux_common",
+        "TrailMateLinuxSources.cmake",
+    ]:
+        if token in wrapper_text:
+            failures += fail(f"builds/linux_cmake/CMakeLists.txt owns forbidden token: {token}")
+
+    failures += check_tokens(
+        "apps/linux_uconsole_gtk/CMakeLists.txt",
+        [
+            "TrailMateUxPacks.cmake",
+            "trailmate_ui_lvgl_ux_packs",
+            "trailmate_linux_uconsole_gtk_shell",
+            "linux_uconsole_gtk_app_shell.cpp",
+            "linux_uconsole_gtk_historical_source_descriptor.cpp",
+            "linux_uconsole_gtk_app_shell_smoke.cpp",
+            "linux_uconsole_gtk_historical_source_descriptor_smoke.cpp",
+            "add_test",
+        ],
+        "uConsole GTK app shell CMake",
+    )
+
+    failures += check_tokens(
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.h",
+        [
+            "LinuxUConsoleGtkAppShellConfig",
+            "target_id = \"uconsole\"",
+            "ux_pack_id = \"uconsole_desktop\"",
+            "linux_uconsole_gtk_historical_source_descriptor.h",
+            "linuxUConsoleGtkHistoricalSourceDescriptor().historical_root_name",
+            "LinuxUConsoleGtkAppShell",
+        ],
+        "uConsole GTK app shell header",
+    )
+
+    failures += check_tokens(
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.cpp",
+        [
+            "LinuxUConsoleGtkAppShell::config",
+            "LinuxUConsoleGtkAppShell::validate",
+            "ui_lvgl_ux_packs/ux/ux_pack_registry.h",
+            "findUxPackById",
+            "config_.target_id",
+            "config_.ux_pack_id",
+            "config_.historical_source",
+            "historical_source.historical_root_name",
+            "historical_source.replacement_owner",
+        ],
+        "uConsole GTK app shell source",
+    )
+
+    failures += check_tokens(
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_historical_source_descriptor.h",
+        [
+            "LinuxUConsoleGtkHistoricalSourceDescriptor",
+            "historical_root_name = \"legacy/app_implementations/linux_uconsole\"",
+            "historical_role = \"pre-refactor uConsole GTK implementation root\"",
+            "replacement_owner = \"apps/linux_uconsole_gtk + modules/ui_gtk_runtime\"",
+        ],
+        "uConsole GTK historical source descriptor",
+    )
+
+    failures += check_tokens(
+        "apps/linux_sim_shell/CMakeLists.txt",
+        [
+            "TrailMateUxPacks.cmake",
+            "trailmate_ui_lvgl_ux_packs",
+            "trailmate_linux_sim_shell",
+            "linux_sim_app_shell.cpp",
+            "linux_sim_historical_source_descriptor.cpp",
+            "linux_sim_app_shell_smoke.cpp",
+            "linux_sim_historical_source_descriptor_smoke.cpp",
+            "ux_pack_registry",
+            "add_test",
+        ],
+        "Linux sim app shell CMake",
+    )
+
+    failures += check_tokens(
+        "apps/linux_sim_shell/src/linux_sim_app_shell.h",
+        [
+            "LinuxSimAppShellConfig",
+            "target_id = \"linux_sim\"",
+            "ux_pack_id = \"simulator_full\"",
+            "linux_sim_historical_source_descriptor.h",
+            "linuxSimHistoricalSourceDescriptor().historical_root_name",
+            "LinuxSimAppShell",
+        ],
+        "Linux sim app shell header",
+    )
+
+    failures += check_tokens(
+        "apps/linux_sim_shell/src/linux_sim_app_shell.cpp",
+        [
+            "LinuxSimAppShell::config",
+            "LinuxSimAppShell::validate",
+            "ui_lvgl_ux_packs/ux/ux_pack_registry.h",
+            "findUxPackById",
+            "config_.target_id",
+            "config_.ux_pack_id",
+            "config_.historical_source",
+            "historical_source.historical_root_name",
+            "historical_source.replacement_owner",
+        ],
+        "Linux sim app shell source",
+    )
+
+    failures += check_tokens(
+        "apps/linux_sim_shell/src/linux_sim_historical_source_descriptor.h",
+        [
+            "LinuxSimHistoricalSourceDescriptor",
+            "historical_root_name = \"legacy/app_implementations/linux_sim\"",
+            "historical_role = \"pre-refactor Linux simulator implementation root\"",
+            "replacement_owner = \"apps/linux_sim_shell + modules/ui_ascii_runtime\"",
+        ],
+        "Linux sim historical source descriptor",
+    )
+
+    failures += check_tokens(
+        "builds/esp_idf/CMakeLists.txt",
+        [
+            "Build Entrypoint invokes; App Shell composes.",
+            "TRAIL_MATE_ESP_APP_SHELL",
+            "apps/esp32_lvgl",
+            "add_subdirectory",
+        ],
+        "ESP-IDF executable build wrapper",
+    )
+
+    esp_wrapper_text = read_text("builds/esp_idf/CMakeLists.txt")
+    for token in [
+        "idf_component_register",
+        "trail_mate_idf_ui_shared_sources",
+        "ChatService",
+        "MapWorkspaceModel",
+        "GpsStatusModel",
+    ]:
+        if token in esp_wrapper_text:
+            failures += fail(f"builds/esp_idf/CMakeLists.txt owns forbidden token: {token}")
+
+    failures += check_tokens(
+        "apps/esp32_lvgl/CMakeLists.txt",
+        [
+            "TrailMateUxPacks.cmake",
+            "trailmate_ui_lvgl_ux_packs",
+            "trailmate_esp32_lvgl_app_shell",
+            "esp32_lvgl_app_shell.cpp",
+            "esp32_lvgl_historical_source_descriptor.cpp",
+            "esp32_lvgl_startup_runtime.cpp",
+            "esp32_lvgl_loop_runtime.cpp",
+            "esp32_lvgl_runtime_config.cpp",
+            "esp32_lvgl_app_shell_smoke.cpp",
+            "add_test",
+        ],
+        "ESP32 LVGL app shell CMake",
+    )
+
+    failures += check_tokens(
+        "apps/esp32_lvgl/src/esp32_lvgl_app_shell.h",
+        [
+            "Esp32LvglAppShellConfig",
+            "target_family = \"esp32_lvgl\"",
+            "default_ux_pack_id = \"compatibility\"",
+            "build_entrypoint = \"builds/esp_idf\"",
+            "component_sources = \"builds/esp_idf/ESP_IDF_COMPONENT_SOURCES.cmake\"",
+            "historical_root_name =",
+            "esp32LvglHistoricalSourceDescriptor().historical_root_name",
+            "Esp32LvglAppShell",
+        ],
+        "ESP32 LVGL app shell header",
+    )
+
+    failures += check_tokens(
+        "apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp",
+        [
+            "Esp32LvglAppShell::config",
+            "Esp32LvglAppShell::validate",
+            "ui_lvgl_ux_packs/ux/ux_pack_registry.h",
+            "findUxPackById",
+            "config_.target_family",
+            "config_.default_ux_pack_id",
+            "config_.build_entrypoint",
+            "config_.component_sources",
+            "config_.historical_root_name",
+            "config_.historical_role",
+            "config_.replacement_owner",
+        ],
+        "ESP32 LVGL app shell source",
+    )
+
+    failures += check_tokens(
+        "legacy/app_implementations/esp_idf/src/esp_idf_legacy_implementation_adapter.h",
+        [
+            "EspIdfLegacyImplementationDescriptor",
+            "implementation_root = \"legacy/app_implementations/esp_idf\"",
+            "app_shell = \"apps/esp32_lvgl\"",
+            "build_wrapper = \"builds/esp_idf\"",
+            "EspIdfLegacyImplementationAdapter",
+        ],
+        "ESP-IDF legacy adapter header",
+    )
+
+    failures += check_tokens(
+        "builds/pio_nrf52/platformio.ini",
+        [
+            "Build Entrypoint invokes",
+            "App Shell composes",
+            "apps/nrf52_node",
+            "legacy/app_implementations/esp_pio",
+            "legacy/app_implementations/gat562_mesh_evb_pro",
+            "env:nrf52_node_wrapper_baseline",
+            "symlink://../../apps/nrf52_node",
+            "symlink://../../modules/ui_lvgl_ux_packs",
+            "TRAIL_MATE_BUILD_WRAPPER_BASELINE",
+            "modules/ui_lvgl_ux_packs/include",
+            "nrf52_node_wrapper_baseline.cpp",
+        ],
+        "PIO nRF52 executable build wrapper",
+    )
+
+    failures += check_tokens(
+        "builds/pio_nrf52/src/nrf52_node_wrapper_baseline.cpp",
+        [
+            "nrf52_node_app_shell.h",
+            "nrf52_historical_source_descriptor.h",
+            "Nrf52NodeAppShell",
+            "nrf52HistoricalSourceDescriptor",
+            "shell.validate()",
+        ],
+        "PIO nRF52 wrapper source",
+    )
+
+    failures += check_tokens(
+        "apps/nrf52_node/library.json",
+        [
+            "trailmate-nrf52-node-app-shell",
+            "\"includeDir\": \"src\"",
+            "\"srcDir\": \"src\"",
+            "ui_lvgl_ux_packs",
+        ],
+        "nRF52 node PIO library manifest",
+    )
+
+    failures += check_tokens(
+        "apps/nrf52_node/src/nrf52_node_app_shell.h",
+        [
+            "Nrf52NodeAppShellConfig",
+            "target_family = \"nrf52_node\"",
+            "default_ux_pack_id = \"tiny_node_status\"",
+            "historical_generic_root_name =",
+            "nrf52HistoricalSourceDescriptor().historical_generic_root_name",
+            "historical_board_root_name =",
+            "nrf52HistoricalSourceDescriptor().historical_board_root_name",
+            "Nrf52NodeAppShell",
+        ],
+        "nRF52 node app shell header",
+    )
+
+    failures += check_tokens(
+        "apps/nrf52_node/src/nrf52_node_app_shell.cpp",
+        [
+            "Nrf52NodeAppShell::config",
+            "Nrf52NodeAppShell::validate",
+            "ui_lvgl_ux_packs/ux/ux_pack_registry.h",
+            "findUxPackById",
+            "config_.target_family",
+            "config_.default_ux_pack_id",
+            "config_.historical_generic_root_name",
+            "config_.historical_board_root_name",
+            "config_.historical_role",
+            "config_.replacement_owner",
+        ],
+        "nRF52 node app shell source",
+    )
+
+    failures += check_tokens(
+        "legacy/app_implementations/esp_pio/src/nrf52_pio_legacy_implementation_adapter.h",
+        [
+            "Nrf52PioLegacyImplementationDescriptor",
+            "implementation_root = \"legacy/app_implementations/esp_pio\"",
+            "board_specific_root = \"legacy/app_implementations/gat562_mesh_evb_pro\"",
+            "app_shell = \"apps/nrf52_node\"",
+            "build_wrapper = \"builds/pio_nrf52\"",
+        ],
+        "nRF52 PIO legacy adapter header",
+    )
+
+    for path, app_shell, wrapper in [
+        ("legacy/app_implementations/linux_uconsole/TRANSITIONAL_IMPLEMENTATION_ROOT.md", "apps/linux_uconsole_gtk", "builds/linux_cmake"),
+        ("legacy/app_implementations/linux_sim/TRANSITIONAL_IMPLEMENTATION_ROOT.md", "apps/linux_sim_shell", "builds/linux_cmake"),
+        ("legacy/app_implementations/esp_idf/TRANSITIONAL_IMPLEMENTATION_ROOT.md", "apps/esp32_lvgl", "builds/esp_idf"),
+        ("legacy/app_implementations/esp_pio/TRANSITIONAL_IMPLEMENTATION_ROOT.md", "apps/nrf52_node", "builds/pio_nrf52"),
+        ("legacy/app_implementations/gat562_mesh_evb_pro/TRANSITIONAL_IMPLEMENTATION_ROOT.md", "apps/nrf52_node", "builds/pio_nrf52"),
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "transitional implementation root",
+                "not the final app shell semantic root",
+                "Final app shell",
+                app_shell,
+                "Authoritative build wrapper",
+                wrapper,
+                "Exit condition",
+            ],
+            "transitional implementation root marker",
+        )
+
+    return failures
+
+
+def check_ux_pack_runtime_binding() -> int:
+    failures = 0
+
+    ux_tokens = {
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/device_ux_profile.h": [
+            "DeviceUxProfile",
+            "ScreenClass",
+            "InputModel",
+            "MapMode",
+            "ChatMode",
+            "supports_team_actions",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_feature_set.h": [
+            "UxFeatureSet",
+            "chat",
+            "contacts",
+            "map",
+            "gps",
+            "team",
+            "tracker",
+            "settings",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/screen_registry.h": [
+            "ScreenRegistry",
+            "ScreenDescriptor",
+            "ScreenId",
+            "kMaxScreens",
+            "void clear()",
+            "bool add",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/input_binding_set.h": [
+            "InputBindingSet",
+            "InputBinding",
+            "InputAction",
+            "kMaxBindings",
+            "void clear()",
+            "bool add",
+        ],
+        "modules/ui_presentation/include/ui_presentation/menu/menu_model.h": [
+            "MenuModel",
+            "MenuItem",
+            "MenuScreenId",
+            "kMaxItems",
+            "void clear()",
+            "bool add",
+        ],
+        "modules/ui_presentation/include/ui_presentation/screen/screen_route.h": [
+            "ScreenRoute",
+            "ScreenOpenMode",
+            "routeForMenuScreen",
+            "MenuScreenId",
+            "Replace",
+            "valid",
+        ],
+        "modules/ui_presentation/include/ui_presentation/screen/screen_binding_registry.h": [
+            "ScreenBindingRegistry",
+            "ScreenBinding",
+            "MenuScreenId",
+            "kMaxBindings",
+            "find",
+            "bool add",
+        ],
+        "modules/ui_presentation/src/screen/screen_binding_registry.cpp": [
+            "ScreenBindingRegistry",
+            "find",
+            "screen_id",
+            "items_",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_model.h": [
+            "ui_presentation/menu/menu_model.h",
+            "UxMenuModel",
+            "UxMenuItem",
+            "using UxMenuModel",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h": [
+            "UxScreenMenuAdapter",
+            "ScreenRegistry",
+            "ui::menu::MenuModel",
+            "buildMenu",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_provider.h": [
+            "buildMenuForUxPack",
+            "ui::menu::MenuModel",
+        ],
+        "modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp": [
+            "UxScreenMenuAdapter",
+            "ScreenRegistry",
+            "MenuScreenId",
+            "toMenuScreenId",
+            "screen.enabled",
+        ],
+        "modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp": [
+            "buildMenuForUxPack",
+            "findUxPackById",
+            "ScreenRegistry",
+            "ui::menu::MenuModel",
+            "UxScreenMenuAdapter",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h": [
+            "LvglMenuRuntimeAdapter",
+            "LvglMenuEntry",
+            "ui::menu::MenuModel",
+            "ScreenRoute",
+            "route",
+            "buildEntries",
+        ],
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp": [
+            "LvglMenuRuntimeAdapter",
+            "buildEntries",
+            "MenuItem",
+            "routeForMenuScreen",
+            "out_count",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h": [
+            "CompatibilityScreenFactory",
+            "CompatibilityScreenDescriptor",
+            "ScreenBindingRegistry",
+            "describe",
+            "buildBindingsForMenu",
+        ],
+        "modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp": [
+            "CompatibilityScreenFactory",
+            "Dashboard",
+            "Chat",
+            "Map",
+            "Settings",
+            "binding_id",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h": [
+            "LvglScreenHostAdapter",
+            "LvglScreenHostEntry",
+            "resolve",
+            "binding_id",
+        ],
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp": [
+            "LvglScreenHostAdapter",
+            "CompatibilityScreenFactory",
+            "resolve",
+            "binding_id",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h": [
+            "LvglScreenGraphBridge",
+            "PresentationBundle",
+            "LvglMenuRuntimeAdapter",
+            "LvglScreenHostAdapter",
+            "menuCount",
+            "screenCount",
+        ],
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp": [
+            "LvglScreenGraphBridge",
+            "PresentationBundle",
+            "hasUxMenu",
+            "hasScreenBindings",
+            "LvglMenuRuntimeAdapter",
+            "LvglScreenHostAdapter",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack.h": [
+            "IUxPack",
+            "virtual const char* id() const = 0",
+            "DeviceUxProfile",
+            "UxFeatureSet",
+            "buildScreens",
+            "buildInputBindings",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_pack_registry.h": [
+            "findUxPackById",
+            "IUxPack",
+        ],
+        "modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp": [
+            "findUxPackById",
+            "CompatibilityUxPack",
+            "UConsoleDesktopUxPack",
+            "TinyNodeStatusUxPack",
+            "SimulatorFullUxPack",
+            "compatibility",
+            "uconsole_desktop",
+            "tiny_node_status",
+            "simulator_full",
+            "nullptr",
+        ],
+        "modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp": [
+            "CompatibilityUxPack",
+            "compatibility",
+            "ScreenId::Dashboard",
+            "ScreenId::Chat",
+            "ScreenId::Extensions",
+            "InputAction::Compose",
+        ],
+        "modules/ui_lvgl_ux_packs/src/packs/uconsole_desktop_ux_pack.cpp": [
+            "UConsoleDesktopUxPack",
+            "uconsole_desktop",
+            "ScreenClass::Desktop",
+            "InputModel::DesktopKeyboardMouse",
+            "MapMode::Desktop",
+            "ChatMode::Full",
+        ],
+        "modules/ui_lvgl_ux_packs/src/packs/tiny_node_status_ux_pack.cpp": [
+            "TinyNodeStatusUxPack",
+            "tiny_node_status",
+            "ScreenClass::TinyStatus",
+            "MapMode::None",
+            "ChatMode::StatusOnly",
+            "ScreenId::Team",
+        ],
+        "modules/ui_lvgl_ux_packs/src/packs/simulator_full_ux_pack.cpp": [
+            "SimulatorFullUxPack",
+            "simulator_full",
+            "ScreenClass::Desktop",
+            "MapMode::Full",
+            "ChatMode::Full",
+            "ScreenId::Extensions",
+        ],
+        "cmake/TrailMateUxPacks.cmake": [
+            "trailmate_add_ui_lvgl_ux_packs",
+            "menu_model.cpp",
+            "screen_binding_registry.cpp",
+            "screen_registry.cpp",
+            "input_binding_set.cpp",
+            "ux_menu_model.cpp",
+            "ux_screen_menu_adapter.cpp",
+            "ux_menu_provider.cpp",
+            "ux_pack_registry.cpp",
+            "compatibility_screen_factory.cpp",
+            "lvgl_menu_runtime_adapter.cpp",
+            "lvgl_screen_host_adapter.cpp",
+            "lvgl_screen_graph_bridge.cpp",
+            "compatibility_ux_pack.cpp",
+            "uconsole_desktop_ux_pack.cpp",
+            "tiny_node_status_ux_pack.cpp",
+            "simulator_full_ux_pack.cpp",
+        ],
+    }
+
+    for path, tokens in ux_tokens.items():
+        failures += check_tokens(path, tokens, "UX Pack runtime binding")
+
+    for path, expected_pack in [
+        ("apps/esp32_lvgl/src/esp32_lvgl_app_shell.cpp", "default_ux_pack_id"),
+        ("apps/linux_uconsole_gtk/src/linux_uconsole_gtk_app_shell.cpp", "ux_pack_id"),
+        ("apps/linux_sim_shell/src/linux_sim_app_shell.cpp", "ux_pack_id"),
+        ("apps/nrf52_node/src/nrf52_node_app_shell.cpp", "default_ux_pack_id"),
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "ui_lvgl_ux_packs/ux/ux_pack_registry.h",
+                "findUxPackById",
+                "activeUxPackId",
+                expected_pack,
+            ],
+            "app shell UX Pack lookup",
+        )
+
+    for path, expected_pack_id in [
+        ("apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp", "default_ux_pack_id"),
+        ("apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_app_shell_smoke.cpp", "ux_pack_id"),
+        ("apps/linux_sim_shell/tests/linux_sim_app_shell_smoke.cpp", "ux_pack_id"),
+        ("apps/nrf52_node/tests/nrf52_node_app_shell_smoke.cpp", "default_ux_pack_id"),
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "findUxPackById",
+                "activeUxPackId",
+                expected_pack_id,
+            ],
+            "app shell UX Pack smoke test",
+        )
+
+    failures += check_tokens(
+        "modules/ui_shared/include/ui/menu/menu_layout.h",
+        [
+            "ui_presentation/menu/menu_model.h",
+            "MenuModel",
+            "ux_menu",
+        ],
+        "existing menu UX model entry point",
+    )
+
+    failures += check_tokens(
+        "modules/ui_shared/src/ui/menu/menu_layout.cpp",
+        [
+            "MenuScreenId",
+            "stableIdForScreenId",
+            "createAppButtonsFromUxMenu",
+            "createAppButtonsFromCatalog",
+        ],
+        "existing menu UX model consumer",
+    )
+
+    failures += check_tokens(
+        "modules/ui_shared/src/ui/startup_shell.cpp",
+        [
+            "buildMenuForUxPack",
+            "hooks.ux_pack_id",
+            "menu_options.ux_menu",
+        ],
+        "startup shell UX menu provider",
+    )
+
+    failures += check_tokens(
+        "modules/ui_shared/src/ui/startup_ui_shell.cpp",
+        [
+            "buildMenuForUxPack",
+            "hooks.ux_pack_id",
+            "options.ux_menu",
+        ],
+        "startup UI shell UX menu provider",
+    )
+
+    return failures
+
+
+def check_composition_root_binding() -> int:
+    failures = 0
+
+    failures += check_tokens(
+        "modules/product_composition/include/product_composition/presentation_bundle.h",
+        [
+            "ui_presentation/menu/menu_model.h",
+            "ui_presentation/screen/screen_binding_registry.h",
+            "MenuModel",
+            "ux_menu",
+            "hasUxMenu",
+            "screen_bindings",
+            "hasScreenBindings",
+        ],
+        "presentation bundle UX menu slot",
+    )
+    if "ui_lvgl_ux_packs/ux/ux_menu_model.h" in read_text(
+        "modules/product_composition/include/product_composition/presentation_bundle.h"
+    ):
+        failures += fail(
+            "PresentationBundle must not depend on ui_lvgl_ux_packs/ux/ux_menu_model.h"
+        )
+
+    for path, config_token, pack_id in [
+        (
+            "legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.h",
+            "UConsoleCompositionRootConfig",
+            "uconsole_desktop",
+        ),
+        (
+            "legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.h",
+            "LinuxSimCompositionRootConfig",
+            "simulator_full",
+        ),
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "ui_presentation/menu/menu_model.h",
+                "MenuModel",
+                "ScreenBindingRegistry",
+                "ux_pack_id",
+                pack_id,
+                config_token,
+                "initialize(const",
+                "uxMenu",
+            ],
+            "composition root UX menu contract",
+        )
+        if "ui_lvgl_ux_packs/ux/ux_menu_model.h" in read_text(path):
+            failures += fail(
+                f"{path} must use ui_presentation/menu/menu_model.h, not the UX-pack menu alias"
+            )
+
+    for path in [
+        "legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.cpp",
+        "legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.cpp",
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "buildMenuForUxPack",
+                "config.ux_pack_id",
+                "ux_menu_",
+                "screen_bindings_",
+                "presentation_.ux_menu",
+                "presentation_.screen_bindings",
+            ],
+            "composition root UX menu wiring",
+        )
+
+        text = read_text(path)
+        for token in [
+            "builds/",
+            "builds\\",
+            "boards/",
+            "boards\\",
+            "platformio",
+            "idf_component_register",
+            "TRAIL_MATE_IDF_TARGET",
+        ]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden composition root token: {token}")
+
+    for path in [
+        "apps/esp32_lvgl/tests/esp32_lvgl_app_shell_smoke.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_app_shell_smoke.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_app_shell_smoke.cpp",
+        "apps/nrf52_node/tests/nrf52_node_app_shell_smoke.cpp",
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "activeUxPackId",
+                "buildMenuForUxPack",
+                "menu.size()",
+            ],
+            "app shell UX menu smoke test",
+        )
+
+    failures += check_tokens(
+        "legacy/app_implementations/linux_uconsole/CMakeLists.txt",
+        [
+            "archive-only",
+            "Use apps/linux_uconsole_gtk",
+        ],
+        "uConsole composition root UX pack linkage",
+    )
+
+    failures += check_tokens(
+        "legacy/app_implementations/linux_sim/CMakeLists.txt",
+        [
+            "archive-only",
+            "Use apps/linux_sim_shell",
+        ],
+        "Linux sim composition root UX pack target",
+    )
+
+    return failures
+
+
+def check_ui_runtime_consumption_boundary() -> int:
+    failures = 0
+
+    failures += check_tokens(
+        "legacy/LEGACY_GOVERNANCE.md",
+        [
+            "not a feature area",
+            "historical implementation roots only",
+            "LEGACY_BURNDOWN_REGISTER",
+            "stable adapters must be renamed",
+            "compatibility containment",
+        ],
+        "legacy governance",
+    )
+
+    failures += check_tokens(
+        "legacy/app_implementations/LEGACY_IMPLEMENTATION_INDEX.md",
+        [
+            "Historical path",
+            "Current path",
+            "Final app shell",
+            "Authoritative build wrapper",
+            "Exit condition",
+            "legacy/app_implementations/gat562_mesh_evb_pro",
+        ],
+        "legacy implementation index",
+    )
+
+    failures += check_tokens(
+        "docs/audits/PHASE8_RUNTIME_UI_ADOPTION_REPORT.md",
+        [
+            "GTK descriptor bridge",
+            "ASCII descriptor bridge",
+            "LVGL descriptor bridge",
+            "real LVGL menu renderer",
+            "real GTK page switch logic",
+            "real simulator main UI selection",
+            "hardcoded screen creation",
+            "fallbacks remain compatibility fallbacks",
+        ],
+        "Phase 8 runtime UI adoption report",
+    )
+
+    failures += check_tokens(
+        "modules/product_composition/include/product_composition/presentation_bundle.h",
+        [
+            "ui_presentation/menu/menu_model.h",
+            "ux_menu",
+            "hasUxMenu",
+        ],
+        "portable presentation menu boundary",
+    )
+
+    product_composition_root = ROOT / "modules/product_composition"
+    for path in iter_code_files(product_composition_root):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        if "ui_lvgl_ux_packs" in text:
+            failures += fail(
+                f"{path.relative_to(ROOT)} depends on ui_lvgl_ux_packs; use ui_presentation/menu/menu_model.h"
+            )
+
+    failures += check_tokens(
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_model.h",
+        [
+            "ui_presentation/menu/menu_model.h",
+            "using UxMenuItem",
+            "using UxMenuModel",
+        ],
+        "UX menu compatibility alias",
+    )
+
+    for path in [
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_provider.h",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp",
+    ]:
+        failures += check_tokens(
+            path,
+            ["ui::menu::MenuModel"],
+            "portable MenuModel provider output",
+        )
+
+    for path in [
+        "legacy/app_implementations/linux_uconsole/archive/composition/uconsole_composition_root.h",
+        "legacy/app_implementations/linux_sim/archive/composition/linux_sim_composition_root.h",
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "ui_presentation/menu/menu_model.h",
+                "ui::menu::MenuModel",
+            ],
+            "composition root portable menu model",
+        )
+        if "ui_lvgl_ux_packs/ux/ux_menu_model.h" in read_text(path):
+            failures += fail(
+                f"{path} must not include the UX-pack menu compatibility alias"
+            )
+
+    runtime_contracts = {
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_menu_runtime_adapter.cpp": [
+            "LvglMenuRuntimeAdapter",
+            "buildMenuForUxPack",
+            "MenuModel",
+        ],
+        "modules/ui_ascii_runtime/tests/ascii_menu_runtime_adapter_smoke.cpp": [
+            "AsciiMenuRuntimeAdapter",
+            "presentation().ux_menu",
+            "hasUxMenu",
+        ],
+        "modules/ui_gtk_runtime/tests/gtk_menu_runtime_adapter_smoke.cpp": [
+            "GtkMenuRuntimeAdapter",
+            "presentation().ux_menu",
+            "hasUxMenu",
+        ],
+    }
+    for path, tokens in runtime_contracts.items():
+        failures += check_tokens(path, tokens, "runtime menu consumption smoke")
+
+    for path in [
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp",
+    ]:
+        text = read_text(path)
+        for token in [
+            "lvgl.h",
+            "apps/",
+            "apps\\",
+            "builds/",
+            "boards/",
+            "boards\\",
+            "platform/",
+            "platform\\",
+        ]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden runtime menu adapter token {token}")
+
+    failures += check_tokens(
+        "apps/linux_sim_shell/CMakeLists.txt",
+        [
+            "ascii_menu_runtime_adapter.cpp",
+            "ascii_screen_graph_bridge.cpp",
+        ],
+        "ASCII menu runtime adapter final shell source",
+    )
+    failures += check_tokens(
+        "apps/linux_uconsole_gtk/CMakeLists.txt",
+        [
+            "gtk_menu_runtime_adapter.cpp",
+            "gtk_uconsole_screen_graph_bridge.cpp",
+        ],
+        "GTK menu runtime adapter final shell source",
+    )
+    failures += check_tokens(
+        "apps/linux_sim_shell/CMakeLists.txt",
+        [
+            "lvgl_menu_runtime_adapter",
+            "lvgl_screen_graph_bridge",
+        ],
+        "LVGL menu runtime adapter test target",
+    )
+
+    return failures
+
+
+def check_screen_factory_host_binding() -> int:
+    failures = 0
+
+    portable_contracts = {
+        "modules/ui_presentation/include/ui_presentation/screen/screen_route.h": [
+            "ScreenRoute",
+            "ScreenOpenMode",
+            "routeForMenuScreen",
+        ],
+        "modules/ui_presentation/include/ui_presentation/screen/screen_binding_registry.h": [
+            "ScreenBindingRegistry",
+            "ScreenBinding",
+            "find",
+        ],
+        "modules/ui_presentation/tests/test_screen_binding_registry.cpp": [
+            "ScreenRoute",
+            "routeForMenuScreen",
+            "ScreenBindingRegistry",
+        ],
+    }
+    for path, tokens in portable_contracts.items():
+        failures += check_tokens(path, tokens, "portable screen binding contract")
+
+    screen_runtime_contracts = {
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h": [
+            "CompatibilityScreenFactory",
+            "CompatibilityScreenDescriptor",
+            "buildBindingsForMenu",
+        ],
+        "modules/ui_lvgl_ux_packs/tests/test_compatibility_screen_factory.cpp": [
+            "CompatibilityScreenFactory",
+            "Dashboard",
+            "Chat",
+            "Map",
+            "Settings",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h": [
+            "LvglScreenHostAdapter",
+            "resolve",
+            "binding_id",
+        ],
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_host_adapter.cpp": [
+            "LvglScreenHostAdapter",
+            "resolve",
+            "binding_id",
+        ],
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h": [
+            "LvglScreenGraphBridge",
+            "PresentationBundle",
+            "screenCount",
+        ],
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_screen_graph_bridge.cpp": [
+            "LvglScreenGraphBridge",
+            "PresentationBundle",
+            "hasUxMenu",
+            "hasScreenBindings",
+        ],
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_host_adapter.h": [
+            "AsciiScreenHostAdapter",
+            "ScreenRoute",
+            "resolve",
+        ],
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_screen_host_adapter.h": [
+            "GtkScreenHostAdapter",
+            "ScreenRoute",
+            "resolve",
+        ],
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h": [
+            "AsciiScreenGraphBridge",
+            "PresentationBundle",
+            "AsciiMenuRuntimeAdapter",
+            "AsciiScreenHostAdapter",
+            "AsciiScreenGraph",
+        ],
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h": [
+            "GtkUConsoleScreenGraphBridge",
+            "PresentationBundle",
+            "GtkMenuRuntimeAdapter",
+            "GtkScreenHostAdapter",
+            "screenBindingCount",
+        ],
+    }
+    for path, tokens in screen_runtime_contracts.items():
+        failures += check_tokens(path, tokens, "screen factory host binding")
+
+    bridge_source_contracts = {
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp": [
+            "PresentationBundle",
+            "hasUxMenu",
+            "hasScreenBindings",
+            "LvglMenuRuntimeAdapter",
+            "LvglScreenHostAdapter",
+        ],
+        "modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp": [
+            "PresentationBundle",
+            "hasUxMenu",
+            "hasScreenBindings",
+            "AsciiMenuRuntimeAdapter",
+            "AsciiScreenHostAdapter",
+        ],
+        "modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp": [
+            "PresentationBundle",
+            "hasUxMenu",
+            "hasScreenBindings",
+            "GtkMenuRuntimeAdapter",
+            "GtkScreenHostAdapter",
+        ],
+    }
+    for path, tokens in bridge_source_contracts.items():
+        failures += check_tokens(path, tokens, "screen graph bridge runtime adoption")
+
+    for path in [
+        "modules/ui_ascii_runtime/tests/ascii_screen_host_adapter_smoke.cpp",
+        "modules/ui_gtk_runtime/tests/gtk_screen_host_adapter_smoke.cpp",
+        "modules/ui_ascii_runtime/tests/ascii_screen_graph_bridge_smoke.cpp",
+        "modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_bridge_smoke.cpp",
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "presentation().ux_menu",
+                "route",
+                "ScreenRoute",
+                "hasScreenBindings",
+            ],
+            "screen host adapter smoke route consumption",
+        )
+
+    for path in [
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_menu_runtime_adapter.h",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_menu_runtime_adapter.h",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_menu_runtime_adapter.h",
+    ]:
+        failures += check_tokens(
+            path,
+            ["ScreenRoute", "route"],
+            "menu runtime route-bearing descriptor",
+        )
+
+    for path in [
+        "apps/linux_sim_shell/CMakeLists.txt",
+        "apps/linux_uconsole_gtk/CMakeLists.txt",
+    ]:
+        failures += check_tokens(
+            path,
+            [
+                "screen_host_adapter.cpp",
+                "screen_graph_bridge.cpp",
+            ],
+            "screen host adapter final shell source",
+        )
+
+    failures += check_tokens(
+        "apps/linux_sim_shell/CMakeLists.txt",
+        [
+            "compatibility_screen_factory",
+            "lvgl_screen_host_adapter",
+        ],
+        "LVGL screen factory smoke target",
+    )
+
+    forbidden_portable = [
+        "lvgl.h",
+        "gtk",
+        "apps/",
+        "apps\\",
+        "boards/",
+        "boards\\",
+        "platform/",
+        "platform\\",
+    ]
+    for path in [
+        "modules/ui_presentation/include/ui_presentation/screen/screen_route.h",
+        "modules/ui_presentation/include/ui_presentation/screen/screen_binding_registry.h",
+        "modules/ui_presentation/src/screen/screen_binding_registry.cpp",
+    ]:
+        text = read_text(path)
+        for token in forbidden_portable:
+            if token in text:
+                failures += fail(f"{path} contains forbidden portable screen token {token}")
+
+    for path in [
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/compatibility_screen_factory.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_host_adapter.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_screen_graph_bridge.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp",
+    ]:
+        text = read_text(path)
+        for token in [
+            "lvgl.h",
+            "gtk",
+            "apps/",
+            "apps\\",
+            "boards/",
+            "boards\\",
+            "platform/",
+            "platform\\",
+            "ChatService",
+            "MapRuntime",
+            "GpsRuntime",
+            "lv_obj",
+            "GtkWidget",
+        ]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden screen factory token {token}")
+
+    for path in [
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h",
+        "modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h",
+        "modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp",
+    ]:
+        text = read_text(path)
+        for token in [
+            "lvgl.h",
+            "GtkWidget",
+            "gtk_widget",
+            "activeUxPackId",
+            "findUxPackById",
+            "buildMenuForUxPack",
+            "apps/",
+            "boards/",
+            "platformio",
+        ]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden screen graph bridge token {token}")
+
+    return failures
+
+
+def check_forwarding_headers() -> int:
+    expected = {
+        "modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h":
+            "ui_chat_runtime/chat_page_runtime_event_pump.h",
+        "modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h":
+            "ui_chat_runtime/chat_ui_refresh_sink.h",
+        "modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h":
+            "ui_gps_runtime/gps_page_runtime_pump.h",
+        "modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h":
+            "ui_gps_runtime/gps_ui_refresh_sink.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_types.h":
+            "ui_map_runtime/map_tiles/map_tile_types.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h":
+            "ui_map_runtime/map_tiles/map_tile_resolver.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_source.h":
+            "ui_map_runtime/map_tiles/map_tile_source.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_cache.h":
+            "ui_map_runtime/map_tiles/map_tile_cache.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h":
+            "ui_map_runtime/map_tiles/map_tile_decoder_cache.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h":
+            "ui_map_runtime/map_tiles/map_tile_render_queue.h",
+        "modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h":
+            "ui_map_runtime/map_tiles/filesystem_map_tile_source.h",
+        "modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h":
+            "ui_map_runtime/map_overlay/map_overlay_projector.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h":
+            "ui_chat_runtime/chat_delivery_event_projection_adapter.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h":
+            "ui_chat_runtime/chat_delivery_action_port_adapter.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h":
+            "ui_key_verification_runtime/key_verification_session_adapter.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h":
+            "ui_key_verification_runtime/key_verification_presentation_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h":
+            "ui_key_verification_runtime/key_verification_action_sink.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h":
+            "ui_map_runtime/map_overlay_snapshot_source.h",
+        "modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h":
+            "ui_lvgl_ux_packs/common/team_position_picker_renderer.h",
+        "modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h":
+            "ui_lvgl_ux_packs/common/key_verification_modal_renderer.h",
+    }
+
+    failures = 0
+    for path, include_token in expected.items():
+        if not exists(path):
+            failures += fail(f"missing forwarding header: {path}")
+            continue
+        text = read_text(path)
+        if include_token not in text:
+            failures += fail(f"{path} does not forward to {include_token}")
+        if path in {
+            "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h",
+            "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h",
+            "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h",
+            "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h",
+            "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h",
+            "modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h",
+        }:
+            if "using Legacy" not in text or "[[deprecated" not in text:
+                failures += fail(f"{path} must be a deprecated alias forwarding header")
+            if "class " in text or "struct " in text:
+                failures += fail(f"{path} must not contain a class or struct implementation")
+            continue
+        if "class " in text or "struct " in text or "namespace " in text:
+            failures += fail(f"{path} must be a forwarding header only")
+
+    forbidden_sources = [
+        "modules/ui_shared/src/ui/screens/chat/chat_page_runtime_event_pump.cpp",
+        "modules/ui_shared/src/ui/screens/gps/gps_page_runtime_pump.cpp",
+        "modules/ui_shared/src/ui/map_tiles/map_tile_resolver.cpp",
+        "modules/ui_shared/src/ui/map_tiles/map_tile_render_queue.cpp",
+        "modules/ui_shared/src/ui/map_tiles/legacy_filesystem_map_tile_source.cpp",
+        "modules/ui_shared/src/ui/map_overlay/map_overlay_projector.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_chat_delivery_event_bridge.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_chat_delivery_action_bridge.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_source.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_key_verification_action_sink.cpp",
+        "modules/ui_shared/src/ui/presentation_sources/legacy_map_overlay_source.cpp",
+        "modules/ui_shared/src/ui/screens/chat/team_position_picker_renderer.cpp",
+        "modules/ui_shared/src/ui/screens/chat/key_verification_modal_renderer.cpp",
+    ]
+    for path in forbidden_sources:
+        if exists(path):
+            failures += fail(f"old implementation path still exists: {path}")
+
+    return failures
+
+
+def check_authoritative_include_paths() -> int:
+    old_include_replacements = {
+        "ui/screens/chat/chat_page_runtime_event_pump.h":
+            "ui_chat_runtime/chat_page_runtime_event_pump.h",
+        "ui/screens/chat/chat_ui_refresh_sink.h":
+            "ui_chat_runtime/chat_ui_refresh_sink.h",
+        "ui/screens/gps/gps_page_runtime_pump.h":
+            "ui_gps_runtime/gps_page_runtime_pump.h",
+        "ui/screens/gps/gps_ui_refresh_sink.h":
+            "ui_gps_runtime/gps_ui_refresh_sink.h",
+        "ui/map_tiles/map_tile_types.h":
+            "ui_map_runtime/map_tiles/map_tile_types.h",
+        "ui/map_tiles/map_tile_resolver.h":
+            "ui_map_runtime/map_tiles/map_tile_resolver.h",
+        "ui/map_tiles/map_tile_source.h":
+            "ui_map_runtime/map_tiles/map_tile_source.h",
+        "ui/map_tiles/map_tile_cache.h":
+            "ui_map_runtime/map_tiles/map_tile_cache.h",
+        "ui/map_tiles/map_tile_decoder_cache.h":
+            "ui_map_runtime/map_tiles/map_tile_decoder_cache.h",
+        "ui/map_tiles/map_tile_render_queue.h":
+            "ui_map_runtime/map_tiles/map_tile_render_queue.h",
+        "ui/map_tiles/legacy_filesystem_map_tile_source.h":
+            "ui_map_runtime/map_tiles/filesystem_map_tile_source.h",
+        "ui/map_overlay/map_overlay_projector.h":
+            "ui_map_runtime/map_overlay/map_overlay_projector.h",
+        "ui/presentation_sources/legacy_chat_delivery_event_bridge.h":
+            "ui_chat_runtime/chat_delivery_event_projection_adapter.h",
+        "ui/presentation_sources/legacy_chat_delivery_action_bridge.h":
+            "ui_chat_runtime/chat_delivery_action_port_adapter.h",
+        "ui/presentation_sources/legacy_key_verification_session.h":
+            "ui_key_verification_runtime/key_verification_session_adapter.h",
+        "ui/presentation_sources/legacy_key_verification_source.h":
+            "ui_key_verification_runtime/key_verification_presentation_source.h",
+        "ui/presentation_sources/legacy_key_verification_action_sink.h":
+            "ui_key_verification_runtime/key_verification_action_sink.h",
+        "ui/presentation_sources/legacy_map_overlay_source.h":
+            "ui_map_runtime/map_overlay_snapshot_source.h",
+        "ui/screens/chat/team_position_picker_renderer.h":
+            "ui_lvgl_ux_packs/common/team_position_picker_renderer.h",
+        "ui/screens/chat/key_verification_modal_renderer.h":
+            "ui_lvgl_ux_packs/common/key_verification_modal_renderer.h",
+    }
+
+    forwarding_headers = {
+        "modules/ui_shared/include/ui/screens/chat/chat_page_runtime_event_pump.h",
+        "modules/ui_shared/include/ui/screens/chat/chat_ui_refresh_sink.h",
+        "modules/ui_shared/include/ui/screens/gps/gps_page_runtime_pump.h",
+        "modules/ui_shared/include/ui/screens/gps/gps_ui_refresh_sink.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_types.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_resolver.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_source.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_cache.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_decoder_cache.h",
+        "modules/ui_shared/include/ui/map_tiles/map_tile_render_queue.h",
+        "modules/ui_shared/include/ui/map_tiles/legacy_filesystem_map_tile_source.h",
+        "modules/ui_shared/include/ui/map_overlay/map_overlay_projector.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_event_bridge.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_chat_delivery_action_bridge.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h",
+        "modules/ui_shared/include/ui/screens/chat/team_position_picker_renderer.h",
+        "modules/ui_shared/include/ui/screens/chat/key_verification_modal_renderer.h",
+    }
+
+    failures = 0
+    for root_name in ["apps", "modules", "platform", "boards"]:
+        for path in iter_code_files(ROOT / root_name):
+            rel = path.relative_to(ROOT).as_posix()
+            if rel in forwarding_headers:
+                continue
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            if "PHASE8_COMPATIBILITY_INCLUDE_TEST" in text:
+                continue
+            for line in text.splitlines():
+                stripped = line.strip()
+                if not stripped.startswith("#include"):
+                    continue
+                for old_include, replacement in old_include_replacements.items():
+                    if f'"{old_include}"' in stripped or f"<{old_include}>" in stripped:
+                        failures += fail(
+                            f"{rel} includes compatibility path {old_include}; use {replacement}"
+                        )
+
+    return failures
+
+
+def check_build_manifest_authority() -> int:
+    failures = 0
+    common_include_tokens = [
+        "modules/ui_chat_runtime/include",
+        "modules/ui_map_runtime/include",
+        "modules/ui_gps_runtime/include",
+        "modules/ui_legacy_adapters/include",
+        "modules/ui_lvgl_core/include",
+        "modules/ui_lvgl_ux_packs/include",
+    ]
+
+    for manifest in [
+        "platformio.ini",
+        "modules/ui_shared/library.json",
+        "legacy/app_implementations/esp_pio/library.json",
+        "legacy/app_implementations/gat562_mesh_evb_pro/library.json",
+    ]:
+        failures += check_tokens(manifest, common_include_tokens, "new module include authority")
+
+    failures += check_tokens(
+        "legacy/app_implementations/esp_pio/library.json",
+        [
+            '"name":  "ui_chat_runtime"',
+            '"name":  "ui_map_runtime"',
+            '"name":  "ui_gps_runtime"',
+            '"name":  "ui_legacy_adapters"',
+            '"name":  "ui_lvgl_core"',
+            '"name":  "ui_lvgl_ux_packs"',
+        ],
+        "ESP PIO new module dependency",
+    )
+
+    failures += check_tokens(
+        "legacy/app_implementations/esp_idf/CMakeLists.txt",
+        [
+            "modules/ui_chat_runtime/src/chat_page_runtime_event_pump.cpp",
+            "modules/ui_map_runtime/src/map_tiles/filesystem_map_tile_source.cpp",
+            "modules/ui_map_runtime/src/map_tiles/map_tile_resolver.cpp",
+            "modules/ui_map_runtime/src/map_overlay/map_overlay_projector.cpp",
+            "modules/ui_gps_runtime/src/gps_page_runtime_pump.cpp",
+            "modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp",
+            "modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp",
+            "modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp",
+            "modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp",
+            "modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp",
+            "modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp",
+            "modules/ui_lvgl_core/include",
+            "modules/ui_presentation/src/*/*.cpp",
+            "modules/ui_lvgl_ux_packs/src/common/team_position_picker_renderer.cpp",
+            "modules/ui_lvgl_ux_packs/src/common/key_verification_modal_renderer.cpp",
+            "modules/ui_lvgl_ux_packs/src/ux/screen_registry.cpp",
+            "modules/ui_lvgl_ux_packs/src/ux/input_binding_set.cpp",
+            "modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp",
+            "modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp",
+            "modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp",
+            "modules/ui_lvgl_ux_packs/src/ux/ux_pack_registry.cpp",
+            "modules/ui_lvgl_ux_packs/src/runtime/compatibility_screen_factory.cpp",
+            "modules/ui_lvgl_ux_packs/src/runtime/lvgl_menu_runtime_adapter.cpp",
+            "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_host_adapter.cpp",
+            "modules/ui_lvgl_ux_packs/src/runtime/lvgl_screen_graph_bridge.cpp",
+            "modules/ui_lvgl_ux_packs/src/packs/compatibility_ux_pack.cpp",
+            "modules/ui_lvgl_ux_packs/src/packs/uconsole_desktop_ux_pack.cpp",
+            "modules/ui_lvgl_ux_packs/src/packs/tiny_node_status_ux_pack.cpp",
+            "modules/ui_lvgl_ux_packs/src/packs/simulator_full_ux_pack.cpp",
+        ],
+        "ESP-IDF new module authority",
+    )
+
+    failures += check_tokens(
+        "cmake/TrailMateLinuxSources.cmake",
+        [
+            "TRAIL_MATE_UI_CHAT_RUNTIME_INCLUDE_ROOT",
+            "TRAIL_MATE_UI_CHAT_RUNTIME_SRC_ROOT",
+            "TRAIL_MATE_UI_MAP_RUNTIME_INCLUDE_ROOT",
+            "TRAIL_MATE_UI_MAP_RUNTIME_SRC_ROOT",
+            "TRAIL_MATE_UI_GPS_RUNTIME_INCLUDE_ROOT",
+            "TRAIL_MATE_UI_GPS_RUNTIME_SRC_ROOT",
+            "TRAIL_MATE_UI_KEY_VERIFICATION_RUNTIME_INCLUDE_ROOT",
+            "TRAIL_MATE_UI_KEY_VERIFICATION_RUNTIME_SRC_ROOT",
+            "TRAIL_MATE_UI_LEGACY_ADAPTERS_INCLUDE_ROOT",
+            "TRAIL_MATE_UI_LEGACY_ADAPTERS_SRC_ROOT",
+            "TRAIL_MATE_UI_LVGL_CORE_INCLUDE_ROOT",
+            "TRAIL_MATE_UI_LVGL_UX_PACKS_INCLUDE_ROOT",
+            "TRAIL_MATE_UI_LVGL_UX_PACKS_SRC_ROOT",
+            "chat_page_runtime_event_pump.cpp",
+            "chat_delivery_action_port_adapter.cpp",
+            "chat_delivery_event_projection_adapter.cpp",
+            "key_verification_presentation_source.cpp",
+            "key_verification_action_sink.cpp",
+            "filesystem_map_tile_source.cpp",
+            "map_overlay_projection_adapter.cpp",
+            "map_overlay_snapshot_source.cpp",
+            "gps_page_runtime_pump.cpp",
+            "menu_model.cpp",
+            "screen_binding_registry.cpp",
+            "ux_menu_model.cpp",
+            "ux_screen_menu_adapter.cpp",
+            "ux_menu_provider.cpp",
+            "ux_pack_registry.cpp",
+            "compatibility_screen_factory.cpp",
+            "lvgl_menu_runtime_adapter.cpp",
+            "lvgl_screen_host_adapter.cpp",
+            "lvgl_screen_graph_bridge.cpp",
+            "compatibility_ux_pack.cpp",
+            "uconsole_desktop_ux_pack.cpp",
+            "tiny_node_status_ux_pack.cpp",
+            "simulator_full_ux_pack.cpp",
+            "team_position_picker_renderer.cpp",
+            "key_verification_modal_renderer.cpp",
+        ],
+        "Linux CMake new module authority",
+    )
+
+    return failures
+
+
+def check_runtime_module_boundaries() -> int:
+    failures = 0
+    forbidden_by_root = {
+        "modules/ui_chat_runtime": [
+            "lvgl.h",
+            "apps/",
+            "apps\\",
+            "builds/",
+            "boards/",
+            "boards\\",
+        ],
+        "modules/ui_gps_runtime": [
+            "lvgl.h",
+            "apps/",
+            "apps\\",
+            "builds/",
+            "boards/",
+            "boards\\",
+        ],
+        "modules/ui_map_runtime": [
+            "lvgl.h",
+            "apps/",
+            "apps\\",
+            "builds/",
+            "boards/",
+            "boards\\",
+        ],
+        "modules/ui_key_verification_runtime": [
+            "lvgl.h",
+            "GtkWidget",
+            "lv_obj_t",
+            "apps/",
+            "apps\\",
+            "builds/",
+            "boards/",
+            "boards\\",
+        ],
+        "modules/ui_legacy_adapters": [
+            "apps/",
+            "apps\\",
+            "builds/",
+            "boards/",
+            "boards\\",
+        ],
+        "modules/ui_lvgl_ux_packs": [
+            "apps/",
+            "apps\\",
+            "builds/",
+            "boards/",
+            "boards\\",
+            "platform/",
+            "platform\\",
+        ],
+    }
+
+    for root_name, forbidden_tokens in forbidden_by_root.items():
+        for path in iter_code_files(ROOT / root_name):
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in forbidden_tokens:
+                if token in text:
+                    failures += fail(
+                        f"{path.relative_to(ROOT)} contains forbidden boundary token {token}"
+                    )
+
+    for path in [
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_model.h",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_menu_model.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_screen_menu_adapter.h",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_screen_menu_adapter.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/ux/ux_menu_provider.h",
+        "modules/ui_lvgl_ux_packs/src/ux/ux_menu_provider.cpp",
+    ]:
+        text = read_text(path)
+        for token in ["lvgl.h", "apps/", "apps\\", "boards/", "boards\\", "platform/", "platform\\"]:
+            if token in text:
+                failures += fail(f"{path} contains forbidden UX menu binding token {token}")
+
+    filesystem_header = "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h"
+    if exists(filesystem_header):
+        text = read_text(filesystem_header)
+        if "class FilesystemMapTileSource" not in text:
+            failures += fail("FilesystemMapTileSource class is missing")
+        if "using LegacyFilesystemMapTileSource" not in text:
+            failures += fail("LegacyFilesystemMapTileSource compatibility alias is missing")
+        if "[[deprecated" not in text:
+            failures += fail("LegacyFilesystemMapTileSource alias must be deprecated")
+        if "FilesystemMapTileSource;" not in text:
+            failures += fail("LegacyFilesystemMapTileSource must alias FilesystemMapTileSource")
+
+    for path in iter_code_files(ROOT / "modules/ui_map_runtime"):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        if "LegacyFilesystemMapTileSource" in text and path.as_posix().endswith(
+            "filesystem_map_tile_source.h"
+        ):
+            continue
+        if "LegacyFilesystemMapTileSource" in text:
+            failures += fail(
+                f"{path.relative_to(ROOT)} uses deprecated LegacyFilesystemMapTileSource"
+            )
+
+    ui_presentation_root = ROOT / "modules/ui_presentation"
+    for path in iter_code_files(ui_presentation_root):
+        text = path.read_text(encoding="utf-8", errors="ignore")
+        for token in ["lvgl.h", "platform/", "platform\\", "filesystem", "FILE*"]:
+            if token in text:
+                failures += fail(
+                    f"{path.relative_to(ROOT)} contains forbidden portable presentation token {token}"
+                )
+
+    return failures
+
+
+def check_deprecated_alias_usage() -> int:
+    allowed = {
+        "modules/ui_map_runtime/include/ui_map_runtime/map_tiles/filesystem_map_tile_source.h",
+    }
+
+    failures = 0
+    for root_name in ["apps", "modules", "platform", "boards"]:
+        for path in iter_code_files(ROOT / root_name):
+            rel = path.relative_to(ROOT).as_posix()
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            if "LegacyFilesystemMapTileSource" not in text:
+                continue
+            if rel in allowed:
+                continue
+            if "PHASE8_LEGACY_ALIAS_COMPATIBILITY_TEST" in text:
+                continue
+            failures += fail(
+                f"{rel} uses deprecated LegacyFilesystemMapTileSource alias; use FilesystemMapTileSource"
+            )
+
+    return failures
+
+
+def check_transitional_app_markers() -> int:
+    failures = 0
+    marker_path = "docs/audits/TRANSITIONAL_BUILD_ENTRYPOINTS.md"
+    marker = read_text(marker_path) if exists(marker_path) else ""
+
+    for path in [
+        "legacy/app_implementations/esp_idf",
+        "legacy/app_implementations/esp_pio",
+        "legacy/app_implementations/linux_sim",
+        "legacy/app_implementations/linux_uconsole",
+        "legacy/app_implementations/gat562_mesh_evb_pro",
+    ]:
+        if exists(path) and path not in marker:
+            failures += fail(f"{path} exists but is not marked transitional")
+
+    apps_root = ROOT / "apps"
+    if not apps_root.exists():
+        return failures
+
+    allowed = {
+        "README.md",
+        "esp32_lvgl",
+        "nrf52_node",
+        "linux_uconsole_gtk",
+        "linux_sim_shell",
+    }
+    for child in apps_root.iterdir():
+        if child.name not in allowed:
+            failures += fail(
+                f"apps/{child.name} is not an allowed final app shell entry"
+            )
+
+    for legacy_name in [
+        "esp_idf",
+        "esp_pio",
+        "linux_uconsole",
+        "linux_sim",
+        "linux_rpi",
+        "linux_unoq",
+        "gat562_mesh_evb_pro",
+    ]:
+        if (apps_root / legacy_name).exists():
+            failures += fail(
+                f"apps/{legacy_name} must not contain a legacy implementation root"
+            )
+
+    return failures
+
+
+def main() -> int:
+    if not exists("legacy"):
+        return check_post_root_legacy_removed()
+
+    failures = 0
+    failures += check_required_files()
+    failures += check_specification_language()
+    failures += check_audit_language()
+    failures += check_app_shell_language()
+    failures += check_ux_profile_language()
+    failures += check_build_entrypoint_language()
+    failures += check_executable_layout_convergence()
+    failures += check_ux_pack_runtime_binding()
+    failures += check_composition_root_binding()
+    failures += check_ui_runtime_consumption_boundary()
+    failures += check_screen_factory_host_binding()
+    failures += check_forwarding_headers()
+    failures += check_authoritative_include_paths()
+    failures += check_build_manifest_authority()
+    failures += check_runtime_module_boundaries()
+    failures += check_deprecated_alias_usage()
+    failures += check_transitional_app_markers()
+
+    if failures:
+        return 1
+
+    print("[phase8-layout-ready] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/tools/architecture/check_phase9_final_ready.py b/tools/architecture/check_phase9_final_ready.py
new file mode 100644
index 00000000..333fba20
--- /dev/null
+++ b/tools/architecture/check_phase9_final_ready.py
@@ -0,0 +1,237 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_absent(rel: str, failures: list[str]) -> None:
+    if (ROOT / rel).exists():
+        failures.append(f"old implementation should remain absent: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def require_any_token(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    if not any(token in text for token in tokens):
+        failures.append(f"{rel} missing one of: {', '.join(tokens)}")
+
+
+def iter_code_files(root: Path):
+    if not root.exists():
+        return
+    for path in root.rglob("*"):
+        if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+            yield path
+
+
+def is_allowed_alias_path(path: Path) -> bool:
+    rel = path.relative_to(ROOT).as_posix()
+    name = path.name
+    allowed_prefixes = [
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/",
+        "modules/ui_shared/include/ui/presentation_sources/",
+    ]
+    if any(rel.startswith(prefix) for prefix in allowed_prefixes):
+        return True
+    return (
+        name.endswith("_legacy_alias_test.cpp")
+        or name.endswith("_legacy_alias.cpp")
+        or name.endswith("_compatibility_test.cpp")
+    )
+
+
+def check_no_main_code_includes_burned_down_legacy_headers(failures: list[str]) -> None:
+    forbidden_includes = [
+        '#include "ui_legacy_adapters/legacy_chat_delivery_action_bridge.h"',
+        '#include "ui_legacy_adapters/legacy_chat_delivery_event_bridge.h"',
+        '#include "ui_legacy_adapters/legacy_key_verification_source.h"',
+        '#include "ui_legacy_adapters/legacy_key_verification_action_sink.h"',
+        '#include "ui_legacy_adapters/legacy_key_verification_session.h"',
+        '#include "ui_legacy_adapters/legacy_map_overlay_source.h"',
+    ]
+    for root_name in ["apps", "legacy/app_implementations", "modules", "platform", "boards"]:
+        for path in iter_code_files(ROOT / root_name):
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in forbidden_includes:
+                if token in text and not is_allowed_alias_path(path):
+                    failures.append(
+                        f"{path.relative_to(ROOT).as_posix()} includes burned-down legacy header: {token}"
+                    )
+
+
+def run_checker(rel: str, failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing checker: {rel}")
+        return
+
+    result = subprocess.run(
+        [sys.executable, str(path)],
+        cwd=ROOT,
+        text=True,
+        capture_output=True,
+    )
+    if result.returncode != 0:
+        output = (result.stdout + result.stderr).strip()
+        failures.append(f"{rel} failed:\n{output}")
+
+
+def check_final_report(failures: list[str]) -> None:
+    require_tokens(
+        "docs/audits/PHASE9_FINAL_READINESS_REPORT.md",
+        [
+            "Runtime Adoption",
+            "ASCII / LinuxSim",
+            "ASCII presenter",
+            "GTK / uConsole",
+            "GTK presenter",
+            "LVGL presenter",
+            "Legacy Burn-down",
+            "ChatDelivery",
+            "KeyVerification",
+            "MapOverlay",
+            "Remaining Fallback",
+            "LinuxSim hardcoded runtime routing",
+            "GTK hardcoded page registry",
+            "LVGL hardcoded menu/page creation",
+            "Phase 10 Entry Recommendation",
+            "LinuxSim / ASCII primary path",
+            "AsciiRuntimeEntryAdoption as primary source",
+            "Phase 10 makes one adopted path the primary runtime path",
+        ],
+        failures,
+    )
+
+
+def check_cross_doc_consistency(failures: list[str]) -> None:
+    docs = [
+        "docs/audits/LEGACY_BURNDOWN_REGISTER.md",
+        "docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md",
+        "docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md",
+        "docs/audits/PHASE9_FINAL_READINESS_REPORT.md",
+    ]
+    stable_owner_tokens = [
+        "ChatDeliveryActionPortAdapter",
+        "ChatDeliveryEventProjectionAdapter",
+        "KeyVerificationPresentationSource",
+        "KeyVerificationActionSink",
+        "KeyVerificationSessionAdapter",
+        "MapOverlaySnapshotSource",
+        "MapOverlayProjectionAdapter",
+    ]
+    for rel in docs:
+        require_tokens(rel, stable_owner_tokens, failures)
+        require_any_token(
+            rel,
+            ["main runtime callers removed", "no main runtime callers"],
+            failures,
+        )
+        require_any_token(
+            rel,
+            ["deprecated aliases", "deprecated alias", "deprecated aliases only"],
+            failures,
+        )
+
+    require_tokens(
+        "docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md",
+        [
+            "LinuxSim hardcoded runtime routing",
+            "GTK hardcoded page registry",
+            "LVGL hardcoded menu/page creation",
+            "contained fallback",
+            "Exit condition",
+            "Phase 10 first cut makes `AsciiRuntimeEntryAdoption as primary source`",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/LEGACY_BURNDOWN_REGISTER.md",
+        [
+            "Phase 9.6 Final Readiness Alignment",
+            "The remaining Phase 10-facing UI fallbacks are not legacy adapter burn-down items",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md",
+        [
+            "Phase 9.6 Final Readiness Alignment",
+            "The remaining LinuxSim, GTK, and LVGL hardcoded runtime paths are not reported as burned down",
+        ],
+        failures,
+    )
+
+
+def check_required_files(failures: list[str]) -> None:
+    for rel in [
+        "tools/architecture/check_phase9_runtime_adoption_ready.py",
+        "tools/architecture/check_phase9_legacy_burndown_ready.py",
+        "docs/audits/PHASE9_FINAL_READINESS_REPORT.md",
+        "docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md",
+        "docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md",
+        "docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md",
+        "docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md",
+        "docs/audits/LEGACY_BURNDOWN_REGISTER.md",
+    ]:
+        require_file(rel, failures)
+
+    for rel in [
+        "modules/ui_legacy_adapters/src/legacy_chat_delivery_action_bridge.cpp",
+        "modules/ui_legacy_adapters/src/legacy_chat_delivery_event_bridge.cpp",
+        "modules/ui_legacy_adapters/src/legacy_key_verification_source.cpp",
+        "modules/ui_legacy_adapters/src/legacy_key_verification_action_sink.cpp",
+        "modules/ui_legacy_adapters/src/legacy_key_verification_session.cpp",
+        "modules/ui_legacy_adapters/src/legacy_map_overlay_source.cpp",
+    ]:
+        require_absent(rel, failures)
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    check_required_files(failures)
+    run_checker("tools/architecture/check_phase9_runtime_adoption_ready.py", failures)
+    run_checker("tools/architecture/check_phase9_legacy_burndown_ready.py", failures)
+    check_final_report(failures)
+    check_cross_doc_consistency(failures)
+    check_no_main_code_includes_burned_down_legacy_headers(failures)
+
+    if failures:
+        for failure in failures:
+            print(f"[phase9-final-ready] {failure}")
+        return 1
+
+    print("[phase9-final-ready] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_phase9_legacy_burndown_ready.py b/tools/architecture/check_phase9_legacy_burndown_ready.py
new file mode 100644
index 00000000..77fbf949
--- /dev/null
+++ b/tools/architecture/check_phase9_legacy_burndown_ready.py
@@ -0,0 +1,580 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def check_post_root_legacy_removed() -> int:
+    result = subprocess.run(
+        [sys.executable, str(ROOT / "tools/architecture/check_no_root_legacy_ready.py")],
+        cwd=ROOT,
+        text=True,
+        capture_output=True,
+    )
+    if result.returncode != 0:
+        output = (result.stdout + result.stderr).strip()
+        print(f"[phase9-legacy-burndown] {output}")
+        return 1
+    print("[phase9-legacy-burndown] OK (root legacy removed)")
+    return 0
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_absent(rel: str, failures: list[str]) -> None:
+    if (ROOT / rel).exists():
+        failures.append(f"old legacy implementation must be absent: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    if not (ROOT / rel).exists():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def forbid_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    if not (ROOT / rel).exists():
+        return
+    text = read(rel)
+    for token in tokens:
+        if token in text:
+            failures.append(f"{rel} contains forbidden token: {token}")
+
+
+def iter_code_files(root: Path):
+    if not root.exists():
+        return
+    for path in root.rglob("*"):
+        if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+            yield path
+
+
+def is_allowed_legacy_chat_include(path: Path) -> bool:
+    rel = path.relative_to(ROOT).as_posix()
+    name = path.name
+    allowed = {
+        "modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp",
+    }
+    if rel in allowed:
+        return True
+    if rel in {
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h",
+    }:
+        return True
+    return (
+        name.endswith("_legacy_alias_test.cpp")
+        or name.endswith("_legacy_alias.cpp")
+        or name.endswith("_compatibility_test.cpp")
+    )
+
+
+def is_allowed_legacy_key_map_include(path: Path) -> bool:
+    rel = path.relative_to(ROOT).as_posix()
+    name = path.name
+    allowed = {
+        "modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h",
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h",
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h",
+    }
+    if rel in allowed:
+        return True
+    return (
+        name.endswith("_legacy_alias_test.cpp")
+        or name.endswith("_legacy_alias.cpp")
+        or name.endswith("_compatibility_test.cpp")
+    )
+
+
+def check_main_code_no_legacy_chat_includes(failures: list[str]) -> None:
+    forbidden_includes = [
+        '#include "ui_legacy_adapters/legacy_chat_delivery_action_bridge.h"',
+        '#include "ui_legacy_adapters/legacy_chat_delivery_event_bridge.h"',
+    ]
+    for root_name in ["apps", "legacy/app_implementations", "modules", "platform", "boards"]:
+        for path in iter_code_files(ROOT / root_name):
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in forbidden_includes:
+                if token in text and not is_allowed_legacy_chat_include(path):
+                    failures.append(
+                        f"{path.relative_to(ROOT).as_posix()} includes deprecated Chat delivery legacy header: {token}"
+                    )
+
+
+def check_main_code_no_legacy_key_map_includes(failures: list[str]) -> None:
+    forbidden_includes = [
+        '#include "ui_legacy_adapters/legacy_key_verification_source.h"',
+        '#include "ui_legacy_adapters/legacy_key_verification_action_sink.h"',
+        '#include "ui_legacy_adapters/legacy_key_verification_session.h"',
+        '#include "ui_legacy_adapters/legacy_map_overlay_source.h"',
+    ]
+    for root_name in ["apps", "legacy/app_implementations", "modules", "platform", "boards"]:
+        for path in iter_code_files(ROOT / root_name):
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in forbidden_includes:
+                if token in text and not is_allowed_legacy_key_map_include(path):
+                    failures.append(
+                        f"{path.relative_to(ROOT).as_posix()} includes deprecated KeyVerification/MapOverlay legacy header: {token}"
+                    )
+
+
+def check_legacy_headers_are_aliases(failures: list[str]) -> None:
+    headers = {
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_action_bridge.h": [
+            "ui_chat_runtime/chat_delivery_action_port_adapter.h",
+            "using LegacyChatDeliveryActionBridge",
+            "ChatDeliveryActionPortAdapter",
+            "[[deprecated",
+        ],
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_chat_delivery_event_bridge.h": [
+            "ui_chat_runtime/chat_delivery_event_projection_adapter.h",
+            "using LegacyChatDeliveryEventBridge",
+            "ChatDeliveryEventProjectionAdapter",
+            "[[deprecated",
+        ],
+    }
+    for rel, tokens in headers.items():
+        require_tokens(rel, tokens, failures)
+        forbid_tokens(
+            rel,
+            [
+                "class LegacyChatDelivery",
+                "struct LegacyChatDelivery",
+                "handleMessageAction(",
+                "onChatSendResult(",
+                "onAckTimeout(",
+                "ChatService&",
+                "IChatDeliveryActionSink&",
+            ],
+            failures,
+        )
+
+
+def check_key_map_legacy_headers_are_aliases(failures: list[str]) -> None:
+    headers = {
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_session.h": [
+            "ui_key_verification_runtime/key_verification_session_adapter.h",
+            "using LegacyKeyVerificationSession",
+            "KeyVerificationSessionAdapter",
+            "[[deprecated",
+        ],
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_source.h": [
+            "ui_key_verification_runtime/key_verification_presentation_source.h",
+            "using LegacyKeyVerificationSource",
+            "KeyVerificationPresentationSource",
+            "[[deprecated",
+        ],
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_key_verification_action_sink.h": [
+            "ui_key_verification_runtime/key_verification_action_sink.h",
+            "using LegacyKeyVerificationActionSink",
+            "KeyVerificationActionSink",
+            "[[deprecated",
+        ],
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/legacy_map_overlay_source.h": [
+            "ui_map_runtime/map_overlay_snapshot_source.h",
+            "using LegacyMapOverlaySource",
+            "MapOverlaySnapshotSource",
+            "[[deprecated",
+        ],
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_session.h": [
+            "ui_key_verification_runtime/key_verification_session_adapter.h",
+            "using LegacyKeyVerificationSession",
+            "KeyVerificationSessionAdapter",
+            "[[deprecated",
+        ],
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_source.h": [
+            "ui_key_verification_runtime/key_verification_presentation_source.h",
+            "using LegacyKeyVerificationSource",
+            "KeyVerificationPresentationSource",
+            "[[deprecated",
+        ],
+        "modules/ui_shared/include/ui/presentation_sources/legacy_key_verification_action_sink.h": [
+            "ui_key_verification_runtime/key_verification_action_sink.h",
+            "using LegacyKeyVerificationActionSink",
+            "KeyVerificationActionSink",
+            "[[deprecated",
+        ],
+        "modules/ui_shared/include/ui/presentation_sources/legacy_map_overlay_source.h": [
+            "ui_map_runtime/map_overlay_snapshot_source.h",
+            "using LegacyMapOverlaySource",
+            "MapOverlaySnapshotSource",
+            "[[deprecated",
+        ],
+    }
+    for rel, tokens in headers.items():
+        require_tokens(rel, tokens, failures)
+        forbid_tokens(
+            rel,
+            [
+                "class LegacyKeyVerification",
+                "struct LegacyKeyVerification",
+                "class LegacyMapOverlaySource",
+                "struct LegacyMapOverlaySource",
+                "buildKeyVerificationSnapshot(",
+                "buildMapOverlaySnapshot(",
+                "submitKeyVerificationNumber(",
+                "setNodeKeyManuallyVerified(",
+                "projectCurrentPosition(",
+            ],
+            failures,
+        )
+
+
+def check_build_lists(failures: list[str]) -> None:
+    old_sources = [
+        "legacy_chat_delivery_action_bridge.cpp",
+        "legacy_chat_delivery_event_bridge.cpp",
+        "test_legacy_chat_delivery_action_bridge.cpp",
+        "test_legacy_chat_delivery_event_bridge.cpp",
+        "legacy_key_verification_source.cpp",
+        "legacy_key_verification_action_sink.cpp",
+        "legacy_key_verification_session.cpp",
+        "legacy_map_overlay_source.cpp",
+        "test_legacy_key_verification_adapters.cpp",
+        "test_legacy_map_overlay_source.cpp",
+    ]
+    checked = [
+        "cmake/TrailMateLinuxSources.cmake",
+        "apps/linux_sim_shell/CMakeLists.txt",
+        "apps/linux_uconsole_gtk/CMakeLists.txt",
+        "legacy/app_implementations/linux_sim/CMakeLists.txt",
+        "legacy/app_implementations/linux_uconsole/CMakeLists.txt",
+        "legacy/app_implementations/esp_idf/CMakeLists.txt",
+    ]
+    for rel in checked:
+        if not (ROOT / rel).exists():
+            continue
+        text = read(rel)
+        for token in old_sources:
+            if token in text:
+                failures.append(f"{rel} still references old legacy source/test: {token}")
+
+    for rel in [
+        "cmake/TrailMateLinuxSources.cmake",
+        "legacy/app_implementations/esp_idf/CMakeLists.txt",
+    ]:
+        require_tokens(
+            rel,
+            [
+                "chat_delivery_action_port_adapter.cpp",
+                "chat_delivery_event_projection_adapter.cpp",
+            ],
+            failures,
+        )
+
+    for rel in [
+        "cmake/TrailMateLinuxSources.cmake",
+        "legacy/app_implementations/esp_idf/CMakeLists.txt",
+    ]:
+        require_tokens(
+            rel,
+            [
+                "key_verification_action_sink.cpp",
+                "key_verification_presentation_source.cpp",
+                "map_overlay_projection_adapter.cpp",
+                "map_overlay_snapshot_source.cpp",
+            ],
+            failures,
+        )
+
+
+def main() -> int:
+    if not (ROOT / "legacy").exists():
+        return check_post_root_legacy_removed()
+
+    failures: list[str] = []
+
+    for rel in [
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h",
+        "modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h",
+        "modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp",
+        "modules/ui_chat_runtime/tests/test_chat_delivery_action_port_adapter.cpp",
+        "modules/ui_chat_runtime/tests/test_chat_delivery_event_projection_adapter.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge_legacy_alias.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge_legacy_alias.cpp",
+        "modules/ui_key_verification_runtime/README.md",
+        "modules/ui_key_verification_runtime/library.json",
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h",
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h",
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h",
+        "modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp",
+        "modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp",
+        "modules/ui_key_verification_runtime/tests/test_key_verification_runtime_adapters.cpp",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h",
+        "modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp",
+        "modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp",
+        "modules/ui_map_runtime/tests/test_map_overlay_snapshot_source.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters_legacy_alias.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source_legacy_alias.cpp",
+        "docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md",
+        "docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md",
+        "docs/audits/LEGACY_BURNDOWN_REGISTER.md",
+        "docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md",
+        "docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md",
+    ]:
+        require_file(rel, failures)
+
+    for rel in [
+        "modules/ui_legacy_adapters/src/legacy_chat_delivery_action_bridge.cpp",
+        "modules/ui_legacy_adapters/src/legacy_chat_delivery_event_bridge.cpp",
+        "modules/ui_legacy_adapters/src/legacy_key_verification_source.cpp",
+        "modules/ui_legacy_adapters/src/legacy_key_verification_action_sink.cpp",
+        "modules/ui_legacy_adapters/src/legacy_key_verification_session.cpp",
+        "modules/ui_legacy_adapters/src/legacy_map_overlay_source.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_action_bridge.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_chat_delivery_event_bridge.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_key_verification_adapters.cpp",
+        "modules/ui_legacy_adapters/tests/test_legacy_map_overlay_source.cpp",
+    ]:
+        require_absent(rel, failures)
+
+    require_tokens(
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h",
+        [
+            "IChatDeliveryActionPort",
+            "ChatDeliveryActionRequest",
+            "ChatDeliveryActionResult",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h",
+        [
+            "IChatDeliveryEventPort",
+            "ChatDeliveryEvent",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h",
+        [
+            "class ChatDeliveryActionPortAdapter",
+            "IChatDeliveryActionPort&",
+            "handleMessageAction",
+            "toDeliveryRef",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h",
+        [
+            "class ChatDeliveryEventProjectionAdapter",
+            "IChatDeliveryEventPort&",
+            "onChatSendResult",
+            "onAckTimeout",
+        ],
+        failures,
+    )
+    for rel in [
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_port.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_action_port_adapter.h",
+        "modules/ui_chat_runtime/include/ui_chat_runtime/chat_delivery_event_projection_adapter.h",
+        "modules/ui_chat_runtime/src/chat_delivery_action_port_adapter.cpp",
+        "modules/ui_chat_runtime/src/chat_delivery_event_projection_adapter.cpp",
+    ]:
+        forbid_tokens(
+            rel,
+            [
+                "LegacyChatDeliveryActionBridge",
+                "LegacyChatDeliveryEventBridge",
+                "ui_legacy_adapters/legacy_chat_delivery_action_bridge.h",
+                "ui_legacy_adapters/legacy_chat_delivery_event_bridge.h",
+            ],
+            failures,
+        )
+
+    require_tokens(
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h",
+        [
+            "struct KeyVerificationSessionAdapter",
+            "VerificationProtocol",
+            "VerificationState",
+            "VerificationPromptKind",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h",
+        [
+            "class KeyVerificationPresentationSource",
+            "IKeyVerificationPresentationSource",
+            "buildKeyVerificationSnapshot",
+            "onNumberRequest",
+            "onFinal",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h",
+        [
+            "class KeyVerificationActionSink",
+            "IKeyVerificationActionSink",
+            "accept",
+            "submitNumber",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h",
+        [
+            "class MapOverlayProjectionAdapter",
+            "IMapOverlayGpsSource",
+            "IMapOverlayTeamSource",
+            "project",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h",
+        [
+            "class MapOverlaySnapshotSource",
+            "IMapOverlayPresentationSource",
+            "MapOverlayProjectionAdapter",
+            "buildMapOverlaySnapshot",
+        ],
+        failures,
+    )
+    for rel in [
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_session_adapter.h",
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_presentation_source.h",
+        "modules/ui_key_verification_runtime/include/ui_key_verification_runtime/key_verification_action_sink.h",
+        "modules/ui_key_verification_runtime/src/key_verification_presentation_source.cpp",
+        "modules/ui_key_verification_runtime/src/key_verification_action_sink.cpp",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay_snapshot_source.h",
+        "modules/ui_map_runtime/include/ui_map_runtime/map_overlay_projection_adapter.h",
+        "modules/ui_map_runtime/src/map_overlay_snapshot_source.cpp",
+        "modules/ui_map_runtime/src/map_overlay_projection_adapter.cpp",
+    ]:
+        forbid_tokens(
+            rel,
+            [
+                "LegacyKeyVerificationSource",
+                "LegacyKeyVerificationActionSink",
+                "LegacyKeyVerificationSession",
+                "LegacyMapOverlaySource",
+                "ui_legacy_adapters/legacy_key_verification_source.h",
+                "ui_legacy_adapters/legacy_key_verification_action_sink.h",
+                "ui_legacy_adapters/legacy_key_verification_session.h",
+                "ui_legacy_adapters/legacy_map_overlay_source.h",
+                "lvgl.h",
+                "GtkWidget",
+                "lv_obj_t",
+            ],
+            failures,
+        )
+
+    check_legacy_headers_are_aliases(failures)
+    check_key_map_legacy_headers_are_aliases(failures)
+    check_main_code_no_legacy_chat_includes(failures)
+    check_main_code_no_legacy_key_map_includes(failures)
+    check_build_lists(failures)
+
+    require_tokens(
+        "docs/audits/CHAT_LEGACY_DELIVERY_BURN_DOWN_AUDIT.md",
+        [
+            "Current compatibility header",
+            "Former implementation source",
+            "Current callers",
+            "Replacement",
+            "Migration decision",
+            "main runtime callers",
+            "deprecated forwarding aliases",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/LEGACY_BURNDOWN_REGISTER.md",
+        [
+            "ChatDeliveryActionPortAdapter",
+            "ChatDeliveryEventProjectionAdapter",
+            "KeyVerificationPresentationSource",
+            "KeyVerificationActionSink",
+            "KeyVerificationSessionAdapter",
+            "MapOverlaySnapshotSource",
+            "MapOverlayProjectionAdapter",
+            "burned-down to deprecated alias",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md",
+        [
+            "Burned Down In Phase 9.4",
+            "Burned Down In Phase 9.5",
+            "main runtime callers removed",
+            "deprecated aliases",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md",
+        [
+            "Chat LegacyDelivery bridges",
+            "burned down to deprecated alias",
+            "ChatDeliveryActionPortAdapter",
+            "ChatDeliveryEventProjectionAdapter",
+            "KeyVerificationPresentationSource",
+            "KeyVerificationActionSink",
+            "MapOverlaySnapshotSource",
+            "MapOverlayProjectionAdapter",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/KEY_VERIFICATION_MAP_OVERLAY_LEGACY_BURN_DOWN_AUDIT.md",
+        [
+            "LegacyKeyVerificationSource",
+            "LegacyKeyVerificationActionSink",
+            "LegacyKeyVerificationSession",
+            "LegacyMapOverlaySource",
+            "current callers",
+            "main runtime callers",
+            "test callers",
+            "docs references",
+            "replacement",
+            "migration decision",
+            "deprecated compatibility aliases only",
+        ],
+        failures,
+    )
+
+    if failures:
+        for failure in failures:
+            print(f"[phase9-legacy-burndown] {failure}")
+        return 1
+
+    print("[phase9-legacy-burndown] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_phase9_runtime_adoption_ready.py b/tools/architecture/check_phase9_runtime_adoption_ready.py
new file mode 100644
index 00000000..e01e4c92
--- /dev/null
+++ b/tools/architecture/check_phase9_runtime_adoption_ready.py
@@ -0,0 +1,487 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def check_post_root_legacy_removed() -> int:
+    result = subprocess.run(
+        [sys.executable, str(ROOT / "tools/architecture/check_no_root_legacy_ready.py")],
+        cwd=ROOT,
+        text=True,
+        capture_output=True,
+    )
+    if result.returncode != 0:
+        output = (result.stdout + result.stderr).strip()
+        print(f"[phase9-runtime-adoption] {output}")
+        return 1
+    print("[phase9-runtime-adoption] OK (root legacy removed)")
+    return 0
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_absent(rel: str, failures: list[str]) -> None:
+    if (ROOT / rel).exists():
+        failures.append(f"legacy runtime adoption must be burned down, not maintained: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def forbid_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    text = read(rel)
+    for token in tokens:
+        if token in text:
+            failures.append(f"{rel} contains forbidden token: {token}")
+
+
+def forbid_legacy_entry_adoption_tokens(failures: list[str]) -> None:
+    legacy_root = ROOT / "legacy" / "app_implementations"
+    if not legacy_root.exists():
+        return
+
+    forbidden = [
+        "AsciiRuntimeEntryAdoption",
+        "GtkRuntimeEntryAdoption",
+        "LvglRuntimeEntryAdoption",
+        "ascii_runtime_entry_adoption",
+        "gtk_runtime_entry_adoption",
+        "lvgl_runtime_entry_adoption",
+    ]
+    for path in legacy_root.rglob("*"):
+        if not path.is_file():
+            continue
+        try:
+            text = path.read_text(encoding="utf-8")
+        except UnicodeDecodeError:
+            continue
+        for token in forbidden:
+            if token in text:
+                rel = path.relative_to(ROOT).as_posix()
+                failures.append(
+                    f"{rel} contains forbidden Phase 9 runtime adoption token: {token}"
+                )
+
+
+def main() -> int:
+    if not (ROOT / "legacy").exists():
+        return check_post_root_legacy_removed()
+
+    failures: list[str] = []
+
+    required_files = [
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_menu_runtime_adapter.h",
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_host_adapter.h",
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_screen_graph_bridge.h",
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_screen_graph_presenter.h",
+        "modules/ui_ascii_runtime/include/ui_ascii_runtime/ascii_runtime_entry_adoption.h",
+        "modules/ui_ascii_runtime/src/ascii_menu_runtime_adapter.cpp",
+        "modules/ui_ascii_runtime/src/ascii_screen_host_adapter.cpp",
+        "modules/ui_ascii_runtime/src/ascii_screen_graph_bridge.cpp",
+        "modules/ui_ascii_runtime/src/ascii_runtime_screen_graph_presenter.cpp",
+        "modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp",
+        "modules/ui_ascii_runtime/tests/ascii_runtime_screen_graph_presenter_smoke.cpp",
+        "modules/ui_ascii_runtime/tests/ascii_runtime_entry_adoption_smoke.cpp",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_menu_runtime_adapter.h",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_screen_host_adapter.h",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_bridge.h",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_uconsole_screen_graph_presenter.h",
+        "modules/ui_gtk_runtime/include/ui_gtk_runtime/gtk_runtime_entry_adoption.h",
+        "modules/ui_gtk_runtime/src/gtk_menu_runtime_adapter.cpp",
+        "modules/ui_gtk_runtime/src/gtk_screen_host_adapter.cpp",
+        "modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_bridge.cpp",
+        "modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_presenter.cpp",
+        "modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp",
+        "modules/ui_gtk_runtime/tests/gtk_uconsole_screen_graph_presenter_smoke.cpp",
+        "modules/ui_gtk_runtime/tests/gtk_runtime_entry_adoption_smoke.cpp",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_screen_graph_presenter.h",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_entry_adoption.h",
+        "modules/ui_lvgl_ux_packs/include/ui_lvgl_ux_packs/runtime/lvgl_runtime_adoption_probe.h",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_screen_graph_presenter.cpp",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_entry_adoption.cpp",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_adoption_probe.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_screen_graph_presenter.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_entry_adoption.cpp",
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_adoption_probe.cpp",
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.h",
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp",
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry.h",
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp",
+        "apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp",
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp",
+        "docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md",
+        "docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md",
+        "docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md",
+        "docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md",
+    ]
+    for rel in required_files:
+        require_file(rel, failures)
+
+    old_legacy_runtime_files = [
+        "legacy/app_implementations/linux_sim/src/ascii_menu_runtime_adapter.h",
+        "legacy/app_implementations/linux_sim/src/ascii_menu_runtime_adapter.cpp",
+        "legacy/app_implementations/linux_sim/src/ascii_screen_host_adapter.h",
+        "legacy/app_implementations/linux_sim/src/ascii_screen_host_adapter.cpp",
+        "legacy/app_implementations/linux_sim/src/ascii_screen_graph_bridge.h",
+        "legacy/app_implementations/linux_sim/src/ascii_screen_graph_bridge.cpp",
+        "legacy/app_implementations/linux_sim/src/ascii_runtime_entry_adoption.h",
+        "legacy/app_implementations/linux_sim/src/ascii_runtime_entry_adoption.cpp",
+        "legacy/app_implementations/linux_sim/tests/ascii_runtime_entry_adoption_smoke.cpp",
+        "legacy/app_implementations/linux_sim/src/linux_sim_runtime_adoption_bridge.h",
+        "legacy/app_implementations/linux_sim/src/linux_sim_runtime_adoption_bridge.cpp",
+        "legacy/app_implementations/linux_sim/tests/linux_sim_runtime_adoption_bridge_smoke.cpp",
+        "legacy/app_implementations/linux_uconsole/src/gtk_menu_runtime_adapter.h",
+        "legacy/app_implementations/linux_uconsole/src/gtk_menu_runtime_adapter.cpp",
+        "legacy/app_implementations/linux_uconsole/src/gtk_screen_host_adapter.h",
+        "legacy/app_implementations/linux_uconsole/src/gtk_screen_host_adapter.cpp",
+        "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_uconsole_screen_graph_bridge.h",
+        "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_uconsole_screen_graph_bridge.cpp",
+        "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_runtime_entry_adoption.h",
+        "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_runtime_entry_adoption.cpp",
+        "legacy/app_implementations/linux_uconsole/tests/gtk_runtime_entry_adoption_smoke.cpp",
+        "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_uconsole_phase9_screen_graph_bridge.h",
+        "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_uconsole_phase9_screen_graph_bridge.cpp",
+        "legacy/app_implementations/linux_uconsole/tests/gtk_uconsole_phase9_screen_graph_bridge_smoke.cpp",
+    ]
+    for rel in old_legacy_runtime_files:
+        require_absent(rel, failures)
+
+    forbid_legacy_entry_adoption_tokens(failures)
+
+    presenter_contract_tokens = [
+        "PresentationBundle",
+        "hasUxMenu",
+        "hasScreenBindings",
+        "load",
+        "menuCount",
+        "screenCount",
+    ]
+    for rel in [
+        "modules/ui_ascii_runtime/src/ascii_runtime_screen_graph_presenter.cpp",
+        "modules/ui_gtk_runtime/src/gtk_uconsole_screen_graph_presenter.cpp",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_screen_graph_presenter.cpp",
+    ]:
+        require_tokens(rel, presenter_contract_tokens, failures)
+        forbid_tokens(
+            rel,
+            [
+                "findUxPackById",
+                "UxPackRegistry",
+                "activeUxPackId",
+                "lvgl.h",
+                "gtk/gtk.h",
+                "GtkWidget",
+                "lv_obj_t",
+                "apps/",
+                "boards/",
+                "platform/",
+            ],
+            failures,
+        )
+
+    entry_adoption_contracts = {
+        "modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp": [
+            "AsciiRuntimeEntryAdoption",
+            "AsciiRuntimeScreenGraphPresenter",
+            "PresentationBundle",
+            "ready_",
+        ],
+        "modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp": [
+            "GtkRuntimeEntryAdoption",
+            "GtkUConsoleScreenGraphPresenter",
+            "PresentationBundle",
+            "ready_",
+        ],
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_entry_adoption.cpp": [
+            "LvglRuntimeEntryAdoption",
+            "LvglRuntimeScreenGraphPresenter",
+            "PresentationBundle",
+            "ready_",
+        ],
+    }
+    for rel, tokens in entry_adoption_contracts.items():
+        require_tokens(rel, tokens, failures)
+        forbid_tokens(
+            rel,
+            [
+                "findUxPackById",
+                "UxPackRegistry",
+                "activeUxPackId",
+                "MenuModel menu",
+                "ui::menu::MenuModel",
+                "buildMenuForUxPack",
+                "gtk/gtk.h",
+                "GtkWidget",
+                "lvgl.h",
+                "lv_obj_t",
+                "apps/",
+                "boards/",
+                "platform/",
+            ],
+            failures,
+        )
+
+    app_shell_probe_contracts = {
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.cpp": [
+            "LinuxSimRuntimeEntryAdoptionProbe",
+            "AsciiRuntimeEntryAdoption",
+            "activeUxPackId",
+            "buildMenuForUxPack",
+            "CompatibilityScreenFactory",
+            "fallback_",
+        ],
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.cpp": [
+            "LinuxUConsoleGtkRuntimeEntryAdoptionProbe",
+            "GtkRuntimeEntryAdoption",
+            "activeUxPackId",
+            "buildMenuForUxPack",
+            "CompatibilityScreenFactory",
+            "fallback_",
+        ],
+    }
+    for rel, tokens in app_shell_probe_contracts.items():
+        require_tokens(rel, tokens, failures)
+        forbid_tokens(
+            rel,
+            [
+                "findUxPackById",
+                "UxPackRegistry",
+                "gtk/gtk.h",
+                "GtkWidget",
+                "lvgl.h",
+                "lv_obj_t",
+                "legacy/app_implementations",
+                "boards/",
+                "platform/",
+            ],
+            failures,
+        )
+
+    real_entry_contracts = {
+        "apps/linux_sim_shell/src/linux_sim_runtime_entry.cpp": [
+            "LinuxSimRuntimeEntry",
+            "AsciiRuntimeEntryAdoption",
+            "fallback",
+        ],
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_adoption.cpp": [
+            "LinuxUConsoleGtkPageRegistryAdoption",
+            "GtkRuntimeEntryAdoption",
+            "fallback",
+        ],
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_runtime_adoption_probe.cpp": [
+            "LvglRuntimeAdoptionProbe",
+            "LvglRuntimeEntryAdoption",
+            "fallback",
+        ],
+    }
+    for rel, tokens in real_entry_contracts.items():
+        require_tokens(rel, tokens, failures)
+        forbid_tokens(
+            rel,
+            [
+                "findUxPackById",
+                "UxPackRegistry",
+                "buildMenuForUxPack",
+                "MenuModel menu",
+                "ui::menu::MenuModel",
+                "gtk/gtk.h",
+                "GtkWidget",
+                "lvgl.h",
+                "lv_obj_t",
+                "BOARD_",
+                "legacy/app_implementations",
+                "boards/",
+                "platform/",
+            ],
+            failures,
+        )
+
+    require_tokens(
+        "apps/linux_sim_shell/CMakeLists.txt",
+        [
+            "linux_sim_runtime_entry.cpp",
+            "linux_sim_runtime_entry_smoke.cpp",
+            "modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp",
+            "linux_sim_runtime_entry_adoption_probe.cpp",
+            "linux_sim_runtime_entry_adoption_probe_smoke.cpp",
+            "ascii_runtime_entry_adoption_smoke.cpp",
+            "lvgl_runtime_adoption_probe",
+            "lvgl_runtime_entry_adoption",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/CMakeLists.txt",
+        [
+            "linux_uconsole_gtk_page_registry_adoption.cpp",
+            "linux_uconsole_gtk_page_registry_adoption_smoke.cpp",
+            "modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp",
+            "linux_uconsole_gtk_runtime_entry_adoption_probe.cpp",
+            "linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp",
+            "gtk_runtime_entry_adoption_smoke.cpp",
+        ],
+        failures,
+    )
+    require_tokens(
+        "cmake/TrailMateUxPacks.cmake",
+        [
+            "lvgl_runtime_screen_graph_presenter.cpp",
+            "lvgl_runtime_entry_adoption.cpp",
+            "lvgl_runtime_adoption_probe.cpp",
+        ],
+        failures,
+    )
+
+    require_tokens(
+        "apps/linux_sim_shell/tests/linux_sim_runtime_entry_adoption_probe_smoke.cpp",
+        [
+            "LinuxSimRuntimeEntryAdoptionProbe",
+            "fallbackUsed",
+            "route.valid",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_sim_shell/tests/linux_sim_runtime_entry_smoke.cpp",
+        [
+            "LinuxSimRuntimeEntry",
+            "fallbackUsed",
+            "route.valid",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_runtime_entry_adoption_probe_smoke.cpp",
+        [
+            "LinuxUConsoleGtkRuntimeEntryAdoptionProbe",
+            "fallbackUsed",
+            "route.valid",
+        ],
+        failures,
+    )
+    require_tokens(
+        "apps/linux_uconsole_gtk/tests/linux_uconsole_gtk_page_registry_adoption_smoke.cpp",
+        [
+            "LinuxUConsoleGtkPageRegistryAdoption",
+            "fallbackUsed",
+            "route.valid",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_entry_adoption.cpp",
+        [
+            "LvglRuntimeEntryAdoption",
+            "PresentationBundle",
+            "route.valid",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/ui_lvgl_ux_packs/tests/test_lvgl_runtime_adoption_probe.cpp",
+        [
+            "LvglRuntimeAdoptionProbe",
+            "LvglRuntimeEntryAdoption",
+            "fallbackUsed",
+            "route.valid",
+        ],
+        failures,
+    )
+
+    require_tokens(
+        "docs/audits/PHASE9_RUNTIME_ADOPTION_REPORT.md",
+        [
+            "Phase 9 Rule",
+            "Phase 9.2 Entry Adoption",
+            "modules/ui_ascii_runtime",
+            "modules/ui_gtk_runtime",
+            "apps/linux_sim_shell",
+            "apps/linux_uconsole_gtk",
+            "Phase 9.3 Real Entry Adoption",
+            "must not be added to `legacy/`",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE9_RUNTIME_ENTRY_ADOPTION_REPORT.md",
+        [
+            "fallback",
+            "apps/linux_sim_shell/src/linux_sim_runtime_entry_adoption_probe.*",
+            "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_runtime_entry_adoption_probe.*",
+            "modules/ui_ascii_runtime/src/ascii_runtime_entry_adoption.cpp",
+            "modules/ui_gtk_runtime/src/gtk_runtime_entry_adoption.cpp",
+            "LinuxSimRuntimeEntry",
+            "LinuxUConsoleGtkPageRegistryAdoption",
+            "LvglRuntimeAdoptionProbe",
+            "legacy/app_implementations remains burn-down",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE9_FALLBACK_CONTAINMENT_LEDGER.md",
+        [
+            "LinuxSim hardcoded runtime routing",
+            "GTK hardcoded page registry",
+            "LVGL hardcoded menu/page creation",
+            "Chat LegacyDelivery bridges",
+            "KeyVerification legacy source/sink",
+            "MapOverlay legacy source",
+            "exit condition",
+            "contained fallback",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE9_LEGACY_BURNDOWN_REPORT.md",
+        [
+            "moved out of legacy",
+            "LegacyChatDeliveryActionBridge",
+            "LegacyChatDeliveryEventBridge",
+            "Compilation",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/LEGACY_BURNDOWN_REGISTER.md",
+        [
+            "modules/ui_ascii_runtime",
+            "modules/ui_gtk_runtime",
+            "moved out of legacy",
+        ],
+        failures,
+    )
+
+    if failures:
+        for failure in failures:
+            print(f"[phase9-runtime-adoption] {failure}")
+        return 1
+
+    print("[phase9-runtime-adoption] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_pio_real_env_restored.py b/tools/architecture/check_pio_real_env_restored.py
new file mode 100644
index 00000000..3af47c9a
--- /dev/null
+++ b/tools/architecture/check_pio_real_env_restored.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def iter_files(root: Path):
+    if not root.exists():
+        return
+    for path in root.rglob("*"):
+        if path.is_file():
+            yield path
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    platformio_rel = "builds/pio_nrf52/platformio.ini"
+    platformio = read(platformio_rel)
+    for token in [
+        "[env:gat562_mesh_evb_pro]",
+        "board = gat562_mesh_evb_pro",
+        "symlink://../../apps/nrf52_node",
+        "symlink://../../platform/nrf52",
+        "symlink://../../boards/gat562_mesh_evb_pro",
+    ]:
+        if token not in platformio:
+            failures.append(f"{platformio_rel} missing token: {token}")
+
+    for rel in [
+        "apps/nrf52_node/src/nrf52_node_startup_runtime.cpp",
+        "apps/nrf52_node/src/nrf52_node_loop_runtime.cpp",
+        "apps/nrf52_node/src/nrf52_node_arduino_entry.cpp",
+        "apps/nrf52_node/src/nrf52_node_runtime_config.cpp",
+        "apps/nrf52_node/src/nrf52_node_app_runtime_access.cpp",
+        "platform/nrf52/README.md",
+        "platform/nrf52/debug/nrf52_debug_console.cpp",
+        "platform/nrf52/protocol/nrf52_protocol_factory.cpp",
+        "platform/nrf52/runtime/nrf52_runtime_apply_service.cpp",
+        "builds/pio_nrf52/src/gat562_mesh_evb_pro.cpp",
+    ]:
+        if not (ROOT / rel).is_file():
+            failures.append(f"missing restored PIO/nRF52 owner file: {rel}")
+
+    for forbidden_dir in [
+        "apps/esp_pio",
+        "apps/gat562_mesh_evb_pro",
+    ]:
+        if (ROOT / forbidden_dir).exists():
+            failures.append(f"{forbidden_dir}/ must not be restored")
+
+    for root_name in ["apps", "builds", "platform", "boards"]:
+        for path in iter_files(ROOT / root_name):
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            if "legacy/app_implementations" in text:
+                failures.append(
+                    f"{path.relative_to(ROOT).as_posix()} contains legacy/app_implementations"
+                )
+
+    if failures:
+        for failure in failures:
+            print(f"[pio-real-env] {failure}")
+        return 1
+
+    print("[pio-real-env] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_post_refactor_final_ready.py b/tools/architecture/check_post_refactor_final_ready.py
new file mode 100644
index 00000000..9eee9a23
--- /dev/null
+++ b/tools/architecture/check_post_refactor_final_ready.py
@@ -0,0 +1,316 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def forbid_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        return
+    text = read(rel)
+    for token in tokens:
+        if token in text:
+            failures.append(f"{rel} contains forbidden token: {token}")
+
+
+def run_checker(rel: str, failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing checker: {rel}")
+        return
+    result = subprocess.run(
+        [sys.executable, str(path)],
+        cwd=ROOT,
+        text=True,
+        capture_output=True,
+    )
+    if result.returncode != 0:
+        output = (result.stdout + result.stderr).strip()
+        failures.append(f"{rel} failed:\n{output}")
+
+
+def iter_code_files(root: Path):
+    if not root.exists():
+        return
+    for path in root.rglob("*"):
+        if path.is_file() and path.suffix in {".h", ".hpp", ".cpp", ".cc", ".cxx"}:
+            yield path
+
+
+def is_allowed_legacy_alias_path(path: Path) -> bool:
+    rel = path.relative_to(ROOT).as_posix()
+    name = path.name
+    allowed_prefixes = [
+        "modules/ui_legacy_adapters/include/ui_legacy_adapters/",
+        "modules/ui_shared/include/ui/presentation_sources/",
+    ]
+    return (
+        any(rel.startswith(prefix) for prefix in allowed_prefixes)
+        or name.endswith("_legacy_alias.cpp")
+        or name.endswith("_legacy_alias_test.cpp")
+        or name.endswith("_compatibility_test.cpp")
+    )
+
+
+def check_apps_directory(failures: list[str]) -> None:
+    allowed = {
+        "README.md",
+        "esp32_lvgl",
+        "nrf52_node",
+        "linux_uconsole_gtk",
+        "linux_sim_shell",
+    }
+    apps_root = ROOT / "apps"
+    for path in apps_root.iterdir():
+        if path.name not in allowed:
+            failures.append(f"apps/ contains non-final app shell entry: {path.name}")
+
+
+def check_legacy_app_implementations(failures: list[str]) -> None:
+    legacy_root = ROOT / "legacy" / "app_implementations"
+    if not legacy_root.is_dir():
+        return
+
+    forbidden = [
+        "RuntimeEntryAdoption",
+        "RuntimeScreenGraphPresenter",
+        "DescriptorRenderer",
+        "DescriptorPageRegistry",
+        "LvglPrimaryScreenGraphRuntime",
+    ]
+    for path in legacy_root.rglob("*"):
+        if not path.is_file():
+            continue
+        try:
+            text = path.read_text(encoding="utf-8", errors="ignore")
+        except OSError:
+            continue
+        for token in forbidden:
+            if token in text:
+                rel = path.relative_to(ROOT).as_posix()
+                failures.append(
+                    f"{rel} contains post-refactor runtime adoption token: {token}"
+                )
+
+
+def check_renderer_forbidden_tokens(failures: list[str]) -> None:
+    renderer_files = [
+        "apps/linux_sim_shell/src/linux_sim_runtime_renderer.cpp",
+        "apps/linux_sim_shell/src/linux_sim_runtime_renderer.h",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.cpp",
+        "apps/linux_uconsole_gtk/src/linux_uconsole_gtk_page_registry_renderer.h",
+        "modules/ui_ascii_runtime/src/ascii_descriptor_renderer.cpp",
+        "modules/ui_gtk_runtime/src/gtk_descriptor_page_registry.cpp",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_menu_model.cpp",
+        "modules/ui_lvgl_ux_packs/src/runtime/lvgl_descriptor_renderer_probe.cpp",
+    ]
+    forbidden = [
+        "UxPackRegistry",
+        "findUxPackById",
+        "buildMenuForUxPack",
+        "activeUxPackId",
+        "GtkWidget",
+        "gtk/gtk.h",
+        "lvgl.h",
+        "lv_obj_t",
+        "BOARD_",
+    ]
+    for rel in renderer_files:
+        forbid_tokens(rel, forbidden, failures)
+
+
+def check_no_main_code_includes_burned_down_legacy_headers(
+    failures: list[str],
+) -> None:
+    forbidden_includes = [
+        '#include "ui_legacy_adapters/legacy_chat_delivery_action_bridge.h"',
+        '#include "ui_legacy_adapters/legacy_chat_delivery_event_bridge.h"',
+        '#include "ui_legacy_adapters/legacy_key_verification_source.h"',
+        '#include "ui_legacy_adapters/legacy_key_verification_action_sink.h"',
+        '#include "ui_legacy_adapters/legacy_key_verification_session.h"',
+        '#include "ui_legacy_adapters/legacy_map_overlay_source.h"',
+    ]
+    for root_name in ["apps", "legacy/app_implementations", "modules", "platform", "boards"]:
+        for path in iter_code_files(ROOT / root_name):
+            text = path.read_text(encoding="utf-8", errors="ignore")
+            for token in forbidden_includes:
+                if token in text and not is_allowed_legacy_alias_path(path):
+                    failures.append(
+                        f"{path.relative_to(ROOT).as_posix()} includes burned-down legacy header: {token}"
+                    )
+
+
+def check_phase12_docs(failures: list[str]) -> None:
+    required = [
+        "docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md",
+        "docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md",
+        "docs/specification/POST_REFACTOR_ARCHITECTURE_FREEZE.md",
+        "docs/audits/POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md",
+    ]
+    for rel in required:
+        require_file(rel, failures)
+
+    require_tokens(
+        "docs/audits/PHASE12_FALLBACK_DELETION_READINESS.md",
+        [
+            "LinuxSim hardcoded runtime routing",
+            "GTK hardcoded page registry",
+            "LVGL hardcoded menu/page creation",
+            "Chat legacy alias headers",
+            "KeyVerification legacy alias headers",
+            "MapOverlay legacy alias header",
+            "`ui_shared` forwarding shims",
+            "`legacy/app_implementations` roots",
+            "Safe to delete now?",
+            "Deletion condition",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE12_DEPRECATED_ALIAS_CLEANUP_PLAN.md",
+        [
+            "LegacyChatDeliveryActionBridge",
+            "LegacyChatDeliveryEventBridge",
+            "LegacyKeyVerificationSource",
+            "LegacyKeyVerificationActionSink",
+            "LegacyKeyVerificationSession",
+            "LegacyMapOverlaySource",
+            "Main code must not include deprecated alias headers",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/specification/POST_REFACTOR_ARCHITECTURE_FREEZE.md",
+        [
+            "`apps/`",
+            "`builds/`",
+            "`modules/`",
+            "`platform/`",
+            "`boards/`",
+            "Root `legacy/` has been removed",
+            "Renderers must not select UX packs",
+            "Runtime entries must not call `buildMenuForUxPack`",
+            "`modules/` must not depend on `apps/`",
+            "New `Legacy*` bridges are forbidden",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/POST_REFACTOR_FINAL_CLOSEOUT_REPORT.md",
+        [
+            "This architecture refactor is complete",
+            "Phase 8 directory/app shell/UX/menu/screen graph",
+            "Phase 9 runtime adoption and legacy burn-down",
+            "Phase 10 primary path migration",
+            "Phase 11 renderer descriptor consumption",
+            "Phase 12 closeout",
+            "Batch 4 root legacy elimination",
+            "Next work is not architecture refactor",
+            "feature work",
+            "targeted fallback deletion",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md",
+        [
+            "fallback-only",
+            "Phase 11 does not rewrite real GTK widgets",
+            "Phase 11 does not create LVGL widgets",
+            "Phase 11 does not delete fallback",
+        ],
+        failures,
+    )
+    forbid_tokens(
+        "docs/audits/PHASE11_RENDERER_DESCRIPTOR_CONSUMPTION_REPORT.md",
+        ["primary hardcoded routing"],
+        failures,
+    )
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    for rel in [
+        "tools/architecture/check_phase8_layout_ready.py",
+        "tools/architecture/check_phase9_runtime_adoption_ready.py",
+        "tools/architecture/check_phase9_legacy_burndown_ready.py",
+        "tools/architecture/check_phase10_primary_path_ready.py",
+        "tools/architecture/check_phase11_renderer_consumption_ready.py",
+        "tools/architecture/check_legacy_compat_temp_inventory_ready.py",
+        "tools/architecture/check_no_root_legacy_ready.py",
+        "tools/architecture/check_legacy_disposition_execution_ready.py",
+        "tools/architecture/check_esp_idf_final_owner_extraction_ready.py",
+        "tools/architecture/check_target_architecture_foundation_ready.py",
+        "tools/architecture/check_all_target_architecture_ready.py",
+        "tools/architecture/check_no_intermediate_ui_layer_ready.py",
+        "tools/architecture/check_board_facts_boundary_ready.py",
+        "tools/architecture/check_uconsole_real_ui_restored.py",
+        "tools/architecture/check_pio_real_env_restored.py",
+        "tools/architecture/check_esp_arduino_real_targets_restored.py",
+        "tools/architecture/check_esp_idf_real_targets_restored.py",
+        "tools/architecture/check_real_target_regression_recovery_ready.py",
+    ]:
+        require_file(rel, failures)
+
+    for rel in [
+        "tools/architecture/check_phase8_layout_ready.py",
+        "tools/architecture/check_phase9_runtime_adoption_ready.py",
+        "tools/architecture/check_phase9_legacy_burndown_ready.py",
+        "tools/architecture/check_phase10_primary_path_ready.py",
+        "tools/architecture/check_phase11_renderer_consumption_ready.py",
+        "tools/architecture/check_legacy_compat_temp_inventory_ready.py",
+        "tools/architecture/check_no_root_legacy_ready.py",
+        "tools/architecture/check_legacy_disposition_execution_ready.py",
+        "tools/architecture/check_esp_idf_final_owner_extraction_ready.py",
+        "tools/architecture/check_target_architecture_foundation_ready.py",
+        "tools/architecture/check_all_target_architecture_ready.py",
+        "tools/architecture/check_no_intermediate_ui_layer_ready.py",
+        "tools/architecture/check_board_facts_boundary_ready.py",
+        "tools/architecture/check_real_target_regression_recovery_ready.py",
+    ]:
+        run_checker(rel, failures)
+
+    check_phase12_docs(failures)
+    check_apps_directory(failures)
+    check_legacy_app_implementations(failures)
+    check_renderer_forbidden_tokens(failures)
+    check_no_main_code_includes_burned_down_legacy_headers(failures)
+
+    if failures:
+        for failure in failures:
+            print(f"[post-refactor-final] {failure}")
+        return 1
+
+    print("[post-refactor-final] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_product_architecture_boundaries.py b/tools/architecture/check_product_architecture_boundaries.py
new file mode 100644
index 00000000..10f9737c
--- /dev/null
+++ b/tools/architecture/check_product_architecture_boundaries.py
@@ -0,0 +1,542 @@
+#!/usr/bin/env python3
+"""Report cross-platform product architecture boundary drift.
+
+Phase 1 is intentionally non-blocking. By default this script prints a report
+and exits 0 even when it finds violations. Use --strict when a later phase is
+ready to make these checks fail CI.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+import argparse
+import os
+from pathlib import Path
+import re
+import sys
+
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+KNOWN_VIOLATIONS = (
+    "tools/architecture/KNOWN_PRODUCT_ARCHITECTURE_VIOLATIONS.md"
+)
+
+SOURCE_SUFFIXES = {
+    ".c",
+    ".cc",
+    ".cpp",
+    ".cxx",
+    ".h",
+    ".hh",
+    ".hpp",
+    ".ipp",
+}
+
+EXCLUDED_DIR_NAMES = {
+    ".git",
+    ".pio",
+    ".pytest_cache",
+    ".tmp",
+    ".venv",
+    "__pycache__",
+    "build",
+    "build-debug",
+    "build-release",
+    "cmake-build-debug",
+    "dist",
+    "managed_components",
+}
+
+
+@dataclass(frozen=True)
+class Rule:
+    name: str
+    roots: tuple[str, ...]
+    patterns: tuple[re.Pattern[str], ...]
+    path_contains: tuple[str, ...] = ()
+    path_regex: re.Pattern[str] | None = None
+    excludes: tuple[str, ...] = ()
+
+
+@dataclass(frozen=True)
+class Violation:
+    rule_name: str
+    path: Path
+    line_number: int
+    line: str
+
+
+def compile_patterns(patterns: tuple[str, ...]) -> tuple[re.Pattern[str], ...]:
+    return tuple(re.compile(pattern, re.IGNORECASE) for pattern in patterns)
+
+
+RULES = (
+    Rule(
+        name="core-module-must-not-include-platform-ui-board",
+        roots=("modules",),
+        path_regex=re.compile(r"^modules/core_[^/\\]+/"),
+        patterns=compile_patterns(
+            (
+                r"#include\s*[<\"]Arduino\.h[>\"]",
+                r"#include\s*[<\"]Preferences[>\"]",
+                r"#include\s*[<\"]SD\.h[>\"]",
+                r"#include\s*[<\"]FS\.h[>\"]",
+                r"#include\s*[<\"]freertos/",
+                r"#include\s*[<\"]lvgl",
+                r"#include\s*[<\"]gtk/",
+                r"#include\s*[<\"]platform/",
+                r"#include\s*[<\"]board/",
+                r"#include\s*[<\"]boards/",
+                r"#include\s*[<\"]display/",
+                r"#include\s*[<\"]ui/",
+            )
+        ),
+        excludes=(
+            "modules/core_chat/generated",
+            "modules/core_chat/third_party",
+        ),
+    ),
+    Rule(
+        name="board-package-must-not-own-business",
+        roots=("boards", "platform/esp/boards", "platform/nrf52/boards", "platform/linux/boards"),
+        patterns=compile_patterns(
+            (
+                r"\bChatService\b",
+                r"\bMeshService\b",
+                r"\bPhoneCore\b",
+                r"\bDirectMessage\b",
+                r"\bAppConfig\b",
+                r"\blv_obj_t\b",
+                r"\bGtkWidget\b",
+            )
+        ),
+    ),
+    Rule(
+        name="core-mesh-must-not-include-platform-sdk-or-ui",
+        roots=("modules/core_mesh",),
+        patterns=compile_patterns(
+            (
+                r"#include\s*[<\"]Arduino\.h[>\"]",
+                r"#include\s*[<\"]Preferences[>\"]",
+                r"#include\s*[<\"]sqlite3\.h[>\"]",
+                r"#include\s*[<\"]freertos/",
+                r"#include\s*[<\"]zephyr/",
+                r"#include\s*[<\"]nrf_",
+                r"#include\s*[<\"]esp_",
+                r"#include\s*[<\"]RadioLib",
+                r"#include\s*[<\"]lvgl\.h[>\"]",
+                r"#include\s*[<\"]gtk/",
+                r"#include\s*[<\"]bluefruit",
+                r"#include\s*[<\"]Bluefruit",
+                r"#include\s*[<\"]NimBLE",
+                r"#include\s*[<\"]platform/",
+                r"#include\s*[<\"]board/",
+                r"#include\s*[<\"]boards/",
+            )
+        ),
+    ),
+    Rule(
+        name="ui-presentation-must-not-include-toolkit-platform-or-storage",
+        roots=("modules/ui_presentation",),
+        patterns=compile_patterns(
+            (
+                r"#include\s*[<\"]lvgl\.h[>\"]",
+                r"#include\s*[<\"]gtk/",
+                r"#include\s*[<\"]ncurses",
+                r"#include\s*[<\"]Arduino\.h[>\"]",
+                r"#include\s*[<\"]Preferences[>\"]",
+                r"#include\s*[<\"]sqlite3\.h[>\"]",
+                r"#include\s*[<\"]RadioLib",
+                r"#include\s*[<\"]platform/",
+                r"#include\s*[<\"]chat/domain/chat_types\.h[>\"]",
+                r"#include\s*[<\"]apps/",
+                r"#include\s*[<\"]board/",
+                r"#include\s*[<\"]boards/",
+            )
+        ),
+    ),
+    Rule(
+        name="chat-presentation-adapters-must-stay-pure-mappers",
+        roots=("modules/chat_presentation_adapters",),
+        patterns=compile_patterns(
+            (
+                r"\bChatService\b",
+                r"\bContactService\b",
+                r"\bTeamService\b",
+                r"\bMeshSession\b",
+                r"\bIMeshAdapter\b",
+                r"\bAppContext\b",
+                r"#include\s*[<\"]platform/",
+                r"#include\s*[<\"]lvgl\.h[>\"]",
+                r"#include\s*[<\"]gtk/",
+                r"#include\s*[<\"]sqlite3\.h[>\"]",
+                r"#include\s*[<\"]Preferences[>\"]",
+                r"#include\s*[<\"]RadioLib",
+                r"#include\s*[<\"]Arduino\.h[>\"]",
+                r"#include\s*[<\"]board/",
+                r"#include\s*[<\"]boards/",
+            )
+        ),
+    ),
+    Rule(
+        name="chat-presentation-source-sink-adapters-must-not-touch-renderer-or-radio",
+        roots=("modules/ui_shared", "platform"),
+        path_contains=("/presentation_sources/", "\\presentation_sources\\"),
+        path_regex=re.compile(r".*chat.*\.(c|cc|cpp|cxx|h|hh|hpp)$", re.IGNORECASE),
+        patterns=compile_patterns(
+            (
+                r"#include\s*[<\"]lvgl\.h[>\"]",
+                r"#include\s*[<\"]gtk/",
+                r"#include\s*[<\"]sqlite3\.h[>\"]",
+                r"#include\s*[<\"]Preferences[>\"]",
+                r"#include\s*[<\"]RadioLib",
+                r"#include\s*[<\"]Arduino\.h[>\"]",
+                r"#include\s*[<\"]board/",
+                r"#include\s*[<\"]boards/",
+                r"\blv_obj_t\b",
+                r"\bGtkWidget\b",
+                r"\bIPacketRadio\b",
+                r"\bDirectMessageService\b",
+                r"\bPeerIdentityService\b",
+            )
+        ),
+    ),
+    Rule(
+        name="platform-ble-must-not-own-phone-protocol",
+        roots=("platform",),
+        path_contains=("/ble/", "\\ble\\"),
+        patterns=compile_patterns(
+            (
+                r"\bhandleToRadio(Packet)?\b",
+                r"\bToRadio\b",
+                r"\bFromRadio\b",
+                r"\bFromRadio\s+encode\b",
+                r"\bToRadio\s+decode\b",
+                r"\bAdminMessage\b",
+                r"\bContactService\b",
+                r"\bChatService\b",
+                r"\bDirectMessage\b",
+                r"\bboard\.gps\b",
+                r"\bgat562_board\b",
+                r"#include\s*[<\"]board/",
+                r"#include\s*[<\"]boards/",
+                r"\bgetBoard\s*\(",
+                r"\bgps::gps_is_",
+                r"\bfillMeshtasticGpsFix",
+                r"\bloadTimezone",
+                r"\bgetTimezone",
+                r"\bsetTimezone",
+                r"\bctx_\s*\.\s*getConfig\s*\(",
+                r"\bctx_\s*\.\s*saveConfig\s*\(",
+                r"\bctx_\s*\.\s*applyMeshConfig\s*\(",
+                r"\bctx_\s*\.\s*applyPositionConfig\s*\(",
+            )
+        ),
+        excludes=(
+            "platform/esp/arduino_common/include/ble/app_phone_facade.h",
+            "platform/esp/arduino_common/src/ble/app_phone_facade.cpp",
+            "platform/nrf52/arduino_common/include/ble/app_phone_facade.h",
+            "platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp",
+        ),
+    ),
+    Rule(
+        name="platform-radio-must-not-own-message-or-key-policy",
+        roots=("platform", "boards"),
+        path_regex=re.compile(r"(^|[/\\]).*radio.*\.(c|cc|cpp|cxx|h|hh|hpp)$", re.IGNORECASE),
+        patterns=compile_patterns(
+            (
+                r"\bDirectMessage\b",
+                r"\bPeerKey\b",
+                r"\bLocalIdentity\b",
+                r"\bPkiFlow\b",
+                r"\bAdminMessage\b",
+                r"\bContactService\b",
+                r"\bChatService\b",
+                r"\bPhoneCore\b",
+                r"\bToRadio\b",
+                r"\bFromRadio\b",
+            )
+        ),
+    ),
+    Rule(
+        name="platform-mesh-runtime-shell-must-not-own-crypto-or-peer-policy",
+        roots=("platform",),
+        path_contains=("/mesh/", "\\mesh\\"),
+        patterns=compile_patterns(
+            (
+                r"\bAES\b",
+                r"\bCurve25519\b",
+                r"\bEd25519\b",
+                r"\bpeer trust\b",
+                r"\btrust peer\b",
+                r"\bsavePeer(Key|PubKey)",
+                r"\bloadPeer(Key|PubKey)",
+                r"\bgenerateIdentity\b",
+                r"\bdecrypt direct packet\b",
+                r"\bencrypt direct packet\b",
+            )
+        ),
+    ),
+    Rule(
+        name="legacy-mesh-adapter-thickness-must-shrink",
+        roots=("platform",),
+        path_regex=re.compile(r"(^|[/\\])(mt_adapter|meshcore_adapter)\.(c|cc|cpp|cxx|h|hh|hpp)$", re.IGNORECASE),
+        patterns=compile_patterns(
+            (
+                r"\bsavePeer(Key|PubKey)",
+                r"\bloadPeer(Key|PubKey)",
+                r"\bgenerateIdentity\b",
+                r"\binitPkiKeys\b",
+                r"\bloadPkiNodeKeys\b",
+                r"\bsavePkiNodeKey\b",
+                r"\bdecryptPkiPayload\b",
+                r"\bencryptPkiPayload\b",
+                r"\bderiveIdentitySecret\b",
+                r"\btryDecryptPeerPayload\b",
+            )
+        ),
+    ),
+    Rule(
+        name="platform-ble-must-not-read-gps-driver-directly",
+        roots=("platform",),
+        path_contains=("/ble/", "\\ble\\"),
+        patterns=compile_patterns(
+            (
+                r"\bboard\.gps\b",
+                r"\bGpsService\b",
+                r"\bNmeaParser\b",
+                r"\bsettimeofday\b",
+                r"\bgps_uart\b",
+                r"\bgps_get_data\b",
+                r"#include\s*[<\"]platform/ui/gps_runtime\.h[>\"]",
+                r"#include\s*[<\"]platform/[^>\"]+/gps/",
+            )
+        ),
+        excludes=(
+            "platform/esp/arduino_common/include/ble/app_phone_facade.h",
+            "platform/esp/arduino_common/src/ble/app_phone_facade.cpp",
+            "platform/nrf52/arduino_common/include/ble/app_phone_facade.h",
+            "platform/nrf52/arduino_common/src/ble/app_phone_facade.cpp",
+        ),
+    ),
+    Rule(
+        name="ui-must-not-read-gps-driver-directly",
+        roots=("modules/ui_shared", "legacy/app_implementations/linux_uconsole", "platform/esp/arduino_common", "platform/linux"),
+        path_contains=("/ui/", "\\ui\\", "/gtk/", "\\gtk\\"),
+        patterns=compile_patterns(
+            (
+                r"\bGpsService\b",
+                r"\bIGnssByteStream\b",
+                r"\bNmeaParser\b",
+                r"\bgps_driver\b",
+                r"\bgps_uart\b",
+                r"#include\s*[<\"]platform/[^>\"]+/gps/",
+            )
+        ),
+    ),
+    Rule(
+        name="mesh-team-must-use-location-source-not-gps-driver",
+        roots=("modules/core_team", "modules/core_chat"),
+        patterns=compile_patterns(
+            (
+                r"\bGpsService\b",
+                r"\bIGnssByteStream\b",
+                r"\bNmeaParser\b",
+                r"\bboard\.gps\b",
+                r"#include\s*[<\"]platform/ui/gps_runtime\.h[>\"]",
+                r"#include\s*[<\"]platform/[^>\"]+/gps/",
+            )
+        ),
+    ),
+    Rule(
+        name="platform-gps-shell-must-not-own-ui-or-business",
+        roots=("platform",),
+        path_contains=("/gps/", "\\gps\\"),
+        patterns=compile_patterns(
+            (
+                r"\blv_obj_t\b",
+                r"\bGtkWidget\b",
+                r"\bChatService\b",
+                r"\bContactService\b",
+                r"\bDirectMessage\b",
+                r"\bMeshtasticPhoneCore\b",
+                r"\bMeshCorePhoneCore\b",
+            )
+        ),
+    ),
+    Rule(
+        name="lvgl-ui-must-not-access-storage-radio-gps-board-directly",
+        roots=("modules/ui_shared", "platform/esp/arduino_common", "legacy/app_implementations/esp_pio"),
+        path_contains=("/ui/", "\\ui\\"),
+        patterns=compile_patterns(
+            (
+                r"\bsqlite\b",
+                r"\bPreferences\b",
+                r"\bRadioLib\b",
+                r"\bsx1262\b",
+                r"\bgps\s*uart\b",
+                r"#include\s*[<\"]board/",
+                r"#include\s*[<\"]boards/",
+            )
+        ),
+    ),
+    Rule(
+        name="gtk-ui-must-not-own-protocol-store-radio",
+        roots=("legacy/app_implementations/linux_uconsole", "platform/linux"),
+        path_contains=("/gtk/", "\\gtk\\"),
+        patterns=compile_patterns(
+            (
+                r"\bprotocol parser\b",
+                r"\bstore direct mutation\b",
+                r"\bradio direct access\b",
+                r"#include\s*[<\"]chat/infra/",
+                r"#include\s*[<\"]platform/linux/sx126x_radio\.h[>\"]",
+            )
+        ),
+    ),
+    Rule(
+        name="ascii-ui-must-not-access-radio-gps-store-directly",
+        roots=("apps", "legacy/app_implementations", "platform/linux"),
+        path_regex=re.compile(r"(^|[/\\]).*(ascii|terminal|tui).*\.(c|cc|cpp|cxx|h|hh|hpp)$", re.IGNORECASE),
+        patterns=compile_patterns(
+            (
+                r"\bradio\b",
+                r"\bgps\b",
+                r"\bstore\b",
+                r"#include\s*[<\"]platform/linux/sx126x_radio\.h[>\"]",
+                r"#include\s*[<\"]platform/ui/gps_runtime\.h[>\"]",
+            )
+        ),
+    ),
+    Rule(
+        name="target-board-macros-should-stay-in-composition-roots",
+        roots=("apps", "modules", "platform", "boards", "src"),
+        patterns=compile_patterns(
+            (
+                r"\bBOARD_[A-Z0-9_]+",
+                r"\bTARGET_[A-Z0-9_]+",
+                r"\bCONFIG_IDF_TARGET[A-Z0-9_]*",
+            )
+        ),
+        excludes=(
+            "boards/",
+            "platform/esp/boards/",
+            "legacy/app_implementations/esp_idf/CMakeLists.txt",
+        ),
+    ),
+)
+
+
+def iter_source_files(root: Path):
+    for current_root, dir_names, file_names in os.walk(root):
+        dir_names[:] = [
+            name for name in dir_names if name not in EXCLUDED_DIR_NAMES
+        ]
+        current_root_path = Path(current_root)
+        for file_name in file_names:
+            path = current_root_path / file_name
+            if path.suffix.lower() in SOURCE_SUFFIXES:
+                yield path
+
+
+def relative_posix(path: Path) -> str:
+    return path.relative_to(REPO_ROOT).as_posix()
+
+
+def is_excluded(relative: str, excludes: tuple[str, ...]) -> bool:
+    return any(
+        relative == prefix.rstrip("/")
+        or relative.startswith(prefix.rstrip("/") + "/")
+        for prefix in excludes
+    )
+
+
+def path_matches(rule: Rule, relative: str) -> bool:
+    if rule.path_contains and not any(token in relative for token in rule.path_contains):
+        return False
+    if rule.path_regex is not None and rule.path_regex.search(relative) is None:
+        return False
+    return True
+
+
+def collect_violations() -> list[Violation]:
+    violations: list[Violation] = []
+    seen: set[tuple[str, Path]] = set()
+
+    for rule in RULES:
+        for root_name in rule.roots:
+            root = REPO_ROOT / root_name
+            if not root.exists():
+                continue
+            for path in iter_source_files(root):
+                relative = relative_posix(path)
+                if is_excluded(relative, rule.excludes):
+                    continue
+                if not path_matches(rule, relative):
+                    continue
+                key = (rule.name, path)
+                if key in seen:
+                    continue
+                seen.add(key)
+                lines = path.read_text(encoding="utf-8", errors="ignore").splitlines()
+                for line_number, line in enumerate(lines, start=1):
+                    if any(pattern.search(line) for pattern in rule.patterns):
+                        violations.append(
+                            Violation(
+                                rule_name=rule.name,
+                                path=path,
+                                line_number=line_number,
+                                line=line.strip(),
+                            )
+                        )
+    return violations
+
+
+def parse_args(argv: list[str]) -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        description="Report Trail Mate product architecture boundary drift."
+    )
+    parser.add_argument(
+        "--strict",
+        action="store_true",
+        help="Exit 1 when violations are found.",
+    )
+    parser.add_argument(
+        "--max",
+        type=int,
+        default=200,
+        help="Maximum violation lines to print.",
+    )
+    return parser.parse_args(argv)
+
+
+def main(argv: list[str]) -> int:
+    args = parse_args(argv)
+    violations = collect_violations()
+
+    if not violations:
+        print("Product architecture boundary report: no violations found.")
+        return 0
+
+    print("Product architecture boundary report")
+    print("Phase 1 mode: non-blocking report.")
+    print(f"Known historical violations log: {KNOWN_VIOLATIONS}")
+    print(f"Violations found: {len(violations)}")
+    print()
+
+    for violation in violations[: args.max]:
+        relative = relative_posix(violation.path)
+        print(f"- [{violation.rule_name}] {relative}:{violation.line_number}")
+        print(f"  {violation.line}")
+
+    if len(violations) > args.max:
+        print()
+        print(f"... {len(violations) - args.max} more not shown; increase --max to inspect.")
+
+    if args.strict:
+        return 1
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))
diff --git a/tools/architecture/check_real_target_regression_recovery_ready.py b/tools/architecture/check_real_target_regression_recovery_ready.py
new file mode 100644
index 00000000..6b951560
--- /dev/null
+++ b/tools/architecture/check_real_target_regression_recovery_ready.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+CHECKERS = [
+    "tools/architecture/check_uconsole_real_ui_restored.py",
+    "tools/architecture/check_pio_real_env_restored.py",
+    "tools/architecture/check_esp_arduino_real_targets_restored.py",
+    "tools/architecture/check_esp_idf_real_targets_restored.py",
+    "tools/architecture/check_no_root_legacy_ready.py",
+    "tools/architecture/check_all_target_architecture_ready.py",
+]
+
+
+def main() -> int:
+    failures: list[str] = []
+    for rel in CHECKERS:
+        path = ROOT / rel
+        if not path.is_file():
+            failures.append(f"missing checker: {rel}")
+            continue
+        result = subprocess.run(
+            [sys.executable, str(path)],
+            cwd=ROOT,
+            text=True,
+            capture_output=True,
+        )
+        if result.returncode != 0:
+            output = (result.stdout + result.stderr).strip()
+            failures.append(f"{rel} failed:\n{output}")
+
+    if failures:
+        for failure in failures:
+            print(f"[real-target-regression-recovery] {failure}")
+        return 1
+
+    print("[real-target-regression-recovery] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_target_architecture_foundation_ready.py b/tools/architecture/check_target_architecture_foundation_ready.py
new file mode 100644
index 00000000..565d7573
--- /dev/null
+++ b/tools/architecture/check_target_architecture_foundation_ready.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def require_file(rel: str, failures: list[str]) -> None:
+    if not (ROOT / rel).is_file():
+        failures.append(f"missing required file: {rel}")
+
+
+def require_tokens(rel: str, tokens: list[str], failures: list[str]) -> None:
+    path = ROOT / rel
+    if not path.is_file():
+        failures.append(f"missing file for token check: {rel}")
+        return
+    text = read(rel)
+    for token in tokens:
+        if token not in text:
+            failures.append(f"{rel} missing token: {token}")
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    for rel in [
+        "modules/product_composition/include/product_composition/target_profile.h",
+        "modules/product_composition/src/target_profile.cpp",
+        "modules/product_composition/tests/test_target_profile.cpp",
+        "modules/product_composition/include/product_composition/target_build_binding.h",
+        "modules/product_composition/src/target_build_binding.cpp",
+        "modules/product_composition/tests/test_target_build_binding.cpp",
+        "modules/product_composition/include/product_composition/target_ux_binding.h",
+        "modules/product_composition/src/target_ux_binding.cpp",
+        "modules/product_composition/tests/test_target_ux_binding.cpp",
+        "docs/targets/TARGET_MATRIX.md",
+    ]:
+        require_file(rel, failures)
+
+    all_targets = [
+        "tab5",
+        "tdisplayp4_tft",
+        "tdisplayp4_amoled",
+        "tlora_pager",
+        "tdeck",
+        "twatch",
+        "uconsole",
+        "cardputerzero",
+        "gat562_mesh_evb_pro",
+    ]
+
+    for rel in [
+        "modules/product_composition/src/target_profile.cpp",
+        "modules/product_composition/src/target_build_binding.cpp",
+        "modules/product_composition/tests/test_target_profile.cpp",
+        "modules/product_composition/tests/test_target_build_binding.cpp",
+    ]:
+        require_tokens(rel, all_targets, failures)
+
+    require_tokens(
+        "modules/product_composition/src/target_ux_binding.cpp",
+        all_targets,
+        failures,
+    )
+
+    require_tokens(
+        "modules/product_composition/include/product_composition/target_profile.h",
+        [
+            "TargetProfile",
+            "TargetPlatform",
+            "TargetRenderer",
+            "target_id",
+            "board_id",
+            "build_entrypoint",
+            "app_shell",
+            "ux_pack_id",
+            "ui_profile_id",
+            "page_manifest_id",
+            "layout_profile_id",
+            "TargetSupportStatus",
+            "findTargetProfile",
+        ],
+        failures,
+    )
+    require_tokens(
+        "modules/product_composition/include/product_composition/target_build_binding.h",
+        [
+            "TargetBuildBinding",
+            "sdkconfig_defaults",
+            "findTargetBuildBinding",
+        ],
+        failures,
+    )
+    require_tokens(
+        "docs/targets/TARGET_MATRIX.md",
+        [
+            "tab5",
+            "tdisplayp4_tft",
+            "tdisplayp4_amoled",
+            "tdeck",
+            "tlora_pager",
+            "twatch",
+            "uconsole",
+            "cardputerzero",
+            "gat562_mesh_evb_pro",
+            "ActiveWithFallback",
+            "PendingHardwareValidation",
+            "Headless",
+            "Final owner",
+        ],
+        failures,
+    )
+
+    if failures:
+        for failure in failures:
+            print(f"[target-architecture-foundation] {failure}")
+        return 1
+
+    print("[target-architecture-foundation] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/check_uconsole_real_ui_restored.py b/tools/architecture/check_uconsole_real_ui_restored.py
new file mode 100644
index 00000000..15f2a242
--- /dev/null
+++ b/tools/architecture/check_uconsole_real_ui_restored.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+
+REQUIRED_GTK_SOURCES = [
+    "apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_app.cpp",
+    "apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_pages.cpp",
+    "apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_chat_layout.cpp",
+    "apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_chat_logic.cpp",
+    "apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_map_layout.cpp",
+    "apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_map_logic.cpp",
+    "apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_overview_layout.cpp",
+    "apps/linux_uconsole_gtk/src/platform/gtk/gtk_uconsole_settings_layout.cpp",
+]
+
+
+def read(rel: str) -> str:
+    return (ROOT / rel).read_text(encoding="utf-8", errors="ignore")
+
+
+def main() -> int:
+    failures: list[str] = []
+
+    for rel in REQUIRED_GTK_SOURCES:
+        if not (ROOT / rel).is_file():
+            failures.append(f"missing restored uConsole GTK source: {rel}")
+
+    cmake_rel = "apps/linux_uconsole_gtk/CMakeLists.txt"
+    cmake = read(cmake_rel) if (ROOT / cmake_rel).is_file() else ""
+    for rel in REQUIRED_GTK_SOURCES:
+        token = rel.removeprefix("apps/linux_uconsole_gtk/")
+        if token not in cmake:
+            failures.append(f"{cmake_rel} does not list {token}")
+
+    for rel in [
+        "apps/linux_uconsole_gtk/packaging/trailmate-uconsole.desktop",
+        "apps/linux_uconsole_gtk/packaging/trailmate-uconsole.png",
+        "apps/linux_uconsole_gtk/tools/sx1262_probe.cpp",
+        "apps/linux_uconsole_gtk/src/targets/uconsole_main.cpp",
+    ]:
+        if not (ROOT / rel).is_file():
+            failures.append(f"missing restored uConsole packaging/tool file: {rel}")
+
+    if (ROOT / "apps/linux_uconsole").exists():
+        failures.append("apps/linux_uconsole/ must not be restored")
+
+    if failures:
+        for failure in failures:
+            print(f"[uconsole-real-ui] {failure}")
+        return 1
+
+    print("[uconsole-real-ui] OK")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/tools/architecture/phase5_renderer_legacy_baseline.json b/tools/architecture/phase5_renderer_legacy_baseline.json
new file mode 100644
index 00000000..500cc24a
--- /dev/null
+++ b/tools/architecture/phase5_renderer_legacy_baseline.json
@@ -0,0 +1,128 @@
+{
+  "phase": "5.9",
+  "purpose": "renderer legacy boundary baseline",
+  "known_legacy_islands": [
+    {
+      "id": "chat-ui-controller-legacy",
+      "path": "modules/ui_shared/src/ui/screens/chat/chat_ui_controller.cpp",
+      "allowed_tokens": [
+        "ChatService",
+        "ContactService",
+        "TeamUiStore",
+        "gps_runtime",
+        "service_.getRecentMessages",
+        "service_.getConversations"
+      ],
+      "reason": "legacy application controller documented in CHAT_UI_CONTROLLER_LEGACY_OWNERSHIP_AUDIT.md",
+      "future_phase": "chat-renderer-cleanup"
+    },
+    {
+      "id": "chat-ui-controller-header-legacy",
+      "path": "modules/ui_shared/include/ui/screens/chat/chat_ui_controller.h",
+      "allowed_tokens": [
+        "ChatService"
+      ],
+      "reason": "ChatUiController still owns event handling, compatibility refresh, and legacy island lifecycle",
+      "future_phase": "chat-renderer-cleanup"
+    },
+    {
+      "id": "gps-page-state-legacy",
+      "path": "modules/ui_shared/src/ui/screens/gps",
+      "allowed_tokens": [
+        "platform/ui/gps_runtime.h",
+        "GPSPageState",
+        "map_viewport",
+        "map_tiles"
+      ],
+      "reason": "legacy LVGL GPS/map page state documented in MAP_UI_LEGACY_OWNERSHIP_AUDIT.md",
+      "future_phase": "map-renderer-cleanup"
+    },
+    {
+      "id": "lvgl-map-viewport-legacy",
+      "path": "modules/ui_shared/src/ui/widgets/map",
+      "allowed_tokens": [
+        "map_tiles",
+        "lv_obj_t",
+        "lvgl"
+      ],
+      "reason": "map viewport remains the legacy tile renderer/runtime surface",
+      "future_phase": "map-renderer-cleanup"
+    },
+    {
+      "id": "lvgl-dashboard-widgets-legacy",
+      "path": "modules/ui_shared/src/ui/menu/dashboard",
+      "allowed_tokens": [
+        "platform/ui/gps_runtime.h",
+        "ContactService",
+        "ChatService",
+        "messagingFacade"
+      ],
+      "reason": "dashboard widgets are being hardened incrementally through presentation snapshots",
+      "future_phase": "dashboard-renderer-cleanup"
+    },
+    {
+      "id": "uconsole-map-model-legacy",
+      "path": "platform/linux/uconsole/src/uconsole_map_workspace_model.cpp",
+      "allowed_tokens": [
+        "map_tiles_around",
+        "ensureTile",
+        "ensureContourTiles",
+        "MapTileCache"
+      ],
+      "reason": "uConsole tile/cache/contour enumeration remains outside MapWorkspaceSnapshot",
+      "future_phase": "uconsole-map-renderer-cleanup"
+    },
+    {
+      "id": "uconsole-map-model-header-legacy",
+      "path": "platform/linux/uconsole/include/uconsole/uconsole_map_workspace_model.h",
+      "allowed_tokens": [
+        "MapTileCache",
+        "MapTileCacheStats"
+      ],
+      "reason": "uConsole map model still owns platform tile/cache state as a bounded legacy app model",
+      "future_phase": "uconsole-map-renderer-cleanup"
+    },
+    {
+      "id": "uconsole-chat-model-legacy",
+      "path": "platform/linux/uconsole/src/uconsole_chat_workspace_model.cpp",
+      "allowed_tokens": [
+        "platform/ui/gps_runtime.h",
+        "ChatService",
+        "ContactService"
+      ],
+      "reason": "uConsole chat app model still contains legacy compatibility reads and command paths",
+      "future_phase": "uconsole-chat-renderer-cleanup"
+    },
+    {
+      "id": "uconsole-dashboard-model-legacy",
+      "path": "platform/linux/uconsole/src/uconsole_dashboard_model.cpp",
+      "allowed_tokens": [
+        "platform/ui/gps_runtime.h",
+        "ChatService",
+        "ContactService",
+        "MapTileCache"
+      ],
+      "reason": "uConsole dashboard app model remains a platform application model, not a pure renderer",
+      "future_phase": "uconsole-dashboard-renderer-cleanup"
+    },
+    {
+      "id": "uconsole-gtk-overview-legacy",
+      "path": "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_uconsole_overview_logic.cpp",
+      "allowed_tokens": [
+        "platform/ui/gps_runtime.h"
+      ],
+      "reason": "GTK overview logic still contains legacy GPS compatibility reads and is not part of the Phase 5.9 map presentation bridge",
+      "future_phase": "uconsole-gtk-renderer-cleanup"
+    },
+    {
+      "id": "tracker-route-overlay-legacy",
+      "path": "modules/ui_shared/src/ui/screens/tracker",
+      "allowed_tokens": [
+        "platform/ui/route_storage.h",
+        "route_storage"
+      ],
+      "reason": "route/tracker overlays are outside Phase 5.9 renderer hardening",
+      "future_phase": "route-renderer-cleanup"
+    }
+  ]
+}
diff --git a/tools/architecture/phase6_composition_legacy_baseline.json b/tools/architecture/phase6_composition_legacy_baseline.json
new file mode 100644
index 00000000..40683c6f
--- /dev/null
+++ b/tools/architecture/phase6_composition_legacy_baseline.json
@@ -0,0 +1,106 @@
+{
+  "phase": "6",
+  "purpose": "product composition legacy boundary baseline",
+  "known_legacy_composition_surfaces": [
+    {
+      "id": "esp-pio-app-context",
+      "path": "legacy/app_implementations/esp_pio/src/app_context.cpp",
+      "allowed_tokens": [
+        "AppContext",
+        "ChatService",
+        "ContactService",
+        "TeamService",
+        "IMeshAdapter"
+      ],
+      "reason": "ESP Arduino app services still live behind the documented AppContext legacy bridge.",
+      "future_phase": "esp-composition-root-migration"
+    },
+    {
+      "id": "esp-pio-runtime-access",
+      "path": "legacy/app_implementations/esp_pio/src/app_runtime_access.cpp",
+      "allowed_tokens": [
+        "AppContext::getInstance",
+        "bootstrapAppContext",
+        "resolveAppContextInitHandles"
+      ],
+      "reason": "ESP Arduino startup currently resolves board/runtime handles before AppContext bootstrapping.",
+      "future_phase": "esp-startup-composition-root"
+    },
+    {
+      "id": "esp-idf-app-facade-runtime",
+      "path": "legacy/app_implementations/esp_idf/src/app_facade_runtime.cpp",
+      "allowed_tokens": [
+        "MinimalAppFacade",
+        "bindAppFacade",
+        "AppContextInitHandles"
+      ],
+      "reason": "ESP-IDF still uses an app facade runtime bridge while target startup is preserved.",
+      "future_phase": "esp-idf-composition-root"
+    },
+    {
+      "id": "global-app-facade-access",
+      "path": "modules/core_sys/src/app/app_facade_access.cpp",
+      "allowed_tokens": [
+        "g_app_facade",
+        "bindAppFacade",
+        "appFacade"
+      ],
+      "reason": "Global facade access remains a bounded compatibility bridge for legacy UI islands.",
+      "future_phase": "appcontext-removal"
+    },
+    {
+      "id": "chat-page-runtime-presentation-bridge",
+      "path": "modules/ui_shared/src/ui/screens/chat/chat_page_runtime.cpp",
+      "allowed_tokens": [
+        "ChatPresentationSource",
+        "LegacyChatActionSink",
+        "TeamChatPresentationSource",
+        "TeamChatActionSink",
+        "ChatWorkspaceModel"
+      ],
+      "reason": "Chat page runtime still constructs presentation adapters until the LVGL shell has a full composition binding.",
+      "future_phase": "lvgl-chat-composition-root"
+    },
+    {
+      "id": "gps-page-runtime-presentation-bridge",
+      "path": "modules/ui_shared/src/ui/screens/gps/gps_page_runtime.cpp",
+      "allowed_tokens": [
+        "LegacyMapPresentationSource",
+        "LegacyMapActionSink",
+        "MapWorkspaceModel"
+      ],
+      "reason": "GPS page runtime still constructs the map presentation bridge as a legacy renderer island.",
+      "future_phase": "lvgl-map-composition-root"
+    },
+    {
+      "id": "dashboard-status-widget-bridge",
+      "path": "modules/ui_shared/src/ui/menu/dashboard/dashboard_gps_widget.cpp",
+      "allowed_tokens": [
+        "LegacyGpsStatusSource",
+        "GpsStatusModel"
+      ],
+      "reason": "Dashboard GPS widget is hardened through snapshots but still owns local bridge construction.",
+      "future_phase": "dashboard-composition-binding"
+    },
+    {
+      "id": "gtk-uconsole-app-state-legacy",
+      "path": "legacy/app_implementations/linux_uconsole/src/platform/gtk/gtk_uconsole_app_state.h",
+      "allowed_tokens": [
+        "LinuxAppServices",
+        "UConsoleChatWorkspaceModel",
+        "UConsoleMapWorkspaceModel"
+      ],
+      "reason": "Existing GTK app state still owns uConsole app models until the GTK shell consumes UConsoleCompositionRoot.",
+      "future_phase": "uconsole-gtk-shell-composition-root"
+    },
+    {
+      "id": "uconsole-desktop-shell-legacy",
+      "path": "platform/linux/uconsole/src/uconsole_desktop_shell.cpp",
+      "allowed_tokens": [
+        "LinuxAppServices"
+      ],
+      "reason": "Legacy framebuffer shell still owns LinuxAppServices as a bounded pre-root surface.",
+      "future_phase": "uconsole-shell-composition-root"
+    }
+  ]
+}
diff --git a/tools/architecture/scan_legacy_compat_temp_surfaces.py b/tools/architecture/scan_legacy_compat_temp_surfaces.py
new file mode 100644
index 00000000..853a169e
--- /dev/null
+++ b/tools/architecture/scan_legacy_compat_temp_surfaces.py
@@ -0,0 +1,197 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import subprocess
+from collections import defaultdict
+from dataclasses import dataclass
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[2]
+OUTPUT = ROOT / "docs/audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md"
+
+KEYWORDS = [
+    "legacy",
+    "compat",
+    "compatibility",
+    "transitional",
+    "temporary",
+    "fallback",
+    "shim",
+    "deprecated",
+    "archive-only",
+    "adapter",
+    "bridge",
+    "probe",
+    "smoke",
+]
+
+TEXT_SUFFIXES = {
+    ".c",
+    ".cc",
+    ".cpp",
+    ".cxx",
+    ".h",
+    ".hpp",
+    ".cmake",
+    ".ini",
+    ".json",
+    ".md",
+    ".py",
+    ".txt",
+    ".yaml",
+    ".yml",
+}
+
+EXCLUDED_PREFIXES = (
+    "third_party/",
+    "site/assets/",
+    "docs/images/",
+    "docs/EnergySweep/",
+)
+
+EXCLUDED_PARTS = {
+    ".git",
+    ".vs",
+    ".vscode",
+    "build",
+    "build.tab5",
+    "builds-out",
+    "cmake-build-debug",
+    "cmake-build-release",
+    "_deps",
+}
+
+EXCLUDED_FILES = {
+    "docs/audits/LEGACY_COMPAT_TEMP_SURFACE_SCAN.md",
+}
+
+
+@dataclass
+class Match:
+    keyword: str
+    path: str
+    line: int
+    text: str
+
+
+def git_files() -> list[str]:
+    result = subprocess.run(
+        ["git", "ls-files"],
+        cwd=ROOT,
+        check=True,
+        text=True,
+        encoding="utf-8",
+        errors="ignore",
+        capture_output=True,
+    )
+    return [line.strip() for line in result.stdout.splitlines() if line.strip()]
+
+
+def should_scan(rel: str) -> bool:
+    if rel in EXCLUDED_FILES:
+        return False
+    if rel.startswith(EXCLUDED_PREFIXES):
+        return False
+    path = Path(rel)
+    if set(path.parts).intersection(EXCLUDED_PARTS):
+        return False
+    return path.suffix.lower() in TEXT_SUFFIXES
+
+
+def scan() -> list[Match]:
+    matches: list[Match] = []
+    lowered_keywords = [(keyword, keyword.lower()) for keyword in KEYWORDS]
+    for rel in git_files():
+        if not should_scan(rel):
+            continue
+        path = ROOT / rel
+        if not path.exists():
+            continue
+        try:
+            lines = path.read_text(encoding="utf-8", errors="ignore").splitlines()
+        except OSError:
+            continue
+        rel_posix = rel.replace("\\", "/")
+        rel_lower = rel_posix.lower()
+        path_keywords = [
+            keyword for keyword, lowered in lowered_keywords if lowered in rel_lower
+        ]
+        for keyword in path_keywords:
+            matches.append(Match(keyword, rel_posix, 0, "(path match)"))
+        for line_no, line in enumerate(lines, start=1):
+            lowered_line = line.lower()
+            for keyword, lowered in lowered_keywords:
+                if lowered in lowered_line:
+                    matches.append(
+                        Match(keyword, rel_posix, line_no, line.strip()[:180].strip())
+                    )
+    return matches
+
+
+def render(matches: list[Match]) -> str:
+    by_keyword: dict[str, list[Match]] = defaultdict(list)
+    by_path: dict[str, set[str]] = defaultdict(set)
+    for match in matches:
+        by_keyword[match.keyword].append(match)
+        by_path[match.path].add(match.keyword)
+
+    lines: list[str] = [
+        "# Legacy / Compatibility / Temporary Surface Scan",
+        "",
+        "Generated by `tools/architecture/scan_legacy_compat_temp_surfaces.py`.",
+        "",
+        "This scan is discovery input only. It is not a disposition decision and",
+        "must be interpreted through `LEGACY_COMPAT_TEMP_SURFACE_INVENTORY.md`.",
+        "",
+        "## Keyword Counts",
+        "",
+        "| Keyword | Matches | Paths |",
+        "| --- | ---: | ---: |",
+    ]
+
+    for keyword in KEYWORDS:
+        keyword_matches = by_keyword.get(keyword, [])
+        paths = {match.path for match in keyword_matches}
+        lines.append(f"| `{keyword}` | {len(keyword_matches)} | {len(paths)} |")
+
+    lines.extend(
+        [
+            "",
+            "## Matched Paths",
+            "",
+            "| Path | Keywords |",
+            "| --- | --- |",
+        ]
+    )
+    for path in sorted(by_path):
+        keywords = ", ".join(f"`{keyword}`" for keyword in sorted(by_path[path]))
+        lines.append(f"| `{path}` | {keywords} |")
+
+    lines.extend(["", "## Sample Matches By Keyword", ""])
+    for keyword in KEYWORDS:
+        lines.extend([f"### `{keyword}`", ""])
+        for match in by_keyword.get(keyword, [])[:60]:
+            if match.line == 0:
+                lines.append(f"- `{match.path}`: path match")
+            else:
+                lines.append(f"- `{match.path}:{match.line}`: {match.text}")
+        if len(by_keyword.get(keyword, [])) > 60:
+            remaining = len(by_keyword[keyword]) - 60
+            lines.append(f"- ... {remaining} additional matches omitted")
+        lines.append("")
+
+    return "\n".join(lines).rstrip() + "\n"
+
+
+def main() -> int:
+    matches = scan()
+    OUTPUT.parent.mkdir(parents=True, exist_ok=True)
+    OUTPUT.write_text(render(matches), encoding="utf-8")
+    print(f"[legacy-compat-temp-scan] wrote {OUTPUT.relative_to(ROOT).as_posix()}")
+    print(f"[legacy-compat-temp-scan] matches: {len(matches)}")
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/variants/gat562_mesh_evb_pro/envs/gat562_mesh_evb_pro.ini b/variants/gat562_mesh_evb_pro/envs/gat562_mesh_evb_pro.ini
index e77b0d40..e3968213 100644
--- a/variants/gat562_mesh_evb_pro/envs/gat562_mesh_evb_pro.ini
+++ b/variants/gat562_mesh_evb_pro/envs/gat562_mesh_evb_pro.ini
@@ -48,6 +48,7 @@ build_flags =
     -I${PROJECT_DIR}/platform/nrf52/arduino_common/include
     -I${PROJECT_DIR}/platform/shared/include
     -I${PROJECT_DIR}/variants/gat562_mesh_evb_pro
+    -I${PROJECT_DIR}/modules/core_phone/include
     -I${PROJECT_DIR}/modules/core_sys/include
     -I${PROJECT_DIR}/modules/core_chat/include
     -I${PROJECT_DIR}/modules/core_chat/generated
@@ -65,9 +66,10 @@ lib_extra_dirs =
     ${PROJECT_DIR}/modules
     ${PROJECT_DIR}/apps
     ${PROJECT_DIR}/boards
-    ${PROJECT_DIR}/platform/nrf52
     ${PROJECT_DIR}/third_party
 lib_deps =
+    symlink://platform/nrf52
+    symlink://platform/nrf52/arduino_common
     jgromes/RadioLib @ 7.4.0
     mikalhart/TinyGPSPlus @ 1.0.3
     nanopb/nanopb @ ^0.4.8
@@ -78,5 +80,19 @@ lib_deps =
     Adafruit nRFCrypto
 lib_ignore =
     apps_esp_pio
+    trailmate_esp32_lvgl_app_shell
+    esp_arduino_common
+    esp_boards
+    esp_idf_common
+    arduino_audio_codec
+    ui_shared
+    ui_chat_runtime
+    ui_key_verification_runtime
+    ui_gps_runtime
+    ui_map_runtime
+    ui_legacy_adapters
+    ui_lvgl_core
+    ui_lvgl_ux_packs
+    chat_presentation_adapters
     core_team
     core_hostlink
diff --git a/variants/lilygo_tlora_pager/envs/tlora_pager.ini b/variants/lilygo_tlora_pager/envs/tlora_pager.ini
index 636a8374..ef9be5f7 100644
--- a/variants/lilygo_tlora_pager/envs/tlora_pager.ini
+++ b/variants/lilygo_tlora_pager/envs/tlora_pager.ini
@@ -48,52 +48,3 @@ lib_deps =
     adafruit/Adafruit BusIO @ 1.17.0
     https://github.com/stm32duino/ST25R3916.git#2.0.2
     https://github.com/vicliu624/NFC-RFAL.git
-
-[env:tlora_pager_sx1280]
-extends = arduino_base
-board = lilygo-t-lora-pager
-build_src_filter =
-    +<*>
-    -<ui/watch_face.cpp>
-    -<ui/screens/chat_watch/>
-    -<input/morse_engine.cpp>
-build_flags =
-    ${arduino_base.build_flags}
-    -D SCREEN_WIDTH=480
-    -D SCREEN_HEIGHT=222
-    -D ARDUINO_T_LORA_PAGER
-    -D ARDUINO_LILYGO_LORA_SX1280
-    -DTRAIL_MATE_LORA_TX_POWER_MAX_DBM=13
-    -I variants/lilygo_tlora_pager
-lib_deps =
-    ${arduino_base.lib_deps}
-    adafruit/Adafruit TCA8418 @ 1.0.2
-    adafruit/Adafruit BusIO @ 1.17.0
-    https://github.com/stm32duino/ST25R3916.git#2.0.2
-    https://github.com/vicliu624/NFC-RFAL.git
-
-[env:tlora_pager_sx1280_debug]
-extends = arduino_base
-board = lilygo-t-lora-pager
-build_src_filter =
-    +<*>
-    -<ui/watch_face.cpp>
-    -<ui/screens/chat_watch/>
-    -<input/morse_engine.cpp>
-build_flags =
-    ${arduino_base.build_flags}
-    -D SCREEN_WIDTH=480
-    -D SCREEN_HEIGHT=222
-    -D ARDUINO_T_LORA_PAGER
-    -D ARDUINO_LILYGO_LORA_SX1280
-    -DTRAIL_MATE_LORA_TX_POWER_MAX_DBM=13
-    -D MESHCORE_LOG_ENABLE=1
-    -D LORA_LOG_ENABLE=1
-    -D APP_EVENT_LOG_ENABLE=1
-    -I variants/lilygo_tlora_pager
-lib_deps =
-    ${arduino_base.lib_deps}
-    adafruit/Adafruit TCA8418 @ 1.0.2
-    adafruit/Adafruit BusIO @ 1.17.0
-    https://github.com/stm32duino/ST25R3916.git#2.0.2
-    https://github.com/vicliu624/NFC-RFAL.git
diff --git a/variants/lilygo_twatch_s3/envs/lilygo_twatch_s3.ini b/variants/lilygo_twatch_s3/envs/lilygo_twatch_s3.ini
index ee1324a3..fb21713f 100644
--- a/variants/lilygo_twatch_s3/envs/lilygo_twatch_s3.ini
+++ b/variants/lilygo_twatch_s3/envs/lilygo_twatch_s3.ini
@@ -6,6 +6,7 @@ board_build.psram_type = qspi
 build_src_filter =
     +<*>
     -<ui/screens/chat/>
+    -<modules/ui_shared/src/ui/screens/chat/>
 build_flags =
     ${arduino_base.build_flags}
     -DBOARD_HAS_PSRAM=1
@@ -36,6 +37,7 @@ board_build.psram_type = qspi
 build_src_filter =
     +<*>
     -<ui/screens/chat/>
+    -<modules/ui_shared/src/ui/screens/chat/>
 build_flags =
     ${arduino_base.build_flags}
     -DBOARD_HAS_PSRAM=1