carson 3.10.4 → 3.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15dca7c329b421bc534d0ea857d38af70bfe89bad5eb2ec40be9bbe09015e37f
-  data.tar.gz: a2a997bf5f9be278a33034155fffa61caa1c28e78c24fa3d8af85e43f72241c0
+  metadata.gz: 29198792c7eb5bb9c02c43fc31d6a2ba04fc1430684e978cc365c2e74b47f810
+  data.tar.gz: b0e164e172315cc707017a9c82e83328fdb1e84a5e4f983aa5aeabc9caae1b04
 SHA512:
-  metadata.gz: 8e7f231146222978f1f880a08e16ce99bb75ae3c69899f20d23413bd88b712edc0cc8a21b3b1515437496ef625e079318a62f435dd4634490cafa3ac034c09b9
-  data.tar.gz: 2e3ec460ec390a021b48e132597899e5c6d7df5f3d1e667aa29572f0b45de673a076410bf81a6b768b6dd06fb60adec5672278e4cbbd695a5d598688afaecbb2
+  metadata.gz: 45361da34684eaf4d399f7d40eba060a63f3c364f41ed890ac448f6ffeeb4d886961f451ce393adec495240ffc5bff5bc95399b59d7afd08aaba0eadf0579fde
+  data.tar.gz: b827c09fcf9cef558f237471abd328906ecda337f2bdef04a7991ee2547b2a31437840eb651d04e1ca659c1d55b891e84890cf57b857247240fd3a5ecd81f71c

data/RELEASE.md

@@ -5,17 +5,16 @@ 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`.
 
-## 3.10.4
+## 3.10.5
 
 ### What changed
 
-- **Worktree remove guards unpushed commits** — `carson worktree remove` now checks for unpushed commits before deleting a worktree. Blocks with recovery guidance (push command or `--force` to override). Prevents accidental destruction of work that exists only locally.
-- **Shared unpushed-commits check** — extracted `check_unpushed_commits` method used by both `worktree done` and `worktree remove`, eliminating code duplication.
-- **Fix resolve path from inside worktrees** — `resolve_worktree_path` now uses `main_worktree_root` instead of `repo_root` for bare-name resolution. Previously, calling `carson worktree remove <name>` from inside a worktree would look in the wrong directory.
+- **CWD guard for prune** — `carson prune` now proactively detects when the process CWD is inside a worktree and skips that worktree's branch in all prune paths (stale, orphan, absorbed). Previously, prune relied on git's own refusal to delete a branch checked out in a worktree — accidental protection, not principled safety. The new guard matches the same CWD-awareness that `worktree remove` already has.
+- **`cwd_worktree_branch` helper** — new method that finds the branch checked out in the worktree containing the process CWD. Uses longest-path matching because worktree directories live inside the main repo tree (`.claude/worktrees/`).
 
 ### Migration
 
-- No breaking changes. `--force` overrides the new unpushed-commits guard.
+- No breaking changes. New safety guard — previously git-protected operations now fail earlier with clearer diagnostics.
 
 ## 3.10.3
 

data/VERSION

@@ -1 +1 @@
-3.10.4
+3.10.5

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

@@ -20,16 +20,17 @@ module Carson
 
 				prune_git!( "fetch", config.git_remote, "--prune", json_output: json_output )
 				active_branch = current_branch
+				cwd_branch = cwd_worktree_branch
 				counters = { deleted: 0, skipped: 0 }
 				branches = []
 
 				stale_branches = stale_local_branches
-				prune_stale_branch_entries( stale_branches: stale_branches, active_branch: active_branch, counters: counters, branches: branches )
+				prune_stale_branch_entries( stale_branches: stale_branches, active_branch: active_branch, cwd_branch: cwd_branch, counters: counters, branches: branches )
 
-				orphan_branches = orphan_local_branches( active_branch: active_branch )
+				orphan_branches = orphan_local_branches( active_branch: active_branch, cwd_branch: cwd_branch )
 				prune_orphan_branch_entries( orphan_branches: orphan_branches, counters: counters, branches: branches )
 
-				absorbed_branches = absorbed_local_branches( active_branch: active_branch )
+				absorbed_branches = absorbed_local_branches( active_branch: active_branch, cwd_branch: cwd_branch )
 				prune_absorbed_branch_entries( absorbed_branches: absorbed_branches, counters: counters, branches: branches )
 
 				prune_finish(
@@ -90,27 +91,28 @@ module Carson
 				end
 			end
 
-			def prune_stale_branch_entries( stale_branches:, active_branch:, counters: { deleted: 0, skipped: 0 }, branches: [] )
+			def prune_stale_branch_entries( stale_branches:, active_branch:, cwd_branch: nil, counters: { deleted: 0, skipped: 0 }, branches: [] )
 				stale_branches.each do |entry|
-					result = prune_stale_branch_entry( entry: entry, active_branch: active_branch )
+					result = prune_stale_branch_entry( entry: entry, active_branch: active_branch, cwd_branch: cwd_branch )
 					counters[ result.fetch( :action ) ] += 1
 					branches << result
 				end
 				counters
 			end
 
-			def prune_stale_branch_entry( entry:, active_branch: )
+			def prune_stale_branch_entry( entry:, active_branch:, cwd_branch: nil )
 				branch = entry.fetch( :branch )
 				upstream = entry.fetch( :upstream )
 				return prune_skip_stale_branch( type: :protected, branch: branch, upstream: upstream ) if config.protected_branches.include?( branch )
 				return prune_skip_stale_branch( type: :current, branch: branch, upstream: upstream ) if branch == active_branch
+				return prune_skip_stale_branch( type: :cwd_worktree, branch: branch, upstream: upstream ) if cwd_branch && branch == cwd_branch
 
 				prune_delete_stale_branch( branch: branch, upstream: upstream )
 			end
 
 			def prune_skip_stale_branch( type:, branch:, upstream: )
-				reason = type == :protected ? "protected branch" : "current branch"
-				status = type == :protected ? "skip_protected_branch" : "skip_current_branch"
+				reason = { protected: "protected branch", current: "current branch", cwd_worktree: "checked out in CWD worktree" }.fetch( type, type.to_s )
+				status = { protected: "skip_protected_branch", current: "skip_current_branch", cwd_worktree: "skip_cwd_worktree_branch" }.fetch( type, "skip_#{type}" )
 				puts_verbose "#{status}: #{branch} (upstream=#{upstream})"
 				{ action: :skipped, branch: branch, upstream: upstream, type: "stale", reason: reason }
 			end
@@ -208,7 +210,7 @@ module Carson
 			end
 
 			# Detects local branches with no upstream tracking ref — candidates for orphan pruning.
-			def orphan_local_branches( active_branch: )
+			def orphan_local_branches( active_branch:, cwd_branch: nil )
 				git_capture!( "for-each-ref", "--format=%(refname:short)\t%(upstream:short)", "refs/heads" ).lines.filter_map do |line|
 					branch, upstream = line.strip.split( "\t", 2 )
 					branch = branch.to_s.strip
@@ -217,6 +219,7 @@ module Carson
 					next unless upstream.empty?
 					next if config.protected_branches.include?( branch )
 					next if branch == active_branch
+					next if cwd_branch && branch == cwd_branch
 					next if branch == TEMPLATE_SYNC_BRANCH
 
 					branch
@@ -226,7 +229,7 @@ module Carson
 			# Detects local branches whose upstream still exists but whose content is already on main.
 			# Two-step evidence: (1) find the merge-base, (2) verify every file the branch changed
 			# relative to the merge-base has identical content on main.
-			def absorbed_local_branches( active_branch: )
+			def absorbed_local_branches( active_branch:, cwd_branch: nil )
 				git_capture!( "for-each-ref", "--format=%(refname:short)\t%(upstream:short)\t%(upstream:track)", "refs/heads" ).lines.filter_map do |line|
 					branch, upstream, track = line.strip.split( "\t", 3 )
 					branch = branch.to_s.strip
@@ -237,6 +240,7 @@ module Carson
 					next if track.include?( "gone" )
 					next if config.protected_branches.include?( branch )
 					next if branch == active_branch
+					next if cwd_branch && branch == cwd_branch
 					next if branch == TEMPLATE_SYNC_BRANCH
 
 					next unless branch_absorbed_into_main?( branch: branch )

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

@@ -299,6 +299,28 @@ module Carson
 				nil
 			end
 
+			# Returns the branch checked out in the worktree that contains the process CWD,
+			# or nil if CWD is not inside any worktree. Used by prune to proactively
+			# protect the CWD worktree's branch from deletion.
+			# Matches the longest (most specific) path because worktree directories
+			# live under the main repo tree (.claude/worktrees/).
+			def cwd_worktree_branch
+				cwd = realpath_safe( Dir.pwd )
+				best_branch = nil
+				best_length = -1
+				worktree_list.each do |wt|
+					wt_path = wt.fetch( :path )
+					normalised = File.join( wt_path, "" )
+					if ( cwd == wt_path || cwd.start_with?( normalised ) ) && wt_path.length > best_length
+						best_branch = wt.fetch( :branch, nil )
+						best_length = wt_path.length
+					end
+				end
+				best_branch
+			rescue StandardError
+				nil
+			end
+
 			# Returns the main (non-worktree) repository root.
 			# Uses git-common-dir to find the shared .git directory, then takes its parent.
 			# Falls back to repo_root if detection fails.

metadata

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