carson 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8fc2b54698568aaec7d7f4ec39ecd32f56f44a395555a34099b24ec52a1d608
-  data.tar.gz: e3b0a5a14c733d6b2e9f5c08475d89a53f0a3d1faf8a2fb85ed72bcb76f662ef
+  metadata.gz: d430ed51ffe8ee87c8aa2a652c63d92ef7e9f0a65713b9104dd4df57dbcba90a
+  data.tar.gz: d5bf899e7acc479cb5f673c0ba0323dce10e83a6c8d843f418d9db53adbbed38
 SHA512:
-  metadata.gz: 9d3733f98a23dffdc69c1ebde71e94595c22e662f5ead86b97988fa3f5cf0e8daf56806deb82ceb1d034e0913640d9a8b7cafc26992f94e43dd96a3e304d6812
-  data.tar.gz: eb44eca84a943a461668b478e2bed295b3a73ee7e916cc5d85a837c52f5be09326b369e07a99812d4ffdc883914511d18c7f0489e151f3d4d66afe8ddaf97402
+  metadata.gz: 903da2928ca57d07422e7450670efb7686603934fc2b7aa8122789fcea6ecce2e1b841420c15c2df39dc33b2789c4d3a85a0cb56dc5816aa1b0216fa103f7cb5
+  data.tar.gz: 2c67d3aa87576d0124d3ea2fb31fdaf8457cbfb81199c539e103072636a1fcaef4e1274c3642d1a843117c1cd88a69e437cf369c5f981a06fed50d6e57e0d2f3

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.6.0 — Prune JSON + Recovery
+
+### What changed
+
+- **`carson prune --json`** — machine-readable JSON output for the prune command. The JSON envelope includes `command`, `status`, `branches` (array of per-branch details), `deleted`, `skipped`, and `exit_code`. Each branch entry has `branch`, `upstream`, `type` (stale/orphan/absorbed), `action` (deleted/skipped), and `reason`.
+- **Recovery-aware prune errors** — outsider fingerprint blocks now include the specific recovery command in JSON output.
+- **Structured branch entries** — internal prune methods now return structured hashes instead of bare symbols, enabling per-branch detail collection for JSON mode.
+
+### UX
+
+- JSON output suppresses `git fetch` stdout to keep the JSON envelope clean.
+- Human output remains unchanged when `--json` is not passed.
+- All existing prune tests pass unchanged — human output behaviour is preserved.
+
+### Migration
+
+- No breaking changes. `carson prune` without `--json` behaves identically to 3.5.0.
+
 ## 3.5.0 — Sync JSON + Recovery
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-3.5.0
+3.6.0

data/lib/carson/cli.rb

@@ -53,7 +53,7 @@ module Carson
 
 		def self.build_parser
 			OptionParser.new do |opts|
-				opts.banner = "Usage: carson [status [--json]|setup|audit [--json]|sync [--json]|deliver [--merge] [--json] [--title T] [--body-file F]|prune [--all]|worktree create|done|remove <name>|onboard|refresh [--all]|offboard|template check|apply|review gate|sweep|govern [--dry-run] [--json] [--loop SECONDS]|version]"
+				opts.banner = "Usage: carson [status [--json]|setup|audit [--json]|sync [--json]|deliver [--merge] [--json] [--title T] [--body-file F]|prune [--all] [--json]|worktree create|done|remove <name>|onboard|refresh [--all]|offboard|template check|apply|review gate|sweep|govern [--dry-run] [--json] [--loop SECONDS]|version]"
 			end
 		end
 
@@ -168,9 +168,10 @@ module Carson
 
 		def self.parse_prune_command( argv:, parser:, err: )
 			all_flag = argv.delete( "--all" ) ? true : false
+			json_flag = argv.delete( "--json" ) ? true : false
 			parser.parse!( argv )
-			return { command: "prune:all" } if all_flag
-			{ command: "prune" }
+			return { command: "prune:all", json: json_flag } if all_flag
+			{ command: "prune", json: json_flag }
 		end
 
 		def self.parse_worktree_subcommand( argv:, parser:, err: )
@@ -347,7 +348,7 @@ module Carson
 			when "sync"
 				runtime.sync!( json_output: parsed.fetch( :json, false ) )
 			when "prune"
-				runtime.prune!
+				runtime.prune!( json_output: parsed.fetch( :json, false ) )
 			when "prune:all"
 				runtime.prune_all!
 			when "worktree:create"

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

@@ -1,31 +1,74 @@
+# Removes stale local branches (gone upstream), orphan branches (no tracking) with merged PR evidence,
+# and absorbed branches (content already on main, no open PR).
+# Supports --json for machine-readable structured output with per-branch action details.
 module Carson
 	class Runtime
 		module Local
-			# Removes stale local branches (gone upstream), orphan branches (no tracking) with merged PR evidence,
-			# and absorbed branches (content already on main, no open PR).
-			def prune!
+			def prune!( json_output: false )
 				fingerprint_status = block_if_outsider_fingerprints!
-				return fingerprint_status unless fingerprint_status.nil?
+				unless fingerprint_status.nil?
+					if json_output
+						out.puts JSON.pretty_generate( {
+							command: "prune", status: "block",
+							error: "Carson-owned artefacts detected in host repository",
+							recovery: "remove Carson-owned files (.carson.yml, bin/carson, .tools/carson) then retry",
+							exit_code: EXIT_BLOCK
+						} )
+					end
+					return fingerprint_status
+				end
 
-				git_system!( "fetch", config.git_remote, "--prune" )
+				prune_git!( "fetch", config.git_remote, "--prune", json_output: json_output )
 				active_branch = current_branch
 				counters = { deleted: 0, skipped: 0 }
+				branches = []
 
 				stale_branches = stale_local_branches
-				prune_stale_branch_entries( stale_branches: stale_branches, active_branch: active_branch, counters: counters )
+				prune_stale_branch_entries( stale_branches: stale_branches, active_branch: active_branch, counters: counters, branches: branches )
 
 				orphan_branches = orphan_local_branches( active_branch: active_branch )
-				prune_orphan_branch_entries( orphan_branches: orphan_branches, counters: counters )
+				prune_orphan_branch_entries( orphan_branches: orphan_branches, counters: counters, branches: branches )
 
 				absorbed_branches = absorbed_local_branches( active_branch: active_branch )
-				prune_absorbed_branch_entries( absorbed_branches: absorbed_branches, counters: counters )
+				prune_absorbed_branch_entries( absorbed_branches: absorbed_branches, counters: counters, branches: branches )
+
+				prune_finish(
+					result: { command: "prune", status: "ok", branches: branches, deleted: counters.fetch( :deleted ), skipped: counters.fetch( :skipped ) },
+					exit_code: EXIT_OK, json_output: json_output, counters: counters
+				)
+			end
 
-				return prune_no_stale_branches if counters.fetch( :deleted ).zero? && counters.fetch( :skipped ).zero?
+		private
+
+			# Unified output for prune results — JSON or human-readable.
+			def prune_finish( result:, exit_code:, json_output:, counters: )
+				result[ :exit_code ] = exit_code
+
+				if json_output
+					out.puts JSON.pretty_generate( result )
+				else
+					print_prune_human( counters: counters )
+				end
 
-				puts_verbose "prune_summary: deleted=#{counters.fetch( :deleted )} skipped=#{counters.fetch( :skipped )}"
+				exit_code
+			end
+
+			# Human-readable output for prune results.
+			def print_prune_human( counters: )
+				deleted_count = counters.fetch( :deleted )
+				skipped_count = counters.fetch( :skipped )
+
+				if deleted_count.zero? && skipped_count.zero?
+					if verbose?
+						puts_line "OK: no stale or orphan branches to prune."
+					else
+						puts_line "No stale branches."
+					end
+					return
+				end
+
+				puts_verbose "prune_summary: deleted=#{deleted_count} skipped=#{skipped_count}"
 				unless verbose?
-					deleted_count = counters.fetch( :deleted )
-					skipped_count = counters.fetch( :skipped )
 					message = if deleted_count > 0 && skipped_count > 0
 						"Pruned #{deleted_count}, skipped #{skipped_count} (--verbose for details)."
 					elsif deleted_count > 0
@@ -35,24 +78,23 @@ module Carson
 					end
 					puts_line message
 				end
-				EXIT_OK
 			end
 
-		private
-
-			def prune_no_stale_branches
-				if verbose?
-					puts_line "OK: no stale or orphan branches to prune."
+			# Runs a git command, suppressing stdout in JSON mode to keep output clean.
+			def prune_git!( *args, json_output: false )
+				if json_output
+					_, stderr_text, success, = git_run( *args )
+					raise "git #{args.join( ' ' )} failed: #{stderr_text.to_s.strip}" unless success
 				else
-					puts_line "No stale branches."
+					git_system!( *args )
 				end
-				EXIT_OK
 			end
 
-			def prune_stale_branch_entries( stale_branches:, active_branch:, counters: { deleted: 0, skipped: 0 } )
+			def prune_stale_branch_entries( stale_branches:, active_branch:, counters: { deleted: 0, skipped: 0 }, branches: [] )
 				stale_branches.each do |entry|
-					outcome = prune_stale_branch_entry( entry: entry, active_branch: active_branch )
-					counters[ outcome ] += 1
+					result = prune_stale_branch_entry( entry: entry, active_branch: active_branch )
+					counters[ result.fetch( :action ) ] += 1
+					branches << result
 				end
 				counters
 			end
@@ -67,9 +109,10 @@ module Carson
 			end
 
 			def prune_skip_stale_branch( type:, branch:, upstream: )
+				reason = type == :protected ? "protected branch" : "current branch"
 				status = type == :protected ? "skip_protected_branch" : "skip_current_branch"
 				puts_verbose "#{status}: #{branch} (upstream=#{upstream})"
-				:skipped
+				{ action: :skipped, branch: branch, upstream: upstream, type: "stale", reason: reason }
 			end
 
 			def prune_delete_stale_branch( branch:, upstream: )
@@ -87,7 +130,7 @@ module Carson
 			def prune_safe_delete_success( branch:, upstream:, stdout_text: )
 				out.print stdout_text if verbose? && !stdout_text.empty?
 				puts_verbose "deleted_local_branch: #{branch} (upstream=#{upstream})"
-				:deleted
+				{ action: :deleted, branch: branch, upstream: upstream, type: "stale", reason: "upstream gone" }
 			end
 
 			def prune_force_delete_stale_branch( branch:, upstream:, delete_error_text: )
@@ -106,19 +149,19 @@ module Carson
 			def prune_force_delete_success( branch:, upstream:, merged_pr:, force_stdout: )
 				out.print force_stdout if verbose? && !force_stdout.empty?
 				puts_verbose "deleted_local_branch_force: #{branch} (upstream=#{upstream}) merged_pr=#{merged_pr.fetch( :url )}"
-				:deleted
+				{ action: :deleted, branch: branch, upstream: upstream, type: "stale", reason: "force deleted with PR evidence" }
 			end
 
 			def prune_force_delete_failed( branch:, upstream:, force_stderr: )
 				force_error_text = normalise_branch_delete_error( error_text: force_stderr )
 				puts_verbose "fail_force_delete_branch: #{branch} (upstream=#{upstream}) reason=#{force_error_text}"
-				:skipped
+				{ action: :skipped, branch: branch, upstream: upstream, type: "stale", reason: force_error_text }
 			end
 
 			def prune_force_delete_skipped( branch:, upstream:, delete_error_text:, force_error: )
 				puts_verbose "skip_delete_branch: #{branch} (upstream=#{upstream}) reason=#{delete_error_text}"
 				puts_verbose "skip_force_delete_branch: #{branch} (upstream=#{upstream}) reason=#{force_error}" unless force_error.to_s.strip.empty?
-				:skipped
+				{ action: :skipped, branch: branch, upstream: upstream, type: "stale", reason: delete_error_text }
 			end
 
 			def normalise_branch_delete_error( error_text: )
@@ -229,13 +272,14 @@ module Carson
 			end
 
 			# Processes absorbed branches: verifies no open PR exists before deleting local and remote.
-			def prune_absorbed_branch_entries( absorbed_branches:, counters: )
+			def prune_absorbed_branch_entries( absorbed_branches:, counters:, branches: [] )
 				return counters if absorbed_branches.empty?
 				return counters unless gh_available?
 
 				absorbed_branches.each do |entry|
-					outcome = prune_absorbed_branch_entry( branch: entry.fetch( :branch ), upstream: entry.fetch( :upstream ) )
-					counters[ outcome ] += 1
+					result = prune_absorbed_branch_entry( branch: entry.fetch( :branch ), upstream: entry.fetch( :upstream ) )
+					counters[ result.fetch( :action ) ] += 1
+					branches << result
 				end
 				counters
 			end
@@ -244,14 +288,14 @@ module Carson
 			def prune_absorbed_branch_entry( branch:, upstream: )
 				if branch_has_open_pr?( branch: branch )
 					puts_verbose "skip_absorbed_branch: #{branch} reason=open PR exists"
-					return :skipped
+					return { action: :skipped, branch: branch, upstream: upstream, type: "absorbed", reason: "open PR exists" }
 				end
 
 				force_stdout, force_stderr, force_success = force_delete_local_branch( branch: branch )
 				unless force_success
 					error_text = normalise_branch_delete_error( error_text: force_stderr )
 					puts_verbose "fail_delete_absorbed_branch: #{branch} reason=#{error_text}"
-					return :skipped
+					return { action: :skipped, branch: branch, upstream: upstream, type: "absorbed", reason: error_text }
 				end
 
 				out.print force_stdout if verbose? && !force_stdout.empty?
@@ -260,7 +304,7 @@ module Carson
 				git_run( "push", config.git_remote, "--delete", remote_branch )
 
 				puts_verbose "deleted_absorbed_branch: #{branch} (upstream=#{upstream})"
-				:deleted
+				{ action: :deleted, branch: branch, upstream: upstream, type: "absorbed", reason: "content already on main" }
 			end
 
 			# Returns true if the branch has at least one open PR.
@@ -282,13 +326,14 @@ module Carson
 			end
 
 			# Processes orphan branches: verifies merged PR evidence via GitHub API before deleting.
-			def prune_orphan_branch_entries( orphan_branches:, counters: )
+			def prune_orphan_branch_entries( orphan_branches:, counters:, branches: [] )
 				return counters if orphan_branches.empty?
 				return counters unless gh_available?
 
 				orphan_branches.each do |branch|
-					outcome = prune_orphan_branch_entry( branch: branch )
-					counters[ outcome ] += 1
+					result = prune_orphan_branch_entry( branch: branch )
+					counters[ result.fetch( :action ) ] += 1
+					branches << result
 				end
 				counters
 			end
@@ -300,12 +345,12 @@ module Carson
 					error_text = tip_sha_error.to_s.strip
 					error_text = "unable to read local branch tip sha" if error_text.empty?
 					puts_verbose "skip_orphan_branch: #{branch} reason=#{error_text}"
-					return :skipped
+					return { action: :skipped, branch: branch, upstream: "", type: "orphan", reason: error_text }
 				end
 				branch_tip_sha = tip_sha_text.to_s.strip
 				if branch_tip_sha.empty?
 					puts_verbose "skip_orphan_branch: #{branch} reason=unable to read local branch tip sha"
-					return :skipped
+					return { action: :skipped, branch: branch, upstream: "", type: "orphan", reason: "unable to read local branch tip sha" }
 				end
 
 				merged_pr, error = merged_pr_for_branch( branch: branch, branch_tip_sha: branch_tip_sha )
@@ -313,19 +358,19 @@ module Carson
 					reason = error.to_s.strip
 					reason = "no merged PR evidence for branch tip into #{config.main_branch}" if reason.empty?
 					puts_verbose "skip_orphan_branch: #{branch} reason=#{reason}"
-					return :skipped
+					return { action: :skipped, branch: branch, upstream: "", type: "orphan", reason: reason }
 				end
 
 				force_stdout, force_stderr, force_success = force_delete_local_branch( branch: branch )
 				if force_success
 					out.print force_stdout if verbose? && !force_stdout.empty?
 					puts_verbose "deleted_orphan_branch: #{branch} merged_pr=#{merged_pr.fetch( :url )}"
-					return :deleted
+					return { action: :deleted, branch: branch, upstream: "", type: "orphan", reason: "merged PR evidence found" }
 				end
 
 				force_error_text = normalise_branch_delete_error( error_text: force_stderr )
 				puts_verbose "fail_delete_orphan_branch: #{branch} reason=#{force_error_text}"
-				:skipped
+				{ action: :skipped, branch: branch, upstream: "", type: "orphan", reason: force_error_text }
 			end
 
 			# Safe delete can fail after squash merges because branch tip is no longer an ancestor.

metadata

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