Refactor unified build modifier logic in targets.py to clarify group conditions for app compatibility

Author: asirko-soft

scripts/build/build/targets.py

@@ -208,30 +208,20 @@ def BuildHostTarget():
     # Standalone modifiers
     target.AppendModifier('no-read-client', chip_enable_read_client=False)
 
-    # Unified build modifier - automatically selects compatible group
-    # The unified_group is determined by the combination of other modifiers
+    # Unified build modifier
+    # Main group: apps that work with default settings can always use -unified
+    # Group 2: energy-management, jf-admin-app, light-data-model-no-unique-id can use -unified
+    #          ONLY when -no-read-client is also present
+    # Group 3: fabric-admin, fabric-bridge, jf-control-app can use -unified
+    #          ONLY when -rpc is also present
     target.AppendModifier('unified', unified=True).OnlyIfRe(
-        "-(" + "|".join([
-            # keep-sorted start
-            'air-purifier',
-            'bridge',
-            'closure',
-            'energy-management',
-            'fabric-admin',
-            'fabric-bridge',
-            'jf-admin-app',
-            'jf-control-app',
-            'light',
-            'light-data-model-no-unique-id',
-            'lock',
-            'microwave-oven',
-            'ota-provider',
-            'rvc',
-            'thermostat',
-            'tv-app',
-            'water-leak-detector',
-            # keep-sorted end
-        ]) + ")-")
+        # Main group - always allow unified
+        "-(air-purifier|bridge|closure|light(?!-data-model-no-unique-id)|lock|microwave-oven|ota-provider|rvc|thermostat|tv-app|water-leak-detector)-[^-]*(-[^-]*)*-unified|"
+        # Group 2 - only with -no-read-client and -unified
+        "-(energy-management|jf-admin-app|light-data-model-no-unique-id)(-[^-]*)*-no-read-client(-[^-]*)*-unified|"
+        # Group 3 - only with -rpc and -unified
+        "-(fabric-admin|fabric-bridge|jf-control-app)(-[^-]*)*-rpc(-[^-]*)*-unified"
+    )
 
     return target