feat(predicates): units_of_type_in_region_gte — type-filtered region count

Wave-5 coord-squad-handoff and friends need to enforce SQUAD IDENTITY
at a waypoint ('Squad A — 3 jeeps — at P1; Squad B — 3 tanks — at
P2') so a single-squad tour cannot satisfy two type-distinct clauses
in series. Pair with then: composite for ordered squad handoff.

Form: {type, x, y, radius, n}
Phrase translation + test coverage included. Confined to bench-side
(no Rust changes needed).

Author: a Wave-5 worktree agent (untracked when their push was
blocked; salvaged and committed from the main session).

openra_bench/game_knowledge.py

@@ -142,7 +142,12 @@ def scenario_primer(compiled: Any) -> str:
 
 # ── win/fail predicate → plain language ────────────────────────────────────
 
-_REGION_KEYS = ("reach_region", "units_in_region_gte", "all_units_in_region")
+_REGION_KEYS = (
+    "reach_region",
+    "units_in_region_gte",
+    "units_of_type_in_region_gte",
+    "all_units_in_region",
+)
 
 
 def _region(x: Any, coords: str = "exact") -> str:
@@ -176,6 +181,11 @@ _PHRASES: dict[str, Any] = {
         f"get ≥{(v if isinstance(v, dict) else {}).get('n', 1)} "
         f"units into {_region(v)}"
     ),
+    "units_of_type_in_region_gte": lambda v: (
+        f"get ≥{(v if isinstance(v, dict) else {}).get('n', 1)} "
+        f"'{(v if isinstance(v, dict) else {}).get('type')}' "
+        f"units into {_region(v)}"
+    ),
     "all_units_in_region": lambda v: f"get EVERY unit into {_region(v)}",
     "own_units_gte": lambda v: f"keep ≥{v} units alive",
     "cash_gte": lambda v: f"hold ≥{v} credits",
@@ -216,6 +226,11 @@ _REGION_PHRASES: dict[str, Any] = {
         f"get ≥{(v if isinstance(v, dict) else {}).get('n', 1)} "
         f"units into {_region(v, c)}"
     ),
+    "units_of_type_in_region_gte": lambda v, c: (
+        f"get ≥{(v if isinstance(v, dict) else {}).get('n', 1)} "
+        f"'{(v if isinstance(v, dict) else {}).get('type')}' "
+        f"units into {_region(v, c)}"
+    ),
     "all_units_in_region": lambda v, c: f"get EVERY unit into {_region(v, c)}",
     "waypoint_sequence": lambda v, c: (
         "reach these waypoints IN ORDER (no skipping, no idling): "

openra_bench/scenarios/win_conditions.py

@@ -138,6 +138,18 @@ _PREDICATES: dict[str, Callable[[WinContext, Any], bool]] = {
         _agent_units(c), int(v["x"]), int(v["y"]), float(v.get("radius", 3))
     )
     >= int(v.get("n", 1)),
+    # Type-filtered region count: ≥ n agent units of a given type within
+    # radius of (x,y). Lets a scenario enforce SQUAD IDENTITY at a
+    # waypoint ("Squad A — 3 jeeps — at P1; Squad B — 3 tanks — at
+    # P2") so a single-squad tour cannot satisfy two type-distinct
+    # clauses in series. Pair with `then:` for ordered squad handoff.
+    # {type, x, y, radius, n}
+    "units_of_type_in_region_gte": lambda c, v: sum(
+        1 for u in _agent_units(c)
+        if str(u.get("type", "")).lower() == str(v["type"]).lower()
+        and (u["cell_x"] - int(v["x"])) ** 2 + (u["cell_y"] - int(v["y"])) ** 2
+        <= float(v.get("radius", 3)) ** 2
+    ) >= int(v.get("n", 1)),
     # Stateful ordered-route latch (see _waypoint_sequence). Lets a
     # scenario require visiting W1→W2→…→Wk IN ORDER (skip/idle ⇒ never
     # satisfied), which stateless region predicates cannot express.

tests/test_game_knowledge.py

@@ -100,6 +100,9 @@ def test_all_predicate_keys_have_a_translation():
     sample = {
         "reach_region": {"x": 1, "y": 2, "radius": 3},
         "all_units_in_region": {"x": 1, "y": 2, "radius": 3},
+        "units_of_type_in_region_gte": {
+            "type": "jeep", "x": 1, "y": 2, "radius": 3, "n": 3,
+        },
         "building_count_gte": {"type": "powr", "n": 2},
         "building_in_region": {"x": 1, "y": 2, "count": 1},
         "unit_type_count_eq": {"type": "e1", "n": 3},