carson 2.31.0 → 2.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96820bedb9187d90787072b441c35129457a7d45202899ea520a9bb1e3b50876
-  data.tar.gz: f8963204bde45cee5e7e662dcc5f5bb947e84372f0d24a03d6ef494c3653adbf
+  metadata.gz: 99666417783ceb949cdef39bbf1595465bf0a5f674607229b4b937a4ae8b6197
+  data.tar.gz: a8e55f943e2ab34a26d50b0468e10cecbdbf5879eaeef1a7323e99e80715dac3
 SHA512:
-  metadata.gz: 616dbf56c4c09e6327767ccaaa8b88595a51ae4e8275290d1b6f1349fb6b2e25cb3789e4891699b3e6b8ff878d209bf4503adcc4974506b1a72ddcee374e432d
-  data.tar.gz: 83b8827df9139e9a81fa587a00816333d37fc87d03a3f7f0388bbd3fb8722138978b7b99844ccbfa6713243a651c4886774f88400c226c060398f1824b64e7ba
+  metadata.gz: 2342dcf7bde01d3632741e76adaefe6c499a03a36d11bda476870419e43f87caa51ae9837fc5f1cdbbc9b5c083b4b2058824fc5c0f346788ca7f2658aecbe2ab
+  data.tar.gz: f0f8fe556fa65044b3789a45cd25d1fc354e2865a5b923843bf3249a30259bac989eb74f0cb5bb1ff2072c4dc548911ca5f5d26d13da933baceb70161a527993

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.32.0 — Worktree-Aware Pruning
+
+### What changed
+
+- **Prune now clears worktrees that block branch deletion.** When a branch is checked out in a worktree, `carson prune` safely removes the worktree first (refuses if uncommitted changes exist), then deletes the branch. Previously, these branches were silently skipped.
+- **Honest skip reporting.** Non-verbose output no longer says "No stale branches" when branches were detected but couldn't be pruned. Shows "Skipped N branch(es)" or "Pruned N, skipped M" as appropriate, with a `--verbose` hint.
+
+### Migration
+
+- No action required. Existing prune behaviour is strictly improved.
+
 ## 2.31.0 — Worktree Lifecycle + Prune --all
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-2.31.0
+2.32.0

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

@@ -25,11 +25,15 @@ module Carson
 				puts_verbose "prune_summary: deleted=#{counters.fetch( :deleted )} skipped=#{counters.fetch( :skipped )}"
 				unless verbose?
 					deleted_count = counters.fetch( :deleted )
-					if deleted_count.zero?
-						puts_line "No stale branches."
+					skipped_count = counters.fetch( :skipped )
+					message = if deleted_count > 0 && skipped_count > 0
+						"Pruned #{deleted_count}, skipped #{skipped_count} (--verbose for details)."
+					elsif deleted_count > 0
+						"Pruned #{deleted_count} stale branch#{plural_suffix( count: deleted_count )}."
 					else
-						puts_line "Pruned #{deleted_count} stale branch#{plural_suffix( count: deleted_count )}."
+						"Skipped #{skipped_count} branch#{plural_suffix( count: skipped_count )} (--verbose for details)."
 					end
+					puts_line message
 				end
 				EXIT_OK
 			end
@@ -93,7 +97,7 @@ module Carson
 				)
 				return prune_force_delete_skipped( branch: branch, upstream: upstream, delete_error_text: delete_error_text, force_error: force_error ) if merged_pr.nil?
 
-				force_stdout, force_stderr, force_success, = git_run( "branch", "-D", branch )
+				force_stdout, force_stderr, force_success = force_delete_local_branch( branch: branch )
 				return prune_force_delete_success( branch: branch, upstream: upstream, merged_pr: merged_pr, force_stdout: force_stdout ) if force_success
 
 				prune_force_delete_failed( branch: branch, upstream: upstream, force_stderr: force_stderr )
@@ -122,6 +126,37 @@ module Carson
 				text.empty? ? "unknown error" : text
 			end
 
+			# Attempts git branch -D. If blocked by a worktree, safely removes the worktree
+			# first (no --force — refuses if worktree has uncommitted changes) and retries.
+			def force_delete_local_branch( branch: )
+				stdout, stderr, success, = git_run( "branch", "-D", branch )
+				return [ stdout, stderr, success ] if success
+				return [ stdout, stderr, false ] unless worktree_blocked_error?( error_text: stderr )
+
+				wt_path = worktree_path_for_branch( branch: branch )
+				return [ stdout, stderr, false ] if wt_path.nil?
+
+				rm_stdout, rm_stderr, rm_success, = git_run( "worktree", "remove", wt_path )
+				unless rm_success
+					error_text = rm_stderr.to_s.strip
+					puts_verbose "skip_worktree_remove: #{wt_path} (branch=#{branch}) reason=#{error_text}"
+					return [ stdout, stderr, false ]
+				end
+				puts_verbose "worktree_removed_for_prune: #{wt_path} (branch=#{branch})"
+
+				git_run( "branch", "-D", branch )
+			end
+
+			def worktree_blocked_error?( error_text: )
+				error_text.to_s.downcase.include?( "used by worktree" )
+			end
+
+			# Returns the worktree path for a branch, or nil if not checked out in any worktree.
+			def worktree_path_for_branch( branch: )
+				entry = worktree_list.find { |wt| wt.fetch( :branch, nil ) == branch }
+				entry&.fetch( :path, nil )
+			end
+
 			# Detects local branches whose upstream tracking is marked [gone] after fetch --prune.
 			def stale_local_branches
 				git_capture!( "for-each-ref", "--format=%(refname:short)\t%(upstream:short)\t%(upstream:track)", "refs/heads" ).lines.map do |line|
@@ -218,7 +253,7 @@ module Carson
 					return :skipped
 				end
 
-				force_stdout, force_stderr, force_success, = git_run( "branch", "-D", branch )
+				force_stdout, force_stderr, force_success = force_delete_local_branch( branch: branch )
 				unless force_success
 					error_text = normalise_branch_delete_error( error_text: force_stderr )
 					puts_verbose "fail_delete_absorbed_branch: #{branch} reason=#{error_text}"
@@ -287,7 +322,7 @@ module Carson
 					return :skipped
 				end
 
-				force_stdout, force_stderr, force_success, = git_run( "branch", "-D", branch )
+				force_stdout, force_stderr, force_success = force_delete_local_branch( branch: branch )
 				if force_success
 					out.print force_stdout if verbose? && !force_stdout.empty?
 					puts_verbose "deleted_orphan_branch: #{branch} merged_pr=#{merged_pr.fetch( :url )}"

metadata

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