carson 4.3.5 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f75abd3dbe087565ec4338de23c0b6ca0e5a3269dd217deebfd4e13653e9cc71
-  data.tar.gz: bdfd8b3c61839f93d1424d28b94d3314a1a6f07158b961e2a4f04cbcedf5f6de
+  metadata.gz: a8eb2ac9b4d1ac6375fc581b2be86768ad5f441685b36dca3358e31aa43715b8
+  data.tar.gz: e2c7e9e3b3a4b35e26c8fbb7d59c46c10db8cf67b01000b0893d528a84055ce1
 SHA512:
-  metadata.gz: f90470bef8509ee72e7dfffc57463f7c6fcb10918ee3e4b9a5af72698302edfa7c4259971d23ff50225e63d2a5900fa05f8308b296c56316f88ae903ed5f276d
-  data.tar.gz: a115dd2f198afd4f014165588e476538137611aea3186599d539fb65ac7eccfc13f3fcd920e2786597ba0dec4ce7a1a2339d81af59158cd4337032c5c2e59990
+  metadata.gz: 58f5388783aa5efbd5a74393c75b6552278bab58d06bc00bcea1a4467353aac70b7aa54685517d02062d61d0befa16898867f82b5ca9c7fc2a0908baa441cf94
+  data.tar.gz: d8e760dba0ca676a9a5c6e88d729102fa86f8c9ea205507fbe46821280c42593352bc985d486d6c82b377311cb5564820f06d7d15ddb63e15ee17ebab750780e

data/MANUAL.md

@@ -153,6 +153,8 @@ carson worktree create my-feature
 cd /path/to/.claude/worktrees/my-feature
 ```
 
+The worktree lives under the calling harness's agent directory — `.claude/worktrees/` from Claude Code, `.pi/worktrees/` from Pi (detected via `PI_CODING_AGENT`). Set `CARSON_AGENT_DIR` to override. Commands that take a worktree name resolve it across all agent directories, so worktrees created by another harness remain reachable.
+
 On the governed main working tree, Carson blocks raw `git add` / `git commit` and blocks raw `git worktree add/remove`, raw `git pull --rebase`, and raw `gh pr create/merge`. Use `carson worktree create`, `carson sync`, and `carson deliver` instead.
 
 **2. Work** — make changes, test them, and either commit normally or let Carson create the delivery commit.

data/README.md

@@ -51,6 +51,10 @@ carson onboard your/repo/path
 carson worktree create your-worktree
 cd your/repo/path/.claude/worktrees/your-worktree
 
+# Carson places the worktree under the calling harness's agent directory:
+# .claude/worktrees/ from Claude Code, .pi/worktrees/ from Pi
+# (detected via PI_CODING_AGENT). Set CARSON_AGENT_DIR to override.
+
 # work and test, then commit and hand the branch to Carson
 git add -A
 git commit -m "fix: describe this delivery"

data/RELEASE.md

@@ -7,6 +7,32 @@ Release-note scope rule:
 
 ## Unreleased
 
+## 4.5.0
+
+### New
+
+- **Harness-aware worktree directories.** `carson checkin` / `carson worktree create` place the worktree under the calling harness's agent directory — `.pi/worktrees/` from a Pi session (detected via `PI_CODING_AGENT`), `.claude/worktrees/` otherwise, exactly as before. Set `CARSON_AGENT_DIR` to override. Bare-name resolution, `.git/info/exclude` bookkeeping, and diagnostics follow the chosen directory, and commands that take a worktree name resolve across all agent directories, so worktrees created by another harness remain reachable.
+- **Sweep and reap cover `.pi/worktrees/`.** Both agent-directory lists gained `.pi`.
+
+### Why
+
+The worktree directory was hardcoded to `.claude/worktrees/`, so Pi sessions produced Claude-flavoured paths. Each harness's worktrees now live under their own directory.
+
+### Migration
+
+None. Existing `.claude/worktrees/` worktrees resolve by name as before.
+
+## 4.4.0
+
+### New
+
+- **Auto-chdir on checkout from inside worktree.** `carson checkout` no longer blocks when the current working directory is inside the worktree being removed. Carson `Dir.chdir`s to the main worktree root and completes the removal automatically. Both the warehouse (`assess_removal`) and legacy (`remove_check`) paths are fixed.
+- **Parent shell excluded from held-by-other-process check.** `held_by_other_process?` now excludes `Process.ppid` (the user's shell that launched Carson) in addition to `Process.pid`. Prevents false blocks when the user runs `carson checkout` from inside the worktree.
+
+### Why
+
+Running `carson checkout` from inside the target worktree is the most natural invocation — agents and users are already there. Blocking and printing a recovery command added friction for no safety benefit, since Carson can move its own process out.
+
 ## 4.3.5
 
 ### Fixed

data/VERSION

@@ -1 +1 @@
-4.3.5
+4.5.0

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

@@ -8,7 +8,8 @@ module Carson
 
 			# --- Delegates to Warehouse::Workbench ---
 
-			# Creates a new worktree under .claude/worktrees/<name>.
+			# Creates a new workbench under the calling harness's agent
+			# directory (<agent_dir>/worktrees/<name>, e.g. .pi from a Pi session).
 			def worktree_create!( name:, json_output: false )
 				result = worktree_warehouse.build_workbench!( name: name )
 				finish_worktree( result: result, json_output: json_output )

data/lib/carson/warehouse/workbench.rb

@@ -10,7 +10,9 @@ module Carson
 		module Workbench
 
 			# Agent directory names whose workbenches the warehouse may sweep.
-			AGENT_DIRS = %w[ .claude .codex ].freeze
+			# Carson::Worktree::AGENT_DIRS (legacy) carries the same list — keep
+			# both in lockstep until reap moves here.
+			AGENT_DIRS = %w[ .claude .codex .pi ].freeze
 
 			# --- Inventory ---
 
@@ -64,8 +66,9 @@ module Carson
 			end
 
 			# Resolve a bare name and find the workbench.
-			# Tries .claude/worktrees/<name> first, then searches all registered
-			# workbenches by directory name.
+			# Tries the calling harness's agent directory first (scoped, then
+			# flat), then the other agent directories, then searches all
+			# registered workbenches by directory name.
 			def workbench_named( name )
 				if Pathname.new( name ).absolute?
 					return workbench_at( path: name )
@@ -76,18 +79,20 @@ module Carson
 				found = workbench_at( path: relative_candidate )
 				return found if found
 
-				# Try scoped path (e.g. "claude/foo" → .claude/worktrees/claude/foo).
+				# Try scoped path (e.g. "claude/foo" → .claude/worktrees/claude/foo),
+				# the calling harness's directory first.
 				if name.include?( "/" )
-					scoped_candidate = realpath_safe( File.join( main_worktree_root, ".claude", "worktrees", name ) )
-					found = workbench_at( path: scoped_candidate )
-					return found if found
+					ordered_agent_dirs.each do |dir|
+						found = workbench_at( path: realpath_safe( File.join( main_worktree_root, dir, "worktrees", name ) ) )
+						return found if found
+					end
 				end
 
-				# Try flat layout: .claude/worktrees/<name>.
-				root = main_worktree_root
-				candidate = realpath_safe( File.join( root, ".claude", "worktrees", name ) )
-				found = workbench_at( path: candidate )
-				return found if found
+				# Try flat layout: <agent_dir>/worktrees/<name>, calling harness first.
+				ordered_agent_dirs.each do |dir|
+					found = workbench_at( path: realpath_safe( File.join( main_worktree_root, dir, "worktrees", name ) ) )
+					return found if found
+				end
 
 				# Search all registered workbenches by dirname.
 				matches = workbenches.select { |wb| File.basename( wb.path ) == name }
@@ -105,11 +110,12 @@ module Carson
 			# --- Lifecycle ---
 
 			# Build a new workbench from local main.
-			# Creates the directory, branches from the local standard,
-			# ensures .claude/ is excluded from git status.
+			# Creates the directory under the calling harness's agent directory,
+			# branches from the local standard, and excludes the agent directory
+			# from git status.
 			def build_workbench!( name: )
 				root = main_worktree_root
-				worktrees_dir = File.join( root, ".claude", "worktrees" )
+				worktrees_dir = File.join( root, agent_dir, "worktrees" )
 				workbench_path = File.join( worktrees_dir, name )
 
 				if Dir.exist?( workbench_path )
@@ -119,8 +125,8 @@ module Carson
 						recovery: "carson worktree remove #{name}, then retry" }
 				end
 
-				# Ensure .claude/ is excluded from git status.
-				ensure_claude_dir_excluded!
+				# Ensure the agent directory is excluded from git status.
+				ensure_agent_dir_excluded!
 
 				# Create the worktree with a new branch.
 				FileUtils.mkdir_p( File.dirname( workbench_path ) )
@@ -232,11 +238,8 @@ module Carson
 					return { status: :ok, missing: true }
 				end
 
-				if workbench.holds_cwd?
-					return { status: :block, result_status: "block",
-						error: "current working directory is inside this worktree",
-						recovery: "cd #{main_worktree_root} && carson checkout #{File.basename( workbench.path )}" }
-				end
+				# Auto-chdir out so removal can proceed.
+				Dir.chdir( main_worktree_root ) if workbench.holds_cwd?
 
 				if workbench.held_by_other_process?
 					return { status: :block, result_status: "block",
@@ -383,7 +386,7 @@ module Carson
 				wt_list, = git( "worktree", "list", "--porcelain" )
 				branch_list, = git( "branch", "--list", name )
 				git_version, = Open3.capture3( "git", "--version" )
-				workbench_path = File.join( root, ".claude", "worktrees", name )
+				workbench_path = File.join( root, agent_dir, "worktrees", name )
 				entry = workbench_at( path: workbench_path )
 				{
 					git_stdout: git_stdout.to_s.strip,
@@ -398,8 +401,25 @@ module Carson
 				}
 			end
 
-			# Ensure .claude/ is in .git/info/exclude.
-			def ensure_claude_dir_excluded!
+			# The calling harness's workbench directory name.
+			# CARSON_AGENT_DIR wins over detection; absent detection, .claude is the
+			# historical default so Claude Code and Codex sessions behave as before.
+			# Pi sessions export PI_CODING_AGENT.
+			def agent_dir
+				override = ENV.fetch( "CARSON_AGENT_DIR", "" ).to_s.strip
+				return override unless override.empty?
+				return ".pi" if ENV.key?( "PI_CODING_AGENT" )
+
+				".claude"
+			end
+
+			# Agent directories in resolution order: the calling harness's first.
+			def ordered_agent_dirs
+				( [ agent_dir ] + AGENT_DIRS ).uniq
+			end
+
+			# Ensure the calling harness's agent directory is in .git/info/exclude.
+			def ensure_agent_dir_excluded!
 				git_dir = File.join( main_worktree_root, ".git" )
 				return unless File.directory?( git_dir )
 
@@ -408,9 +428,10 @@ module Carson
 
 				FileUtils.mkdir_p( info_dir )
 				existing = File.exist?( exclude_path ) ? File.read( exclude_path ) : ""
-				return if existing.lines.any? { |line| line.strip == ".claude/" }
+				entry = "#{agent_dir}/"
+				return if existing.lines.any? { |line| line.strip == entry }
 
-				File.open( exclude_path, "a" ) { |file| file.puts ".claude/" }
+				File.open( exclude_path, "a" ) { |file| file.puts entry }
 			rescue StandardError
 				# Best-effort — do not block workbench creation.
 			end

data/lib/carson/worktree.rb

@@ -12,7 +12,9 @@ require "pathname"
 module Carson
 	class Worktree
 		# Agent directory names whose worktrees Carson may sweep.
-		AGENT_DIRS = %w[ .claude .codex ].freeze
+		# Warehouse::Workbench::AGENT_DIRS carries the same list — keep both in
+		# lockstep until reap/sweep move to the warehouse.
+		AGENT_DIRS = %w[ .claude .codex .pi ].freeze
 
 		attr_reader :path, :branch, :prunable_reason
 
@@ -270,18 +272,8 @@ module Carson
 			entry = find( path: resolved_path, runtime: runtime )
 			branch = entry&.branch
 
-			if entry&.holds_cwd?
-				safe_root = runtime.main_worktree_root
-				return {
-					status: :block,
-					result_status: "block",
-					exit_code: Runtime::EXIT_BLOCK,
-					resolved_path: resolved_path,
-					branch: branch,
-					error: "current working directory is inside this worktree",
-					recovery: "cd #{safe_root} && carson checkout #{File.basename( resolved_path )}"
-				}
-			end
+			# Auto-chdir out so removal can proceed.
+			Dir.chdir( runtime.main_worktree_root ) if entry&.holds_cwd?
 
 			if entry&.held_by_other_process?
 				return {
@@ -388,11 +380,12 @@ module Carson
 			return false if stdout.nil? || stdout.empty?
 
 			normalised = File.join( canonical, "" )
-			my_pid = Process.pid
+			# Exclude this process and its parent (the user's shell that launched Carson).
+			excluded_pids = [ Process.pid, Process.ppid ].to_set
 			stdout.lines.drop( 1 ).any? do |line|
 				fields = line.strip.split( /\s+/ )
 				next false unless fields.length >= 9
-				next false if fields[ 1 ].to_i == my_pid
+				next false if excluded_pids.include?( fields[ 1 ].to_i )
 				name = fields[ 8.. ].join( " " )
 				name == canonical || name.start_with?( normalised )
 			end

metadata

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