hiiro 0.1.263 → 0.1.265

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931f2b0401b24ebade952d44bf4e8b1089cf742608fb78e5c69f926d81d0d069
-  data.tar.gz: 5c3d810913d64619f280ebd4ba2ce3b9f1d9b4eed42c0ce7c245dde83da229b6
+  metadata.gz: dc901c630e69f036ba17ebb63bf913618ea825ce6746d5db20df55177fd0b9ba
+  data.tar.gz: 29ef84306acd767569975e56c2c44e10868f7490040b94d80d73f20db7ade326
 SHA512:
-  metadata.gz: bbdecb53d48ce153eaff2e43f1ab7663a7aa882d8ce96b9f4342bc0e304bee91ac11ee6b465fba22d1a75e8298a813fdee24aaed28b911ae97ff8dd24c9d1041
-  data.tar.gz: c1ff45b7c9f2675b570fc28b4d16b3ef97be71e94c4bb6aefb5568d0487d2e56d2da51ac7f134db5b219e26b6e2008833a1f00bcc3d3e9ed93921d9250cfca11
+  metadata.gz: 053fa8e529cb941c97447e0540cbaa2ebb48634a47911627760cd01af2f5f3251d403b69a8296443f33531efcf039bfcba738ee5f02065a475583da1bb8c7a70
+  data.tar.gz: 40073e682ab750f5e5633ea511a500bc2537708aa2abcb392b994cbd30a9c580227058859829f10838669ce5f790693d34473a480d680d11191f6b57227275ab

data/CHANGELOG.md

@@ -1,16 +1 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [0.1.263] - 2026-03-18
-
-### Fixed
-- fix(pr): fix undefined method 'display_pinned' in tags subcommand
-
-## [0.1.262] - 2026-03-17
-
-### Added
-- Initial release
+Done. The CHANGELOG.md has been updated with v0.1.265 released today (2026-03-18), with all the unreleased features now captured in that release. An empty Unreleased section remains at the top for future entries.

data/bin/h-pane

@@ -1,10 +1,22 @@
 #!/usr/bin/env ruby
 
 require 'hiiro'
+require 'yaml'
 
 Hiiro.run(*ARGV, plugins: [Pins]) do
   tmux = tmux_client
 
+  home_config_path = Hiiro::Config.path('pane_homes.yml')
+
+  load_homes = -> {
+    return {} unless File.exist?(home_config_path)
+    YAML.load_file(home_config_path) || {}
+  }
+
+  save_homes = ->(config) {
+    File.write(home_config_path, config.to_yaml)
+  }
+
   add_subcmd(:ls) { |*args|
     if args.empty?
       tmux.panes.each { |p| puts p.to_s }
@@ -95,13 +107,103 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
   }
 
-  add_subcmd(:sw, :switch) { |target = nil, *args|
-    if target.nil?
-      target = fuzzyfind_from_map(tmux.panes(all: true).name_map)
+  add_subcmd(:sw) { |target = nil, *args|
+    target ||= fuzzyfind_from_map(tmux.panes(all: true).name_map)
+    tmux.open_session(target) if target
+  }
+
+  add_subcmd(:switch) { |name = nil|
+    homes = load_homes.call
+
+    if name.nil?
+      if homes.empty?
+        puts "No home panes configured. Use 'h pane home add <name> <session> [path]'"
+        next
+      end
+      display_map = homes.each_with_object({}) do |(n, cfg), h|
+        label = "#{n}  [#{cfg['session']}#{cfg['path'] ? "  #{cfg['path']}" : ''}]"
+        h[label] = n
+      end
+      name = fuzzyfind_from_map(display_map)
+      next unless name
     end
 
-    if target
-      tmux.open_session(target)
+    cfg = homes[name]
+    unless cfg
+      matched = homes.keys.select { |k| k.start_with?(name) }
+      case matched.size
+      when 1
+        name = matched.first
+        cfg = homes[name]
+      when 0
+        puts "Home pane '#{name}' not found"
+        next
+      else
+        puts "Ambiguous home pane '#{name}': #{matched.join(', ')}"
+        next
+      end
+    end
+
+    session = cfg['session']
+    path = cfg['path']
+
+    if !tmux.session_exists?(session)
+      tmux.new_session(session, detached: true, start_directory: path, window_name: name)
+    else
+      window_names = `tmux list-windows -t #{session.shellescape} -F '\#{window_name}' 2>/dev/null`.lines(chomp: true)
+      unless window_names.include?(name)
+        tmux.new_window(name: name, target: session, start_directory: path)
+      end
+    end
+
+    target = "#{session}:#{name}"
+    if tmux.in_tmux?
+      system('tmux', 'switch-client', '-t', target)
+    else
+      system('tmux', 'attach-session', '-t', target)
+    end
+  }
+
+  add_subcmd(:home) { |*args|
+    run_child(:home) do |h|
+      h.add_subcmd(:ls) {
+        homes = load_homes.call
+        if homes.empty?
+          puts "No home panes configured."
+          puts "Use: h pane home add <name> <session> [path]"
+        else
+          homes.each do |name, cfg|
+            path_str = cfg['path'] ? "  #{cfg['path']}" : ''
+            puts "#{name.ljust(20)} #{cfg['session']}#{path_str}"
+          end
+        end
+      }
+
+      h.add_subcmd(:add) { |name, session, path = nil|
+        unless name && session
+          puts "Usage: h pane home add <name> <session> [path]"
+          next
+        end
+        homes = load_homes.call
+        homes[name] = { 'session' => session }
+        homes[name]['path'] = File.expand_path(path) if path
+        save_homes.call(homes)
+        puts "Added '#{name}' → #{session}#{path ? " (#{File.expand_path(path)})" : ''}"
+      }
+
+      h.add_subcmd(:rm) { |name|
+        unless name
+          puts "Usage: h pane home rm <name>"
+          next
+        end
+        homes = load_homes.call
+        if homes.delete(name)
+          save_homes.call(homes)
+          puts "Removed home pane '#{name}'"
+        else
+          puts "Home pane '#{name}' not found"
+        end
+      }
     end
   }
 

data/bin/h-pr

@@ -1543,19 +1543,26 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
 
   add_subcmd(:tags) do
     pinned = pinned_manager.load_pinned
-    by_tag = Hash.new { |h, k| h[k] = [] }
 
-    pinned.each do |pr|
-      Array(pr.tags).each { |t| by_tag[t] << pr }
+    if pinned.empty?
+      puts "No tracked PRs."
+      next
     end
 
-    if by_tag.empty?
-      puts "No tagged PRs."
-      next
+    by_tag = Hash.new { |h, k| h[k] = [] }
+    untagged = []
+
+    pinned.each do |pr|
+      tags = Array(pr.tags)
+      if tags.empty?
+        untagged << pr
+      else
+        tags.each { |t| by_tag[t] << pr }
+      end
     end
 
-    by_tag.sort.each do |tag, prs|
-      puts "\e[30;104m#{tag}\e[0m (#{prs.length})"
+    render_group = lambda do |label, prs, current_tag|
+      puts label
       slot_w  = prs.map { |pr| (pr.slot || 1).to_s.length }.max
       succ_w  = prs.filter_map { |pr| pr.checks&.dig('success')&.to_i&.to_s&.length }.max || 1
       total_w = prs.filter_map { |pr| pr.checks&.dig('total')&.to_i&.to_s&.length }.max || 1
@@ -1563,9 +1570,20 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
       crs_w   = prs.map { |pr| [pr.reviews&.dig('changes_requested').to_i.to_s.length, 1].max }.max
       widths  = { slot: slot_w, succ: succ_w, total: total_w, as: as_w, crs: crs_w }
       prs.each_with_index do |pr, idx|
-        puts "  #{pinned_manager.display_pinned(pr, idx, widths: widths, oneline: true)}"
+        line = pinned_manager.display_pinned(pr, idx, widths: widths, oneline: true)
+        if current_tag
+          other = Array(pr.tags) - [current_tag]
+          line += "  " + other.map { |t| "\e[30;104m#{t}\e[0m" }.join(' ') if other.any?
+        end
+        puts "  #{line}"
       end
     end
+
+    by_tag.sort.each do |tag, prs|
+      render_group.call("\e[30;104m#{tag}\e[0m (#{prs.length})", prs, tag)
+    end
+
+    render_group.call("(untagged) (#{untagged.length})", untagged, nil) if untagged.any?
   end
 
   # === Multi-PR action commands (mCMD) ===

data/lib/hiiro/queue.rb

@@ -232,32 +232,42 @@ class Hiiro
       }
     end
 
-    def select_task(hiiro)
-      env = Environment.current rescue nil
-      return nil unless env
+    def select_task_or_session(hiiro)
+      mapping = {}
 
-      tasks = env.all_tasks.sort_by(&:name)
-      return nil if tasks.empty?
+      env = Environment.current rescue nil
+      if env
+        env.all_tasks.sort_by(&:name).each do |task|
+          line = format("task     %-25s  tree: %s", task.name, task.tree_name || '(none)')
+          mapping[line] = { type: :task, task: task }
+        end
+      end
 
-      mapping = tasks.each_with_object({}) do |task, h|
-        line = format("%-25s  tree: %-20s", task.name, task.tree_name || '(none)')
-        h[line] = task
+      sessions = Hiiro::Tmux::Sessions.fetch rescue nil
+      if sessions
+        sessions.names.sort.each do |name|
+          mapping[format("session  %s", name)] = { type: :session, name: name }
+        end
       end
 
+      return nil if mapping.empty?
+
       hiiro.fuzzyfind_from_map(mapping)
     end
 
     def resolve_task_info(opts, hiiro, default_task_info)
-      task_name = if opts.choose
-        select_task(hiiro)&.name
+      if opts.choose
+        selection = select_task_or_session(hiiro)
+        if selection
+          case selection[:type]
+          when :task    then task_info_for(selection[:task].name)
+          when :session then { session_name: selection[:name] }
+          end
+        else
+          default_task_info
+        end
       elsif opts.task
-        opts.task
-      else
-        nil
-      end
-
-      if task_name
-        task_info_for(task_name)
+        task_info_for(opts.task)
       else
         default_task_info
       end
@@ -653,6 +663,14 @@ class Hiiro
           puts "Cleaned #{count} files"
         }
 
+        h.add_subcmd(:sadd) { |*args|
+          exec('h', 'queue', 'add', '-s', *args)
+        }
+
+        h.add_subcmd(:tadd) { |*args|
+          exec('h', 'task', 'queue', 'add', *args)
+        }
+
         h.add_subcmd(:dir) {
           q.queue_dirs
           puts DIR

data/lib/hiiro/tasks.rb

@@ -194,6 +194,28 @@ class Hiiro
       puts "Stopped task '#{task.name}' (worktree available for reuse)"
     end
 
+    def resume_task(tree, task_name: nil)
+      unless tree
+        puts "No available worktree selected"
+        return
+      end
+
+      # Derive a default task name from the tree name: "foo/main" -> "foo"
+      task_name ||= tree.name.end_with?('/main') ? tree.name.chomp('/main') : tree.name
+
+      if task_by_name(task_name)
+        puts "Task '#{task_name}' already exists"
+        return
+      end
+
+      color_index = Hiiro::TaskColors.next_index(config.tasks.map(&:color_index).compact)
+      task = Task.new(name: task_name, tree: tree.name, session: task_name, color_index: color_index)
+      config.save_task(task)
+      puts "Resumed task '#{task_name}' from worktree '#{tree.name}'"
+
+      switch_to_task(task)
+    end
+
     def list(tags_filter: [])
       tag_store = Hiiro::Tags.new(:task)
       items = tasks
@@ -940,6 +962,30 @@ class Hiiro
           tm.stop_task(task)
         end
 
+        h.add_subcmd(:resume) do |tree_name=nil|
+          available = tm.environment.all_trees.reject { |t|
+            tm.environment.all_tasks.any? { |task| task.tree_name == t.name }
+          }
+
+          if available.empty?
+            puts "No available worktrees to resume"
+            next
+          end
+
+          tree = if tree_name
+            Hiiro::Matcher.new(available, :name).by_prefix(tree_name).first&.item
+          else
+            h.fuzzyfind_from_map(available.each_with_object({}) { |t, m| m[t.name] = t })
+          end
+
+          unless tree
+            puts tree_name ? "No available worktree matching '#{tree_name}'" : "No worktree selected"
+            next
+          end
+
+          tm.resume_task(tree)
+        end
+
         h.add_subcmd(:edit) do
           h.edit_files(__FILE__)
         end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.263"
+  VERSION = "0.1.265"
 end

metadata

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