carson 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b65ac7c43c1275299430d71f23f1da3a9896b112aa1f57e334222d06282a3a62
-  data.tar.gz: ff4efcd085b8cb0deb4385bfdb40d98407d463547b6e065fbfc455f516cc4dbb
+  metadata.gz: 8bf071658d6db37302910554b54a528ac3efe7faa22a1cb88b42d13faf0b6b30
+  data.tar.gz: 0e30d7ca60c8d8f13438562b003009a64820ff7109ca1c525a127282a5c942c9
 SHA512:
-  metadata.gz: b49a0b8760ad230996f6330b378fd7f9a202977c148683c4ae3eec066f2b820f6210e59a0e251ef275471d90db0d8154dee82cc5f97c3e46378cfad1fce074c2
-  data.tar.gz: 64cc150e7bb257ebbd6d48a603ab7eaa3e3b9794f08fcc65625bb8264628cc99e14f5603fe526d7818253ac57169de995cdc71c413c75cc6a3e2b56dbbb41f2c
+  metadata.gz: 0d50b557c6e2a29b78d4f82dfedf2f89c4d6eacc68fb561d5684eb7c40582ba43de5ff84b6929c992fd98b5069e1ee15b17fb434f4512b3ea30f94c97a387ae6
+  data.tar.gz: 4cc5c13c062c226ffcfd8627882ecb6c3093169e61dc759d03e2b77110f93323b77bc90761107a8e2a7696b211fe42c603ad0823639c3eb062ff66753410f96b

data/RELEASE.md

@@ -11,6 +11,14 @@ Release-note scope rule:
 
 - CLI grammar is now two-tier: portfolio commands (`list`, `onboard`, `offboard`, `refresh`, `version`) and repo-scoped commands (`carson <repo> <command>` or `carson <command>` from CWD)
 
+## 4.0.2
+
+### Fixed
+
+- **Seal marker moved outside worktree** — `.carson-delivering` marker now lives at `~/.carson/seals/` instead of inside the worktree. The in-worktree marker polluted `git status`, showed as untracked in editors, and blocked `carson deliver` via the dirty-tree guard. Seal file includes the worktree path for debugging.
+- **`receive_latest_standard!` works from worktrees** (#451) — `git fetch origin main:main` failed when `main` was checked out in the main worktree ("fatal: refusing to fetch into branch checked out"). Now uses `merge --ff-only` when main is checked out, fetch refspec otherwise.
+- **Audit seal check delegates to Warehouse** — `carson audit` no longer hardcodes the marker path; it creates a Warehouse and asks `sealed?`. Single source of truth for seal location.
+
 ## 4.0.1
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-4.0.1
+4.0.2

data/lib/carson/runtime/audit.rb

@@ -185,11 +185,12 @@ module Carson
 
 				# Check if the workbench is sealed (parcel in flight).
 				# Returns EXIT_BLOCK if sealed, nil otherwise.
+				# Delegates to Warehouse so the seal path is resolved in one place.
 				def audit_sealed_workbench( json_output: )
-					marker_path = File.join( work_dir, ".carson-delivering" )
-					return nil unless File.exist?( marker_path )
+					warehouse = Warehouse.new( path: work_dir )
+					return nil unless warehouse.sealed?
 
-					tracking_number = File.read( marker_path ).strip rescue "unknown"
+					tracking_number = warehouse.sealed_tracking_number || "unknown"
 					if json_output
 						require "json"
 						output.puts JSON.pretty_generate( {

data/lib/carson/warehouse.rb

@@ -2,6 +2,8 @@
 # parcels (committed changes) are stored on shelves (worktrees) with
 # labels (branches). Git commands are hidden inside — callers never
 # see git terms.
+require "digest"
+require "fileutils"
 require "open3"
 
 module Carson
@@ -107,8 +109,12 @@ module Carson
 
 		# Seal the shelf — no more packing until the delivery outcome is confirmed.
 		# The courier seals the shelf after shipping and filing the waybill.
+		# The marker lives outside the worktree (~/.carson/seals/) so it does
+		# not pollute git status or block delivery with a dirty-tree guard.
 		def seal_shelf!( tracking_number: )
-			File.write( delivering_marker_path, tracking_number.to_s )
+			marker = delivering_marker_path
+			FileUtils.mkdir_p( File.dirname( marker ) )
+			File.write( marker, "#{tracking_number}\n#{@path}" )
 		end
 
 		# Unseal the shelf — the courier brought back the parcel.
@@ -125,18 +131,43 @@ module Carson
 		# The tracking number of the in-flight delivery (nil if not sealed).
 		def sealed_tracking_number
 			return nil unless sealed?
-			File.read( delivering_marker_path ).strip
+			File.read( delivering_marker_path ).lines.first.strip
 		end
 
 		# Receive the latest standard from the registry after a parcel is accepted.
 		# Fast-forwards local main without switching branches.
 		# Returns true on success, false on failure.
+		#
+		# Two paths depending on the main worktree's checkout state:
+		# - Main checked out → merge --ff-only (updates ref + working tree).
+		# - Main not checked out → fetch refspec (updates ref only, safe when
+		#   no worktree has the branch).
 		def receive_latest_standard!( remote: bureau_address )
-			_, _, status = Open3.capture3(
-				"git", "-C", main_worktree_root,
-				"fetch", remote, "#{main_label}:#{main_label}"
+			root = main_worktree_root
+
+			# Fetch remote tracking refs — always safe, even when main is checked out.
+			_, _, fetch_status = Open3.capture3( "git", "-C", root, "fetch", remote )
+			return false unless fetch_status.success?
+
+			# Determine how to advance local main.
+			head_ref, _, head_status = Open3.capture3(
+				"git", "-C", root, "rev-parse", "--abbrev-ref", "HEAD"
 			)
-			status.success?
+			return false unless head_status.success?
+
+			if head_ref.strip == @main_label
+				# Main is checked out in the main worktree — fast-forward via merge.
+				_, _, merge_status = Open3.capture3(
+					"git", "-C", root, "merge", "--ff-only", "#{remote}/#{@main_label}"
+				)
+				merge_status.success?
+			else
+				# Main is not checked out — safe to update the ref via fetch refspec.
+				_, _, refspec_status = Open3.capture3(
+					"git", "-C", root, "fetch", remote, "#{@main_label}:#{@main_label}"
+				)
+				refspec_status.success?
+			end
 		end
 
 		# --- Inventory ---
@@ -173,8 +204,12 @@ module Carson
 	private
 
 		# Path to the delivery marker file — signals the shelf is sealed.
+		# Lives outside the worktree at ~/.carson/seals/<sha256-of-path>
+		# so it does not pollute git status.
 		def delivering_marker_path
-			File.join( path, ".carson-delivering" )
+			seals_dir = File.join( Dir.home, ".carson", "seals" )
+			key = Digest::SHA256.hexdigest( @path )
+			File.join( seals_dir, key )
 		end
 
 		# All git commands go through this single gateway.

metadata

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