Push to branch working

Author: john-b-yang

codeclash/agents/__init__.py

@@ -13,8 +13,8 @@ def get_agent(config: dict, game: CodeGame) -> Player:
         raise ValueError(f"Unknown agent type: {config['agent']}")
     environment = game.get_environment(f"{game.game_id}_{config['name']}")
     format_vars = {
+        "game_name": game.name,
         "game_id": game.game_id,
         "rounds": game.rounds,
-        "round": game.round,
     }
     return agents(config, environment, format_vars)

codeclash/agents/abstract.py

@@ -20,8 +20,8 @@ def __init__(
         self.config = config
         self.name = f"{format_vars['game_id']}_{config['name']}"
         self.environment = environment
-        self.round = format_vars["round"]
         self.format_vars = format_vars
+        self.round = 1  # TODO: This is disconnected from game.round right now
 
     def commit(self):
         """Commit changes to the agent's codebase."""
@@ -32,6 +32,7 @@ def commit(self):
         ]:
             assert_zero_exit_code(self.environment.execute(cmd))
         print(f"Committed changes for {self.name} for round {self.round}/{rounds}")
+        self.round += 1  # TODO: This is disconnected from game.round right now
 
     def push(self):
         """Push codebase to a branch on the game's remote repository."""
@@ -40,10 +41,14 @@ def push(self):
             raise ValueError("GITHUB_TOKEN environment variable is required")
 
         for cmd in [
-            f"git remote add origin https://x-access-token:{token}@github.com/{GH_ORG}/{self.name}.git",
-            "git push -u origin main",
+            f"git remote remove origin",
+            f"git remote add origin https://x-access-token:{token}@github.com/{GH_ORG}/{self.format_vars['game_name']}.git",
+            f"git push origin {self.name}",
         ]:
             assert_zero_exit_code(self.environment.execute(cmd))
+        print(
+            f"Pushed {self.name} commit history to remote repository (branch {self.name})"
+        )
 
     @abstractmethod
     def run(self):

codeclash/games/abstract.py

@@ -78,7 +78,7 @@ def get_environment(self, branch_name: str | None = None) -> DockerEnvironment:
             cwd=str(DIR_WORK),
             env={"GITHUB_TOKEN": os.getenv("GITHUB_TOKEN", "")},
         )
-        # Reinitialize git
+        # Ensure all future branches occur against branch
         branch_name = self.game_id if branch_name is None else branch_name
         for cmd in [
             f"git branch {branch_name}",