From 147694f2d77622150837c531d5e940a4c0ede929 Mon Sep 17 00:00:00 2001
From: David Montero Crespo <davidmonterocrespo24@gmail.com>
Date: Wed, 19 Aug 2026 19:56:45 +0200
Subject: [PATCH] fix(espidf): demote nested junk-named dirs to header-only;
 require esp_http_server

Two more merge gaps surfaced by FastLED 3.10 + U8g2 in one sketch:

- src/fl/test/ was fully dropped because 'test' matched the generic
  excluded_dirs check at ANY depth, but FastLED's unity build includes
  "fl/test/_build.cpp.hpp". Repo-level dirs named test/examples/docs
  stay fully excluded; the same names nested inside a src-layout tree are
  now header-only (fragments copied, sources still never compiled).

- FastLED's fl/net remote code includes <esp_http_server.h>, which the
  Arduino IDE provides via the core's global include path. Add
  esp_http_server to the merged component's guarded REQUIRES list.
---
 backend/app/services/espidf_compiler.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/backend/app/services/espidf_compiler.py b/backend/app/services/espidf_compiler.py
index c73868ca..a02a6db7 100644
--- a/backend/app/services/espidf_compiler.py
+++ b/backend/app/services/espidf_compiler.py
@@ -1646,11 +1646,23 @@ class ESPIDFCompiler:
 
                 def _should_include(rel_path: Path) -> bool:
                     parts = rel_path.parts
-                    if any(part.lower() in excluded_dirs for part in parts[:-1]):
+                    # A dir named test/examples/docs/... at the REPO level is
+                    # repo-only content: fully excluded. The same name NESTED
+                    # inside src/ is library code — FastLED has src/fl/test/
+                    # whose _build.cpp.hpp the unity build #includes — so
+                    # nested matches are demoted to header-only (fragments
+                    # copied, sources never compiled) instead of dropped.
+                    if parts[0].lower() in excluded_dirs and len(parts) > 1:
+                        return False
+                    nested_junk = any(
+                        p.lower() in excluded_dirs for p in parts[1:-1]
+                    )
+                    if not has_src_layout and nested_junk:
                         return False
                     if (rel_path.suffix.lower() in ('.c', '.cpp')
-                            and any(p.lower() in header_only_dirs
-                                    for p in parts[:-1])):
+                            and (nested_junk
+                                 or any(p.lower() in header_only_dirs
+                                        for p in parts[:-1]))):
                         return False
                     # Copy compiled sources (.c/.cpp) AND every flavour of header
                     # or text-included fragment. `.inl`/`.inc`/`.ipp`/`.tcc` are
@@ -1768,9 +1780,12 @@ class ESPIDFCompiler:
         # at a time (nvs.h, then esp_efuse.h, ... — M5GFX/M5Unified touch
         # several). Require the standard set Arduino-facing libraries lean
         # on, guarded on existence so both IDF generations stay happy.
+        # esp_http_server: FastLED 3.10's fl/net remote-control code includes
+        # <esp_http_server.h>; in Arduino IDE builds it arrives through the
+        # core's global include path, here it must be an explicit REQUIRES.
         for _comp in ('nvs_flash', 'efuse', 'esp_timer', 'driver',
                       'spi_flash', 'esp_adc', 'esp_wifi', 'esp_event',
-                      'esp_netif', 'esp_partition'):
+                      'esp_netif', 'esp_partition', 'esp_http_server'):
             for _root in filter(None, (self.idf5_path, self.idf_path)):
                 if os.path.isdir(os.path.join(_root, 'components', _comp)):
                     extra_requires += f' {_comp}'