hiiro 0.1.383 → 0.1.385

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2d48728418d4a6d30a48f702f0aa89ba3d6d7d9552904a4da2bcbdc78ccdde
-  data.tar.gz: 3e14943d3dbbafab65ebc8fc11e763f88af12476d217b67a51f32a02ab1d536b
+  metadata.gz: 1877449a8336392c36f54f38f1ea86792b736f6d8af25bea8bb98f1f62081328
+  data.tar.gz: 495465e2395a43cc24464922aa60e24283e97bf715f7492f7be182e8936629c6
 SHA512:
-  metadata.gz: 970a8d0e22b46b7a1c20ca873d6ecb1d331c81a887d3bddffc15f743b5d0a9666ff823cdae7dfc03692116f1da77adfd47cc76d82087f0e66fe57a220270e5c4
-  data.tar.gz: 62d1f129d289f5cc3363aaaf69a4766366f26774396f23685aada9dc0115745ad09d9fdd1687004311f58b22e40b827d79cb64b13db7f191afdfd458cda6153e
+  metadata.gz: 0d1c6e96f27300ab32b675f10b2d00c207792a0534859bbbfaa02f72d855b3af33572422842474cdfddf3a18cd5146eb93060349b03671232b4b4485c262079d
+  data.tar.gz: 0db00cb34ddc01b743a1a3f039e80308619134ce722e9f316cc483f36c1db1579d749218be66ab30e31b664996f6eeb9e89a6ffacff6c1763ce8d47dc8193e7e

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## Unreleased
+
+### Added
+- `h herdr` and `hh` pane controls for Vim-style focus, two-pane reflow, resize, swap, and zoom
+- `prefix+shift+h/j/k/l` reflows a two-pane tab toward an edge; `prefix+alt+h/j/k/l` resizes the current pane
+
+## [0.1.384] - 2026-09-23
+
+### Added
+- `h plist` command for working with property lists
+
+### Fixed
+- publish script now requires hiiro unconditionally at startup instead of only when falling back to local version
+
 ## [0.1.381] - 2026-09-20
 
 ### Added
@@ -14,8 +28,6 @@
 - `h save` subcommands: `ls`/`list`, `dir`, `show`/`cat`, `copy`, `open`, `edit`, `rm`/`remove` for managing saved files
 - `t path`, `t cd`, `t start`, and `t switch` accept optional `APP` argument to select a configured relative directory beneath the task root
 - APP resolves by exact name or unique case-sensitive prefix; fails when ambiguous or missing
-
-### Added
 - `t switch` / `t workspace` and `t cd` accept an optional APP positional (or `--app`) resolving through the apps registry by exact name or unique prefix; the workspace or pane cd targets the app directory under the task worktree, e.g. `t switch aldi cpm` opens `~/work/aldi/main/retailer-tools/content-page-migrator`
 
 ## [0.1.376] - 2026-09-14
@@ -143,14 +155,4 @@
 
 ### Removed
 - Remove tmux paste-buffer, jumplist, task-color, focus-hook, and arbitrary-layout features that Herdr 0.8.2 does not support.
-- Remove the old `Hiiro::Tmux` adapter and tmux-specific command tests.
-
-### Fixed
-- Strip the desktop notifier executable path and run notifications and sounds as detached processes instead of creating persistent Herdr tabs.
-- Preserve `add_cmd` declaration locations and argument metadata in generated help; allow command groups to pass arguments and help through to child commands.
-- Make undeclared `add_cmd opts:` entries boolean flags without consuming positional arguments; preserve explicit options and reserve conflicting short aliases.
-- Show selected command options for `add_cmd -h`/`--help` without executing the command block.
-- Focus the exact Herdr pane through the socket API and read the CLI's plain-text pane output without JSON parsing.
-- Restore the missing `Hiiro::Bins` helper so `require "hiiro"` boots and commands like `h jumplist record` dispatch correctly.
-- Make Hiiro's Ruby requirement explicit as Ruby 3.2+ and have rbenv-wide gem installs skip incompatible Ruby versions.
-- Update the publish script to preserve the Ruby support constant, run only on supported Ruby, and install releases only into compatible rbenv versions.
+- Remove the old `Hiiro::Tmux` adapter and tmux-specific command tests.

data/README.md

@@ -152,7 +152,7 @@ See the [task command reference](docs/t.md) for all commands and the [workflow i
 | `h setup` | Install plugins and subcommands to system paths |
 | `h edit` | Open the h script in your editor |
 | `h alert` | macOS desktop notifications via terminal-notifier |
-| `h herdr` | Herdr plugin for `t`: fuzzy task switcher, todo capture, todo copy, task shell and nvim popups (`h herdr install`) |
+| `h herdr` | Herdr task popups plus Vim-style pane focus, movement, resize, swap, and zoom controls (`h herdr install`) |
 | `h task` | Same program as `t`: task records, todos, worktrees (`t NAME tree new`), and Herdr workspaces |
 
 ### External Subcommands

data/bin/h-herdr

@@ -10,6 +10,16 @@ require 'fileutils'
 
 PLUGIN_ID = 'hiiro'
 ACTIONS = %w[switch todo-add todos shell nvim].freeze
+PANE_DIRECTIONS = {
+  'h' => 'left',
+  'j' => 'down',
+  'k' => 'up',
+  'l' => 'right',
+  'left' => 'left',
+  'down' => 'down',
+  'up' => 'up',
+  'right' => 'right',
+}.freeze
 INSTALL_DIR = Hiiro::Config.config_dir('herdr-plugin')
 SOURCE_DIR = File.expand_path('../herdr-plugin', File.dirname(File.realpath(__FILE__)))
 KEYS_SNIPPET = <<~TOML
@@ -43,6 +53,56 @@ KEYS_SNIPPET = <<~TOML
   type = "plugin_action"
   command = "hiiro.nvim"
   description = "task notes in nvim"
+
+  # Vim-style pane layout controls. Herdr already uses prefix+h/j/k/l for focus.
+  # Uppercase rotates a two-pane tab so the current pane lands on that edge.
+  [[keys.command]]
+  key = "prefix+shift+h"
+  type = "shell"
+  command = "h herdr move left"
+  description = "move current pane to the left"
+
+  [[keys.command]]
+  key = "prefix+shift+j"
+  type = "shell"
+  command = "h herdr move down"
+  description = "move current pane to the bottom"
+
+  [[keys.command]]
+  key = "prefix+shift+k"
+  type = "shell"
+  command = "h herdr move up"
+  description = "move current pane to the top"
+
+  [[keys.command]]
+  key = "prefix+shift+l"
+  type = "shell"
+  command = "h herdr move right"
+  description = "move current pane to the right"
+
+  [[keys.command]]
+  key = "prefix+alt+h"
+  type = "shell"
+  command = "h herdr resize left"
+  description = "resize current pane left"
+
+  [[keys.command]]
+  key = "prefix+alt+j"
+  type = "shell"
+  command = "h herdr resize down"
+  description = "resize current pane down"
+
+  [[keys.command]]
+  key = "prefix+alt+k"
+  type = "shell"
+  command = "h herdr resize up"
+  description = "resize current pane up"
+
+  [[keys.command]]
+  key = "prefix+alt+l"
+  type = "shell"
+  command = "h herdr resize right"
+  description = "resize current pane right"
 TOML
 
 def herdr_bin
@@ -55,6 +115,45 @@ def source_dir
   gem_root && File.join(gem_root, 'herdr-plugin')
 end
 
+def pane_direction!(value)
+  PANE_DIRECTIONS.fetch(value.to_s) do
+    raise Hiiro::Error, 'Direction must be h, j, k, l, left, down, up, or right'
+  end
+end
+
+def pane_ratio!(value)
+  return nil if value.nil?
+  ratio = Float(value, exception: false)
+  raise Hiiro::Error, 'Ratio must be greater than 0 and less than 1' unless ratio && ratio.positive? && ratio < 1
+  ratio
+end
+
+def move_current_pane(direction, ratio = nil)
+  current = herdr_client.current_pane
+  raise Hiiro::Error, 'No current Herdr pane' unless current
+  panes = herdr_client.panes(workspace: current.workspace_id).select { |pane| pane.tab_id == current.tab_id }
+  raise Hiiro::Error, "Move requires exactly two panes in the current tab; found #{panes.length}" unless panes.length == 2
+  other = panes.find { |pane| pane.id != current.id }
+
+  if %w[left up].include?(direction)
+    source, target = other, current
+    split = direction == 'left' ? 'right' : 'down'
+    move_ratio = ratio && 1.0 - ratio
+    focus = '--no-focus'
+  else
+    source, target = current, other
+    split = direction
+    move_ratio = ratio
+    focus = '--focus'
+  end
+
+  detached = system(herdr_bin, 'pane', 'move', source.id, '--new-tab', '--no-focus')
+  raise Hiiro::Error, 'Herdr could not detach the pane for reflow' unless detached
+  args = ['pane', 'move', source.id, '--tab', target.tab_id, '--target-pane', target.id, '--split', split]
+  args += ['--ratio', move_ratio.to_s] if move_ratio
+  raise Hiiro::Error, 'Herdr could not reflow the pane' unless system(herdr_bin, *args, focus)
+end
+
 Hiiro.run(*ARGV, external_commands: false) do
   add_cmd(:install) do
     no_args = opts.args.empty?
@@ -81,6 +180,33 @@ Hiiro.run(*ARGV, external_commands: false) do
 
   add_cmd(:actions) { ACTIONS.each { |name| puts "hiiro.#{name}" } }
 
+  add_cmd(:focus, args: %i[direction]) do
+    direction = pane_direction!(opts.args.first)
+    raise Hiiro::Error, 'Herdr could not focus the pane' unless system(herdr_bin, 'pane', 'focus', '--current', '--direction', direction)
+  end
+
+  add_cmd(:resize, args: %i[direction amount?]) do
+    direction = pane_direction!(opts.args.shift)
+    amount = opts.args.shift
+    args = ['pane', 'resize', '--current', '--direction', direction]
+    args += ['--amount', amount] if amount
+    raise Hiiro::Error, 'Herdr could not resize the pane' unless system(herdr_bin, *args)
+  end
+
+  add_cmd(:swap, args: %i[direction]) do
+    direction = pane_direction!(opts.args.first)
+    raise Hiiro::Error, 'Herdr could not swap the pane' unless system(herdr_bin, 'pane', 'swap', '--current', '--direction', direction)
+  end
+
+  add_cmd(:move, :layout, :arrange, args: %i[direction ratio?]) do
+    move_current_pane(pane_direction!(opts.args.shift), pane_ratio!(opts.args.shift))
+  end
+
+  add_cmd(:zoom) do
+    raise Hiiro::Error, 'h herdr zoom takes no arguments' unless opts.args.empty?
+    raise Hiiro::Error, 'Herdr could not zoom the pane' unless system(herdr_bin, 'pane', 'zoom', '--current', '--toggle')
+  end
+
   # Headless: bound to a key, opens the popup with the chosen action.
   add_cmd(:action, args: %i[name]) do
     name = opts.args.first

data/bin/h-js

@@ -5,6 +5,27 @@ require 'hiiro'
 # sed -n '/scripts.*[{]/,/[}]/p' package.json
 
 Hiiro.run do
+  add_cmd :add, args: ['NAME', 'COMMAND...'] do
+    abort 'Usage: h-js add NAME COMMAND... (use -- before command flags)' unless opts.args.length >= 2
+    name, *command_args = opts.args
+    abort 'Script name cannot be blank' if name.strip.empty?
+    command = command_args.length == 1 ? command_args.first : Shellwords.join(command_args)
+    abort 'Script command cannot be blank' if command.strip.empty?
+    abort 'No package.json in the current directory' unless File.file?('package.json')
+
+    package = JSON.parse(File.read('package.json'))
+    abort 'package.json must contain an object' unless package.is_a?(Hash)
+    package['scripts'] = {} unless package.key?('scripts')
+    abort 'package.json scripts must be an object' unless package['scripts'].is_a?(Hash)
+    abort "Script #{name.inspect} already exists" if package['scripts'].key?(name)
+
+    package['scripts'][name] = command
+    File.write('package.json', JSON.pretty_generate(package) + "\n")
+    puts "Added script #{name.inspect} to package.json"
+  rescue JSON::ParserError => error
+    abort "Invalid package.json: #{error.message}"
+  end
+
   add_cmd :pkg do
     file, *_other = Dir.glob('package.json')
 

data/bin/h-plist

@@ -0,0 +1,214 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+require 'open3'
+require 'json'
+
+PLIST_TYPES = %w[bool integer float date string data xml json dictionary array].freeze
+PLIST_FORMATS = %w[xml1 binary1 json swift objc].freeze
+
+def require_plist(path)
+  unless path && !path.empty?
+    STDERR.puts 'A plist path is required.'
+    exit 1
+  end
+  expanded = File.expand_path(path)
+  unless File.file?(expanded)
+    STDERR.puts "Plist not found: #{expanded}"
+    exit 1
+  end
+  expanded
+end
+
+def run_plutil(*arguments, allow_failure: false)
+  stdout, stderr, status = Open3.capture3('plutil', *arguments)
+  unless status.success? || allow_failure
+    STDERR.print(stderr.empty? ? stdout : stderr)
+    exit status.exitstatus
+  end
+  [stdout, stderr, status]
+end
+
+def print_plutil(*arguments)
+  stdout, stderr, = run_plutil(*arguments)
+  STDOUT.print(stdout)
+  STDERR.print(stderr)
+end
+
+def validate_type(type)
+  return type if PLIST_TYPES.include?(type)
+  STDERR.puts "Unknown type #{type.inspect}. Use: #{PLIST_TYPES.join(', ')}"
+  exit 1
+end
+
+def mutation_arguments(verb, key, type, values)
+  args = [verb, key, "-#{validate_type(type)}"]
+  unless %w[dictionary array].include?(type)
+    if values.empty?
+      STDERR.puts "A value is required for type #{type}."
+      exit 1
+    end
+    args << values.join(' ')
+  end
+  args
+end
+
+Hiiro.run(*ARGV) do
+  add_subcmd(:show, :print) do |path=nil|
+    print_plutil('-p', '--', require_plist(path))
+  end
+
+  add_subcmd(:get) do |path=nil, key=nil, format='raw'|
+    unless key
+      STDERR.puts 'Usage: h plist get <file> <keypath> [raw|json|xml1|binary1]'
+      exit 1
+    end
+    unless %w[raw json xml1 binary1].include?(format)
+      STDERR.puts 'Format must be raw, json, xml1, or binary1.'
+      exit 1
+    end
+    print_plutil('-extract', key, format, '-o', '-', '--', require_plist(path))
+  end
+
+  add_subcmd(:keys) do |path=nil, key=nil|
+    plist = require_plist(path)
+    stdout, = if key
+                run_plutil('-extract', key, 'json', '-expect', 'dictionary', '-o', '-', '--', plist)
+              else
+                run_plutil('-convert', 'json', '-o', '-', '--', plist)
+              end
+    value = JSON.parse(stdout)
+    unless value.is_a?(Hash)
+      STDERR.puts(key ? "Not a dictionary: #{key}" : 'The plist root is not a dictionary.')
+      exit 1
+    end
+    puts value.keys.sort
+  end
+
+  add_subcmd(:type) do |path=nil, key=nil|
+    unless key
+      STDERR.puts 'Usage: h plist type <file> <keypath>'
+      exit 1
+    end
+    print_plutil('-type', key, '--', require_plist(path))
+  end
+
+  add_subcmd(:lint) do |*paths|
+    if paths.empty?
+      STDERR.puts 'Usage: h plist lint <file...>'
+      exit 1
+    end
+    expanded = paths.map { |path| require_plist(path) }
+    print_plutil('-lint', '--', *expanded)
+  end
+
+  add_subcmd(:set) do |path=nil, key=nil, *arguments|
+    unless key
+      STDERR.puts 'Usage: h plist set <file> <keypath> [type] <value>'
+      exit 1
+    end
+    type = PLIST_TYPES.include?(arguments.first) ? arguments.shift : 'string'
+    values = arguments
+    plist = require_plist(path)
+    _, _, status = run_plutil('-type', key, '--', plist, allow_failure: true)
+    verb = status.success? ? '-replace' : '-insert'
+    print_plutil(*mutation_arguments(verb, key, type, values), '--', plist)
+  end
+
+  add_subcmd(:add, :insert) do |path=nil, key=nil, *arguments|
+    unless key
+      STDERR.puts 'Usage: h plist add <file> <keypath> [type] <value>'
+      exit 1
+    end
+    type = PLIST_TYPES.include?(arguments.first) ? arguments.shift : 'string'
+    values = arguments
+    print_plutil(*mutation_arguments('-insert', key, type, values), '--', require_plist(path))
+  end
+
+  add_subcmd(:rm, :remove, :delete) do |path=nil, key=nil|
+    unless key
+      STDERR.puts 'Usage: h plist rm <file> <keypath>'
+      exit 1
+    end
+    print_plutil('-remove', key, '--', require_plist(path))
+  end
+
+  add_subcmd(:convert) do |path=nil, format=nil, output=nil|
+    plist = require_plist(path)
+    unless PLIST_FORMATS.include?(format)
+      STDERR.puts "Usage: h plist convert <file> <#{PLIST_FORMATS.join('|')}> [output]"
+      exit 1
+    end
+    args = ['-convert', format]
+    args.concat(['-o', File.expand_path(output)]) if output
+    print_plutil(*args, '--', plist)
+  end
+
+  add_subcmd(:json) do |path=nil|
+    print_plutil('-convert', 'json', '-r', '-o', '-', '--', require_plist(path))
+  end
+
+  add_subcmd(:xml) do |path=nil|
+    print_plutil('-convert', 'xml1', '-o', '-', '--', require_plist(path))
+  end
+
+  add_subcmd(:create) do |path=nil, format='xml1'|
+    unless path
+      STDERR.puts 'Usage: h plist create <file> [xml1|binary1|json]'
+      exit 1
+    end
+    unless %w[xml1 binary1 json].include?(format)
+      STDERR.puts 'Create format must be xml1, binary1, or json.'
+      exit 1
+    end
+    expanded = File.expand_path(path)
+    if File.exist?(expanded)
+      STDERR.puts "Refusing to overwrite existing file: #{expanded}"
+      exit 1
+    end
+    print_plutil('-create', format, expanded)
+  end
+
+  add_subcmd(:edit) do |path=nil|
+    exec('safe_nvim', require_plist(path))
+  end
+
+  add_subcmd(:help) do
+    puts <<~HELP
+      h-plist — inspect and modify Apple property lists with plutil
+
+      READ:
+        h plist <file>                         Pretty-print a plist
+        h plist show <file>                    Pretty-print a plist
+        h plist get <file> <keypath> [format]  Extract a value
+        h plist keys <file> [dict-keypath]     List dictionary keys
+        h plist type <file> <keypath>          Print a value's type
+        h plist lint <file...>                 Validate plist syntax
+        h plist json <file>                    Emit readable JSON
+        h plist xml <file>                     Emit XML
+
+      WRITE:
+        h plist set <file> <keypath> [type] <value>  Insert or replace
+        h plist add <file> <keypath> [type] <value>  Insert only
+        h plist rm <file> <keypath>                  Remove a value
+        h plist convert <file> <format> [output]     Convert in place or copy
+        h plist create <file> [format]               Create without overwrite
+        h plist edit <file>                          Open with safe_nvim
+
+      TYPES:
+        bool, integer, float, date, string (default), data, xml, json,
+        dictionary, array
+
+      Key paths use plutil syntax. Numeric components address array indexes.
+      Quote values containing spaces. Mutating commands edit the file in place.
+    HELP
+  end
+
+  add_default do |path=nil|
+    if path
+      print_plutil('-p', '--', require_plist(path))
+    else
+      run_subcmd(:help)
+    end
+  end
+end

data/bin/hh

@@ -44,6 +44,10 @@ Hiiro.run do
     end
   end
 
+  %i[focus resize swap move layout arrange zoom].each do |name|
+    add_cmd(name) { |*args| system('h', 'herdr', name.to_s, *args) }
+  end
+
   add_default do |*args|
     system 'herdr', *args
   end