carson 3.10.5 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29198792c7eb5bb9c02c43fc31d6a2ba04fc1430684e978cc365c2e74b47f810
-  data.tar.gz: b0e164e172315cc707017a9c82e83328fdb1e84a5e4f983aa5aeabc9caae1b04
+  metadata.gz: 0d6a7526cb4973b9f911b8fd28d151ca719cbb53be7d42beb29e676d0d9354f4
+  data.tar.gz: 4b116460df0e2e9397edf0f60432abb907d7b81f1e28a4d7e8bceda47e030db7
 SHA512:
-  metadata.gz: 45361da34684eaf4d399f7d40eba060a63f3c364f41ed890ac448f6ffeeb4d886961f451ce393adec495240ffc5bff5bc95399b59d7afd08aaba0eadf0579fde
-  data.tar.gz: b827c09fcf9cef558f237471abd328906ecda337f2bdef04a7991ee2547b2a31437840eb651d04e1ca659c1d55b891e84890cf57b857247240fd3a5ecd81f71c
+  metadata.gz: 807185f0bbeb5c2762b89c8a59aed681006a1589a66024f2cf546972416bde79ad858be69cceb685a6b762a8594d95efa41607323f1d5469f3d70709b64a57f1
+  data.tar.gz: 7d7c6a06a7bf4b75428a57afa891f04dadf1ca402ac35cfee2d968658963e180b8b2ed27a1aa2a8c78c057456d319977ddfce6d022f945281081c9d7b936a7ff

data/RELEASE.md

@@ -5,6 +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.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
@@ -16,6 +26,18 @@ Release-note scope rule:
 
 - 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 `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
+
+- No breaking changes. `--force` overrides the new unpushed-commits guard.
+
 ## 3.10.3
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-3.10.5
+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/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 ]}"

metadata

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