hiiro 0.1.86 → 0.1.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da3861933a1b2b03e5ff7cd9fa87d700e7f3f1ed8e6eb62463ec93c783e2a86
-  data.tar.gz: 9c5957829cae479530f68cccae440bc683285a93e1695db75c4a44dfa1a02503
+  metadata.gz: ce90e3d37e2dfb575b7a30f2070c605e377146073fe32f715768383b907290f4
+  data.tar.gz: a700aaee8c6b5c0eadfe6fe694df2a97291b38aa289c6c5dfce931e8ce1df39d
 SHA512:
-  metadata.gz: 6c0c41355a0c33056574f1e4c61d937087e7b8fedb1db2fe864f41f571264c44c8c7c46af14b4e238d17f202f061f599fb982fa7fdcfddc7829051802462e7f8
-  data.tar.gz: 07a5888842492bf0aa9b9ed5444b9f9b12bb15ea14615b70eaeb44b4c0e41d9319e1ffdbab80eba422108a91cb68dfb5c0c20edc9f76500364eaf67ee5671d25
+  metadata.gz: 398be942e72ed10cd94becb6626d2c29bedd8554647e792b05cccea5098964085995a7eae2ebf0c15a3d5bacac73766884fcdb9ed8499d6546e3fb71ae48d59d
+  data.tar.gz: d6f3682431737967af381781a888d028b5b2fe13617d34eba984bebed53e5c4ffcbe41c9c79d72eba70aec3cfb8400f8185db5cf678953475896a5f96948922e

data/CLAUDE.md

@@ -154,7 +154,7 @@ Main entry point with class methods:
 
 Instance methods available in subcommand blocks:
 - `git` - Returns `Hiiro::Git` instance for git operations
-- `sk(lines)` - Interactive selection via skim
+- `fuzzyfind(lines)` - Interactive selection via skim
 - `pins` - Key-value storage per command
 - `todo_manager` - Todo item management
 - `history` - Command history tracking
@@ -193,15 +193,15 @@ git.move_worktree(from, to)       # Rename worktree
 git.current_pr                    # Get current PR info
 ```
 
-### Hiiro::Sk (lib/hiiro/sk.rb)
+### Hiiro::Fuzzyfind (lib/hiiro/fuzzyfind.rb)
 
-Integration with `sk` (skim) fuzzy finder:
+Integration with `sk` (skim) or `fzf` fuzzy finders:
 
 ```ruby
-selected = Hiiro::Sk.select(["option1", "option2", "option3"])
+selected = Hiiro::Fuzzyfind.select(["option1", "option2", "option3"])
 # Returns selected string or nil if cancelled
 
-value = Hiiro::Sk.map_select({ "Display 1" => "value1", "Display 2" => "value2" })
+value = Hiiro::Fuzzyfind.map_select({ "Display 1" => "value1", "Display 2" => "value2" })
 # Shows keys, returns corresponding value
 ```
 
@@ -235,7 +235,7 @@ History.by_session("work")                      # Filter by tmux session
 - `bin/h-*` - External subcommands (tmux wrappers, video operations)
 - `plugins/*.rb` - Reusable plugin modules (Pins, Project, Task, Tmux, Notify)
 - `lib/hiiro.rb` - Main Hiiro class and Runners
-- `lib/hiiro/*.rb` - Supporting classes (Git, PrefixMatcher, Sk, Todo, History)
+- `lib/hiiro/*.rb` - Supporting classes (Git, PrefixMatcher, Fuzzyfind, Todo, History)
 
 ## External Dependencies
 

data/README.md

@@ -36,7 +36,7 @@ Ensure `~/bin` is in your `$PATH`.
 brew install terminal-notifier
 
 # For fuzzy-finder
-brew install sk
+brew install sk # (or fzf)
 ```
 
 ## Quick Start

data/bin/h-branch

@@ -14,18 +14,6 @@ class BranchManager
     @hiiro = hiiro
   end
 
-  def help
-    puts "Usage: h branch <subcommand> [args]"
-    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
-
   def save
     branch_name = current_branch
     unless branch_name
@@ -62,35 +50,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 +91,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,8 +121,8 @@ 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(:current) { print `git branch --show-current` }
+hiiro.add_subcmd(:info) { manager.current }
 hiiro.add_subcmd(:select) do |*args|
   branches = hiiro.git.branches(sort_by: 'authordate', ignore_case: true)
 
@@ -341,6 +258,36 @@ hiiro.add_subcmd(:diff) { |*args|
   system('git', 'log', '--oneline', '--decorate', range)
 }
 
+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(:ahead) { |*args|
   case args.length
   when 0
@@ -375,6 +322,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
@@ -401,6 +457,4 @@ hiiro.add_subcmd(:ancestor) { |*args|
   end
 }
 
-hiiro.add_default { manager.help }
-
 hiiro.run

data/bin/h-buffer

@@ -27,8 +27,7 @@ def select_buffer(partial = nil)
   return nil if names.empty?
   return names.first if names.length == 1
 
-  require 'open3'
-  selected, status = Open3.capture2('sk', '--no-sort', stdin_data: names.join("\n"))
+  selected, status = Hiiro::Fuzzyfind.select(names)
   return nil unless status.success?
 
   selected.strip.empty? ? nil : selected.strip
@@ -112,7 +111,7 @@ o.add_subcmd(:select) do |*args|
     h[line] = buffer_name
   end
 
-  selected = Hiiro::Sk.map_select(lines)
+  selected = o.fuzzyfind_from_map(lines)
 
   if selected
     print selected

data/bin/h-link

@@ -275,8 +275,7 @@ o.add_subcmd(:select) do |*args|
     lines = lm.hash_matches?(lines, *args)
   end
 
-  require 'open3'
-  selected, status = Open3.capture2('sk', stdin_data: lines.keys.join("\n"))
+  selected, status = o.fuzzyfind(lines.keys)
 
   if status.success? && !selected.strip.empty?
     link = lines[selected.strip]
@@ -349,8 +348,7 @@ o.add_subcmd(:open) do |*args|
       lines = lm.hash_matches?(lines, *args)
     end
 
-    require 'open3'
-    selected, status = Open3.capture2('sk', stdin_data: lines.keys.join("\n"))
+    selected, status = o.fuzzyfind(lines.keys)
 
     if status.success? && !selected.strip.empty?
       link = lines[selected.strip]

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
@@ -85,7 +74,7 @@ o.add_subcmd(:select) do |*args|
     h[line] = pane_id
   end
 
-  selected = Hiiro::Sk.map_select(lines)
+  selected = o.fuzzyfind_from_map(lines)
 
   if selected
     print selected

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']}"
@@ -541,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) }
@@ -566,7 +502,7 @@ hiiro.add_subcmd(:select) do |*args|
     h[display] = pr['number'].to_s
   end
 
-  selected = Hiiro::Sk.map_select(lines)
+  selected = hiiro.fuzzyfind_from_map(lines)
 
   if selected
     print selected
@@ -602,7 +538,7 @@ hiiro.add_subcmd(:pin) do |ref = nil, *args|
         h[display] = pr
       end
 
-      pr_info = Hiiro::Sk.map_select(lines)
+      pr_info = hiiro.fuzzyfind_from_map(lines)
       unless pr_info
         puts "No PR selected"
         next
@@ -643,7 +579,7 @@ hiiro.add_subcmd(:unpin) do |ref = nil, *args|
       h[pinned_manager.display_pinned(pr, idx)] = pr['number'].to_s
     end
 
-    pr_number = Hiiro::Sk.map_select(lines)
+    pr_number = hiiro.fuzzyfind_from_map(lines)
     unless pr_number
       puts "No PR selected"
       next

data/bin/h-project

@@ -155,7 +155,7 @@ o.add_subcmd(:select) { |*args|
     h[display] = path
   end
 
-  selected = Hiiro::Sk.map_select(lines)
+  selected = o.fuzzyfind_from_map(lines)
 
   if selected
     print selected

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-sha

@@ -18,7 +18,7 @@ Hiiro.init(*ARGV, plugins: [Pins]) { |hiiro|
       h[line] = sha
     end
 
-    selected = Hiiro::Sk.map_select(lines)
+    selected = hiiro.fuzzyfind_from_map(lines)
 
     if selected
       print selected
@@ -44,12 +44,7 @@ Hiiro.init(*ARGV, plugins: [Pins]) { |hiiro|
       next if sha.empty?
     end
 
-    require 'open3'
-    Open3.popen3('pbcopy') do |stdin, stdout, stderr, wait_thr|
-      stdin.write(sha)
-      stdin.close
-      wait_thr.value
-    end
+    Hiiro::Shell.pipe(sha, 'pbcopy')
     puts "Copied #{sha} to clipboard"
   end
 

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
@@ -82,7 +70,7 @@ o.add_subcmd(:select) do |*args|
     h[line] = window_id
   end
 
-  selected = Hiiro::Sk.map_select(lines)
+  selected = o.fuzzyfind_from_map(lines)
 
   if selected
     print selected

data/bin/h-wtree

@@ -28,7 +28,7 @@ Hiiro.run(*ARGV) do |h|
       hash[line] = path
     end
 
-    selected = Hiiro::Sk.map_select(lines)
+    selected = h.fuzzyfind_from_map(lines)
 
     if selected
       print selected

data/lib/hiiro/fuzzyfind.rb

@@ -0,0 +1,32 @@
+require_relative 'shell'
+
+class Hiiro
+  class Fuzzyfind
+    TOOLS = %w[sk fzf]
+
+    def self.tool
+      TOOLS.find { |name| system("command -v #{name} 2>/dev/null") }
+    end
+
+    def self.tool!
+      match = tool
+
+      return match if match
+
+      puts "ERROR: No fuzzyfinder found!"
+      exit 1
+    end
+
+    def self.select(lines)
+      Shell.pipe_lines(lines, tool!)
+    end
+
+    def self.map_select(mapping)
+      keys = mapping.keys
+
+      key = select(keys)
+
+      mapping[key.to_s.chomp]
+    end
+  end
+end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.86"
+  VERSION = "0.1.87"
 end