hiiro 0.1.231 → 0.1.233

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f8ec87844086b0454fd8fbae741e0606702cba54c405a63f4084cd3e55d7fcf
-  data.tar.gz: 3a770a7ad8c6c9ffb6abc47c1f1a09869ee61c9d7f712300c1a0ba0e516fab20
+  metadata.gz: 998294642c1d69a195fe30bdc06fb48b26825bcf47454dd6b57748877f819dac
+  data.tar.gz: 5e74e47755731485eeab5340e09f673aed515d5fe10f87c46283ad88ae945063
 SHA512:
-  metadata.gz: e6fa5471a21551ee74ac7764f040ce6d3874f022afd43831411e5d32236bce24636c6537b819cd0d06ee35b001bee02f5b4b13810a7d7bd99d589d3e0f6ed92b
-  data.tar.gz: e1f351cc92d23a2345c9e5f4823af94f9b6d59d83bd937f75e0657990a0ae57f2330cf2da3db56c2a0eca8719192fd0f3d848e38d6badc504693bdfa817ff3e7
+  metadata.gz: b9c0145e7765252e6d77f17cfd787d152caa7dc0e29d33b5759ba7960a58100c9ba3bb8b3a9e94a5b31cf8b70170546107a3da195797f68546bdb3e42c2c423f
+  data.tar.gz: 5dd5b16bee94ad2d442ed42ba4cf8869d33e6a4ca4d357172f1958620860a46029c3f64eb82bb5b0890954357de0818d0f7a9747557ad1bc11027f5967467210

data/bin/h-pr

@@ -368,7 +368,8 @@ class PinnedPRManager
 
     as_str  = as  > 0 ? "\e[30;102m#{as}\e[0m"  : '-'
     crs_str = crs > 0 ? "\e[30;103m#{crs}\e[0m" : '-'
-    reviews_str = "#{as_str}a/#{crs_str}cr"
+    conflict_str = pr['mergeable'] == 'CONFLICTING' ? " \e[30;101m[conflicts]\e[0m" : ""
+    reviews_str = "#{as_str}a/#{crs_str}cr#{conflict_str}"
 
     repo = pr_repo(pr)
     repo_label = (repo && repo != 'instacart/carrot') ? " [#{repo}]" : ""
@@ -1071,6 +1072,81 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     system('gh', 'pr', 'merge', pr_number.to_s, *merge_args)
   end
 
+  add_subcmd(:fix) do |*fix_args|
+    opts = Hiiro::Options.parse(fix_args) do
+      flag(:red, short: :r, desc: 'Fix all PRs with failing checks')
+      flag(:run, short: :R, desc: 'Launch queue tasks immediately after queuing')
+    end
+
+    pinned = pinned_manager.load_pinned
+
+    prs_to_fix = if opts.red
+      failing = pinned.select { |pr| (c = pr['checks']) && c['failed'].to_i > 0 }
+      if failing.empty?
+        puts "No PRs with failing checks"
+        next
+      end
+      failing
+    elsif opts.args.empty?
+      # Default: fuzzy-select from failing PRs, fall back to all tracked
+      failing = pinned.select { |pr| (c = pr['checks']) && c['failed'].to_i > 0 }
+      candidates = failing.empty? ? pinned : failing
+      if candidates.empty?
+        puts "No tracked PRs"
+        next
+      end
+      lines = candidates.each_with_index.each_with_object({}) do |(pr, idx), h|
+        h[pinned_manager.display_pinned(pr, idx)] = pr
+      end
+      selected = fuzzyfind_from_map(lines)
+      next unless selected
+      [selected]
+    else
+      # Resolve each positional arg as a PR ref
+      opts.args.map { |ref|
+        pr_num = resolve_pr.call(ref)
+        next nil unless pr_num
+        pinned.find { |p| p['number'].to_s == pr_num.to_s }
+      }.compact
+    end
+
+    if prs_to_fix.empty?
+      puts "No PRs to fix"
+      next
+    end
+
+    q = Hiiro::Queue.current(self)
+    queued_names = []
+
+    prs_to_fix.each do |pr|
+      task_info = {
+        task_name:    pr['task'],
+        tree_name:    pr['worktree'],
+        session_name: pr['tmux_session'],
+      }.compact
+      task_info = nil if task_info.empty?
+
+      result = q.add_with_frontmatter("/pr:fix #{pr['number']}", task_info: task_info)
+      if result
+        puts "Queued fix for ##{pr['number']}: #{pr['title']}"
+        queued_names << result[:name]
+      else
+        STDERR.puts "Failed to queue fix for ##{pr['number']}"
+      end
+    end
+
+    unless queued_names.empty?
+      puts
+      puts "Queued #{queued_names.length} fix task(s)."
+      if opts.run
+        puts "Launching..."
+        queued_names.each { |name| q.launch_task(name) }
+      else
+        puts "Run 'h queue run' to start."
+      end
+    end
+  end
+
   add_subcmd(:comment) do |ref = nil|
     pr_number = resolve_pr.call(ref)
     next unless pr_number

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.231"
+  VERSION = "0.1.233"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.231
+  version: 0.1.233
 platform: ruby
 authors:
 - Joshua Toyota