hiiro 0.1.24 → 0.1.26

data/bin/h-task

@@ -3,8 +3,8 @@
 require "hiiro"
 require "fileutils"
 require "yaml"
+require "pathname"
 
-Hiiro.load_env
 hiiro = Hiiro.init(*ARGV, plugins: [Tmux])
 
 class TaskManager
@@ -20,7 +20,7 @@ class TaskManager
     puts "Subcommands:"
     puts "  list, ls              List all worktrees and their active tasks"
     puts "  start TASK [APP]      Start a task (reuses available worktree or creates new)"
-    puts "  switch TASK           Switch to an existing task"
+    puts "  switch [TASK]         Switch to an existing task (interactive if no task given)"
     puts "  app APP_NAME          Open a tmux window for an app in current worktree"
     puts "  apps                  List configured apps from apps.yml"
     puts "  save                  Save current tmux session info for this task"
@@ -42,17 +42,37 @@ class TaskManager
 
     current = current_task
     active, available = trees.partition { |tree_name| task_for_tree(tree_name) }
+    sessions = tmux_sessions
 
     active.each do |tree_name|
       task = task_for_tree(tree_name)
       marker = (current && current[:tree] == tree_name) ? "*" : " "
-      puts format("%s %-20s => %s", marker, tree_name, task)
+
+      # Check if there's a tmux session for this task
+      session_name = session_name_for(task)
+      has_session = sessions.include?(session_name)
+      session_marker = has_session ? "+" : " "
+      session_info = has_session ? " (#{session_name})" : ""
+
+      puts format("%s%s %-20s => %s%s", marker, session_marker, tree_name, task, session_info)
     end
 
     puts if active.any? && available.any?
 
     available.each do |tree_name|
-      puts format("  %-20s    (available)", tree_name)
+      puts format("   %-20s    (available)", tree_name)
+    end
+
+    # List tmux sessions without associated tasks
+    associated_sessions = active.map { |tree_name| session_name_for(task_for_tree(tree_name)) }
+    unassociated_sessions = sessions - associated_sessions
+
+    if unassociated_sessions.any?
+      puts
+      puts "Tmux sessions without tasks:"
+      unassociated_sessions.each do |session|
+        puts format("  %s", session)
+      end
     end
   end
 
@@ -136,7 +156,13 @@ class TaskManager
   end
 
   # Start working on a task
-  def switch_task(task_name)
+  def switch_task(task_name = nil)
+    # If no task name provided, use interactive selection
+    if task_name.nil? || task_name.empty?
+      task_name = select_task_interactive
+      return false unless task_name
+    end
+
     tree, task = assignments.find { |tree, task| task.start_with?(task_name) } || []
 
     unless task
@@ -150,6 +176,34 @@ class TaskManager
     true
   end
 
+  # Interactive task selection using sk
+  def select_task_interactive
+    active_tasks = trees.select { |tree_name| task_for_tree(tree_name) }
+
+    if active_tasks.empty?
+      puts "No active tasks found."
+      return nil
+    end
+
+    # Build selection lines
+    lines = active_tasks.map do |tree_name|
+      task = task_for_tree(tree_name)
+      "#{tree_name.ljust(20)} => #{task}"
+    end
+
+    require 'open3'
+    selected, status = Open3.capture2('sk', stdin_data: lines.join("\n"))
+
+    if status.success? && !selected.strip.empty?
+      # Parse the selected line to extract the task name
+      if selected =~ /=>\s*(\S+)/
+        return $1
+      end
+    end
+
+    nil
+  end
+
   # Open an app window within the current tree
   def open_app(app_name)
     current = current_task
@@ -337,7 +391,12 @@ class TaskManager
       puts printable_apps.keys.sort.map{|k| format("%#{longest_app_name}s => %s", k, printable_apps[k]) }
       exit 1
     when 1
-      print File.join(tree_root, apps_config[matching_apps.first])
+      if Pathname.pwd.ascend.any? { |parent| parent.equal?(tree_root) }
+        pwd_to_root = Pathname.new(tree_root).relative_path_from(Pathname.pwd)
+        print File.join(pwd_to_root, apps_config[matching_apps.first])
+      else
+        print File.join(tree_root, apps_config[matching_apps.first])
+      end
       exit 0
     else
       puts "Multiple matches found:"
@@ -346,8 +405,6 @@ class TaskManager
     end
   end
 
-  private
-
   def printable_apps
     apps_config.transform_keys(&:to_s)
   end
@@ -506,6 +563,12 @@ class TaskManager
     { task: task_name, tree: tree, session: session }
   end
 
+  def task_name
+    task = current_task
+
+    (task || {})[:task]
+  end
+
   def switch_to_task(task_name, tree, app: nil)
     session = session_name_for(task_name)
     base_path = tree_path(tree)
@@ -623,6 +686,13 @@ class TaskManager
       { 'index' => idx, 'name' => name, 'path' => path }
     }
   end
+
+  # Get all tmux sessions
+  def tmux_sessions
+    output = `tmux list-sessions -F '\#{session_name}' 2>/dev/null`
+    return [] unless $?.success?
+    output.lines.map(&:strip)
+  end
 end
 
 # Create task manager instance
@@ -633,16 +703,15 @@ hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
 hiiro.add_subcmd(:list) { tasks.list_trees }
 hiiro.add_subcmd(:ls) { tasks.list_trees }
 hiiro.add_subcmd(:start) { |task_name, app=nil| tasks.start_task(task_name, app: app) }
-hiiro.add_subcmd(:switch) { |task_name| tasks.switch_task(task_name) }
+hiiro.add_subcmd(:switch) { |task_name=nil| tasks.switch_task(task_name) }
 hiiro.add_subcmd(:app) { |app_name| tasks.open_app(app_name) }
-hiiro.add_subcmd(:path) { |app_name=nil, task=nil| tasks.app_path(app_name, task: task) }
+hiiro.add_subcmd(:path) { |app_name=nil, task=nil| tasks.app_path(app_name, task: task || tasks.task_name) }
 hiiro.add_subcmd(:cd) { |*args| tasks.cd_app(*args) }
 hiiro.add_subcmd(:apps) { tasks.list_configured_apps }
 hiiro.add_subcmd(:status) { tasks.status }
 hiiro.add_subcmd(:st) { tasks.status }
 hiiro.add_subcmd(:save) { tasks.save_current }
 hiiro.add_subcmd(:stop) { |task_name=nil| task_name ? tasks.stop_task(task_name) : tasks.stop_current }
-
-hiiro.add_default { tasks.help }
+hiiro.add_subcmd(:current) { print tasks.task_name }
 
 hiiro.run

data/bin/h-video

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-load '/Users/unixsuperhero/bin/h'
+
+require 'hiiro'
 
 o = Hiiro.init(*ARGV)
 

data/bin/h-vim

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+
+BASE_DIR = CONFIG_DIR = File.join(Dir.home, '.config/nvim')
+TMUX_SESSION_NAME = 'vim'
+
+o = Hiiro.init(*ARGV, plugins: [Tmux, Pins, Project])
+
+o.add_subcmd(:edit) { |*args|
+  nvim = ENV['EDITOR']
+  system(nvim, __FILE__)
+}
+
+o.add_subcmd(:path) { |*args|
+  print BASE_DIR
+}
+
+o.add_subcmd(:init, :config) { |*args|
+  nvim = ENV['EDITOR']
+
+  Dir.chdir(BASE_DIR)
+  system(nvim, 'init.lua')
+}
+
+o.add_subcmd(:skf) { |*args|
+  Dir.chdir(BASE_DIR)
+  system('skf', *args)
+}
+
+o.add_subcmd(:rg) { |*args|
+  Dir.chdir(BASE_DIR)
+  system('rg', '-S', *args)
+}
+
+o.add_subcmd(:rgall) { |*args|
+  Dir.chdir(BASE_DIR)
+  system('rg', '-S', '--no-ignore-vcs', *args)
+}
+
+o.add_subcmd(:session) { |*args|
+  Dir.chdir(BASE_DIR)
+
+  o.switch_to_tmux_session(TMUX_SESSION_NAME)
+}
+
+# basically call :session
+o.add_subcmd(:tmux) { |*args|
+  Dir.chdir(BASE_DIR)
+
+  o.switch_to_tmux_session(TMUX_SESSION_NAME)
+}
+
+if o.runnable?
+  o.run
+else
+  puts format('ERROR: %s', :no_runnable_found)
+
+  puts
+
+  o.help
+end
+

data/lib/hiiro/history.rb

@@ -7,7 +7,7 @@ class Hiiro
     HISTORY_FILE = File.join(Dir.home, '.config/hiiro/history.yml')
 
     class Entry
-      attr_reader :id, :timestamp, :source, :cmd, :description, :pwd
+      attr_reader :id, :timestamp, :source, :cmd, :description
       attr_reader :tmux_session, :tmux_window, :tmux_pane
       attr_reader :git_branch, :git_worktree
       attr_reader :task, :subtask
@@ -18,7 +18,6 @@ class Hiiro
         @timestamp = data['timestamp']
         @source = data['source']
         @cmd = data['cmd']
-        @pwd = data['pwd'] || Dir.pwd
         @description = data['description']
         @tmux_session = data['tmux_session']
         @tmux_window = data['tmux_window']
@@ -35,7 +34,6 @@ class Hiiro
           'timestamp' => timestamp,
           'source' => source,
           'cmd' => cmd,
-          'pwd' => pwd,
           'description' => description,
           'tmux_session' => tmux_session,
           'tmux_window' => tmux_window,

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.24"
+  VERSION = "0.1.26"
 end

data/script/sync

@@ -0,0 +1,107 @@
+#!/bin/bash
+
+# Compare directories interactively
+# This script compares bin/ and .config/hiiro/ with their counterparts in $OTHER_DIR
+
+set -e
+
+REPO_DIR="$(cd "$(dirname "$0")/.." && pwd)"
+cd "$REPO_DIR"
+
+OTHER_DIR="$REPO_DIR/../home/"
+
+echo "Comparing directories with $OTHER_DIR"
+echo "Repository: $REPO_DIR ($0)"
+echo "Other Dir: $OTHER_DIR"
+echo
+
+# Function to prompt for y/n
+ask_yn() {
+  local prompt="$1"
+  local response
+  read -p "$prompt (y/N): " response </dev/tty
+  [[ "$response" =~ ^[yY]$ ]]
+}
+
+# Function to copy file with confirmation
+handle_copy() {
+  local src="$1"
+  local dst="$2"
+  local direction="$3"
+
+  echo
+  echo "File only in $direction: $src"
+  if ask_yn "Copy to $dst?"; then
+    mkdir -p "$(dirname "$dst")"
+    cp -v "$src" "$dst"
+    echo "Copied!"
+  else
+    echo "Skipped."
+  fi
+}
+
+# Function to diff files with confirmation
+handle_diff() {
+  local file1="$1"
+  local file2="$2"
+
+  echo
+  echo "DIFFERENT: $file1 <=> $file2"
+  if ask_yn "Open in vim diff?"; then
+    nvim -d "$file1" "$file2" </dev/tty >/dev/tty
+  else
+    echo "Skipped."
+  fi
+}
+
+# Process diff output for a directory pair
+process_diff() {
+  local repo_dir="$1"
+  local home_dir="$2"
+
+  echo "========================================="
+  echo "Comparing: $repo_dir <=> $home_dir"
+  echo "========================================="
+
+  # Use diff -qrs and process line by line
+  while IFS= read -r line; do
+    if [[ "$line" =~ ^"Only in "(.*)": "(.*) ]]; then
+      local dir="${BASH_REMATCH[1]}"
+      local file="${BASH_REMATCH[2]}"
+      local full_path="$dir/$file"
+
+      # Determine if it's only in repo or only in home
+      if [[ "$full_path" == "$repo_dir"* ]]; then
+        # Only in repo, offer to copy to home
+        local rel_path="${full_path#$repo_dir}"
+        handle_copy "$full_path" "$home_dir$rel_path" "repository"
+      else
+        # Only in home, offer to copy to repo
+        local rel_path="${full_path#$home_dir}"
+        handle_copy "$full_path" "$repo_dir$rel_path" "home directory"
+      fi
+
+    elif [[ "$line" =~ ^"Files "(.+)" and "(.+)" differ"$ ]]; then
+      local file1="${BASH_REMATCH[1]}"
+      local file2="${BASH_REMATCH[2]}"
+      handle_diff "$file1" "$file2"
+    fi
+  done < <(diff -qrs "$repo_dir" "$home_dir" 2>/dev/null)
+
+  echo
+}
+
+# Compare bin directories
+if [[ -d "bin" && -d "$OTHER_DIR/bin" ]]; then
+  process_diff "$REPO_DIR/bin/" "$OTHER_DIR/bin/"
+fi
+
+# Compare .config directories
+if [[ -d ".config" && -d "$OTHER_DIR/.config" ]]; then
+  process_diff "$REPO_DIR/.config/hiiro/" "$OTHER_DIR/.config/hiiro/"
+fi
+
+echo "========================================="
+echo "Sync complete!"
+echo "========================================="
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.26
 platform: ruby
 authors:
 - Joshua Toyota
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-28 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -38,17 +38,31 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/g-pr
 - bin/h
 - bin/h-branch
 - bin/h-buffer
+- bin/h-dot
+- bin/h-dotfiles
+- 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-pr-monitor
+- bin/h-pr-watch
+- bin/h-project
+- bin/h-runtask
+- bin/h-serve
 - bin/h-session
+- bin/h-sha
 - bin/h-subtask
 - bin/h-task
 - bin/h-video
+- bin/h-vim
 - bin/h-window
 - bin/h-wtree
 - docs/README.md
@@ -72,6 +86,7 @@ files:
 - script/compare
 - script/install
 - script/publish
+- script/sync
 homepage: https://github.com/unixsuperhero/hiiro
 licenses:
 - MIT