carson 2.29.0 → 2.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4db94cc8153a2add26aa8e34ee4d1232d2211bf0ecc81ed0a806b1b5608b0550
-  data.tar.gz: da51fe2ad074433bd52d83c22c06ed95187ac96745ffe66152a2f01120fdd8ad
+  metadata.gz: 374e4a7af2ec608b1c3c9d07ca4a5ad8b028715434c1f02fb4b4034a71b153d2
+  data.tar.gz: a795fabcecbe2b43d03f155b0d4b730f804d0879ef4a1fe280cc4e082350c76f
 SHA512:
-  metadata.gz: 6a1aeea9070859c0781734ed69e7c984054f40dc6c3572b063614c81b10ed75c933989e99c65de749a7d5bcbe0b16e65702020d30fb69d3d8c8d8d9ecbcbab3a
-  data.tar.gz: e2e54a61d3e4d8acf3267f192482d0cc0358b1476f06037933e298a3150282a5c112c7de2ab14c057c930dfe20e05416eececc53824ee54f96872eafdbeead39
+  metadata.gz: 83b920da278fa2e457c424babaf3b06955a2317f920b5ad3681ae4da8a90fc5d5c3969d7160796b0febc49669a7cf7995c8f83ba674ce7f0865ca72eb6a48cbf
+  data.tar.gz: 8506fe647fe4538a27dd0ef25e0ecbeb1d9c0b78c8251d45b6023e562091cd6c861ef660707684b4e3d202a69728b0779a8a623ceb79313efc7e86eb0b482b17

data/RELEASE.md

@@ -5,6 +5,17 @@ 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

data/VERSION

@@ -1 +1 @@
-2.29.0
+2.30.0

data/lib/carson/runtime/audit.rb

@@ -102,7 +102,6 @@ module Carson
 					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.29.0
+  version: 2.30.0
 platform: ruby
 authors:
 - Hailei Wang