carson 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57e828abcdfc77caa38be92fa08a41d8d13abd37a09e7a4bf726d07253a48749
-  data.tar.gz: 5a6141be7046db72d03971fc9c4f45f1b7c81a47d685b13c97810711ebe9db39
+  metadata.gz: 251588ff2b1c952538965ea349b498e424c9646f6c57965dd516e7729e002035
+  data.tar.gz: 2fee9945faa9fbace57ef59dfd77cf5fb9c38992f4e573e796daeef8b1972017
 SHA512:
-  metadata.gz: 409ab608b1bed1423f16aa257efcc53f608643112db23020ac1786bd77fcc94a1776df32991be7ff0c00eb5d9b31f6db454e1ea4ad6020b65aaeb4dd186e39aa
-  data.tar.gz: a482b66aa5220c17d9d1b4c2852cc10b9cfeaa0d8af803e0b7974c20994754b1eb2affbb4d3a5659804764a398f25f7c822ffe3feaaa61b4c6b7fea46cf4b88a
+  metadata.gz: 3981e6facd927beb517b18151eb0d4804863e6adab4d4d39039e6e9313e644f57caae09e0b292e1e33d49b383e1f3f7975decfe3d0672dc372f3582b757bc513
+  data.tar.gz: 55175ac0b094290e602d79854e65208fb5f1baa23753ed05c786c48ddda562b2015de76fb7244dc90c12a2495b2d84269e40c3f9521077d646776eeab843c760

data/RELEASE.md

@@ -7,6 +7,16 @@ Release-note scope rule:
 
 ## Unreleased
 
+## 4.2.1
+
+### Fixed
+
+- **`label_absorbed?` detects rebase-merged branches** — previously only detected merge commits, missing branches integrated via rebase merge.
+
+### UX
+
+- **`carson --help` promotes the agent workflow** — `checkin` and `deliver` now appear in a dedicated "Agent workflow" section at the top of repository commands. `recover` and `worktree` removed from help — agents reach these through Carson's block messages, not by browsing.
+
 ## 4.2.0
 
 ### New

data/VERSION

@@ -1 +1 @@
-4.2.0
+4.2.1

data/lib/carson/warehouse.rb

@@ -148,10 +148,15 @@ module Carson
 			output.lines.map { it.strip }.reject { it.empty? }
 		end
 
-		# Has this label been merged into main?
+		# Has this label's content been absorbed into main?
+		# Content-aware: compares tree content, not SHA ancestry.
+		# Catches rebase-merged and squash-merged branches that
+		# `git branch --merged` misses (replayed SHAs differ).
 		def label_absorbed?( name )
-			merged_output, = git( "branch", "--merged", main_label, "--format", "%(refname:short)" )
-			merged_output.lines.map { it.strip }.include?( name )
+			_, _, status = Open3.capture3(
+				"git", "diff", "--quiet", @main_label, name,
+				chdir: path )
+			status.success?
 		end
 
 		# All worktree paths (transitional — use workbenches for Worktree instances).

data/lib/cli.rb

@@ -140,12 +140,14 @@ module Carson
 				parser.separator "    refresh      Re-install hooks and configuration (all governed repos)"
 				parser.separator "    version      Show Carson version"
 				parser.separator ""
+				parser.separator "Agent workflow:"
+				parser.separator "    checkin      Prepare a fresh workbench from the latest standard"
+				parser.separator "    deliver      Ship committed work — push, PR, merge, cleanup"
+				parser.separator ""
 				parser.separator "Repository commands (from CWD or with explicit repo):"
+				parser.separator "    checkout     Release a workbench when done"
 				parser.separator "    status       Show repository delivery state"
 				parser.separator "    audit        Run pre-commit health checks"
-				parser.separator "    deliver      Start autonomous branch delivery"
-				parser.separator "    recover      Merge the repair PR for one baseline-red governance check"
-				parser.separator "    worktree     Manage isolated coding worktrees"
 				parser.separator ""
 				parser.separator "Run `carson <command> --help` for details on a specific command."
 			end

metadata

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