carson 4.3.0 → 4.3.2

data/lib/cli.rb

@@ -5,7 +5,7 @@ require "optparse"
 module Carson
 	class CLI
 		PORTFOLIO_COMMANDS = %w[onboard offboard list refresh version].freeze
-		REPO_COMMANDS = %w[deliver receive sync status audit prune housekeep worktree abandon recover review template setup checkin checkout].freeze
+		REPO_COMMANDS = %w[deliver receive sync status prune housekeep worktree abandon recover review template setup checkin checkout].freeze
 		ALL_COMMANDS = ( PORTFOLIO_COMMANDS + REPO_COMMANDS ).freeze
 
 		def self.start( arguments:, repo_root:, tool_root:, output:, error: )
@@ -131,25 +131,19 @@ module Carson
 			OptionParser.new do |parser|
 				parser.banner = "Usage: carson <command> [options]\n       carson <repo> <command> [options]"
 				parser.separator ""
-				parser.separator "Repository governance and workflow automation for coding agents."
-				parser.separator ""
-				parser.separator "Portfolio commands:"
-				parser.separator "    list         List governed repositories"
-				parser.separator "    onboard      Register a repository for governance (requires repo path)"
-				parser.separator "    offboard     Remove a repository from governance (requires repo path)"
-				parser.separator "    refresh      Re-install hooks and configuration (all governed repos)"
-				parser.separator "    version      Show Carson version"
+				parser.separator "Keep agents from breaking main. Keep agents from breaking each other."
 				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 "    checkin      Get a fresh workbench"
+				parser.separator "    deliver      Accept into main and back up to remote"
 				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 "Portfolio:"
+				parser.separator "    onboard      Start governing a repository"
+				parser.separator "    offboard     Stop governing a repository"
+				parser.separator "    list         Show governed repositories"
+				parser.separator "    version      Show Carson version"
 				parser.separator ""
-				parser.separator "Run `carson <command> --help` for details on a specific command."
+				parser.separator "Run `carson <command> --help` for details."
 			end
 		end
 
@@ -160,7 +154,7 @@ module Carson
 				return { command: :help }
 			end
 			return { command: "version" } if [ "--version", "-v" ].include?( first )
-			return { command: "audit" } if arguments.empty?
+			return { command: "status" } if arguments.empty?
 
 			nil
 		end
@@ -223,8 +217,6 @@ module Carson
 				parse_sync_command( arguments: arguments, error: error )
 			when "status"
 				parse_status_command( arguments: arguments, error: error )
-			when "audit"
-				parse_audit_command( arguments: arguments, error: error )
 			when "prune"
 				parse_prune_command( arguments: arguments, error: error )
 			when "housekeep"
@@ -290,7 +282,7 @@ module Carson
 				parser.banner = "Usage: carson onboard <REPO_PATH>"
 				parser.separator ""
 				parser.separator "Register a repository for Carson governance."
-				parser.separator "Detects the remote, installs hooks, applies templates, and runs initial audit."
+				parser.separator "Detects the remote, installs hooks, and applies templates."
 				parser.separator ""
 				parser.separator "Examples:"
 				parser.separator "    carson onboard ~/Dev/app   Onboard a specific repository"
@@ -683,36 +675,6 @@ module Carson
 			{ command: :invalid }
 		end
 
-		# --- audit ---
-
-		def self.parse_audit_command( arguments:, error: )
-			options = { json: false }
-			audit_parser = OptionParser.new do |parser|
-				parser.banner = "Usage: carson audit [--json]"
-				parser.separator ""
-				parser.separator "Run pre-commit health checks on the repository."
-				parser.separator "Validates hooks, main-branch sync, PR status, and CI baseline."
-				parser.separator "Exits with a non-zero status when policy violations are found."
-				parser.separator ""
-				parser.separator "Options:"
-				parser.on( "--json", "Machine-readable JSON output" ) { options[ :json ] = true }
-				parser.separator ""
-				parser.separator "Examples:"
-				parser.separator "    carson audit           Check repository health (also the default command)"
-				parser.separator "    carson audit --json    Structured output for agent consumption"
-			end
-			audit_parser.parse!( arguments )
-			unless arguments.empty?
-				error.puts "#{BADGE} Unexpected arguments for audit: #{arguments.join( ' ' )}"
-				return { command: :invalid }
-			end
-			{ command: "audit", json: options[ :json ] }
-		rescue OptionParser::ParseError => exception
-			error.puts "#{BADGE} #{exception.message}"
-			error.puts audit_parser
-			{ command: :invalid }
-		end
-
 		# --- abandon ---
 
 		def self.parse_abandon_command( arguments:, error: )
@@ -813,20 +775,20 @@ module Carson
 
 			options = { json: false, title: nil, body_file: nil, commit_message: nil }
 			deliver_parser = OptionParser.new do |parser|
-				parser.banner = "Usage: carson deliver [--json] [--title TITLE] [--body-file PATH] [--commit MESSAGE]"
+				parser.banner = "Usage: carson deliver [--json] [--commit MESSAGE]"
 				parser.separator ""
-				parser.separator "Push the current branch, create or refresh the pull request, and hand the branch to Carson."
-				parser.separator "Use --commit to create one all-dirty delivery commit before Carson pushes and opens the PR."
+				parser.separator "Accept committed work into main and sync to remote."
+				parser.separator "Use --commit to stage and commit all changes before delivery."
 				parser.separator ""
 				parser.separator "Options:"
 				parser.on( "--json", "Machine-readable JSON output" ) { options[ :json ] = true }
-				parser.on( "--title TITLE", "PR title (defaults to branch name)" ) { |value| options[ :title ] = value }
-				parser.on( "--body-file PATH", "File containing PR body text" ) { |value| options[ :body_file ] = value }
-				parser.on( "--commit MESSAGE", "Commit all dirty user changes before delivery" ) { |value| options[ :commit_message ] = value }
+				parser.on( "--title TITLE", "PR title (remote workstyle only)" ) { |value| options[ :title ] = value }
+				parser.on( "--body-file PATH", "PR body file (remote workstyle only)" ) { |value| options[ :body_file ] = value }
+				parser.on( "--commit MESSAGE", "Commit all changes before delivery" ) { |value| options[ :commit_message ] = value }
 				parser.separator ""
 				parser.separator "Examples:"
 				parser.separator "    carson deliver                               Deliver existing commits"
-				parser.separator "    carson deliver --commit \"fix: harden flow\"   Commit dirty changes, then deliver"
+				parser.separator "    carson deliver --commit \"fix: harden flow\"   Commit then deliver"
 			end
 			deliver_parser.parse!( arguments )
 			if options.fetch( :commit_message, nil ).to_s.strip.empty? && !options.fetch( :commit_message, nil ).nil?
@@ -860,7 +822,7 @@ module Carson
 				parser.banner = "Usage: carson recover --check NAME [--json]"
 				parser.separator ""
 				parser.separator "Merge the current repair PR when one governance-owned required check is already red on the default branch."
-				parser.separator "Recovery is narrow: Carson verifies the baseline failure, keeps every other gate intact, and records an audit event."
+				parser.separator "Recovery is narrow: Carson verifies the baseline failure, keeps every other gate intact, and records a recovery event."
 				parser.separator ""
 				parser.separator "Options:"
 				parser.on( "--check NAME", "Name of the governance-owned required check to recover" ) { |value| options[ :check_name ] = value }
@@ -994,8 +956,6 @@ module Carson
 				runtime.status!( json_output: parsed.fetch( :json, false ) )
 			when "setup"
 				runtime.setup!( cli_choices: parsed.fetch( :cli_choices, {} ) )
-			when "audit"
-				runtime.audit!( json_output: parsed.fetch( :json, false ) )
 			when "abandon"
 				runtime.abandon!( target: parsed.fetch( :target ), json_output: parsed.fetch( :json, false ) )
 			when "sync"
@@ -1023,15 +983,15 @@ module Carson
 			when "template:apply"
 				runtime.template_apply!( push_prep: parsed.fetch( :push_prep, false ) )
 			when "deliver"
-				if runtime.config.workstyle == :local
-					dispatch_deliver_locally( parsed: parsed, runtime: runtime )
-				else
+				if runtime.config.bureau
 					runtime.deliver!(
 						title: parsed.fetch( :title, nil ),
 						body_file: parsed.fetch( :body_file, nil ),
 						commit_message: parsed.fetch( :commit_message, nil ),
 						json_output: parsed.fetch( :json, false )
 					)
+				else
+					dispatch_deliver_locally( parsed: parsed, runtime: runtime )
 				end
 			when "recover"
 				runtime.recover!(
@@ -1102,6 +1062,14 @@ module Carson
 			json = parsed.fetch( :json, false )
 			output = runtime.output
 
+			# Guard: cannot deliver from main itself.
+			if parcel.on_main?( runtime.config.main_branch )
+				result = { command: "deliver", status: "block",
+					error: "Cannot deliver from #{runtime.config.main_branch}.",
+					recovery: "carson checkin <name>" }
+				return report_deliver( result: result, json: json, output: output )
+			end
+
 			# Step 1: Prepare.
 			prep = warehouse.prepare!( parcel, message: message )
 			unless prep[ :status ] == "ok"
@@ -1119,12 +1087,12 @@ module Carson
 				return report_deliver( result: accept, json: json, output: output )
 			end
 
-			# Step 3: Courier delivers backup.
-			courier = Courier.new( warehouse, workstyle: :local, output: output )
-			backup = courier.deliver( parcel )
+			# Step 3: Courier syncs to remote.
+			courier = Courier.new( warehouse, output: output )
+			sync = courier.deliver( parcel )
 
 			# Combine results.
-			result = accept.merge( backup.slice( :outcome, :synced, :backup_error ) )
+			result = accept.merge( sync.slice( :outcome, :synced, :sync_error ) )
 			result[ :command ] = "deliver"
 			result[ :outcome ] ||= "delivered"
 			report_deliver( result: result, json: json, output: output )
@@ -1146,9 +1114,9 @@ module Carson
 				when "ok"
 					output.puts "#{BADGE} #{result[ :branch ]} merged into main."
 					if result[ :synced ]
-						output.puts "#{BADGE} Pushed to #{result.fetch( :remote_main, "remote" )}."
-					elsif result[ :backup_error ]
-						output.puts "#{BADGE} Backup failed."
+						output.puts "#{BADGE} Synced to remote."
+					elsif result[ :sync_error ]
+						output.puts "#{BADGE} Sync failed."
 						output.puts "  \u2192 git push"
 					end
 				when "block", "error"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carson
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.2
 platform: ruby
 authors:
 - Hailei Wang
@@ -57,7 +57,6 @@ files:
 - lib/carson/revision.rb
 - lib/carson/runtime.rb
 - lib/carson/runtime/abandon.rb
-- lib/carson/runtime/audit.rb
 - lib/carson/runtime/deliver.rb
 - lib/carson/runtime/housekeep.rb
 - lib/carson/runtime/list.rb