hiiro 0.1.205 → 0.1.207

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ef86ef100b4a6168747547e00aefcfdb7b623d5a3e48111842bf225a984e17c
-  data.tar.gz: 6fd3e91d5cf8d24eaa4c4fdda364fd85b0bce27bd5a3a96a3274116ed88c8759
+  metadata.gz: 052c2d9a3c7a88df4edd8a75173aabe9148b6102774402aaa7b07597afe91326
+  data.tar.gz: 32afdbc0de57463c5a0714558f2abca31b96ff43873623baac008b8681d21db2
 SHA512:
-  metadata.gz: 4a68cf14bc2e0272aa2a8d49361a40f9f77427176aa19998400c84c8cc08c9b26ae53ff356da2ec4627ef6fc5f0d4de8e1c4b4b3ad61025d47d5a4b01354c48b
-  data.tar.gz: 267eb4c6d06fedcc0c85afe0663929e9936bfa7be7cd28078e543d9f4edc385d41f24d6c5ba38d09ad84c70351aeca8dd4dfb67b45bd8fbdd0d4358f5ddf8b22
+  metadata.gz: 69f92f2bc0fd2ec8931121c528b8aa81a5336124e81071f79075760fb7afe37216c8c270f0ccaed771b3caf2e048ec2628c09110be2497ea7d7ece1bdb3ce60d
+  data.tar.gz: 0634315a52af0fa1de48d66af87d068d003d4eedddffc083fcac9a8df9fb9c58d4d7a51d6a1787d19821990b69dce8bafef6edb8859fda1215cc7cbd4d2ce773

data/lib/hiiro/queue.rb

@@ -146,6 +146,7 @@ class Hiiro
           working_dir = tree.path if tree
         elsif prompt_obj.session
           target_session = prompt_obj.session.name
+          working_dir = prompt_obj.session.path || working_dir
         end
 
         if prompt_obj.tree
@@ -508,9 +509,16 @@ class Hiiro
           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')
           end
           args = opts.args
           ti = q.resolve_task_info(opts, h, task_info)
+
+          if opts.session
+            session_name = h.tmux_client.current_session&.name
+            ti = (ti || {}).merge(session_name: session_name) if session_name
+          end
+
           name = args.first
 
           if name.nil?
@@ -661,12 +669,7 @@ class Hiiro
       end
 
       def tree_name
-        doc.front_matter['tree_name'].tap do |tname|
-          puts tree_name: tname
-          puts task_tree: task&.tree
-          puts task_tree_name: task&.tree_name
-          puts task_tree_path: task&.tree&.path
-        end
+        doc.front_matter['tree_name']
       end
 
       def session_name

data/lib/hiiro/tasks.rb

@@ -185,7 +185,7 @@ class Hiiro
       puts "#{label}:"
       puts
 
-      client_map = TmuxSession.client_map
+      client_map = Hiiro::Tmux::Session.client_map
 
       # Collect rows as {prefix, name, tree, branch, session} so we can
       # compute max column widths before rendering.
@@ -876,43 +876,6 @@ class Hiiro
     end
   end
 
-  class TmuxSession
-    attr_reader :name
-
-    def self.current
-      name = Hiiro::Tmux::Session.current&.name
-      return nil unless name
-      new(name)
-    end
-
-    def self.all
-      output = `tmux list-sessions -F '#S' 2>/dev/null`
-      output.lines(chomp: true).map { |name| new(name) }
-    end
-
-    # Returns { session_name => "ttysXXX" } for sessions with attached clients.
-    # The tty identifies which terminal tab (e.g. Ghostty tab) the client is in.
-    def self.client_map
-      output = `tmux list-clients -F '\#{client_tty}|\#{session_name}' 2>/dev/null`
-      output.lines(chomp: true).each_with_object({}) do |line, map|
-        tty, session = line.split('|', 2)
-        map[session] ||= tty.delete_prefix('/dev/')
-      end
-    end
-
-    def initialize(name)
-      @name = name
-    end
-
-    def ==(other)
-      other.is_a?(TmuxSession) && name == other.name
-    end
-
-    def to_s
-      name
-    end
-  end
-
   class Tree
     attr_reader :path, :head, :branch
 
@@ -1060,7 +1023,7 @@ class Hiiro
     end
 
     def all_sessions
-      @all_sessions ||= TmuxSession.all
+      @all_sessions ||= Hiiro::Tmux::Session.all
     end
 
     def all_trees
@@ -1099,7 +1062,7 @@ class Hiiro
     end
 
     def session
-      @session ||= TmuxSession.current
+      @session ||= Hiiro::Tmux::Session.current
     end
 
     def tree

data/lib/hiiro/tmux/session.rb

@@ -1,17 +1,17 @@
 class Hiiro
   class Tmux
     class Session
-      FORMAT = '#{session_id}|#{session_name}|#{session_windows}|#{session_attached}|#{session_created}|#{session_last_attached}'
+      FORMAT = '#{session_id}|#{session_name}|#{session_windows}|#{session_attached}|#{session_created}|#{session_last_attached}|#{session_path}'
 
-      attr_reader :id, :name, :windows, :created, :last_attached
+      attr_reader :id, :name, :windows, :created, :last_attached, :path
 
       def self.from_format_line(line)
         return nil if line.nil? || line.strip.empty?
 
-        parts = line.strip.split('|', 6)
+        parts = line.strip.split('|', 7)
         return nil if parts.size < 4
 
-        id, name, windows, attached, created, last_attached = parts
+        id, name, windows, attached, created, last_attached, path = parts
 
         new(
           id: id,
@@ -19,7 +19,8 @@ class Hiiro
           windows: windows.to_i,
           attached: attached == '1',
           created: created.to_i,
-          last_attached: last_attached.to_i
+          last_attached: last_attached.to_i,
+          path: path
         )
       end
 
@@ -30,13 +31,33 @@ class Hiiro
         from_format_line(output)
       end
 
-      def initialize(id:, name:, windows: 0, attached: false, created: 0, last_attached: 0)
+      def self.all
+        output = `tmux list-sessions -F '#{FORMAT}' 2>/dev/null`
+        return [] if output.nil? || output.empty?
+
+        output.each_line.map { |line| from_format_line(line) }.compact
+      end
+
+      def self.client_map
+        output = `tmux list-clients -F '\#{client_tty}|\#{session_name}' 2>/dev/null`
+        output.lines(chomp: true).each_with_object({}) do |line, map|
+          tty, session_name = line.split('|', 2)
+          map[session_name] ||= tty.delete_prefix('/dev/')
+        end
+      end
+
+      def initialize(id:, name:, windows: 0, attached: false, created: 0, last_attached: 0, path: nil)
         @id = id
         @name = name
         @windows = windows
         @attached = attached
         @created = created
         @last_attached = last_attached
+        @path = path
+      end
+
+      def ==(other)
+        other.is_a?(Session) && name == other.name
       end
 
       def attached?
@@ -74,7 +95,8 @@ class Hiiro
           windows: windows,
           attached: attached?,
           created: created,
-          last_attached: last_attached
+          last_attached: last_attached,
+          path: path
         }.compact
       end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.205"
+  VERSION = "0.1.207"
 end

metadata

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