hiiro 0.1.359 → 0.1.361

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c336f9c4c1b59833aa907d1168d66dd055edccfc80e707eae1c6193eb99c303b
-  data.tar.gz: a98470507032d423c49dd4f8f8fd7e90eb23824933c5b2bfe2a3278d734cde1e
+  metadata.gz: e1a1f6f0db99f2573bda6b2c6e8746e49464a4079d40534b6367aa5c888d4557
+  data.tar.gz: f805de24c6a10db384b4bbb5141edc8d9f0511d9b07cf8c81c4ada064cb6d50e
 SHA512:
-  metadata.gz: '08212298421522b4cfa442573451106dc3f539395773e7446bf99e30980b69bc9f30e1b369ed56c33a5fce1957d068720cb3a5231fd6360a00d6b75334b88f6b'
-  data.tar.gz: 64f95314c15015105b3445bc8c5ce9671be9c81ad7626d0ef30b6a120b6ede06904fa2c0161b1d336fa4380db79520e913b0cae311bc3b1e4860ee723ce0d305
+  metadata.gz: 5008e27fbd04a84a473fd12f81d41d758a8e147d2455abb69d33417741feabf5d2605a7697e3b462f56b121b627c46d9bbaeb067663be39a605e70a4ae9592e9
+  data.tar.gz: 15ac3b8449da827b76e5bbf68fac2e40dfe468526cef493e14d9887e32ad1a0a5f04830f260b82ee9adfc55d7df67d6272c54cbb11406c0a2881bc751ce04df4

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+### Added
+- Add `Hiiro::Herdr`, a JSON-backed adapter for Herdr workspaces, tabs, panes, notifications, and command execution.
+- Persist Herdr workspace/tab/pane IDs for invocations, branches, queued prompts, services, and tracked PRs, with read fallbacks for legacy metadata.
+
+### Changed
+- Move task, project, queue, service, background, Claude, app navigation, PR attach, title, and notification workflows from tmux to Herdr.
+- Keep `h session` and `h window` as compatibility commands for Herdr workspaces and tabs.
+
+### 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
 - 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.

data/README.md

@@ -27,7 +27,7 @@ h setup
 
 This installs:
 - Plugins to `~/.config/hiiro/plugins/`
-- Subcommands (`h-buffer`, `h-todo`, etc.) to `~/bin/`
+- Subcommands (`h-pane`, `h-todo`, etc.) to `~/bin/`
 
 Ensure `~/bin` is in your `$PATH`.
 
@@ -35,9 +35,12 @@ Ensure `~/bin` is in your `$PATH`.
 ### Dependencies
 
 ```sh
-# For notify plugin (macOS)
+# For h alert (macOS)
 brew install terminal-notifier
 
+# Terminal workspace, tab, and pane management
+# Install Herdr 0.8.2 or newer.
+
 # For fuzzy-finder
 brew install sk # (or fzf)
 
@@ -76,24 +79,22 @@ h ping
 |---------|-------------|
 | `h app` | Manage app directories within tasks/projects |
 | `h branch` | Git branch management with fuzzy selection and copy |
-| `h buffer` | Tmux paste buffer management |
-| `h claude` | Claude CLI wrapper with tmux split support |
+| `h claude` | Claude CLI wrapper with Herdr split support |
 | `h commit` | Select commits using fuzzy finder |
-| `h config` | Open config files (vim, git, tmux, zsh, starship, claude) |
+| `h config` | Open config files (vim, git, Herdr, zsh, starship, claude) |
 | `h link` | Manage saved links with URL, description, and shorthand |
-| `h pane` | Tmux pane management |
+| `h pane` | Herdr pane management |
 | `h plugin` | Manage hiiro plugins (list, edit, search) |
 | `h pr` | GitHub PR management via gh CLI |
-| `h project` | Project navigation with tmux session management |
-| `h queue` | Claude prompt queue with tmux-based task execution |
-| `h jumplist` | Vim-style tmux navigation history (back/forward through panes) |
+| `h project` | Project navigation with Herdr workspace management |
+| `h queue` | Claude prompt queue with Herdr-based task execution |
 | `h service` | Manage background dev services with env variations and groups |
 | `h file` | Track and open frequently-used files per app |
 | `h run` | Run dev tools (lint/test/format) against changed files |
-| `h session` | Tmux session management |
+| `h session` | Compatibility commands for Herdr workspaces |
 | `h sha` | Extract short SHA from git log |
 | `h todo` | Todo list management with tags and task association |
-| `h window` | Tmux window management |
+| `h window` | Compatibility commands for Herdr tabs |
 | `h wtree` | Git worktree management |
 
 `h claude agents|commands|skills -a` prints the absolute file path for each matching `.claude` tool, including `SKILL.md` for skills.
@@ -103,7 +104,6 @@ h ping
 Any subcommand can be abbreviated as long as the prefix uniquely matches:
 
 ```sh
-h buf ls      # matches h buffer ls
 h ses ls      # matches h session ls
 h win         # matches h window
 ```
@@ -117,9 +117,9 @@ Plugins are Ruby modules loaded from `~/.config/hiiro/plugins/`:
 | Plugin | Description |
 |--------|-------------|
 | Pins | Per-command YAML key-value storage |
-| Project | Project directory navigation with tmux session management |
+| Project | Project directory navigation with Herdr workspace management |
 | Tasks | Task lifecycle management across git worktrees with external-worktree registration and subtask support |
-| Notify | macOS desktop notifications via terminal-notifier |
+| Notify | Herdr desktop notifications |
 
 ## Adding Subcommands
 
@@ -226,9 +226,8 @@ All configuration lives in `~/.config/hiiro/`:
 ~/.config/hiiro/
   plugins/        # Plugin files (auto-loaded)
   pins/           # Pin storage (per command)
-  queue/          # Prompt queue (wip, pending, running, done, failed)
   services/       # Service runtime state
-  jumplist/       # Per-client tmux navigation history
+  bg-history.txt  # Background command history
   env_templates/  # Base .env templates for services
   tasks/          # Task metadata
   projects.yml    # Project aliases
@@ -239,6 +238,14 @@ All configuration lives in `~/.config/hiiro/`:
   todo.yml        # Todo items
 ```
 
+Runtime data lives separately:
+
+```
+~/.local/share/hiiro/
+  queue/          # Prompt queue (wip, pending, running, done, failed)
+  notify_log.yml  # Herdr notification log
+```
+
 ## Testing
 
 Run the test suite:
@@ -349,7 +356,7 @@ MIT
   # Start with specific variations
   h service start api-rails --use DATABASE_URL=docker --use REDIS_URL=docker
 
-  # Start the full local stack (one window, 3 split panes)
+  # Start the full local stack (one Herdr tab per service)
   h service start full-stack
 
   # Start frontend pointing at staging backends

data/bin/h-app

@@ -25,12 +25,10 @@ def relative_cd_path(target_path)
 end
 
 def send_cd(path)
-  pane = ENV['TMUX_PANE']
-  if pane
-    system('tmux', 'send-keys', '-t', pane, "cd #{path}\n")
-  else
-    system('tmux', 'send-keys', "cd #{path}\n")
-  end
+  pane = ENV['HERDR_PANE_ID']
+  return warn('Not running inside a Herdr pane') unless pane
+
+  Hiiro::Herdr.client.run_in_pane(pane, "cd #{path.shellescape}")
 end
 
 

data/bin/h-bg

@@ -16,9 +16,7 @@ def append_history(cmd)
 end
 
 def run_in_bg(cmd)
-  Hiiro::Background.ensure_session
-  name = cmd.split.first.to_s
-  system('tmux', 'new-window', '-d', '-t', "#{Hiiro::Background::SESSION}:", '-n', name, cmd)
+  Hiiro::Background.run(ENV['SHELL'] || 'zsh', '-lc', cmd)
 end
 
 Hiiro.run(*ARGV) do
@@ -57,7 +55,8 @@ Hiiro.run(*ARGV) do
   end
 
   add_subcmd(:attach, :a) do
-    system('tmux', 'switch-client', '-t', Hiiro::Background::SESSION)
+    workspace = Hiiro::Background.ensure_workspace
+    Hiiro::Herdr.client.focus_workspace(workspace.id)
   end
 
   add_subcmd(:history, :hist) do
@@ -70,10 +69,6 @@ Hiiro.run(*ARGV) do
   end
 
   add_subcmd(:setup) do
-    $stderr.puts 'Add this to your tmux.conf:'
-    $stderr.puts
-    puts "bind-key b display-popup -E -w 80% -h 40% \"h bg popup\""
-    $stderr.puts
-    $stderr.puts "Then reload tmux: tmux source-file ~/.tmux.conf"
+    puts 'No setup is required. Bind `h bg popup` in Herdr if you want a shortcut.'
   end
 end

data/bin/h-branch

@@ -36,7 +36,7 @@ class BranchManager
       name:     entry[:name],
       worktree: entry[:worktree],
       task:     entry[:task],
-      tmux:     entry[:tmux],
+      herdr:    entry[:herdr],
       sha:      entry[:sha]
     )
     show_entry(entry)
@@ -104,7 +104,7 @@ class BranchManager
         name:       branch_name,
         worktree:   entry[:worktree],
         task:       entry[:task],
-        tmux_json:  Hiiro::DB::JSON.dump(entry[:tmux]),
+        herdr_json: Hiiro::DB::JSON.dump(entry[:herdr]),
         sha:        entry[:sha],
         created_at: Time.now.iso8601
       )
@@ -119,7 +119,7 @@ class BranchManager
         'name'       => b.name,
         'worktree'   => b.worktree,
         'task'       => b.task,
-        'tmux'       => b.tmux.empty? ? nil : b.tmux,
+        'herdr'      => b.herdr.empty? ? nil : b.herdr,
         'sha'        => b.sha,
         'note'       => b.note,
         'created_at' => b.created_at
@@ -132,7 +132,7 @@ class BranchManager
 
   def build_entry(branch_name)
     current_task = Hiiro::Environment.current&.task rescue nil
-    tmux_info = capture_tmux_info
+    herdr_info = capture_herdr_info
     sha = `git rev-parse HEAD 2>/dev/null`.strip
 
     {
@@ -140,7 +140,7 @@ class BranchManager
       sha:      sha.empty? ? nil : sha,
       worktree: current_task&.tree_name,
       task:     current_task&.name,
-      tmux:     tmux_info
+      herdr:    herdr_info
     }
   end
 
@@ -150,13 +150,13 @@ class BranchManager
     hiiro.git.branch
   end
 
-  def capture_tmux_info
-    return nil unless ENV['TMUX']
+  def capture_herdr_info
+    return nil unless ENV['HERDR_ENV'] == '1'
 
     {
-      'session' => `tmux display-message -p '#S'`.strip,
-      'window'  => `tmux display-message -p '#W'`.strip,
-      'pane'    => ENV['TMUX_PANE']
+      'workspace' => ENV['HERDR_WORKSPACE_ID'],
+      'tab' => ENV['HERDR_TAB_ID'],
+      'pane' => ENV['HERDR_PANE_ID'],
     }
   end
 
@@ -165,20 +165,20 @@ class BranchManager
     puts "  SHA: #{entry[:sha] || '(unknown)'}"
     puts "  Task: #{entry[:task] || '(none)'}"
     puts "  Worktree: #{entry[:worktree] || '(none)'}"
-    if entry[:tmux]
-      puts "  Tmux session: #{entry[:tmux]['session']}"
-      puts "  Tmux window: #{entry[:tmux]['window']}"
-      puts "  Tmux pane: #{entry[:tmux]['pane']}"
+    if entry[:herdr]
+      puts "  Herdr workspace: #{entry[:herdr]['workspace']}"
+      puts "  Herdr tab: #{entry[:herdr]['tab']}"
+      puts "  Herdr pane: #{entry[:herdr]['pane']}"
     end
   end
 
-  def save_branch(name:, worktree:, task:, tmux: nil, sha: nil)
+  def save_branch(name:, worktree:, task:, herdr: nil, sha: nil)
     existing = Hiiro::Branch.find_by_name(name)
     if existing
       existing.update(
         worktree:   worktree,
         task:       task,
-        tmux_json:  Hiiro::DB::JSON.dump(tmux),
+        herdr_json: Hiiro::DB::JSON.dump(herdr),
         sha:        sha,
         updated_at: Time.now.iso8601
       )
@@ -187,7 +187,7 @@ class BranchManager
         name:       name,
         worktree:   worktree,
         task:       task,
-        tmux_json:  Hiiro::DB::JSON.dump(tmux),
+        herdr_json: Hiiro::DB::JSON.dump(herdr),
         sha:        sha,
         created_at: Time.now.iso8601
       )
@@ -301,10 +301,10 @@ Hiiro.run(*ARGV) do
     puts "  SHA:      #{entry[:sha] || '(unknown)'}"
     puts "  Task:     #{entry[:task] || '(none)'}"
     puts "  Worktree: #{entry[:worktree] || '(none)'}"
-    if entry[:tmux]
-      puts "  Tmux session: #{entry[:tmux]['session']}"
-      puts "  Tmux window:  #{entry[:tmux]['window']}"
-      puts "  Tmux pane:    #{entry[:tmux]['pane']}"
+    if entry[:herdr]
+      puts "  Herdr workspace: #{entry[:herdr]['workspace']}"
+      puts "  Herdr tab:       #{entry[:herdr]['tab']}"
+      puts "  Herdr pane:      #{entry[:herdr]['pane']}"
     end
 
     base = FIND_BASE.call

data/bin/h-claude

@@ -128,7 +128,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) {
     size += '%' if opts.percent
     cmd = opts.ignore ? fire_command(opts) : start_command(opts)
 
-    tmux_client.split_window(horizontal: !opts.horizontal, size: size, command: cmd)
+    herdr_client.split_window(horizontal: !opts.horizontal, size: size, command: cmd)
   }
 
   add_subcmd(:vsplit) { |*args|
@@ -138,8 +138,8 @@ Hiiro.run(*ARGV, plugins: [Pins]) {
     size += '%' if size && opts.percent
     cmd = opts.ignore ? fire_command(opts) : start_command(opts)
 
-    tmux_client.vsplit_window(size: size, command: cmd)
-    tmux_client.swap_current_pane(0, keep_active: true) if opts.left
+    herdr_client.vsplit_window(size: size, command: cmd)
+    herdr_client.swap_current_pane(:left) if opts.left
   }
 
   add_subcmd(:hsplit) { |*args|
@@ -149,14 +149,14 @@ Hiiro.run(*ARGV, plugins: [Pins]) {
     size += '%' if size && opts.percent
     cmd = opts.ignore ? fire_command(opts) : start_command(opts)
 
-    tmux_client.hsplit_window(size: size, command: cmd)
-    tmux_client.swap_current_pane(0, keep_active: true) unless opts.bottom
+    herdr_client.hsplit_window(size: size, command: cmd)
+    herdr_client.swap_current_pane(:up) unless opts.bottom
   }
 
   add_subcmd(:window) { |*args|
     opts = opts.parse(args)
     cmd = opts.ignore ? fire_command(opts) : start_command(opts)
-    tmux_client.new_window(command: cmd)
+    herdr_client.new_tab(command: cmd)
   }
 
 add_subcmd(:env) { |*args|

data/bin/h-config

@@ -26,8 +26,8 @@ Hiiro.run(*ARGV) {
     }.run
   }
 
-  add_subcmd(:tmux) {
-    open_config('.tmux.conf', dir: '~')
+  add_subcmd(:herdr) {
+    open_config('config.toml', dir: '~/.config/herdr')
   }
 
   add_subcmd(:zsh) {