hiiro 0.1.199 → 0.1.201

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b00244bcf091a676a118452abc560dddc2ada10cdd940712347116ae28a19c0
-  data.tar.gz: e9d04032c1de3e6ffbaad800c702167316dd3231d485985e9c809830c7b26e67
+  metadata.gz: 0161eeaf4f0cbe1052c13d9373ab9ed268394d1895f498fd5b964ba363b017d9
+  data.tar.gz: 559024c602f5667a1ae23b3d9d917295fe676194c17e24489d3047f16cb1b50d
 SHA512:
-  metadata.gz: 05e222b01ba1adefd31726d4b4095aaa704f09260ee3ff0e7fa27a42abf121099816c3d9a34b5c2acc785f64502ae0bd43baa8a48da87f6cfa94df30b14f3a8f
-  data.tar.gz: e971605f3f44578d3dd39462a48a39dc94d09741f5c196aa119bb36db9df8d23c3cc1c3b3122c2f35719517d6f16994f14806ac34d1cd8d355256ed7bff98f41
+  metadata.gz: 85941f5cf69ef053cc6ae8a08ef2b1036313ee8b60413243009cbd85311c2fcb8823b52c11780dd7b4fdf2785027440a86373146673dbb76e9ab2b3de819d773
+  data.tar.gz: 8cba796136692b6cd26cc372a42d429d422a7a141414939cc383212f4fa9a491b1a94a05cb0383fc2db27d503c4d63ad00be87bd49c63e08b52b5e4458acc3a6

data/bin/h-pr

@@ -174,6 +174,15 @@ end
 class PinnedPRManager
   PINNED_FILE = File.join(Dir.home, '.config/hiiro/pinned_prs.yml')
 
+  def self.repo_from_url(url)
+    return nil unless url
+    url.match(%r{github\.com/([^/]+/[^/]+)/pull/})&.[](1)
+  end
+
+  def pr_repo(pr)
+    pr['repo'] || self.class.repo_from_url(pr['url'])
+  end
+
   def initialize
     ensure_file
   end
@@ -195,8 +204,12 @@ class PinnedPRManager
   end
 
   def pin(pr_info)
+    pr_info['repo'] ||= self.class.repo_from_url(pr_info['url'])
+
     pinned = load_pinned
-    existing = pinned.find { |p| p['number'] == pr_info['number'] }
+    existing = pinned.find { |p|
+      p['number'] == pr_info['number'] && pr_repo(p) == pr_repo(pr_info)
+    }
 
     if existing
       existing.merge!(pr_info)
@@ -221,11 +234,14 @@ class PinnedPRManager
     load_pinned.any? { |p| p['number'].to_s == pr_number.to_s }
   end
 
-  def fetch_pr_info(pr_number)
+  def fetch_pr_info(pr_number, repo: nil)
     fields = 'number,title,url,headRefName,state,statusCheckRollup,reviewDecision,reviews,isDraft,mergeable'
-    output = `gh pr view #{pr_number} --json #{fields} 2>/dev/null`.strip
+    repo_flag = repo ? " --repo #{repo}" : ""
+    output = `gh pr view #{pr_number}#{repo_flag} --json #{fields} 2>/dev/null`.strip
     return nil if output.empty?
-    JSON.parse(output)
+    result = JSON.parse(output)
+    result['repo'] ||= self.class.repo_from_url(result['url'])
+    result
   rescue JSON::ParserError
     nil
   end
@@ -234,7 +250,9 @@ class PinnedPRManager
     fields = 'number,title,url,headRefName,state'
     output = `gh pr view --json #{fields} 2>/dev/null`.strip
     return nil if output.empty?
-    JSON.parse(output)
+    result = JSON.parse(output)
+    result['repo'] ||= self.class.repo_from_url(result['url'])
+    result
   rescue JSON::ParserError
     nil
   end
@@ -242,13 +260,15 @@ class PinnedPRManager
   def fetch_my_prs
     output = `gh pr list --author @me --state open --json number,title,headRefName,url 2>/dev/null`.strip
     return [] if output.empty?
-    JSON.parse(output) rescue []
+    prs = JSON.parse(output) rescue []
+    prs.each { |pr| pr['repo'] ||= self.class.repo_from_url(pr['url']) }
   end
 
   def fetch_assigned_prs
     output = `gh pr list --assignee @me --state open --json number,title,headRefName,url 2>/dev/null`.strip
     return [] if output.empty?
-    JSON.parse(output) rescue []
+    prs = JSON.parse(output) rescue []
+    prs.each { |pr| pr['repo'] ||= self.class.repo_from_url(pr['url']) }
   end
 
   def fetch_my_and_assigned_prs
@@ -274,10 +294,27 @@ class PinnedPRManager
   end
 
 
-  def batch_fetch_pr_info(pr_numbers)
+  # Accepts an array of PR records (each with 'number' and optionally 'repo'/'url'),
+  # groups them by repo, and fetches in batches per repo via GraphQL.
+  def batch_fetch_pr_info(prs)
+    return {} if prs.empty?
+
+    by_repo = prs.group_by { |pr| pr_repo(pr) || 'instacart/carrot' }
+
+    result = {}
+    by_repo.each do |repo_path, repo_prs|
+      owner, name = repo_path.split('/', 2)
+      pr_numbers = repo_prs.map { |pr| pr['number'] }
+      result.merge!(fetch_batch_for_repo(owner, name, pr_numbers))
+    end
+    result
+  end
+
+  private
+
+  def fetch_batch_for_repo(owner, name, 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}) {
@@ -316,7 +353,7 @@ class PinnedPRManager
 
     query = <<~GRAPHQL
       query {
-        repository(owner: "instacart", name: "carrot") {
+        repository(owner: "#{owner}", name: "#{name}") {
           #{pr_queries.join("\n")}
         }
       }
@@ -329,14 +366,13 @@ class PinnedPRManager
     repo_data = data.dig('data', 'repository')
     return {} unless repo_data
 
-    # Convert GraphQL response to hash keyed by PR number
-    pr_info_by_number = {}
+    pr_info_by_key = {}
+    repo_path = "#{owner}/#{name}"
     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] = {
+      pr_info_by_key[[num, repo_path]] = {
         'number' => pr_data['number'],
         'title' => pr_data['title'],
         'url' => pr_data['url'],
@@ -346,15 +382,18 @@ class PinnedPRManager
         'mergeable' => pr_data['mergeable'],
         'reviewDecision' => pr_data['reviewDecision'],
         'statusCheckRollup' => pr_data.dig('statusCheckRollup', 'contexts', 'nodes'),
-        'reviews' => pr_data.dig('reviews', 'nodes') || []
+        'reviews' => pr_data.dig('reviews', 'nodes') || [],
+        'repo' => repo_path
       }
     end
 
-    pr_info_by_number
+    pr_info_by_key
   rescue JSON::ParserError, StandardError
     {}
   end
 
+  public
+
   def refresh_all_status(prs, force: false)
     prs_to_refresh = prs.select { |pr| needs_refresh?(pr, force: force) }
 
@@ -363,11 +402,11 @@ class PinnedPRManager
       return prs
     end
 
-    pr_numbers = prs_to_refresh.map { |pr| pr['number'] }
-    infos = batch_fetch_pr_info(pr_numbers)
+    # infos is keyed by [number, repo] to avoid collisions across repos
+    infos = batch_fetch_pr_info(prs_to_refresh)
 
     prs_to_refresh.each do |pr|
-      info = infos[pr['number']]
+      info = infos[[pr['number'], pr_repo(pr) || 'instacart/carrot']]
       next unless info
 
       pr['state'] = info['state']
@@ -386,7 +425,7 @@ class PinnedPRManager
   def refresh_status(pr, force: false)
     return pr unless needs_refresh?(pr, force: force)
 
-    info = fetch_pr_info(pr['number'])
+    info = fetch_pr_info(pr['number'], repo: pr_repo(pr))
     return pr unless info
 
     pr['state'] = info['state']
@@ -492,7 +531,10 @@ class PinnedPRManager
         ""
       end
 
-    "#{num} #{state_icon} ##{pr['number']} #{pr['title']}#{checks_str}#{reviews_str}".strip
+    repo = pr_repo(pr)
+    repo_label = (repo && repo != 'instacart/carrot') ? " [#{repo}]" : ""
+
+    "#{num} #{state_icon} ##{pr['number']}#{repo_label} #{pr['title']}#{checks_str}#{reviews_str}".strip
   end
 
   def display_detailed(pr, idx = nil)
@@ -505,7 +547,10 @@ class PinnedPRManager
     else pr['is_draft'] ? 'DRAFT' : 'OPEN'
     end
 
-    lines << "#{num} ##{pr['number']} - #{pr['title']}"
+    repo = pr_repo(pr)
+    repo_label = (repo && repo != 'instacart/carrot') ? " [#{repo}]" : ""
+
+    lines << "#{num} ##{pr['number']}#{repo_label} - #{pr['title']}"
     lines << "   State: #{state_str}"
     lines << "   Branch: #{pr['headRefName']}" if pr['headRefName']
     lines << "   URL: #{pr['url']}" if pr['url']

data/lib/hiiro/queue.rb

@@ -97,7 +97,7 @@ class Hiiro
 
       if prompt_obj
         if prompt_obj.task
-          target_session = prompt_obj.task.session_name
+          target_session = prompt_obj.session_name
           tree = prompt_obj.task.tree
           working_dir = tree.path if tree
         elsif prompt_obj.session
@@ -618,17 +618,29 @@ class Hiiro
       end
 
       attr_reader :hiiro, :doc, :frontmatter, :prompt
-      attr_reader :task_name, :tree_name, :session_name
 
       def initialize(doc, hiiro: nil)
         @hiiro = hiiro
         @doc = doc
         @frontmatter = doc.front_matter
         @prompt = prompt
+      end
+
+      def task_name
+        doc.front_matter['task_name']
+      end
+
+      def tree_name
+        doc.front_matter['tree_name'].tap do |tname|
+          puts tree_name: tname
+          puts task_tree: task&.tree
+          puts task_tree_name: task&.tree_name
+          puts task_tree_path: task&.tree&.path
+        end
+      end
 
-        @task_name = doc.front_matter['task_name']
-        @tree_name = doc.front_matter['tree_name']
-        @session_name = doc.front_matter['session_name']
+      def session_name
+        doc.front_matter['session_name'] || task&.session_name
       end
 
       def task

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.199"
+  VERSION = "0.1.201"
 end

metadata

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