carson 2.31.0 → 2.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96820bedb9187d90787072b441c35129457a7d45202899ea520a9bb1e3b50876
-  data.tar.gz: f8963204bde45cee5e7e662dcc5f5bb947e84372f0d24a03d6ef494c3653adbf
+  metadata.gz: 83e70e6824d3de6da2d444aa9d0b2859f3710e357f87cdcf65cecc512ff63fee
+  data.tar.gz: 6c09bd64199ab8ee6f7fa14722b670a123c7cb051ea2937c1e2bbfddb696fded
 SHA512:
-  metadata.gz: 616dbf56c4c09e6327767ccaaa8b88595a51ae4e8275290d1b6f1349fb6b2e25cb3789e4891699b3e6b8ff878d209bf4503adcc4974506b1a72ddcee374e432d
-  data.tar.gz: 83b8827df9139e9a81fa587a00816333d37fc87d03a3f7f0388bbd3fb8722138978b7b99844ccbfa6713243a651c4886774f88400c226c060398f1824b64e7ba
+  metadata.gz: 3a6570b397a73c27aab1d33e044bd28f56d1f643e57e76b40d3bbd5cdd1ff5da2779467980c9f595c6a25cbe2524cf5ff6508050a2736677ebb94079434eb749
+  data.tar.gz: 33d29172314ab043a5a38122b91fac3c150b3d846ef113cff953fefec5f56f8c35af1290a48ef951fe1154de4caf749cd779daf98c09c939518c0e64f7a72ecd

data/RELEASE.md

@@ -5,6 +5,32 @@ 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.33.0 — Safe Worktree Remove
+
+### What changed
+
+- **`carson worktree remove` no longer force-removes by default.** If the worktree has uncommitted or untracked changes, Carson refuses with a clear message instead of silently discarding work. Pass `--force` to override when you intentionally want to discard changes.
+- **Template sync cleanup is safer.** Carson's internal template propagation tries safe worktree removal first, falling back to `--force` only for its own ephemeral sync worktree.
+
+### UX
+
+- Dirty worktree removal now shows the worktree name and actionable guidance: "Commit or discard changes first, or use --force to override."
+
+### Migration
+
+- No action required. Existing `carson worktree remove` calls without `--force` will now refuse on dirty worktrees instead of silently destroying uncommitted work.
+
+## 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.33.0

data/lib/carson/cli.rb

@@ -175,12 +175,13 @@ module Carson
 
 			case action
 			when "remove"
+				force = argv.delete( "--force" ) ? true : false
 				worktree_path = argv.shift
 				if worktree_path.to_s.strip.empty?
 					err.puts "#{BADGE} Missing path for worktree remove. Use: carson worktree remove <name-or-path>"
 					return { command: :invalid }
 				end
-				{ command: "worktree:remove", worktree_path: worktree_path }
+				{ command: "worktree:remove", worktree_path: worktree_path, force: force }
 			else
 				err.puts "#{BADGE} Unknown worktree subcommand: #{action}. Use: carson worktree remove <name-or-path>"
 				{ command: :invalid }
@@ -276,7 +277,7 @@ module Carson
 			when "prune:all"
 				runtime.prune_all!
 			when "worktree:remove"
-				runtime.worktree_remove!( worktree_path: parsed.fetch( :worktree_path ) )
+				runtime.worktree_remove!( worktree_path: parsed.fetch( :worktree_path ), force: parsed.fetch( :force, false ) )
 			when "onboard"
 				runtime.onboard!
 			when "refresh"

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,31 @@ module Carson
 				text.empty? ? "unknown error" : text
 			end
 
+			# Attempts git branch -D. If blocked by a worktree, skips with a diagnostic —
+			# prune never removes worktrees because another session may own them.
+			def force_delete_local_branch( branch: )
+				stdout, stderr, success, = git_run( "branch", "-D", branch )
+				return [ stdout, stderr, success ] if success
+
+				if worktree_blocked_error?( error_text: stderr )
+					wt_path = worktree_path_for_branch( branch: branch )
+					hint = wt_path ? "run: carson worktree remove #{File.basename( wt_path )}" : "remove the worktree first"
+					puts_verbose "skip_worktree_blocked: #{branch} (#{hint})"
+				end
+
+				[ stdout, stderr, false ]
+			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 +247,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 +316,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 )}"

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

@@ -244,7 +244,9 @@ module Carson
 			end
 
 			def template_propagate_cleanup!( worktree_dir: )
-				git_run( "worktree", "remove", "--force", worktree_dir )
+				# Try safe removal first; fall back to force only for Carson's own sync worktree.
+				_, _, safe_success, = git_run( "worktree", "remove", worktree_dir )
+				git_run( "worktree", "remove", "--force", worktree_dir ) unless safe_success
 				git_run( "branch", "-D", TEMPLATE_SYNC_BRANCH )
 				puts_verbose "template_propagate: worktree and local branch cleaned up"
 			rescue StandardError => e

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

@@ -3,7 +3,9 @@ module Carson
 		module Local
 			# Safe worktree lifecycle management for coding agents.
 			# Enforces the teardown order: exit worktree → git worktree remove → branch cleanup.
-			def worktree_remove!( worktree_path: )
+			# Never forces removal — if the worktree has uncommitted changes, refuses unless
+			# the user explicitly passes force: true via CLI --force flag.
+			def worktree_remove!( worktree_path:, force: false )
 				fingerprint_status = block_if_outsider_fingerprints!
 				return fingerprint_status unless fingerprint_status.nil?
 
@@ -17,14 +19,23 @@ module Carson
 				end
 
 				branch = worktree_branch( path: resolved_path )
-				puts_verbose "worktree_remove: path=#{resolved_path} branch=#{branch}"
+				puts_verbose "worktree_remove: path=#{resolved_path} branch=#{branch} force=#{force}"
 
 				# Step 1: remove the worktree (directory + git registration).
-				rm_stdout, rm_stderr, rm_success, = git_run( "worktree", "remove", "--force", resolved_path )
+				# Try safe removal first. Only use --force if the user explicitly requested it.
+				rm_args = [ "worktree", "remove" ]
+				rm_args << "--force" if force
+				rm_args << resolved_path
+				rm_stdout, rm_stderr, rm_success, = git_run( *rm_args )
 				unless rm_success
 					error_text = rm_stderr.to_s.strip
 					error_text = "unable to remove worktree" if error_text.empty?
-					puts_line "ERROR: #{error_text}"
+					if !force && ( error_text.downcase.include?( "untracked" ) || error_text.downcase.include?( "modified" ) )
+						puts_line "Worktree has uncommitted changes: #{File.basename( resolved_path )}"
+						puts_line "  Commit or discard changes first, or use --force to override."
+					else
+						puts_line "ERROR: #{error_text}"
+					end
 					return EXIT_ERROR
 				end
 				puts_verbose "worktree_removed: #{resolved_path}"

metadata

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