carson 3.10.1 → 3.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e11a0b3de1e579e809455fca256a40882a226ae914e296cf0a670f0268c6ee3
-  data.tar.gz: 2b6bfb9124d69bec88912fae936d7394d1bb77a5e37fed2653e026fff14a531b
+  metadata.gz: 2bbb3e13e1c89593777ce820ddcf6ef96502693aaa1c2d41303e95cc374a46d9
+  data.tar.gz: 402e3a4b6152547e7b328c02686aeea4780a329cc61a187e75ec256de8355244
 SHA512:
-  metadata.gz: b2126c426ece435a94905532f7e7776cc873debb62aa57ba5267ec830a5995da330db79ebe28c5939835c1e15084132d60f0084abd7bee6e1d7780ec35fc288d
-  data.tar.gz: 5d4d9442043aa1abb923714ceabacae0edadba4b55b870a85cf2d0697364d92951299e86d85641202671ec0ceddd30407e52d8d2db8a65bd55782214ab45aa8f
+  metadata.gz: d415ae9589a2a65587709a3adf079f112c5489890c68ffe42b295b23527dca980669e8433ec3a531f77628dd07099d7368d5c055817463627e5d9aa8710ec61a
+  data.tar.gz: 45d641154e946ee1f1f37e1d6b3a61971cab37c34433e6fd4ecbc6f44f0691b01268213f1664416061db5cedcf8f306b58698043667613f345005dd3f852050d

data/RELEASE.md

@@ -5,6 +5,35 @@ 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.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
+
+- **Path normalisation** — all worktree path comparisons now use `File.realpath` to handle symlink differences (e.g. `/tmp` → `/private/tmp` on macOS). Fixes worktree recognition failures in `worktree done`, `worktree remove`, and `status` where Git returns canonical paths that differ from Carson's internal paths.
+- **deliver --merge post-merge sync** — `sync_after_merge!` now pulls into the main worktree via `git -C` instead of attempting `git checkout main` (which always fails inside a feature worktree). Also adds a review gate check before merge (blocks on `CHANGES_REQUESTED`), marks the worktree done in session state after merge, and records sync result in structured output.
+- **Worktree repo pollution** — `worktree create` now auto-adds `.claude/` to `.git/info/exclude` (local-only, never committed) so worktree directories do not appear as untracked files in the host repository. Idempotent and outsider-safe.
+- **Worktree done push guard** — `worktree done` now blocks when a branch has unique unpushed commits and no remote ref exists. Previously the guard silently passed due to a `Process::Status` truthiness bug (`Open3.capture3` returns a Status object that is always truthy; now uses `.success?`). Branches with no unique commits (just created, no work done) are allowed through.
+
+### UX
+
+- `deliver --merge --json` output now includes `review`, `synced`, and optionally `sync_error` fields.
+- `worktree done` error messages distinguish "branch has not been pushed" from "worktree has unpushed commits", with specific recovery commands for each.
+- Host repositories stay clean after worktree creation — no more `?? .claude/` in `git status`.
+
+### Migration
+
+- No breaking changes. All fixes are backwards-compatible improvements to existing behaviour.
+
 ## 3.10.1
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-3.10.1
+3.10.3

data/lib/carson/runtime/deliver.rb

@@ -51,7 +51,7 @@ module Carson
 
 				case ci_status
 				when :pass
-					# Continue to merge.
+					# Continue to review gate.
 				when :pending
 					result[ :recovery ] = "gh pr checks #{pr_number} --watch && carson deliver --merge"
 					return deliver_finish( result: result, exit_code: EXIT_OK, json_output: json_output )
@@ -63,14 +63,26 @@ module Carson
 					return deliver_finish( result: result, exit_code: EXIT_OK, json_output: json_output )
 				end
 
-				# Step 4: merge.
+				# Step 4: check review gate — block if changes are requested.
+				review = check_pr_review( number: pr_number )
+				result[ :review ] = review.to_s
+				if review == :changes_requested
+					result[ :error ] = "review changes requested on PR ##{pr_number}"
+					result[ :recovery ] = "address review comments, push, then `carson deliver --merge`"
+					return deliver_finish( result: result, exit_code: EXIT_BLOCK, json_output: json_output )
+				end
+
+				# Step 5: merge.
 				merge_exit = merge_pr!( number: pr_number, result: result )
 				return deliver_finish( result: result, exit_code: merge_exit, json_output: json_output ) unless merge_exit == EXIT_OK
 
 				result[ :merged ] = true
 
-				# Step 5: sync main.
-				sync_after_merge!( remote: remote, main: main )
+				# Step 6: mark worktree done in session state.
+				update_session( worktree: :clear )
+
+				# Step 7: sync main in the main worktree.
+				sync_after_merge!( remote: remote, main: main, result: result )
 
 				deliver_finish( result: result, exit_code: EXIT_OK, json_output: json_output )
 			end
@@ -225,15 +237,35 @@ module Carson
 				:pass
 			end
 
+			# Checks review decision on a PR. Returns :approved, :changes_requested, :review_required, or :none.
+			def check_pr_review( number: )
+				stdout, _, success, = gh_run(
+					"pr", "view", number.to_s,
+					"--json", "reviewDecision"
+				)
+				return :none unless success
+
+				data = JSON.parse( stdout ) rescue {}
+				decision = data[ "reviewDecision" ].to_s.strip.upcase
+				case decision
+				when "APPROVED" then :approved
+				when "CHANGES_REQUESTED" then :changes_requested
+				when "REVIEW_REQUIRED" then :review_required
+				else :none
+				end
+			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
@@ -242,16 +274,28 @@ 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
 
 			# Syncs main after a successful merge.
-			def sync_after_merge!( remote:, main: )
-				git_run( "checkout", main )
-				git_run( "pull", remote, main )
-				puts_verbose "synced #{main} from #{remote}"
+			# Pulls into the main worktree directly — does not attempt checkout,
+			# because checkout would fail when running inside a feature worktree
+			# (main is already checked out in the main tree).
+			def sync_after_merge!( remote:, main:, result: )
+				main_root = main_worktree_root
+				_, pull_stderr, pull_success, = Open3.capture3(
+					"git", "-C", main_root, "pull", "--ff-only", remote, main
+				)
+				if pull_success
+					result[ :synced ] = true
+					puts_verbose "synced #{main} in #{main_root} from #{remote}"
+				else
+					result[ :synced ] = false
+					result[ :sync_error ] = pull_stderr.to_s.strip
+					puts_verbose "sync failed: #{pull_stderr.to_s.strip}"
+				end
 			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

@@ -23,6 +23,10 @@ module Carson
 				# Determine the base branch (main branch from config).
 				base = config.main_branch
 
+				# Ensure .claude/ is excluded from git status in the host repository.
+				# Uses .git/info/exclude (local-only, never committed) to respect the outsider boundary.
+				ensure_claude_dir_excluded!
+
 				# Create the worktree with a new branch based on the main branch.
 				FileUtils.mkdir_p( worktrees_dir )
 				_, wt_stderr, wt_success, = git_run( "worktree", "add", wt_path, "-b", name, base )
@@ -69,8 +73,8 @@ module Carson
 				end
 
 				# Check for uncommitted changes in the worktree.
-				wt_status, _, status_success, = Open3.capture3( "git", "status", "--porcelain", chdir: resolved_path )
-				if status_success && !wt_status.strip.empty?
+				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",
@@ -80,12 +84,27 @@ 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.
 				branch = worktree_branch( path: resolved_path )
 				if branch
 					remote = config.git_remote
 					remote_ref = "#{remote}/#{branch}"
-					ahead, _, ahead_ok, = Open3.capture3( "git", "rev-list", "--count", "#{remote_ref}..#{branch}", chdir: resolved_path )
-					if ahead_ok && ahead.strip.to_i > 0
+					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",
@@ -250,10 +269,12 @@ module Carson
 			# Returns true when the process CWD is inside the given worktree path.
 			# This detects the most common session-crash scenario: removing a worktree
 			# while the caller's shell is inside it.
+			# Uses realpath on both sides to handle symlink differences (e.g. /tmp vs /private/tmp).
 			def cwd_inside_worktree?( worktree_path: )
-				cwd = Dir.pwd
-				normalised_wt = File.join( worktree_path, "" )
-				cwd == worktree_path || cwd.start_with?( normalised_wt )
+				cwd = realpath_safe( Dir.pwd )
+				wt = realpath_safe( worktree_path )
+				normalised_wt = File.join( wt, "" )
+				cwd == wt || cwd.start_with?( normalised_wt )
 			rescue StandardError
 				false
 			end
@@ -268,28 +289,57 @@ module Carson
 				repo_root
 			end
 
+			# Adds .claude/ to .git/info/exclude if not already present.
+			# 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.
+			def ensure_claude_dir_excluded!
+				git_dir = File.join( repo_root, ".git" )
+				return unless File.directory?( git_dir )
+
+				info_dir = File.join( git_dir, "info" )
+				exclude_path = File.join( info_dir, "exclude" )
+
+				FileUtils.mkdir_p( info_dir )
+				existing = File.exist?( exclude_path ) ? File.read( exclude_path ) : ""
+				return if existing.lines.any? { |line| line.strip == ".claude/" }
+
+				File.open( exclude_path, "a" ) { |f| f.puts ".claude/" }
+			rescue StandardError
+				# Best-effort — do not block worktree creation if exclude fails.
+			end
+
 			# 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).
 			def resolve_worktree_path( worktree_path: )
-				return File.expand_path( worktree_path ) if worktree_path.include?( "/" )
+				if worktree_path.include?( "/" )
+					return realpath_safe( worktree_path )
+				end
 
 				candidate = File.join( repo_root, ".claude", "worktrees", worktree_path )
-				return candidate if Dir.exist?( candidate )
+				return realpath_safe( candidate ) if Dir.exist?( candidate )
 
-				File.expand_path( worktree_path )
+				realpath_safe( worktree_path )
 			end
 
 			# Returns true if the path is a registered git worktree.
+			# Compares using realpath to handle symlink differences.
 			def worktree_registered?( path: )
-				worktree_list.any? { |wt| wt.fetch( :path ) == path }
+				canonical = realpath_safe( path )
+				worktree_list.any? { |wt| wt.fetch( :path ) == canonical }
 			end
 
 			# Returns the branch name checked out in a worktree, or nil.
+			# Compares using realpath to handle symlink differences.
 			def worktree_branch( path: )
-				entry = worktree_list.find { |wt| wt.fetch( :path ) == path }
+				canonical = realpath_safe( path )
+				entry = worktree_list.find { |wt| wt.fetch( :path ) == canonical }
 				entry&.fetch( :branch, nil )
 			end
 
 			# Parses `git worktree list --porcelain` into structured entries.
+			# Normalises paths with realpath so comparisons work across symlink differences.
 			def worktree_list
 				output = git_capture!( "worktree", "list", "--porcelain" )
 				entries = []
@@ -300,7 +350,7 @@ module Carson
 						entries << current unless current.empty?
 						current = {}
 					elsif line.start_with?( "worktree " )
-						current[ :path ] = line.sub( "worktree ", "" )
+						current[ :path ] = realpath_safe( line.sub( "worktree ", "" ) )
 					elsif line.start_with?( "branch " )
 						current[ :branch ] = line.sub( "branch refs/heads/", "" )
 					elsif line == "detached"
@@ -310,6 +360,14 @@ module Carson
 				entries << current unless current.empty?
 				entries
 			end
+
+			# Resolves a path to its canonical form, tolerating non-existent paths.
+			# Falls back to File.expand_path when the path does not exist yet.
+			def realpath_safe( path )
+				File.realpath( path )
+			rescue Errno::ENOENT
+				File.expand_path( path )
+			end
 		end
 
 		include Local

data/lib/carson/runtime/status.rb

@@ -88,7 +88,9 @@ module Carson
 				ownership = build_worktree_ownership( sessions: sessions )
 
 				# Filter out the main worktree (the repository root itself).
-				entries.reject { |wt| wt.fetch( :path ) == repo_root }.map do |wt|
+				# Use realpath for comparison — git returns canonical paths that may differ from repo_root.
+				canonical_root = realpath_safe( repo_root )
+				entries.reject { |wt| wt.fetch( :path ) == canonical_root }.map do |wt|
 					name = File.basename( wt.fetch( :path ) )
 					info = {
 						path: wt.fetch( :path ),

metadata

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