fix: retry

Author: kacperzolkiewski

.maestro/scripts/run-tests.sh

@@ -187,6 +187,34 @@ maestro_test_paths() {
   echo "$paths"
 }
 
+normalize_maestro_output() {
+  sed 's/\x1b\[[0-9;]*[a-zA-Z]//g; s/\r//g' "$1"
+}
+
+is_tag_filter_miss() {
+  normalize_maestro_output "$1" | grep -Eqi \
+    'did not match any [Ff]lows|no flows matched|Error: no test flows found'
+}
+
+is_maestro_run_success() {
+  local output
+  output=$(normalize_maestro_output "$1")
+
+  is_tag_filter_miss "$1" && return 0
+
+  if echo "$output" | grep -Eqi 'Failed: [1-9][0-9]*'; then
+    return 1
+  fi
+  if echo "$output" | grep -Eqi '✗ FAIL'; then
+    return 1
+  fi
+  if echo "$output" | grep -Eqi 'Tests completed|Failed: 0|✓ PASS'; then
+    return 0
+  fi
+
+  return 1
+}
+
 run_maestro_with_targets() {
   local test_targets="$1"
   shift
@@ -215,13 +243,10 @@ run_maestro_with_targets() {
     fi
     rc=${PIPESTATUS[0]}
 
-    if [ "$rc" -eq 0 ]; then
-      rm -f "$tmp"
-      return 0
-    fi
-
-    if sed 's/\x1b\[[0-9;]*[a-zA-Z]//g; s/\r//g' "$tmp" | grep -Eqi "did not match any [Ff]lows|no flows matched"; then
-      echo "warn: no flows matched the tag filter — treating as success" >&2
+    if is_maestro_run_success "$tmp" || { [ "$rc" -eq 0 ] && ! is_driver_startup_crash "$tmp"; }; then
+      if is_tag_filter_miss "$tmp"; then
+        echo "warn: no flows matched the tag filter — treating as success" >&2
+      fi
       rm -f "$tmp"
       return 0
     fi
@@ -259,17 +284,26 @@ run_maestro_with_targets() {
 }
 
 run_maestro() {
+  local tag_args=("$@")
+
+  # Tag-filtered suites skip most flows; run them in one batch so we don't
+  # invoke maestro once per file only to get "no test flows found".
+  if is_ci && [[ " ${tag_args[*]} " == *" --include-tags "* ]]; then
+    run_maestro_with_targets "$FLOWS" "${tag_args[@]}"
+    return $?
+  fi
+
   if is_ci; then
     local flow failed=0
     while IFS= read -r flow; do
       [ -z "$flow" ] && continue
       echo "=== Running flow: $flow ==="
-      run_maestro_with_targets "$(maestro_test_paths "$flow")" "$@" || failed=1
+      run_maestro_with_targets "$(maestro_test_paths "$flow")" "${tag_args[@]}" || failed=1
     done < <(collect_flow_files)
     return "$failed"
   fi
 
-  run_maestro_with_targets "$FLOWS" "$@"
+  run_maestro_with_targets "$FLOWS" "${tag_args[@]}"
 }
 
 set +e