carson 3.10.4 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15dca7c329b421bc534d0ea857d38af70bfe89bad5eb2ec40be9bbe09015e37f
-  data.tar.gz: a2a997bf5f9be278a33034155fffa61caa1c28e78c24fa3d8af85e43f72241c0
+  metadata.gz: 0d6a7526cb4973b9f911b8fd28d151ca719cbb53be7d42beb29e676d0d9354f4
+  data.tar.gz: 4b116460df0e2e9397edf0f60432abb907d7b81f1e28a4d7e8bceda47e030db7
 SHA512:
-  metadata.gz: 8e7f231146222978f1f880a08e16ce99bb75ae3c69899f20d23413bd88b712edc0cc8a21b3b1515437496ef625e079318a62f435dd4634490cafa3ac034c09b9
-  data.tar.gz: 2e3ec460ec390a021b48e132597899e5c6d7df5f3d1e667aa29572f0b45de673a076410bf81a6b768b6dd06fb60adec5672278e4cbbd695a5d598688afaecbb2
+  metadata.gz: 807185f0bbeb5c2762b89c8a59aed681006a1589a66024f2cf546972416bde79ad858be69cceb685a6b762a8594d95efa41607323f1d5469f3d70709b64a57f1
+  data.tar.gz: 7d7c6a06a7bf4b75428a57afa891f04dadf1ca402ac35cfee2d968658963e180b8b2ed27a1aa2a8c78c057456d319977ddfce6d022f945281081c9d7b936a7ff

data/RELEASE.md

@@ -5,12 +5,33 @@ 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.11.0
+
+### What changed
+
+- **Drop `worktree done`** — removed the `worktree done` subcommand entirely. `worktree remove` now handles everything: CWD safety guard, unpushed-commits guard, session state cleanup, branch and remote deletion. Two operations (create, remove) instead of three. Simpler, safer, less to remember.
+
+### Breaking changes
+
+- `carson worktree done <name>` no longer exists. Use `carson worktree remove <name>` instead. Add `--force` to override safety guards.
+
+## 3.10.5
+
+### What changed
+
+- **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. New safety guard — previously git-protected operations now fail earlier with clearer diagnostics.
+
 ## 3.10.4
 
 ### 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.
+- **Shared unpushed-commits check** — extracted `check_unpushed_commits` method used by `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.
 
 ### Migration

data/VERSION

@@ -1 +1 @@
-3.10.4
+3.11.0

data/lib/carson/cli.rb

@@ -53,7 +53,7 @@ module Carson
 
 		def self.build_parser
 			OptionParser.new do |opts|
-				opts.banner = "Usage: carson [status [--json]|setup|audit [--json]|sync [--json]|deliver [--merge] [--json] [--title T] [--body-file F]|prune [--all] [--json]|worktree [--json] create|done|remove <name>|onboard|refresh [--all]|offboard|template check|apply|review gate|sweep|govern [--dry-run] [--json] [--loop SECONDS]|session [--json] [--task T]|session clear [--json]|version]"
+				opts.banner = "Usage: carson [status [--json]|setup|audit [--json]|sync [--json]|deliver [--merge] [--json] [--title T] [--body-file F]|prune [--all] [--json]|worktree [--json] create|remove <name>|onboard|refresh [--all]|offboard|template check|apply|review gate|sweep|govern [--dry-run] [--json] [--loop SECONDS]|session [--json] [--task T]|session clear [--json]|version]"
 			end
 		end
 
@@ -180,7 +180,7 @@ module Carson
 			json_flag = argv.delete( "--json" ) ? true : false
 			action = argv.shift
 			if action.to_s.strip.empty?
-				err.puts "#{BADGE} Missing subcommand for worktree. Use: carson worktree create|done|remove <name>"
+				err.puts "#{BADGE} Missing subcommand for worktree. Use: carson worktree create|remove <name>"
 				err.puts parser
 				return { command: :invalid }
 			end
@@ -193,9 +193,6 @@ module Carson
 					return { command: :invalid }
 				end
 				{ command: "worktree:create", worktree_name: name, json: json_flag }
-			when "done"
-				name = argv.shift
-				{ command: "worktree:done", worktree_name: name, json: json_flag }
 			when "remove"
 				force = argv.delete( "--force" ) ? true : false
 				worktree_path = argv.shift
@@ -205,7 +202,7 @@ module Carson
 				end
 				{ command: "worktree:remove", worktree_path: worktree_path, force: force, json: json_flag }
 			else
-				err.puts "#{BADGE} Unknown worktree subcommand: #{action}. Use: carson worktree create|done|remove <name>"
+				err.puts "#{BADGE} Unknown worktree subcommand: #{action}. Use: carson worktree create|remove <name>"
 				{ command: :invalid }
 			end
 		end
@@ -379,8 +376,6 @@ module Carson
 				runtime.prune_all!
 			when "worktree:create"
 				runtime.worktree_create!( name: parsed.fetch( :worktree_name ), json_output: parsed.fetch( :json, false ) )
-			when "worktree:done"
-				runtime.worktree_done!( name: parsed.fetch( :worktree_name, nil ), json_output: parsed.fetch( :json, false ) )
 			when "worktree:remove"
 				runtime.worktree_remove!( worktree_path: parsed.fetch( :worktree_path ), force: parsed.fetch( :force, false ), json_output: parsed.fetch( :json, false ) )
 			when "onboard"

data/lib/carson/runtime/deliver.rb

@@ -78,7 +78,7 @@ module Carson
 
 				result[ :merged ] = true
 
-				# Step 6: mark worktree done in session state.
+				# Step 6: clear worktree from session state.
 				update_session( worktree: :clear )
 
 				# Step 7: sync main in the main worktree.

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

@@ -1,6 +1,6 @@
 # Safe worktree lifecycle management for coding agents.
-# Three operations: create, done (mark completed), remove (full cleanup).
-# Remove guards against unpushed commits and CWD-inside-worktree — safe by default.
+# Two operations: create and remove. Remove is safe by default — guards against
+# CWD-inside-worktree and unpushed commits. Use --force to override.
 # Supports --json for machine-readable structured output with recovery commands.
 module Carson
 	class Runtime
@@ -50,62 +50,6 @@ module Carson
 				)
 			end
 
-			# Marks a worktree as completed without deleting it.
-			# Verifies all changes are committed. Deferred deletion — cleanup happens later.
-			def worktree_done!( name: nil, json_output: false )
-				if name.to_s.strip.empty?
-					return worktree_finish(
-						result: { command: "worktree done", status: "error",
-							error: "missing worktree name",
-							recovery: "carson worktree done <name>" },
-						exit_code: EXIT_ERROR, json_output: json_output
-					)
-				end
-
-				resolved_path = resolve_worktree_path( worktree_path: name )
-
-				unless worktree_registered?( path: resolved_path )
-					return worktree_finish(
-						result: { command: "worktree done", status: "error", name: name,
-							error: "#{name} is not a registered worktree",
-							recovery: "git worktree list" },
-						exit_code: EXIT_ERROR, json_output: json_output
-					)
-				end
-
-				# Check for uncommitted changes in the worktree.
-				wt_status, _, status_result, = Open3.capture3( "git", "status", "--porcelain", chdir: resolved_path )
-				if status_result.success? && !wt_status.strip.empty?
-					return worktree_finish(
-						result: { command: "worktree done", status: "block", name: name,
-							error: "worktree has uncommitted changes",
-							recovery: "git -C #{resolved_path} add -A && git -C #{resolved_path} commit, then carson worktree done #{name}" },
-						exit_code: EXIT_BLOCK, json_output: json_output
-					)
-				end
-
-				# Check for unpushed commits using shared guard.
-				branch = worktree_branch( path: resolved_path )
-				unpushed = check_unpushed_commits( branch: branch, worktree_path: resolved_path )
-				if unpushed
-					return worktree_finish(
-						result: { command: "worktree done", status: "block", name: name, branch: branch,
-							error: unpushed[ :error ],
-							recovery: unpushed[ :recovery ] },
-						exit_code: EXIT_BLOCK, json_output: json_output
-					)
-				end
-
-				# Clear worktree from session state.
-				update_session( worktree: :clear )
-
-				worktree_finish(
-					result: { command: "worktree done", status: "ok", name: name, branch: branch || "(detached)",
-						next_step: "carson worktree remove #{name}" },
-					exit_code: EXIT_OK, json_output: json_output
-				)
-			end
-
 			# Removes a worktree: directory, git registration, and branch.
 			# Never forces removal — if the worktree has uncommitted changes, refuses unless
 			# the user explicitly passes force: true via CLI --force flag.
@@ -211,6 +155,9 @@ module Carson
 					end
 				end
 
+				# Clear worktree from session state.
+				update_session( worktree: :clear )
+
 				worktree_finish(
 					result: { command: "worktree remove", status: "ok", name: File.basename( resolved_path ),
 						branch: branch, branch_deleted: branch_deleted, remote_deleted: remote_deleted },
@@ -245,10 +192,6 @@ module Carson
 						puts_line "Worktree created: #{result[ :name ]}"
 						puts_line "  Path: #{result[ :path ]}"
 						puts_line "  Branch: #{result[ :branch ]}"
-					when "worktree done"
-						puts_line "Worktree done: #{result[ :name ]}"
-						puts_line "  Branch: #{result[ :branch ]}"
-						puts_line "  Cleanup later with `#{result[ :next_step ]}` or `carson housekeep`."
 					when "worktree remove"
 						unless verbose?
 							puts_line "Worktree removed: #{result[ :name ]}"
@@ -299,6 +242,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.11.0
 platform: ruby
 authors:
 - Hailei Wang