Speedup reset_and_apply_patch

Author: yolo h8cker 93

codeclash/agents/player.py

@@ -118,11 +118,6 @@ def reset_and_apply_patch(self, patch: str, *, base_commit: str = "", filter_pat
         """Clean all uncommitted changes. If base_commit is provided, reset to that commit.
         Then apply the patch to the codebase.
         """
-        # Need to clean before we copy over the patch (else it's gonna be removed by git clean)
-        self.logger.debug(
-            assert_zero_exit_code(self.environment.execute(f"git reset --hard {base_commit} && git clean -fd"))
-        )
-
         patch = filter_git_diff(patch) if filter_patch else patch
 
         if not patch.strip():
@@ -135,13 +130,18 @@ def reset_and_apply_patch(self, patch: str, *, base_commit: str = "", filter_pat
             dest_path="tmp_patch.txt",
         )
 
-        self.logger.debug(f"Applying patch to agent's codebase: {patch}")
-
-        commands = ["git status", "git apply tmp_patch.txt", "rm -f tmp_patch.txt"]
-        for cmd in commands:
-            self.logger.debug(f"Executing command: {cmd}")
-            out = assert_zero_exit_code(self.environment.execute(cmd), logger=self.logger)
-            self.logger.debug(out)
+        # Need to clean before we copy over the patch (else it's gonna be removed by git clean)
+        commands = [
+            "git reset --hard {base_commit}",
+            "git clean -fd",
+            "git status",
+            "git apply tmp_patch.txt",
+            "rm -f tmp_patch.txt",
+        ]
+        cmd = " && ".join(commands)
+        self.logger.debug(f"Executing command: {cmd}")
+        out = assert_zero_exit_code(self.environment.execute(cmd), logger=self.logger)
+        self.logger.debug(out)
 
     # --- Helper methods ---