bash-merge 7.1.1 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8c10612883ee3b2218483ddde5232e2facdb105fa9246b97501a186bcff828a
-  data.tar.gz: '08672c8444e3b98a710ad6fcb7e02c220413abe470deaebad741efe4084baa0d'
+  metadata.gz: 63912e4ed1e5c589b747fe8c4bff43704efb8011c051c738c140a3a9b8372610
+  data.tar.gz: c37449f1e387c5beeb1f4bcd062a5c748ec2cbeae76c1b3dd8e1559c8f3f8404
 SHA512:
-  metadata.gz: bebbff49479397116a97b31333e815ef906345c3ce1f592716021a9ec842b9110b89932ce5ef236edac43e36bfde1462060477c003a3d4b3d4bc54dda48fe439
-  data.tar.gz: 1dcbae759052e304d3be6e5709ac4efbbf2120ea985bb5bcff242d4f9ec090b24e0d6d204b00816642ecec9c8c00c1787b667440585b00a4c0e81fc459debb3d
+  metadata.gz: 05c63cd77818e9091f81afdc9f33212c0c66f40b266f4d9a57f7426ca4ef9c39b4a07da65d599f06f8bd8987ac12695cfbf05158d26dec7bf500243ade3a9e5b
+  data.tar.gz: ca5966709c53a0ebac627228ebf76b3bdc1541efef4cc6f40399cef04c71870b0f5fd3c0d8a325fc46a428388851d78c52e1cd919c7c82b6f49d0f25d42b0221

data/README.md

@@ -85,7 +85,7 @@ File.write("merged.sh", result.to_bash)
 
 ### Compatibility
 
-Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
+Compatible with MRI Ruby 4.0.0+, JRuby, and TruffleRuby.
 CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
 This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
 may be higher than the gem's runtime compatibility floor when legacy Rubies are
@@ -258,20 +258,12 @@ See [SECURITY.md][🔐security].
 ## 🤝 Contributing
 
 If you need some ideas of where to help, you could work on adding more code coverage,
-or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
-or use the gem and think about how it could be better.
+check [issues][🤝gh-issues] or [PRs][🤝gh-pulls], or use the gem and think about how it could be better.
 
 We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
 
 See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
 
-### Code Coverage
-
-<details markdown="1">
-<summary>Coverage service badges</summary>
-
-</details>
-
 ## 📌 Versioning
 
 This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.

data/lib/bash/merge/node_wrapper.rb

@@ -19,6 +19,8 @@ module Bash
     #
     # @see Ast::Merge::NodeWrapperBase
     class NodeWrapper < Ast::Merge::NodeWrapperBase
+      attr_reader :node
+
       # Check if this is a function definition
       # @return [Boolean]
       def function_definition?
@@ -107,6 +109,18 @@ module Bash
         nil
       end
 
+      def start_byte = node.start_byte
+      def end_byte = node.end_byte
+      def source_text = @source.byteslice(start_byte...end_byte).to_s
+
+      def semantic_tree
+        semantic_node(node)
+      end
+
+      def heredoc?
+        descendant_type?(node, %w[heredoc_redirect heredoc_body])
+      end
+
       # Find a child by field name
       # @param field_name [String] Field name to look for
       # @return [TreeSitter::Node, nil]
@@ -193,6 +207,19 @@ module Bash
 
       private
 
+      def semantic_node(value)
+        children = value.children
+        return [value.type.to_s, @source.byteslice(value.start_byte...value.end_byte).to_s] if children.empty?
+
+        [value.type.to_s, children.select(&:named?).map { |child| semantic_node(child) }]
+      end
+
+      def descendant_type?(value, types)
+        return true if types.include?(value.type.to_s)
+
+        value.children.any? { |child| descendant_type?(child, types) }
+      end
+
       def extract_command_signature_context(node)
         # Extract additional context like redirections
         redirections = []

data/lib/bash/merge/provider.rb

@@ -0,0 +1,983 @@
+# frozen_string_literal: true
+
+require 'digest'
+require 'json'
+require 'ast/merge/source_render'
+require_relative 'node_wrapper'
+require_relative 'file_analysis'
+
+module Bash
+  # Registration and source-preserving workflow implementation for Bash.
+  module Merge
+    class << self
+      def merge_provider
+        @merge_provider ||= Provider.new
+      end
+
+      def register_provider!(replace: false)
+        return unless Ast::Merge.respond_to?(:register_provider)
+
+        Ast::Merge.register_provider(merge_provider, replace: replace)
+      end
+    end
+
+    # Base-aware, source-preserving provider for native top-level Bash owners.
+    # Functions and assignments have stable AST identities. Every other
+    # top-level form must remain identical across all revisions in a composite.
+    # rubocop:disable Metrics/AbcSize, Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/ParameterLists, Metrics/PerceivedComplexity -- provider decisions, source plans, and verification form one boundary
+    class Provider
+      DEFAULT_PROFILE = :source_preserving
+      Owner = Data.define(:id, :signature, :membership, :compound, :fingerprint, :start_line, :end_line, :role)
+      Document = Data.define(:source, :analysis, :owners, :by_id, :unmanaged_fingerprint)
+      ExactDocument = Data.define(:source, :analysis, :declarations, :issues, :role)
+      Decision = Data.define(:changes, :conflicts, :choices)
+
+      def provider_id = 'ruby.bash'
+      def family = 'bash'
+
+      def capabilities
+        {
+          operations: Ast::Merge::ProviderContract::OPERATIONS,
+          dialects: %i[bash],
+          backends: [TREE_SITTER_BACKEND.id.to_sym],
+          profiles: [DEFAULT_PROFILE],
+          role: :workflow,
+          ast_ownership: :stable_functions_and_assignments,
+          source_preservation: %i[exact_source declaration_fragments line_provenance reparse semantic_verification]
+        }.freeze
+      end
+
+      def analyze(request)
+        document = parse_document(:analyze, request, :source)
+        return document if provider_failure?(document)
+
+        result(
+          :analyze,
+          request,
+          analysis: {
+            backend: TREE_SITTER_BACKEND.id,
+            valid: true,
+            declarations: document.owners.map { |owner| owner_description(owner) }
+          },
+          verification: { source_parsed: true }
+        )
+      end
+
+      def diff2(request)
+        before = parse_document(:diff2, request, :before)
+        return before if provider_failure?(before)
+
+        after = parse_document(:diff2, request, :after)
+        return after if provider_failure?(after)
+
+        changes = diff_documents(before, after)
+        result(
+          :diff2,
+          request,
+          diff: { changes: changes },
+          changes: changes,
+          verification: { before_parsed: true, after_parsed: true }
+        )
+      end
+
+      def merge2(request)
+        merge3_request = request.merge(
+          base_source: request.fetch(:current_source),
+          ours_source: request.fetch(:current_source),
+          theirs_source: request.fetch(:incoming_source)
+        )
+        merged = merge3(merge3_request)
+        merged.merge(
+          operation: :merge2,
+          verification: merged.fetch(:verification).except(:base_participated)
+        )
+      end
+
+      def merge3(request)
+        exact_role = exact_revision_role(request)
+        return merge3_exact(request, exact_role) if exact_role
+
+        documents = parse_merge3_documents(request)
+        return documents if provider_failure?(documents)
+
+        ownership_failure = unstable_ownership_failure(request, documents)
+        return ownership_failure if ownership_failure
+
+        decision = decide(documents, include_unmanaged_conflict: true)
+        return render_conflicts(request, documents, decision) unless decision.conflicts.empty?
+
+        render_composite(request, documents, decision)
+      end
+
+      private
+
+      def parse_merge3_documents(request)
+        %i[base ours theirs].each_with_object({}) do |role, documents|
+          source = request.fetch(:"#{role}_source")
+          document = parse_source(source, role, request[:dialect])
+          if document.is_a?(Hash) && document[:parse_error]
+            return parse_failure(:merge3, request, role, document)
+          elsif provider_failure?(document)
+            return unsafe_document_failure(request, role, document)
+          end
+
+          documents[role] = document
+        end
+      end
+
+      def parse_document(operation, request, role)
+        source = request.fetch(role == :source ? :source : :"#{role}_source")
+        parsed = parse_source(source, role, request[:dialect])
+        return parse_failure(operation, request, role, parsed) if provider_failure?(parsed)
+
+        parsed
+      end
+
+      def parse_source(source, role, _dialect = nil)
+        analysis = FileAnalysis.new(source)
+        return { parse_error: analysis.errors.map(&:to_s).join('; '), source_role: role } unless analysis.valid?
+
+        unstable_occurrences = Hash.new(0)
+        owners = analysis.top_level_statements.map do |wrapper|
+          return { unsafe_range: :heredoc, source_role: role } if wrapper.heredoc?
+          return { unsafe_range: wrapper.signature, source_role: role } unless safe_range?(source, wrapper)
+
+          signature = provider_signature(wrapper)
+          return { unsafe_range: wrapper.type, source_role: role } unless signature
+
+          occurrence = if stable_signature?(signature)
+                         nil
+                       else
+                         unstable_occurrences[signature] += 1
+                       end
+          Owner.new(
+            id: owner_id(occurrence ? [signature, occurrence] : signature),
+            signature: signature,
+            membership: signature,
+            compound: false,
+            fingerprint: owner_fingerprint(wrapper),
+            start_line: wrapper.start_line,
+            end_line: wrapper.end_line,
+            role: role
+          )
+        end
+        duplicate = owners.group_by(&:id).find { |_id, matches| matches.length > 1 }
+        return { ambiguous_owner: duplicate.first, source_role: role } if duplicate
+
+        return { unsafe_range: :overlapping_declarations, source_role: role } unless non_overlapping?(owners)
+
+        Document.new(
+          source: source,
+          analysis: analysis,
+          owners: owners.freeze,
+          by_id: owners.to_h { |owner| [owner.id, owner] }.freeze,
+          unmanaged_fingerprint: unmanaged_fingerprint(source, owners)
+        )
+      rescue StandardError => e
+        { parse_error: e.message, source_role: role }
+      end
+
+      def parse_exact_source(source, role, _dialect = nil)
+        analysis = FileAnalysis.new(source)
+        return { parse_error: analysis.errors.map(&:to_s).join('; '), source_role: role } unless analysis.valid?
+
+        declarations = analysis.top_level_statements.map do |wrapper|
+          [provider_signature(wrapper), wrapper.semantic_tree]
+        end.freeze
+        duplicate_keys = declarations.group_by(&:first).filter_map do |signature, matches|
+          signature if matches.length > 1
+        end
+        issues = duplicate_keys.uniq.map do |identity|
+          {
+            category: :ambiguous_owner,
+            declaration: identity,
+            message: duplicate_message(identity)
+          }.freeze
+        end
+        ExactDocument.new(
+          source: source,
+          analysis: analysis,
+          declarations: declarations,
+          issues: issues.freeze,
+          role: role
+        )
+      rescue StandardError => e
+        { parse_error: e.message, source_role: role }
+      end
+
+      def provider_signature(wrapper)
+        if wrapper.function_definition?
+          name = wrapper.function_name
+          name && [:function, name]
+        elsif wrapper.variable_assignment?
+          name = wrapper.variable_name
+          name && [:variable_assignment, name]
+        else
+          wrapper.signature
+        end
+      end
+
+      def safe_range?(source, wrapper)
+        return false if wrapper.start_byte.negative? || wrapper.end_byte > source.bytesize
+        return false if wrapper.end_byte < wrapper.start_byte
+
+        line_start = source.rindex("\n", [wrapper.start_byte - 1, 0].max)
+        line_start = line_start ? line_start + 1 : 0
+        line_end = source.index("\n", wrapper.end_byte) || source.bytesize
+        horizontal_whitespace?(source.byteslice(line_start...wrapper.start_byte).to_s) &&
+          horizontal_whitespace?(source.byteslice(wrapper.end_byte...line_end).to_s)
+      end
+
+      def horizontal_whitespace?(value)
+        value.each_byte.all? { |byte| [9, 13, 32].include?(byte) }
+      end
+
+      def non_overlapping?(owners)
+        owners.each_cons(2).all? { |left, right| left.end_line < right.start_line }
+      end
+
+      def unmanaged_fingerprint(source, owners)
+        owned_lines = owners.each_with_object({}) do |owner, lines|
+          (owner.start_line..owner.end_line).each { |line| lines[line] = true }
+        end
+        source.lines.each_with_index.filter_map do |line, index|
+          line unless owned_lines[index + 1]
+        end.join
+      end
+
+      def owner_fingerprint(wrapper)
+        Digest::SHA256.hexdigest(
+          JSON.generate(Ast::Merge.json_ready([wrapper.semantic_tree, wrapper.source_text]))
+        )
+      end
+
+      def owner_id(signature)
+        Digest::SHA256.hexdigest(JSON.generate(Ast::Merge.json_ready(signature)))
+      end
+
+      def owner_path(owner)
+        owner ? owner.signature.inspect : '<document>'
+      end
+
+      def owner_description(owner)
+        {
+          path: owner_path(owner),
+          signature: owner.signature,
+          source_role: owner.role,
+          line_range: [owner.start_line, owner.end_line]
+        }
+      end
+
+      def diff_documents(before, after)
+        ordered_ids(before, after).filter_map do |id|
+          left = before.by_id[id]
+          right = after.by_id[id]
+          next if equivalent?(left, right)
+
+          {
+            path: owner_path(left || right),
+            before: change_side(left),
+            after: change_side(right),
+            change: change_kind(left, right)
+          }.freeze
+        end.freeze
+      end
+
+      def change_side(owner)
+        return { present: false } unless owner
+
+        { present: true, source_role: owner.role, line_range: [owner.start_line, owner.end_line] }
+      end
+
+      def ordered_ids(*documents)
+        documents.flat_map { |document| document.owners.map(&:id) }.uniq
+      end
+
+      def change_kind(before, after)
+        return :added unless before
+        return :deleted unless after
+
+        :edited
+      end
+
+      def decide(documents, include_unmanaged_conflict:)
+        changes = []
+        conflicts = []
+        choices = {}
+        append_unmanaged_conflict(changes, conflicts, documents) if include_unmanaged_conflict
+        ordered_ids(*documents.values).each do |id|
+          base = documents.fetch(:base).by_id[id]
+          ours = documents.fetch(:ours).by_id[id]
+          theirs = documents.fetch(:theirs).by_id[id]
+          ours_change = side_change(base, ours)
+          theirs_change = side_change(base, theirs)
+          next choices[id] = :ours if ours_change == :unchanged && theirs_change == :unchanged
+
+          change = {
+            path: owner_path(base || ours || theirs),
+            ours: ours_change,
+            theirs: theirs_change
+          }.freeze
+          changes << change
+          choice = owner_choice(base, ours, theirs)
+          if choice == :conflict
+            conflicts << conflict_for(id, base, ours, theirs, change)
+          else
+            choices[id] = choice
+          end
+        end
+        Decision.new(changes: changes.freeze, conflicts: conflicts.freeze, choices: choices.freeze)
+      end
+
+      def append_unmanaged_conflict(changes, conflicts, documents)
+        base = documents.fetch(:base).unmanaged_fingerprint
+        ours = documents.fetch(:ours).unmanaged_fingerprint
+        theirs = documents.fetch(:theirs).unmanaged_fingerprint
+        return if ours == theirs
+
+        change = {
+          path: '<unmanaged-source>',
+          ours: base == ours ? :unchanged : :edited,
+          theirs: base == theirs ? :unchanged : :edited
+        }.freeze
+        changes << change
+        conflicts << {
+          conflict_id: "bash-unmanaged-#{Digest::SHA256.hexdigest([base, ours, theirs].join("\0"))[0, 16]}",
+          category: :unmanaged_source_change,
+          path: change.fetch(:path),
+          owner_id: nil,
+          change_classification: change
+        }.freeze
+      end
+
+      def unstable_ownership_failure(request, documents)
+        sequences = documents.transform_values do |document|
+          document.owners.filter_map do |owner|
+            [owner.signature, owner.fingerprint] unless stable_signature?(owner.signature)
+          end
+        end
+        return if sequences.values.uniq.one?
+
+        mismatch_index = (0...sequences.values.map(&:length).max).find do |index|
+          sequences.values.map { |sequence| sequence[index] }.uniq.length > 1
+        end
+        unstable = documents.values.filter_map do |document|
+          unstable_owners = document.owners.reject { |owner| stable_signature?(owner.signature) }
+          unstable_owners[mismatch_index]
+        end.first
+        identity = sequences.transform_values { |sequence| sequence[mismatch_index] }
+        signature_digest = Digest::SHA256.hexdigest(JSON.generate(Ast::Merge.json_ready(sequences)))
+        conflict = {
+          conflict_id: "bash-ownership-#{signature_digest[0, 16]}",
+          category: :unproven_ast_ownership,
+          path: owner_path(unstable),
+          owner_id: nil,
+          signature: unstable&.signature,
+          unstable_index: mismatch_index,
+          identities: identity
+        }.freeze
+        decision = Decision.new(changes: [], conflicts: [conflict], choices: {})
+        rendered = render_plan(request, [whole_document_conflict(request, decision)])
+        failure(
+          :merge3,
+          request,
+          category: :unproven_ast_ownership,
+          message: 'A non-stable Bash top-level AST identity changed; whole-file fallback is required.',
+          conflicts: [conflict],
+          conflicted_output: rendered.content,
+          render_report: render_report(rendered, :full_file_conflict),
+          verification: { base_participated: true },
+          fallbacks: [{
+            from: :top_level_ast_ownership,
+            to: :full_file_conflict,
+            reason: :identity_changed
+          }]
+        )
+      end
+
+      def stable_signature?(signature)
+        %i[function variable_assignment].include?(signature.first)
+      end
+
+      def side_change(base, side)
+        return :unchanged if equivalent?(base, side)
+        return :added if !base && side
+        return :deleted if base && !side
+        return :unchanged unless base || side
+
+        :edited
+      end
+
+      def owner_choice(base, ours, theirs)
+        return :ours if equivalent?(ours, theirs)
+        return :theirs if equivalent?(base, ours)
+        return :ours if equivalent?(base, theirs)
+        return if ours.nil? && theirs.nil?
+
+        :conflict
+      end
+
+      def equivalent?(left, right)
+        return true if left.nil? && right.nil?
+        return false unless left && right
+
+        left.fingerprint == right.fingerprint
+      end
+
+      def conflict_for(id, base, ours, theirs, change)
+        {
+          conflict_id: "bash-declaration-#{id[0, 16]}",
+          category: base && (!ours || !theirs) ? :delete_edit : :edit_edit,
+          path: change.fetch(:path),
+          owner_id: id,
+          base: owner_state(base),
+          ours: owner_state(ours),
+          theirs: owner_state(theirs),
+          change_classification: change
+        }.freeze
+      end
+
+      def owner_state(owner)
+        {
+          present: !owner.nil?,
+          fingerprint: owner&.fingerprint,
+          source_role: owner&.role,
+          line_range: owner && [owner.start_line, owner.end_line]
+        }
+      end
+
+      def exact_revision_role(request)
+        base = request.fetch(:base_source)
+        ours = request.fetch(:ours_source)
+        theirs = request.fetch(:theirs_source)
+        return :ours if ours == theirs || base == theirs
+
+        :theirs if base == ours
+      end
+
+      def merge3_exact(request, role)
+        documents = %i[base ours theirs].to_h do |source_role|
+          [source_role, parse_exact_source(request.fetch(:"#{source_role}_source"), source_role, request[:dialect])]
+        end
+        winner = documents.fetch(role)
+        return parse_failure(:merge3, request, role, winner) if provider_failure?(winner)
+
+        render_exact(request, documents, role)
+      end
+
+      def render_exact(request, documents, role)
+        winner = documents.fetch(role)
+        rendered = render_plan(request, [whole_source_fragment(role, request.fetch(:"#{role}_source"))])
+        verification = verify_exact_rendered(rendered.content, winner)
+        unless verification[:semantic_match] && verification[:byte_exact]
+          return failure(
+            :merge3,
+            request,
+            category: :render_failure,
+            message: 'Bash exact revision did not remain byte-exact and semantically identical ' \
+                     'after native reparse.',
+            source_role: role,
+            render_report: render_report(rendered, :exact_revision),
+            verification: verification.merge(base_participated: true)
+          )
+        end
+
+        result(
+          :merge3,
+          request,
+          output: rendered.content,
+          diagnostics: exact_diagnostics(documents),
+          render_report: render_report(rendered, :exact_revision),
+          verification: verification.merge(base_participated: true)
+        )
+      end
+
+      def verify_exact_rendered(output, expected)
+        parsed = parse_exact_source(output, :output)
+        if provider_failure?(parsed)
+          return {
+            output_reparsed: false,
+            byte_exact: output == expected.source,
+            semantic_match: false,
+            parse_error: failure_detail(parsed),
+            source_role: expected.role
+          }
+        end
+
+        actual_signatures = parsed.declarations.map(&:first)
+        expected_signatures = expected.declarations.map(&:first)
+        actual_attributes = parsed.declarations.map(&:last)
+        expected_attributes = expected.declarations.map(&:last)
+        {
+          output_reparsed: true,
+          byte_exact: output == expected.source,
+          semantic_match: parsed.declarations == expected.declarations,
+          ordered_declaration_signatures_verified: actual_signatures == expected_signatures,
+          ast_attributes_verified: actual_attributes == expected_attributes,
+          planned_declaration_count: expected.declarations.length,
+          output_declaration_count: parsed.declarations.length,
+          source_role: expected.role
+        }
+      end
+
+      def exact_diagnostics(documents)
+        documents.flat_map do |role, document|
+          if provider_failure?(document)
+            [{
+              category: :parse_error,
+              severity: :warning,
+              message: "#{role} parse error: #{failure_detail(document)}",
+              blocking: false,
+              source_role: role
+            }]
+          else
+            document.issues.map do |issue|
+              issue.merge(severity: :warning, blocking: false, source_role: role).freeze
+            end
+          end
+        end.freeze
+      end
+
+      def duplicate_message(signature)
+        "ambiguous duplicate declaration #{signature.inspect}"
+      end
+
+      def render_composite(request, documents, decision)
+        fragments = composite_fragments(documents, decision)
+        rendered = render_plan(request, fragments)
+        expected = expected_owners(documents, decision)
+        verification = verify_rendered(rendered.content, expected, request[:dialect])
+        unless verification[:semantic_match]
+          return failure(
+            :merge3,
+            request,
+            category: :render_failure,
+            message: 'Bash composite did not match the planned ordered declaration structure and AST attributes.',
+            changes: decision.changes,
+            render_report: render_report(rendered, :exact_declaration_composite),
+            verification: verification.merge(base_participated: true)
+          )
+        end
+
+        result(
+          :merge3,
+          request,
+          output: rendered.content,
+          changes: decision.changes,
+          render_report: render_report(rendered, :exact_declaration_composite),
+          verification: verification.merge(base_participated: true)
+        )
+      end
+
+      def composite_fragments(documents, decision)
+        ours = documents.fetch(:ours)
+        fragments = []
+        cursor = 1
+        edits = composite_edits(documents, decision).sort_by do |edit|
+          insertion = edit.fetch(:end_line) < edit.fetch(:start_line)
+          [edit.fetch(:start_line), insertion ? 0 : 1]
+        end
+        edits.each do |edit|
+          append_range(fragments, :ours, cursor, edit.fetch(:start_line) - 1)
+          edit.fetch(:owners).each_with_index do |owner, index|
+            append_owner(fragments, owner)
+            ensure_plan_boundary!(fragments, documents) if index < edit.fetch(:owners).length - 1
+          end
+          cursor = [cursor, edit.fetch(:end_line) + 1].max
+        end
+        append_range(fragments, :ours, cursor, ours.source.lines.length)
+        append_declaration_additions(fragments, documents, decision)
+        fragments
+      end
+
+      def composite_edits(documents, decision)
+        replacement_edits(documents, decision) + import_insertion_edits(documents, decision)
+      end
+
+      def replacement_edits(documents, decision)
+        ours = documents.fetch(:ours)
+        decision.choices.filter_map do |id, role|
+          ours_owner = ours.by_id[id]
+          next unless ours_owner
+          next if role == :ours
+
+          {
+            start_line: ours_owner.start_line,
+            end_line: ours_owner.end_line,
+            owners: [role && documents.fetch(role).by_id[id]].compact
+          }
+        end
+      end
+
+      def import_insertion_edits(documents, decision)
+        additions = added_theirs_owners(documents, decision).select { |owner| import_owner?(owner) }
+        return [] if additions.empty?
+
+        ours = documents.fetch(:ours)
+        anchor = ours.owners.reverse.find { |owner| package_or_import_owner?(owner) }
+        insertion_line = anchor ? anchor.end_line + 1 : ours.owners.first&.start_line || ours.source.lines.length + 1
+        [{
+          start_line: insertion_line,
+          end_line: insertion_line - 1,
+          owners: additions
+        }]
+      end
+
+      def append_declaration_additions(fragments, documents, decision)
+        additions = added_theirs_owners(documents, decision).reject { |owner| import_owner?(owner) }
+        return if additions.empty?
+
+        ensure_plan_boundary!(fragments, documents)
+        additions.each_with_index do |owner, index|
+          append_owner(fragments, owner)
+          ensure_plan_boundary!(fragments, documents) if index < additions.length - 1
+        end
+      end
+
+      def added_theirs_owners(documents, decision)
+        ours = documents.fetch(:ours)
+        documents.fetch(:theirs).owners.select do |owner|
+          !ours.by_id.key?(owner.id) && decision.choices[owner.id] == :theirs
+        end
+      end
+
+      def ensure_plan_boundary!(fragments, documents)
+        fragment = fragments.last
+        return if fragment.nil? || fragment_content(fragment, documents).end_with?("\n")
+
+        if fragment.is_a?(Ast::Merge::SourceRender::SourceFragment) && fragment.start_line < fragment.end_line
+          fragments[-1] = source_range_fragment(fragment.revision, fragment.start_line, fragment.end_line - 1)
+        else
+          fragments.pop
+        end
+        content = if fragment.is_a?(Ast::Merge::SourceRender::SourceFragment)
+                    documents.fetch(fragment.revision).source.lines.fetch(fragment.end_line - 1)
+                  else
+                    fragment.content
+                  end
+        fragments << Ast::Merge::SourceRender::SynthesizedFragment.new(
+          content: "#{content}\n",
+          reason: :declaration_separator,
+          producer: provider_id,
+          metadata: { source_role: fragment.respond_to?(:revision) ? fragment.revision : nil, copied_source: true }
+        )
+      end
+
+      def fragment_content(fragment, documents)
+        return fragment.content if fragment.is_a?(Ast::Merge::SourceRender::SynthesizedFragment)
+
+        document = documents.fetch(fragment.revision)
+        document.source.lines.slice(fragment.start_line - 1, fragment.end_line - fragment.start_line + 1).join
+      end
+
+      def append_owner(fragments, owner)
+        fragments << source_range_fragment(owner.role, owner.start_line, owner.end_line)
+      end
+
+      def append_range(fragments, role, start_line, end_line)
+        return if start_line > end_line
+
+        fragments << source_range_fragment(role, start_line, end_line)
+      end
+
+      def expected_owners(documents, decision)
+        ours = documents.fetch(:ours)
+        expected = ours.owners.filter_map do |owner|
+          role = decision.choices[owner.id]
+          role && documents.fetch(role).by_id[owner.id]
+        end
+        import_offset = expected.rindex { |owner| package_or_import_owner?(owner) }
+        documents.fetch(:theirs).owners.each do |owner|
+          next if ours.by_id.key?(owner.id)
+          next unless decision.choices[owner.id] == :theirs
+
+          if import_owner?(owner)
+            import_offset = import_offset ? import_offset + 1 : 0
+            expected.insert(import_offset, owner)
+          else
+            expected << owner
+          end
+        end
+        expected
+      end
+
+      def import_owner?(_owner)
+        false
+      end
+
+      alias package_or_import_owner? import_owner?
+
+      def verify_rendered(output, expected, dialect)
+        parsed = parse_source(output, :output, dialect)
+        if provider_failure?(parsed)
+          return {
+            output_reparsed: false,
+            semantic_match: false,
+            parse_error: failure_detail(parsed)
+          }
+        end
+
+        actual = parsed.owners.map { |owner| [owner.signature, owner.fingerprint] }
+        planned = expected.map { |owner| [owner.signature, owner.fingerprint] }
+        {
+          output_reparsed: true,
+          semantic_match: actual == planned,
+          ordered_declaration_signatures_verified: actual.map(&:first) == planned.map(&:first),
+          ast_attributes_verified: actual.map(&:last) == planned.map(&:last),
+          planned_declaration_count: planned.length,
+          output_declaration_count: actual.length
+        }
+      end
+
+      def render_conflicts(request, documents, decision)
+        localized = localized_conflict_fragments(request, documents, decision)
+        if localized
+          rendered = render_plan(request, localized)
+          return conflict_failure(request, decision, rendered, :declaration_localized_conflict)
+        end
+
+        rendered = render_plan(request, [whole_document_conflict(request, decision)])
+        conflict_failure(
+          request,
+          decision,
+          rendered,
+          :full_file_conflict,
+          fallbacks: [{ from: :declaration_localization, to: :full_file_conflict, reason: :source_ownership_unproven }]
+        )
+      end
+
+      def localized_conflict_fragments(request, documents, decision)
+        return if decision.conflicts.any? { |conflict| conflict[:owner_id].nil? }
+
+        ours = documents.fetch(:ours)
+        return unless decision.conflicts.all? { |conflict| ours.by_id.key?(conflict.fetch(:owner_id)) }
+
+        ranges = decision.conflicts.map { |conflict| [conflict, ours.by_id.fetch(conflict.fetch(:owner_id))] }
+        return unless ranges.sort_by { |_conflict, owner| owner.start_line }.each_cons(2).none? do |left, right|
+          left.last.end_line >= right.last.start_line
+        end
+
+        fragments = []
+        cursor = 1
+        ranges.sort_by { |_conflict, owner| owner.start_line }.each do |conflict, owner|
+          append_range(fragments, :ours, cursor, owner.start_line - 1)
+          fragments << declaration_conflict_fragment(request, documents, conflict)
+          cursor = owner.end_line + 1
+        end
+        append_range(fragments, :ours, cursor, ours.source.lines.length)
+        fragments
+      end
+
+      def declaration_conflict_fragment(request, documents, conflict)
+        Ast::Merge::SourceRender::ConflictFragment.new(
+          conflict_id: conflict.fetch(:conflict_id),
+          base: conflict_declaration_side(documents, conflict, :base),
+          ours: conflict_declaration_side(documents, conflict, :ours),
+          theirs: conflict_declaration_side(documents, conflict, :theirs),
+          labels: request.fetch(:labels, {}),
+          marker_size: request.fetch(:conflict_marker_size, 7),
+          metadata: { path: conflict.fetch(:path), category: conflict.fetch(:category) }
+        )
+      end
+
+      def conflict_declaration_side(documents, conflict, role)
+        document = documents.fetch(role)
+        owner = document.by_id[conflict.fetch(:owner_id)]
+        owner ? [conflict_source_fragment(owner, document.source)] : []
+      end
+
+      def unsafe_document_failure(request, role, parsed)
+        return parsed unless parsed[:unsafe_range] || parsed[:ambiguous_owner]
+
+        conflict_id = "bash-unsafe-#{Digest::SHA256.hexdigest([role, failure_detail(parsed)].join("\0"))[0, 16]}"
+        conflict = {
+          conflict_id: conflict_id,
+          category: parsed[:ambiguous_owner] ? :ambiguous_owner : :unsafe_source_range,
+          path: '<document>',
+          owner_id: nil,
+          source_role: role
+        }
+        rendered = render_plan(
+          request,
+          [whole_document_conflict(request, Decision.new(changes: [], conflicts: [conflict], choices: {}))]
+        )
+        failure(
+          :merge3,
+          request,
+          category: conflict.fetch(:category),
+          message: "#{role} cannot be merged safely: #{failure_detail(parsed)}",
+          conflicts: [conflict],
+          conflicted_output: rendered.content,
+          source_role: role,
+          render_report: render_report(rendered, :full_file_conflict),
+          verification: { base_participated: true }
+        )
+      end
+
+      def whole_document_conflict(request, decision)
+        Ast::Merge::SourceRender::ConflictFragment.new(
+          conflict_id: decision.conflicts.first.fetch(:conflict_id),
+          base: [conflict_whole_source_fragment(:base, request.fetch(:base_source))],
+          ours: [conflict_whole_source_fragment(:ours, request.fetch(:ours_source))],
+          theirs: [conflict_whole_source_fragment(:theirs, request.fetch(:theirs_source))],
+          labels: request.fetch(:labels, {}),
+          marker_size: request.fetch(:conflict_marker_size, 7),
+          metadata: { conflicts: decision.conflicts.map { |conflict| conflict[:conflict_id] } }
+        )
+      end
+
+      def conflict_source_fragment(owner, source)
+        fragment_source = source.lines.slice(owner.start_line - 1, owner.end_line - owner.start_line + 1).join
+        return source_range_fragment(owner.role, owner.start_line, owner.end_line) if fragment_source.end_with?("\n")
+
+        synthesized_copy("#{fragment_source}\n", :conflict_line_boundary, owner.role)
+      end
+
+      def conflict_whole_source_fragment(role, source)
+        return whole_source_fragment(role, source) if source.empty? || source.end_with?("\n")
+
+        synthesized_copy("#{source}\n", :conflict_line_boundary, role)
+      end
+
+      def synthesized_copy(content, reason, role)
+        Ast::Merge::SourceRender::SynthesizedFragment.new(
+          content: content,
+          reason: reason,
+          producer: provider_id,
+          metadata: { source_role: role, copied_source: true }
+        )
+      end
+
+      def whole_source_fragment(role, source)
+        return synthesized_copy('', :exact_empty_source, role) if source.empty?
+
+        source_range_fragment(role, 1, source.lines.length)
+      end
+
+      def source_range_fragment(role, start_line, end_line)
+        Ast::Merge::SourceRender::SourceFragment.new(
+          revision: role,
+          start_line: start_line,
+          end_line: end_line,
+          metadata: { source_role: role }
+        )
+      end
+
+      def render_plan(request, fragments)
+        Ast::Merge::SourceRender::Renderer.new.render(
+          Ast::Merge::SourceRender::Plan.new(
+            sources: {
+              base: request[:base_source].to_s,
+              ours: request[:ours_source].to_s,
+              theirs: request[:theirs_source].to_s
+            },
+            fragments: fragments,
+            metadata: { provider_id: provider_id }
+          )
+        )
+      end
+
+      def render_report(rendered, strategy)
+        {
+          strategy: strategy,
+          line_records: rendered.line_records,
+          synthesized_fragments: rendered.synthesized_fragments,
+          conflicts: rendered.conflicts,
+          verification_input: rendered.verification_input
+        }
+      end
+
+      def conflict_failure(request, decision, rendered, strategy, fallbacks: [])
+        failure(
+          :merge3,
+          request,
+          category: :merge_conflict,
+          message: 'Bash top-level declaration changed incompatibly on both sides.',
+          changes: decision.changes,
+          conflicts: decision.conflicts,
+          conflicted_output: rendered.content,
+          render_report: render_report(rendered, strategy),
+          verification: { base_participated: true },
+          fallbacks: fallbacks
+        )
+      end
+
+      def parse_failure(operation, request, role, parsed)
+        category = if parsed[:parse_error]
+                     :parse_error
+                   elsif parsed[:ambiguous_owner]
+                     :ambiguous_owner
+                   else
+                     :unsafe_source_range
+                   end
+        failure(
+          operation,
+          request,
+          category: category,
+          message: "#{role} parse error: #{failure_detail(parsed)}",
+          source_role: role
+        )
+      end
+
+      def failure_detail(parsed)
+        return parsed[:parse_error] if parsed[:parse_error]
+        return "ambiguous duplicate declaration #{parsed[:ambiguous_owner].inspect}" if parsed[:ambiguous_owner]
+
+        "unsafe declaration range #{parsed[:unsafe_range].inspect}"
+      end
+
+      def provider_failure?(value)
+        value.is_a?(Hash) &&
+          (value[:ok] == false || value.key?(:parse_error) || value.key?(:ambiguous_owner) || value.key?(:unsafe_range))
+      end
+
+      def result(operation, request, changes: [], diagnostics: [], render_report: {}, verification: {}, **payload)
+        Ast::Merge::ProviderResult.build(
+          operation: operation,
+          success: true,
+          envelope: envelope(
+            request,
+            changes: changes,
+            diagnostics: diagnostics,
+            render_report: render_report,
+            verification: verification
+          ),
+          **payload
+        )
+      end
+
+      def failure(operation, request, category:, message:, changes: [], conflicts: [], fallbacks: [],
+                  render_report: {}, verification: {}, **payload)
+        Ast::Merge::ProviderResult.build(
+          operation: operation,
+          success: false,
+          envelope: envelope(
+            request,
+            changes: changes,
+            conflicts: conflicts,
+            fallbacks: fallbacks,
+            diagnostics: [{ category: category, severity: :error, message: message, blocking: true }],
+            render_report: render_report,
+            verification: verification
+          ),
+          **payload
+        )
+      end
+
+      def envelope(request, **fields)
+        {
+          provider: {
+            provider_id: provider_id,
+            family: family,
+            dialect: request[:dialect] || :bash,
+            backend: request[:backend] || TREE_SITTER_BACKEND.id.to_sym,
+            package: 'bash-merge',
+            package_version: Bash::Merge::Version::VERSION
+          },
+          profile: { profile_id: request[:profile_id] || DEFAULT_PROFILE }
+        }.merge(fields)
+      end
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/ParameterLists, Metrics/PerceivedComplexity
+  end
+end

data/lib/bash/merge/version.rb

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

data/lib/bash/merge.rb

@@ -119,6 +119,7 @@ module Bash
     autoload :FileAnalysis, 'bash/merge/file_analysis'
     autoload :MergeResult, 'bash/merge/merge_result'
     autoload :NodeWrapper, 'bash/merge/node_wrapper'
+    autoload :Provider, 'bash/merge/provider'
     autoload :SmartMerger, 'bash/merge/smart_merger'
 
     class << self
@@ -208,6 +209,9 @@ TreeHaver::BackendRegistry.register_tag(:bash_grammar, category: :grammar, backe
   Bash::Merge.available?
 end
 
+require_relative 'merge/provider'
+Bash::Merge.register_provider!
+
 # Register with ast-merge's MergeGemRegistry for RSpec dependency tags
 # Only register if MergeGemRegistry is loaded (i.e., in test environment)
 if defined?(Ast::Merge::RSpec::MergeGemRegistry)

data/sig/bash/merge.rbs

@@ -1,5 +1,27 @@
 module Bash
   module Merge
+    class NodeWrapper
+      attr_reader node: untyped
+      def start_byte: () -> Integer
+      def end_byte: () -> Integer
+      def source_text: () -> String
+      def semantic_tree: () -> Array[untyped]
+      def heredoc?: () -> bool
+    end
+
+    class Provider
+      def provider_id: () -> String
+      def family: () -> String
+      def capabilities: () -> Hash[Symbol, untyped]
+      def analyze: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def diff2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge3: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+    end
+
+    def self.merge_provider: () -> Provider
+    def self.register_provider!: (?replace: bool) -> untyped
+
     module Version
       VERSION: String
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.3
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +306,7 @@ files:
 - lib/bash/merge/freeze_node.rb
 - lib/bash/merge/merge_result.rb
 - lib/bash/merge/node_wrapper.rb
+- lib/bash/merge/provider.rb
 - lib/bash/merge/smart_merger.rb
 - lib/bash/merge/version.rb
 - sig/bash/merge.rbs
@@ -315,10 +316,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.1
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
+  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
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/bash-merge/7.1.1
+  documentation_uri: https://www.rubydoc.info/gems/bash-merge/7.1.3
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/bash-merge