carson 3.12.0 → 3.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d436c55fe8aa3dcd6d680a4051acf5456ccbf93ae4891bc7aeeb70878fa9a945
-  data.tar.gz: 501ccae43b713c7d0394b58af4816197c79e5bb643a617852b7982f089b5df5e
+  metadata.gz: bb773d053eb0271bf5b1997349eaf9afa972ad5ba8612a3930764e2ace68592d
+  data.tar.gz: 957745cc1c1f0ee91e2a58062e6730b4ff09f3c78e7c7178f7d7d602ac74b858
 SHA512:
-  metadata.gz: e0179948219588b434de25b80159c3b0c57fb57acc09ec57e02e2be480d65afc61e184048667cc0d8155f6ac870fcde80d15b31eff94ed79316285274a5c30a8
-  data.tar.gz: 22b1fd4044c4ec1918f1b4570e98728d1f645a343ecdb3ce87836c7c373fba6428b417b824f8248ca94620baf21cb48e4e5b1a98a84858b95946e729240f9ef3
+  metadata.gz: f547c3aa8645e9da8877c24e645dad85896cd3640890f9da2c6d35cd5557fe0fcd784e3dd75a74910d677544be2294aace0720bd6267e56f1fb7e99c3abe094b
+  data.tar.gz: 01a7ec9498cae31c12e1f68a3498381ad8f7bb5a229de5b2e833c410b06cca4759abd426583b39c766b931d1e829c3fae1cb9272d12b60ea52e59328296bb287

data/RELEASE.md

@@ -5,6 +5,24 @@ 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.13.1
+
+### What changed
+
+- **Content-aware unpushed-commits guard** — `carson worktree remove` no longer falsely blocks after squash or rebase merges. Previously it compared commit SHAs, which differ after squash merge even though the content is on main. Now it compares tree content via `git diff --quiet`: if the branch's content matches main, the work is already merged and removal proceeds without `--force`.
+
+## 3.13.0
+
+### What changed
+
+- **Worktree create auto-syncs main** — `carson worktree create` now pulls the main branch from remote (`--ff-only`) before branching. Prevents stale-base merge conflicts that waste agent context resolving later. Best-effort: if pull fails (offline, non-fast-forward), creation continues from the local main.
+- **Deliver prints next steps after merge** — `carson deliver --merge` now tells the agent exactly what to do after a successful merge. If running inside a worktree, prints `cd <main_root> && carson worktree remove <name>`. If not, suggests `carson prune`. Available in both human and JSON output (`next_step` field).
+
+### UX improvement
+
+- Agents no longer need to remember post-merge cleanup steps — Carson tells them.
+- Agents no longer hit merge conflicts from stale main — Carson syncs before branching.
+
 ## 3.12.0
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-3.12.0
+3.13.1

data/lib/carson/runtime/deliver.rb

@@ -77,6 +77,9 @@ module Carson
 				# Step 6: sync main in the main worktree.
 				sync_after_merge!( remote: remote, main: main, result: result )
 
+				# Step 7: compute next-step guidance for the agent.
+				compute_post_merge_next_step!( result: result )
+
 				deliver_finish( result: result, exit_code: EXIT_OK, json_output: json_output )
 			end
 
@@ -128,6 +131,7 @@ module Carson
 
 				if result[ :merged ]
 					puts_line "Merged PR ##{result[ :pr_number ]} via #{result[ :merge_method ]}."
+					puts_line "  Next: #{result[ :next_step ]}" if result[ :next_step ]
 				end
 			end
 
@@ -290,6 +294,24 @@ module Carson
 					puts_verbose "sync failed: #{pull_stderr.to_s.strip}"
 				end
 			end
+
+			# Builds next-step guidance after a successful merge.
+			# Detects whether the agent is inside a worktree and suggests cleanup.
+			def compute_post_merge_next_step!( result: )
+				main_root = main_worktree_root
+				cwd = realpath_safe( Dir.pwd )
+				current_wt = worktree_list.select { |wt| wt.fetch( :path ) != realpath_safe( main_root ) }
+					.find { |wt| cwd == wt.fetch( :path ) || cwd.start_with?( File.join( wt.fetch( :path ), "" ) ) }
+
+				if current_wt
+					wt_name = File.basename( current_wt.fetch( :path ) )
+					result[ :next_step ] = "cd #{main_root} && carson worktree remove #{wt_name}"
+				else
+					result[ :next_step ] = "carson prune"
+				end
+			rescue StandardError
+				# Best-effort — do not fail deliver because of next-step detection.
+			end
 		end
 
 		include Deliver

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

@@ -24,6 +24,13 @@ module Carson
 				# Determine the base branch (main branch from config).
 				base = config.main_branch
 
+				# Sync main from remote before branching so the worktree starts
+				# from the latest code. Prevents stale-base merge conflicts later.
+				# Best-effort — if pull fails (non-ff, offline), continue anyway.
+				main_root = main_worktree_root
+				_, _, pull_ok, = Open3.capture3( "git", "-C", main_root, "pull", "--ff-only", config.git_remote, base )
+				puts_verbose pull_ok.success? ? "synced #{base} before branching" : "sync skipped — continuing from local #{base}"
+
 				# 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!
@@ -213,6 +220,7 @@ module Carson
 			end
 
 			# Checks whether a branch has unpushed commits that would be lost on removal.
+			# Content-aware: after squash/rebase merge, SHAs differ but tree content may match main. Compares content, not SHAs.
 			# Returns nil if safe, or { error:, recovery: } hash if unpushed work exists.
 			def check_unpushed_commits( branch:, worktree_path: )
 				return nil unless branch
@@ -224,8 +232,16 @@ module Carson
 					# 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" }
+						# Content-aware check: after squash/rebase merge, commit SHAs differ
+						# but the tree content may be identical to main. Compare content,
+						# not SHAs — if the diff is empty, the work is already on main.
+						diff_out, _, diff_ok, = Open3.capture3( "git", "diff", "--quiet", config.main_branch, branch, chdir: worktree_path )
+						unless diff_ok.success?
+							return { error: "branch has not been pushed to #{remote}",
+								recovery: "git -C #{worktree_path} push -u #{remote} #{branch}, or use --force to override" }
+						end
+						# Diff is empty — content is on main (squash/rebase merged). Safe.
+						puts_verbose "branch #{branch} content matches main — squash/rebase merged, safe to remove"
 					end
 				elsif ahead.strip.to_i > 0
 					return { error: "worktree has unpushed commits",

metadata

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