hiiro 0.1.81 → 0.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f87285ddecfdb583f432a5017f6261299b44090af65809fd4a8840f7c497a0a
-  data.tar.gz: 41376a591fe399529e5eb4d2dd33cd01c55eb9f1a9f9f5cc1a56691608e1a631
+  metadata.gz: 599e565871c2afc37ae659954e4ccf01568bed4375032fb9d8ba21007e7e2673
+  data.tar.gz: 4fdcbf43a79f2b63ec3f95ecd003973cb3175b4ef0b6cdbb0cbc36444439b259
 SHA512:
-  metadata.gz: f055d30b6555898fee3011e99ed35085c0989bfb786478815c7e42ece61eba17d7e4c5462b788ca220fa1b06432ebfe17f09cf5d4a84143b8f55b0e0d31da782
-  data.tar.gz: 40f214d34537a625a9ecea49d9ba57d9c96cf2e6a85c586b9854eabc18960d2b14009743458008c4127b822dc5c4e630db293fc55b41b0384586702ff0398029
+  metadata.gz: e8945bc066927371fa804f6b0deef00ee36f84be0fc9178033e52d5228ce5f6b895b114cb3a0a37129e491f2c8d4a1156cfce36e18740d28048fa7885ad1f792
+  data.tar.gz: 31acaf4e204e3be5f8c6fddbf6009f0e757bad86e3dcbe5c770637c05d848a6c4a65c42552617e015bd8b55171aecc9d2fde86b58e6b16ed06ef23f8bdef6179

data/bin/h-branch

@@ -19,10 +19,6 @@ class BranchManager
     puts
     puts "Subcommands:"
     puts "  save                  Record current branch for this task"
-    puts "  history               List branch history (oldest to newest)"
-    puts "  history --worktree=X  Filter by worktree"
-    puts "  history --task=X      Filter by task"
-    puts "  history --session=X   Filter by tmux session"
     puts "  current               Show current branch info"
   end
 
@@ -62,35 +58,6 @@ class BranchManager
     true
   end
 
-  def history(args = [])
-    filters = parse_filters(args)
-    data = load_data
-    branches = data['branches'] || []
-
-    if branches.empty?
-      puts "No branches recorded."
-      puts "Use 'h branch save' to record the current branch."
-      return
-    end
-
-    # Apply filters
-    branches = filter_entries(branches, filters)
-
-    if branches.empty?
-      puts "No branches match the given filters."
-      return
-    end
-
-    # Sort by created_at (oldest first)
-    branches = branches.sort_by { |b| b['created_at'] || '' }
-
-    puts "Branch history (oldest to newest):"
-    puts
-    branches.each_with_index do |branch, idx|
-      puts format_entry(branch, idx + 1)
-    end
-  end
-
   def current
     branch_name = current_branch
     unless branch_name
@@ -132,48 +99,6 @@ class BranchManager
     }
   end
 
-  def parse_filters(args)
-    filters = {}
-    args.each do |arg|
-      case arg
-      when /^--worktree=(.+)$/
-        filters[:worktree] = $1
-      when /^--task=(.+)$/
-        filters[:task] = $1
-      when /^--session=(.+)$/
-        filters[:session] = $1
-      when /^-w(.+)$/
-        filters[:worktree] = $1
-      when /^-t(.+)$/
-        filters[:task] = $1
-      when /^-s(.+)$/
-        filters[:session] = $1
-      end
-    end
-    filters
-  end
-
-  def filter_entries(entries, filters)
-    entries.select do |entry|
-      next false if filters[:worktree] && !entry['worktree']&.include?(filters[:worktree])
-      next false if filters[:task] && !entry['task']&.include?(filters[:task])
-      next false if filters[:session] && entry.dig('tmux', 'session') != filters[:session]
-      true
-    end
-  end
-
-  def format_entry(entry, num)
-    lines = []
-    lines << "#{num}. #{entry['name']}"
-    lines << "   Task: #{entry['task'] || '(none)'}"
-    lines << "   Worktree: #{entry['worktree'] || '(none)'}"
-    if entry['tmux']
-      lines << "   Tmux: #{entry['tmux']['session']}/#{entry['tmux']['window']}"
-    end
-    lines << "   Created: #{entry['created_at']}"
-    lines.join("\n")
-  end
-
   def show_entry(entry)
     puts "  Branch: #{entry[:name]}"
     puts "  Task: #{entry[:task] || '(none)'}"
@@ -204,7 +129,6 @@ manager = BranchManager.new(hiiro)
 
 hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
 hiiro.add_subcmd(:save) { manager.save }
-hiiro.add_subcmd(:history) { |*args| manager.history(args) }
 hiiro.add_subcmd(:current) { manager.current }
 hiiro.add_subcmd(:select) do |*args|
   branches = hiiro.git.branches(sort_by: 'authordate', ignore_case: true)
@@ -375,6 +299,115 @@ hiiro.add_subcmd(:behind) { |*args|
   puts "#{branch} is #{count} commit(s) behind #{behind_of}"
 }
 
+hiiro.add_subcmd(:log) { |upstream = nil|
+  upstream ||= %w[origin/master master origin/main main].find { |ref|
+    system("git rev-parse --verify #{ref} >/dev/null 2>&1")
+  }
+
+  unless upstream
+    puts "Cannot find master or origin/master"
+    next
+  end
+
+  forkpoint = `git merge-base --fork-point #{upstream} HEAD 2>/dev/null`.strip
+  if forkpoint.empty?
+    forkpoint = `git merge-base #{upstream} HEAD 2>/dev/null`.strip
+  end
+
+  if forkpoint.empty?
+    puts "Could not find fork point"
+    next
+  end
+
+  system('git', 'log', '--oneline', '--decorate', "#{forkpoint}..HEAD")
+}
+
+hiiro.add_subcmd(:forkpoint) { |upstream = nil, branch = nil|
+  branch ||= 'HEAD'
+  upstream ||= %w[origin/master master origin/main main].find { |ref|
+    system("git rev-parse --verify #{ref} >/dev/null 2>&1")
+  }
+
+  unless upstream
+    puts "Cannot find master or origin/master"
+    next
+  end
+
+  forkpoint = `git merge-base --fork-point #{upstream} #{branch} 2>/dev/null`.strip
+
+  if forkpoint.empty?
+    # Fallback to regular merge-base if fork-point fails
+    forkpoint = `git merge-base #{upstream} #{branch} 2>/dev/null`.strip
+  end
+
+  if forkpoint.empty?
+    puts "Could not find fork point between #{upstream} and #{branch}"
+  else
+    puts forkpoint
+  end
+}
+
+hiiro.add_subcmd(:changed) { |*args|
+  show_all = args.delete('-a') || args.delete('--all')
+  upstream = args.first
+
+  upstream ||= %w[origin/master master origin/main main].find { |ref|
+    system("git rev-parse --verify #{ref} >/dev/null 2>&1")
+  }
+
+  unless upstream
+    puts "Cannot find master or origin/master"
+    next
+  end
+
+  forkpoint = `git merge-base --fork-point #{upstream} HEAD 2>/dev/null`.strip
+  if forkpoint.empty?
+    forkpoint = `git merge-base #{upstream} HEAD 2>/dev/null`.strip
+  end
+
+  if forkpoint.empty?
+    puts "Could not find fork point"
+    next
+  end
+
+  if show_all
+    system('git', 'diff', '--name-only', "#{forkpoint}...HEAD")
+  else
+    system('git', 'diff', '--name-only', '--relative', "#{forkpoint}...HEAD")
+  end
+}
+
+
+hiiro.add_subcmd(:changed) { |*args|
+  show_all = args.delete('-a') || args.delete('--all')
+  upstream = args.first
+
+  upstream ||= %w[origin/master master origin/main main].find { |ref|
+    system("git rev-parse --verify #{ref} >/dev/null 2>&1")
+  }
+
+  unless upstream
+    puts "Cannot find master or origin/master"
+    next
+  end
+
+  forkpoint = `git merge-base --fork-point #{upstream} HEAD 2>/dev/null`.strip
+  if forkpoint.empty?
+    forkpoint = `git merge-base #{upstream} HEAD 2>/dev/null`.strip
+  end
+
+  if forkpoint.empty?
+    puts "Could not find fork point"
+    next
+  end
+
+  if show_all
+    system('git', 'diff', '--name-only', "#{forkpoint}...HEAD")
+  else
+    system('git', 'diff', '--name-only', '--relative', "#{forkpoint}...HEAD")
+  end
+}
+
 hiiro.add_subcmd(:ancestor) { |*args|
   case args.length
   when 0

data/bin/h-pane

@@ -60,17 +60,6 @@ o.add_subcmd(:resize) { |*args|
   system('tmux', 'resize-pane', *args)
 }
 
-o.add_subcmd(:history) { |pane_id=nil|
-  entries = Hiiro::History.by_pane(pane_id)
-  if entries.empty?
-    puts "No history for this pane"
-  else
-    puts "History for pane: #{pane_id || ENV['TMUX_PANE'] || 'current'}"
-    puts
-    entries.last(20).each_with_index { |e, i| puts e.oneline(i + 1) }
-  end
-}
-
 o.add_subcmd(:select) do |*args|
   # Get all panes with details
   output = `tmux list-panes -a -F '\#{session_name}:\#{window_index}.\#{pane_index} [\#{pane_current_command}] \#{pane_current_path}'`.strip

data/bin/h-pr

@@ -21,10 +21,6 @@ class PRManager
     puts
     puts "Subcommands:"
     puts "  save [PR_NUMBER]      Record PR for this task (auto-detects if omitted)"
-    puts "  history               List PR history (oldest to newest)"
-    puts "  history --worktree=X  Filter by worktree"
-    puts "  history --task=X      Filter by task"
-    puts "  history --session=X   Filter by tmux session"
     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"
@@ -67,35 +63,6 @@ class PRManager
     true
   end
 
-  def history(args = [])
-    filters = parse_filters(args)
-    data = load_data
-    prs = data['prs'] || []
-
-    if prs.empty?
-      puts "No PRs recorded."
-      puts "Use 'h pr save' to record the current PR."
-      return
-    end
-
-    # Apply filters
-    prs = filter_entries(prs, filters)
-
-    if prs.empty?
-      puts "No PRs match the given filters."
-      return
-    end
-
-    # Sort by created_at (oldest first)
-    prs = prs.sort_by { |p| p['created_at'] || '' }
-
-    puts "PR history (oldest to newest):"
-    puts
-    prs.each_with_index do |pr, idx|
-      puts format_entry(pr, idx + 1)
-    end
-  end
-
   def current
     pr_info = fetch_pr_info
     unless pr_info
@@ -169,36 +136,6 @@ class PRManager
     }
   end
 
-  def parse_filters(args)
-    filters = {}
-    args.each do |arg|
-      case arg
-      when /^--worktree=(.+)$/
-        filters[:worktree] = $1
-      when /^--task=(.+)$/
-        filters[:task] = $1
-      when /^--session=(.+)$/
-        filters[:session] = $1
-      when /^-w(.+)$/
-        filters[:worktree] = $1
-      when /^-t(.+)$/
-        filters[:task] = $1
-      when /^-s(.+)$/
-        filters[:session] = $1
-      end
-    end
-    filters
-  end
-
-  def filter_entries(entries, filters)
-    entries.select do |entry|
-      next false if filters[:worktree] && !entry['worktree']&.include?(filters[:worktree])
-      next false if filters[:task] && !entry['task']&.include?(filters[:task])
-      next false if filters[:session] && entry.dig('tmux', 'session') != filters[:session]
-      true
-    end
-  end
-
   def format_entry(entry, num)
     lines = []
     lines << "#{num}. PR ##{entry['number']}: #{entry['title']}"
@@ -295,7 +232,7 @@ class PinnedPRManager
   end
 
   def fetch_pr_info(pr_number)
-    fields = 'number,title,url,headRefName,state,statusCheckRollup'
+    fields = 'number,title,url,headRefName,state,statusCheckRollup,reviewDecision,reviews,isDraft,mergeable'
     output = `gh pr view #{pr_number} --json #{fields} 2>/dev/null`.strip
     return nil if output.empty?
     JSON.parse(output)
@@ -325,6 +262,10 @@ class PinnedPRManager
     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
     pr
   end
@@ -343,28 +284,124 @@ class PinnedPRManager
     { 'total' => total, 'success' => success, 'pending' => pending, 'failed' => failed }
   end
 
+  def summarize_reviews(reviews)
+    return nil unless reviews.is_a?(Array) && !reviews.empty?
+
+    # Get the latest review state per author
+    latest_by_author = {}
+    reviews.each do |review|
+      author = review['author']['login'] rescue nil
+      next unless author
+      # Only track if it's a meaningful state
+      state = review['state']
+      next unless %w[APPROVED CHANGES_REQUESTED COMMENTED].include?(state)
+      latest_by_author[author] = state
+    end
+
+    approved = latest_by_author.values.count { |s| s == 'APPROVED' }
+    changes_requested = latest_by_author.values.count { |s| s == 'CHANGES_REQUESTED' }
+    commented = latest_by_author.values.count { |s| s == 'COMMENTED' }
+
+    { 'approved' => approved, 'changes_requested' => changes_requested, 'commented' => commented, 'reviewers' => latest_by_author }
+  end
+
   def display_pinned(pr, idx = nil)
     num = idx ? "#{(idx + 1).to_s.rjust(3)}." : ""
     state_icon = case pr['state']
     when 'MERGED' then '[M]'
     when 'CLOSED' then '[X]'
-    else '[O]'
+    else pr['is_draft'] ? '[D]' : '[O]'
     end
 
     checks_str = if pr['checks']
       c = pr['checks']
       if c['failed'] > 0
-        " [#{c['success']}/#{c['total']} FAIL:#{c['failed']}]"
+        " checks:#{c['success']}/#{c['total']} FAIL:#{c['failed']}"
       elsif c['pending'] > 0
-        " [#{c['success']}/#{c['total']} pending:#{c['pending']}]"
+        " checks:#{c['success']}/#{c['total']} pending:#{c['pending']}"
       else
-        " [#{c['success']}/#{c['total']}]"
+        " checks:#{c['success']}/#{c['total']}"
       end
     else
       ""
     end
 
-    "#{num} #{state_icon} ##{pr['number']} #{pr['title']}#{checks_str}".strip
+    reviews_str = if pr['reviews']
+      r = pr['reviews']
+      parts = []
+      parts << "#{r['approved']} approved" if r['approved'] > 0
+      parts << "#{r['changes_requested']} changes" if r['changes_requested'] > 0
+      parts.empty? ? "" : " | #{parts.join(', ')}"
+    else
+      ""
+    end
+
+    "#{num} #{state_icon} ##{pr['number']} #{pr['title']}#{checks_str}#{reviews_str}".strip
+  end
+
+  def display_detailed(pr, idx = nil)
+    lines = []
+    num = idx ? "#{idx + 1}." : ""
+
+    state_str = case pr['state']
+    when 'MERGED' then 'MERGED'
+    when 'CLOSED' then 'CLOSED'
+    else pr['is_draft'] ? 'DRAFT' : 'OPEN'
+    end
+
+    lines << "#{num} ##{pr['number']} - #{pr['title']}"
+    lines << "   State: #{state_str}"
+    lines << "   Branch: #{pr['headRefName']}" if pr['headRefName']
+    lines << "   URL: #{pr['url']}" if pr['url']
+
+    # Checks
+    if pr['checks']
+      c = pr['checks']
+      check_status = if c['failed'] > 0
+        "FAILING (#{c['success']}/#{c['total']} passed, #{c['failed']} failed)"
+      elsif c['pending'] > 0
+        "PENDING (#{c['success']}/#{c['total']} passed, #{c['pending']} pending)"
+      else
+        "PASSING (#{c['success']}/#{c['total']})"
+      end
+      lines << "   Checks: #{check_status}"
+    else
+      lines << "   Checks: (none)"
+    end
+
+    # Reviews
+    if pr['reviews']
+      r = pr['reviews']
+      review_parts = []
+      review_parts << "#{r['approved']} approved" if r['approved'] > 0
+      review_parts << "#{r['changes_requested']} requesting changes" if r['changes_requested'] > 0
+      review_parts << "#{r['commented']} commented" if r['commented'] > 0
+
+      if review_parts.any?
+        lines << "   Reviews: #{review_parts.join(', ')}"
+        if r['reviewers'] && !r['reviewers'].empty?
+          r['reviewers'].each do |author, state|
+            icon = case state
+            when 'APPROVED' then '+'
+            when 'CHANGES_REQUESTED' then '-'
+            else '?'
+            end
+            lines << "      #{icon} #{author}: #{state.downcase.gsub('_', ' ')}"
+          end
+        end
+      else
+        lines << "   Reviews: (none)"
+      end
+    else
+      lines << "   Reviews: (not fetched)"
+    end
+
+    # Mergeable
+    if pr['mergeable']
+      lines << "   Mergeable: #{pr['mergeable']}"
+    end
+
+    lines.join("\n")
   end
 end
 
@@ -441,7 +478,6 @@ hiiro.add_subcmd(:link) { |*args|
 
 hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
 hiiro.add_subcmd(:save) { |pr_number=nil| manager.save(pr_number) }
-hiiro.add_subcmd(:history) { |*args| manager.history(args) }
 hiiro.add_subcmd(:current) { manager.current }
 hiiro.add_subcmd(:open) { |pr_number=nil| manager.open(pr_number) }
 hiiro.add_subcmd(:view) { |pr_number=nil| manager.view(pr_number) }
@@ -586,16 +622,23 @@ hiiro.add_subcmd(:status) do |*args|
     next
   end
 
+  compact = args.include?('-c') || args.include?('--compact')
+
   puts "Refreshing status for #{pinned.length} pinned PR(s)..."
   puts
 
   pinned.each_with_index do |pr, idx|
     pinned_manager.refresh_status(pr)
-    puts pinned_manager.display_pinned(pr, idx)
+    if compact
+      puts pinned_manager.display_pinned(pr, idx)
+    else
+      puts pinned_manager.display_detailed(pr, idx)
+      puts
+    end
   end
 
   pinned_manager.save_pinned(pinned)
-  puts
+  puts "---"
   puts "Status updated at #{Time.now.strftime('%H:%M:%S')}"
 end
 

data/bin/h-session

@@ -60,16 +60,4 @@ o.add_subcmd(:info) { |*args|
   system('tmux', 'display-message', '-p', '#{session_name}: #{session_windows} windows, #{session_attached} attached', *args)
 }
 
-o.add_subcmd(:history) { |session_name=nil|
-  session_name ||= `tmux display-message -p '#S'`.strip if ENV['TMUX']
-  entries = Hiiro::History.by_session(session_name)
-  if entries.empty?
-    puts "No history for this session"
-  else
-    puts "History for session: #{session_name || 'current'}"
-    puts
-    entries.last(20).each_with_index { |e, i| puts e.oneline(i + 1) }
-  end
-}
-
 o.run

data/bin/h-window

@@ -56,18 +56,6 @@ o.add_subcmd(:unlink) { |*args|
   system('tmux', 'unlink-window', *args)
 }
 
-o.add_subcmd(:history) { |window_id=nil|
-  window_id ||= `tmux display-message -p '#I'`.strip if ENV['TMUX']
-  entries = Hiiro::History.by_window(window_id)
-  if entries.empty?
-    puts "No history for this window"
-  else
-    puts "History for window: #{window_id || 'current'}"
-    puts
-    entries.last(20).each_with_index { |e, i| puts e.oneline(i + 1) }
-  end
-}
-
 o.add_subcmd(:select) do |*args|
   # Get all windows with details
   output = `tmux list-windows -a -F '\#{session_name}:\#{window_index} \#{window_name} [\#{window_panes} panes]'`.strip

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.81"
+  VERSION = "0.1.83"
 end

data/lib/hiiro.rb

@@ -6,7 +6,6 @@ require "pry"
 require_relative "hiiro/version"
 require_relative "hiiro/prefix_matcher"
 require_relative "hiiro/git"
-require_relative "hiiro/history"
 require_relative "hiiro/options"
 require_relative "hiiro/notification"
 require_relative "hiiro/sk"
@@ -39,7 +38,6 @@ class Hiiro
     bin_name = values[:bin_name] || $0
 
     new(bin_name, *args, logging: logging, **values).tap do |hiiro|
-      History.load(hiiro)
       hiiro.load_plugins(*plugins)
 
       hiiro.add_subcommand(:pry) { |*args|
@@ -104,16 +102,9 @@ class Hiiro
     @todo_manager ||= TodoManager.new
   end
 
-  def history
-    @history ||= History.new
-  end
-
   def run
     result = runner.run(*args)
 
-    # Track command after running (only saves if state changed and in task context)
-    History.track(cmd: full_command, hiiro: self)
-
     handle_result(result)
 
     exit 1

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.81
+  version: 0.1.83
 platform: ruby
 authors:
 - Joshua Toyota
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -72,21 +73,14 @@ files:
 - bin/h-buffer
 - bin/h-commit
 - bin/h-config
-- bin/h-home
-- bin/h-html
 - bin/h-link
-- bin/h-mic
-- bin/h-note
 - bin/h-pane
 - bin/h-plugin
 - bin/h-pr
 - bin/h-project
-- bin/h-remind
-- bin/h-serve
 - bin/h-session
 - bin/h-sha
 - bin/h-todo
-- bin/h-video
 - bin/h-window
 - bin/h-wtree
 - docs/README.md
@@ -107,8 +101,6 @@ files:
 - lib/hiiro/git/remote.rb
 - lib/hiiro/git/worktree.rb
 - lib/hiiro/git/worktrees.rb
-- lib/hiiro/history.rb
-- lib/hiiro/history/entry.rb
 - lib/hiiro/notification.rb
 - lib/hiiro/options.rb
 - lib/hiiro/prefix_matcher.rb
@@ -134,6 +126,7 @@ metadata:
   homepage_uri: https://github.com/unixsuperhero/hiiro
   source_code_uri: https://github.com/unixsuperhero/hiiro
   changelog_uri: https://github.com/unixsuperhero/hiiro/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,7 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A lightweight CLI framework for Ruby
 test_files: []