hiiro 0.1.201 → 0.1.203

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0161eeaf4f0cbe1052c13d9373ab9ed268394d1895f498fd5b964ba363b017d9
-  data.tar.gz: 559024c602f5667a1ae23b3d9d917295fe676194c17e24489d3047f16cb1b50d
+  metadata.gz: 8c0bb6c6511776861d3adb6a22dbc07343bade8517cdbef483dd6696e2695911
+  data.tar.gz: 6367f7818b192365e44b7109d1199583c07f23bd3a08890019b26cc3a0e5dc5b
 SHA512:
-  metadata.gz: 85941f5cf69ef053cc6ae8a08ef2b1036313ee8b60413243009cbd85311c2fcb8823b52c11780dd7b4fdf2785027440a86373146673dbb76e9ab2b3de819d773
-  data.tar.gz: 8cba796136692b6cd26cc372a42d429d422a7a141414939cc383212f4fa9a491b1a94a05cb0383fc2db27d503c4d63ad00be87bd49c63e08b52b5e4458acc3a6
+  metadata.gz: 3fe17a443379a9aec58acbd7f9f664cc363c508dbb87014f964ee4c4e1dd12e3c9be3236e7af7d8e96116ada68eb28018be1337da355d8d2a04709a948dd3a04
+  data.tar.gz: 8a731d6af3505960bd6683b5b439cb60cc839a54cdc307ebe9decb989e84b23860f7a50d244edb7dbd29857b9e4742548c153c6758d5fa85272b82c55820d2e1

data/bin/h-pr

@@ -195,7 +195,17 @@ class PinnedPRManager
 
   def load_pinned
     ensure_file
-    YAML.load_file(PINNED_FILE) || []
+    prs = YAML.load_file(PINNED_FILE) || []
+    if prs.any? { |p| !p['slot'] }
+      next_slot = prs.map { |p| p['slot'].to_i }.max.to_i
+      prs.each do |p|
+        next if p['slot']
+        next_slot += 1
+        p['slot'] = next_slot
+      end
+      save_pinned(prs)
+    end
+    prs
   end
 
   def save_pinned(prs)
@@ -215,6 +225,7 @@ class PinnedPRManager
       existing.merge!(pr_info)
       existing['updated_at'] = Time.now.iso8601
     else
+      pr_info['slot'] = (pinned.map { |p| p['slot'].to_i }.max.to_i) + 1
       pr_info['pinned_at'] = Time.now.iso8601
       pinned << pr_info
     end
@@ -485,7 +496,7 @@ class PinnedPRManager
   end
 
   def display_pinned(pr, idx = nil)
-    num = idx ? "#{(idx + 1).to_s.rjust(3)}." : ""
+    num = idx ? "#{(pr['slot'] || idx + 1).to_s.rjust(3)}." : ""
 
     check_emoji = if pr['checks']
       c = pr['checks']
@@ -634,7 +645,11 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
 
     if ref.to_s =~ /^\d+$/ && ref.to_i > 0
-      idx = ref.to_i - 1
+      slot = ref.to_i
+      by_slot = pinned.find { |p| p['slot'].to_i == slot }
+      return by_slot['number'].to_s if by_slot
+      # Fall back to 1-based index for unslotted data
+      idx = slot - 1
       return pinned[idx]['number'].to_s if idx < pinned.length
     end
 
@@ -688,15 +703,23 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
   }
 
-  add_subcmd(:link) { |*args|
-    stdout = `gh pr view`
+  add_subcmd(:link) { |ref=nil|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
 
-    number = stdout[/number:\s*(\d+)/, 1]
+    pinned = pinned_manager.load_pinned
+    pr = pinned.find { |p| p['number'].to_s == pr_number.to_s }
 
-    if number
-      print ['https://github.com/instacart/carrot/pull/', number].join
+    if pr && pr['url']
+      print pr['url']
     else
-      puts stdout
+      output = `gh pr view #{pr_number} --json url 2>/dev/null`
+      info = JSON.parse(output) rescue nil
+      if info&.dig('url')
+        print info['url']
+      else
+        STDERR.puts "Could not find URL for PR ##{pr_number}"
+      end
     end
   }
 
@@ -1127,6 +1150,68 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     puts "Added #{added} PR(s) to tracking."
   end
 
+  add_subcmd(:attach) do |ref = nil|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+
+    pinned = pinned_manager.load_pinned
+    pr = pinned.find { |p| p['number'].to_s == pr_number.to_s }
+
+    unless pr
+      puts "PR ##{pr_number} not in pinned list — run 'h pr update' first"
+      next
+    end
+
+    branch = pr['headRefName']
+    task_name = pr['task']
+
+    unless branch
+      puts "PR ##{pr_number} has no branch info"
+      next
+    end
+
+    # Resolve task session and working directory
+    target_session = nil
+    working_dir = Dir.pwd
+
+    if task_name
+      env = Environment.current rescue nil
+      task = env&.find_task(task_name)
+      if task
+        target_session = task.session_name
+        tree = task.tree
+        working_dir = tree.path if tree
+      end
+    end
+
+    unless target_session && system('tmux', 'has-session', '-t', target_session, out: File::NULL, err: File::NULL)
+      puts "Task '#{task_name || '(none)'}' has no active tmux session"
+      next
+    end
+
+    # Write a launcher: commit WIP if dirty, checkout the PR branch, then drop into shell
+    script_path = "/tmp/h-pr-attach-#{pr_number}.sh"
+    File.write(script_path, <<~SH)
+      #!/usr/bin/env bash
+      cd #{Shellwords.shellescape(working_dir)}
+
+      if [ -n "$(git status --porcelain)" ]; then
+        git add -A
+        git commit -m "WIP"
+        echo ""
+        echo "WIP COMMIT: ALL UNCOMMITTED CHANGES HAVE BEEN COMMITTED BEFORE SWITCHING BRANCHES"
+        echo ""
+      fi
+
+      git checkout #{Shellwords.shellescape(branch)}
+      exec #{Shellwords.shellescape(ENV['SHELL'] || 'zsh')}
+    SH
+    FileUtils.chmod(0755, script_path)
+
+    system('tmux', 'new-window', '-t', target_session, '-c', working_dir, script_path)
+    system('tmux', 'switch-client', '-t', target_session)
+  end
+
   add_subcmd(:track) do
     pr_info = pinned_manager.fetch_current_branch_pr
     unless pr_info

data/lib/hiiro/queue.rb

@@ -40,6 +40,50 @@ class Hiiro
       Dir.glob(File.join(dir, '*.md')).sort.map { |f| File.basename(f, '.md') }
     end
 
+    def tasks_in_sorted(status)
+      dir = queue_dirs[status]
+      Dir.glob(File.join(dir, '*.md')).map { |f|
+        { name: File.basename(f, '.md'), mtime: File.mtime(f) }
+      }.sort_by { |t| -t[:mtime].to_i }
+    end
+
+    def format_mtime(mtime)
+      now = Time.now
+      mtime.year == now.year ? mtime.strftime("%m-%d %H:%M") : mtime.strftime("%Y-%m-%d %H:%M")
+    end
+
+    def list_lines(all: false)
+      lines = []
+      STATUSES.each do |status|
+        tasks = tasks_in_sorted(status.to_sym)
+        next if tasks.empty?
+
+        display = all ? tasks : tasks.first(10)
+        display.each do |t|
+          ts = format_mtime(t[:mtime])
+          line = "%-10s %-12s %s" % [status, ts, t[:name]]
+          meta = meta_for(t[:name], status.to_sym)
+          if meta && status == 'running'
+            started = meta['started_at']
+            if started
+              elapsed = Time.now - Time.parse(started)
+              mins = (elapsed / 60).to_i
+              line += "  (#{mins}m)"
+            end
+            line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]" if meta['tmux_session']
+          end
+          preview = task_preview(t[:name], status.to_sym)
+          line += "  #{preview}" if preview
+          lines << line
+        end
+
+        if !all && tasks.size > 10
+          lines << "  ... and #{tasks.size - 10} more"
+        end
+      end
+      lines
+    end
+
     def all_tasks
       STATUSES.flat_map do |status|
         tasks_in(status.to_sym).map { |name| { name: name, status: status } }
@@ -315,54 +359,30 @@ class Hiiro
           end
         }
 
-        h.add_subcmd(:ls) {
-          tasks = q.all_tasks
-          if tasks.empty?
-            puts "No tasks"
-            next
-          end
-          tasks.each do |t|
-            line = "%-10s %s" % [t[:status], t[:name]]
-            meta = q.meta_for(t[:name], t[:status].to_sym)
-            if meta && t[:status] == 'running'
-              started = meta['started_at']
-              if started
-                elapsed = Time.now - Time.parse(started)
-                mins = (elapsed / 60).to_i
-                line += "  (#{mins}m)"
-              end
-              line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]" if meta['tmux_session']
-            end
-            preview = q.task_preview(t[:name], t[:status].to_sym)
-            line += "  #{preview}" if preview
-            puts line
+        list_cmd = proc { |*args|
+          opts = Hiiro::Options.parse(args) do
+            flag(:all, short: :a, desc: 'Show all tasks without limit; use pager if output exceeds terminal height')
           end
-        }
-
-        h.add_subcmd(:list) {
-          tasks = q.all_tasks
-          if tasks.empty?
+          lines = q.list_lines(all: opts.all)
+          if lines.empty?
             puts "No tasks"
             next
           end
-          tasks.each do |t|
-            line = "%-10s %s" % [t[:status], t[:name]]
-            meta = q.meta_for(t[:name], t[:status].to_sym)
-            if meta && t[:status] == 'running'
-              started = meta['started_at']
-              if started
-                elapsed = Time.now - Time.parse(started)
-                mins = (elapsed / 60).to_i
-                line += "  (#{mins}m)"
-              end
-              line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]" if meta['tmux_session']
+          if opts.all
+            terminal_lines = ENV['LINES']&.to_i || 24
+            if lines.size > terminal_lines
+              IO.popen(ENV['PAGER'] || 'less', 'w') { |io| io.puts lines }
+            else
+              puts lines
             end
-            preview = q.task_preview(t[:name], t[:status].to_sym)
-            line += "  #{preview}" if preview
-            puts line
+          else
+            puts lines
           end
         }
 
+        h.add_subcmd(:ls, &list_cmd)
+        h.add_subcmd(:list, &list_cmd)
+
         h.add_subcmd(:status) {
           tasks = q.all_tasks
           if tasks.empty?

data/lib/hiiro/version.rb

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

metadata

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