hiiro 0.1.384 → 0.1.385

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 308d4ea2a261c3dd45eedd5b40bb0bcf8ada1b6cd2310bd908abac4e4d73c408
-  data.tar.gz: e138d7b8aeed4b9fa598dbe8d0d7dfb45abec78658c338a048d42d8d540a3a27
+  metadata.gz: 1877449a8336392c36f54f38f1ea86792b736f6d8af25bea8bb98f1f62081328
+  data.tar.gz: 495465e2395a43cc24464922aa60e24283e97bf715f7492f7be182e8936629c6
 SHA512:
-  metadata.gz: 9d0e4d5ab790f5c262d7d4c03517c7caf40214ad9e9e2b76e7df84724bdf19f105eff32c935bcdea3f73cc64ec3bdf5e922258ffed5c44cdd9969b2649e313b7
-  data.tar.gz: 74a0868f58e19659707345d4241f08ae0c112f2e925b2c5fe43e6faf008b7eceafdcc914aba27ce5f638ccd7c7c4b55a383ac7f3126cd78cc1e7b26a2daf263c
+  metadata.gz: 0d1c6e96f27300ab32b675f10b2d00c207792a0534859bbbfaa02f72d855b3af33572422842474cdfddf3a18cd5146eb93060349b03671232b4b4485c262079d
+  data.tar.gz: 0db00cb34ddc01b743a1a3f039e80308619134ce722e9f316cc483f36c1db1579d749218be66ab30e31b664996f6eeb9e89a6ffacff6c1763ce8d47dc8193e7e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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

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/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

data/docs/h-herdr.md

@@ -1,6 +1,6 @@
 # h herdr
 
-Expose the `t` task CLI inside Herdr as keybound actions. Each action opens a session-modal popup that runs `h herdr popup`, so fuzzy pickers and editors get a real TTY without disturbing the tiled layout.
+Expose task popups and pane controls inside Herdr. Popup actions use the Hiiro plugin; pane focus, reflow, resize, swap, and zoom commands call Herdr's native pane API directly.
 
 ## Install
 
@@ -10,7 +10,7 @@ h herdr keys                 # prints [[keys.command]] entries to paste into ~/.
 herdr server reload-config
 ```
 
-`h herdr uninstall` unlinks the plugin and removes the copied directory. Requires Herdr 0.7.4 or newer, and `sk` or `fzf` on `PATH`.
+`h herdr uninstall` unlinks the plugin and removes the copied directory. Requires Herdr 0.7.4 or newer, and `sk` or `fzf` on `PATH`. Run `h herdr keys` again after upgrading Hiiro, paste the new entries, then reload Herdr's config.
 
 ## Actions
 
@@ -21,21 +21,34 @@ herdr server reload-config
 | `hiiro.todos` | `prefix+shift+y` | Fuzzy-pick an open todo of the current task and copy its text to the clipboard |
 | `hiiro.shell` | `prefix+shift+s` | 90% popup running `t sh` in the current task's start directory |
 | `hiiro.nvim` | `prefix+shift+e` | 90% popup running bare `$EDITOR` (default `nvim`) in the working directory of the pane the key was pressed in |
+| Native Herdr focus | `prefix+h/j/k/l` | Focus the neighboring pane using Herdr's default Vim bindings |
+| Pane reflow | `prefix+shift+h/j/k/l` | Move the current pane to that edge in a two-pane tab; for example `prefix+shift+l` changes a top/bottom split into full-height left/right columns |
+| Pane resize | `prefix+alt+h/j/k/l` | Grow or shrink the current split in that direction |
 
 The current task resolves through `Hiiro::CurrentTask`: the popup's Herdr workspace, then the working directory, then the task saved with `t use TASK`. Errors print in the popup for two seconds before it closes.
 
+Pane reflow intentionally requires exactly two panes in the current tab. This keeps an uppercase movement deterministic: the current pane lands on the requested edge and the other pane occupies the remainder. Use native `h herdr swap DIRECTION` for larger layouts instead of silently rebuilding a multi-pane tree.
+
 ## Subcommands
 
 | Command | Behavior |
 |---|---|
 | `h herdr install` | Copy the manifest from the gem, link it in Herdr, print next steps |
 | `h herdr uninstall` | Unlink and remove the copy |
-| `h herdr keys` | Print the keybinding snippet |
-| `h herdr actions` | List action ids |
-| `h herdr action NAME` | Headless: open the popup for NAME (what the manifest binds) |
-| `h herdr popup` | Runs inside the popup; reads `HIIRO_HERDR_ACTION` |
+| `h herdr keys` | Print task popup, pane reflow, and pane resize keybindings |
+| `h herdr actions` | List popup action ids |
+| `h herdr action NAME` | Headless: open the popup for NAME |
+| `h herdr popup` | Run the selected action inside the popup |
+| `h herdr focus DIRECTION` | Focus the neighboring pane; accepts `h/j/k/l` or `left/down/up/right` |
+| `h herdr move DIRECTION [RATIO]` | Reflow a two-pane tab with the current pane on DIRECTION and optionally give it RATIO of the available space; aliases: `layout`, `arrange` |
+| `h herdr resize DIRECTION [AMOUNT]` | Resize the current pane split |
+| `h herdr swap DIRECTION` | Swap the current pane with its neighbor |
+| `h herdr zoom` | Toggle current-pane zoom |
+
+`hh focus`, `hh move`, `hh layout`, `hh arrange`, `hh resize`, `hh swap`, and `hh zoom` delegate to the same `h herdr` commands.
 
 ## Files
 
-- `herdr-plugin/herdr-plugin.toml` in the gem: manifest with five `[[actions]]` and one `[[panes]]` popup entrypoint
-- `bin/h-herdr`: actions, popup logic, install and keys helpers
+- `herdr-plugin/herdr-plugin.toml` in the gem: task popup actions and popup entrypoint
+- `bin/h-herdr`: popup logic, pane controls, installation, and keybinding output
+- `bin/hh`: short aliases for the pane controls

data/lib/hiiro/version.rb

@@ -1,4 +1,4 @@
 class Hiiro
-  VERSION = "0.1.384"
+  VERSION = "0.1.385"
   SUPPORTED_RUBY_VERSION = ">= 3.2.0"
 end

metadata

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