hiiro 0.1.263 → 0.1.264

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931f2b0401b24ebade952d44bf4e8b1089cf742608fb78e5c69f926d81d0d069
-  data.tar.gz: 5c3d810913d64619f280ebd4ba2ce3b9f1d9b4eed42c0ce7c245dde83da229b6
+  metadata.gz: 76687adcde43e2ad6dce4229da650c5be4a9ff7af7fd0868fe500b8baa538dc3
+  data.tar.gz: ffa4a2fd4780888a1d77f2db4775fb03f6293780d1cf32ce92b9c2fe594b4bfb
 SHA512:
-  metadata.gz: bbdecb53d48ce153eaff2e43f1ab7663a7aa882d8ce96b9f4342bc0e304bee91ac11ee6b465fba22d1a75e8298a813fdee24aaed28b911ae97ff8dd24c9d1041
-  data.tar.gz: c1ff45b7c9f2675b570fc28b4d16b3ef97be71e94c4bb6aefb5568d0487d2e56d2da51ac7f134db5b219e26b6e2008833a1f00bcc3d3e9ed93921d9250cfca11
+  metadata.gz: 9f7845f577e987676e7943623c4aa926487d3008fe2ed9d286dbcd235ba574bf848deed0bf1cd03234745881e8e768e6a7c9f30fc2772466c657c3fcd66c1179
+  data.tar.gz: 3468f5173adb4138320c894485f1cae7540bc03d41df3ff5c089f0e90dedd39a6c1b288772305f83d2d30761f482f4bf0bb3534f0a4c37c392ae5107c83b161a

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.264 released today (2026-03-18), moving the previously unreleased features into the new version section and creating a fresh [Unreleased] section.

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.264"
 end

metadata

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