hiiro 0.1.369 → 0.1.371

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3565b794ff2dd7e61d45810479a5bed58621c54ac4e3afa51f12adeb9626c639
-  data.tar.gz: 75073d800fee5ab0185eea6062b39961b7f68c4200a1f428f8ac72f090edabd5
+  metadata.gz: 4910c0070a20706820a27abe45f728d8751da4d9d2297cacd05d26836c96dce1
+  data.tar.gz: 3173f0e134ef9353383405aff0dfd72ebe502a72ec3a2f149000dd6d221e6116
 SHA512:
-  metadata.gz: 9435184f96a4b71ea43ecb873180411326aaf5ebb866153748be8f9e5fdbe7605d92c71df4506498029772f510374e91034ce74748663a9d1b4de8ff264d5c17
-  data.tar.gz: 8a8a5539086877c051ce05639fdb2c72a626c88d92284981c551fff2a3b6a8d6e048250d969b6fedb4e811c720da0a4c58a1e6aa97dddebeba1a478f1c26194e
+  metadata.gz: e0fb10ffa72f026a25c0cba9ebe6f926f7d6c7504ea1d51f729519feed61918cba7fb2cf0da814c322f787c90ec532b667ea22c9e2c3bbfacb414758fb30cbc8
+  data.tar.gz: 5192581c3c17c73e5d7781f3cfd736e16678d89be171ca1676dfedd7e49c53e007bef1efe5b1f80bf61e827113fad82b07206564ce9779ccc97a1cbec28f4449

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## [Unreleased]
 
+## [0.1.371] - 2026-09-14
+
+### Added
+- `t ls` lists the panes under every open workspace with directory, agent state, and foreground command via `herdr pane process-info`; `t switch` accepts an exact pane ID and its picker includes panes
+- `Hiiro::Herdr#process_info` and `Pane#foreground_command`
+
+## [0.1.370] - 2026-09-14
+
+### Added
+- `t ls` marks tasks with an open Herdr workspace with `@` and lists workspaces that belong to no task
+
 ## [0.1.369] - 2026-09-14
 
 ### Added

data/docs/t.md

@@ -29,7 +29,7 @@ Task names may be `parent/child` for subtasks. `t new NAME` creates exactly `NAM
 
 | Command | Behavior |
 |---|---|
-| `t`, `t ls`, `t list` | Lists all tasks alphabetically with open todo counts, e.g. `prez (3)`, plus `next:` and `waiting:` text |
+| `t`, `t ls`, `t list` | Lists all tasks alphabetically with open todo counts, e.g. `prez (3)`, plus `next:` and `waiting:` text. When Herdr is running, tasks whose workspace is open get an `@` marker, every open workspace lists its panes as `ID  ~/dir  agent (status)  command` (from `herdr pane process-info`), and live workspaces that belong to no task are listed afterwards with their IDs |
 | `t show [TASK]` | Status, home, next action, waiting text, code directory, workspace label, resources, documents, and todos |
 | `t current [TASK]` | Prints the resolved task name; never saves |
 | `t use TASK` (alias `pin`) | Saves TASK as the fallback for when no workspace or directory identifies a task |
@@ -112,7 +112,7 @@ t pane run [TASK] ID|LABEL [--] COMMAND...
 t pane split [TASK] ID|LABEL [--direction right|down] [--directory PATH] [--command COMMAND]
 ```
 
-These require a running Herdr server. The workspace label is the task session or name with `.` replaced by `_`. `switch` also accepts the name of a live Herdr workspace that belongs to no task, exactly or by unique prefix, and focuses it; a task with the same name wins. When the name is ambiguous, or no task or context is given, a terminal gets a fuzzy finder over tasks and loose workspaces, with duplicate workspace names numbered in the label only. `switch` focuses the existing task workspace or creates it in the start directory (`--directory`, else primary directory, worktree, or home), and saves the task as the fallback when it was named explicitly. `--show` only prints the workspace, tabs, and panes. Tab and pane references match a live ID or label, then a unique prefix; with no reference and several candidates a fuzzy finder opens.
+These require a running Herdr server. The workspace label is the task session or name with `.` replaced by `_`. `switch` also accepts the name of a live Herdr workspace that belongs to no task, exactly or by unique prefix, and focuses it; a task with the same name wins. An exact pane ID such as `w6:p2` focuses that pane, and the picker lists every live pane with its directory and foreground command. When the name is ambiguous, or no task or context is given, a terminal gets a fuzzy finder over tasks and loose workspaces, with duplicate workspace names numbered in the label only. `switch` focuses the existing task workspace or creates it in the start directory (`--directory`, else primary directory, worktree, or home), and saves the task as the fallback when it was named explicitly. `--show` only prints the workspace, tabs, and panes. Tab and pane references match a live ID or label, then a unique prefix; with no reference and several candidates a fuzzy finder opens.
 
 ## Native AI sessions
 

data/lib/hiiro/herdr.rb

@@ -204,6 +204,19 @@ class Hiiro
       def to_s
         "#{id} #{name} [#{workspace_id} / #{tab_id}]#{focused? ? ' *' : ''}"
       end
+
+      # `herdr pane process-info` for this pane, fetched once.
+      def process_info
+        @process_info ||= client.process_info(id)
+      end
+
+      # Command line of the foreground process group leader, or nil at a shell prompt.
+      def foreground_command
+        procs = process_info['foreground_processes'] || []
+        leader = procs.find { |proc| proc['pid'] == process_info['foreground_process_group_id'] } || procs.last
+        return nil if leader.nil? || leader['pid'] == process_info['shell_pid']
+        leader['cmdline']
+      end
     end
 
     class Panes < Collection
@@ -319,6 +332,10 @@ class Hiiro
       row && Tab.new(row, client: self)
     end
 
+    def process_info(pane_id)
+      capture_result('pane', 'process-info', '--pane', pane_id).fetch('process_info', {})
+    end
+
     def get_pane(id)
       row = capture_result('pane', 'get', id)['pane']
       row && Pane.new(row, client: self, rect: pane_rect(id))

data/lib/hiiro/task_cli.rb

@@ -40,7 +40,6 @@ class Hiiro
         add_flag :find, short: :f, desc: 'Choose the task with a fuzzy finder'
       end
 
-      # Exact name, else unique prefix; ambiguous prefixes fail; nil when nothing matches.
       # Exact name, else unique prefix. An ambiguous prefix opens the fuzzy finder
       # over the candidates on a TTY and fails otherwise. nil when nothing matches.
       def lookup_task(reference)
@@ -180,24 +179,73 @@ class Hiiro
           end
       end
 
+      # Live Herdr workspaces, or [] when Herdr is not running.
+      def live_workspaces
+        herdr_client.server_running? ? client.workspaces.to_a : []
+      rescue Hiiro::Error
+        []
+      end
+
+      # All live panes grouped by workspace id, or {} when Herdr is not running.
+      def live_panes
+        @live_panes ||= begin
+          herdr_client.server_running? ? client.panes(all: true).to_a.group_by(&:workspace_id) : {}
+        rescue Hiiro::Error
+          {}
+        end
+      end
+
+      # "ID  ~/dir  agent (status)  command line" for listings and pickers.
+      def pane_line(pane)
+        dir = (pane.foreground_cwd || pane.cwd).to_s.sub(/\A#{Regexp.escape(Dir.home)}(?=\/|\z)/, '~')
+        what = []
+        what << "#{pane.agent}#{pane.agent_status ? " (#{pane.agent_status})" : ''}" if pane.agent
+        what << (pane.foreground_command || (pane.agent ? nil : 'shell'))
+        [pane.id, dir, *what.compact].reject(&:empty?).join('  ')
+      end
+
+      def print_panes(workspace_id, indent: '    ')
+        live_panes.fetch(workspace_id, []).each { |pane| puts "#{indent}#{pane_line(pane)}" }
+      end
+
+      # Tasks with open todo counts, an @ marker when the task workspace is open,
+      # then any live Herdr workspaces that belong to no task. Panes are listed
+      # under every open workspace with their directory and foreground command.
       def list_tasks
         tasks = Hiiro::TaskRecord.all_as_list
-        if tasks.empty?
+        workspaces = live_workspaces
+        labels = tasks.map { |task| workspace_label(task) }
+        open_labels = workspaces.map(&:name)
+        loose = workspaces.reject { |workspace| labels.include?(workspace.name) }
+        if tasks.empty? && loose.empty?
           puts 'No tasks. Create one with t new NAME.'
           return
         end
         counts = open_todo_counts
+        attached = tasks.any? { |task| open_labels.include?(workspace_label(task)) }
         rows = tasks.map do |task|
           count = counts[task.name]
           label = count.zero? ? task.name : "#{task.name} (#{count})"
+          label = "#{open_labels.include?(workspace_label(task)) ? '@' : ' '} #{label}" if attached
           detail = []
           detail << "next: #{task.next_action}" if task.next_action
           detail << "waiting: #{task.waiting_on}" if task.waiting_on
           [label, task.task_status, detail.join('  ')]
         end
-        name_col = rows.map { |row| row[0].length }.max
-        status_col = rows.map { |row| row[1].length }.max
-        rows.each { |label, status, detail| puts format("%-#{name_col}s  %-#{status_col}s  %s", label, status, detail).rstrip }
+        name_col = rows.map { |row| row[0].length }.max || 0
+        status_col = rows.map { |row| row[1].length }.max || 0
+        rows.each_with_index do |(label, status, detail), index|
+          puts format("%-#{name_col}s  %-#{status_col}s  %s", label, status, detail).rstrip
+          workspace = workspaces.find { |candidate| candidate.name == workspace_label(tasks[index]) }
+          print_panes(workspace.id) if workspace
+        end
+        return if loose.empty?
+        puts unless rows.empty?
+        puts 'Workspaces without a task:'
+        loose.each do |workspace|
+          puts "  #{workspace.name}  #{workspace.id}"
+          print_panes(workspace.id)
+        end
       end
 
 
@@ -467,10 +515,11 @@ class Hiiro
         client.workspaces.reject { |workspace| labels.include?(workspace.name) }
       end
 
-      # Fuzzy map over tasks and loose workspaces; duplicate workspace names are numbered
-      # in the label only, so the choice still maps to the exact workspace.
-      def pick_switch_target(tasks, workspaces)
-        raise Error, 'No tasks or workspaces to choose from' if tasks.empty? && workspaces.empty?
+      # Fuzzy map over tasks, loose workspaces, and live panes; duplicate workspace
+      # names are numbered in the label only, so the choice still maps to the exact one.
+      def pick_switch_target(tasks, workspaces, panes: nil)
+        panes = live_panes.values.flatten if panes.nil?
+        raise Error, 'No tasks, workspaces, or panes to choose from' if tasks.empty? && workspaces.empty? && panes.empty?
         counts = workspaces.group_by(&:name).transform_values(&:length)
         seen = Hash.new(0)
         map = tasks.to_h { |task| [task.name, task] }
@@ -479,9 +528,16 @@ class Hiiro
           label = counts[workspace.name] > 1 ? "#{workspace.name} ##{seen[workspace.name]}" : workspace.name
           map["#{label} (workspace)"] = workspace
         end
+        panes.each { |pane| map["#{pane_line(pane)} (pane)"] = pane }
         fuzzyfind_from_map(map) || raise(Error, 'Nothing selected')
       end
 
+      def focus_pane_target(pane)
+        check_result(client.focus_workspace(pane.workspace_id))
+        check_result(client.focus_pane(pane.id), "Could not focus pane #{pane.id}")
+        puts pane_line(pane)
+      end
+
       # [target, explicit]. A task wins over a workspace with the same name.
       def switch_target(args)
         args = args.dup
@@ -495,6 +551,8 @@ class Hiiro
           workspaces = loose_workspaces
           exact = tasks.find { |task| task.name == first }
           return [exact, true] if exact
+          pane = live_panes.values.flatten.find { |candidate| candidate.id == first }
+          return [pane, false] if pane
           exact_ws = workspaces.select { |workspace| workspace.name == first }
           return [exact_ws.first, false] if exact_ws.one?
           task_matches = tasks.select { |task| task.name.start_with?(first) }
@@ -504,7 +562,7 @@ class Hiiro
           raise Error, "No task or workspace matches #{first}" if task_matches.empty? && ws_matches.empty?
           names = (task_matches.map(&:name) + ws_matches.map { |w| "#{w.name} (workspace)" }).join(', ')
           raise Error, "Ambiguous #{first}: #{names}" unless $stdin.tty?
-          target = pick_switch_target(task_matches, ws_matches)
+          target = pick_switch_target(task_matches, ws_matches, panes: [])
           return [target, target.is_a?(Hiiro::TaskRecord)]
         end
         args.shift if first == '.'
@@ -738,7 +796,10 @@ class Hiiro
         add_option :directory, desc: 'Existing start directory'
         add_cmd(:switch, :workspace, args: ['task-or-workspace?'], opts: [*TASK_OPTIONS, :directory, :show]) do
           target, explicit = switch_target(opts.args)
-          if target.is_a?(Hiiro::Herdr::Workspace)
+          if target.is_a?(Hiiro::Herdr::Pane)
+            raise Error, '--show applies to task workspaces' if opts.show
+            focus_pane_target(target)
+          elsif target.is_a?(Hiiro::Herdr::Workspace)
             raise Error, '--show applies to task workspaces' if opts.show
             check_result(client.focus_workspace(target.id))
             puts target

data/lib/hiiro/version.rb

@@ -1,4 +1,4 @@
 class Hiiro
-  VERSION = "0.1.369"
+  VERSION = "0.1.371"
   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.369
+  version: 0.1.371
 platform: ruby
 authors:
 - Joshua Toyota