featureparity 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a4558cdeaa90d0b4197daca351b9eadbeee5af21cb8454e9a1f44b3725bbaa
-  data.tar.gz: d0134aeca43dd6ee3415bfafe25ea7f67212eda1b8577a3bdfd9d9a3800aa150
+  metadata.gz: 2403a7e55f95df5cf1821375442902c0a06784c26186f1e2fc1ae2e474ee937b
+  data.tar.gz: 4cbb3354c710f6d6e19114b2e2c28e533251c10bfa4a93c0a917ff73e5ebce93
 SHA512:
-  metadata.gz: 70827aadfd85037c992e670923ae4c7065c6ba913905028b903f4b6535f8498f530d3ec51a9ff245aa9734a3f044d6ca779b5e8b849b0a15d1b6b2aaed360e2f
-  data.tar.gz: 9ba46d5f8efa5a57e4b23c2557969cdd5c6b6697cb8584bb98b7c11fc237a099743c33474b46d05444361785278707981206af09e7c32570261ae5b104a9885d
+  metadata.gz: 8a065b839f21e0bdf4194f65b93c233abf3e09ef11a50f96d0259d68609fc1c6e89e3d07e760a5a8d3b3bb12b849b7fdb7ea1c3a5fa65fc59b4befa053595366
+  data.tar.gz: 50e977bdf9a66c6f24a8a264d9334a506d5f15379f8e9aeaa8635d6cf84b5f9eee526e990c6e9b1a041631f1e15b7115e3ed3484311130f1fd23ca0ad7d35cde

data/lib/fp/client.rb

@@ -281,7 +281,7 @@ module Fp
     # only do that by fetching the test files from GitHub, which fails silently on a
     # private repo, so resolved results are always sent when we have them.
     def ingest_ci_results(project_id, ci_url:, surface:, junit_xml:, pr_url: nil, results: nil,
-                          test_revisions: nil, unmarked_failures: nil, orphan_markers: nil)
+                          test_revisions: nil, unmarked_failures: nil, orphan_markers: nil, sha: nil)
       body = {
         ci_url: ci_url,
         surface: surface,
@@ -289,6 +289,9 @@ module Fp
       }
       # Only send pr_url when set, so a merged-branch run stays a plain ingest.
       body[:pr_url] = pr_url if pr_url && !pr_url.empty?
+      # The checkout commit, so the receipt (or a PR run's branch verdict) links the
+      # exact revision the suite ran at.
+      body[:sha] = sha if sha && !sha.empty?
       body[:results] = results if results && !results.empty?
       # Testcase-level source receipts stay separate from aggregate Evidence outcomes:
       # several tests may back one cell, and each can change independently.

data/lib/fp/commands/ci_report.rb

@@ -146,6 +146,7 @@ module Fp
           # with servers old enough to ignore client-resolved results.
           junit_xml: resolved_reports.first[:xml],
           pr_url: opts[:pr],
+          sha: commit_sha,
           results: combined_results,
           test_revisions: combined_revisions,
           unmarked_failures: totals[:unmarked_failures],

data/lib/fp/commands/report.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'open3'
+require 'set'
 require_relative 'attach'
 
 module Fp
@@ -37,11 +39,14 @@ module Fp
       help_flag :junit, 'JUnit XML report to batch-upload evidence from'
       help_flag :base_dir, 'Where relative test-file paths in the report resolve from'
       help_flag :attach_media, 'With --junit: upload the videos/screenshots the run recorded ([[ATTACHMENT|…]]) as visual evidence'
+      help_flag :stamp_all, 'With --junit: put --pr/--work-item on every receipt, not only on tests in files this branch changed'
       help_example 'fp report print_container_qr --project stowzilla --surface api --file spec/qr_spec.rb --repo stowzilla/app'
       help_example 'fp report --junit junit.xml --project stowzilla --surface api --repo stowzilla/app',
                    'Batch-upload from a JUnit report (slugs come from fp:<slug> markers)'
       help_note "Agents report 'present' or 'stub' only. CI writes 'passing'/'failing' via fp ci-report.\n" \
-                'Always pass --test-type when a surface has more than one suite, or they overwrite each other.'
+                "Always pass --test-type when a surface has more than one suite, or they overwrite each other.\n" \
+                'With --junit, --pr and --work-item land only on tests in files this branch changed (git); ' \
+                'the rest of the suite keeps the card and PR that introduced it.'
 
       KNOWN_FLAGS = {
         project: :string,
@@ -58,7 +63,8 @@ module Fp
         state: :string,
         junit: :string,
         base_dir: :string,
-        attach_media: :boolean
+        attach_media: :boolean,
+        stamp_all: :boolean
       }.freeze
 
       VALID_STATES = %w[present stub].freeze
@@ -261,6 +267,12 @@ module Fp
 
         project_id = resolve_project_id(opts[:project])
 
+        # --pr and --work-item say what prompted *this* work. A suite run covers every
+        # marker in the repo, so stamping them on every receipt rewrote the card and PR
+        # on requirements the branch never touched — "View Card" on an unrelated
+        # requirement led to whichever card last ran the suite (Fizzy #1631). Only the
+        # tests in files this branch changed get them; the rest keep their own.
+        provenance = provenance_scope(opts, base_dir)
         reported = []
         skipped_unknown = []
         api_unavailable = false
@@ -289,9 +301,10 @@ module Fp
           }
           params[:test_type] = binding.test_type if binding.test_type
           params[:line] = binding.line if binding.line
-          params[:pr_url] = opts[:pr] if opts[:pr]
+          stamped = provenance.stamps?(binding.file)
+          params[:pr_url] = opts[:pr] if opts[:pr] && stamped
           params[:sha] = opts[:sha] if opts[:sha]
-          params[:work_item_url] = opts[:work_item] if opts[:work_item]
+          params[:work_item_url] = opts[:work_item] if opts[:work_item] && stamped
           params[:ci_url] = opts[:ci_url] if opts[:ci_url]
           params[:title] = binding.title if binding.title
 
@@ -310,7 +323,7 @@ module Fp
             exit 1
           end
 
-          reported << { binding: binding, state: state, recorded: true,
+          reported << { binding: binding, state: state, recorded: true, stamped: stamped,
                         stored_status: stored_status_from(report_result),
                         stored_source: stored_source_from(report_result) }
         end
@@ -321,7 +334,80 @@ module Fp
         end
 
         emit_junit_summary(opts, reported, skipped_unknown, unmatched, api_unavailable, collisions,
-                           empty_name: empty_name, media: media, uploaded_media: uploaded_media)
+                           empty_name: empty_name, media: media, uploaded_media: uploaded_media,
+                           provenance: provenance)
+      end
+
+      # Which receipts of a --junit batch carry --pr/--work-item.
+      #
+      # `files` is the set of repo-relative paths this branch changed — the commits since
+      # it left the default branch, plus anything uncommitted or untracked — or, when
+      # the checkout *is* the default branch, the files in its HEAD commit. Nil means
+      # git couldn't say (not a repository, no default branch to compare with), and then
+      # every receipt is stamped as before, with a note. `--stamp-all` forces that.
+      ProvenanceScope = Struct.new(:mode, :files, keyword_init: true) do
+        def stamps?(file)
+          return true if mode == :all || files.nil?
+
+          files.include?(file.to_s)
+        end
+
+        def scoped?
+          mode != :all && !files.nil?
+        end
+      end
+
+      def provenance_scope(opts, base_dir)
+        return ProvenanceScope.new(mode: :all, files: nil) if opts[:stamp_all]
+        return ProvenanceScope.new(mode: :all, files: nil) if opts[:pr].nil? && opts[:work_item].nil?
+
+        root = Fp::JUnit.repo_root_for(base_dir)
+        return ProvenanceScope.new(mode: :no_git, files: nil) if root.nil?
+
+        head = git_out(root, 'rev-parse', 'HEAD')
+        return ProvenanceScope.new(mode: :no_git, files: nil) if head.nil? || head.empty?
+
+        base = merge_base_with_default_branch(root)
+        committed =
+          if base && base != head
+            git_out(root, 'diff', '--name-only', base, 'HEAD')
+          elsif base
+            # On the default branch itself: the work is whatever this commit touched.
+            git_out(root, 'diff-tree', '--no-commit-id', '--name-only', '-r', '--root', 'HEAD')
+          end
+        return ProvenanceScope.new(mode: :no_git, files: nil) if committed.nil?
+
+        pending = git_out(root, 'diff', '--name-only', 'HEAD') || ''
+        untracked = git_out(root, 'ls-files', '--others', '--exclude-standard') || ''
+        files = [committed, pending, untracked].join("\n").split("\n").map(&:strip).reject(&:empty?).to_set
+        ProvenanceScope.new(mode: (base != head ? :branch : :commit), files: files)
+      end
+
+      # The merge base between HEAD and the default branch, trying origin's HEAD first
+      # and the usual names after it. Nil when none of them exists locally.
+      def merge_base_with_default_branch(root)
+        candidates = []
+        remote_head = git_out(root, 'symbolic-ref', '--short', '-q', 'refs/remotes/origin/HEAD')
+        candidates << remote_head if remote_head && !remote_head.empty?
+        candidates.concat(%w[origin/main origin/master main master])
+        candidates.uniq.each do |ref|
+          verified = git_out(root, 'rev-parse', '--verify', '-q', "#{ref}^{commit}")
+          next if verified.nil? || verified.empty?
+
+          base = git_out(root, 'merge-base', ref, 'HEAD')
+          return base if base && !base.empty?
+        end
+        nil
+      end
+
+      # Stdout of a git command, stripped — '' when it printed nothing, nil on failure.
+      def git_out(root, *args)
+        stdout, _stderr, status = Open3.capture3('git', *args, chdir: root)
+        return nil unless status.success?
+
+        stdout.strip
+      rescue SystemCallError
+        nil
       end
 
       # Upload the media (videos/screenshots) a run recorded for its bound testcases as
@@ -397,10 +483,13 @@ module Fp
       end
 
       def emit_junit_summary(opts, reported, skipped_unknown, unmatched, api_unavailable, collisions = [],
-                             empty_name: [], media: [], uploaded_media: [])
+                             empty_name: [], media: [], uploaded_media: [], provenance: nil)
+        provenance ||= ProvenanceScope.new(mode: :all, files: nil)
+        stamping = !opts[:pr].nil? || !opts[:work_item].nil?
         data = {
           repo: opts[:repo],
-          reported: reported.map { |r| { slug: r[:binding].slug, surface: r[:binding].surface, test_type: r[:binding].test_type, file: r[:binding].file, line: r[:binding].line, state: r[:state], recorded: r[:recorded], stored_status: r[:stored_status], superseded_by_ci: ci_superseded?(r[:state], r[:stored_status], r[:stored_source]) } },
+          reported: reported.map { |r| { slug: r[:binding].slug, surface: r[:binding].surface, test_type: r[:binding].test_type, file: r[:binding].file, line: r[:binding].line, state: r[:state], recorded: r[:recorded], stamped: (stamping ? r[:stamped] != false : nil), stored_status: r[:stored_status], superseded_by_ci: ci_superseded?(r[:state], r[:stored_status], r[:stored_source]) }.compact },
+          provenance: (stamping ? { scoped: provenance.scoped?, mode: provenance.mode.to_s, stamped: reported.count { |r| r[:stamped] != false } } : nil),
           skipped_unknown: skipped_unknown.map { |b| { slug: b.slug, surface: b.surface, file: b.file } },
           unmatched_testcases: unmatched.map { |tc| { name: tc.name, file: tc.file } },
           empty_name: empty_name,
@@ -423,7 +512,21 @@ module Fp
             loc = r[:binding].line ? "#{r[:binding].file}:#{r[:binding].line}" : r[:binding].file
             type = r[:binding].test_type ? " [#{r[:binding].test_type}]" : ''
             shown_state = superseded ? "#{r[:stored_status]}, kept CI — #{r[:state]} ignored" : r[:state]
-            puts "  #{marker} #{r[:binding].slug} → #{r[:binding].surface}#{type}  (#{shown_state})  #{loc}"
+            stamp = stamping && provenance.scoped? && r[:stamped] ? '  ← this change' : ''
+            puts "  #{marker} #{r[:binding].slug} → #{r[:binding].surface}#{type}  (#{shown_state})  #{loc}#{stamp}"
+          end
+
+          if stamping
+            puts
+            stamped = reported.count { |r| r[:stamped] != false }
+            what = [opts[:pr] && '--pr', opts[:work_item] && '--work-item'].compact.join(' and ')
+            if provenance.scoped?
+              where = provenance.mode == :commit ? 'the files in this commit' : 'the files this branch changed'
+              puts "ℹ️  #{what} recorded on #{stamped} of #{reported.length} receipt(s) — the tests in #{where}."
+              puts '    The rest keep the card and PR that introduced them. Pass --stamp-all to override.'
+            elsif provenance.mode == :no_git
+              puts "ℹ️  #{what} recorded on every receipt: git could not say which files this change touched."
+            end
           end
 
           emit_collision_warning(collisions)

data/lib/fp/commands/show.rb

@@ -164,6 +164,15 @@ module Fp
                 if e['merged_status'] && e['merged_status'] != e['status']
                   puts "    Merged:  #{e['merged_status']} (the default branch's last verdict)"
                 end
+                # An open pull request's CI has reported on this test since the default
+                # branch did. It never changes the status above (Fizzy #1631); it is
+                # the heads-up that a branch says otherwise, with the PR to look at.
+                if e['branch_status']
+                  branch = ["On PR:   #{e['branch_status']}"]
+                  branch << e['branch_pr_url'] if e['branch_pr_url']
+                  branch << '(not merged)'
+                  puts "    #{branch.join(' ')}"
+                end
                 puts "    Type:    #{e['test_type']}" if e['test_type'] && e['test_type'] != 'unspecified'
                 if e['source_file']
                   loc = e['source_line'] ? "#{e['source_file']}:#{e['source_line']}" : e['source_file']

data/lib/fp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fp
-  VERSION = '0.0.25'
+  VERSION = '0.0.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: featureparity
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Stowzilla
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-23 00:00:00.000000000 Z
+date: 2026-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http