Move logs/ to root, minor tweaks to mini config

Author: john-b-yang

codeclash/constants.py

@@ -2,8 +2,8 @@
 
 from codeclash import REPO_DIR
 
-DIR_LOGS = Path("logs")  # this is used also for parts of the paths in the environment
-LOCAL_LOG_DIR = REPO_DIR / DIR_LOGS  # this one is always relative to the location of this code
+DIR_LOGS = Path("/logs")  # this is used also for parts of the paths in the environment
+LOCAL_LOG_DIR = REPO_DIR / "logs"  # this one is always relative to the location of this code
 DIR_WORK = Path("/testbed")
 FILE_RESULTS = "results.json"
 GH_ORG = "emagedoc"

codeclash/games/game.py

@@ -95,7 +95,7 @@ def __init__(self, config: dict, *, tournament_id: str, local_output_dir: Path,
             "game_id": tournament_id,
             "created_timestamp": int(time.time()),
         }
-        self.log_env: Path = (DIR_WORK / DIR_LOGS).resolve()
+        self.log_env: Path = DIR_LOGS
         self.log_local: Path = local_output_dir
         self.logger = get_logger(self.name, log_path=self.log_local / "game.log", emoji="🏓")
         self.environment: DockerEnvironment = self.get_environment()

codeclash/tournaments/pvp.py

@@ -11,7 +11,7 @@
 from codeclash.agents import get_agent
 from codeclash.agents.player import Player
 from codeclash.agents.utils import GameContext
-from codeclash.constants import DIR_WORK, FILE_RESULTS
+from codeclash.constants import DIR_LOGS, DIR_WORK, FILE_RESULTS
 from codeclash.games import get_game
 from codeclash.games.game import CodeGame
 from codeclash.tournaments.tournament import AbstractTournament
@@ -106,7 +106,7 @@ def run_edit_phase(self, round_num: int) -> None:
             copy_to_container(
                 agent.environment,
                 self.game.log_local / "rounds" / str(round_num - 1),
-                f"logs/rounds/{round_num - 1}/",
+                DIR_LOGS / "rounds" / str(round_num - 1),
             )
 
         with ThreadPoolExecutor() as executor:

configs/mini/default.yaml

@@ -26,30 +26,41 @@ instance_template: |
 
   ## General tips about how to play the game
 
-  The details of the game are fully available within this codebase.
-  - `docs/`: Game documentation
-  - `logs/`: Past rounds and outcomes
-  - `trajs/`: History of your edits
-  - and a lot more. It's up to you to explore and utilize these resources.
-
-  The game is played in rounds and you will be evaluated on the performance over all the rounds. You won't remember past rounds.
-
-  In every round, you have a limit of {{step_limit}} steps and a cost limit of {{cost_limit}} dollars.
-  We will show you the number of steps and cost used so far after every response in the `<limit_note>` tag.
-  After you've reached the step or cost limit, you cannot continue working on this task, and we will play the game with your codebase.
-  This means that it's fine to reach the step or cost limit while working on documentation or testing, but you shouldn't
-  reach the limit while working on the actual game logic to avoid submitting an invalid codebase.
-
-  So if you want to carry knowledge forward — leave tools, notes, or strategies in the codebase.
-  Good documentation means you (and others) can pick up right where you left off.
-
-  If you'd hate to repeat a step next round, encode it now — as a script, a note, or a tool.
-
-  Improve the bot however you like — experiment, document, iterate. Some ideas:
-  - Build analysis tools
-  - Create bot variants to test
-  - Track strategies across rounds
-  How you choose to evolve and document is up to you. Good luck!
+   The game details are in this codebase ({{working_dir}}):
+   - `docs/`: Game documentation
+   - `/logs/`: Past rounds and outcomes (agent runs in `/logs/edits/`, gameplay logs in `/logs/rounds/`)
+
+   The game is played in team rounds. You play one round, then a teammate takes over.
+   You're scored on total team performance across all rounds.
+
+   Each round has {{step_limit}} steps and {{cost_limit}} dollar limits.
+   We show usage after each response in `<limit_note>` tags.
+   After you've reached the step or cost limit, you cannot continue working on this task, and we will play the game with your codebase.
+   We recommend submitting before you hit the limits to avoid losing work.
+
+   Each round starts fresh with no knowledge of previous actions.
+   Leave tools, notes, and strategies in the codebase for teammates.
+   Use README_agent.md at repository root to pass instructions to your next teammate.
+   Document important files, analysis tools, and context.
+
+   Improve the bot however you like — experiment, document, iterate.
+
+   IMPORTANT: Store all changes in {{working_dir}} or subdirectories.
+
+   Tips:
+
+   1. Check README_agent.md for notes from previous teammates.
+   2. Consider writing analysis scripts for game logs (in `/logs/`) to understand win/loss status and opponent strategies.
+      Write analysis scripts and save them for teammates (mention in README_agent.md).
+   3. You don't *have* to modify anything in your player code.
+      For instance, if your team has been winning, and you think keeping the same strategy is best,
+      feel free to just submit, or put more time towards adding analyses and documentation for your teammates.
+      Of course, you can also try to improve your bot if you think you can do better.
+   4. You can modify *any* part of the codebase, particularly if you think the code is impacting performance negatively.
+   5. You could create tests to ensure your changes or bots are working as expected.
+   6. Testing against previous versions can be helpful for making sure your changes are improvements.
+   7. Examine game logic and documentation for clarity, but modifying game logic won't affect your rating.
+   8. Remember `/logs/` is outside your working directory when writing analyses.
 
   ## Command Execution Rules
 
@@ -146,6 +157,8 @@ instance_template: |
   EOF
   ```
 
+  Note: You cannot combine this heredoc usage with other commands through the use of `&&` or `||`.
+
   ### Edit files with sed:
 
   ```bash

configs/mini/semi_prescriptive.yaml

@@ -93,7 +93,7 @@ def main(models, rounds, simulations, output: Path):
                     {
                         "agent": "mini",
                         "name": get_name(p),
-                        "config": {"agent": IncludeTag("mini/semi_prescriptive.yaml"), "model": p},
+                        "config": {"agent": IncludeTag("mini/default.yaml"), "model": p},
                     }
                     for p in pair
                 ],