From 6ee4a195e1fe8b6963c379c800f7fb4bf20e5704 Mon Sep 17 00:00:00 2001
From: mikecarper <mikecarper@gmail.com>
Date: Fri, 4 Sep 2026 11:41:01 -0700
Subject: [PATCH] Route reduced ESP32 overflow aliases to Full

---
 build.sh                    | 31 +++++++++++++++++++++++++------
 test/test_build_profiles.sh | 12 +++++++++---
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index af7b1e92..6499b094 100755
--- a/build.sh
+++ b/build.sh
@@ -4907,7 +4907,7 @@ run_logged_build_targets() {
       if [ "$build_status" -eq 42 ] \
           && [ "${DEFER_ESP32_PORTABLE_OVERFLOW_TO_FULL:-0}" = "1" ] \
           && [ "$profile" = "standard" ] \
-          && supports_esp32_full_build "$env"; then
+          && has_esp32_full_profile "$env"; then
         LOGGING_MATRIX_DEFERRED_TARGETS+=("$env")
         echo "DEFERRED: ${env} (${profile}) exceeds the portable OTA slot; the expanded FULL pass is required."
         echo "DEFERRED: ${env} (${profile}) exceeds the portable OTA slot; the expanded FULL pass is required." >> "$log_path"
@@ -5026,7 +5026,7 @@ run_logged_build_targets() {
     if [ "$build_status" -eq 42 ] \
         && [ "${DEFER_ESP32_PORTABLE_OVERFLOW_TO_FULL:-0}" = "1" ] \
         && [ "$profile" = "standard" ] \
-        && supports_esp32_full_build "$env"; then
+        && has_esp32_full_profile "$env"; then
       LOGGING_MATRIX_DEFERRED_TARGETS+=("$env")
       echo "DEFERRED: ${env} (${profile}) exceeds the portable OTA slot; the expanded FULL pass is required."
       echo "DEFERRED: ${env} (${profile}) exceeds the portable OTA slot; the expanded FULL pass is required." >> "$log_path"
@@ -5059,10 +5059,27 @@ run_logged_build_targets() {
   return "$overall_status"
 }
 
-has_esp32_full_profile() {
+get_esp32_full_profile_target() {
   local target=$1
+
+  # Synthetic reduced LoRa-OTA aliases share an expanded FULL replacement
+  # with their complete base repeater. Resolve that base before looking for
+  # MQTT/unified siblings so a portable overflow is deferred only when the
+  # replacement can actually be built.
+  if is_lora_ota_only_target "$target"; then
+    local complete_target=${PIO_ENV_COMPLETE_OTA_BASE_BY_NAME[$target]:-${target%_lora_ota_no_external_sensors}}
+    if is_supported_build_env "$complete_target"; then
+      target=$complete_target
+    fi
+  fi
+  echo "$target"
+}
+
+has_esp32_full_profile() {
+  local target
   local candidate=""
 
+  target=$(get_esp32_full_profile_target "$1")
   candidate=$(get_mqtt_enabled_target "$target") || candidate=""
   if [ -n "$candidate" ] && supports_esp32_full_build "$candidate"; then
     return 0
@@ -5077,6 +5094,7 @@ run_full_esp32_profile() {
   shift 2
   local targets=("$@")
   local target
+  local full_profile_target
   local full_target
   local mqtt_target
   local full_targets=()
@@ -5091,17 +5109,18 @@ run_full_esp32_profile() {
   local pass_status=0
 
   for target in "${targets[@]}"; do
+    full_profile_target=$(get_esp32_full_profile_target "$target")
     full_target=""
     if [ "$profile_mode" = "fallback" ]; then
       # A matching MQTT environment is emitted once by the unified profile;
       # do not also build its former non-MQTT FULL-logging twin.
-      mqtt_target=$(get_mqtt_enabled_target "$target") || mqtt_target=""
+      mqtt_target=$(get_mqtt_enabled_target "$full_profile_target") || mqtt_target=""
       if [ -n "$mqtt_target" ] && supports_esp32_full_build "$mqtt_target"; then
         continue
       fi
-      full_target=$(get_mqtt_disabled_target "$target") || full_target=""
+      full_target=$(get_mqtt_disabled_target "$full_profile_target") || full_target=""
     else
-      full_target=$(get_mqtt_enabled_target "$target") || full_target=""
+      full_target=$(get_mqtt_enabled_target "$full_profile_target") || full_target=""
     fi
     if [ -z "$full_target" ] || ! supports_esp32_full_build "$full_target"; then
       continue
diff --git a/test/test_build_profiles.sh b/test/test_build_profiles.sh
index 97acc698..29b74c34 100644
--- a/test/test_build_profiles.sh
+++ b/test/test_build_profiles.sh
@@ -783,8 +783,8 @@ fi
 
 # Option 3 must not publish an oversized standard ESP32 image, but its expected
 # portable-slot status is satisfied by the mandatory expanded FULL pass.
-saved_supports_esp32_full_build=$(declare -f supports_esp32_full_build)
-supports_esp32_full_build() { [ "$1" = esp32_portable_overflow ]; }
+saved_has_esp32_full_profile=$(declare -f has_esp32_full_profile)
+has_esp32_full_profile() { [ "$1" = esp32_portable_overflow ]; }
 build_firmware() { return 42; }
 saved_output_dir=$OUTPUT_DIR
 OUTPUT_DIR=$version_test_dir
@@ -802,7 +802,13 @@ fi
   || fail "portable ESP32 overflow was not deferred to FULL"
 OUTPUT_DIR=$saved_output_dir
 unset DEFER_ESP32_PORTABLE_OVERFLOW_TO_FULL
-eval "$saved_supports_esp32_full_build"
+eval "$saved_has_esp32_full_profile"
+
+reduced_full_alias=Tbeam_SX1262_repeater_lora_ota_no_external_sensors
+[ "$(get_esp32_full_profile_target "$reduced_full_alias")" = Tbeam_SX1262_repeater ] \
+  || fail "reduced ESP32 LoRa OTA alias did not resolve to its FULL base target"
+has_esp32_full_profile "$reduced_full_alias" \
+  || fail "reduced ESP32 LoRa OTA alias lost its expanded FULL replacement"
 
 calls=()
 build_firmware() {