Apply retry markers in ResultCollector before name normalization

Adds applyRetryMarkers() which scans the same directory as the source XML
for TEST-retried-*.xml files and calls tagRetriedTests() for each, patching
prior retry attempts as skip before tagFinalStatuses() runs.

Called before normalizeStableTestNames() so that display names in the marker
files match the XML before normalization rewrites them, preventing false
positives from unrelated tests collapsing to the same normalized name.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

Author: mhdatie

.gitlab/collect-result/ResultCollector.java

@@ -39,16 +39,18 @@ void collect() throws Exception {
   }
 
   private void collect(Path sourceXml) throws Exception {
+    if (fileName(sourceXml).startsWith("TEST-retried-")) return;
+
     var aggregatedName = aggregatedFileName(sourceXml);
     var targetXml = resultsDir.resolve(aggregatedName);
     System.out.print("- " + toUnixString(sourceXml) + " as " + aggregatedName);
 
     var sourceFile = sourceFileResolver.resolve(sourceXml);
     var report = JUnitReport.parse(sourceXml);
     var reportChangedBeforeFinalStatus = report.addFileAttribute(sourceFile);
+    applyRetryMarkers(sourceXml.getParent(), report);  // before normalizeStableTestNames
     reportChangedBeforeFinalStatus |= report.normalizeStableTestNames();
     report.tagSyntheticFailures();
-    report.tagRetriedTests();
     report.tagFinalStatuses();
     report.write(targetXml);
 
@@ -58,6 +60,26 @@ private void collect(Path sourceXml) throws Exception {
     System.out.println();
   }
 
+  private static void applyRetryMarkers(Path dir, JUnitReport report) {
+    if (dir == null) return;
+    try (var paths = Files.list(dir)) {
+      paths
+          .filter(p -> fileName(p).startsWith("TEST-retried-") && fileName(p).endsWith(".xml"))
+          .forEach(markerFile -> {
+            try {
+              report.tagRetriedTests(JUnitReport.parse(markerFile).testcaseKeys());
+            } catch (Exception e) {
+              System.err.println(
+                  "[ResultCollector] Failed to apply retry markers from "
+                      + markerFile.getFileName() + ": " + e.getMessage());
+            }
+          });
+    } catch (IOException e) {
+      System.err.println(
+          "[ResultCollector] Failed to scan for retry markers in " + dir + ": " + e.getMessage());
+    }
+  }
+
   private List<Path> findTestResultDirs() throws IOException {
     var found = new ArrayList<Path>();
     for (var searchDir : searchDirs) {