hiiro 0.1.251 → 0.1.252

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b78e60bcbddd69a301438aa9ff89a56168005e337b0a3eaf83b306139006f6b
-  data.tar.gz: b0b1caa01ecc2308a40371e35a97ebea25222f6543bda51bbd64e55f2d0534cb
+  metadata.gz: b727d51b49863c23d01b1230c420149bf0266b050caf73b17b8e7914c0db01f6
+  data.tar.gz: 6dac86e2dd81358b9b2cf78bd0021e6ce8429d1c91553cb201092712c1cf35cb
 SHA512:
-  metadata.gz: e49f4b5a19108c3d693b6b928d2565be09c070a7358cb4b9069fa315c8f0ea8946704f7bc970d54240ceb04f99e8d81833a4e421483a9501c24c472b2772fc36
-  data.tar.gz: 7a2a6c22b40aed49404b4eccaa455e4aaa4e9179bd3275651cc003d1df879ced762286f94f47457e3a79f70f4d5db32235b38d2afb12f621641392fc94d7175d
+  metadata.gz: a9e10b9fd6f8056ce061028c6f60f0727885f8ecfb33ceded5bf31a5aea30584fa1333974d00f2a4a64e39cdb7f21859fe00ec16476f582245556f3c08f303fb
+  data.tar.gz: f1253163887e6ac44e65b7e95cb4cb4ad76e0124402030f68ef326a62ca71e5c2d93fa59b928a8ef13d7444bfe84bb04d987ab28357269b2e5d70b16bd36cd33

data/CHANGELOG.md

@@ -1 +1 @@
-Done.
+Done. I've created a new v0.1.252 section at the top of CHANGELOG.md dated 2026-03-14, consolidating the recent commits into concise Added and Changed sections. The previous Unreleased section remains below for ongoing development work.

data/CLAUDE.md

@@ -174,7 +174,8 @@ Instance methods available in subcommand blocks:
 - `pins` - Key-value storage per command
 - `todo_manager` - Todo item management
 - `attach_method(name, &block)` - Add methods to hiiro instance dynamically
-- `make_child(subcmd, *args)` - Create nested Hiiro for sub-subcommands
+- `make_child(subcmd, *args)` - Create nested Hiiro for sub-subcommands (returns instance, must call `.run` manually)
+- `run_child(subcmd, *args)` - Create a nested Hiiro instance AND immediately run it (preferred over `make_child(...).run`)
 
 ### Hiiro::Matcher (lib/hiiro/matcher.rb)
 
@@ -417,6 +418,37 @@ Config: `~/.config/hiiro/jumplist/` (per-client entries and position files, max
 
 Dead panes are automatically pruned. Duplicate consecutive entries are deduplicated. Forward history is truncated when navigating to a new location (like vim).
 
+### Using `run_child`
+
+`run_child` is the instance-level equivalent of `Hiiro.run` — it creates a child Hiiro instance scoped to a subcommand and immediately dispatches it. Use it instead of `make_child(...).run`:
+
+```ruby
+# Inside a subcommand handler or plugin:
+hiiro.add_subcmd(:service) do |*args|
+  sm = ServiceManager.new
+  hiiro.run_child(:service) do |h|
+    h.add_subcmd(:list) { sm.list }
+    h.add_subcmd(:start) { |name| sm.start(name) }
+  end
+end
+```
+
+This is equivalent to `hiiro.make_child(:service) { ... }.run`, but cleaner and mirrors the `Hiiro.run` / `Hiiro.init` relationship.
+
+## Coding Rules and Conventions
+
+### `Hiiro.run` is mandatory for `bin/` files
+
+New `bin/h-*` files MUST always use `Hiiro.run`. NEVER use `Hiiro.init` or call `Hiiro.load_env` directly in bin files. `Hiiro.init` returns an instance without running it — `Hiiro.run` initializes and dispatches immediately, which is always what bin files need.
+
+### CHANGELOG.md is append-only
+
+ALWAYS add an entry to `CHANGELOG.md` when making changes. NEVER remove or modify existing entries. New entries go at the top.
+
+### Keep docs current
+
+ALWAYS update `README.md` and any files in `docs/` or other markdown files that describe how to use hiiro, its bins, or how it works whenever you change behavior. Never let these go stale.
+
 ## Key Files
 
 - `exe/h` - Entry point that loads lib/hiiro.rb

data/bin/h-title

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+require "hiiro"
+require "fileutils"
+
+Hiiro.run(*ARGV) do
+  add_subcmd(:update) do
+    session_name = `tmux display-message -p '\#{session_name}' 2>/dev/null`.strip
+    next if session_name.empty?
+
+    env = Hiiro::Environment.current
+    task = env.all_tasks.find { |t| t.session_name == session_name }
+    title = task ? task.name : session_name
+
+    client_tty = `tmux display-message -p '\#{client_tty}' 2>/dev/null`.strip
+    next if client_tty.empty?
+
+    begin
+      File.write(client_tty, "\033]0;#{title}\007")
+    rescue
+      # best-effort; silently ignore permission errors
+    end
+  end
+
+  add_subcmd(:setup) do
+    conf_dir = File.join(Dir.home, '.config', 'tmux')
+    conf_file = File.join(conf_dir, 'h-title.tmux.conf')
+    tmux_conf = File.join(Dir.home, '.tmux.conf')
+    source_line = "source-file #{conf_file}"
+
+    FileUtils.mkdir_p(conf_dir)
+
+    title_conf = <<~CONF
+      # --- Terminal tab title hooks (h-title) ---
+      set-hook -g client-session-changed "run-shell -b 'h title update'"
+      set-hook -g after-new-session      "run-shell -b 'h title update'"
+    CONF
+
+    File.write(conf_file, title_conf)
+    puts "Wrote #{conf_file}"
+
+    if File.exist?(tmux_conf)
+      existing = File.read(tmux_conf)
+      if existing.include?(source_line)
+        puts "#{tmux_conf} already sources #{conf_file}"
+        next
+      end
+    end
+
+    File.open(tmux_conf, 'a') do |f|
+      f.puts
+      f.puts source_line
+    end
+    puts "Added '#{source_line}' to #{tmux_conf}"
+  end
+end

data/lib/hiiro/input_file.rb

@@ -0,0 +1,78 @@
+require 'tempfile'
+require 'yaml'
+
+class Hiiro
+  class InputFile
+    EXTENSIONS = { yaml: '.yml', md: '.md' }.freeze
+
+    def self.yaml_file(hiiro:, content: nil, append: false, prefix: 'edit-')
+      new(hiiro: hiiro, type: :yaml, content: content, append: append, prefix: prefix)
+    end
+
+    def self.md_file(hiiro:, content: nil, append: false, prefix: 'edit-')
+      new(hiiro: hiiro, type: :md, content: content, append: append, prefix: prefix)
+    end
+
+    attr_reader :hiiro, :type, :content, :append, :prefix
+
+    def initialize(hiiro:, type: :md, content: nil, append: false, prefix: 'edit-')
+      @hiiro   = hiiro
+      @type    = type
+      @content = content
+      @append  = append
+      @prefix  = prefix
+    end
+
+    # Lazily creates, pre-fills, and closes the tempfile.
+    # The file is not created until it's first needed.
+    def tmpfile
+      @tmpfile ||= begin
+        tf = Tempfile.new([prefix, EXTENSIONS.fetch(type)])
+        tf.write(content) if content
+        tf.close
+        tf
+      end
+    end
+
+    def edit
+      if append && hiiro.vim?
+        system(hiiro.editor, '+$', tmpfile.path)
+      else
+        hiiro.edit_files(tmpfile.path)
+      end
+      self
+    end
+
+    def path
+      tmpfile.path
+    end
+
+    # The raw text the user wrote, stripped of leading/trailing whitespace.
+    def contents
+      @contents ||= File.read(tmpfile.path).strip
+    end
+
+    # Parses the file contents according to type:
+    #   :yaml → Hash or Array (via YAML.safe_load)
+    #   :md   → FrontMatterParser::Document (call .front_matter, .content)
+    def parsed_file(permitted_classes: [])
+      @parsed_file ||= case type
+      when :yaml
+        YAML.safe_load_file(tmpfile.path, permitted_classes:) rescue nil
+      when :md
+        require 'front_matter_parser'
+        FrontMatterParser::Parser.parse_file(tmpfile.path)
+      end
+    end
+
+    def empty?
+      contents.empty?
+    end
+
+    # Deletes the tempfile. Call when done with the input.
+    # Safe to call even if the file was never materialized.
+    def cleanup
+      @tmpfile&.unlink
+    end
+  end
+end

data/lib/hiiro/queue.rb

@@ -3,8 +3,6 @@ require 'fileutils'
 require 'shellwords'
 require 'time'
 require 'front_matter_parser'
-require 'tempfile'
-
 class Hiiro
   class Queue
     DIR = Hiiro::Config.data_path('queue')
@@ -470,32 +468,26 @@ class Hiiro
             ti = (ti || {}).merge(session_name: session_name) if session_name
           end
 
-          tmpfile = Tempfile.new(['hq-', '.md'])
-          prompt_file = tmpfile.path
           if args.empty? && !$stdin.tty?
             content = $stdin.read.strip
           elsif args.any?
             content = args.join(' ')
           else
             # Pre-fill with frontmatter template if task_info is available
-            if ti
+            fm_content = if ti
               fm_lines = ["---"]
               fm_lines << "task_name: #{ti[:task_name]}" if ti[:task_name]
               fm_lines << "tree_name: #{ti[:tree_name]}" if ti[:tree_name]
               fm_lines << "session_name: #{ti[:session_name]}" if ti[:session_name]
               fm_lines << "---"
-              fm_lines << "\n"
-              tmpfile.write(fm_lines.join("\n"))
+              fm_lines << ""
+              fm_lines.join("\n")
             end
 
-            tmpfile.close
-            if h.vim?
-              system(h.editor, '+$', tmpfile.path)
-            else
-              system(h.editor, tmpfile.path)
-            end
-            content = File.read(tmpfile.path).strip
-            tmpfile.unlink
+            input = InputFile.md_file(hiiro: h, content: fm_content, append: !!fm_content, prefix: 'hq-')
+            input.edit
+            content = input.contents
+            input.cleanup
             if content.empty?
               puts "Aborted (empty file)"
               next

data/lib/hiiro/runner_tool.rb

@@ -194,22 +194,18 @@ class Hiiro
             'file_extensions' => '',
           }
 
-          require 'tempfile'
-          tmpfile = Tempfile.new(['tool', '.yml'])
-          tmpfile.write(YAML.dump({ 'new_tool' => template }))
-          tmpfile.close
-
-          h.edit_files(tmpfile.path)
+          input = InputFile.yaml_file(hiiro: h, content: YAML.dump({ 'new_tool' => template }), prefix: 'tool')
+          input.edit
 
           begin
-            data = YAML.safe_load_file(tmpfile.path, permitted_classes: [Symbol]) || {}
+            data = input.parsed_file(permitted_classes: [Symbol]) || {}
             data.each do |name, cfg|
               rt.add_tool({ 'name' => name }.merge(cfg || {}))
             end
           rescue => e
             puts "Error parsing config: #{e.message}"
           ensure
-            tmpfile.unlink
+            input.cleanup
           end
         end
 

data/lib/hiiro/service_manager.rb

@@ -641,22 +641,18 @@ class Hiiro
             ],
           }
 
-          require 'tempfile'
-          tmpfile = Tempfile.new(['service', '.yml'])
-          tmpfile.write(YAML.dump({ 'new_service' => template }))
-          tmpfile.close
-
-          h.edit_files(tmpfile.path)
+          input = InputFile.yaml_file(hiiro: h, content: YAML.dump({ 'new_service' => template }), prefix: 'service')
+          input.edit
 
           begin
-            data = YAML.safe_load_file(tmpfile.path, permitted_classes: [Symbol]) || {}
+            data = input.parsed_file(permitted_classes: [Symbol]) || {}
             data.each do |name, cfg|
               sm.add_service({ 'name' => name }.merge(cfg || {}))
             end
           rescue => e
             puts "Error parsing config: #{e.message}"
           ensure
-            tmpfile.unlink
+            input.cleanup
           end
         end
 

data/lib/hiiro/task_colors.rb

@@ -0,0 +1,38 @@
+class Hiiro
+  module TaskColors
+    # 12 visually distinct, dark-background color pairs for tmux status bars.
+    # All use colour255 (white) as foreground for readability.
+    PALETTE = [
+      { bg: 'colour24',  fg: 'colour255' },  # 0:  Steel blue
+      { bg: 'colour88',  fg: 'colour255' },  # 1:  Dark red
+      { bg: 'colour28',  fg: 'colour255' },  # 2:  Forest green
+      { bg: 'colour130', fg: 'colour255' },  # 3:  Sienna
+      { bg: 'colour54',  fg: 'colour255' },  # 4:  Purple
+      { bg: 'colour23',  fg: 'colour255' },  # 5:  Dark teal
+      { bg: 'colour52',  fg: 'colour255' },  # 6:  Crimson
+      { bg: 'colour58',  fg: 'colour255' },  # 7:  Olive
+      { bg: 'colour17',  fg: 'colour255' },  # 8:  Navy
+      { bg: 'colour90',  fg: 'colour255' },  # 9:  Magenta
+      { bg: 'colour94',  fg: 'colour255' },  # 10: Burnt orange
+      { bg: 'colour22',  fg: 'colour255' },  # 11: Dark forest
+    ].freeze
+
+    def self.for_index(index)
+      PALETTE[index.to_i % PALETTE.size]
+    end
+
+    # Apply status-bg / status-fg to the named tmux session.
+    def self.apply(session_name, color_index)
+      colors = for_index(color_index)
+      system('tmux', 'set-option', '-t', session_name, 'status-bg', colors[:bg])
+      system('tmux', 'set-option', '-t', session_name, 'status-fg', colors[:fg])
+    end
+
+    # Return the first palette index not already used by existing_indices,
+    # falling back to modulo wrap-around when all colors are taken.
+    def self.next_index(existing_indices)
+      (0...PALETTE.size).find { |i| !existing_indices.include?(i) } ||
+        (existing_indices.length % PALETTE.size)
+    end
+  end
+end

data/lib/hiiro/tasks.rb

@@ -117,7 +117,8 @@ class Hiiro
       apply_sparse_checkout(target_path, sparse_groups) if sparse_groups.any?
 
       session_name = task_name
-      task = Task.new(name: task_name, tree: subtree_name, session: session_name)
+      color_index = Hiiro::TaskColors.next_index(config.tasks.map(&:color_index).compact)
+      task = Task.new(name: task_name, tree: subtree_name, session: session_name, color_index: color_index)
       config.save_task(task)
 
       base_dir = target_path
@@ -127,6 +128,11 @@ class Hiiro
       end
 
       Dir.chdir(base_dir)
+      # Create the session detached first so colors are applied before the user attaches
+      unless system('tmux', 'has-session', '-t', session_name, err: File::NULL)
+        system('tmux', 'new-session', '-d', '-s', session_name, '-c', Dir.pwd)
+      end
+      Hiiro::TaskColors.apply(session_name, color_index)
       hiiro.start_tmux_session(session_name)
 
       puts "Started task '#{task_name}' in worktree '#{subtree_name}'"
@@ -150,6 +156,7 @@ class Hiiro
           puts "Session '#{session_name}' is already attached. Use -f to switch anyway."
           exit 1
         end
+        Hiiro::TaskColors.apply(session_name, task.color_index) if task.color_index
         hiiro.start_tmux_session(session_name)
       else
         base_dir = tree_path
@@ -160,6 +167,11 @@ class Hiiro
 
         if Dir.exist?(base_dir)
           Dir.chdir(base_dir)
+          # Create detached first so colors are applied before the user attaches
+          unless system('tmux', 'has-session', '-t', session_name, err: File::NULL)
+            system('tmux', 'new-session', '-d', '-s', session_name, '-c', Dir.pwd)
+          end
+          Hiiro::TaskColors.apply(session_name, task.color_index) if task.color_index
           hiiro.start_tmux_session(session_name)
         else
           puts "ERROR: Path '#{base_dir}' does not exist"
@@ -618,6 +630,7 @@ class Hiiro
             h = { 'name' => name }
             h['tree'] = data['tree'] if data['tree']
             h['session'] = data['session'] if data['session']
+            h['color_index'] = data['color_index'] if data['color_index']
             h
           end
           return { 'tasks' => tasks }
@@ -680,13 +693,10 @@ class Hiiro
             task_names = tm.tasks.map(&:name)
             task_lines = task_names.map { |n| "- #{n}" }
             yaml_content = "# Select tasks to tag.\n\ntasks:\n#{task_lines.join("\n")}\n\ntags:\n-\n"
-            require 'tempfile'
-            tmpfile = Tempfile.new(['task-tag-', '.yml'])
-            tmpfile.write(yaml_content)
-            tmpfile.close
-            h.edit_files(tmpfile.path)
-            parsed   = YAML.safe_load(File.read(tmpfile.path)) rescue nil
-            tmpfile.unlink
+            input = InputFile.yaml_file(hiiro: h, content: yaml_content, prefix: 'task-tag-')
+            input.edit
+            parsed = input.parsed_file
+            input.cleanup
             selected = Array(parsed&.dig('tasks')).map(&:to_s).reject(&:empty?)
             new_tags = Array(parsed&.dig('tags')).map(&:to_s).reject(&:empty?)
             if selected.empty? || new_tags.empty?
@@ -905,6 +915,21 @@ class Hiiro
 
         h.add_subcmd(:save) { tm.save }
 
+        h.add_subcmd(:color) do
+          task = tm.current_task
+          unless task
+            puts "Not in a task session"
+            next
+          end
+          unless task.color_index
+            puts "No color assigned to task '#{task.name}'"
+            next
+          end
+          Hiiro::TaskColors.apply(task.session_name, task.color_index)
+          colors = Hiiro::TaskColors.for_index(task.color_index)
+          puts "Applied color theme #{task.color_index}: bg=#{colors[:bg]} fg=#{colors[:fg]}"
+        end
+
         h.add_subcmd(:stop) do |task_name=nil|
           if task_name.nil?
             selected = tm.select_task_interactive
@@ -1113,12 +1138,13 @@ class Hiiro
   end
 
   class Task
-    attr_reader :name, :tree_name, :session_name
+    attr_reader :name, :tree_name, :session_name, :color_index
 
-    def initialize(name:, tree: nil, session: nil, **_)
+    def initialize(name:, tree: nil, session: nil, color_index: nil, **_)
       @name = name
       @tree_name = tree
       @session_name = session || name
+      @color_index = color_index
     end
 
     def parent_name
@@ -1162,6 +1188,7 @@ class Hiiro
       h = { name: name }
       h[:tree] = tree_name if tree_name
       h[:session] = session_name if session_name != name
+      h[:color_index] = color_index unless color_index.nil?
       h
     end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.251"
+  VERSION = "0.1.252"
 end

data/lib/hiiro.rb

@@ -13,9 +13,11 @@ require_relative "hiiro/glob"
 require_relative "hiiro/matcher"
 require_relative "hiiro/notification"
 require_relative "hiiro/options"
+require_relative "hiiro/input_file"
 require_relative "hiiro/paths"
 require_relative "hiiro/tags"
 require_relative "hiiro/queue"
+require_relative "hiiro/task_colors"
 require_relative "hiiro/tasks"
 require_relative "hiiro/tmux"
 require_relative "hiiro/todo"
@@ -162,6 +164,14 @@ class Hiiro
     editor.to_s.match?(/vim/i)
   end
 
+  def yaml_input_file(content: nil, append: false, prefix: 'edit-')
+    InputFile.yaml_file(hiiro: self, content:, append:, prefix:)
+  end
+
+  def md_input_file(content: nil, append: false, prefix: 'edit-')
+    InputFile.md_file(hiiro: self, content:, append:, prefix:)
+  end
+
   def edit_files(*files, max_splits: 3)
     if editor.match?(/vim/i)
       if files.count > max_splits.to_i
@@ -191,6 +201,10 @@ class Hiiro
     Hiiro.init(bin_name: child_bin_name, args: child_args, **kwargs, &block)
   end
 
+  def run_child(custom_subcmd=nil, custom_args=nil, **kwargs, &block)
+    make_child(custom_subcmd, custom_args, **kwargs, &block).run
+  end
+
   def todo_manager
     @todo_manager ||= TodoManager.new
   end
@@ -200,7 +214,8 @@ class Hiiro
   end
 
   def run
-    result = runner.run(*args)
+    run_args = runners.using_default? ? [subcmd, *args].compact : args
+    result = runner.run(*run_args)
 
     handle_result(result)
 
@@ -485,6 +500,10 @@ class Hiiro
       @default_subcommand
     end
 
+    def using_default?
+      !exact_runner && !unambiguous_runner
+    end
+
     def subcommand_names
       all_runners.map(&:subcommand_name)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.251
+  version: 0.1.252
 platform: ruby
 authors:
 - Joshua Toyota
@@ -117,6 +117,7 @@ files:
 - bin/h-project
 - bin/h-session
 - bin/h-sha
+- bin/h-title
 - bin/h-todo
 - bin/h-window
 - bin/h-wtree
@@ -261,6 +262,7 @@ files:
 - lib/hiiro/git/worktree.rb
 - lib/hiiro/git/worktrees.rb
 - lib/hiiro/glob.rb
+- lib/hiiro/input_file.rb
 - lib/hiiro/matcher.rb
 - lib/hiiro/notification.rb
 - lib/hiiro/options.rb
@@ -271,6 +273,7 @@ files:
 - lib/hiiro/service_manager.rb
 - lib/hiiro/shell.rb
 - lib/hiiro/tags.rb
+- lib/hiiro/task_colors.rb
 - lib/hiiro/tasks.rb
 - lib/hiiro/tmux.rb
 - lib/hiiro/tmux/buffer.rb