hiiro 0.1.123 → 0.1.124

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09c953336eb16ea65b0e501937a1ce3ca9d478a4290f4e17b01fd357b61c2bcf'
-  data.tar.gz: eba72473fabb36214727ef277e8fde1424d3af1660e6f9102fce2079385d07ab
+  metadata.gz: 07e567369471f9f5c5aacb65fe7e7a29df6f7125cca138a2788567597abd1a2e
+  data.tar.gz: c6bc9ae5a1d181e15e255ce831ee13b52ef277cfc9e4dd06e35330c5b368207f
 SHA512:
-  metadata.gz: 14063fe4372147c627525a7837a1d825d10d5c7a9d2507497830f02b031bf38cc7c013f974135cf070fac2a6763d65729dfb078ef956d77be77f4744405bc000
-  data.tar.gz: a4bcdf2b1d9d6de4ce1df9c86170cd96468a9d609cd09c5b242ea25adcf342e12fd97e159ca96de793a58fd929192cc8b21eb1be2434b6fc85e3318d29046af2
+  metadata.gz: 8ee763ca17e6f61efc9ca7e9e5eedb8ceec4609936c2a11c850c5efd63ba7297f1112d852e07f68ab52e6c79c89c6279eb677c385ff4427285af9e4f2d4e446d
+  data.tar.gz: 4f4c032a247b5fb4bdb81420cd92e98bea0cac9853270e05eaa57050b73e7f0ef68a379f3ac758133c4ca9de42d3021b3dce10f93042530bd268aa87b4563bbf

data/bin/h-link

@@ -7,6 +7,10 @@ require 'pry'
 require 'tempfile'
 require "hiiro"
 
+opts = Hiiro::Options.setup {
+  option(:shorthand, short: :s)
+}
+
 class LinkManager
   LINKS_FILE = File.join(Dir.home, '.config/hiiro/links.yml')
   LINK_TEMPLATE = {
@@ -215,10 +219,12 @@ Hiiro.run(*ARGV, plugins: [Pins], links_file: lm.links_file) do
     url = add_args.shift
     description = add_args.join(' ')
 
+    vals = opts.parse!(add_args)
+
     new_link = LinkManager::Link.new(
       url: url,
       description: description,
-      shorthand: nil,
+      shorthand: vals.shorthand,
       created_at: Time.now.iso8601
     )
 

data/bin/h-pr

@@ -16,16 +16,6 @@ class PRManager
     @hiiro = hiiro
   end
 
-  def help
-    puts "Usage: h pr <subcommand> [args]"
-    puts
-    puts "Subcommands:"
-    puts "  save [PR_NUMBER]      Record PR for this task (auto-detects if omitted)"
-    puts "  current               Show current branch's PR info"
-    puts "  open [PR_NUMBER]      Open PR in browser"
-    puts "  view [PR_NUMBER]      View PR details in terminal"
-  end
-
   def save(pr_number = nil)
     pr_info = fetch_pr_info(pr_number)
     unless pr_info
@@ -266,7 +256,131 @@ class PinnedPRManager
     (authored_prs + assigned_prs).uniq { |pr| pr['number'] }
   end
 
-  def refresh_status(pr)
+  def needs_refresh?(pr, force: false)
+    return true if force
+    return true unless pr['last_checked']
+
+    last_check_time = Time.parse(pr['last_checked']) rescue nil
+    return true unless last_check_time
+
+    # Refresh if last check was more than 2 minutes ago
+    (Time.now - last_check_time) > 120
+  end
+
+
+  def batch_fetch_pr_info(pr_numbers)
+    return {} if pr_numbers.empty?
+
+    # Build GraphQL query to fetch multiple PRs at once
+    pr_queries = pr_numbers.map.with_index do |num, idx|
+      <<~GRAPHQL.strip
+        pr#{idx}: pullRequest(number: #{num}) {
+          number
+          title
+          url
+          headRefName
+          state
+          isDraft
+          mergeable
+          reviewDecision
+          statusCheckRollup {
+            contexts {
+              ... on CheckRun {
+                conclusion
+                status
+              }
+              ... on StatusContext {
+                state
+              }
+            }
+          }
+          reviews(last: 50) {
+            nodes {
+              author {
+                login
+              }
+              state
+            }
+          }
+        }
+      GRAPHQL
+    end
+
+    query = <<~GRAPHQL
+      query {
+        repository(owner: "instacart", name: "carrot") {
+          #{pr_queries.join("\n")}
+        }
+      }
+    GRAPHQL
+
+    result = `gh api graphql -f query='#{query.gsub("'", "'\\''")}' 2>/dev/null`
+    return {} if result.empty?
+
+    data = JSON.parse(result)
+    repo_data = data.dig('data', 'repository')
+    return {} unless repo_data
+
+    # Convert GraphQL response to hash keyed by PR number
+    pr_info_by_number = {}
+    pr_numbers.each_with_index do |num, idx|
+      pr_data = repo_data["pr#{idx}"]
+      next unless pr_data
+
+      # Transform GraphQL response to match gh pr view format
+      pr_info_by_number[num] = {
+        'number' => pr_data['number'],
+        'title' => pr_data['title'],
+        'url' => pr_data['url'],
+        'headRefName' => pr_data['headRefName'],
+        'state' => pr_data['state'],
+        'isDraft' => pr_data['isDraft'],
+        'mergeable' => pr_data['mergeable'],
+        'reviewDecision' => pr_data['reviewDecision'],
+        'statusCheckRollup' => pr_data['statusCheckRollup'],
+        'reviews' => pr_data.dig('reviews', 'nodes') || []
+      }
+    end
+
+    pr_info_by_number
+  rescue JSON::ParserError, StandardError
+    {}
+  end
+
+  def refresh_all_status(prs, force: false)
+    # Determine which PRs need refreshing
+    prs_to_refresh = prs.select { |pr| needs_refresh?(pr, force: force) }
+
+    if prs_to_refresh.empty?
+      puts "All PRs recently checked (within last 2 minutes). Use -U to force update." unless force
+      return prs
+    end
+
+    # Batch fetch all PR info at once
+    pr_numbers = prs_to_refresh.map { |pr| pr['number'] }
+    fetched_info = batch_fetch_pr_info(pr_numbers)
+
+    # Update each PR with fetched info
+    prs_to_refresh.each do |pr|
+      info = fetched_info[pr['number']]
+      next unless info
+
+      pr['state'] = info['state']
+      pr['title'] = info['title']
+      pr['checks'] = summarize_checks(info['statusCheckRollup'])
+      pr['reviews'] = summarize_reviews(info['reviews'])
+      pr['review_decision'] = info['reviewDecision']
+      pr['is_draft'] = info['isDraft']
+      pr['mergeable'] = info['mergeable']
+      pr['last_checked'] = Time.now.iso8601
+    end
+
+    prs
+  end
+
+  def refresh_status(pr, force: false)
+    return pr unless needs_refresh?(pr, force: force)
+
     info = fetch_pr_info(pr['number'])
     return pr unless info
 
@@ -661,12 +775,14 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
 
     compact = status_args.include?('-c') || status_args.include?('--compact')
+    force = status_args.include?('-U') || status_args.include?('--force-update')
 
     puts "Refreshing status for #{pinned.length} pinned PR(s)..."
     puts
 
+    pinned_manager.refresh_all_status(pinned, force: force)
+
     pinned.each_with_index do |pr, idx|
-      pinned_manager.refresh_status(pr)
       if compact
         puts pinned_manager.display_pinned(pr, idx)
       else
@@ -680,7 +796,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     puts "Status updated at #{Time.now.strftime('%H:%M:%S')}"
   end
 
-  add_subcmd(:update) do
+  add_subcmd(:update) do |*update_args|
     pinned = pinned_manager.load_pinned
 
     if pinned.empty?
@@ -688,15 +804,19 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       next
     end
 
+    force = update_args.include?('-U') || update_args.include?('--force-update')
+
     puts "Updating status for #{pinned.length} PR(s)..."
-    pinned.each { |pr| pinned_manager.refresh_status(pr) }
+    pinned_manager.refresh_all_status(pinned, force: force)
     pinned_manager.save_pinned(pinned)
     puts "Done."
   end
 
-  add_subcmd(:green) do
+  add_subcmd(:green) do |*green_args|
     pinned = pinned_manager.load_pinned
-    pinned.each { |pr| pinned_manager.refresh_status(pr) }
+    force = green_args.include?('-U') || green_args.include?('--force-update')
+
+    pinned_manager.refresh_all_status(pinned, force: force)
     pinned_manager.save_pinned(pinned)
 
     filtered = pinned.select { |pr|
@@ -714,9 +834,11 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     filtered.each_with_index { |pr, i| puts pinned_manager.display_pinned(pr, i) }
   end
 
-  add_subcmd(:red) do
+  add_subcmd(:red) do |*red_args|
     pinned = pinned_manager.load_pinned
-    pinned.each { |pr| pinned_manager.refresh_status(pr) }
+    force = red_args.include?('-U') || red_args.include?('--force-update')
+
+    pinned_manager.refresh_all_status(pinned, force: force)
     pinned_manager.save_pinned(pinned)
 
     filtered = pinned.select { |pr|
@@ -734,9 +856,11 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     filtered.each_with_index { |pr, i| puts pinned_manager.display_pinned(pr, i) }
   end
 
-  add_subcmd(:old) do
+  add_subcmd(:old) do |*old_args|
     pinned = pinned_manager.load_pinned
-    pinned.each { |pr| pinned_manager.refresh_status(pr) }
+    force = old_args.include?('-U') || old_args.include?('--force-update')
+
+    pinned_manager.refresh_all_status(pinned, force: force)
     pinned_manager.save_pinned(pinned)
 
     filtered = pinned.select { |pr| pr['state'] == 'MERGED' }
@@ -760,7 +884,8 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       next
     end
 
-    pinned.each { |pr| pinned_manager.refresh_status(pr) }
+    force = args.include?('-U') || args.include?('--force-update')
+    pinned_manager.refresh_all_status(pinned, force: force)
 
     merged_or_closed = pinned.select { |pr| pr['state'] == 'MERGED' || pr['state'] == 'CLOSED' }
 
@@ -782,9 +907,11 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     puts "Done. #{pinned_manager.load_pinned.length} PR(s) still tracked."
   end
 
-  add_subcmd(:draft) do
+  add_subcmd(:draft) do |*draft_args|
     pinned = pinned_manager.load_pinned
-    pinned.each { |pr| pinned_manager.refresh_status(pr) }
+    force = draft_args.include?('-U') || draft_args.include?('--force-update')
+
+    pinned_manager.refresh_all_status(pinned, force: force)
     pinned_manager.save_pinned(pinned)
 
     filtered = pinned.select { |pr| pr['is_draft'] == true }
@@ -827,7 +954,14 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     missing_numbers = missing.map { |pr| pr['number'] }
 
     tmpfile = Tempfile.new(['missing-prs-', '.yml'])
-    tmpfile.write(missing_numbers.to_yaml)
+    lines = ['---']
+    missing.each do |pr|
+      lines << ''
+      lines << "# [#{pr['headRefName']}] #{pr['title']}"
+      lines << "# url: #{pr['url']}"
+      lines << "- #{pr['number']}"
+    end
+    tmpfile.write(lines.join("\n"))
     tmpfile.close
 
     system(ENV['EDITOR'] || 'nvim', tmpfile.path)
@@ -944,7 +1078,8 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
 
     # Refresh all statuses first
-    pinned.each { |pr| pinned_manager.refresh_status(pr) }
+    force = args.include?('-U') || args.include?('--force-update')
+    pinned_manager.refresh_all_status(pinned, force: force)
     pinned_manager.save_pinned(pinned)
 
     merged = pinned.select { |pr| pr['state'] == 'MERGED' }
@@ -975,7 +1110,8 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
 
     # Refresh all statuses first
-    pinned.each { |pr| pinned_manager.refresh_status(pr) }
+    force = args.include?('-U') || args.include?('--force-update')
+    pinned_manager.refresh_all_status(pinned, force: force)
 
     merged_or_closed = pinned.select { |pr| pr['state'] == 'MERGED' || pr['state'] == 'CLOSED' }
 

data/bin/h-session

@@ -4,7 +4,7 @@ require 'hiiro'
 require 'tempfile'
 require 'yaml'
 
-Hiiro.run(*ARGV, plugins: [Pins]) do
+Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   tmux = tmux_client
 
   add_subcmd(:ls, :list) { |*args|
@@ -130,7 +130,6 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   end
 
   add_subcmd(:orphans) do
-    env = Environment.current
     task_session_names = env.all_tasks.map(&:session_name)
     orphans = env.all_sessions.reject { |s| task_session_names.include?(s.name) }
 
@@ -144,7 +143,6 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   end
 
   add_subcmd(:okill) do
-    env = Environment.current
     task_session_names = env.all_tasks.map(&:session_name)
     orphans = env.all_sessions.reject { |s| task_session_names.include?(s.name) }
 

data/exe/h

@@ -3,6 +3,20 @@
 require "hiiro"
 require "fileutils"
 
+def update_hiiro
+  if `gem list hiiro`.strip.empty?
+    system('gem', 'install', 'hiiro')
+  else
+    system('gem', 'update', 'hiiro')
+  end
+
+  system('h', 'setup')
+end
+
+def rbenv_versions
+  versions = `rbenv versions --bare`.lines(chomp: true)
+end
+
 Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
   add_subcmd(:version) { |*args|
     puts Hiiro::VERSION
@@ -12,6 +26,21 @@ Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
     puts "pong"
   }
 
+  add_subcmd(:install) { |*args|
+    opts = Hiiro::Options.setup {
+      flag(:all, short: :a)
+    }.parse!(ARGV)
+
+    if opts.all
+      rbenv_versions.each do |ver|
+        ENV['RBENV_VERSION'] = ver
+        update_hiiro
+      end
+    else
+      update_hiiro
+    end
+  }
+
   add_subcmd(:setup) do |*args|
     # Detect how the command was invoked to determine prefix
     invoked_as = File.basename($0)

data/lib/hiiro/queue.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 require 'shellwords'
 require 'time'
 require 'front_matter_parser'
+require 'tempfile'
 
 class Hiiro
   class Queue
@@ -177,7 +178,7 @@ class Hiiro
       return nil unless task
 
       {
-        task_name: task.subtask? ? task.parent_name : task.name,
+        task_name: task.name,
         tree_name: task.tree_name,
         session_name: task.session_name,
       }
@@ -235,8 +236,11 @@ class Hiiro
         end
       end
 
-      name = slugify(content.lines.reject { |l| l.start_with?('---') || l.match?(/^\w+:/) }.first.to_s.strip)
-      return nil if name.empty?
+      name = slugify(content.lines.drop_while { |l| l.strip.empty? || l.start_with?('---') || l.match?(/^\w+:/) }.first.to_s.strip)
+
+      if name.empty?
+        name = Time.now.strftime("%Y%m%d%H%M%S") + '-' + task_info[:task_name]
+      end
 
       base_name = name
       counter = 1
@@ -394,14 +398,13 @@ class Hiiro
           args, flag_task = q.extract_task_flag(args)
           ti = flag_task ? q.task_info_for(flag_task) : task_info
 
+          tmpfile = Tempfile.new(['hq-', '.md'])
+          prompt_file = tmpfile.path
           if args.empty? && !$stdin.tty?
             content = $stdin.read.strip
           elsif args.any?
             content = args.join(' ')
           else
-            require 'tempfile'
-            tmpfile = Tempfile.new(['hq-', '.md'])
-
             # Pre-fill with frontmatter template if task_info is available
             if ti
               fm_lines = ["---"]
@@ -424,7 +427,7 @@ class Hiiro
             end
           end
 
-          result = q.add_with_frontmatter(content, task_info: ti)
+          result = q.add_with_frontmatter(content)
           if result
             puts "Created: #{result[:path]}"
           else

data/lib/hiiro/tasks.rb

@@ -177,21 +177,15 @@ class Hiiro
 
       items.each do |task|
         marker = (current && current.name == task.name) ? "*" : " "
-        tree = environment.find_tree(task.tree_name)
-        branch = tree&.branch || (tree&.detached? ? '(detached)' : nil)
-        branch_str = branch ? "  [#{branch}]" : ""
-
-        display_name = scope == :subtask ? task.short_name : task.name
-        puts format("%s %-25s  tree: %-20s%s", marker, display_name, task.tree_name || '(none)', branch_str)
+        line = task.display_line(scope: scope, environment: environment)
+        puts "#{marker} #{line}"
 
         if scope == :task
           subs = subtasks(task)
           subs.each do |st|
             sub_marker = (current && current.name == st.name) ? "*" : " "
-            sub_tree = environment.find_tree(st.tree_name)
-            sub_branch = sub_tree&.branch || (sub_tree&.detached? ? '(detached)' : nil)
-            sub_branch_str = sub_branch ? "  [#{sub_branch}]" : ""
-            puts format("%s - %-23s  tree: %-20s%s", sub_marker, st.short_name, st.tree_name || '(none)', sub_branch_str)
+            sub_line = st.display_line(scope: :subtask, environment: environment)
+            puts "#{sub_marker} - #{sub_line}"
           end
         end
       end
@@ -352,14 +346,20 @@ class Hiiro
     # --- Interactive selection with sk ---
 
     def select_task_interactive(prompt = nil)
-      names = if scope == :subtask
-        tasks.map(&:short_name)
+      task_list = if scope == :subtask
+        tasks.sort_by(&:short_name)
       else
-        environment.all_tasks.map(&:name)
+        environment.all_tasks.sort_by(&:name)
       end
-      return nil if names.empty?
+      return nil if task_list.empty?
 
-      hiiro.fuzzyfind(names.sort)
+      mapping = task_list.each_with_object({}) do |task, h|
+        display_name = scope == :subtask ? task.short_name : task.name
+        line = task.display_line(scope: scope, environment: environment)
+        h[line] = display_name
+      end
+
+      hiiro.fuzzyfind_from_map(mapping)
     end
 
     def value_for_task(task_name = nil, &block)
@@ -645,8 +645,7 @@ class Hiiro
 
           task_info = if task
             {
-              task_name: task.subtask? ? task.parent_name : task.name,
-              subtask_name: task.subtask? ? task.short_name : nil,
+              task_name: task.name,
               tree: task.tree_name,
               branch: task.branch,
               session: task.session_name
@@ -761,7 +760,7 @@ class Hiiro
           task = tm.current_task
           task_info = if task
             {
-              task_name: task.subtask? ? task.parent_name : task.name,
+              task_name: task.name,
               tree_name: task.tree_name,
               session_name: task.session_name
             }
@@ -894,6 +893,19 @@ class Hiiro
       h[:session] = session_name if session_name != name
       h
     end
+
+    def display_line(scope: :task, environment:)
+      display_name = (scope == :subtask) ? short_name : name
+      tree = environment.find_tree(tree_name)
+      branch = tree&.branch || (tree&.detached? ? '(detached)' : '(none)')
+      session = session_name || '(none)'
+
+      format("%-25s  tree: %-20s  branch: %-20s  session: %s",
+             display_name,
+             tree_name || '(none)',
+             branch,
+             session)
+    end
   end
 
   class App

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.123"
+  VERSION = "0.1.124"
 end

data/scripts/compare

@@ -8,7 +8,7 @@ diff_dirs() {
 
 # s@Only in \(bin|plugins\): \(.*\)@cp -v \1/\2 $HOME/\1/@;
 
-diff_dirs | sed -E "s@Only in @@;s@: @/@;s@^(/.*(bin|plugins).*)@cp -v \\1 \\2/@;s@^(bin.*)@cp -v \\1 $HOME/bin/@;s@^(plugins.*)@cp -v \\1 $HOME/.config/hiiro/plugins/@;s@Files (.*) and (.*) differ@vim -d \\1 \\2@" | egrep 'cp -'
+diff_dirs | sed -E "s@Only in @@;s@: @/@;s@^(/.*(bin|plugins).*)@cp -v \\1 \\2/@;s@^(bin.*)@cp -v \\1 $HOME/bin/@;s@^(plugins.*)@cp -v \\1 $HOME/.config/hiiro/plugins/@;s@Files (.*) and (.*) differ@safe_nvim -d \\1 \\2@" | egrep 'cp -'
 
-diff_dirs | sed -E "s@Only in @@;s@: @/@;s@^(/.*(bin|plugins).*)@cp -v \\1 \\2/@;s@^(bin.*)@cp -v \\1 $HOME/bin/@;s@^(plugins.*)@cp -v \\1 $HOME/.config/hiiro/plugins/@;s@Files (.*) and (.*) differ@vim -d \\1 \\2@" | egrep -v 'cp -'
+diff_dirs | sed -E "s@Only in @@;s@: @/@;s@^(/.*(bin|plugins).*)@cp -v \\1 \\2/@;s@^(bin.*)@cp -v \\1 $HOME/bin/@;s@^(plugins.*)@cp -v \\1 $HOME/.config/hiiro/plugins/@;s@Files (.*) and (.*) differ@safe_nvim -d \\1 \\2@" | egrep -v 'cp -'
 

metadata

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