cogames 0.3.59.post1.dev2__tar.gz → 0.3.65__tar.gz

{cogames-0.3.59.post1.dev2/src/cogames.egg-info → cogames-0.3.65}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: cogames
-Version: 0.3.59.post1.dev2
+Version: 0.3.65
 Summary: Multi-agent cooperative games
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mettagrid==0.2.0.67
+Requires-Dist: mettagrid==0.2.0.75
 Requires-Dist: packaging>=24.0.0
 Requires-Dist: pufferlib-core
 Requires-Dist: pydantic>=2.11.5
@@ -1306,7 +1306,7 @@ cogames [COMMAND] --help
 
 
 <pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="font-weight: bold">                                                                                                                   </span>
-<span style="font-weight: bold"> </span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">Usage: </span><span style="font-weight: bold">cogames seasons [OPTIONS]                                                                                  </span>
+<span style="font-weight: bold"> </span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">Usage: </span><span style="font-weight: bold">cogames seasons [OPTIONS] [SEASON_NAME]                                                                    </span>
 <span style="font-weight: bold">                                                                                                                   </span>
 </pre>
 
@@ -1320,6 +1320,22 @@ cogames [COMMAND] --help
 
 
 
+<pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Arguments ─────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>   season_name      <span style="color: #bfbf7f; text-decoration-color: #bfbf7f; font-weight: bold">[</span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">SEASON_NAME</span><span style="color: #bfbf7f; text-decoration-color: #bfbf7f; font-weight: bold">]</span>  Show versions of a specific season                                            <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>
+</pre>
+
+
+
+
+<pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Options ───────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--versions</span>  <span style="color: #008000; text-decoration-color: #008000; font-weight: bold">-v</span>        List all versions of the season                                                           <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>
+</pre>
+
+
+
+
 <pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Server ────────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
 <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--login-server</span>          <span style="color: #808000; text-decoration-color: #808000; font-weight: bold">URL</span>  Authentication server URL <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">[default: https://softmax.com/api]</span>                       <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
 <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--server</span>        <span style="color: #008000; text-decoration-color: #008000; font-weight: bold">-s</span>      <span style="color: #808000; text-decoration-color: #808000; font-weight: bold">URL</span>  Tournament server URL <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">[default: https://api.observatory.softmax-research.net]</span>      <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>

{cogames-0.3.59.post1.dev2 → cogames-0.3.65}/README.ipynb

@@ -2609,13 +2609,13 @@
      "data": {
       "text/html": [
        "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"font-weight: bold\">                                                                                                                   </span>\n",
-       "<span style=\"font-weight: bold\"> </span><span style=\"color: #808000; text-decoration-color: #808000; font-weight: bold\">Usage: </span><span style=\"font-weight: bold\">cogames seasons [OPTIONS]                                                                                  </span>\n",
+       "<span style=\"font-weight: bold\"> </span><span style=\"color: #808000; text-decoration-color: #808000; font-weight: bold\">Usage: </span><span style=\"font-weight: bold\">cogames seasons [OPTIONS] [SEASON_NAME]                                                                    </span>\n",
        "<span style=\"font-weight: bold\">                                                                                                                   </span>\n",
        "</pre>\n"
       ],
       "text/plain": [
        "\u001b[1m                                                                                                                   \u001b[0m\n",
-       "\u001b[1m \u001b[0m\u001b[1;33mUsage: \u001b[0m\u001b[1mcogames seasons [OPTIONS]\u001b[0m\u001b[1m                                                                                 \u001b[0m\u001b[1m \u001b[0m\n",
+       "\u001b[1m \u001b[0m\u001b[1;33mUsage: \u001b[0m\u001b[1mcogames seasons [OPTIONS] [SEASON_NAME]\u001b[0m\u001b[1m                                                                   \u001b[0m\u001b[1m \u001b[0m\n",
        "\u001b[1m                                                                                                                   \u001b[0m\n"
       ]
      },
@@ -2637,6 +2637,40 @@
      "metadata": {},
      "output_type": "display_data"
     },
+    {
+     "data": {
+      "text/html": [
+       "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">╭─ Arguments ─────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>\n",
+       "<span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">│</span>   season_name      <span style=\"color: #bfbf7f; text-decoration-color: #bfbf7f; font-weight: bold\">[</span><span style=\"color: #808000; text-decoration-color: #808000; font-weight: bold\">SEASON_NAME</span><span style=\"color: #bfbf7f; text-decoration-color: #bfbf7f; font-weight: bold\">]</span>  Show versions of a specific season                                            <span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">│</span>\n",
+       "<span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>\n",
+       "</pre>\n"
+      ],
+      "text/plain": [
+       "\u001b[2m╭─\u001b[0m\u001b[2m Arguments \u001b[0m\u001b[2m────────────────────────────────────────────────────────────────────────────────────────────────────\u001b[0m\u001b[2m─╮\u001b[0m\n",
+       "\u001b[2m│\u001b[0m   season_name      \u001b[1;2;33m[\u001b[0m\u001b[1;33mSEASON_NAME\u001b[0m\u001b[1;2;33m]\u001b[0m  Show versions of a specific season                                            \u001b[2m│\u001b[0m\n",
+       "\u001b[2m╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯\u001b[0m\n"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "data": {
+      "text/html": [
+       "<pre style=\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\"><span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">╭─ Options ───────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>\n",
+       "<span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">│</span> <span style=\"color: #008080; text-decoration-color: #008080; font-weight: bold\">--versions</span>  <span style=\"color: #008000; text-decoration-color: #008000; font-weight: bold\">-v</span>        List all versions of the season                                                           <span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">│</span>\n",
+       "<span style=\"color: #7f7f7f; text-decoration-color: #7f7f7f\">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>\n",
+       "</pre>\n"
+      ],
+      "text/plain": [
+       "\u001b[2m╭─\u001b[0m\u001b[2m Options \u001b[0m\u001b[2m──────────────────────────────────────────────────────────────────────────────────────────────────────\u001b[0m\u001b[2m─╮\u001b[0m\n",
+       "\u001b[2m│\u001b[0m \u001b[1;36m-\u001b[0m\u001b[1;36m-versions\u001b[0m  \u001b[1;32m-v\u001b[0m        List all versions of the season                                                           \u001b[2m│\u001b[0m\n",
+       "\u001b[2m╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯\u001b[0m\n"
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
     {
      "data": {
       "text/html": [

{cogames-0.3.59.post1.dev2 → cogames-0.3.65}/README.md

@@ -1270,7 +1270,7 @@ cogames [COMMAND] --help
 
 
 <pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="font-weight: bold">                                                                                                                   </span>
-<span style="font-weight: bold"> </span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">Usage: </span><span style="font-weight: bold">cogames seasons [OPTIONS]                                                                                  </span>
+<span style="font-weight: bold"> </span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">Usage: </span><span style="font-weight: bold">cogames seasons [OPTIONS] [SEASON_NAME]                                                                    </span>
 <span style="font-weight: bold">                                                                                                                   </span>
 </pre>
 
@@ -1284,6 +1284,22 @@ cogames [COMMAND] --help
 
 
 
+<pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Arguments ─────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>   season_name      <span style="color: #bfbf7f; text-decoration-color: #bfbf7f; font-weight: bold">[</span><span style="color: #808000; text-decoration-color: #808000; font-weight: bold">SEASON_NAME</span><span style="color: #bfbf7f; text-decoration-color: #bfbf7f; font-weight: bold">]</span>  Show versions of a specific season                                            <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>
+</pre>
+
+
+
+
+<pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Options ───────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--versions</span>  <span style="color: #008000; text-decoration-color: #008000; font-weight: bold">-v</span>        List all versions of the season                                                           <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
+<span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</span>
+</pre>
+
+
+
+
 <pre style="white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace"><span style="color: #7f7f7f; text-decoration-color: #7f7f7f">╭─ Server ────────────────────────────────────────────────────────────────────────────────────────────────────────╮</span>
 <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--login-server</span>          <span style="color: #808000; text-decoration-color: #808000; font-weight: bold">URL</span>  Authentication server URL <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">[default: https://softmax.com/api]</span>                       <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>
 <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span> <span style="color: #008080; text-decoration-color: #008080; font-weight: bold">--server</span>        <span style="color: #008000; text-decoration-color: #008000; font-weight: bold">-s</span>      <span style="color: #808000; text-decoration-color: #808000; font-weight: bold">URL</span>  Tournament server URL <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">[default: https://api.observatory.softmax-research.net]</span>      <span style="color: #7f7f7f; text-decoration-color: #7f7f7f">│</span>

{cogames-0.3.59.post1.dev2 → cogames-0.3.65}/TECHNICAL_MANUAL.md

@@ -37,6 +37,17 @@ Each token encodes a single feature value at a specific location within your obs
 Your sensors use a special marker value `0xFF` (255) to indicate empty or invalid tokens. When `location == 0xFF`, the
 token should be ignored. Empty tokens are used to pad observation arrays to a fixed size for efficient batch processing.
 
+### Global Tokens
+
+Global tokens use a dedicated location marker `0xFE` (254) to indicate non-spatial, agent-wide state. These include:
+
+- `episode_completion_pct`: How far through the episode you are (0-255)
+- `last_action`: The action you took last step
+- `last_reward`: The reward you received last step
+- Local position observations (lp:north, lp:south, lp:east, lp:west)
+
+Global tokens can be detected by position alone: `location == 0xFE` means it's a global token.
+
 ### Coordinate Encoding
 
 Your observation window uses a packed coordinate system to efficiently encode spatial information:
@@ -44,6 +55,7 @@ Your observation window uses a packed coordinate system to efficiently encode sp
 - **Upper 4 bits (high nibble)**: Row coordinate (0-14)
 - **Lower 4 bits (low nibble)**: Column coordinate (0-14)
 - **Special value `0xFF`**: Empty/invalid coordinate
+- **Special value `0xFE`**: Global token (non-spatial observation)
 
 Observation windows are typically 11x11 centered on your position; you are located at `0x55` (row 5, column 5).
 Coordinates are **egocentric** (relative to your position), not absolute map coordinates.
@@ -52,7 +64,7 @@ Coordinates are **egocentric** (relative to your position), not absolute map coo
 
 - **Row (r/y)**: Vertical coordinate, increases downward
 - **Column (c/x)**: Horizontal coordinate, increases rightward
-- **Center location**: Used for cog-specific features (inventory, global state)
+- **Center location**: Used for cog-specific features (inventory)
 
 ### Observation Features
 
@@ -98,7 +110,6 @@ feature IDs for your configuration.
 | `last_action`                     | Last action taken by the cog                                                    | self                      |                                                                                 |
 | `last_reward`                     | Last reward received by the cog                                                 | self                      |                                                                                 |
 | `vibe`                            | Cog's current vibe                                                              | any object                | Values can be found in `vibes.VIBES`                                            |
-| `agent:compass`                   | Compass direction toward hub                                                    | self                      |                                                                                 |
 | `tag`                             | Tags associated with an object (e.g., "wall", "oxygen_extractor", "blue")       | any object                | Values can be found in `IdMap.tag_names()`. Multiple tags emit multiple tokens. |
 | `cooldown_remaining`              | Remaining cooldown time for objects                                             | hub, extractors           | Value capped at 255                                                             |
 | `clipped`                         | Whether an hub is clipped or not                                                | extractors                |                                                                                 |

{cogames-0.3.59.post1.dev2 → cogames-0.3.65}/pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 requires-python = ">=3.12,<3.13"
 classifiers = ["Programming Language :: Python :: 3", "Programming Language :: Python :: 3.12"]
 dependencies = [
-  "mettagrid==0.2.0.67",
+  "mettagrid==0.2.0.75",
   "packaging>=24.0.0",
   "pufferlib-core",
   "pydantic>=2.11.5",

{cogames-0.3.59.post1.dev2 → cogames-0.3.65}/scripts/run_evaluation.py

@@ -25,7 +25,7 @@ from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import asdict, dataclass
 from pathlib import Path
-from typing import Any, Dict, List, Optional, cast
+from typing import Dict, List, Optional
 
 import matplotlib
 
@@ -36,9 +36,12 @@ from safetensors.torch import load_file as load_safetensors_file
 
 from cogames.cli.policy import parse_policy_spec
 from cogames.cogs_vs_clips.evals.diagnostic_evals import DIAGNOSTIC_EVALS
-from cogames.cogs_vs_clips.mission import AnyMission, Mission, MissionVariant, NumCogsVariant
+from cogames.cogs_vs_clips.mission import CvCMission as AnyMission
+from cogames.cogs_vs_clips.mission import CvCMission as Mission
+from cogames.cogs_vs_clips.mission import NumCogsVariant
 from cogames.cogs_vs_clips.missions import MISSIONS as ALL_MISSIONS
 from cogames.cogs_vs_clips.variants import VARIANTS
+from cogames.core import CoGameMissionVariant as MissionVariant
 from metta_alo.rollout import run_single_episode_rollout
 from mettagrid.config.reward_config import statReward
 from mettagrid.policy.policy import PolicySpec
@@ -170,13 +173,6 @@ def _run_case(
                 if env_config.game.actions.attack:
                     env_config.game.actions.attack.enabled = False
 
-            allowed_vibes = set(vibe_names)
-            chest = env_config.game.objects.get("chest")
-            if chest:
-                vibe_transfers = getattr(chest, "vibe_transfers", None)
-                if isinstance(vibe_transfers, dict):
-                    cast(Any, chest).vibe_transfers = {v: t for v, t in vibe_transfers.items() if v in allowed_vibes}
-
     if variant is None or getattr(variant, "max_steps_override", None) is None:
         env_config.game.max_steps = max_steps
 

{cogames-0.3.59.post1.dev2 → cogames-0.3.65}/src/cogames/cli/client.py

@@ -51,6 +51,8 @@ class PoolInfo(BaseModel):
 
 class SeasonInfo(BaseModel):
     name: str
+    version: int
+    canonical: bool
     summary: str
     entry_pool: str | None = None
     leaderboard_pool: str | None = None
@@ -58,6 +60,13 @@ class SeasonInfo(BaseModel):
     pools: list[PoolInfo]
 
 
+class SeasonVersionInfo(BaseModel):
+    version: int
+    canonical: bool
+    disabled_at: str | None
+    created_at: str
+
+
 class LeaderboardEntry(BaseModel):
     rank: int
     policy: PolicyVersionSummary
@@ -174,6 +183,9 @@ class TournamentServerClient:
     def get_config(self, config_id: str) -> dict[str, Any]:
         return self._get(f"/tournament/configs/{config_id}")
 
+    def get_season_versions(self, season_name: str) -> list[SeasonVersionInfo]:
+        return self._get(f"/tournament/seasons/{season_name}/versions", list[SeasonVersionInfo])
+
     def get_leaderboard(self, season_name: str, include_hidden_seasons: bool = False) -> list[LeaderboardEntry]:
         return self._get(
             f"/tournament/seasons/{season_name}/leaderboard",

{cogames-0.3.59.post1.dev2 → cogames-0.3.65}/src/cogames/cli/leaderboard.py

@@ -36,6 +36,22 @@ def parse_policy_identifier(identifier: str) -> tuple[str, int | None]:
     return identifier, None
 
 
+def parse_season_ref(season_ref: str) -> tuple[str, int | None]:
+    if ":v" in season_ref:
+        name, version_str = season_ref.rsplit(":v", 1)
+        try:
+            return name, int(version_str)
+        except ValueError:
+            return season_ref, None
+    if ":" in season_ref:
+        name, version_str = season_ref.rsplit(":", 1)
+        try:
+            return name, int(version_str)
+        except ValueError:
+            return season_ref, None
+    return season_ref, None
+
+
 def _format_timestamp(value: Optional[str]) -> str:
     """Format ISO timestamps for CLI output."""
     if not value:
@@ -321,6 +337,8 @@ def leaderboard_cmd(
 
 
 def seasons_cmd(
+    season_name: Optional[str] = typer.Argument(None, help="Show versions of a specific season"),
+    versions: bool = typer.Option(False, "--versions", "-v", help="List all versions of the season"),
     login_server: str = typer.Option(
         DEFAULT_COGAMES_SERVER,
         "--login-server",
@@ -358,6 +376,28 @@ def seasons_cmd(
 
     try:
         with client:
+            if season_name and versions:
+                season_versions = client.get_season_versions(season_name)
+                if json_output:
+                    console.print(json.dumps([v.model_dump() for v in season_versions], indent=2))
+                    return
+
+                if not season_versions:
+                    console.print(f"[yellow]No versions found for season '{season_name}'.[/yellow]")
+                    return
+
+                table = Table(title=f"Versions: {season_name}", box=box.SIMPLE_HEAVY, show_lines=False, pad_edge=False)
+                table.add_column("Version", style="bold cyan")
+                table.add_column("Status", style="white")
+                table.add_column("Created", style="dim")
+
+                for v in season_versions:
+                    status = "[green]canonical[/green]" if v.canonical else "[dim]historical[/dim]"
+                    table.add_row(f"v{v.version}", status, _format_timestamp(v.created_at))
+
+                console.print(table)
+                return
+
             seasons = client.get_seasons()
     except httpx.HTTPError as exc:
         console.print(f"[red]Failed to reach server:[/red] {exc}")

{cogames-0.3.59.post1.dev2 → cogames-0.3.65}/src/cogames/cli/mission.py

@@ -9,53 +9,48 @@ 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[Mission]:
+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[Mission] = []
+    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:
         mission_set: Name of mission set to load. Options:
+            - "cogsguard_evals": CogsGuard evaluation missions (map-based)
             - "integrated_evals": Integrated evaluation missions
             - "spanning_evals": Spanning evaluation missions
             - "diagnostic_evals": Diagnostic evaluation missions
@@ -67,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())
@@ -82,6 +77,10 @@ def load_mission_set(mission_set: str) -> list[AnyMission]:
         from cogames.cogs_vs_clips.evals.diagnostic_evals import DIAGNOSTIC_EVALS
 
         missions_list = [mission_cls() for mission_cls in DIAGNOSTIC_EVALS]  # type: ignore[call-arg]
+    elif mission_set == "cogsguard_evals":
+        from cogames.cogs_vs_clips.evals.cogsguard_evals import COGSGUARD_EVAL_MISSIONS
+
+        missions_list = list(COGSGUARD_EVAL_MISSIONS)
     elif mission_set == "integrated_evals":
         from cogames.cogs_vs_clips.evals.integrated_evals import EVAL_MISSIONS as INTEGRATED_EVAL_MISSIONS
 
@@ -91,20 +90,20 @@ def load_mission_set(mission_set: str) -> list[AnyMission]:
 
         missions_list = list(SPANNING_EVAL_MISSIONS)
     else:
-        available = "integrated_evals, spanning_evals, diagnostic_evals, all"
+        available = "cogsguard_evals, integrated_evals, spanning_evals, diagnostic_evals, all"
         raise ValueError(f"Unknown mission set: {mission_set}\nAvailable sets: {available}")
 
     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
@@ -112,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
@@ -143,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:
@@ -159,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")
@@ -246,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:
@@ -281,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:
@@ -291,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
@@ -323,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)
@@ -447,7 +444,7 @@ def list_evals() -> None:
         return
 
     # Group missions by site
-    missions_by_site: dict[str, list[Mission]] = {}
+    missions_by_site: dict[str, list[CvCMission]] = {}
     for m in evals:
         missions_by_site.setdefault(m.site.name, []).append(m)
 
@@ -499,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-0.3.59.post1.dev2 → cogames-0.3.65}/src/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-0.3.65/src/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")