From c69b584cf74d456e22644d07ea24d9725513af8e Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 20:39:03 +0100
Subject: [PATCH 01/14] Add blank query object and remove all junit formatter
 implementations

---
 lib/cucumber/formatter/junit.rb | 386 ++++++++++++++++----------------
 lib/cucumber/query.rb           |   5 +
 2 files changed, 198 insertions(+), 193 deletions(-)
 create mode 100644 lib/cucumber/query.rb

diff --git a/lib/cucumber/formatter/junit.rb b/lib/cucumber/formatter/junit.rb
index e457383df..45654483a 100644
--- a/lib/cucumber/formatter/junit.rb
+++ b/lib/cucumber/formatter/junit.rb
@@ -11,199 +11,199 @@ module Cucumber
   module Formatter
     # The formatter used for <tt>--format junit</tt>
     class Junit
-      include Io
-
-      class UnNamedFeatureError < StandardError
-        def initialize(feature_file)
-          super("The feature in '#{feature_file}' does not have a name. The JUnit XML format requires a name for the testsuite element.")
-        end
-      end
-
-      def initialize(config)
-        @ast_lookup = AstLookup.new(config)
-        config.on_event :test_case_started, &method(:on_test_case_started)
-        config.on_event :test_case_finished, &method(:on_test_case_finished)
-        config.on_event :test_step_finished, &method(:on_test_step_finished)
-        config.on_event :test_run_finished, &method(:on_test_run_finished)
-        @reportdir = ensure_dir(config.out_stream, 'junit')
-        @config = config
-        @features_data = Hash.new do |h, k|
-          h[k] = {
-            feature: nil,
-            failures: 0,
-            errors: 0,
-            tests: 0,
-            skipped: 0,
-            time: 0,
-            builder: Builder::XmlMarkup.new(indent: 2)
-          }
-        end
-      end
-
-      def on_test_case_started(event)
-        test_case = event.test_case
-        start_feature(test_case) unless same_feature_as_previous_test_case?(test_case)
-        @failing_test_step = nil
-        # In order to fill out <system-err/> and <system-out/>, we need to
-        # intercept the $stderr and $stdout
-        @interceptedout = Interceptor::Pipe.wrap(:stdout)
-        @interceptederr = Interceptor::Pipe.wrap(:stderr)
-      end
-
-      def on_test_step_finished(event)
-        test_step, result = *event.attributes
-        return if @failing_test_step
-
-        @failing_test_step = test_step unless result.ok?(strict: @config.strict)
-      end
-
-      def on_test_case_finished(event)
-        test_case, result = *event.attributes
-        result = result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
-        test_case_name = NameBuilder.new(test_case, @ast_lookup)
-        scenario = test_case_name.scenario_name
-        scenario_designation = "#{scenario}#{test_case_name.name_suffix}"
-        output = create_output_string(test_case, scenario, result, test_case_name.row_name)
-        build_testcase(result, scenario_designation, output)
-
-        Interceptor::Pipe.unwrap! :stdout
-        Interceptor::Pipe.unwrap! :stderr
-      end
-
-      def on_test_run_finished(_event)
-        @features_data.each_value { |data| end_feature(data) }
-      end
-
-      private
-
-      def same_feature_as_previous_test_case?(test_case)
-        @current_feature_data && @current_feature_data[:uri] == test_case.location.file
-      end
-
-      def start_feature(test_case)
-        uri = test_case.location.file
-        feature = @ast_lookup.gherkin_document(uri).feature
-        raise UnNamedFeatureError, uri if feature.name.empty?
-
-        @current_feature_data = @features_data[uri]
-        @current_feature_data[:uri] = uri unless @current_feature_data[:uri]
-        @current_feature_data[:feature] = feature unless @current_feature_data[:feature]
-      end
-
-      def end_feature(feature_data)
-        @testsuite = Builder::XmlMarkup.new(indent: 2)
-        @testsuite.instruct!
-        @testsuite.testsuite(
-          failures: feature_data[:failures],
-          errors: feature_data[:errors],
-          skipped: feature_data[:skipped],
-          tests: feature_data[:tests],
-          time: format('%<time>.6f', time: feature_data[:time]),
-          name: feature_data[:feature].name
-        ) do
-          @testsuite << feature_data[:builder].target!
-        end
-
-        write_file(feature_result_filename(feature_data[:uri]), @testsuite.target!)
-      end
-
-      def create_output_string(test_case, scenario, result, row_name)
-        scenario_source = @ast_lookup.scenario_source(test_case)
-        keyword = scenario_source.type == :Scenario ? scenario_source.scenario.keyword : scenario_source.scenario_outline.keyword
-        output = "#{keyword}: #{scenario}\n\n"
-        return output if result.ok?(strict: @config.strict)
-
-        if scenario_source.type == :Scenario
-          if @failing_test_step
-            if @failing_test_step.hook?
-              output += "#{@failing_test_step.text} at #{@failing_test_step.location}\n"
-            else
-              step_source = @ast_lookup.step_source(@failing_test_step).step
-              output += "#{step_source.keyword}#{@failing_test_step.text}\n"
-            end
-          else # An Around hook has failed
-            output += "Around hook\n"
-          end
-        else
-          output += "Example row: #{row_name}\n"
-        end
-        "#{output}\nMessage:\n"
-      end
-
-      def build_testcase(result, scenario_designation, output)
-        duration = ResultBuilder.new(result).test_case_duration
-        @current_feature_data[:time] += duration
-        classname = @current_feature_data[:feature].name
-        filename = @current_feature_data[:uri]
-        name = scenario_designation
-
-        testcase_attributes = get_testcase_attributes(classname, name, duration, filename)
-
-        @current_feature_data[:builder].testcase(testcase_attributes) do
-          if !result.passed? && result.ok?(strict: @config.strict)
-            @current_feature_data[:builder].skipped
-            @current_feature_data[:skipped] += 1
-          elsif !result.passed?
-            status = result.to_sym
-            exception = get_backtrace_object(result)
-            @current_feature_data[:builder].failure(message: "#{status} #{name}", type: status) do
-              @current_feature_data[:builder].cdata! output
-              @current_feature_data[:builder].cdata!(format_exception(exception)) if exception
-            end
-            @current_feature_data[:failures] += 1
-          end
-          @current_feature_data[:builder].tag!('system-out') do
-            @current_feature_data[:builder].cdata! strip_control_chars(@interceptedout.buffer_string)
-          end
-          @current_feature_data[:builder].tag!('system-err') do
-            @current_feature_data[:builder].cdata! strip_control_chars(@interceptederr.buffer_string)
-          end
-        end
-        @current_feature_data[:tests] += 1
-      end
-
-      def get_testcase_attributes(classname, name, duration, filename)
-        { classname: classname, name: name, time: format('%<duration>.6f', duration: duration) }.tap do |attributes|
-          attributes[:file] = filename if add_fileattribute?
-        end
-      end
-
-      def add_fileattribute?
-        return false if @config.formats.nil? || @config.formats.empty?
-
-        !!@config.formats.find do |format|
-          format.first == 'junit' && format.dig(1, 'fileattribute') == 'true'
-        end
-      end
-
-      def get_backtrace_object(result)
-        if result.failed?
-          result.exception
-        elsif result.backtrace
-          result
-        end
-      end
-
-      def format_exception(exception)
-        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
-      end
-
-      def feature_result_filename(feature_file)
-        File.join(@reportdir, "TEST-#{basename(feature_file)}.xml")
-      end
-
-      def basename(feature_file)
-        File.basename(feature_file.gsub(/[\\\/]/, '-'), '.feature')
-      end
-
-      def write_file(feature_filename, data)
-        File.open(feature_filename, 'w') { |file| file.write(data) }
-      end
-
-      # strip control chars from cdata, to make it safe for external parsers
-      def strip_control_chars(cdata)
-        cdata.scan(/[[:print:]\t\n\r]/).join
-      end
+    #   include Io
+    #
+    #   class UnNamedFeatureError < StandardError
+    #     def initialize(feature_file)
+    #       super("The feature in '#{feature_file}' does not have a name. The JUnit XML format requires a name for the testsuite element.")
+    #     end
+    #   end
+    #
+    #   def initialize(config)
+    #     @ast_lookup = AstLookup.new(config)
+    #     config.on_event :test_case_started, &method(:on_test_case_started)
+    #     config.on_event :test_case_finished, &method(:on_test_case_finished)
+    #     config.on_event :test_step_finished, &method(:on_test_step_finished)
+    #     config.on_event :test_run_finished, &method(:on_test_run_finished)
+    #     @reportdir = ensure_dir(config.out_stream, 'junit')
+    #     @config = config
+    #     @features_data = Hash.new do |h, k|
+    #       h[k] = {
+    #         feature: nil,
+    #         failures: 0,
+    #         errors: 0,
+    #         tests: 0,
+    #         skipped: 0,
+    #         time: 0,
+    #         builder: Builder::XmlMarkup.new(indent: 2)
+    #       }
+    #     end
+    #   end
+    #
+    #   def on_test_case_started(event)
+    #     test_case = event.test_case
+    #     start_feature(test_case) unless same_feature_as_previous_test_case?(test_case)
+    #     @failing_test_step = nil
+    #     # In order to fill out <system-err/> and <system-out/>, we need to
+    #     # intercept the $stderr and $stdout
+    #     @interceptedout = Interceptor::Pipe.wrap(:stdout)
+    #     @interceptederr = Interceptor::Pipe.wrap(:stderr)
+    #   end
+    #
+    #   def on_test_step_finished(event)
+    #     test_step, result = *event.attributes
+    #     return if @failing_test_step
+    #
+    #     @failing_test_step = test_step unless result.ok?(strict: @config.strict)
+    #   end
+    #
+    #   def on_test_case_finished(event)
+    #     test_case, result = *event.attributes
+    #     result = result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
+    #     test_case_name = NameBuilder.new(test_case, @ast_lookup)
+    #     scenario = test_case_name.scenario_name
+    #     scenario_designation = "#{scenario}#{test_case_name.name_suffix}"
+    #     output = create_output_string(test_case, scenario, result, test_case_name.row_name)
+    #     build_testcase(result, scenario_designation, output)
+    #
+    #     Interceptor::Pipe.unwrap! :stdout
+    #     Interceptor::Pipe.unwrap! :stderr
+    #   end
+    #
+    #   def on_test_run_finished(_event)
+    #     @features_data.each_value { |data| end_feature(data) }
+    #   end
+    #
+    #   private
+    #
+    #   def same_feature_as_previous_test_case?(test_case)
+    #     @current_feature_data && @current_feature_data[:uri] == test_case.location.file
+    #   end
+    #
+    #   def start_feature(test_case)
+    #     uri = test_case.location.file
+    #     feature = @ast_lookup.gherkin_document(uri).feature
+    #     raise UnNamedFeatureError, uri if feature.name.empty?
+    #
+    #     @current_feature_data = @features_data[uri]
+    #     @current_feature_data[:uri] = uri unless @current_feature_data[:uri]
+    #     @current_feature_data[:feature] = feature unless @current_feature_data[:feature]
+    #   end
+    #
+    #   def end_feature(feature_data)
+    #     @testsuite = Builder::XmlMarkup.new(indent: 2)
+    #     @testsuite.instruct!
+    #     @testsuite.testsuite(
+    #       failures: feature_data[:failures],
+    #       errors: feature_data[:errors],
+    #       skipped: feature_data[:skipped],
+    #       tests: feature_data[:tests],
+    #       time: format('%<time>.6f', time: feature_data[:time]),
+    #       name: feature_data[:feature].name
+    #     ) do
+    #       @testsuite << feature_data[:builder].target!
+    #     end
+    #
+    #     write_file(feature_result_filename(feature_data[:uri]), @testsuite.target!)
+    #   end
+    #
+    #   def create_output_string(test_case, scenario, result, row_name)
+    #     scenario_source = @ast_lookup.scenario_source(test_case)
+    #     keyword = scenario_source.type == :Scenario ? scenario_source.scenario.keyword : scenario_source.scenario_outline.keyword
+    #     output = "#{keyword}: #{scenario}\n\n"
+    #     return output if result.ok?(strict: @config.strict)
+    #
+    #     if scenario_source.type == :Scenario
+    #       if @failing_test_step
+    #         if @failing_test_step.hook?
+    #           output += "#{@failing_test_step.text} at #{@failing_test_step.location}\n"
+    #         else
+    #           step_source = @ast_lookup.step_source(@failing_test_step).step
+    #           output += "#{step_source.keyword}#{@failing_test_step.text}\n"
+    #         end
+    #       else # An Around hook has failed
+    #         output += "Around hook\n"
+    #       end
+    #     else
+    #       output += "Example row: #{row_name}\n"
+    #     end
+    #     "#{output}\nMessage:\n"
+    #   end
+    #
+    #   def build_testcase(result, scenario_designation, output)
+    #     duration = ResultBuilder.new(result).test_case_duration
+    #     @current_feature_data[:time] += duration
+    #     classname = @current_feature_data[:feature].name
+    #     filename = @current_feature_data[:uri]
+    #     name = scenario_designation
+    #
+    #     testcase_attributes = get_testcase_attributes(classname, name, duration, filename)
+    #
+    #     @current_feature_data[:builder].testcase(testcase_attributes) do
+    #       if !result.passed? && result.ok?(strict: @config.strict)
+    #         @current_feature_data[:builder].skipped
+    #         @current_feature_data[:skipped] += 1
+    #       elsif !result.passed?
+    #         status = result.to_sym
+    #         exception = get_backtrace_object(result)
+    #         @current_feature_data[:builder].failure(message: "#{status} #{name}", type: status) do
+    #           @current_feature_data[:builder].cdata! output
+    #           @current_feature_data[:builder].cdata!(format_exception(exception)) if exception
+    #         end
+    #         @current_feature_data[:failures] += 1
+    #       end
+    #       @current_feature_data[:builder].tag!('system-out') do
+    #         @current_feature_data[:builder].cdata! strip_control_chars(@interceptedout.buffer_string)
+    #       end
+    #       @current_feature_data[:builder].tag!('system-err') do
+    #         @current_feature_data[:builder].cdata! strip_control_chars(@interceptederr.buffer_string)
+    #       end
+    #     end
+    #     @current_feature_data[:tests] += 1
+    #   end
+    #
+    #   def get_testcase_attributes(classname, name, duration, filename)
+    #     { classname: classname, name: name, time: format('%<duration>.6f', duration: duration) }.tap do |attributes|
+    #       attributes[:file] = filename if add_fileattribute?
+    #     end
+    #   end
+    #
+    #   def add_fileattribute?
+    #     return false if @config.formats.nil? || @config.formats.empty?
+    #
+    #     !!@config.formats.find do |format|
+    #       format.first == 'junit' && format.dig(1, 'fileattribute') == 'true'
+    #     end
+    #   end
+    #
+    #   def get_backtrace_object(result)
+    #     if result.failed?
+    #       result.exception
+    #     elsif result.backtrace
+    #       result
+    #     end
+    #   end
+    #
+    #   def format_exception(exception)
+    #     (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+    #   end
+    #
+    #   def feature_result_filename(feature_file)
+    #     File.join(@reportdir, "TEST-#{basename(feature_file)}.xml")
+    #   end
+    #
+    #   def basename(feature_file)
+    #     File.basename(feature_file.gsub(/[\\\/]/, '-'), '.feature')
+    #   end
+    #
+    #   def write_file(feature_filename, data)
+    #     File.open(feature_filename, 'w') { |file| file.write(data) }
+    #   end
+    #
+    #   # strip control chars from cdata, to make it safe for external parsers
+    #   def strip_control_chars(cdata)
+    #     cdata.scan(/[[:print:]\t\n\r]/).join
+    #   end
     end
 
     class NameBuilder
diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
new file mode 100644
index 000000000..e9b75d6c1
--- /dev/null
+++ b/lib/cucumber/query.rb
@@ -0,0 +1,5 @@
+module Cucumber
+  class Query
+
+  end
+end

From 72b0f161c2e3b0b4563a202ad2ddd7f3256b4d37 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 20:47:44 +0100
Subject: [PATCH 02/14] Comment out the rerun formatter instead

---
 lib/cucumber/formatter/junit.rb | 386 ++++++++++++++++----------------
 lib/cucumber/formatter/rerun.rb |  86 +++----
 2 files changed, 236 insertions(+), 236 deletions(-)

diff --git a/lib/cucumber/formatter/junit.rb b/lib/cucumber/formatter/junit.rb
index 45654483a..e457383df 100644
--- a/lib/cucumber/formatter/junit.rb
+++ b/lib/cucumber/formatter/junit.rb
@@ -11,199 +11,199 @@ module Cucumber
   module Formatter
     # The formatter used for <tt>--format junit</tt>
     class Junit
-    #   include Io
-    #
-    #   class UnNamedFeatureError < StandardError
-    #     def initialize(feature_file)
-    #       super("The feature in '#{feature_file}' does not have a name. The JUnit XML format requires a name for the testsuite element.")
-    #     end
-    #   end
-    #
-    #   def initialize(config)
-    #     @ast_lookup = AstLookup.new(config)
-    #     config.on_event :test_case_started, &method(:on_test_case_started)
-    #     config.on_event :test_case_finished, &method(:on_test_case_finished)
-    #     config.on_event :test_step_finished, &method(:on_test_step_finished)
-    #     config.on_event :test_run_finished, &method(:on_test_run_finished)
-    #     @reportdir = ensure_dir(config.out_stream, 'junit')
-    #     @config = config
-    #     @features_data = Hash.new do |h, k|
-    #       h[k] = {
-    #         feature: nil,
-    #         failures: 0,
-    #         errors: 0,
-    #         tests: 0,
-    #         skipped: 0,
-    #         time: 0,
-    #         builder: Builder::XmlMarkup.new(indent: 2)
-    #       }
-    #     end
-    #   end
-    #
-    #   def on_test_case_started(event)
-    #     test_case = event.test_case
-    #     start_feature(test_case) unless same_feature_as_previous_test_case?(test_case)
-    #     @failing_test_step = nil
-    #     # In order to fill out <system-err/> and <system-out/>, we need to
-    #     # intercept the $stderr and $stdout
-    #     @interceptedout = Interceptor::Pipe.wrap(:stdout)
-    #     @interceptederr = Interceptor::Pipe.wrap(:stderr)
-    #   end
-    #
-    #   def on_test_step_finished(event)
-    #     test_step, result = *event.attributes
-    #     return if @failing_test_step
-    #
-    #     @failing_test_step = test_step unless result.ok?(strict: @config.strict)
-    #   end
-    #
-    #   def on_test_case_finished(event)
-    #     test_case, result = *event.attributes
-    #     result = result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
-    #     test_case_name = NameBuilder.new(test_case, @ast_lookup)
-    #     scenario = test_case_name.scenario_name
-    #     scenario_designation = "#{scenario}#{test_case_name.name_suffix}"
-    #     output = create_output_string(test_case, scenario, result, test_case_name.row_name)
-    #     build_testcase(result, scenario_designation, output)
-    #
-    #     Interceptor::Pipe.unwrap! :stdout
-    #     Interceptor::Pipe.unwrap! :stderr
-    #   end
-    #
-    #   def on_test_run_finished(_event)
-    #     @features_data.each_value { |data| end_feature(data) }
-    #   end
-    #
-    #   private
-    #
-    #   def same_feature_as_previous_test_case?(test_case)
-    #     @current_feature_data && @current_feature_data[:uri] == test_case.location.file
-    #   end
-    #
-    #   def start_feature(test_case)
-    #     uri = test_case.location.file
-    #     feature = @ast_lookup.gherkin_document(uri).feature
-    #     raise UnNamedFeatureError, uri if feature.name.empty?
-    #
-    #     @current_feature_data = @features_data[uri]
-    #     @current_feature_data[:uri] = uri unless @current_feature_data[:uri]
-    #     @current_feature_data[:feature] = feature unless @current_feature_data[:feature]
-    #   end
-    #
-    #   def end_feature(feature_data)
-    #     @testsuite = Builder::XmlMarkup.new(indent: 2)
-    #     @testsuite.instruct!
-    #     @testsuite.testsuite(
-    #       failures: feature_data[:failures],
-    #       errors: feature_data[:errors],
-    #       skipped: feature_data[:skipped],
-    #       tests: feature_data[:tests],
-    #       time: format('%<time>.6f', time: feature_data[:time]),
-    #       name: feature_data[:feature].name
-    #     ) do
-    #       @testsuite << feature_data[:builder].target!
-    #     end
-    #
-    #     write_file(feature_result_filename(feature_data[:uri]), @testsuite.target!)
-    #   end
-    #
-    #   def create_output_string(test_case, scenario, result, row_name)
-    #     scenario_source = @ast_lookup.scenario_source(test_case)
-    #     keyword = scenario_source.type == :Scenario ? scenario_source.scenario.keyword : scenario_source.scenario_outline.keyword
-    #     output = "#{keyword}: #{scenario}\n\n"
-    #     return output if result.ok?(strict: @config.strict)
-    #
-    #     if scenario_source.type == :Scenario
-    #       if @failing_test_step
-    #         if @failing_test_step.hook?
-    #           output += "#{@failing_test_step.text} at #{@failing_test_step.location}\n"
-    #         else
-    #           step_source = @ast_lookup.step_source(@failing_test_step).step
-    #           output += "#{step_source.keyword}#{@failing_test_step.text}\n"
-    #         end
-    #       else # An Around hook has failed
-    #         output += "Around hook\n"
-    #       end
-    #     else
-    #       output += "Example row: #{row_name}\n"
-    #     end
-    #     "#{output}\nMessage:\n"
-    #   end
-    #
-    #   def build_testcase(result, scenario_designation, output)
-    #     duration = ResultBuilder.new(result).test_case_duration
-    #     @current_feature_data[:time] += duration
-    #     classname = @current_feature_data[:feature].name
-    #     filename = @current_feature_data[:uri]
-    #     name = scenario_designation
-    #
-    #     testcase_attributes = get_testcase_attributes(classname, name, duration, filename)
-    #
-    #     @current_feature_data[:builder].testcase(testcase_attributes) do
-    #       if !result.passed? && result.ok?(strict: @config.strict)
-    #         @current_feature_data[:builder].skipped
-    #         @current_feature_data[:skipped] += 1
-    #       elsif !result.passed?
-    #         status = result.to_sym
-    #         exception = get_backtrace_object(result)
-    #         @current_feature_data[:builder].failure(message: "#{status} #{name}", type: status) do
-    #           @current_feature_data[:builder].cdata! output
-    #           @current_feature_data[:builder].cdata!(format_exception(exception)) if exception
-    #         end
-    #         @current_feature_data[:failures] += 1
-    #       end
-    #       @current_feature_data[:builder].tag!('system-out') do
-    #         @current_feature_data[:builder].cdata! strip_control_chars(@interceptedout.buffer_string)
-    #       end
-    #       @current_feature_data[:builder].tag!('system-err') do
-    #         @current_feature_data[:builder].cdata! strip_control_chars(@interceptederr.buffer_string)
-    #       end
-    #     end
-    #     @current_feature_data[:tests] += 1
-    #   end
-    #
-    #   def get_testcase_attributes(classname, name, duration, filename)
-    #     { classname: classname, name: name, time: format('%<duration>.6f', duration: duration) }.tap do |attributes|
-    #       attributes[:file] = filename if add_fileattribute?
-    #     end
-    #   end
-    #
-    #   def add_fileattribute?
-    #     return false if @config.formats.nil? || @config.formats.empty?
-    #
-    #     !!@config.formats.find do |format|
-    #       format.first == 'junit' && format.dig(1, 'fileattribute') == 'true'
-    #     end
-    #   end
-    #
-    #   def get_backtrace_object(result)
-    #     if result.failed?
-    #       result.exception
-    #     elsif result.backtrace
-    #       result
-    #     end
-    #   end
-    #
-    #   def format_exception(exception)
-    #     (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
-    #   end
-    #
-    #   def feature_result_filename(feature_file)
-    #     File.join(@reportdir, "TEST-#{basename(feature_file)}.xml")
-    #   end
-    #
-    #   def basename(feature_file)
-    #     File.basename(feature_file.gsub(/[\\\/]/, '-'), '.feature')
-    #   end
-    #
-    #   def write_file(feature_filename, data)
-    #     File.open(feature_filename, 'w') { |file| file.write(data) }
-    #   end
-    #
-    #   # strip control chars from cdata, to make it safe for external parsers
-    #   def strip_control_chars(cdata)
-    #     cdata.scan(/[[:print:]\t\n\r]/).join
-    #   end
+      include Io
+
+      class UnNamedFeatureError < StandardError
+        def initialize(feature_file)
+          super("The feature in '#{feature_file}' does not have a name. The JUnit XML format requires a name for the testsuite element.")
+        end
+      end
+
+      def initialize(config)
+        @ast_lookup = AstLookup.new(config)
+        config.on_event :test_case_started, &method(:on_test_case_started)
+        config.on_event :test_case_finished, &method(:on_test_case_finished)
+        config.on_event :test_step_finished, &method(:on_test_step_finished)
+        config.on_event :test_run_finished, &method(:on_test_run_finished)
+        @reportdir = ensure_dir(config.out_stream, 'junit')
+        @config = config
+        @features_data = Hash.new do |h, k|
+          h[k] = {
+            feature: nil,
+            failures: 0,
+            errors: 0,
+            tests: 0,
+            skipped: 0,
+            time: 0,
+            builder: Builder::XmlMarkup.new(indent: 2)
+          }
+        end
+      end
+
+      def on_test_case_started(event)
+        test_case = event.test_case
+        start_feature(test_case) unless same_feature_as_previous_test_case?(test_case)
+        @failing_test_step = nil
+        # In order to fill out <system-err/> and <system-out/>, we need to
+        # intercept the $stderr and $stdout
+        @interceptedout = Interceptor::Pipe.wrap(:stdout)
+        @interceptederr = Interceptor::Pipe.wrap(:stderr)
+      end
+
+      def on_test_step_finished(event)
+        test_step, result = *event.attributes
+        return if @failing_test_step
+
+        @failing_test_step = test_step unless result.ok?(strict: @config.strict)
+      end
+
+      def on_test_case_finished(event)
+        test_case, result = *event.attributes
+        result = result.with_filtered_backtrace(Cucumber::Formatter::BacktraceFilter)
+        test_case_name = NameBuilder.new(test_case, @ast_lookup)
+        scenario = test_case_name.scenario_name
+        scenario_designation = "#{scenario}#{test_case_name.name_suffix}"
+        output = create_output_string(test_case, scenario, result, test_case_name.row_name)
+        build_testcase(result, scenario_designation, output)
+
+        Interceptor::Pipe.unwrap! :stdout
+        Interceptor::Pipe.unwrap! :stderr
+      end
+
+      def on_test_run_finished(_event)
+        @features_data.each_value { |data| end_feature(data) }
+      end
+
+      private
+
+      def same_feature_as_previous_test_case?(test_case)
+        @current_feature_data && @current_feature_data[:uri] == test_case.location.file
+      end
+
+      def start_feature(test_case)
+        uri = test_case.location.file
+        feature = @ast_lookup.gherkin_document(uri).feature
+        raise UnNamedFeatureError, uri if feature.name.empty?
+
+        @current_feature_data = @features_data[uri]
+        @current_feature_data[:uri] = uri unless @current_feature_data[:uri]
+        @current_feature_data[:feature] = feature unless @current_feature_data[:feature]
+      end
+
+      def end_feature(feature_data)
+        @testsuite = Builder::XmlMarkup.new(indent: 2)
+        @testsuite.instruct!
+        @testsuite.testsuite(
+          failures: feature_data[:failures],
+          errors: feature_data[:errors],
+          skipped: feature_data[:skipped],
+          tests: feature_data[:tests],
+          time: format('%<time>.6f', time: feature_data[:time]),
+          name: feature_data[:feature].name
+        ) do
+          @testsuite << feature_data[:builder].target!
+        end
+
+        write_file(feature_result_filename(feature_data[:uri]), @testsuite.target!)
+      end
+
+      def create_output_string(test_case, scenario, result, row_name)
+        scenario_source = @ast_lookup.scenario_source(test_case)
+        keyword = scenario_source.type == :Scenario ? scenario_source.scenario.keyword : scenario_source.scenario_outline.keyword
+        output = "#{keyword}: #{scenario}\n\n"
+        return output if result.ok?(strict: @config.strict)
+
+        if scenario_source.type == :Scenario
+          if @failing_test_step
+            if @failing_test_step.hook?
+              output += "#{@failing_test_step.text} at #{@failing_test_step.location}\n"
+            else
+              step_source = @ast_lookup.step_source(@failing_test_step).step
+              output += "#{step_source.keyword}#{@failing_test_step.text}\n"
+            end
+          else # An Around hook has failed
+            output += "Around hook\n"
+          end
+        else
+          output += "Example row: #{row_name}\n"
+        end
+        "#{output}\nMessage:\n"
+      end
+
+      def build_testcase(result, scenario_designation, output)
+        duration = ResultBuilder.new(result).test_case_duration
+        @current_feature_data[:time] += duration
+        classname = @current_feature_data[:feature].name
+        filename = @current_feature_data[:uri]
+        name = scenario_designation
+
+        testcase_attributes = get_testcase_attributes(classname, name, duration, filename)
+
+        @current_feature_data[:builder].testcase(testcase_attributes) do
+          if !result.passed? && result.ok?(strict: @config.strict)
+            @current_feature_data[:builder].skipped
+            @current_feature_data[:skipped] += 1
+          elsif !result.passed?
+            status = result.to_sym
+            exception = get_backtrace_object(result)
+            @current_feature_data[:builder].failure(message: "#{status} #{name}", type: status) do
+              @current_feature_data[:builder].cdata! output
+              @current_feature_data[:builder].cdata!(format_exception(exception)) if exception
+            end
+            @current_feature_data[:failures] += 1
+          end
+          @current_feature_data[:builder].tag!('system-out') do
+            @current_feature_data[:builder].cdata! strip_control_chars(@interceptedout.buffer_string)
+          end
+          @current_feature_data[:builder].tag!('system-err') do
+            @current_feature_data[:builder].cdata! strip_control_chars(@interceptederr.buffer_string)
+          end
+        end
+        @current_feature_data[:tests] += 1
+      end
+
+      def get_testcase_attributes(classname, name, duration, filename)
+        { classname: classname, name: name, time: format('%<duration>.6f', duration: duration) }.tap do |attributes|
+          attributes[:file] = filename if add_fileattribute?
+        end
+      end
+
+      def add_fileattribute?
+        return false if @config.formats.nil? || @config.formats.empty?
+
+        !!@config.formats.find do |format|
+          format.first == 'junit' && format.dig(1, 'fileattribute') == 'true'
+        end
+      end
+
+      def get_backtrace_object(result)
+        if result.failed?
+          result.exception
+        elsif result.backtrace
+          result
+        end
+      end
+
+      def format_exception(exception)
+        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+      end
+
+      def feature_result_filename(feature_file)
+        File.join(@reportdir, "TEST-#{basename(feature_file)}.xml")
+      end
+
+      def basename(feature_file)
+        File.basename(feature_file.gsub(/[\\\/]/, '-'), '.feature')
+      end
+
+      def write_file(feature_filename, data)
+        File.open(feature_filename, 'w') { |file| file.write(data) }
+      end
+
+      # strip control chars from cdata, to make it safe for external parsers
+      def strip_control_chars(cdata)
+        cdata.scan(/[[:print:]\t\n\r]/).join
+      end
     end
 
     class NameBuilder
diff --git a/lib/cucumber/formatter/rerun.rb b/lib/cucumber/formatter/rerun.rb
index 5ee5080c4..97c580452 100644
--- a/lib/cucumber/formatter/rerun.rb
+++ b/lib/cucumber/formatter/rerun.rb
@@ -5,49 +5,49 @@
 module Cucumber
   module Formatter
     class Rerun
-      include Formatter::Io
-
-      def initialize(config)
-        @io = ensure_io(config.out_stream, config.error_stream)
-        @config = config
-        @failures = {}
-        config.on_event :test_case_finished do |event|
-          test_case, result = *event.attributes
-          if @config.strict.strict?(:flaky)
-            next if result.ok?(strict: @config.strict)
-
-            add_to_failures(test_case)
-          else
-            unless @latest_failed_test_case.nil?
-              if @latest_failed_test_case != test_case
-                add_to_failures(@latest_failed_test_case)
-                @latest_failed_test_case = nil
-              elsif result.ok?(strict: @config.strict)
-                @latest_failed_test_case = nil
-              end
-            end
-            @latest_failed_test_case = test_case unless result.ok?(strict: @config.strict)
-          end
-        end
-        config.on_event :test_run_finished do
-          add_to_failures(@latest_failed_test_case) unless @latest_failed_test_case.nil?
-          next if @failures.empty?
-
-          @io.print file_failures.join("\n")
-        end
-      end
-
-      private
-
-      def file_failures
-        @failures.map { |file, lines| [file, lines].join(':') }
-      end
-
-      def add_to_failures(test_case)
-        location = test_case.location
-        @failures[location.file] ||= []
-        @failures[location.file] << location.lines.max unless @failures[location.file].include?(location.lines.max)
-      end
+      # include Formatter::Io
+      #
+      # def initialize(config)
+      #   @io = ensure_io(config.out_stream, config.error_stream)
+      #   @config = config
+      #   @failures = {}
+      #   config.on_event :test_case_finished do |event|
+      #     test_case, result = *event.attributes
+      #     if @config.strict.strict?(:flaky)
+      #       next if result.ok?(strict: @config.strict)
+      #
+      #       add_to_failures(test_case)
+      #     else
+      #       unless @latest_failed_test_case.nil?
+      #         if @latest_failed_test_case != test_case
+      #           add_to_failures(@latest_failed_test_case)
+      #           @latest_failed_test_case = nil
+      #         elsif result.ok?(strict: @config.strict)
+      #           @latest_failed_test_case = nil
+      #         end
+      #       end
+      #       @latest_failed_test_case = test_case unless result.ok?(strict: @config.strict)
+      #     end
+      #   end
+      #   config.on_event :test_run_finished do
+      #     add_to_failures(@latest_failed_test_case) unless @latest_failed_test_case.nil?
+      #     next if @failures.empty?
+      #
+      #     @io.print file_failures.join("\n")
+      #   end
+      # end
+      #
+      # private
+      #
+      # def file_failures
+      #   @failures.map { |file, lines| [file, lines].join(':') }
+      # end
+      #
+      # def add_to_failures(test_case)
+      #   location = test_case.location
+      #   @failures[location.file] ||= []
+      #   @failures[location.file] << location.lines.max unless @failures[location.file].include?(location.lines.max)
+      # end
     end
   end
 end

From 23f7452b79ac0ce0f432843ff1724f60b2c77cbf Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 20:55:01 +0100
Subject: [PATCH 03/14] C+P for existing query

---
 lib/cucumber/formatter/rerun.rb | 100 ++++++++++++++++++--------------
 lib/cucumber/query.rb           |  75 ++++++++++++++++++++++++
 2 files changed, 131 insertions(+), 44 deletions(-)

diff --git a/lib/cucumber/formatter/rerun.rb b/lib/cucumber/formatter/rerun.rb
index 97c580452..953bbdacb 100644
--- a/lib/cucumber/formatter/rerun.rb
+++ b/lib/cucumber/formatter/rerun.rb
@@ -1,53 +1,65 @@
 # frozen_string_literal: true
 
-require 'cucumber/formatter/io'
+# require 'cucumber/formatter/io'
+
+# module Cucumber
+#   module Formatter
+#     class Rerun
+#       # include Formatter::Io
+#       #
+#       # def initialize(config)
+#       #   @io = ensure_io(config.out_stream, config.error_stream)
+#       #   @config = config
+#       #   @failures = {}
+#       #   config.on_event :test_case_finished do |event|
+#       #     test_case, result = *event.attributes
+#       #     if @config.strict.strict?(:flaky)
+#       #       next if result.ok?(strict: @config.strict)
+#       #
+#       #       add_to_failures(test_case)
+#       #     else
+#       #       unless @latest_failed_test_case.nil?
+#       #         if @latest_failed_test_case != test_case
+#       #           add_to_failures(@latest_failed_test_case)
+#       #           @latest_failed_test_case = nil
+#       #         elsif result.ok?(strict: @config.strict)
+#       #           @latest_failed_test_case = nil
+#       #         end
+#       #       end
+#       #       @latest_failed_test_case = test_case unless result.ok?(strict: @config.strict)
+#       #     end
+#       #   end
+#       #   config.on_event :test_run_finished do
+#       #     add_to_failures(@latest_failed_test_case) unless @latest_failed_test_case.nil?
+#       #     next if @failures.empty?
+#       #
+#       #     @io.print file_failures.join("\n")
+#       #   end
+#       # end
+#       #
+#       # private
+#       #
+#       # def file_failures
+#       #   @failures.map { |file, lines| [file, lines].join(':') }
+#       # end
+#       #
+#       # def add_to_failures(test_case)
+#       #   location = test_case.location
+#       #   @failures[location.file] ||= []
+#       #   @failures[location.file] << location.lines.max unless @failures[location.file].include?(location.lines.max)
+#       # end
+#     end
+#   end
+# end
 
 module Cucumber
   module Formatter
     class Rerun
-      # include Formatter::Io
-      #
-      # def initialize(config)
-      #   @io = ensure_io(config.out_stream, config.error_stream)
-      #   @config = config
-      #   @failures = {}
-      #   config.on_event :test_case_finished do |event|
-      #     test_case, result = *event.attributes
-      #     if @config.strict.strict?(:flaky)
-      #       next if result.ok?(strict: @config.strict)
-      #
-      #       add_to_failures(test_case)
-      #     else
-      #       unless @latest_failed_test_case.nil?
-      #         if @latest_failed_test_case != test_case
-      #           add_to_failures(@latest_failed_test_case)
-      #           @latest_failed_test_case = nil
-      #         elsif result.ok?(strict: @config.strict)
-      #           @latest_failed_test_case = nil
-      #         end
-      #       end
-      #       @latest_failed_test_case = test_case unless result.ok?(strict: @config.strict)
-      #     end
-      #   end
-      #   config.on_event :test_run_finished do
-      #     add_to_failures(@latest_failed_test_case) unless @latest_failed_test_case.nil?
-      #     next if @failures.empty?
-      #
-      #     @io.print file_failures.join("\n")
-      #   end
-      # end
-      #
-      # private
-      #
-      # def file_failures
-      #   @failures.map { |file, lines| [file, lines].join(':') }
-      # end
-      #
-      # def add_to_failures(test_case)
-      #   location = test_case.location
-      #   @failures[location.file] ||= []
-      #   @failures[location.file] << location.lines.max unless @failures[location.file].include?(location.lines.max)
-      # end
+      def initialize(config)
+        puts config.inspect
+        @config = config
+
+      end
     end
   end
 end
diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
index e9b75d6c1..e5b3e13fa 100644
--- a/lib/cucumber/query.rb
+++ b/lib/cucumber/query.rb
@@ -1,5 +1,80 @@
 module Cucumber
   class Query
+    def initialize
+      @test_step_result_by_pickle_id = [{}]
+      @test_step_results_by_pickle_step_id = [[]]
+      @test_case_by_pickle_id = []
+      @pickle_id_by_test_step_id = []
+      @pickle_step_id_by_test_step_id = []
+      @test_step_results_by_test_step_id = [[]]
+      @test_step_ids_by_pickle_step_id = [{}]
+      @hooks_by_id = {}
+      @attachments_by_test_step_id = []
+      @step_match_arguments_lists_by_pickle_step_id = [{}]
+      @meta = :not_sure_on_this
+      @test_run_started = :not_sure_on_this
+      @test_run_finished = :not_sure_on_this
+      @test_case_started_by_id = []
+      @lineage_by_id = []
+      @step_by_id = []
+      @pickle_by_id = []
+      @pickle_step_by_id = []
+      @step_definition_by_id = {}
+      @test_case_by_id = []
+      @test_case_finished_by_test_case_started_id = [[]]
+      @test_step_started_by_test_case_started_id = [[]]
+      @test_step_finished_by_test_case_started_id = [[]]
+      @attachments_by_test_case_started_id = [[]]
+    end
 
+    def update(envelope)
+      @meta = envelope.meta if envelope.meta
+      update_gherkin_document(envelope.gherkin_document) if envelope.gherkin_document
+      update_pickle(envelope.pickle) if envelope.gherkin_document
+      @hooks_by_id[envelope.hook.id] = envelope.hook if envelope.hook
+      @step_definition_by_id[envelope.step_definition.id] = envelope.step_definition if envelope.step_definition
+      @test_run_started = envelope.test_run_started if envelope.test_run_started
+      update_test_case(envelope.test_case) if envelope.test_case
+      update_test_case_started(envelope.test_case_started) if envelope.test_case_started
+      update_test_step_started(envelope.test_step_started) if envelope.test_step_started
+      update_attachment(envelope.attachment) if envelope.attachment
+      update_test_step_finished(envelope.test_step_finished) if envelope.test_step_finished
+      update_test_case_finished(envelope.test_case_finished) if envelope.test_case_finished
+      @test_run_finished = envelope.test_run_finished if envelope.test_run_finished
+    end
+
+    private
+
+    def update_gherkin_document(gherkin_document)
+      :not_yet_implemented
+    end
+
+    def update_pickle(pickle)
+      :not_yet_implemented
+    end
+
+    def update_test_case(test_case)
+      :not_yet_implemented
+    end
+
+    def update_test_case_started(test_case_started)
+      :not_yet_implemented
+    end
+
+    def update_test_step_started(test_step_started)
+      :not_yet_implemented
+    end
+
+    def update_attachment(attachment)
+      :not_yet_implemented
+    end
+
+    def update_test_step_finished(test_step_finished)
+      :not_yet_implemented
+    end
+
+    def update_test_case_finished(test_case_finished)
+      :not_yet_implemented
+    end
   end
 end

From 4616d2ee7fdc3cda98ff85ff0f7589f1e50f6865 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 21:21:37 +0100
Subject: [PATCH 04/14] WIP - create a simultaneous new run formatter to try
 get the new envelope testing working for the formatter

---
 lib/cucumber/formatter/message_builder.rb |  4 +
 lib/cucumber/formatter/new_rerun.rb       | 65 ++++++++++++++++
 lib/cucumber/formatter/rerun.rb           | 93 ++++++++++-------------
 spec/cucumber/formatter/rerun_spec.rb     |  5 +-
 4 files changed, 113 insertions(+), 54 deletions(-)
 create mode 100644 lib/cucumber/formatter/new_rerun.rb

diff --git a/lib/cucumber/formatter/message_builder.rb b/lib/cucumber/formatter/message_builder.rb
index 7285083e5..1d232688a 100644
--- a/lib/cucumber/formatter/message_builder.rb
+++ b/lib/cucumber/formatter/message_builder.rb
@@ -9,6 +9,8 @@
 require 'cucumber/formatter/query/test_case_started_by_test_case'
 require 'cucumber/formatter/query/test_run_started'
 
+require 'cucumber/query'
+
 module Cucumber
   module Formatter
     class MessageBuilder
@@ -39,6 +41,8 @@ def initialize(config)
         @current_test_run_started_id = nil
         @current_test_case_started_id = nil
         @current_test_step_id = nil
+
+        @query = Cucumber::Query.new
       end
 
       def output_message
diff --git a/lib/cucumber/formatter/new_rerun.rb b/lib/cucumber/formatter/new_rerun.rb
new file mode 100644
index 000000000..221a720de
--- /dev/null
+++ b/lib/cucumber/formatter/new_rerun.rb
@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'cucumber/formatter/io'
+require 'cucumber/query'
+require 'cucumber/formatter/message_builder'
+
+module Cucumber
+  module Formatter
+    class NewRerun < MessageBuilder
+      include Formatter::Io
+
+      def initialize(config)
+        @io = ensure_io(config.out_stream, config.error_stream)
+
+        # Old implementation
+        #
+        # @failures = {}
+        # config.on_event :test_case_finished do |event|
+        #   test_case, result = *event.attributes
+        #   if @config.strict.strict?(:flaky)
+        #     next if result.ok?(strict: @config.strict)
+        #
+        #     add_to_failures(test_case)
+        #   else
+        #     unless @latest_failed_test_case.nil?
+        #       if @latest_failed_test_case != test_case
+        #         add_to_failures(@latest_failed_test_case)
+        #         @latest_failed_test_case = nil
+        #       elsif result.ok?(strict: @config.strict)
+        #         @latest_failed_test_case = nil
+        #       end
+        #     end
+        #     @latest_failed_test_case = test_case unless result.ok?(strict: @config.strict)
+        #   end
+        # end
+        # config.on_event :test_run_finished do
+        #   add_to_failures(@latest_failed_test_case) unless @latest_failed_test_case.nil?
+        #   next if @failures.empty?
+        #
+        #   @io.print file_failures.join("\n")
+        # end
+
+        super(config)
+      end
+
+      def output_envelope(envelope)
+        @io.write(envelope.to_json)
+        @io.write("\n")
+        @query.update(envelope)
+      end
+
+      private
+
+      def file_failures
+        @failures.map { |file, lines| [file, lines].join(':') }
+      end
+
+      def add_to_failures(test_case)
+        location = test_case.location
+        @failures[location.file] ||= []
+        @failures[location.file] << location.lines.max unless @failures[location.file].include?(location.lines.max)
+      end
+    end
+  end
+end
diff --git a/lib/cucumber/formatter/rerun.rb b/lib/cucumber/formatter/rerun.rb
index 953bbdacb..68bb7f2fd 100644
--- a/lib/cucumber/formatter/rerun.rb
+++ b/lib/cucumber/formatter/rerun.rb
@@ -1,64 +1,53 @@
 # frozen_string_literal: true
 
-# require 'cucumber/formatter/io'
-
-# module Cucumber
-#   module Formatter
-#     class Rerun
-#       # include Formatter::Io
-#       #
-#       # def initialize(config)
-#       #   @io = ensure_io(config.out_stream, config.error_stream)
-#       #   @config = config
-#       #   @failures = {}
-#       #   config.on_event :test_case_finished do |event|
-#       #     test_case, result = *event.attributes
-#       #     if @config.strict.strict?(:flaky)
-#       #       next if result.ok?(strict: @config.strict)
-#       #
-#       #       add_to_failures(test_case)
-#       #     else
-#       #       unless @latest_failed_test_case.nil?
-#       #         if @latest_failed_test_case != test_case
-#       #           add_to_failures(@latest_failed_test_case)
-#       #           @latest_failed_test_case = nil
-#       #         elsif result.ok?(strict: @config.strict)
-#       #           @latest_failed_test_case = nil
-#       #         end
-#       #       end
-#       #       @latest_failed_test_case = test_case unless result.ok?(strict: @config.strict)
-#       #     end
-#       #   end
-#       #   config.on_event :test_run_finished do
-#       #     add_to_failures(@latest_failed_test_case) unless @latest_failed_test_case.nil?
-#       #     next if @failures.empty?
-#       #
-#       #     @io.print file_failures.join("\n")
-#       #   end
-#       # end
-#       #
-#       # private
-#       #
-#       # def file_failures
-#       #   @failures.map { |file, lines| [file, lines].join(':') }
-#       # end
-#       #
-#       # def add_to_failures(test_case)
-#       #   location = test_case.location
-#       #   @failures[location.file] ||= []
-#       #   @failures[location.file] << location.lines.max unless @failures[location.file].include?(location.lines.max)
-#       # end
-#     end
-#   end
-# end
+require 'cucumber/formatter/io'
+require 'cucumber/query'
 
 module Cucumber
   module Formatter
     class Rerun
+      include Formatter::Io
+
       def initialize(config)
-        puts config.inspect
+        @io = ensure_io(config.out_stream, config.error_stream)
         @config = config
+        @failures = {}
+        config.on_event :test_case_finished do |event|
+          test_case, result = *event.attributes
+          if @config.strict.strict?(:flaky)
+            next if result.ok?(strict: @config.strict)
+
+            add_to_failures(test_case)
+          else
+            unless @latest_failed_test_case.nil?
+              if @latest_failed_test_case != test_case
+                add_to_failures(@latest_failed_test_case)
+                @latest_failed_test_case = nil
+              elsif result.ok?(strict: @config.strict)
+                @latest_failed_test_case = nil
+              end
+            end
+            @latest_failed_test_case = test_case unless result.ok?(strict: @config.strict)
+          end
+        end
+        config.on_event :test_run_finished do
+          add_to_failures(@latest_failed_test_case) unless @latest_failed_test_case.nil?
+          next if @failures.empty?
+
+          @io.print file_failures.join("\n")
+        end
+      end
+
+      private
+
+      def file_failures
+        @failures.map { |file, lines| [file, lines].join(':') }
+      end
 
+      def add_to_failures(test_case)
+        location = test_case.location
+        @failures[location.file] ||= []
+        @failures[location.file] << location.lines.max unless @failures[location.file].include?(location.lines.max)
       end
     end
   end
diff --git a/spec/cucumber/formatter/rerun_spec.rb b/spec/cucumber/formatter/rerun_spec.rb
index a4ffb226d..109084702 100644
--- a/spec/cucumber/formatter/rerun_spec.rb
+++ b/spec/cucumber/formatter/rerun_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cucumber/formatter/rerun'
+require 'cucumber/formatter/new_rerun'
 require 'cucumber/core'
 require 'cucumber/core/gherkin/writer'
 require 'support/standard_step_actions'
@@ -9,7 +9,7 @@
 
 module Cucumber
   module Formatter
-    describe Rerun do
+    describe NewRerun do
       include Cucumber::Core::Gherkin::Writer
       include Cucumber::Core
 
@@ -34,6 +34,7 @@ module Formatter
               end
             end
           end
+
           described_class.new(config)
           execute [gherkin], [StandardStepActions.new], config.event_bus
           config.event_bus.test_run_finished

From 875d40d73fbf2064cb1f4fe6c3ac5969446dff71 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 21:23:05 +0100
Subject: [PATCH 05/14] Remove trace

---
 lib/cucumber/formatter/rerun.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/cucumber/formatter/rerun.rb b/lib/cucumber/formatter/rerun.rb
index 68bb7f2fd..5ee5080c4 100644
--- a/lib/cucumber/formatter/rerun.rb
+++ b/lib/cucumber/formatter/rerun.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'cucumber/formatter/io'
-require 'cucumber/query'
 
 module Cucumber
   module Formatter

From 3157de53fd8b338859e7dc08affc8c4d44305beb Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 21:36:58 +0100
Subject: [PATCH 06/14] Alphabeticise the iVars in query

---
 lib/cucumber/query.rb | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
index e5b3e13fa..f4d70f313 100644
--- a/lib/cucumber/query.rb
+++ b/lib/cucumber/query.rb
@@ -1,30 +1,30 @@
 module Cucumber
   class Query
     def initialize
-      @test_step_result_by_pickle_id = [{}]
-      @test_step_results_by_pickle_step_id = [[]]
-      @test_case_by_pickle_id = []
-      @pickle_id_by_test_step_id = []
-      @pickle_step_id_by_test_step_id = []
-      @test_step_results_by_test_step_id = [[]]
-      @test_step_ids_by_pickle_step_id = [{}]
-      @hooks_by_id = {}
+      @attachments_by_test_case_started_id = [[]]
       @attachments_by_test_step_id = []
-      @step_match_arguments_lists_by_pickle_step_id = [{}]
-      @meta = :not_sure_on_this
-      @test_run_started = :not_sure_on_this
-      @test_run_finished = :not_sure_on_this
-      @test_case_started_by_id = []
+      @hooks_by_id = {}
       @lineage_by_id = []
-      @step_by_id = []
+      @meta = :not_sure_on_this
       @pickle_by_id = []
+      @pickle_id_by_test_step_id = []
       @pickle_step_by_id = []
+      @pickle_step_id_by_test_step_id = []
+      @step_by_id = []
       @step_definition_by_id = {}
+      @step_match_arguments_lists_by_pickle_step_id = [{}]
       @test_case_by_id = []
+      @test_case_by_pickle_id = []
       @test_case_finished_by_test_case_started_id = [[]]
-      @test_step_started_by_test_case_started_id = [[]]
+      @test_case_started_by_id = []
+      @test_run_started = :not_sure_on_this
+      @test_run_finished = :not_sure_on_this
       @test_step_finished_by_test_case_started_id = [[]]
-      @attachments_by_test_case_started_id = [[]]
+      @test_step_ids_by_pickle_step_id = [{}]
+      @test_step_result_by_pickle_id = [{}]
+      @test_step_results_by_pickle_step_id = [[]]
+      @test_step_results_by_test_step_id = [[]]
+      @test_step_started_by_test_case_started_id = [[]]
     end
 
     def update(envelope)

From 958abdba64b620308111810fa561a695fcdd7491 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 21:40:09 +0100
Subject: [PATCH 07/14] Note to self on first two items that are required

---
 lib/cucumber/query.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
index f4d70f313..1ccd8f28c 100644
--- a/lib/cucumber/query.rb
+++ b/lib/cucumber/query.rb
@@ -27,6 +27,10 @@ def initialize
       @test_step_started_by_test_case_started_id = [[]]
     end
 
+    # FIRST TWO THINGS TO FIX
+    # Use query to establish
+    # 1) `on_test_step_started` - Establish what the TestStepStarted message property is for `test_case_started_id` is
+    # 2) `on_test_step_finished` - Establish what the TestStepFinished message property is for `test_case_started_id` is
     def update(envelope)
       @meta = envelope.meta if envelope.meta
       update_gherkin_document(envelope.gherkin_document) if envelope.gherkin_document

From ba1a767b209e6ad4cee275c26abfd3fb6ef5f3fb Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 21:43:45 +0100
Subject: [PATCH 08/14] Store test case started by id in query

---
 lib/cucumber/query.rb | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
index 1ccd8f28c..c61c54547 100644
--- a/lib/cucumber/query.rb
+++ b/lib/cucumber/query.rb
@@ -16,7 +16,7 @@ def initialize
       @test_case_by_id = []
       @test_case_by_pickle_id = []
       @test_case_finished_by_test_case_started_id = [[]]
-      @test_case_started_by_id = []
+      @test_case_started_by_id = {}
       @test_run_started = :not_sure_on_this
       @test_run_finished = :not_sure_on_this
       @test_step_finished_by_test_case_started_id = [[]]
@@ -62,7 +62,23 @@ def update_test_case(test_case)
     end
 
     def update_test_case_started(test_case_started)
-      :not_yet_implemented
+      @test_case_started_by_id[test_case_started.id] = test_case_started
+
+      # NOT YET IMPLEMENTED THE BELOW - NEXT STEPS from javascript implementation
+      #     /*
+      #     when a test case attempt starts besides the first one, clear all existing results
+      #     and attachments for that test case, so we always report on the latest attempt
+      #     (applies to legacy pickle-oriented query methods only)
+      #      */
+      #     const testCase = this.testCaseById.get(testCaseStarted.testCaseId)
+      #     if (testCase) {
+      #       this.testStepResultByPickleId.delete(testCase.pickleId)
+      #       for (const testStep of testCase.testSteps) {
+      #         this.testStepResultsByPickleStepId.delete(testStep.pickleStepId)
+      #         this.testStepResultsbyTestStepId.delete(testStep.id)
+      #         this.attachmentsByTestStepId.delete(testStep.id)
+      #       }
+      #     }
     end
 
     def update_test_step_started(test_step_started)

From c6b0f4e3192b57bc3fc4e06fdfcea5c7827aa0ab Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 22:01:23 +0100
Subject: [PATCH 09/14] Add in implementation for next query method

---
 lib/cucumber/query.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
index c61c54547..50359794d 100644
--- a/lib/cucumber/query.rb
+++ b/lib/cucumber/query.rb
@@ -19,7 +19,7 @@ def initialize
       @test_case_started_by_id = {}
       @test_run_started = :not_sure_on_this
       @test_run_finished = :not_sure_on_this
-      @test_step_finished_by_test_case_started_id = [[]]
+      @test_step_finished_by_test_case_started_id = {}
       @test_step_ids_by_pickle_step_id = [{}]
       @test_step_result_by_pickle_id = [{}]
       @test_step_results_by_pickle_step_id = [[]]
@@ -90,7 +90,15 @@ def update_attachment(attachment)
     end
 
     def update_test_step_finished(test_step_finished)
-      :not_yet_implemented
+      @test_step_finished_by_test_case_started_id[test_step_finished.test_case_started_id] = test_step_finished
+
+      # NOT YET IMPLEMENTED THE BELOW - NEXT STEPS from javascript implementation
+      #     const pickleId = this.pickleIdByTestStepId.get(testStepFinished.testStepId)
+      #     this.testStepResultByPickleId.put(pickleId, testStepFinished.testStepResult)
+      #     const testStep = this.testStepById.get(testStepFinished.testStepId)
+      #     this.testStepResultsByPickleStepId.put(testStep.pickleStepId, testStepFinished.testStepResult)
+      #     this.testStepResultsbyTestStepId.put(testStep.id, testStepFinished.testStepResult)
+      #   }
     end
 
     def update_test_case_finished(test_case_finished)

From fdd9c45efc8e2cf46439c26a48cb838fe5fb9387 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Fri, 5 Sep 2025 22:06:11 +0100
Subject: [PATCH 10/14] Comment WIP about getting the iVar from query

---
 lib/cucumber/formatter/message_builder.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/cucumber/formatter/message_builder.rb b/lib/cucumber/formatter/message_builder.rb
index 1d232688a..7c424c54c 100644
--- a/lib/cucumber/formatter/message_builder.rb
+++ b/lib/cucumber/formatter/message_builder.rb
@@ -276,6 +276,7 @@ def on_undefined_parameter_type(event)
       end
 
       def test_case_started_id(test_case)
+        # a = @query.instance_variable_get(:@test_case_started_by_id)
         @test_case_started_by_test_case.test_case_started_id_by_test_case(test_case)
       end
     end

From 1a3700bed86c4b67444554335d7b1b3146bd6adb Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Sat, 6 Sep 2025 00:19:36 +0100
Subject: [PATCH 11/14] Add third implementor and add notes for implemented
 ones

---
 lib/cucumber/query.rb | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
index 50359794d..3b53078be 100644
--- a/lib/cucumber/query.rb
+++ b/lib/cucumber/query.rb
@@ -13,13 +13,13 @@ def initialize
       @step_by_id = []
       @step_definition_by_id = {}
       @step_match_arguments_lists_by_pickle_step_id = [{}]
-      @test_case_by_id = []
+      @test_case_by_id = {} # Should be working
       @test_case_by_pickle_id = []
       @test_case_finished_by_test_case_started_id = [[]]
-      @test_case_started_by_id = {}
+      @test_case_started_by_id = {} # Should be working
       @test_run_started = :not_sure_on_this
       @test_run_finished = :not_sure_on_this
-      @test_step_finished_by_test_case_started_id = {}
+      @test_step_finished_by_test_case_started_id = {} # Should be working
       @test_step_ids_by_pickle_step_id = [{}]
       @test_step_result_by_pickle_id = [{}]
       @test_step_results_by_pickle_step_id = [[]]
@@ -58,7 +58,20 @@ def update_pickle(pickle)
     end
 
     def update_test_case(test_case)
-      :not_yet_implemented
+      @test_case_by_id[test_case.id] = test_case
+
+      # NOT YET IMPLEMENTED THE BELOW - NEXT STEPS from javascript implementation
+      # this.testCaseByPickleId.set(testCase.pickleId, testCase)
+      # testCase.testSteps.forEach((testStep) => {
+      #   this.testStepById.set(testStep.id, testStep)
+      #                            this.pickleIdByTestStepId.set(testStep.id, testCase.pickleId)
+      # this.pickleStepIdByTestStepId.set(testStep.id, testStep.pickleStepId)
+      # this.testStepIdsByPickleStepId.put(testStep.pickleStepId, testStep.id)
+      # this.stepMatchArgumentsListsByPickleStepId.set(
+      #   testStep.pickleStepId,
+      #   testStep.stepMatchArgumentsLists
+      # )
+      # })
     end
 
     def update_test_case_started(test_case_started)

From 5b3abf4c44cdbcaee3a112654c5baf70d2a4084a Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Sat, 6 Sep 2025 00:21:44 +0100
Subject: [PATCH 12/14] Early terminate in #update as only one call is ever
 valid

---
 lib/cucumber/query.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
index 3b53078be..fa39e5dd6 100644
--- a/lib/cucumber/query.rb
+++ b/lib/cucumber/query.rb
@@ -32,18 +32,18 @@ def initialize
     # 1) `on_test_step_started` - Establish what the TestStepStarted message property is for `test_case_started_id` is
     # 2) `on_test_step_finished` - Establish what the TestStepFinished message property is for `test_case_started_id` is
     def update(envelope)
-      @meta = envelope.meta if envelope.meta
-      update_gherkin_document(envelope.gherkin_document) if envelope.gherkin_document
-      update_pickle(envelope.pickle) if envelope.gherkin_document
-      @hooks_by_id[envelope.hook.id] = envelope.hook if envelope.hook
-      @step_definition_by_id[envelope.step_definition.id] = envelope.step_definition if envelope.step_definition
-      @test_run_started = envelope.test_run_started if envelope.test_run_started
-      update_test_case(envelope.test_case) if envelope.test_case
-      update_test_case_started(envelope.test_case_started) if envelope.test_case_started
-      update_test_step_started(envelope.test_step_started) if envelope.test_step_started
-      update_attachment(envelope.attachment) if envelope.attachment
-      update_test_step_finished(envelope.test_step_finished) if envelope.test_step_finished
-      update_test_case_finished(envelope.test_case_finished) if envelope.test_case_finished
+      return @meta = envelope.meta if envelope.meta
+      return update_gherkin_document(envelope.gherkin_document) if envelope.gherkin_document
+      return update_pickle(envelope.pickle) if envelope.gherkin_document
+      return @hooks_by_id[envelope.hook.id] = envelope.hook if envelope.hook
+      return @step_definition_by_id[envelope.step_definition.id] = envelope.step_definition if envelope.step_definition
+      return @test_run_started = envelope.test_run_started if envelope.test_run_started
+      return update_test_case(envelope.test_case) if envelope.test_case
+      return update_test_case_started(envelope.test_case_started) if envelope.test_case_started
+      return update_test_step_started(envelope.test_step_started) if envelope.test_step_started
+      return update_attachment(envelope.attachment) if envelope.attachment
+      return update_test_step_finished(envelope.test_step_finished) if envelope.test_step_finished
+      return update_test_case_finished(envelope.test_case_finished) if envelope.test_case_finished
       @test_run_finished = envelope.test_run_finished if envelope.test_run_finished
     end
 

From f4a53daa9b23f9ec79e665440c15ace2407a942f Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Sat, 6 Sep 2025 00:47:52 +0100
Subject: [PATCH 13/14] Add readerss

---
 lib/cucumber/query.rb | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/cucumber/query.rb b/lib/cucumber/query.rb
index fa39e5dd6..0099ec00d 100644
--- a/lib/cucumber/query.rb
+++ b/lib/cucumber/query.rb
@@ -1,5 +1,29 @@
 module Cucumber
   class Query
+    attr_reader :attachments_by_test_case_started_id,
+                :attachments_by_test_case_finished_id,
+                :hooks_by_id,
+                :lineage_by_id,
+                :meta,
+                :pickle_by_id,
+                :pickle_step_by_id,
+                :pickle_step_id_by_test_step_id,
+                :step_by_id,
+                :step_definition_by_id,
+                :step_matches_by_test_step_id,
+                :test_case_by_id,
+                :test_case_by_pickle_id,
+                :test_case_finished_by_test_case_started_id,
+                :test_case_started_by_id,
+                :test_run_started,
+                :test_run_finished,
+                :test_step_finished_by_test_case_started_id,
+                :test_step_ids_by_pickle_step_id,
+                :test_step_result_by_pickle_id,
+                :test_step_results_by_pickle_step_id,
+                :test_step_results_by_test_step_id,
+                :test_step_started_by_test_case_started_id
+
     def initialize
       @attachments_by_test_case_started_id = [[]]
       @attachments_by_test_step_id = []

From 2615ff7b9dc5d7eba4c559fac50ecd8898840ba5 Mon Sep 17 00:00:00 2001
From: Luke Hill <lukehill_uk@hotmail.com>
Date: Sat, 6 Sep 2025 01:00:43 +0100
Subject: [PATCH 14/14] WIP - more guesswork

---
 lib/cucumber/formatter/new_rerun.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/cucumber/formatter/new_rerun.rb b/lib/cucumber/formatter/new_rerun.rb
index 221a720de..77d125dc1 100644
--- a/lib/cucumber/formatter/new_rerun.rb
+++ b/lib/cucumber/formatter/new_rerun.rb
@@ -13,8 +13,8 @@ def initialize(config)
         @io = ensure_io(config.out_stream, config.error_stream)
 
         # Old implementation
-        #
-        # @failures = {}
+
+        @failures = {}
         # config.on_event :test_case_finished do |event|
         #   test_case, result = *event.attributes
         #   if @config.strict.strict?(:flaky)
@@ -40,6 +40,8 @@ def initialize(config)
         #   @io.print file_failures.join("\n")
         # end
 
+        # End of old implementation
+
         super(config)
       end