hiiro 0.1.279 → 0.1.280

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac54cf95b87a2dd963a261922d9d269597970236714ace84586538ee38b643c
-  data.tar.gz: '0408a01c35a5888a2ff78d880085278b719007aa47ed40257749c65410225592'
+  metadata.gz: c86b1990635355b7028465d785137a29092594900b220e679107138cdedf5821
+  data.tar.gz: fdd08045ed76b8ca7d288fa1f49358eb65649c35f043ce35745114c63af920f0
 SHA512:
-  metadata.gz: 74324fbd4fcfdb860270388df1a19f1affff4030d1d0a2c88362c9c3d26f1a1af7170a9eae2303b8467b2a60f6492166cdb2a0f69ba79adbe58dfcc8378ea005
-  data.tar.gz: b6d351fd166a8b694c067d83ffba0f63681f37c08565ebd3d24eaa3c2bad7d2a598327b54a47eb49f3ccc04d658b0be12cfd52fae4574a2fcfc712f24742cc8b
+  metadata.gz: e4a7443498c3902dc536b39df7d128782f5cd3ad8be6b3acb75b50a93b431e27aff7b68e87b3531d860b7cf7bf82c0f658fad17663a5d2f42098bb7cbf605f2b
+  data.tar.gz: 1acd39aadcadd0dca8abdccfbe3e91d286cffbeb9e40cc5a2d3a139022c9c324de6c030573848ca0571d5d6dcb3a67785e19c0b2d677fd10d01d1e9c733ca25d

data/CHANGELOG.md

@@ -1 +1 @@
-Done. CHANGELOG.md has been updated with v0.1.279 for 2026-03-25. The new section documents the refactoring of `Hiiro::PinnedPRManager` extraction to `lib/hiiro/pinned_pr_manager.rb`, which is the only meaningful code change in the recent commits (the others were script updates and documentation restoration).
+Done. CHANGELOG.md has been updated with v0.1.280 for 2026-03-25. The new section documents all the features, changes, and refactorings from the recent commits, organized by Added and Changed categories.

data/bin/h-buffer

@@ -4,20 +4,7 @@ require "hiiro"
 
 Hiiro.run(*ARGV, plugins: [Pins]) do
   tmux = tmux_client
-
-  select_buffer_proc = ->(partial = nil) {
-    buffers = tmux.buffers
-    return nil if buffers.empty?
-
-    if partial
-      buffers = buffers.matching(partial)
-    end
-
-    return nil if buffers.empty?
-    return buffers.first.name if buffers.size == 1
-
-    fuzzyfind_from_map(buffers.name_map)
-  }
+  Hiiro::Tmux.add_resolvers(self)
 
   add_subcmd(:ls) { |*args|
     if args.empty?
@@ -28,7 +15,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:show) { |name = nil, *args|
-    buffer_name = select_buffer_proc.call(name)
+    buffer_name = resolve(:buffer, name)
 
     unless buffer_name
       puts "No buffer selected or found"
@@ -44,7 +31,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:copy) { |name = nil|
-    buffer_name = select_buffer_proc.call(name)
+    buffer_name = resolve(:buffer, name)
     unless buffer_name
       puts "No buffer selected or found"
       next
@@ -66,7 +53,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     if name
       tmux.save_buffer(path, name: name)
     elsif args.empty?
-      buffer_name = select_buffer_proc.call(nil)
+      buffer_name = resolve(:buffer, nil)
       if buffer_name
         tmux.save_buffer(path, name: buffer_name)
       end
@@ -104,7 +91,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
 
   add_subcmd(:delete) { |name = nil, *args|
     if name.nil?
-      name = select_buffer_proc.call(nil)
+      name = resolve(:buffer, nil)
     end
 
     if name && args.empty?
@@ -130,13 +117,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:select) do
-    buffers = tmux.buffers
-    if buffers.empty?
-      STDERR.puts "No buffers found"
-      next
-    end
-
-    selected = fuzzyfind_from_map(buffers.name_map)
+    selected = resolve(:buffer)
     print selected if selected
   end
 end

data/bin/h-jumplist

@@ -174,14 +174,6 @@ Hiiro.run(*ARGV) do
     entries = read_entries
     pos = get_pos
 
-    # Deduplicate: skip if current position entry matches pane/window/session
-    current_entry = entries[pos]
-    if current_entry
-      current_parts = current_entry.split('|')
-      current_key = current_parts[0..2]
-      next if current_key == [pane_id, window_id, session_name]
-    end
-
     # If position is not at head, truncate forward history
     if pos > 0 && entries.any?
       entries = entries[pos..]
@@ -190,13 +182,48 @@ Hiiro.run(*ARGV) do
       set_pos(0)
     end
 
-    # Prepend new entry (newest first)
     new_entry = [pane_id, window_id, session_name, timestamp, pane_cmd].join('|')
+
+    # Skip if the head already matches this pane (no-op navigation)
+    head_pane = entries.first&.split('|', 2)&.first
+    next if head_pane == pane_id
+
+    # Remove all earlier occurrences of this pane so it appears only once
+    entries.reject! { |e| e.split('|', 2).first == pane_id }
+
+    # Prepend new entry (newest first)
     entries.unshift(new_entry)
     entries = entries.first(MAX_SIZE)
     write_entries(entries)
   end
 
+  add_subcmd(:to) do |index = nil|
+    if index.nil?
+      puts "Usage: h jumplist to <index>"
+      next
+    end
+
+    entries, pos = prune_dead_entries(read_entries, get_pos)
+
+    if entries.empty?
+      system('tmux', 'display-message', 'Jumplist: empty')
+      next
+    end
+
+    idx = index.to_i
+    unless (0...entries.length).include?(idx)
+      system('tmux', 'display-message', "Jumplist: no entry at index #{idx}")
+      next
+    end
+
+    parts = entries[idx].split('|')
+    system('tmux', 'set-environment', 'TMUX_JUMPLIST_SUPPRESS', '1')
+    system('tmux', 'switch-client', '-t', parts[2])
+    system('tmux', 'select-window', '-t', parts[1])
+    system('tmux', 'select-pane', '-t', parts[0])
+    set_pos(idx)
+  end
+
   add_subcmd(:back) do
     entries, pos = prune_dead_entries(read_entries, get_pos)
 

data/bin/h-pane

@@ -5,6 +5,7 @@ require 'yaml'
 
 Hiiro.run(*ARGV, plugins: [Pins]) do
   tmux = tmux_client
+  Hiiro::Tmux.add_resolvers(self)
 
   home_config_path = Hiiro::Config.path('pane_homes.yml')
 
@@ -54,9 +55,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:kill) { |target = nil, *args|
-    if target.nil?
-      target = fuzzyfind_from_map(tmux.panes(all: true).name_map)
-    end
+    target = resolve(:pane, target)
 
     if target && args.empty?
       tmux.kill_pane(target)
@@ -87,9 +86,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:select) { |target = nil, *args|
-    if target.nil?
-      target = fuzzyfind_from_map(tmux.panes(all: true).name_map)
-    end
+    target = resolve(:pane, target)
 
     if target
       print target
@@ -97,9 +94,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:copy) { |target = nil, *args|
-    if target.nil?
-      target = fuzzyfind_from_map(tmux.panes(all: true).name_map)
-    end
+    target = resolve(:pane, target)
 
     if target
       Hiiro::Shell.pipe(target, 'pbcopy')
@@ -108,7 +103,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:sw, :switch) { |target = nil, *args|
-    target ||= fuzzyfind_from_map(tmux.panes(all: true).name_map)
+    target = resolve(:pane, target)
     tmux.open_session(target) if target
   }
 

data/bin/h-project

@@ -19,30 +19,16 @@ def start_tmux_session(session_name)
   end
 end
 
-# Get project directories from ~/proj/
-def project_dirs
-  Dir.glob(File.join(Dir.home, 'proj', '*/')).map { |path|
-    [File.basename(path), path]
-  }.to_h
-end
-
-# Get projects from config file
-def projects_from_config
-  projects_file = File.join(Dir.home, '.config/hiiro', 'projects.yml')
-
-  return {} unless File.exist?(projects_file)
-
-  require 'yaml'
-  YAML.safe_load_file(projects_file)
-end
-
 Hiiro.run(*ARGV) do
+  projects = Hiiro::Projects.new
+  Hiiro::Projects.add_resolvers(self)
+
   # === OPEN PROJECT (default) ===
   add_subcmd(:open) { |project_name|
     re = /#{project_name}/i
 
-    conf_matches = (projects_from_config || {}).select { |k, v| k.match?(re) }
-    dir_matches = (project_dirs || {}).select { |proj, path| proj.match?(re) }
+    conf_matches = projects.from_config.select { |k, v| k.match?(re) }
+    dir_matches  = projects.dirs.select { |proj, path| proj.match?(re) }
 
     matches = dir_matches.merge(conf_matches)
     if matches.count > 1
@@ -82,15 +68,14 @@ Hiiro.run(*ARGV) do
 
   # === LIST PROJECTS ===
   add_subcmd(:list) { |*list_args|
-    dirs = project_dirs
-    conf = projects_from_config
-
-    all_projects = dirs.merge(conf)
+    all  = projects.all
+    conf = projects.from_config
 
     puts "Projects:"
     puts
-    all_projects.keys.sort.each do |name|
-      path = all_projects[name]
+
+    all.keys.sort.each do |name|
+      path   = all[name]
       source = conf.key?(name) ? '[config]' : '[dir]'
       puts format("  %-12s %-8s %s", name, source, path)
     end
@@ -102,12 +87,10 @@ Hiiro.run(*ARGV) do
 
   # === SHOW CONFIG FILE ===
   add_subcmd(:config) { |*config_args|
-    projects_file = File.join(Dir.home, '.config/hiiro', 'projects.yml')
-
-    if File.exist?(projects_file)
-      puts File.read(projects_file)
+    if File.exist?(Hiiro::Projects::CONFIG_FILE)
+      puts File.read(Hiiro::Projects::CONFIG_FILE)
     else
-      puts "No config file found at: #{projects_file}"
+      puts "No config file found at: #{Hiiro::Projects::CONFIG_FILE}"
       puts
       puts "Create it with YAML format:"
       puts "  project_name: /path/to/project"
@@ -116,70 +99,88 @@ Hiiro.run(*ARGV) do
 
   # === EDIT CONFIG FILE ===
   add_subcmd(:edit) { |*edit_args|
-    projects_file = File.join(Dir.home, '.config/hiiro', 'projects.yml')
-    # Create config dir if needed
-    config_dir = File.dirname(projects_file)
+    config_dir = File.dirname(Hiiro::Projects::CONFIG_FILE)
     Dir.mkdir(config_dir) unless Dir.exist?(config_dir)
 
-    # Create empty file if it doesn't exist
-    unless File.exist?(projects_file)
-      File.write(projects_file, "# Project aliases\n# project_name: /path/to/project\n")
+    unless File.exist?(Hiiro::Projects::CONFIG_FILE)
+      File.write(Hiiro::Projects::CONFIG_FILE, "# Project aliases\n# project_name: /path/to/project\n")
     end
 
-    edit_files(projects_file)
+    edit_files(Hiiro::Projects::CONFIG_FILE)
   }
 
   # === SELECT PROJECT ===
   add_subcmd(:select) { |*select_args|
-    dirs = project_dirs
-    conf = projects_from_config
-
-    all_projects = dirs.merge(conf)
+    all = projects.all
 
-    if all_projects.empty?
+    if all.empty?
       STDERR.puts "No projects found"
       next
     end
 
-    lines = all_projects.each_with_object({}) do |(name, path), h|
+    conf = projects.from_config
+    lines = all.each_with_object({}) do |(name, path), h|
       source = conf.key?(name) ? '[config]' : '[dir]'
       display = format("%-15s %s  %s", name, source, path)
       h[display] = path
     end
 
     selected = fuzzyfind_from_map(lines)
-
-    if selected
-      print selected
-    end
+    print selected if selected
   }
 
   # === COPY PROJECT PATH ===
   add_subcmd(:copy) { |*copy_args|
-    dirs = project_dirs
-    conf = projects_from_config
-
-    all_projects = dirs.merge(conf)
+    all = projects.all
 
-    if all_projects.empty?
+    if all.empty?
       STDERR.puts "No projects found"
       next
     end
 
-    lines = all_projects.each_with_object({}) do |(name, path), h|
+    conf = projects.from_config
+    lines = all.each_with_object({}) do |(name, path), h|
       source = conf.key?(name) ? '[config]' : '[dir]'
       display = format("%-15s %s  %s", name, source, path)
       h[display] = path
     end
 
     selected = fuzzyfind_from_map(lines)
-
     if selected
       Hiiro::Shell.pipe(selected, 'pbcopy')
       puts "Copied project path '#{selected}' to clipboard"
     end
   }
 
+  # === SHELL IN PROJECT ===
+  add_subcmd(:sh) { |project_name=nil, *args|
+    if project_name.nil? || project_name.empty?
+      puts "Usage: h project sh <project_name> [command...]"
+      next
+    end
+
+    re = /#{project_name}/i
+    conf_matches = projects.from_config.select { |k, v| k.match?(re) }
+    dir_matches  = projects.dirs.select { |proj, path| proj.match?(re) }
+    matches = dir_matches.merge(conf_matches)
+    matches = matches.select { |name, path| name == project_name } if matches.count > 1
+
+    case matches.count
+    when 0
+      puts "Project '#{project_name}' not found"
+      puts
+      puts "Available projects:"
+      projects.all.keys.sort.each { |k| puts "  #{k}" }
+    when 1
+      _, path = matches.first
+      Dir.chdir(path)
+      args.empty? ? exec(ENV['SHELL'] || 'zsh') : exec(*args)
+    else
+      puts "Ambiguous project '#{project_name}' — multiple matches:"
+      matches.each { |name, path| puts format("  %-15s %s", name, path) }
+    end
+  }
+
   # === HELP ===
   add_subcmd(:help) { |*help_args|
     puts <<~HELP
@@ -192,6 +193,7 @@ Hiiro.run(*ARGV) do
         h-project ls                    Alias for list
         h-project config                Show config file contents
         h-project edit                  Edit config file
+        h-project sh <project_name>     Open shell in project directory
 
       SOURCES:
         Projects are discovered from two sources:
@@ -209,35 +211,6 @@ Hiiro.run(*ARGV) do
     HELP
   }
 
-  # === SHELL IN PROJECT ===
-  add_subcmd(:sh) { |project_name=nil, *args|
-    if project_name.nil? || project_name.empty?
-      puts "Usage: h project sh <project_name> [command...]"
-      next
-    end
-
-    re = /#{project_name}/i
-    conf_matches = (projects_from_config || {}).select { |k, v| k.match?(re) }
-    dir_matches  = (project_dirs || {}).select { |proj, path| proj.match?(re) }
-    matches = dir_matches.merge(conf_matches)
-    matches = matches.select { |name, path| name == project_name } if matches.count > 1
-
-    case matches.count
-    when 0
-      puts "Project '#{project_name}' not found"
-      puts
-      puts "Available projects:"
-      project_dirs.merge(projects_from_config).keys.sort.each { |k| puts "  #{k}" }
-    when 1
-      _, path = matches.first
-      Dir.chdir(path)
-      args.empty? ? exec(ENV['SHELL'] || 'zsh') : exec(*args)
-    else
-      puts "Ambiguous project '#{project_name}' — multiple matches:"
-      matches.each { |name, path| puts format("  %-15s %s", name, path) }
-    end
-  }
-
   add_default {
     run_subcmd(:help)
   }

data/bin/h-session

@@ -6,6 +6,7 @@ require 'yaml'
 
 Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   tmux = tmux_client
+  Hiiro::Tmux.add_resolvers(self)
 
   add_subcmd(:ls, :list) { |*args|
     if args.empty?
@@ -24,9 +25,7 @@ Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   }
 
   add_subcmd(:kill) { |name = nil, *args|
-    if name.nil?
-      name = fuzzyfind_from_map(tmux.sessions.name_map)
-    end
+    name = resolve(:session, name)
 
     if name && args.empty?
       tmux.kill_session(name)
@@ -36,9 +35,7 @@ Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   }
 
   add_subcmd(:attach) { |name = nil, *args|
-    if name.nil?
-      name = fuzzyfind_from_map(tmux.sessions.name_map)
-    end
+    name = resolve(:session, name)
 
     if name && args.empty?
       tmux.attach_session(name)
@@ -48,9 +45,7 @@ Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   }
 
   add_subcmd(:rename) { |old_name = nil, new_name = nil, *args|
-    if old_name.nil?
-      old_name = fuzzyfind_from_map(tmux.sessions.name_map)
-    end
+    old_name = resolve(:session, old_name)
 
     if old_name && new_name && args.empty?
       tmux.rename_session(old_name, new_name)
@@ -60,9 +55,7 @@ Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   }
 
   add_subcmd(:switch) { |name = nil, *args|
-    if name.nil?
-      name = fuzzyfind_from_map(tmux.sessions.name_map)
-    end
+    name = resolve(:session, name)
 
     if name
       tmux.open_session(name)
@@ -105,24 +98,12 @@ Hiiro.run(*ARGV, tasks: true, plugins: [Pins]) do
   }
 
   add_subcmd(:select) do
-    sessions = tmux.sessions
-    if sessions.empty?
-      STDERR.puts "No sessions found"
-      next
-    end
-
-    selected = fuzzyfind_from_map(sessions.name_map)
+    selected = resolve(:session)
     print selected if selected
   end
 
   add_subcmd(:copy) do
-    sessions = tmux.sessions
-    if sessions.empty?
-      STDERR.puts "No sessions found"
-      next
-    end
-
-    selected = fuzzyfind_from_map(sessions.name_map)
+    selected = resolve(:session)
     if selected
       Hiiro::Shell.pipe(selected, 'pbcopy')
       puts "Copied session '#{selected}' to clipboard"

data/bin/h-window

@@ -4,6 +4,7 @@ require 'hiiro'
 
 Hiiro.run(*ARGV, plugins: [Pins]) do
   tmux = tmux_client
+  Hiiro::Tmux.add_resolvers(self)
 
   add_subcmd(:ls) { |*args|
     if args.empty?
@@ -30,9 +31,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:kill) { |target = nil, *args|
-    if target.nil?
-      target = fuzzyfind_from_map(tmux.windows(all: true).name_map)
-    end
+    target = resolve(:window, target)
 
     if target && args.empty?
       tmux.kill_window(target)
@@ -54,9 +53,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:select) { |target = nil, *args|
-    if target.nil?
-      target = fuzzyfind_from_map(tmux.windows(all: true).name_map)
-    end
+    target = resolve(:window, target)
 
     if target
       print target
@@ -64,9 +61,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:copy) { |target = nil, *args|
-    if target.nil?
-      target = fuzzyfind_from_map(tmux.windows(all: true).name_map)
-    end
+    target = resolve(:window, target)
 
     if target
       Hiiro::Shell.pipe(target, 'pbcopy')
@@ -75,9 +70,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:sw, :switch) { |target = nil, *args|
-    if target.nil?
-      target = fuzzyfind_from_map(tmux.windows(all: true).name_map)
-    end
+    target = resolve(:window, target)
 
     if target
       tmux.open_session(target)

data/lib/hiiro/options.rb

@@ -51,16 +51,27 @@ class Hiiro
 
     def flag(name, long: nil, short: nil, default: false, desc: nil)
       defn = Definition.new(name, long: long, short: short, type: :flag, default: default, desc: desc)
+      deconflict_short(short) if short
       @definitions[name.to_sym] = defn
       self
     end
 
-    def option(name, long: nil, short: nil, type: :string, default: nil, desc: nil, multi: false)
-      defn = Definition.new(name, long: long, short: short, type: type, default: default, desc: desc, multi: multi)
+    def option(name, long: nil, short: nil, type: :string, default: nil, desc: nil, multi: false, flag_ifs: [])
+      defn = Definition.new(name, long: long, short: short, type: type, default: default, desc: desc, multi: multi, flag_ifs: Array(flag_ifs))
+      deconflict_short(short) if short
       @definitions[name.to_sym] = defn
       self
     end
 
+    private
+
+    def deconflict_short(short)
+      short_s = short.to_s
+      @definitions.each_value { |d| d.short = nil if d.short == short_s }
+    end
+
+    public
+
     def select(names)
       subset = self.class.setup {}
       names.each do |name|
@@ -170,7 +181,7 @@ class Hiiro
         defn = @definitions.values.find { |d| d.long_form == flag_part }
         return unless defn
 
-        if defn.flag?
+        if defn.flag? || defn.flag_active?(@values)
           @values[defn.name] = !defn.default
         else
           value ||= args.shift
@@ -185,7 +196,7 @@ class Hiiro
           defn = @definitions.values.find { |d| d.short == char }
           next unless defn
 
-          if defn.flag?
+          if defn.flag? || defn.flag_active?(@values)
             @values[defn.name] = !defn.default
           elsif idx == chars.length - 1
             store_value(defn, args.shift)
@@ -207,9 +218,10 @@ class Hiiro
     end
 
     class Definition
-      attr_reader :name, :short, :long, :type, :default, :desc, :multi
+      attr_reader :name, :long, :type, :default, :desc, :multi, :flag_ifs
+      attr_accessor :short
 
-      def initialize(name, short: nil, long: nil, type: :string, default: nil, desc: nil, multi: false)
+      def initialize(name, short: nil, long: nil, type: :string, default: nil, desc: nil, multi: false, flag_ifs: [])
         @name = name.to_sym
         @short = short&.to_s
         @long = long&.to_sym
@@ -217,6 +229,11 @@ class Hiiro
         @default = default
         @desc = desc
         @multi = multi
+        @flag_ifs = flag_ifs.map(&:to_sym)
+      end
+
+      def flag_active?(values)
+        @flag_ifs.any? { |f| values[f] }
       end
 
       def flag?

data/lib/hiiro/projects.rb

@@ -0,0 +1,54 @@
+require 'yaml'
+
+class Hiiro
+  class Projects
+    CONFIG_FILE = File.join(Dir.home, '.config', 'hiiro', 'projects.yml')
+
+    def self.add_resolvers(hiiro)
+      pm = new
+      hiiro.add_resolver(:project,
+        -> {
+          all = pm.all
+          return nil if all.empty?
+          conf = pm.from_config
+          lines = all.each_with_object({}) do |(name, path), h|
+            source = conf.key?(name) ? '[config]' : '[dir]'
+            h[format("%-15s %-8s %s", name, source, path)] = path
+          end
+          hiiro.fuzzyfind_from_map(lines)
+        }
+      ) do |name|
+        pm.find(name)
+      end
+    end
+
+    def dirs
+      Dir.glob(File.join(Dir.home, 'proj', '*/')).map { |path|
+        [File.basename(path), path]
+      }.to_h
+    end
+
+    def from_config
+      return {} unless File.exist?(CONFIG_FILE)
+      YAML.safe_load_file(CONFIG_FILE) || {}
+    end
+
+    def from_config?(name)
+      from_config.key?(name)
+    end
+
+    def all
+      dirs.merge(from_config)
+    end
+
+    # Find a project path by name (regex match, exact-match tiebreak).
+    # Returns the path string, or nil if 0 or >1 matches.
+    def find(name)
+      re = /#{name}/i
+      conf = from_config
+      matches = dirs.select { |k, _| k.match?(re) }.merge(conf.select { |k, _| k.match?(re) })
+      matches = matches.select { |k, _| k == name } if matches.count > 1
+      matches.count == 1 ? matches.values.first : nil
+    end
+  end
+end

data/lib/hiiro/queue.rb

@@ -304,7 +304,7 @@ class Hiiro
     end
 
     def resolve_task_info(opts, hiiro, default_task_info)
-      if opts.choose
+      if opts.find
         selection = select_task_or_session(hiiro)
         if selection
           case selection[:type]
@@ -314,7 +314,7 @@ class Hiiro
         else
           default_task_info
         end
-      elsif opts.task
+      elsif opts.task.is_a?(String)
         task_info_for(opts.task)
       else
         default_task_info
@@ -523,11 +523,13 @@ class Hiiro
         do_add = lambda do |args, split: nil|
           q.queue_dirs
           opts = Hiiro::Options.parse(args) do
-            option(:task,   short: :t, desc: 'Task name')
-            option(:name,   short: :n, desc: 'Base filename for the queue task')
-            flag(:choose,   short: :T, desc: 'Choose task interactively')
-            flag(:session,  short: :s, desc: 'Use current tmux session')
-            flag(:ignore,   short: :i, desc: 'Background task — close window when done, no shell')
+            option(:task,        short: :t, desc: 'Task name', flag_ifs: [:find])
+            option(:name,        short: :n, desc: 'Base filename for the queue task')
+            flag(:find,          short: :f, desc: 'Choose task/session interactively (fuzzyfind)')
+            flag(:horizontal,    short: :h, desc: 'Split horizontally in the current tmux window')
+            flag(:vertical,      short: :v, desc: 'Split vertically in the current tmux window')
+            flag(:session,       short: :s, desc: 'Use current tmux session')
+            flag(:ignore,        short: :i, desc: 'Background task — close window when done, no shell')
           end
 
           if opts.help?
@@ -535,6 +537,9 @@ class Hiiro
             exit 1
           end
 
+          split ||= :hsplit if opts.horizontal
+          split ||= :vsplit if opts.vertical
+
           args = opts.args
           ti = q.resolve_task_info(opts, h, task_info)
 
@@ -543,6 +548,47 @@ class Hiiro
             ti = (ti || {}).merge(session_name: session_name) if session_name
           end
 
+          # Split+interactive: open editor AND run claude in a new tmux pane
+          if split && args.empty? && $stdin.tty?
+            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)
+            fm_lines << "session_name: #{ti[:session_name]}" if ti&.dig(:session_name)
+            fm_lines << "ignore: true" if opts.ignore
+            fm_lines << "# app: <partial-app-name>  (run claude from this app's directory)"
+            fm_lines << "# dir: <relative-path>     (subdir within app or tree root)"
+            fm_lines << "---"
+            fm_lines << ""
+
+            tmp_dir = File.join(Dir.home, '.config/hiiro/tmp')
+            FileUtils.mkdir_p(tmp_dir)
+            base        = File.join(tmp_dir, "hq-#{Time.now.strftime('%Y%m%d%H%M%S%L')}")
+            prompt_path = "#{base}.md"
+            script_path = "#{base}.sh"
+            File.write(prompt_path, fm_lines.join("\n"))
+
+            orig_pane  = `tmux display-message -p '\#{pane_id}'`.strip
+            split_flag = split == :hsplit ? '-v' : '-h'
+            claude_cmd = opts.ignore ? 'claude -p' : 'claude'
+            shell_line = opts.ignore ? '' : "exec ${SHELL:-zsh}"
+
+            File.write(script_path, <<~SH)
+              #!/usr/bin/env bash
+              ${EDITOR:-vim} #{Shellwords.shellescape(prompt_path)}
+              tmux select-pane -t #{Shellwords.shellescape(orig_pane)}
+              if [ -s #{Shellwords.shellescape(prompt_path)} ]; then
+                cat #{Shellwords.shellescape(prompt_path)} | #{claude_cmd}
+              fi
+              rm -f #{Shellwords.shellescape(prompt_path)} #{Shellwords.shellescape(script_path)}
+              #{shell_line}
+            SH
+            FileUtils.chmod(0755, script_path)
+
+            new_pane = `tmux split-window #{split_flag} -P -F '\#{pane_id}' #{Shellwords.shellescape(script_path)} 2>/dev/null`.strip
+            system('tmux', 'select-pane', '-t', new_pane) unless new_pane.empty?
+            next
+          end
+
           if args.empty? && !$stdin.tty?
             content = $stdin.read.strip
           elsif args.any?
@@ -590,9 +636,9 @@ class Hiiro
         h.add_subcmd(:wip) { |*args|
           q.queue_dirs
           opts = Hiiro::Options.parse(args) do
-            option(:task, short: :t, desc: 'Task name')
-            flag(:choose, short: :T, desc: 'Choose task interactively')
-            flag(:session, short: :s, desc: 'Use current tmux session')
+            option(:task,    short: :t, desc: 'Task name', flag_ifs: [:find])
+            flag(:find,      short: :f, desc: 'Choose task/session interactively (fuzzyfind)')
+            flag(:session,   short: :s, desc: 'Use current tmux session')
           end
           args = opts.args
           ti = q.resolve_task_info(opts, h, task_info)

data/lib/hiiro/tasks.rb

@@ -6,6 +6,16 @@ class Hiiro
     TASKS_DIR = File.join(Dir.home, '.config', 'hiiro', 'tasks')
     APPS_FILE = File.join(Dir.home, '.config', 'hiiro', 'apps.yml')
 
+    def self.add_resolvers(hiiro, scope: :task)
+      tm = new(hiiro, scope: scope)
+      hiiro.add_resolver(:task,
+        -> { tm.select_task_interactive }
+      ) { |name|
+        task = tm.task_by_name(name)
+        task&.name || name
+      }
+    end
+
     attr_reader :hiiro, :scope, :environment
 
     def initialize(hiiro, scope: :task, environment: nil)
@@ -937,6 +947,18 @@ class Hiiro
           print task.session_name if task.session_name
         end
 
+        h.add_subcmd(:sh) do |task_name=nil, *args|
+          task = task_name ? tm.task_by_name(task_name) : tm.current_task
+          unless task
+            puts task_name ? "Task '#{task_name}' not found" : "Not in a task session"
+            next
+          end
+          tree = tm.environment.find_tree(task.tree_name)
+          path = tree ? tree.path : File.join(Hiiro::WORK_DIR, task.tree_name)
+          Dir.chdir(path)
+          args.empty? ? exec(ENV['SHELL'] || 'zsh') : exec(*args)
+        end
+
         h.add_subcmd(:status) { tm.status }
         h.add_subcmd(:st) { tm.status }
 

data/lib/hiiro/tmux.rb

@@ -27,6 +27,32 @@ class Hiiro
       client.open_session(name, **opts)
     end
 
+    def self.add_resolvers(hiiro)
+      hiiro.add_resolver(:pane,
+        -> { hiiro.fuzzyfind_from_map(hiiro.tmux_client.panes(all: true).name_map) }
+      ) { |ref| ref }
+
+      hiiro.add_resolver(:window,
+        -> { hiiro.fuzzyfind_from_map(hiiro.tmux_client.windows(all: true).name_map) }
+      ) { |ref| ref }
+
+      hiiro.add_resolver(:session,
+        -> { hiiro.fuzzyfind_from_map(hiiro.tmux_client.sessions.name_map) }
+      ) { |ref| ref }
+
+      hiiro.add_resolver(:buffer,
+        -> {
+          buffers = hiiro.tmux_client.buffers
+          return nil if buffers.empty?
+          hiiro.fuzzyfind_from_map(buffers.name_map)
+        }
+      ) { |ref|
+        buffers = hiiro.tmux_client.buffers
+        matching = buffers.matching(ref)
+        matching.size == 1 ? matching.first.name : ref
+      }
+    end
+
     attr_reader :hiiro
 
     def initialize(hiiro = nil)

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.279"
+  VERSION = "0.1.280"
 end

data/lib/hiiro.rb

@@ -28,6 +28,7 @@ require_relative "hiiro/app_files"
 require_relative "hiiro/rbenv"
 require_relative "hiiro/any_struct"
 require_relative "hiiro/pinned_pr_manager"
+require_relative "hiiro/projects"
 
 class String
   def underscore(camel_cased_word=self)

data/plugins/project.rb

@@ -2,72 +2,32 @@
 
 module Project
   def self.load(hiiro)
-    # hiiro.load_plugin(Tmux)
-    attach_methods(hiiro)
     add_subcommands(hiiro)
   end
 
   def self.add_subcommands(hiiro)
     hiiro.add_subcmd(:project) do |project_name|
-      re = /#{project_name}/i
+      projects = Hiiro::Projects.new
+      path     = projects.find(project_name.to_s)
 
-      conf_matches = hiiro.projects_from_config.select{|k,v| k.match?(re) }
-      dir_matches = hiiro.project_dirs.select{|proj, path| proj.match?(re) }
-
-      puts(conf_matches:,dir_matches:)
-      matches = dir_matches.merge(conf_matches)
-      if matches.count > 1
-        matches = matches.select{|name, path| name == project_name }
-      end
-
-      puts matches_two: matches
-      case matches.count
-      when 0
+      if path.nil?
+        # Fall back to ~/proj root
         name = 'proj'
         path = File.join(Dir.home, 'proj')
-
         unless Dir.exist?(path)
           puts "Error: #{path.inspect} does not exist"
           exit 1
         end
-
-        puts "changing dir: #{path}"
-        Dir.chdir(path)
-
-        hiiro.start_tmux_session(name)
-      when 1
-        name, path = matches.first
-
         puts "changing dir: #{path}"
         Dir.chdir(path)
-
         hiiro.start_tmux_session(name)
-      when (2..)
-        puts "ERROR: Multiple matches found"
-        puts
-        puts "Matches:"
-        matches.each { |name, path|
-          puts format("  %s: %s", name, path)
-        }
+        next
       end
-    end
-  end
 
-  def self.attach_methods(hiiro)
-    hiiro.instance_eval do
-      def project_dirs
-        Dir.glob(File.join(Dir.home, 'proj', '*/')).map { |path|
-          [File.basename(path), path]
-        }.to_h
-      end
-
-      def projects_from_config
-        projects_file = File.join(Dir.home, '.config/hiiro', 'projects.yml')
-
-        return {} unless File.exist?(projects_file)
-
-        YAML.safe_load_file(projects_file)
-      end
+      name = project_name.to_s
+      puts "changing dir: #{path}"
+      Dir.chdir(path)
+      hiiro.start_tmux_session(name)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.279
+  version: 0.1.280
 platform: ruby
 authors:
 - Joshua Toyota
@@ -271,6 +271,7 @@ files:
 - lib/hiiro/options.rb
 - lib/hiiro/paths.rb
 - lib/hiiro/pinned_pr_manager.rb
+- lib/hiiro/projects.rb
 - lib/hiiro/queue.rb
 - lib/hiiro/rbenv.rb
 - lib/hiiro/runner_tool.rb