Fix: Don't duplicate information into metadata; add branch name

Author: klieret

codeclash/agents/player.py

@@ -39,10 +39,11 @@ def __init__(
         self._metadata = {
             "name": self.name,
             "player_unique_id": self._player_unique_id,
-            "diff": {0: ""},  # mapping round -> diff
             "created_timestamp": int(time.time()),
             "config": self.config,
             "initial_commit_hash": self._get_commit_hash(),
+            "branch_name": self._branch_name,
+            "round_tags": {},  # mapping round -> tag
         }
 
         if self.push:
@@ -64,17 +65,24 @@ def pre_run_hook(self, *, new_round: int) -> None:
             self._tag_round(0)
         self.game_context.round = new_round
 
-    def _write_changes_to_file(self, *, round: int, incremental_diff: str, modified_files: dict[str, str]) -> None:
-        """Write incremental changes to a JSON file in players/{name}/changes_r{round}.json"""
+    def _write_changes_to_file(self, *, round: int) -> None:
+        """Write all changes to a JSON file in players/{name}/changes_r{round}.json"""
         if round == 0:
             return  # No changes for round 0
 
+        # Generate all diffs and extract modified files
+        raw_diff = self._get_round_diff(round)
+        filtered_diff = filter_git_diff(raw_diff)
+        incremental_diff = self._get_round_diff(round, incremental=True)
+        modified_files = self._extract_modified_files_from_diff(filtered_diff)
+
         player_dir = self.game_context.log_local / "players" / self.name
         player_dir.mkdir(parents=True, exist_ok=True)
 
         changes_file = player_dir / f"changes_r{round}.json"
         changes_data = {
             "round": round,
+            "full_diff": raw_diff,
             "incremental_diff": incremental_diff,
             "modified_files": modified_files,
             "timestamp": int(time.time()),
@@ -86,14 +94,9 @@ def _write_changes_to_file(self, *, round: int, incremental_diff: str, modified_
     def post_run_hook(self, *, round: int) -> None:
         """Should be called after we called the run method."""
         self._commit()
-        raw_diff = self._get_round_diff(round)
-        filtered_diff = filter_git_diff(raw_diff)
-        self._metadata["diff"][round] = raw_diff
 
-        # Write incremental changes to separate JSON file
-        incremental_diff = self._get_round_diff(round, incremental=True)
-        modified_files = self._extract_modified_files_from_diff(filtered_diff)
-        self._write_changes_to_file(round=round, incremental_diff=incremental_diff, modified_files=modified_files)
+        # Write all changes to separate JSON file
+        self._write_changes_to_file(round=round)
 
         if self.push:
             for cmd in [
@@ -144,10 +147,12 @@ def reset_and_apply_patch(self, patch: str, *, base_commit: str = "", filter_pat
 
     def _tag_round(self, round: int) -> None:
         """Git tag the codebase at the given round."""
+        tag = self._get_round_tag_name(round)
         assert_zero_exit_code(
-            self.environment.execute(f"git tag -a {self._get_round_tag_name(round)} -m 'Round {round} Update'"),
+            self.environment.execute(f"git tag -a {tag} -m 'Round {round} Update'"),
             logger=self.logger,
         )
+        self._metadata["round_tags"][round] = tag
 
     @property
     def _branch_name(self) -> str:

codeclash/viewer/app.py

@@ -357,35 +357,34 @@ def parse_trajectory(self, player_name: str, round_num: int) -> TrajectoryInfo |
                     info = data.get("info", {})
                     model_stats = info.get("model_stats", {})
 
-                    # Get diff data from player metadata and changes file
+                    # Get diff data from changes file (preferred) or fall back to metadata
                     diff = None
                     incremental_diff = None
                     modified_files = None
                     diff_by_files = {}
                     incremental_diff_by_files = {}
 
-                    if player_name in self._player_metadata:
-                        player_meta = self._player_metadata[player_name]
-                        diff = player_meta.get("diff", {}).get(str(round_num), "")
-
-                    # Try to read incremental changes from separate JSON file
+                    # Try to read all changes from separate JSON file first
                     changes_file = player_dir / f"changes_r{round_num}.json"
                     if changes_file.exists():
                         try:
                             changes_data = json.loads(changes_file.read_text())
+                            diff = changes_data.get("full_diff", "")
                             incremental_diff = changes_data.get("incremental_diff", "")
                             modified_files = changes_data.get("modified_files", {})
                         except (json.JSONDecodeError, KeyError):
                             # Fall back to metadata if changes file is corrupted
                             if player_name in self._player_metadata:
                                 player_meta = self._player_metadata[player_name]
+                                diff = player_meta.get("diff", {}).get(str(round_num), "")
                                 incremental_diff = player_meta.get("incremental_diff", {}).get(str(round_num), "")
                                 modified_files = player_meta.get("modified_files", {}).get(str(round_num), {})
                     else:
                         # todo: Legacy: Remove this at some point after we have migrated
                         # Fall back to metadata if changes file doesn't exist
                         if player_name in self._player_metadata:
                             player_meta = self._player_metadata[player_name]
+                            diff = player_meta.get("diff", {}).get(str(round_num), "")
                             incremental_diff = player_meta.get("incremental_diff", {}).get(str(round_num), "")
                             modified_files = player_meta.get("modified_files", {}).get(str(round_num), {})