carson 2.32.0 → 2.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99666417783ceb949cdef39bbf1595465bf0a5f674607229b4b937a4ae8b6197
-  data.tar.gz: a8e55f943e2ab34a26d50b0468e10cecbdbf5879eaeef1a7323e99e80715dac3
+  metadata.gz: 83e70e6824d3de6da2d444aa9d0b2859f3710e357f87cdcf65cecc512ff63fee
+  data.tar.gz: 6c09bd64199ab8ee6f7fa14722b670a123c7cb051ea2937c1e2bbfddb696fded
 SHA512:
-  metadata.gz: 2342dcf7bde01d3632741e76adaefe6c499a03a36d11bda476870419e43f87caa51ae9837fc5f1cdbbc9b5c083b4b2058824fc5c0f346788ca7f2658aecbe2ab
-  data.tar.gz: f0f8fe556fa65044b3789a45cd25d1fc354e2865a5b923843bf3249a30259bac989eb74f0cb5bb1ff2072c4dc548911ca5f5d26d13da933baceb70161a527993
+  metadata.gz: 3a6570b397a73c27aab1d33e044bd28f56d1f643e57e76b40d3bbd5cdd1ff5da2779467980c9f595c6a25cbe2524cf5ff6508050a2736677ebb94079434eb749
+  data.tar.gz: 33d29172314ab043a5a38122b91fac3c150b3d846ef113cff953fefec5f56f8c35af1290a48ef951fe1154de4caf749cd779daf98c09c939518c0e64f7a72ecd

data/RELEASE.md

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

data/VERSION

@@ -1 +1 @@
-2.32.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

@@ -126,25 +126,19 @@ 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.
+			# 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
-				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 ]
+				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
-				puts_verbose "worktree_removed_for_prune: #{wt_path} (branch=#{branch})"
 
-				git_run( "branch", "-D", branch )
+				[ stdout, stderr, false ]
 			end
 
 			def worktree_blocked_error?( error_text: )

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.32.0
+  version: 2.33.0
 platform: ruby
 authors:
 - Hailei Wang