cogames 0.3.64__py3-none-any.whl → 0.3.65__py3-none-any.whl

cogames/cli/mission.py

@@ -9,51 +9,43 @@ from rich.table import Table
 
 from cogames.cli.base import console
 from cogames.cogs_vs_clips.mission import (
-    MAP_MISSION_DELIMITER,
-    AnyMission,
-    Mission,
-    MissionVariant,
+    CvCMission,
     NumCogsVariant,
-    Site,
 )
-from cogames.cogs_vs_clips.procedural import MachinaArena
 from cogames.cogs_vs_clips.sites import SITES
+from cogames.cogs_vs_clips.terrain import MachinaArena
 from cogames.cogs_vs_clips.variants import HIDDEN_VARIANTS, VARIANTS
+from cogames.core import (
+    MAP_MISSION_DELIMITER,
+    CoGameMissionVariant,
+    CoGameSite,
+)
 from cogames.game import load_mission_config, load_mission_config_from_python
 from mettagrid import MettaGridConfig
 from mettagrid.mapgen.mapgen import MapGen
 
 
 @lru_cache(maxsize=1)
-def _get_core_missions() -> list[AnyMission]:
+def _get_core_missions() -> list[CvCMission]:
     from cogames.cogs_vs_clips.missions import get_core_missions
 
     return get_core_missions()
 
 
 @lru_cache(maxsize=1)
-def _get_legacy_missions() -> list[Mission]:
-    from cogames.cogs_vs_clips.missions import get_legacy_missions
-
-    return get_legacy_missions()
-
-
-@lru_cache(maxsize=1)
-def _get_eval_missions_all() -> list[AnyMission]:
-    from cogames.cogs_vs_clips.evals.cogsguard_evals import COGSGUARD_EVAL_MISSIONS
+def _get_eval_missions_all() -> list[CvCMission]:
     from cogames.cogs_vs_clips.evals.diagnostic_evals import DIAGNOSTIC_EVALS
     from cogames.cogs_vs_clips.evals.integrated_evals import EVAL_MISSIONS as INTEGRATED_EVAL_MISSIONS
     from cogames.cogs_vs_clips.evals.spanning_evals import EVAL_MISSIONS as SPANNING_EVAL_MISSIONS
 
-    missions: list[AnyMission] = []
-    missions.extend(COGSGUARD_EVAL_MISSIONS)
+    missions: list[CvCMission] = []
     missions.extend(INTEGRATED_EVAL_MISSIONS)
     missions.extend(SPANNING_EVAL_MISSIONS)
     missions.extend(mission_cls() for mission_cls in DIAGNOSTIC_EVALS)  # type: ignore[call-arg]
     return missions
 
 
-def load_mission_set(mission_set: str) -> list[AnyMission]:
+def load_mission_set(mission_set: str) -> list[CvCMission]:
     """Load a predefined set of evaluation missions.
 
     Args:
@@ -70,7 +62,7 @@ def load_mission_set(mission_set: str) -> list[AnyMission]:
     Raises:
         ValueError: If mission_set name is unknown
     """
-    missions_list: list[AnyMission]
+    missions_list: list[CvCMission]
     if mission_set == "all":
         # All missions: eval missions + integrated + spanning + diagnostic + core missions
         missions_list = list(_get_eval_missions_all())
@@ -104,14 +96,14 @@ def load_mission_set(mission_set: str) -> list[AnyMission]:
     return missions_list
 
 
-def parse_variants(variants_arg: Optional[list[str]]) -> list[MissionVariant]:
+def parse_variants(variants_arg: Optional[list[str]]) -> list[CoGameMissionVariant]:
     """Parse variant specifications from command line.
 
     Args:
         variants_arg: List of variant names like ["solar_flare", "dark_side"]
 
     Returns:
-        List of configured MissionVariant instances
+        List of configured CoGameMissionVariant instances
 
     Raises:
         ValueError: If variant name is unknown
@@ -119,11 +111,11 @@ def parse_variants(variants_arg: Optional[list[str]]) -> list[MissionVariant]:
     if not variants_arg:
         return []
 
-    variants: list[MissionVariant] = []
+    variants: list[CoGameMissionVariant] = []
     all_variants = [*VARIANTS, *HIDDEN_VARIANTS]
     for name in variants_arg:
         # Find matching variant class by instantiating and checking the name
-        variant: MissionVariant | None = None
+        variant: CoGameMissionVariant | None = None
         for v in all_variants:
             if v.name == name:
                 variant = v
@@ -150,7 +142,7 @@ def get_all_eval_missions() -> list[str]:
     return [mission.full_name() for mission in _get_eval_missions_all()]
 
 
-def get_site_by_name(site_name: str) -> Site:
+def get_site_by_name(site_name: str) -> CoGameSite:
     """Get a site by name.
 
     Raises:
@@ -166,7 +158,7 @@ def get_site_by_name(site_name: str) -> Site:
 
 def get_mission_name_and_config(
     ctx: typer.Context, mission_arg: Optional[str], variants_arg: Optional[list[str]] = None, cogs: Optional[int] = None
-) -> tuple[str, MettaGridConfig, Optional[AnyMission]]:
+) -> tuple[str, MettaGridConfig, Optional[CvCMission]]:
     if not mission_arg:
         console.print(ctx.get_help())
         console.print("[yellow]Missing: --mission / -m[/yellow]\n")
@@ -253,12 +245,10 @@ def find_mission(
     *,
     include_evals: bool = False,
     include_legacy: bool = False,
-) -> AnyMission:
-    missions: list[AnyMission] = list(_get_core_missions())
+) -> CvCMission:
+    missions: list[CvCMission] = list(_get_core_missions())
     if include_evals:
         missions = [*missions, *_get_eval_missions_all()]
-    if include_legacy:
-        missions = [*missions, *_get_legacy_missions()]
 
     found_site = False
     for mission in missions:
@@ -288,7 +278,7 @@ def get_mission(
     variants_arg: Optional[list[str]] = None,
     cogs: Optional[int] = None,
     include_legacy: bool = False,
-) -> tuple[str, MettaGridConfig, Optional[AnyMission]]:
+) -> tuple[str, MettaGridConfig, Optional[CvCMission]]:
     """Get a specific mission configuration by name or file path.
 
     Args:
@@ -298,7 +288,7 @@ def get_mission(
         include_legacy: Whether to include legacy (pre-CogsGuard) missions
 
     Returns:
-        Tuple of (mission name, MettaGridConfig, Mission or None)
+        Tuple of (mission name, MettaGridConfig, CvCMission or None)
 
     Raises:
         ValueError: If mission not found or file cannot be loaded
@@ -330,7 +320,7 @@ def get_mission(
     else:
         site_name, mission_name = mission_arg.split(MAP_MISSION_DELIMITER)
 
-    mission: AnyMission = find_mission(site_name, mission_name, include_evals=True, include_legacy=include_legacy)
+    mission: CvCMission = find_mission(site_name, mission_name, include_evals=True, include_legacy=include_legacy)
 
     if variants:
         mission = mission.with_variants(variants)
@@ -454,7 +444,7 @@ def list_evals() -> None:
         return
 
     # Group missions by site
-    missions_by_site: dict[str, list[AnyMission]] = {}
+    missions_by_site: dict[str, list[CvCMission]] = {}
     for m in evals:
         missions_by_site.setdefault(m.site.name, []).append(m)
 
@@ -506,7 +496,7 @@ def list_evals() -> None:
     console.print("  [bold]cogames play[/bold] --mission [blue]evals.divide_and_conquer[/blue]")
 
 
-def describe_mission(mission_name: str, game_config: MettaGridConfig, mission_cfg: AnyMission | None = None) -> None:
+def describe_mission(mission_name: str, game_config: MettaGridConfig, mission_cfg: CvCMission | None = None) -> None:
     """Print detailed information about a specific mission.
 
     Args:

cogames/cli/submit.py

@@ -290,6 +290,7 @@ def validate_policy_in_isolation(
             "run",
             "cogames",
             "validate-policy",
+            "--policy",
             policy_arg,
             "--season",
             season,
@@ -298,7 +299,6 @@ def validate_policy_in_isolation(
         ]
         if setup_script:
             validate_cmd.extend(["--setup-script", setup_script])
-        validate_cmd.extend(["--policy", policy_arg])
 
         _run_from_tmp_dir(validate_cmd)
 

cogames/cogs_vs_clips/clips.py

@@ -0,0 +1,86 @@
+"""Clips behavior events for CogsGuard missions.
+
+Clips are a non-player faction that gradually takes over neutral junctions.
+These events create the spreading/scrambling behavior that pressures players.
+"""
+
+from pydantic import Field
+
+from mettagrid.base_config import Config
+from mettagrid.config.event_config import EventConfig, once, periodic
+from mettagrid.config.filter import isAlignedTo, isNear
+from mettagrid.config.filter.alignment_filter import isNeutral, isNotAlignedTo, isNotNeutral
+from mettagrid.config.mettagrid_config import CollectiveConfig
+from mettagrid.config.mutation import alignTo, removeAlignment
+from mettagrid.config.tag import typeTag
+
+
+class ClipsConfig(Config):
+    """Configuration for clips behavior in CogsGuard game mode."""
+
+    # Clips Behavior - scramble cogs junctions to neutral
+    initial_clips_start: int = Field(default=10)
+    initial_clips_spots: int = Field(default=1)
+
+    scramble_start: int = Field(default=50)
+    scramble_interval: int = Field(default=100)
+    scramble_radius: int = Field(default=25)
+
+    # Clips Behavior - align neutral junctions to clips
+    align_start: int = Field(default=100)
+    align_interval: int = Field(default=100)
+    align_radius: int = Field(default=25)
+
+    def events(self, max_steps: int) -> dict[str, EventConfig]:
+        """Create all clips events for a mission.
+
+        Returns:
+            Dictionary of event name to EventConfig.
+        """
+        return {
+            "initial_clips": EventConfig(
+                name="initial_clips",
+                target_tag=typeTag("junction"),
+                timesteps=once(self.initial_clips_start),
+                mutations=[alignTo("clips")],
+                max_targets=self.initial_clips_spots,
+            ),
+            "cogs_to_neutral": EventConfig(
+                name="cogs_to_neutral",
+                target_tag=typeTag("junction"),
+                timesteps=periodic(start=self.scramble_start, period=self.scramble_interval, end=max_steps),
+                # near a clips-aligned junction
+                filters=[
+                    isNear(typeTag("junction"), [isAlignedTo("clips")], radius=self.scramble_radius),
+                    isNotAlignedTo("clips"),
+                    isNotNeutral(),
+                ],
+                mutations=[removeAlignment()],
+                max_targets=1,
+            ),
+            "neutral_to_clips": EventConfig(
+                name="neutral_to_clips",
+                target_tag=typeTag("junction"),
+                timesteps=periodic(start=self.align_start, period=self.align_interval, end=max_steps),
+                # neutral junctions near a clips-aligned junction
+                filters=[
+                    isNear(typeTag("junction"), [isAlignedTo("clips")], radius=self.align_radius),
+                    isNeutral(),
+                ],
+                mutations=[alignTo("clips")],
+                max_targets=1,
+            ),
+            # If there are no clips-aligned junctions, re-invade
+            "presence_check": EventConfig(
+                name="presence_check",
+                target_tag=typeTag("junction"),
+                timesteps=periodic(start=self.initial_clips_start, period=self.scramble_interval * 2, end=max_steps),
+                filters=[isNear(typeTag("junction"), [isAlignedTo("clips")], radius=1000)],
+                max_targets=1,
+                fallback="initial_clips",
+            ),
+        }
+
+    def collective_config(self) -> CollectiveConfig:
+        """Create a CollectiveConfig for this clips configuration."""
+        return CollectiveConfig(name="clips")

cogames/cogs_vs_clips/cog.py

@@ -2,7 +2,9 @@ from __future__ import annotations
 
 from pydantic import Field
 
+from cogames.cogs_vs_clips.config import CvCConfig
 from mettagrid.base_config import Config
+from mettagrid.config.game_value import stat as game_stat
 from mettagrid.config.handler_config import Handler
 from mettagrid.config.mettagrid_config import (
     AgentConfig,
@@ -10,6 +12,7 @@ from mettagrid.config.mettagrid_config import (
     ResourceLimitsConfig,
 )
 from mettagrid.config.mutation.resource_mutation import updateActor
+from mettagrid.config.reward_config import reward
 
 
 class CogConfig(Config):
@@ -37,25 +40,23 @@ class CogConfig(Config):
     energy_regen: int = Field(default=1)
     hp_regen: int = Field(default=-1)
     influence_regen: int = Field(default=-1)
+    action_cost: dict[str, int] = Field(default_factory=lambda: {"energy": 3})
 
-    # Movement cost
-    move_energy_cost: int = Field(default=3)
-
-    def agent_config(self, gear: list[str], elements: list[str]) -> AgentConfig:
+    def agent_config(self, team: str, max_steps: int) -> AgentConfig:
         """Create an AgentConfig for this cog configuration."""
         return AgentConfig(
-            collective="cogs",
+            collective=team,
             inventory=InventoryConfig(
                 limits={
                     "hp": ResourceLimitsConfig(min=self.hp_limit, resources=["hp"], modifiers=self.hp_modifiers),
                     # when hp == 0, the cog can't hold gear or hearts
-                    "gear": ResourceLimitsConfig(max=self.gear_limit, resources=gear, modifiers={"hp": 100}),
+                    "gear": ResourceLimitsConfig(max=self.gear_limit, resources=CvCConfig.GEAR, modifiers={"hp": 100}),
                     "heart": ResourceLimitsConfig(max=self.heart_limit, resources=["heart"], modifiers={"hp": 100}),
                     "energy": ResourceLimitsConfig(
                         min=self.energy_limit, resources=["energy"], modifiers=self.energy_modifiers
                     ),
                     "cargo": ResourceLimitsConfig(
-                        min=self.cargo_limit, resources=elements, modifiers=self.cargo_modifiers
+                        min=self.cargo_limit, resources=CvCConfig.ELEMENTS, modifiers=self.cargo_modifiers
                     ),
                     "influence": ResourceLimitsConfig(
                         min=self.influence_limit, resources=["influence"], modifiers=self.influence_modifiers
@@ -76,4 +77,10 @@ class CogConfig(Config):
                     ]
                 )
             },
+            rewards={
+                "aligned_junction_held": reward(
+                    game_stat("collective.aligned.junction.held"),
+                    weight=1.0 / max_steps,
+                ),
+            },
         )

cogames/cogs_vs_clips/cogsguard_tutorial.py

@@ -1,12 +1,14 @@
 """CogsGuard tutorial mission configuration."""
 
-from cogames.cogs_vs_clips.mission import Mission, Site
-from cogames.cogs_vs_clips.procedural import MachinaArena
+from cogames.cogs_vs_clips.mission import CvCMission
+from cogames.cogs_vs_clips.team import CogTeam
+from cogames.cogs_vs_clips.terrain import MachinaArena
+from cogames.core import CoGameSite
 from mettagrid.mapgen.mapgen import MapGen
 from mettagrid.mapgen.scenes.base_hub import BaseHubConfig
 
 
-def make_cogsguard_tutorial_site() -> Site:
+def make_cogsguard_tutorial_site() -> CoGameSite:
     """Create a smaller, simpler CogsGuard arena for the tutorial."""
     hub_config = BaseHubConfig(
         corner_bundle="extractors",
@@ -32,7 +34,7 @@ def make_cogsguard_tutorial_site() -> Site:
             hub=hub_config,
         ),
     )
-    return Site(
+    return CoGameSite(
         name="cogsguard_tutorial",
         description="CogsGuard tutorial arena - small map for learning",
         map_builder=map_builder,
@@ -41,16 +43,13 @@ def make_cogsguard_tutorial_site() -> Site:
     )
 
 
-CogsGuardTutorialMission = Mission(
+CogsGuardTutorialMission = CvCMission(
     name="tutorial",
     description="Learn the basics of CogsGuard: Roles, Resources, and Territory Control.",
     site=make_cogsguard_tutorial_site(),
     num_cogs=1,
     max_steps=2000,
-    # Generous initial resources for learning
-    collective_initial_carbon=50,
-    collective_initial_oxygen=50,
-    collective_initial_germanium=50,
-    collective_initial_silicon=50,
-    collective_initial_heart=10,
+    teams={
+        "cogs": CogTeam(name="cogs", num_agents=1, wealth=1),
+    },
 )

cogames/cogs_vs_clips/config.py

@@ -0,0 +1,38 @@
+from types import SimpleNamespace
+
+from mettagrid.config.vibes import Vibe
+
+_GEAR = ["aligner", "scrambler", "miner", "scout"]
+_ELEMENTS = ["oxygen", "carbon", "germanium", "silicon"]
+_VIBES = [
+    Vibe("😐", "default"),
+    Vibe("❤️", "heart"),
+    Vibe("⚙️", "gear"),
+    Vibe("🌀", "scrambler"),
+    Vibe("🔗", "aligner"),
+    Vibe("⛏️", "miner"),
+    Vibe("🔭", "scout"),
+]
+
+CvCConfig = SimpleNamespace(
+    GEAR=_GEAR,
+    ELEMENTS=_ELEMENTS,
+    HEART_COST={e: 10 for e in _ELEMENTS},
+    ALIGN_COST={"heart": 1},
+    SCRAMBLE_COST={"heart": 1},
+    GEAR_COSTS={
+        "aligner": {"carbon": 3, "oxygen": 1, "germanium": 1, "silicon": 1},
+        "scrambler": {"carbon": 1, "oxygen": 3, "germanium": 1, "silicon": 1},
+        "miner": {"carbon": 1, "oxygen": 1, "germanium": 3, "silicon": 1},
+        "scout": {"carbon": 1, "oxygen": 1, "germanium": 1, "silicon": 3},
+    },
+    GEAR_SYMBOLS={
+        "aligner": "🔗",
+        "scrambler": "🌀",
+        "miner": "⛏️",
+        "scout": "🔭",
+    },
+    RESOURCES=["energy", "heart", "hp", "influence", *_ELEMENTS, *_GEAR],
+    VIBES=_VIBES,
+    VIBE_NAMES=[vibe.name for vibe in _VIBES],
+)

cogames/cogs_vs_clips/{cogs_vs_clips_mapgen.md → docs/cogs_vs_clips_mapgen.md}

@@ -324,7 +324,6 @@ Key design choices:
 
 - Pack the base hub lightly (`EmptyBaseVariant`) where appropriate to encourage early exploration without
   over-constraining.
-- Add guidance (`CompassVariant`) on distance-heavy tasks to reduce pure exploration failure modes.
 - Raise agent caps modestly (`PackRatVariant`) to avoid early inventory stalls but keep routing relevant.
 - Shape reward on vibe missions (`HeartChorusVariant`) so partial progress is scored.
 - Keep vibe mechanics intact unless the mission explicitly focuses on vibe manipulation.
@@ -334,9 +333,9 @@ Included missions and variants:
 - oxygen_bottleneck: `EmptyBaseVariant(missing=["oxygen_extractor"])`, `ResourceBottleneckVariant(["oxygen"])`,
   `SingleResourceUniformVariant("oxygen_extractor")`, `PackRatVariant`
 - energy_starved: `EmptyBaseVariant`, `DarkSideVariant`, `PackRatVariant`
-- distant_resources: `EmptyBaseVariant`, `CompassVariant`, `DistantResourcesVariant`
-- quadrant_buildings: `EmptyBaseVariant`, `QuadrantBuildingsVariant`, `CompassVariant`
-- single_use_swarm: `EmptyBaseVariant`, `SingleUseSwarmVariant`, `CompassVariant`, `PackRatVariant`
+- distant_resources: `EmptyBaseVariant`, `DistantResourcesVariant`
+- quadrant_buildings: `EmptyBaseVariant`, `QuadrantBuildingsVariant`
+- single_use_swarm: `EmptyBaseVariant`, `SingleUseSwarmVariant`, `PackRatVariant`
 - vibe_check: `HeartChorusVariant`, `VibeCheckMin2Variant`
 
 Usage example:
@@ -349,6 +348,6 @@ uv run python packages/cogames/scripts/run_evaluation.py \
   --repeats 2
 ```
 
-Recommendation: When designing new scorable baselines, combine one “shaping” variant (e.g., `CompassVariant`,
-`HeartChorusVariant`, `PackRatVariant`) with one “constraint” variant (e.g., `DarkSideVariant`,
-`ResourceBottleneckVariant`, `SingleUseSwarmVariant`) to keep tasks legible yet challenging.
+Recommendation: When designing new scorable baselines, combine one "shaping" variant (e.g., `HeartChorusVariant`,
+`PackRatVariant`) with one "constraint" variant (e.g., `DarkSideVariant`, `ResourceBottleneckVariant`,
+`SingleUseSwarmVariant`) to keep tasks legible yet challenging.

cogames/cogs_vs_clips/evals/README.md

@@ -179,11 +179,11 @@ uv run cogames play --mission hello_world.easy_hearts --cogs 2
 You can apply additional variants on top of the mission's built-in variants:
 
 ```bash
-# Add compass variant
-uv run cogames play --mission hello_world.oxygen_bottleneck --cogs 2 --variant compass
+# Add pack_rat variant
+uv run cogames play --mission hello_world.oxygen_bottleneck --cogs 2 --variant pack_rat
 
 # Add multiple variants
-uv run cogames play --mission hello_world.energy_starved --cogs 2 --variant compass --variant small_50
+uv run cogames play --mission hello_world.energy_starved --cogs 2 --variant pack_rat --variant small_50
 
 # With policy
 uv run cogames play --mission hello_world.single_use_swarm --cogs 4 -p baseline
@@ -230,7 +230,7 @@ mission_variant_curriculum.train(
 mission_variant_curriculum.train(
     base_missions=["oxygen_bottleneck", "energy_starved"],
     num_cogs=4,
-    variants=["compass", "pack_rat"]
+    variants=["pack_rat", "energized"]
 )
 ```
 

cogames/cogs_vs_clips/evals/cogsguard_evals.py

@@ -2,15 +2,30 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from cogames.cogs_vs_clips.mission import CogsGuardMission, Site
-from cogames.cogs_vs_clips.mission_utils import get_map
+from cogames.cogs_vs_clips.mission import CvCMission
+from cogames.core import CoGameSite as Site
+from mettagrid.map_builder.map_builder import MapBuilderConfig
+from mettagrid.mapgen.mapgen import MapGen, MapGenConfig
 
 MAPS_DIR = Path(__file__).resolve().parent.parent.parent / "maps"
 
+
+def _load_map(map_name: str) -> MapGenConfig:
+    map_path = MAPS_DIR / map_name
+    if not map_path.exists():
+        raise FileNotFoundError(f"Map not found: {map_path}")
+    return MapGen.Config(
+        instance=MapBuilderConfig.from_uri(str(map_path)),
+        instances=1,
+        fixed_spawn_order=False,
+        instance_border_width=0,
+    )
+
+
 COGSGUARD_EVALS_BASE = Site(
     name="cogsguard_evals",
     description="CogsGuard evaluation arenas.",
-    map_builder=get_map("evals/eval_balanced_spread.map"),
+    map_builder=_load_map("evals/eval_balanced_spread.map"),
     min_cogs=1,
     max_cogs=20,
 )
@@ -30,7 +45,7 @@ def _count_spawn_pads(map_path: Path) -> int:
 def _make_eval_site(map_name: str, num_cogs: int) -> Site:
     site = COGSGUARD_EVALS_BASE.model_copy(
         update={
-            "map_builder": get_map(map_name),
+            "map_builder": _load_map(map_name),
             "min_cogs": num_cogs,
             "max_cogs": num_cogs,
         }
@@ -66,13 +81,13 @@ COGSGUARD_EVAL_MAPS: list[str] = [
 
 COGSGUARD_EVAL_COGS = {map_name: _count_spawn_pads(MAPS_DIR / map_name) for map_name in COGSGUARD_EVAL_MAPS}
 
-COGSGUARD_EVAL_MISSIONS: list[CogsGuardMission] = []
+COGSGUARD_EVAL_MISSIONS: list[CvCMission] = []
 for map_name in COGSGUARD_EVAL_MAPS:
     stem = Path(map_name).stem
     num_cogs = COGSGUARD_EVAL_COGS[map_name]
     site = _make_eval_site(map_name, num_cogs)
     COGSGUARD_EVAL_MISSIONS.append(
-        CogsGuardMission(
+        CvCMission(
             name=stem,
             description=_description_from_stem(stem),
             site=site,