carson 3.10.2 → 3.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2734c0dc1bc4bdea4f81fe024fce1f92aa303d47eec26c7c9ef5370260a83ef
-  data.tar.gz: 7f16d9206694d8f448817dc7b9b5e034354ac222f082774b281b8f8a2ac9a482
+  metadata.gz: 15dca7c329b421bc534d0ea857d38af70bfe89bad5eb2ec40be9bbe09015e37f
+  data.tar.gz: a2a997bf5f9be278a33034155fffa61caa1c28e78c24fa3d8af85e43f72241c0
 SHA512:
-  metadata.gz: 3a498a739c2b113e41fa9980a89e5de218520bb3f53b4521d1bc7a706f7a5890a193b6650b724b0671f8b1ec66d4865a94ea2f64ac24328034ffb9b07cefd7df
-  data.tar.gz: f7db7bc6d8e00580aecd53f7d0e3e35d511a2d39df5a84cff90a98d60ccfed2efa731f5902ee9f362d3afe4b4b4e78e8ae44b6c6b31f2ff545903611e9836e85
+  metadata.gz: 8e7f231146222978f1f880a08e16ce99bb75ae3c69899f20d23413bd88b712edc0cc8a21b3b1515437496ef625e079318a62f435dd4634490cafa3ac034c09b9
+  data.tar.gz: 2e3ec460ec390a021b48e132597899e5c6d7df5f3d1e667aa29572f0b45de673a076410bf81a6b768b6dd06fb60adec5672278e4cbbd695a5d598688afaecbb2

data/RELEASE.md

@@ -5,6 +5,28 @@ 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
+
+### 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.
+
+### Migration
+
+- No breaking changes. `--force` overrides the new unpushed-commits guard.
+
+## 3.10.3
+
+### What changed
+
+- **Drop `--delete-branch` from PR merge** — `carson deliver --merge` and `carson govern` no longer pass `--delete-branch` to `gh pr merge`. The flag causes `gh` to attempt switching the local checkout to `main` after deleting the branch, which always fails inside a worktree where `main` is already checked out in the main working tree. Branch cleanup is deferred to `carson prune`, which already handles this correctly.
+
+### Migration
+
+- No breaking changes. Merge behaviour is unchanged; only the post-merge local branch deletion attempt is removed.
+
 ## 3.10.2
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-3.10.2
+3.10.4

data/lib/carson/runtime/deliver.rb

@@ -256,14 +256,16 @@ module Carson
 			end
 
 			# Merges the PR using the configured merge method.
+			# Deliberately omits --delete-branch: gh tries to switch the local
+			# checkout to main afterwards, which fails inside a worktree where
+			# main is already checked out. Branch cleanup deferred to `carson prune`.
 			def merge_pr!( number:, result: )
 				method = config.govern_merge_method
 				result[ :merge_method ] = method
 
 				_, stderr, success, = gh_run(
 					"pr", "merge", number.to_s,
-					"--#{method}",
-					"--delete-branch"
+					"--#{method}"
 				)
 
 				if success
@@ -272,7 +274,7 @@ module Carson
 					error_text = stderr.to_s.strip
 					error_text = "merge failed" if error_text.empty?
 					result[ :error ] = error_text
-					result[ :recovery ] = "gh pr merge #{number} --#{method} --delete-branch"
+					result[ :recovery ] = "gh pr merge #{number} --#{method}"
 					EXIT_ERROR
 				end
 			end

data/lib/carson/runtime/govern.rb

@@ -277,6 +277,7 @@ module Carson
 			end
 
 			# Merges a PR that has passed all gates.
+			# Omits --delete-branch (fails inside worktrees). Cleanup via `carson prune`.
 			def merge_if_ready!( pr:, repo_path: )
 				unless config.govern_auto_merge
 					puts_line "    merge authority disabled; skipping merge"
@@ -288,7 +289,6 @@ module Carson
 				stdout_text, stderr_text, status = Open3.capture3(
 					"gh", "pr", "merge", number.to_s,
 					"--#{method}",
-					"--delete-branch",
 					chdir: repo_path
 				)
 				if status.success?

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

@@ -1,14 +1,15 @@
 # Safe worktree lifecycle management for coding agents.
-# Three operations: create, done (mark completed), remove (batch cleanup).
-# The deferred deletion model: worktrees persist after use, cleaned up later.
+# Three operations: create, done (mark completed), remove (full cleanup).
+# Remove guards against unpushed commits and CWD-inside-worktree — safe by default.
 # Supports --json for machine-readable structured output with recovery commands.
 module Carson
 	class Runtime
 		module Local
 
 			# Creates a new worktree under .claude/worktrees/<name> with a fresh branch.
+			# Uses main_worktree_root so this works even when called from inside a worktree.
 			def worktree_create!( name:, json_output: false )
-				worktrees_dir = File.join( repo_root, ".claude", "worktrees" )
+				worktrees_dir = File.join( main_worktree_root, ".claude", "worktrees" )
 				wt_path = File.join( worktrees_dir, name )
 
 				if Dir.exist?( wt_path )
@@ -83,35 +84,16 @@ module Carson
 					)
 				end
 
-				# Check for unpushed commits.
-				# If the remote branch does not exist, check whether the branch has unique commits
-				# versus the main branch. If it does, block — the work exists only locally.
-				# If the branch has no unique commits (just created, no work done), allow.
-				# Note: Open3.capture3 returns Process::Status (always truthy), so .success? is required.
+				# Check for unpushed commits using shared guard.
 				branch = worktree_branch( path: resolved_path )
-				if branch
-					remote = config.git_remote
-					remote_ref = "#{remote}/#{branch}"
-					ahead, _, ahead_status, = Open3.capture3( "git", "rev-list", "--count", "#{remote_ref}..#{branch}", chdir: resolved_path )
-					if !ahead_status.success?
-						# Remote ref does not exist. Only block if the branch has unique commits vs main.
-						unique, _, unique_status, = Open3.capture3( "git", "rev-list", "--count", "#{config.main_branch}..#{branch}", chdir: resolved_path )
-						if unique_status.success? && unique.strip.to_i > 0
-							return worktree_finish(
-								result: { command: "worktree done", status: "block", name: name, branch: branch,
-									error: "branch has not been pushed to #{remote}",
-									recovery: "git -C #{resolved_path} push -u #{remote} #{branch}" },
-								exit_code: EXIT_BLOCK, json_output: json_output
-							)
-						end
-					elsif ahead.strip.to_i > 0
-						return worktree_finish(
-							result: { command: "worktree done", status: "block", name: name, branch: branch,
-								error: "worktree has unpushed commits",
-								recovery: "git -C #{resolved_path} push #{remote} #{branch}" },
-							exit_code: EXIT_BLOCK, json_output: json_output
-						)
-					end
+				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.
@@ -167,6 +149,21 @@ module Carson
 				branch = worktree_branch( path: resolved_path )
 				puts_verbose "worktree_remove: path=#{resolved_path} branch=#{branch} force=#{force}"
 
+				# Safety: refuse if the branch has unpushed commits (unless --force).
+				# Prevents accidental destruction of work that exists only locally.
+				unless force
+					unpushed = check_unpushed_commits( branch: branch, worktree_path: resolved_path )
+					if unpushed
+						return worktree_finish(
+							result: { command: "worktree remove", status: "block", name: File.basename( resolved_path ),
+								branch: branch,
+								error: unpushed[ :error ],
+								recovery: unpushed[ :recovery ] },
+							exit_code: EXIT_BLOCK, json_output: json_output
+						)
+					end
+				end
+
 				# Step 1: remove the worktree (directory + git registration).
 				rm_args = [ "worktree", "remove" ]
 				rm_args << "--force" if force
@@ -279,6 +276,29 @@ module Carson
 				false
 			end
 
+			# Checks whether a branch has unpushed commits that would be lost on removal.
+			# Returns nil if safe, or { error:, recovery: } hash if unpushed work exists.
+			def check_unpushed_commits( branch:, worktree_path: )
+				return nil unless branch
+
+				remote = config.git_remote
+				remote_ref = "#{remote}/#{branch}"
+				ahead, _, ahead_status, = Open3.capture3( "git", "rev-list", "--count", "#{remote_ref}..#{branch}", chdir: worktree_path )
+				if !ahead_status.success?
+					# Remote ref does not exist. Only block if the branch has unique commits vs main.
+					unique, _, unique_status, = Open3.capture3( "git", "rev-list", "--count", "#{config.main_branch}..#{branch}", chdir: worktree_path )
+					if unique_status.success? && unique.strip.to_i > 0
+						return { error: "branch has not been pushed to #{remote}",
+							recovery: "git -C #{worktree_path} push -u #{remote} #{branch}, or use --force to override" }
+					end
+				elsif ahead.strip.to_i > 0
+					return { error: "worktree has unpushed commits",
+						recovery: "git -C #{worktree_path} push #{remote} #{branch}, or use --force to override" }
+				end
+
+				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.
@@ -293,8 +313,9 @@ module Carson
 			# This prevents worktree directories from appearing as untracked files
 			# in the host repository. Uses the local exclude file (never committed)
 			# so the host repo's .gitignore is never touched.
+			# Uses main_worktree_root — worktrees have .git as a file, not a directory.
 			def ensure_claude_dir_excluded!
-				git_dir = File.join( repo_root, ".git" )
+				git_dir = File.join( main_worktree_root, ".git" )
 				return unless File.directory?( git_dir )
 
 				info_dir = File.join( git_dir, "info" )
@@ -312,12 +333,14 @@ module Carson
 			# Resolves a worktree path: if it's a bare name, look under .claude/worktrees/.
 			# Returns the canonical (realpath) form so comparisons against git worktree list succeed,
 			# even when the OS resolves symlinks differently (e.g. /tmp → /private/tmp on macOS).
+			# Uses main_worktree_root (not repo_root) so resolution works from inside worktrees.
 			def resolve_worktree_path( worktree_path: )
 				if worktree_path.include?( "/" )
 					return realpath_safe( worktree_path )
 				end
 
-				candidate = File.join( repo_root, ".claude", "worktrees", worktree_path )
+				root = main_worktree_root
+				candidate = File.join( root, ".claude", "worktrees", worktree_path )
 				return realpath_safe( candidate ) if Dir.exist?( candidate )
 
 				realpath_safe( worktree_path )

metadata

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