carson 3.22.1 → 3.23.1

data/lib/carson/runtime/housekeep.rb

@@ -67,8 +67,8 @@ module Carson
 					results << entry
 				end
 
-				succeeded = results.count { it[ :status ] == "ok" }
-				failed = results.count { it[ :status ] != "ok" }
+				succeeded = results.count { |entry| entry[ :status ] == "ok" }
+				failed = results.count { |entry| entry[ :status ] != "ok" }
 				result = { command: "housekeep", status: failed.zero? ? "ok" : "partial", repos: results, succeeded: succeeded, failed: failed }
 				housekeep_finish( result: result, exit_code: failed.zero? ? EXIT_OK : EXIT_ERROR, json_output: json_output, results: results, succeeded: succeeded, failed: failed )
 			end
@@ -90,10 +90,10 @@ module Carson
 				main_root = main_worktree_root
 				items = []
 
-				agent_prefixes = Worktree::AGENT_DIRS.filter_map do |dir|
+				agent_prefixes = Worktree::AGENT_DIRS.map do |dir|
 					full = File.join( main_root, dir, "worktrees" )
 					File.join( realpath_safe( full ), "" ) if Dir.exist?( full )
-				end
+				end.compact
 
 				worktree_list.each do |worktree|
 					next if worktree.path == main_root

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

@@ -21,7 +21,7 @@ module Carson
 				puts_line "Onboarding #{repo_name}..."
 
 				if !global_config_exists? || !git_remote_exists?( remote_name: config.git_remote )
-					if self.in.respond_to?( :tty? ) && self.in.tty?
+					if input_stream.respond_to?( :tty? ) && input_stream.tty?
 						setup_status = setup!
 						return setup_status unless setup_status == EXIT_OK
 					else
@@ -48,7 +48,7 @@ module Carson
 					hook_status = prepare!
 					return hook_status unless hook_status == EXIT_OK
 
-					drift_count = template_results.count { it.fetch( :status ) != "ok" }
+					drift_count = template_results.count { |entry| entry.fetch( :status ) != "ok" }
 					stale_count = template_superseded_present.count
 					template_status = template_apply!
 					return template_status unless template_status == EXIT_OK
@@ -69,7 +69,7 @@ module Carson
 				return hook_status unless hook_status == EXIT_OK
 				puts_line "Hooks installed (#{config.managed_hooks.count} hooks)."
 
-				template_drift_count = template_results.count { it.fetch( :status ) != "ok" }
+				template_drift_count = template_results.count { |entry| entry.fetch( :status ) != "ok" }
 				stale_count = template_superseded_present.count
 				template_status = with_captured_output { template_apply! }
 				return template_status unless template_status == EXIT_OK
@@ -202,7 +202,7 @@ module Carson
 					puts_line "#{repo_root} is not a git repository."
 					return EXIT_ERROR
 				end
-				if self.in.respond_to?( :tty? ) && self.in.tty?
+				if input_stream.respond_to?( :tty? ) && input_stream.tty?
 					puts_line ""
 					puts_line "This will remove Carson hooks, managed .github/ files,"
 					puts_line "and deregister this repository from portfolio governance."
@@ -251,7 +251,7 @@ module Carson
 				return hook_status unless hook_status == EXIT_OK
 				puts_line "Hooks installed (#{config.managed_hooks.count} hooks)."
 
-				template_drift_count = template_results.count { it.fetch( :status ) != "ok" }
+				template_drift_count = template_results.count { |entry| entry.fetch( :status ) != "ok" }
 				template_status = with_captured_output { template_apply! }
 				return template_status unless template_status == EXIT_OK
 				if template_drift_count.positive?

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

@@ -278,7 +278,7 @@ module Carson
 
 			# Detects local branches with no upstream tracking ref — candidates for orphan pruning.
 			def orphan_local_branches( active_branch:, cwd_branch: nil )
-				git_capture!( "for-each-ref", "--format=%(refname:short)\t%(upstream:short)", "refs/heads" ).lines.filter_map do |line|
+				git_capture!( "for-each-ref", "--format=%(refname:short)\t%(upstream:short)", "refs/heads" ).lines.map do |line|
 					branch, upstream = line.strip.split( "\t", 2 )
 					branch = branch.to_s.strip
 					upstream = upstream.to_s.strip
@@ -290,14 +290,14 @@ module Carson
 					next if branch == TEMPLATE_SYNC_BRANCH
 
 					branch
-				end
+				end.compact
 			end
 
 			# Detects local branches whose upstream still exists but whose content is already on main.
 			# Two-step evidence: (1) find the merge-base, (2) verify every file the branch changed
 			# relative to the merge-base has identical content on main.
 			def absorbed_local_branches( active_branch:, cwd_branch: nil )
-				git_capture!( "for-each-ref", "--format=%(refname:short)\t%(upstream:short)\t%(upstream:track)", "refs/heads" ).lines.filter_map do |line|
+				git_capture!( "for-each-ref", "--format=%(refname:short)\t%(upstream:short)\t%(upstream:track)", "refs/heads" ).lines.map do |line|
 					branch, upstream, track = line.strip.split( "\t", 3 )
 					branch = branch.to_s.strip
 					upstream = upstream.to_s.strip
@@ -313,7 +313,7 @@ module Carson
 					next unless branch_absorbed_into_main?( branch: branch )
 
 					{ branch: branch, upstream: upstream }
-				end
+				end.compact
 			end
 
 			# Returns true when the branch has no unique content relative to main.

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

@@ -28,8 +28,8 @@ module Carson
 				puts_verbose "[Template Sync Check]"
 				results = template_results
 				stale = template_superseded_present
-				drift_count = results.count { it.fetch( :status ) == "drift" }
-				error_count = results.count { it.fetch( :status ) == "error" }
+				drift_count = results.count { |entry| entry.fetch( :status ) == "drift" }
+				error_count = results.count { |entry| entry.fetch( :status ) == "error" }
 				stale_count = stale.count
 				results.each do |entry|
 					puts_verbose "template_file: #{entry.fetch( :file )} status=#{entry.fetch( :status )} reason=#{entry.fetch( :reason )}"
@@ -42,7 +42,7 @@ module Carson
 						summary_parts << "#{drift_count} of #{results.count} drifted" if drift_count.positive?
 						summary_parts << "#{stale_count} stale" if stale_count.positive?
 						puts_line "Templates: #{summary_parts.join( ", " )}"
-						results.select { it.fetch( :status ) == "drift" }.each { |entry| puts_line "  #{entry.fetch( :file )}" }
+						results.select { |entry| entry.fetch( :status ) == "drift" }.each { |entry| puts_line "  #{entry.fetch( :file )}" }
 						stale.each { |file| puts_line "  #{file} — superseded" }
 					else
 						puts_line "Templates: #{results.count} files in sync"
@@ -137,7 +137,7 @@ module Carson
 					removed += 1
 				end
 
-				error_count = results.count { it.fetch( :status ) == "error" }
+				error_count = results.count { |entry| entry.fetch( :status ) == "error" }
 				puts_verbose "template_apply_summary: updated=#{applied} removed=#{removed} error=#{error_count}"
 				unless verbose?
 					if applied.positive? || removed.positive?

data/lib/carson/runtime/review/gate_support.rb

@@ -98,7 +98,9 @@ module Carson
 					unresolved_threads = unresolved_thread_entries( details: details )
 					actionable_top_level = actionable_top_level_items( details: details, pr_author: pr_author )
 					acknowledgements = disposition_acknowledgements( details: details, pr_author: pr_author )
-					unacknowledged_actionable = actionable_top_level.reject { acknowledged_by_disposition?( item: it, acknowledgements: acknowledgements ) }
+					unacknowledged_actionable = actionable_top_level.reject do |item|
+						acknowledged_by_disposition?( item: item, acknowledgements: acknowledgements )
+					end
 					{
 						latest_activity: latest_review_activity( details: details ),
 						unresolved_threads: unresolved_threads,
@@ -112,8 +114,8 @@ module Carson
 				def review_gate_signature( snapshot: )
 					{
 						latest_activity: snapshot.fetch( :latest_activity ).to_s,
-						unresolved_urls: snapshot.fetch( :unresolved_threads ).map { it.fetch( :url ) }.sort,
-						unacknowledged_urls: snapshot.fetch( :unacknowledged_actionable ).map { it.fetch( :url ) }.sort
+						unresolved_urls: snapshot.fetch( :unresolved_threads ).map { |entry| entry.fetch( :url ) }.sort,
+						unacknowledged_urls: snapshot.fetch( :unacknowledged_actionable ).map { |entry| entry.fetch( :url ) }.sort
 					}
 				end
 
@@ -138,7 +140,7 @@ module Carson
 				# Normalise both sides by stripping the [bot] suffix for a consistent match.
 				def bot_username?( author: )
 					normalised = author.to_s.downcase.delete_suffix( "[bot]" )
-					config.review_bot_usernames.any? { it.downcase.delete_suffix( "[bot]" ) == normalised }
+					config.review_bot_usernames.any? { |username| username.downcase.delete_suffix( "[bot]" ) == normalised }
 				end
 
 				def unresolved_thread_entries( details: )
@@ -149,7 +151,7 @@ module Carson
 						comments = thread.fetch( :comments )
 						first_comment = comments.first || {}
 						next if bot_username?( author: first_comment.fetch( :author, "" ) )
-						latest_time = comments.map { it.fetch( :created_at ) }.max.to_s
+						latest_time = comments.map { |comment| comment.fetch( :created_at ) }.max.to_s
 						{
 							url: blank_to( value: first_comment.fetch( :url, "" ), default: "#{details.fetch( :url )}#thread-#{index + 1}" ),
 							author: first_comment.fetch( :author, "" ),
@@ -201,7 +203,7 @@ module Carson
 					sources = []
 					sources.concat( Array( details.fetch( :comments ) ) )
 					sources.concat( Array( details.fetch( :reviews ) ) )
-					sources.concat( Array( details.fetch( :review_threads ) ).flat_map { it.fetch( :comments ) } )
+					sources.concat( Array( details.fetch( :review_threads ) ).flat_map { |thread| thread.fetch( :comments ) } )
 					sources.map do |entry|
 						next unless entry.fetch( :author, "" ) == pr_author
 						body = entry.fetch( :body, "" ).to_s
@@ -222,7 +224,7 @@ module Carson
 				# True when any disposition acknowledgement references the specific finding URL.
 				def acknowledged_by_disposition?( item:, acknowledgements: )
 					acknowledgements.any? do |ack|
-						Array( ack.fetch( :target_urls ) ).any? { it == item.fetch( :url ) }
+						Array( ack.fetch( :target_urls ) ).any? { |target_url| target_url == item.fetch( :url ) }
 					end
 				end
 
@@ -230,10 +232,10 @@ module Carson
 				def latest_review_activity( details: )
 					timestamps = []
 					timestamps << details.fetch( :updated_at )
-					timestamps.concat( Array( details.fetch( :comments ) ).map { it.fetch( :created_at ) } )
-					timestamps.concat( Array( details.fetch( :reviews ) ).map { it.fetch( :created_at ) } )
-					timestamps.concat( Array( details.fetch( :review_threads ) ).flat_map { it.fetch( :comments ) }.map { it.fetch( :created_at ) } )
-					timestamps.map { parse_time_or_nil( text: it ) }.compact.max&.utc&.iso8601
+					timestamps.concat( Array( details.fetch( :comments ) ).map { |comment| comment.fetch( :created_at ) } )
+					timestamps.concat( Array( details.fetch( :reviews ) ).map { |review| review.fetch( :created_at ) } )
+					timestamps.concat( Array( details.fetch( :review_threads ) ).flat_map { |thread| thread.fetch( :comments ) }.map { |comment| comment.fetch( :created_at ) } )
+					timestamps.map { |timestamp| parse_time_or_nil( text: timestamp ) }.compact.max&.utc&.iso8601
 				end
 
 				def resolved_review_gate_pr_summary( owner:, repo:, pr_number:, pr_summary: )
@@ -339,7 +341,7 @@ module Carson
 					if report.fetch( :block_reasons ).empty?
 						lines << "- none"
 					else
-						report.fetch( :block_reasons ).each { lines << "- #{it}" }
+						report.fetch( :block_reasons ).each { |reason| lines << "- #{reason}" }
 					end
 					lines << ""
 					lines << "## Unresolved Threads"

data/lib/carson/runtime/review/sweep_support.rb

@@ -60,7 +60,7 @@ module Carson
 						)
 					end
 
-					Array( details.fetch( :review_threads ) ).flat_map { it.fetch( :comments ) }.each do |comment|
+					Array( details.fetch( :review_threads ) ).flat_map { |thread| thread.fetch( :comments ) }.each do |comment|
 						next if comment.fetch( :author ) == pr_author
 						next if bot_username?( author: comment.fetch( :author ) )
 						hits = matched_risk_keywords( text: comment.fetch( :body ) )
@@ -153,7 +153,7 @@ module Carson
 					stdout_text, stderr_text, success, = gh_run( "issue", "list", "--repo", repo_slug, "--state", "all", "--limit", "100", "--json", "number,title,state,url,labels" )
 					raise gh_error_text( stdout_text: stdout_text, stderr_text: stderr_text, fallback: "unable to list issues for review sweep" ) unless success
 					issues = Array( JSON.parse( stdout_text ) )
-					node = issues.find { it[ "title" ].to_s == config.review_tracking_issue_title }
+					node = issues.find { |issue| issue[ "title" ].to_s == config.review_tracking_issue_title }
 					return nil if node.nil?
 					{
 						number: node[ "number" ],

data/lib/carson/runtime/review/utility.rb

@@ -25,7 +25,7 @@ module Carson
 
 				# GitHub URL extraction for mapping disposition acknowledgements to finding URLs.
 				def extract_github_urls( text: )
-					text.to_s.scan( %r{https://github\.com/[^\s\)\]]+} ).map { it.sub( /[.,;:]+$/, "" ) }.uniq
+					text.to_s.scan( %r{https://github\.com/[^\s\)\]]+} ).map { |url| url.sub( /[.,;:]+$/, "" ) }.uniq
 				end
 
 				# Parse RFC3339 timestamps and return nil on blank/invalid values.

data/lib/carson/runtime/setup.rb

@@ -21,7 +21,7 @@ module Carson
 					return write_setup_config( choices: cli_choices )
 				end
 
-				if self.in.respond_to?( :tty? ) && self.in.tty?
+				if input_stream.respond_to?( :tty? ) && input_stream.tty?
 					interactive_setup!
 				else
 					silent_setup!
@@ -42,9 +42,6 @@ module Carson
 				workflow_choice = prompt_workflow_style
 				choices[ "workflow.style" ] = workflow_choice unless workflow_choice.nil?
 
-				merge_choice = prompt_merge_method
-				choices[ "govern.merge.method" ] = merge_choice unless merge_choice.nil?
-
 				canonical_choice = prompt_canonical_lint_policy
 				choices[ "lint.canonical" ] = canonical_choice unless canonical_choice.nil?
 
@@ -67,7 +64,7 @@ module Carson
 				duplicates = duplicate_remote_groups( remotes: remotes )
 				unless duplicates.empty?
 					duplicates.each_value do |group|
-						names = group.map { it.fetch( :name ) }.join( " and " )
+						names = group.map { |entry| entry.fetch( :name ) }.join( " and " )
 						puts_verbose "duplicate_remotes: #{names} share the same URL"
 					end
 				end
@@ -91,10 +88,10 @@ module Carson
 				end
 
 				duplicates = duplicate_remote_groups( remotes: remotes )
-				duplicate_names = duplicates.values.flatten.map { it.fetch( :name ) }.to_set
+				duplicate_names = duplicates.values.flatten.map { |entry| entry.fetch( :name ) }.to_set
 				unless duplicates.empty?
 					duplicates.each_value do |group|
-						names = group.map { it.fetch( :name ) }.join( " and " )
+						names = group.map { |entry| entry.fetch( :name ) }.join( " and " )
 						puts_line "Remotes #{names} share the same URL. Consider removing the duplicate."
 					end
 				end
@@ -139,21 +136,7 @@ module Carson
 					{ label: "branch — enforce PR-only merges (default)", value: "branch" },
 					{ label: "trunk — commit directly to main", value: "trunk" }
 				]
-				default_index = options.index { it.fetch( :value ) == current } || 0
-				prompt_choice( options: options, default: default_index )
-			end
-
-			def prompt_merge_method
-				puts_line ""
-				puts_line "Merge method"
-				current = config.govern_merge_method
-				puts_line "  Currently: #{current}" unless current.nil? || current.empty?
-				options = [
-					{ label: "squash — one commit per PR (recommended)", value: "squash" },
-					{ label: "rebase — linear history, individual commits", value: "rebase" },
-					{ label: "merge — merge commits", value: "merge" }
-				]
-				default_index = options.index { it.fetch( :value ) == current } || 0
+				default_index = options.index { |option| option.fetch( :value ) == current } || 0
 				prompt_choice( options: options, default: default_index )
 			end
 
@@ -177,7 +160,7 @@ module Carson
 				end
 				output.print "#{BADGE} Choice [#{default + 1}]: "
 				output.flush
-				raw = self.in.gets
+				raw = input_stream.gets
 				return options[ default ].fetch( :value ) if raw.nil?
 
 				input = raw.to_s.strip
@@ -194,7 +177,7 @@ module Carson
 			def prompt_custom_value( label: )
 				output.print "#{BADGE} #{label}: "
 				output.flush
-				raw = self.in.gets
+				raw = input_stream.gets
 				return nil if raw.nil?
 
 				value = raw.to_s.strip
@@ -221,7 +204,7 @@ module Carson
 						others << entry
 					end
 				end
-				well_known.sort_by { WELL_KNOWN_REMOTES.index( it.fetch( :name ) ) || 999 } + others.sort_by { it.fetch( :name ) }
+				well_known.sort_by { |entry| WELL_KNOWN_REMOTES.index( entry.fetch( :name ) ) || 999 } + others.sort_by { |entry| entry.fetch( :name ) }
 			end
 
 			# Normalises a remote URL so SSH and HTTPS variants of the same host/path compare equal.
@@ -297,7 +280,7 @@ module Carson
 
 			def detect_git_remote
 				remotes = list_git_remotes
-				remote_names = remotes.map { it.fetch( :name ) }
+				remote_names = remotes.map { |entry| entry.fetch( :name ) }
 				return nil if remote_names.empty?
 
 				return config.git_remote if remote_names.include?( config.git_remote )
@@ -396,7 +379,7 @@ module Carson
 				hint = default ? "Y/n" : "y/N"
 				output.print "#{BADGE} [#{hint}]: "
 				output.flush
-				raw = self.in.gets
+				raw = input_stream.gets
 				return default if raw.nil?
 
 				input = raw.to_s.strip.downcase