fix: harden stream scan command

Author: martinfrancois

evals-reference/17-java8-optional-prefix-review/task.md

@@ -27,7 +27,18 @@ final class AuditTrail {
         return out;
     }
 
-    record Event(String id, boolean visible) {}
+    static final class Event {
+        private final String id;
+        private final boolean visible;
+
+        Event(String id, boolean visible) {
+            this.id = id;
+            this.visible = visible;
+        }
+
+        String id() { return id; }
+        boolean visible() { return visible; }
+    }
 }
 ```
 
@@ -45,6 +56,17 @@ final class AuditTrail {
                 .toList();
     }
 
-    record Event(String id, boolean visible) {}
+    static final class Event {
+        private final String id;
+        private final boolean visible;
+
+        Event(String id, boolean visible) {
+            this.id = id;
+            this.visible = visible;
+        }
+
+        String id() { return id; }
+        boolean visible() { return visible; }
+    }
 }
 ```

evals/02-java8-version-scan/task.md

@@ -70,14 +70,65 @@ final class Java8StreamDrift {
                 .count();
     }
 
-    record Customer(String id, String name, String region, List<String> aliases, boolean active) {}
-    record Event(String id, boolean visible) {}
-    record Score(int value) implements Comparable<Score> {
+    static final class Customer {
+        private final String id;
+        private final String name;
+        private final String region;
+        private final List<String> aliases;
+        private final boolean active;
+
+        Customer(String id, String name, String region, List<String> aliases, boolean active) {
+            this.id = id;
+            this.name = name;
+            this.region = region;
+            this.aliases = aliases;
+            this.active = active;
+        }
+
+        String id() { return id; }
+        String name() { return name; }
+        String region() { return region; }
+        List<String> aliases() { return aliases; }
+        boolean active() { return active; }
+    }
+
+    static final class Event {
+        private final String id;
+        private final boolean visible;
+
+        Event(String id, boolean visible) {
+            this.id = id;
+            this.visible = visible;
+        }
+
+        String id() { return id; }
+        boolean visible() { return visible; }
+    }
+
+    static final class Score implements Comparable<Score> {
+        private final int value;
+
+        Score(int value) {
+            this.value = value;
+        }
+
         @Override
         public int compareTo(Score other) {
             return Integer.compare(value, other.value);
         }
     }
-    record Split(Optional<Score> min, Optional<Score> max) {}
+
+    static final class Split {
+        private final Optional<Score> min;
+        private final Optional<Score> max;
+
+        Split(Optional<Score> min, Optional<Score> max) {
+            this.min = min;
+            this.max = max;
+        }
+
+        Optional<Score> min() { return min; }
+        Optional<Score> max() { return max; }
+    }
 }
 ```

skills/java-streams/references/hard-stops.md

@@ -61,10 +61,11 @@ When documenting a scan, start with this header so later reviews can tell which
 java-streams hard-stop scan v1
 ```
 
-Run a hard-stop scan over touched Java files before finalizing:
+Run a hard-stop scan over touched Java files before finalizing. The command uses PCRE2 and
+multiline mode so it catches normally formatted fluent chains:
 
 ```bash
-rg -n "count\\(\\)\\s*>\\s*0|collect\\([^;]+\\)\\.isEmpty\\(|collect\\([^;]+\\)\\.size\\(|sorted\\([^;]*\\)\\.findFirst\\(|sorted\\(\\)\\.findFirst\\(|filter\\(Optional::isPresent\\)\\s*\\.map\\(Optional::get\\)|parallelStream\\(|\\.parallel\\(\\)|Collectors\\.toMap\\(|Collectors\\.groupingBy\\(|Comparator\\.naturalOrder\\(\\)|\\.toList\\(\\)|mapMulti\\(|takeWhile\\(|dropWhile\\(|Collectors\\.teeing\\(|Optional::stream|Collectors\\.flatMapping|Stream\\.ofNullable|\\.gather\\(" <touched Java files>
+rg -nUP "count\\(\\)\\s*>\\s*0|collect\\([^;]+\\)\\s*\\.\\s*(?:isEmpty|size)\\(|sorted\\([^;]*\\)\\s*\\.\\s*findFirst\\(|sorted\\(\\)\\s*\\.\\s*findFirst\\(|filter\\(Optional::isPresent\\)\\s*\\.\\s*map\\(Optional::get\\)|parallelStream\\(|\\.parallel\\(\\)|Collectors\\.toMap\\(|Collectors\\.groupingBy\\(|Comparator\\.naturalOrder\\(\\)|(?<!Collectors)\\.toList\\(|mapMulti\\(|takeWhile\\(|dropWhile\\(|Collectors\\.teeing\\(|Optional::stream|Collectors\\.flatMapping|Stream\\.ofNullable|\\.gather\\(" <touched Java files>
 ```
 
 For each hit, decide whether it is legitimate for the project Java baseline and behavior. Fix