ast-merge-git 7.1.3 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c6a8e98b15372fd7b01969b96b15bd463a9c339debba9150d67a336c2592d3
-  data.tar.gz: ef2a36f8917e49e6b24e99955c822e100075d0db1fc06a02be2042ccf8fd6732
+  metadata.gz: be709f99d89a6dc5a6245b53d676a1d6136b64574724cfedada249935de9557b
+  data.tar.gz: dff9b5168e5dd8cac4af0c4a7510726db3038d389f2c0212df27a4954d67fcb1
 SHA512:
-  metadata.gz: 493581576c35445cf976532db9320373bc7de6cdaf09b4a68a860758ea99de388af50052f4b9f14beacc2f0b550884fa27b1557459aec2a5b6d196a2c64d27ec
-  data.tar.gz: aa796efcb1e9a40ef136347bcdc47f793302d023ebded28c19dba0328c6993803b4bc84ec9df6289bdf41fa73aee9a43799814e2de98c4a42a847af0315bcd6e
+  metadata.gz: dd3ccddce030b00948006e96a5c6029fda6d6ee7dab5f9af91bc24a4e361149a5e476ddaa5d45277bb981b593995e8d1135ce70c4d5b672cd5c799cd12078225
+  data.tar.gz: 431a3ab1a6fa2eb04521bbd5a3b99e7b4a786dc5d121de937aa0c5448bd882906c6cfcf013e520ce105bce587144c84dfbebab9475abd8e9d293eafde840329a

data/README.md

@@ -282,7 +282,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.163-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-1.022-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/exe/ast-merge-git

@@ -3,6 +3,35 @@
 
 require 'ast/merge/git'
 
+if ARGV.first == 'benchmark-provider-diff'
+  require 'json'
+
+  begin
+    before_path, after_path, path_name = ARGV.drop(1)
+    raise ArgumentError, 'before, after, and path name are required' unless before_path && after_path && path_name
+
+    require ENV.fetch('AST_MERGE_REQUIRE')
+    result = Ast::Merge.dispatch_provider(
+      :diff2,
+      {
+        provider_id: ENV.fetch('AST_MERGE_PROVIDER'),
+        family: ENV.fetch('AST_MERGE_FAMILY'),
+        dialect: ENV.fetch('AST_MERGE_DIALECT'),
+        backend: ENV.fetch('AST_MERGE_BACKEND'),
+        profile_id: ENV.fetch('AST_MERGE_PROFILE'),
+        before_source: File.binread(before_path),
+        after_source: File.binread(after_path),
+        path_name: path_name
+      }
+    )
+    puts JSON.generate(Ast::Merge.json_ready(result))
+    exit(result[:ok] == true ? 0 : 2)
+  rescue ArgumentError, Ast::Merge::Error, KeyError, LoadError, SystemCallError => e
+    warn "ast-merge-git benchmark-provider-diff: #{e.message}"
+    exit 2
+  end
+end
+
 if ARGV.first == 'benchmark'
   require 'json'
   require 'optparse'
@@ -20,6 +49,7 @@ if ARGV.first == 'benchmark'
     opts.on('--profile PROFILE') { |value| options[:profile] = value }
     opts.on('--changed-path PATH') { |value| options[:changed_paths] << value }
     opts.on('--driver PATH') { |value| options[:driver] = value }
+    opts.on('--mergiraf PATH') { |value| options[:mergiraf] = value }
     opts.on('--tmp-root PATH') { |value| options[:tmp_root] = value }
     opts.on('--timeout SECONDS', Integer) { |value| options[:timeout] = value }
   end
@@ -41,7 +71,8 @@ if ARGV.first == 'benchmark'
                  benchmark: benchmark,
                  driver_path: driver,
                  tmp_root: options[:tmp_root],
-                 timeout: options[:timeout]
+                 timeout: options[:timeout],
+                 competitor_paths: options[:mergiraf] ? { 'mergiraf' => options[:mergiraf] } : {}
                ).run(profile: options[:profile], changed_paths: options[:changed_paths])
                command == 'report' ? Ast::Merge::Git::LocalBenchmarkReport.build(run) : run
              else

data/lib/ast/merge/git/local_benchmark.rb

@@ -16,6 +16,7 @@ module Ast
         SCHEMA = 'structuredmerge.benchmark.corpus/v1'
         CASE_SCHEMA = 'structuredmerge.benchmark/v1'
         OPERATIONS = %w[merge3 metamorphic diff].freeze
+        EXECUTABLE_OPERATIONS = %w[merge3 metamorphic].freeze
         PARTITIONS = %w[sentinel gold metamorphic].freeze
         EXPECTATIONS = %w[clean conflict error excluded_ambiguous].freeze
         SEVERITIES = %w[none low high critical].freeze
@@ -24,6 +25,9 @@ module Ast
           rename move reorder formatting comment independent_edit delete_modify duplicate_key_identity
           schema_aware_mutation
         ].freeze
+        METAMORPHIC_INVARIANTS = %w[
+          comment-retained no-semantic-edit same-json-value same-jsonc-value
+        ].freeze
         ID_PATTERN = /\A[a-z0-9]+(?:[.-][a-z0-9]+)*\z/
         PROVENANCE_FIELDS = %w[
           origin_uri revision spdx_license license_evidence_uri authorship author_review reviewer derivation
@@ -54,7 +58,7 @@ module Ast
 
         def validate!
           require_keys(document, %w[schema_version kind id version extends provenance profiles capability_map
-                                    selection cases expected_summary], 'corpus')
+                                    selection competitors cases expected_summary], 'corpus')
           error!('unsupported corpus schema') unless document['schema_version'] == SCHEMA
           error!('corpus must extend Slice 1022 v1') unless document['extends'] == CASE_SCHEMA
           error!('network must be denied') unless document['network_policy'] == 'denied'
@@ -62,6 +66,7 @@ module Ast
           validate_provenance!(document['provenance'], 'corpus')
           validate_profiles!
           validate_capability_map!
+          validate_competitors!
           validate_cases!
           validate_summary!
           true
@@ -109,7 +114,9 @@ module Ast
               'seed' => document.dig('selection', 'seed'),
               'selected_case_ids' => neighbors
             },
-            'unsupported_selected_cases' => selected.reject { |id| case_by_id(id)['operation'] == 'merge3' },
+            'unsupported_selected_cases' => selected.reject do |id|
+              EXECUTABLE_OPERATIONS.include?(case_by_id(id)['operation'])
+            end,
             'budgets' => definition.fetch('budgets'),
             'explanation' => explanation(
               profile,
@@ -148,6 +155,25 @@ module Ast
           end
         end
 
+        def validate_competitors!
+          document.fetch('competitors').each do |id, competitor|
+            require_keys(
+              competitor,
+              %w[adapter_id source_url source_revision version spdx_license reuse_posture toolchain
+                 build_command operations dialects],
+              "competitor #{id}"
+            )
+            error!("competitor #{id}: adapter ID differs") unless competitor['adapter_id'] == id
+            unless /\A[0-9a-f]{40}\z/.match?(competitor['source_revision'])
+              error!("competitor #{id}: source revision must be a full SHA")
+            end
+            error!("competitor #{id}: only merge3 is admitted") unless competitor['operations'] == ['merge3']
+            next if competitor['dialects'] == competitor['dialects'].sort
+
+            error!("competitor #{id}: dialects must be sorted")
+          end
+        end
+
         def validate_cases!
           records = document['cases']
           error!('cases must not be empty') unless records.is_a?(Array) && records.any?
@@ -260,6 +286,8 @@ module Ast
           digest = item.dig('generator', 'sha256')
           error!("#{id}: generator SHA-256 is malformed") unless /\A[0-9a-f]{64}\z/.match?(digest)
           error!("#{id}: expected invariants must not be empty") if item['expected_invariants'].empty?
+          unknown_invariants = item['expected_invariants'] - METAMORPHIC_INVARIANTS
+          error!("#{id}: unsupported expected invariants: #{unknown_invariants.join(', ')}") if unknown_invariants.any?
           item['transformations'].each do |transformation|
             require_keys(transformation, %w[id type parameters], "#{id} transformation")
             error!("#{id}: unknown transformation") unless TRANSFORMATIONS.include?(transformation['type'])
@@ -348,12 +376,23 @@ module Ast
       # Executes the same authored merge bytes through Git and the installed driver.
       class LocalBenchmarkRunner
         DEFAULT_TIMEOUT = 30
+        MERGIRAF_EXTENSIONS = {
+          'bash' => 'sh',
+          'html' => 'html',
+          'json' => 'json',
+          'markdown' => 'md',
+          'ruby' => 'rb',
+          'toml' => 'toml',
+          'typescript' => 'ts',
+          'yaml' => 'yaml'
+        }.freeze
 
-        def initialize(benchmark:, driver_path:, tmp_root:, timeout: DEFAULT_TIMEOUT)
+        def initialize(benchmark:, driver_path:, tmp_root:, timeout: DEFAULT_TIMEOUT, competitor_paths: {})
           @benchmark = benchmark
           @driver_path = Pathname(driver_path).expand_path
           @tmp_root = Pathname(tmp_root).expand_path
           @timeout = Integer(timeout)
+          @competitor_paths = competitor_paths.transform_values { |path| Pathname(path).expand_path }
         end
 
         def run(profile:, changed_paths: [])
@@ -361,7 +400,8 @@ module Ast
           selection = @benchmark.select(profile: profile, changed_paths: changed_paths)
           original_cwd = Dir.pwd
           results = selection['selected_case_ids'].flat_map do |id|
-            execute_case(@benchmark.case_by_id(id))
+            item = @benchmark.case_by_id(id)
+            execute_case(item) + execute_competitors(item)
           end
           raise LocalBenchmark::Error, 'runner changed its working directory' unless Dir.pwd == original_cwd
 
@@ -372,6 +412,7 @@ module Ast
             'corpus_digest' => @benchmark.corpus_digest,
             'selection' => selection,
             'cache_identity' => cache_identity(selection),
+            'competitors' => competitor_provenance,
             'results' => results
           }
         ensure
@@ -382,14 +423,67 @@ module Ast
 
         def verify_environment!
           error!("missing installed driver: #{@driver_path}") unless @driver_path.file? && @driver_path.executable?
+          @competitor_paths.each do |id, path|
+            error!("unknown competitor: #{id}") unless @benchmark.document.fetch('competitors').key?(id)
+            error!("missing competitor executable: #{path}") unless path.file? && path.executable?
+          end
           root = Pathname(__dir__).join('..', '..', '..', '..').realpath
           resolved = @tmp_root.exist? ? @tmp_root.realpath : @tmp_root.dirname.realpath.join(@tmp_root.basename)
           error!('tmp_root must be inside the ast-merge-git repository') unless resolved.to_s.start_with?("#{root}/")
         end
 
         def execute_case(item)
-          return unsupported_pair(item) unless item['operation'] == 'merge3'
+          return execute_merge3_case(item) if item['operation'] == 'merge3'
+          return execute_metamorphic_case(item) if item['operation'] == 'metamorphic'
+
+          unsupported_pair(item)
+        end
+
+        def execute_competitors(item)
+          @competitor_paths.map do |id, path|
+            metadata = @benchmark.document.dig('competitors', id)
+            unless metadata['operations'].include?(item['operation']) && metadata['dialects'].include?(item['dialect'])
+              next raw_result(
+                item,
+                id,
+                nil,
+                outcome: 'unsupported',
+                unsupported_reason: "#{id} does not support #{item['operation']}/#{item['dialect']}"
+              )
+            end
+
+            execute_mergiraf(item, path)
+          end
+        end
+
+        def execute_mergiraf(item, path)
+          workspace = @tmp_root.join("#{safe_id(item['id'])}-mergiraf-#{Process.pid}")
+          FileUtils.rm_rf(workspace)
+          FileUtils.mkdir_p(workspace)
+          write_roles(item, workspace)
+          output = workspace.join('output')
+          capture = timed_capture(
+            oracle_free_env,
+            path.to_s,
+            'merge',
+            'base',
+            'ours',
+            'theirs',
+            '--output',
+            output.to_s,
+            '--path-name',
+            "#{item['id']}.#{MERGIRAF_EXTENSIONS.fetch(item['dialect'])}",
+            '--conflict-marker-size',
+            '7',
+            chdir: workspace
+          )
+          capture[:output] = output.file? ? output.binread : ''
+          raw_result(item, 'mergiraf', capture)
+        ensure
+          FileUtils.rm_rf(workspace) if workspace
+        end
 
+        def execute_merge3_case(item)
           workspace = @tmp_root.join("#{safe_id(item['id'])}-#{Process.pid}")
           FileUtils.rm_rf(workspace)
           FileUtils.mkdir_p(workspace)
@@ -402,8 +496,22 @@ module Ast
           FileUtils.rm_rf(workspace) if workspace
         end
 
+        def execute_metamorphic_case(item)
+          workspace = @tmp_root.join("#{safe_id(item['id'])}-#{Process.pid}")
+          FileUtils.rm_rf(workspace)
+          FileUtils.mkdir_p(workspace)
+          write_metamorphic_roles(item, workspace)
+          baseline = execute_metamorphic_baseline(item, workspace)
+          candidate = execute_metamorphic_candidate(item, workspace)
+          rerun = execute_metamorphic_candidate(item, workspace)
+          candidate['deterministic_correctness_rerun'] = correctness_record(candidate) == correctness_record(rerun)
+          [baseline, candidate]
+        ensure
+          FileUtils.rm_rf(workspace) if workspace
+        end
+
         def unsupported_pair(item)
-          %w[git.merge-file ast-merge-git].map do |adapter|
+          %w[git.unsupported structuredmerge.unsupported].map do |adapter|
             raw_result(item, adapter, nil, outcome: 'unsupported',
                                            unsupported_reason: "no installed #{item['operation']} adapter")
           end
@@ -434,6 +542,62 @@ module Ast
           end
         end
 
+        def write_metamorphic_roles(item, workspace)
+          %w[source transformed].each do |role|
+            workspace.join(role).binwrite(item.dig('inputs', role, 'bytes'))
+          end
+        end
+
+        def execute_metamorphic_baseline(item, workspace)
+          capture = timed_capture(
+            {},
+            'git', 'diff', '--no-index', '--no-color', '--no-ext-diff', '--', 'source', 'transformed',
+            chdir: workspace
+          )
+          capture[:output] = capture[:stdout]
+          metamorphic_result(
+            item,
+            'git.diff',
+            'baseline',
+            capture,
+            edit_signal: capture[:status] == 1
+          )
+        end
+
+        def execute_metamorphic_candidate(item, workspace)
+          capture, changes = capture_provider_diff(item, workspace)
+          metamorphic_result(
+            item,
+            'ast-merge-provider.diff2',
+            'candidate',
+            capture,
+            edit_signal: changes.any?
+          )
+        end
+
+        def capture_provider_diff(item, workspace)
+          selector = item.fetch('selector')
+          capture = timed_capture(
+            candidate_env(selector),
+            @driver_path.to_s,
+            'benchmark-provider-diff',
+            'source',
+            'transformed',
+            "#{item['id']}.#{item['dialect']}",
+            chdir: workspace
+          )
+          result = capture[:stdout].empty? ? {} : JSON.parse(capture[:stdout])
+          changes = capture[:status].zero? ? result.fetch('changes') : []
+          capture[:output] = JSON.generate(changes)
+          [capture, changes]
+        rescue JSON::ParserError, KeyError => e
+          capture ||= { stdout: '', stderr: '', status: 2, duration_ns: 0 }
+          capture[:stderr] = [capture[:stderr], e.message].reject(&:empty?).join("\n")
+          capture[:status] = 2
+          capture[:output] = ''
+          [capture, []]
+        end
+
         def timed_capture(env, *command, chdir:)
           started = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
           stdin, stdout_io, stderr_io, process = Open3.popen3(env, *command, chdir: chdir.to_s)
@@ -475,6 +639,7 @@ module Ast
             'id' => "result.#{safe_id(item['id'])}.#{safe_id(adapter)}",
             'case_id' => item['id'],
             'adapter_id' => adapter,
+            'adapter_role' => adapter_role(adapter),
             'case_tags' => item.slice(
               'operation', 'partition', 'family', 'provider', 'dialect',
               'capabilities', 'false_auto_merge_severity'
@@ -498,6 +663,135 @@ module Ast
           }
         end
 
+        def adapter_role(adapter)
+          return 'baseline' if adapter.start_with?('git.')
+          return 'candidate' if %w[ast-merge-git ast-merge-provider.diff2 structuredmerge.unsupported].include?(adapter)
+
+          'competitor'
+        end
+
+        def metamorphic_result(item, adapter, adapter_role, capture, edit_signal:)
+          checks = metamorphic_checks(item, edit_signal)
+          classified = if capture[:status].nil? || capture[:status] >= 2
+                         'error'
+                       elsif checks['acceptable']
+                         'correct_clean'
+                       else
+                         'false_conflict'
+                       end
+          eligible = item.dig('oracle', 'score_eligible') && classified != 'error'
+          {
+            'schema_version' => 'structuredmerge.benchmark.result/v1',
+            'id' => "result.#{safe_id(item['id'])}.#{safe_id(adapter)}",
+            'case_id' => item['id'],
+            'adapter_id' => adapter,
+            'adapter_role' => adapter_role,
+            'case_tags' => item.slice(
+              'operation', 'partition', 'family', 'provider', 'dialect',
+              'capabilities', 'false_auto_merge_severity'
+            ),
+            'outcome' => classified,
+            'score_eligible' => eligible,
+            'provenance' => item['provenance'],
+            'process' => {
+              'status' => capture[:status],
+              'exit_classification' => metamorphic_exit_class(adapter_role, capture[:status])
+            },
+            'raw' => {
+              'stdout' => raw_record(capture[:stdout]),
+              'stderr' => raw_record(capture[:stderr]),
+              'output' => raw_record(capture[:output])
+            },
+            'diagnostics' => diagnostics(capture[:stderr], nil),
+            'conflict_regions' => region_evidence(item, []),
+            'checks' => checks,
+            'independent_edit_evidence' => {},
+            'dimensions' => dimensions(item, classified, checks),
+            'runtime' => { 'duration_ns' => capture[:duration_ns], 'comparable' => true }
+          }
+        end
+
+        def metamorphic_checks(item, edit_signal)
+          evaluations = item.fetch('expected_invariants').map do |invariant|
+            matched, evidence = evaluate_metamorphic_invariant(item, invariant, edit_signal)
+            { 'id' => invariant, 'matched' => matched, 'evidence' => evidence }
+          end
+          accepted = evaluations.all? { |evaluation| evaluation['matched'] }
+          {
+            'declared_invariants' => evaluations,
+            'accepted_equivalence' => accepted ? 'declared_invariants' : nil,
+            'acceptable_equivalence_evaluations' => [{
+              'class' => 'declared_invariants',
+              'matched' => accepted
+            }],
+            'parse_validity_only_accepted' => false,
+            'generator_replay' => {
+              'generator_id' => item.dig('generator', 'id'),
+              'generator_version' => item.dig('generator', 'version'),
+              'seed' => item.dig('generator', 'seed'),
+              'transformation_ids' => item.fetch('transformations').map { |transformation| transformation['id'] },
+              'authored_bytes_digest_verified' => true
+            },
+            'preservation_violations' => [],
+            'acceptable' => accepted
+          }
+        end
+
+        def evaluate_metamorphic_invariant(item, invariant, edit_signal)
+          case invariant
+          when 'same-json-value', 'same-jsonc-value'
+            [json_values_equal?(item), 'JSON-family values parsed from source and transformed bytes']
+          when 'no-semantic-edit'
+            [!edit_signal, 'adapter emitted no edit units']
+          when 'comment-retained'
+            [json_comments_retained?(item), 'JSONC AST comment content retained']
+          else
+            [false, 'unsupported invariant']
+          end
+        end
+
+        def json_values_equal?(item)
+          require 'json/merge'
+          selector = item.fetch('selector')
+          source = Json::Merge.json_value_for_source(
+            item.dig('inputs', 'source', 'bytes'),
+            dialect: selector.fetch('dialect').to_sym,
+            backend: selector.fetch('backend')
+          )
+          transformed = Json::Merge.json_value_for_source(
+            item.dig('inputs', 'transformed', 'bytes'),
+            dialect: selector.fetch('dialect').to_sym,
+            backend: selector.fetch('backend')
+          )
+          source == transformed
+        rescue Json::Merge::ParseError, LoadError
+          false
+        end
+
+        def json_comments_retained?(item)
+          require 'json/merge'
+          selector = item.fetch('selector')
+          source = Json::Merge::FileAnalysis.new(
+            item.dig('inputs', 'source', 'bytes'),
+            dialect: selector.fetch('dialect').to_sym
+          )
+          transformed = Json::Merge::FileAnalysis.new(
+            item.dig('inputs', 'transformed', 'bytes'),
+            dialect: selector.fetch('dialect').to_sym
+          )
+          source.valid? && transformed.valid? &&
+            source.comment_nodes.map(&:normalized_content) == transformed.comment_nodes.map(&:normalized_content)
+        rescue TreeHaver::Error, LoadError
+          false
+        end
+
+        def metamorphic_exit_class(adapter_role, status)
+          return 'error' if status.nil? || status >= 2
+          return status == 1 ? 'differences' : 'no_differences' if adapter_role == 'baseline'
+
+          'analyzed'
+        end
+
         def classify(item, status, checks)
           expected = item.dig('expected', 'outcome')
           return 'excluded_ambiguous' if expected == 'excluded_ambiguous'
@@ -677,8 +971,11 @@ module Ast
         end
 
         def candidate_env(selector)
-          forbidden = ENV.keys.grep(/(?:ORACLE|EXPECTED)/i).to_h { |name| [name, nil] }
-          forbidden.merge(selector_env(selector))
+          oracle_free_env.merge(selector_env(selector))
+        end
+
+        def oracle_free_env
+          ENV.keys.grep(/(?:ORACLE|EXPECTED)/i).to_h { |name| [name, nil] }
         end
 
         def cache_identity(selection)
@@ -693,10 +990,12 @@ module Ast
           configuration = selection['selected_case_ids'].map do |id|
             @benchmark.case_by_id(id).slice('id', 'selector')
           end
+          competitors = competitor_provenance
           identity = {
             'adapter_source_sha' => source_sha.strip,
             'adapter_artifact_sha256' => Digest::SHA256.file(@driver_path).hexdigest,
             'configuration_sha256' => Digest::SHA256.hexdigest(JSON.generate(configuration)),
+            'competitors' => competitors,
             'corpus_sha256' => @benchmark.corpus_digest,
             'environment' => environment,
             'profile' => selection['profile'],
@@ -710,6 +1009,22 @@ module Ast
           identity.merge('sha256' => Digest::SHA256.hexdigest(JSON.generate(identity)))
         end
 
+        def competitor_provenance
+          @competitor_provenance ||= @competitor_paths.to_h do |id, path|
+            metadata = @benchmark.document.fetch('competitors').fetch(id)
+            capture = timed_capture(oracle_free_env, path.to_s, '--version', chdir: path.dirname)
+            error!("#{id} version probe failed: #{capture[:stderr].strip}") unless capture[:status].zero?
+            expected = "#{metadata.fetch('adapter_id')} #{metadata.fetch('version')}"
+            error!("#{id} version differs: #{capture[:stdout].strip}") unless capture[:stdout].strip == expected
+
+            [id, metadata.merge(
+              'binary_path' => path.to_s,
+              'binary_sha256' => Digest::SHA256.file(path).hexdigest,
+              'reported_version' => capture[:stdout].strip
+            )]
+          end
+        end
+
         def deep_sort(value)
           case value
           when Hash then value.keys.sort.to_h { |key| [key, deep_sort(value.fetch(key))] }
@@ -750,7 +1065,7 @@ module Ast
 
         def build
           pairs = @results.group_by { |result| result['case_id'] }.values.map { |items| transition(items) }
-          false_auto_merges = eligible.select { |item| item['outcome'] == 'false_auto_merge' }
+          false_auto_merges = candidate_eligible.select { |item| item['outcome'] == 'false_auto_merge' }
           {
             'schema_version' => 'structuredmerge.benchmark.report/v1',
             'kind' => 'paired_aggregate_report',
@@ -760,7 +1075,7 @@ module Ast
             'cache_identity' => @run['cache_identity'],
             'dimensions' => {
               'safety' => {
-                'eligible' => eligible.length,
+                'eligible' => candidate_eligible.length,
                 'false_auto_merge_result_ids' => false_auto_merges.map { |item| item['id'] },
                 'gate' => false_auto_merges.empty? ? 'pass' : 'fail',
                 'non_compensable' => true
@@ -776,7 +1091,8 @@ module Ast
               'reliability' => { 'error_result_ids' => @results.filter_map do |item|
                 item['id'] if item['outcome'] == 'error'
               end },
-              'coverage' => coverage
+              'coverage' => coverage,
+              'competitive' => competitive
             },
             'strata' => strata,
             'transitions' => pairs,
@@ -794,6 +1110,10 @@ module Ast
           @eligible ||= @results.select { |item| item['score_eligible'] }
         end
 
+        def candidate_eligible
+          eligible.select { |item| item['adapter_role'] == 'candidate' }
+        end
+
         def outcome_counts
           %w[correct_clean false_conflict true_conflict false_auto_merge error unsupported
              excluded_ambiguous].to_h do |outcome|
@@ -802,8 +1122,8 @@ module Ast
         end
 
         def transition(items)
-          baseline = items.find { |item| item['adapter_id'] == 'git.merge-file' }
-          candidate = items.find { |item| item['adapter_id'] == 'ast-merge-git' }
+          baseline = items.find { |item| item['adapter_role'] == 'baseline' }
+          candidate = items.find { |item| item['adapter_role'] == 'candidate' }
           {
             'case_id' => items.first['case_id'],
             'baseline_result_id' => baseline['id'],
@@ -831,15 +1151,30 @@ module Ast
         def coverage
           selected = @run.dig('selection', 'selected_case_ids').length
           unsupported = @results.select do |item|
-            item['adapter_id'] == 'ast-merge-git' && item['outcome'] == 'unsupported'
+            item['adapter_role'] == 'candidate' && item['outcome'] == 'unsupported'
           end
           { 'selected_cases' => selected, 'executed_candidate_cases' => selected - unsupported.length,
             'unsupported_case_ids' => unsupported.map { |item| item['case_id'] },
             'unsupported_is_quality_failure' => false }
         end
 
+        def competitive
+          results = @results.select { |item| item['adapter_role'] == 'competitor' }
+          {
+            'configured' => @run.fetch('competitors'),
+            'outcomes' => results.group_by { |item| item['outcome'] }.transform_values(&:length),
+            'unsupported_case_ids' => results.filter_map do |item|
+              item['case_id'] if item['outcome'] == 'unsupported'
+            end,
+            'false_auto_merge_result_ids' => results.filter_map do |item|
+              item['id'] if item['outcome'] == 'false_auto_merge'
+            end,
+            'affects_candidate_safety_gate' => false
+          }
+        end
+
         def strata
-          case_results = @results.select { |item| item['adapter_id'] == 'ast-merge-git' }
+          case_results = @results.select { |item| item['adapter_role'] == 'candidate' }
           tag_fields = %w[operation partition family provider dialect false_auto_merge_severity]
           tag_strata = tag_fields.to_h do |field|
             [field, case_results.group_by { |item| item.dig('case_tags', field) }.transform_values(&:length)]

data/lib/ast/merge/git/version.rb

@@ -6,7 +6,7 @@ module Ast
       # Version namespace for this gem.
       module Version
         # Current gem version.
-        VERSION = '7.1.3'
+        VERSION = '7.1.4'
       end
       # Current gem version exposed at the traditional constant location.
       VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge-git
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -198,7 +198,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 3.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,287 +218,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.5
-- !ruby/object:Gem::Dependency
-  name: bash-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: citrus-toml-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: commonmarker-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: dotenv-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: go-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: html-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: json-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: kramdown-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: markdown-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: markly-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: parslet-toml-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: plain-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: psych-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: rbs-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: ruby-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: rust-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: toml-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: typescript-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: yaml-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-- !ruby/object:Gem::Dependency
-  name: zip-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -542,7 +262,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -552,7 +272,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "☯️ Git protocol adaptation and provider dispatch over ast-merge primitives."
 email:
 - floss@galtzo.com
@@ -576,10 +296,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.3
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.3/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.4
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.3
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.4
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/ast-merge-git