carson 2.28.0 → 2.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7117079168b4f8472a4324f954bc087122e0ded0d253252b73702c41d3996283
-  data.tar.gz: 21484878bcafe5799dfd87a18c223b5982d6b2ff1ab988c78f929de9cd642bdd
+  metadata.gz: 374e4a7af2ec608b1c3c9d07ca4a5ad8b028715434c1f02fb4b4034a71b153d2
+  data.tar.gz: a795fabcecbe2b43d03f155b0d4b730f804d0879ef4a1fe280cc4e082350c76f
 SHA512:
-  metadata.gz: bb4b347d7ace09997a93b40fc7ec179baf4eb8aee75a620e3511d4ac7b9c46545380f7157ac442807e09cc1a679e8709a62df1a237a41618501688162f99c511
-  data.tar.gz: 91aaf60433a82548170eb66eef14ce90c0eb730a3a56e06f7c154449d2355ca50f9a1e282d1b26e372c34b1df2946cb804587854875c14d1ffec3da5d6658bff
+  metadata.gz: 83b920da278fa2e457c424babaf3b06955a2317f920b5ad3681ae4da8a90fc5d5c3969d7160796b0febc49669a7cf7995c8f83ba674ce7f0865ca72eb6a48cbf
+  data.tar.gz: 8506fe647fe4538a27dd0ef25e0ecbeb1d9c0b78c8251d45b6023e562091cd6c861ef660707684b4e3d202a69728b0779a8a623ceb79313efc7e86eb0b482b17

data/RELEASE.md

@@ -5,6 +5,29 @@ Release-note scope rule:
 - `RELEASE.md` records only version deltas, breaking changes, and migration actions.
 - Operational usage guides live in `MANUAL.md` and `API.md`.
 
+## 2.30.0 — Prune Rebase Merge Support + Audit Noise Reduction
+
+### What changed
+
+- **`carson prune` now handles rebase and cherry-pick merges.** When a stale branch fails SHA-based merged PR evidence (commit hashes change after rebase), prune falls back to content-level comparison against main. If the branch content is already absorbed into main, it is safely deleted.
+- **Canonical templates hint removed from concise audit output.** The "canonical templates not configured" message no longer appears on every commit. Verbose mode retains it for debugging.
+
+### Migration
+
+- No action required. Prune behaviour is strictly more capable; existing workflows are unaffected.
+
+## 2.29.0 — Audit Concise Output UX
+
+### What changed
+
+- **"Checks: skipped" and "Baseline: skipped" messages are no longer shown in concise audit output.** If checks cannot run (no PR, no required checks, `gh` unavailable), the audit stays silent instead of surfacing a misleading "skipped" line. Verbose mode still logs the skip reason for debugging.
+- **Audit state no longer bumps to "attention" for skipped checks.** A skip is a non-event, not a concern.
+- **Failing and pending check names are now included in concise messages.** Before: `Baseline (main): 1 failing — fix before merge.` After: `Baseline (main): 1 failing (lint) — fix before merge.` Same treatment applies to PR required checks and advisory baseline messages.
+
+### Migration
+
+- No action required. This is a display-only change to concise audit output.
+
 ## 2.28.0 — Non-Interactive CLI Flags for Setup
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-2.28.0
+2.30.0

data/lib/carson/runtime/audit.rb

@@ -54,48 +54,54 @@ module Carson
 				puts_verbose ""
 				puts_verbose "[PR and Required Checks (gh)]"
 				monitor_report = pr_and_check_report
-				audit_state = "attention" if audit_state == "ok" && monitor_report.fetch( :status ) != "ok"
-				if monitor_report.fetch( :status ) == "skipped"
-					audit_concise_problems << "Checks: skipped (#{monitor_report.fetch( :skip_reason )})."
-				elsif monitor_report.fetch( :status ) == "attention"
+				audit_state = "attention" if audit_state == "ok" && !%w[ok skipped].include?( monitor_report.fetch( :status ) )
+				if monitor_report.fetch( :status ) == "attention"
 					checks = monitor_report.fetch( :checks )
 					fail_n = checks.fetch( :failing_count )
 					pend_n = checks.fetch( :pending_count )
 					total = checks.fetch( :required_total )
+					fail_names = checks.fetch( :failing ).map { |e| e.fetch( :name ) }.join( ", " )
 					if fail_n.positive? && pend_n.positive?
-						audit_concise_problems << "Checks: #{fail_n} failing, #{pend_n} pending of #{total} required."
+						audit_concise_problems << "Checks: #{fail_n} failing (#{fail_names}), #{pend_n} pending of #{total} required."
 					elsif fail_n.positive?
-						audit_concise_problems << "Checks: #{fail_n} of #{total} failing."
+						audit_concise_problems << "Checks: #{fail_n} of #{total} failing (#{fail_names})."
 					elsif pend_n.positive?
 						audit_concise_problems << "Checks: pending (#{total - pend_n} of #{total} complete)."
-					elsif checks.fetch( :status ) == "skipped"
-						audit_concise_problems << "Checks: skipped (#{checks.fetch( :skip_reason )})."
 					end
 				end
 				puts_verbose ""
 				puts_verbose "[Default Branch CI Baseline (gh)]"
 				default_branch_baseline = default_branch_ci_baseline_report
-				audit_state = "attention" if audit_state == "ok" && default_branch_baseline.fetch( :status ) != "ok"
+				audit_state = "attention" if audit_state == "ok" && !%w[ok skipped].include?( default_branch_baseline.fetch( :status ) )
 				baseline_st = default_branch_baseline.fetch( :status )
 				if baseline_st == "block"
 					parts = []
-					parts << "#{default_branch_baseline.fetch( :failing_count )} failing" if default_branch_baseline.fetch( :failing_count ).positive?
-					parts << "#{default_branch_baseline.fetch( :pending_count )} pending" if default_branch_baseline.fetch( :pending_count ).positive?
+					if default_branch_baseline.fetch( :failing_count ).positive?
+						names = default_branch_baseline.fetch( :failing ).map { |e| e.fetch( :name ) }.join( ", " )
+						parts << "#{default_branch_baseline.fetch( :failing_count )} failing (#{names})"
+					end
+					if default_branch_baseline.fetch( :pending_count ).positive?
+						names = default_branch_baseline.fetch( :pending ).map { |e| e.fetch( :name ) }.join( ", " )
+						parts << "#{default_branch_baseline.fetch( :pending_count )} pending (#{names})"
+					end
 					parts << "no check-runs for active workflows" if default_branch_baseline.fetch( :no_check_evidence )
 					audit_concise_problems << "Baseline (#{default_branch_baseline.fetch( :default_branch, config.main_branch )}): #{parts.join( ', ' )} — fix before merge."
 				elsif baseline_st == "attention"
 					parts = []
-					parts << "#{default_branch_baseline.fetch( :advisory_failing_count )} advisory failing" if default_branch_baseline.fetch( :advisory_failing_count ).positive?
-					parts << "#{default_branch_baseline.fetch( :advisory_pending_count )} advisory pending" if default_branch_baseline.fetch( :advisory_pending_count ).positive?
+					if default_branch_baseline.fetch( :advisory_failing_count ).positive?
+						names = default_branch_baseline.fetch( :advisory_failing ).map { |e| e.fetch( :name ) }.join( ", " )
+						parts << "#{default_branch_baseline.fetch( :advisory_failing_count )} advisory failing (#{names})"
+					end
+					if default_branch_baseline.fetch( :advisory_pending_count ).positive?
+						names = default_branch_baseline.fetch( :advisory_pending ).map { |e| e.fetch( :name ) }.join( ", " )
+						parts << "#{default_branch_baseline.fetch( :advisory_pending_count )} advisory pending (#{names})"
+					end
 					audit_concise_problems << "Baseline (#{default_branch_baseline.fetch( :default_branch, config.main_branch )}): #{parts.join( ', ' )}."
-				elsif baseline_st == "skipped"
-					audit_concise_problems << "Baseline: skipped (#{default_branch_baseline.fetch( :skip_reason )})."
 				end
 				if config.template_canonical.nil? || config.template_canonical.to_s.empty?
 					puts_verbose ""
 					puts_verbose "[Canonical Templates]"
 					puts_verbose "HINT: canonical templates not configured — run carson setup to enable."
-					audit_concise_problems << "Hint: canonical templates not configured — run carson setup to enable."
 				end
 					write_and_print_pr_monitor_report(
 						report: monitor_report.merge(

data/lib/carson/runtime/local/prune.rb

@@ -305,6 +305,8 @@ module Carson
 			end
 
 			# Guarded force-delete policy for stale branches.
+			# Checks merged PR evidence first (exact SHA match), then falls back to
+			# absorbed-into-main detection (covers rebase merges where commit hashes change).
 			def force_delete_evidence_for_stale_branch( branch:, delete_error_text: )
 				return [ nil, "safe delete failure is not merge-related" ] unless non_merged_delete_error?( error_text: delete_error_text )
 				return [ nil, "gh CLI not available; cannot verify merged PR evidence" ] unless gh_available?
@@ -318,7 +320,21 @@ module Carson
 				branch_tip_sha = tip_sha_text.to_s.strip
 				return [ nil, "unable to read local branch tip sha" ] if branch_tip_sha.empty?
 
-				merged_pr_for_branch( branch: branch, branch_tip_sha: branch_tip_sha )
+				merged_pr, error = merged_pr_for_branch( branch: branch, branch_tip_sha: branch_tip_sha )
+				return [ merged_pr, error ] unless merged_pr.nil?
+
+				# Fallback: branch content is already on main (rebase/cherry-pick merges rewrite SHAs).
+				if branch_absorbed_into_main?( branch: branch )
+					absorbed_evidence = {
+						number: nil,
+						url: "absorbed into #{config.main_branch}",
+						merged_at: Time.now.utc.iso8601,
+						head_sha: branch_tip_sha
+					}
+					return [ absorbed_evidence, nil ]
+				end
+
+				[ nil, error ]
 			end
 
 			# Finds merged PR evidence for the exact local branch tip.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carson
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 2.30.0
 platform: ruby
 authors:
 - Hailei Wang