hiiro 0.1.277 → 0.1.278

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c0ebae864202a90016b7b7df7f65a32836cc11c144ea85638a9c75b22279b72
-  data.tar.gz: 9a5e414ec3dc428f932acdaf47f989c80d2ca50a1fd19fe4d2d7fa9e4c634a76
+  metadata.gz: 1beafe3505bb704e88e7352d6f92c42023c0b6682574eafd5775f365bd7dc444
+  data.tar.gz: d3074244aabc4c9c64c880688ae45628137fa58d0babd960f3a8fd5bdb7aeaf6
 SHA512:
-  metadata.gz: 4cbdc7c7029c4acfbf6720c47d63d330bb71c270ba1546d76e743a6c05fef40f98229458a39d981627fb49767fac3c63e745b681e12ddde30e180b251ac94087
-  data.tar.gz: 3a95e13a5ebc85325d8426d398812499924bc8605f7e5e0e785cbb16b3ffafa6161ec7d04d1ff72387286779f8142bcff3f338348c35791192b1d97c72e5f780
+  metadata.gz: f7a5bbd8919dc92f5209112abdf6a2997890408bbdf3c71dda6e6adf662350a3b6c2502f4fe2d4dbaf24f02ec50ac4a591ec2c574d1e55856d743946c17d8150
+  data.tar.gz: 7cfa0e4c81959f8db363dfefa29e27faed97941dd72b8c83ef6b2f0a21bac65ca7caf5c06ec19ecaba6d978912a6c7c0e565ef92db1e5eabc24fa4cbd6bcfeb1

data/CHANGELOG.md

@@ -1,6 +1 @@
-Done. Updated CHANGELOG.md:
-
-- Moved `Hiiro#add_resolver` and `Hiiro#resolve` from the Unreleased section to the new v0.1.277 release section (2026-03-24)
-- Added them to the Added subsection of v0.1.277
-- Added a Changed entry documenting the `h pr` refactoring that uses these new methods
-- Updated the Unreleased section to remove these items and add a note in Changed about the `h pr` refactoring
+Done. The CHANGELOG.md has been updated with v0.1.278 released on 2026-03-24. The pane-based queue launch modes (cadd, hadd, vadd) and related changes have been moved from Unreleased to the new v0.1.278 section, and the `add_resolvers` class methods have been added to the Added section based on commit 1bba9fd.

data/lib/hiiro/git.rb

@@ -7,6 +7,23 @@ require_relative 'git/pr'
 
 class Hiiro
   class Git
+    def self.add_resolvers(hiiro)
+      hiiro.add_resolver(:branch, -> { hiiro.fuzzyfind(Branches.local.names) }) do |name|
+        Branches.local.find_by_name(name)&.name || name
+      end
+
+      hiiro.add_resolver(:worktree,
+        -> {
+          wts = Worktrees.fetch.without_bare
+          map = wts.each_with_object({}) { |wt, h| h["#{wt.name}  #{wt.path}"] = wt.path }
+          hiiro.fuzzyfind_from_map(map)
+        }
+      ) do |ref|
+        wts = Worktrees.fetch
+        (wts.find_by_path(ref) || wts.find_by_name(ref) || wts.find_by_branch(ref))&.path || ref
+      end
+    end
+
     attr_reader :hiiro, :pwd
 
     def initialize(hiiro, pwd=Dir.pwd)

data/lib/hiiro/queue.rb

@@ -70,7 +70,11 @@ class Hiiro
               mins = (elapsed / 60).to_i
               line += "  (#{mins}m)"
             end
-            line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]" if meta['tmux_session']
+            if meta['tmux_pane']
+              line += "  [pane #{meta['tmux_pane']}]"
+            elsif meta['tmux_session']
+              line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]"
+            end
           end
           preview = task_preview(t[:name], status.to_sym)
           line += "  #{preview}" if preview
@@ -126,6 +130,16 @@ class Hiiro
     end
 
     def launch_task(name)
+      launch_in_mode(name, mode: :window)
+    end
+
+    def launch_in_pane(name, split:)
+      launch_in_mode(name, mode: split)
+    end
+
+    private
+
+    def launch_in_mode(name, mode:)
       dirs = queue_dirs
       md_file = File.join(dirs[:pending], "#{name}.md")
       return unless File.exist?(md_file)
@@ -174,11 +188,6 @@ class Hiiro
         end
       end
 
-      # Ensure the target session exists
-      unless system('tmux', 'has-session', '-t', target_session, out: File::NULL, err: File::NULL)
-        system('tmux', 'new-session', '-d', '-s', target_session, '-c', working_dir)
-      end
-
       # Write a clean prompt file (no frontmatter) for claude
       raw = File.read(running_md).strip
       prompt_body = prompt_obj ? strip_frontmatter(prompt_obj.doc.content.strip) : strip_frontmatter(raw)
@@ -218,26 +227,45 @@ class Hiiro
       SH
       FileUtils.chmod(0755, script_path)
 
-      win_name = short_window_name(name)
-      system('tmux', 'new-window', '-d', '-t', target_session, '-n', win_name, '-c', working_dir, script_path)
-
-      # Write meta sidecar
+      # Build base meta (no tmux_window/pane yet)
       meta = {
-        'tmux_session' => target_session,
-        'tmux_window' => win_name,
         'started_at' => Time.now.iso8601,
         'working_dir' => working_dir,
       }
       if prompt_obj
-        meta['task_name'] = prompt_obj.task_name if prompt_obj.task_name
-        meta['tree_name'] = prompt_obj.tree_name if prompt_obj.tree_name
+        meta['task_name']    = prompt_obj.task_name    if prompt_obj.task_name
+        meta['tree_name']    = prompt_obj.tree_name    if prompt_obj.tree_name
         meta['session_name'] = prompt_obj.session_name if prompt_obj.session_name
       end
-      File.write(File.join(dirs[:running], "#{name}.meta"), meta.to_yaml)
 
-      puts "Launched: #{name} [#{target_session}:#{win_name}]"
+      case mode
+      when :window
+        # Ensure the target session exists
+        unless system('tmux', 'has-session', '-t', target_session, out: File::NULL, err: File::NULL)
+          system('tmux', 'new-session', '-d', '-s', target_session, '-c', working_dir)
+        end
+        win_name = short_window_name(name)
+        system('tmux', 'new-window', '-d', '-t', target_session, '-n', win_name, '-c', working_dir, script_path)
+        meta['tmux_session'] = target_session
+        meta['tmux_window']  = win_name
+        File.write(File.join(dirs[:running], "#{name}.meta"), meta.to_yaml)
+        puts "Launched: #{name} [#{target_session}:#{win_name}]"
+
+      when :current
+        File.write(File.join(dirs[:running], "#{name}.meta"), meta.to_yaml)
+        exec(script_path)
+
+      when :hsplit, :vsplit
+        flag = mode == :hsplit ? '-v' : '-h'
+        pane_id = `tmux split-window #{flag} -P -F '\#{pane_id}' -c #{Shellwords.shellescape(working_dir)} #{Shellwords.shellescape(script_path)} 2>/dev/null`.strip
+        meta['tmux_pane'] = pane_id unless pane_id.empty?
+        File.write(File.join(dirs[:running], "#{name}.meta"), meta.to_yaml)
+        puts "Launched: #{name} [pane #{pane_id}]"
+      end
     end
 
+    public
+
     def task_info_for(task_name)
       env = Environment.current rescue nil
       return nil unless env
@@ -445,7 +473,11 @@ class Hiiro
                 mins = (elapsed / 60).to_i
                 line += "  (#{mins}m elapsed)"
               end
-              line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]" if meta['tmux_session']
+              if meta['tmux_pane']
+                line += "  [pane #{meta['tmux_pane']}]"
+              elsif meta['tmux_session']
+                line += "  [#{meta['tmux_session']}:#{meta['tmux_window']}]"
+              end
               line += "  dir:#{meta['working_dir']}" if meta['working_dir']
             end
             puts line
@@ -488,7 +520,7 @@ class Hiiro
           Tmux.open_session(TMUX_SESSION, start_directory: work_dir)
         }
 
-        h.add_subcmd(:add) { |*args|
+        do_add = lambda do |args, split: nil|
           q.queue_dirs
           opts = Hiiro::Options.parse(args) do
             option(:task,   short: :t, desc: 'Task name')
@@ -516,7 +548,6 @@ class Hiiro
           elsif args.any?
             content = args.join(' ')
           else
-            # Pre-fill with frontmatter template
             fm_lines = ["---"]
             fm_lines << "task_name: #{ti[:task_name]}" if ti&.dig(:task_name)
             fm_lines << "tree_name: #{ti[:tree_name]}" if ti&.dig(:tree_name)
@@ -539,12 +570,22 @@ class Hiiro
           end
 
           result = q.add_with_frontmatter(content, task_info: ti, ignore: opts.ignore, name: opts.name)
-          if result
-            puts "Created: #{result[:path]}"
-          else
+          unless result
             puts "Could not generate a task name"
+            next
           end
-        }
+
+          if split
+            q.launch_in_pane(result[:name], split: split)
+          else
+            puts "Created: #{result[:path]}"
+          end
+        end
+
+        h.add_subcmd(:add)  { |*args| do_add.call(args) }
+        h.add_subcmd(:cadd) { |*args| do_add.call(args, split: :current) }
+        h.add_subcmd(:hadd) { |*args| do_add.call(args, split: :hsplit) }
+        h.add_subcmd(:vadd) { |*args| do_add.call(args, split: :vsplit) }
 
         h.add_subcmd(:wip) { |*args|
           q.queue_dirs
@@ -635,9 +676,13 @@ class Hiiro
           next unless name
 
           meta = q.meta_for(name, :running)
-          session = meta&.[]('tmux_session') || TMUX_SESSION
-          win = meta&.[]('tmux_window') || name
-          system('tmux', 'kill-window', '-t', "#{session}:#{win}")
+          if meta&.key?('tmux_pane')
+            system('tmux', 'kill-pane', '-t', meta['tmux_pane'])
+          else
+            session = meta&.[]('tmux_session') || TMUX_SESSION
+            win = meta&.[]('tmux_window') || name
+            system('tmux', 'kill-window', '-t', "#{session}:#{win}")
+          end
 
           dirs = q.queue_dirs
           md = File.join(dirs[:running], "#{name}.md")

data/lib/hiiro/service_manager.rb

@@ -12,6 +12,13 @@ class Hiiro
 
     attr_reader :config_file, :state_file
 
+    def self.add_resolvers(hiiro)
+      sm = new
+      hiiro.add_resolver(:service, -> { hiiro.fuzzyfind(sm.services.keys) }) do |name|
+        sm.find_service(name)&.[](:name)
+      end
+    end
+
     def initialize(config_file: CONFIG_FILE, state_file: STATE_FILE)
       @config_file = config_file
       @state_file = state_file

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.277"
+  VERSION = "0.1.278"
 end

metadata

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