hiiro 0.1.179 → 0.1.180

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6333d158a119c0231a4e5087b32c0a8c4fec56d25cfe2c513e4941c1d2ca9e
-  data.tar.gz: 36aa8f6219a0f424671974008389f554490669e0da7e72d20b5c6854d2086153
+  metadata.gz: f20a871c83c5a99f070239f734a5b03bff64f88229f16292cee6b80618a7b6c1
+  data.tar.gz: 713f2256fb0378a9de8b1888c0e2a1a2e945a7fef7746fc8b5b3b9061ac11ff6
 SHA512:
-  metadata.gz: 123dbebf89e634a3be0555298b186383345d98a3eb57da5c69c4037d2517aa8a709995979649e88d6bd581a930908ed8cfabed68e19a9f93a2cbe0822b1ab41c
-  data.tar.gz: 8815f9e6a37b1c19360cb948d68ae1baf8241a5e220c32c32134d849adca07dbdbccf4c3d1b61b13741c8765b6275cec4422af10c1f62ced875a2a77530ba0c5
+  metadata.gz: 8768803a7e31dda94c85e6ed0cc60c88ff1cee45a635bf7cc7530b4c52f804077f37006ed4cf5d228ce70c8069039a1a8f947232124b180131445f59dc513b22
+  data.tar.gz: 00d19f60ce67545fa54d5cb7cc1ac9eab52216b358c4e68f3d1b66fbcfb1fd879bcd29370509d6571d4b90b135708c154933b8057f6c024163d0fd001d595d54

data/lib/hiiro/tasks.rb

@@ -351,15 +351,29 @@ class Hiiro
       else
         environment.all_tasks.sort_by(&:name)
       end
-      return nil if task_list.empty?
 
-      mapping = task_list.each_with_object({}) do |task, h|
+      mapping = {}
+
+      task_list.each do |task|
         display_name = scope == :subtask ? task.short_name : task.name
         line = task.display_line(scope: scope, environment: environment)
-        h[line] = display_name
+        mapping[line] = { type: :task, name: display_name }
       end
 
-      hiiro.fuzzyfind_from_map(mapping)
+      # Add non-task tmux sessions (exclude sessions that belong to tasks)
+      if scope == :task
+        task_session_names = environment.all_tasks.map(&:session_name)
+        extra_sessions = environment.all_sessions.reject { |s| task_session_names.include?(s.name) }
+        extra_sessions.sort_by(&:name).each do |session|
+          line = format("%-25s  (tmux session)", session.name)
+          mapping[line] = { type: :session, name: session.name }
+        end
+      end
+
+      return nil if mapping.empty?
+
+      selected = hiiro.fuzzyfind_from_map(mapping)
+      selected
     end
 
     def value_for_task(task_name = nil, &block)
@@ -559,10 +573,34 @@ class Hiiro
 
         h.add_subcmd(:switch) do |task_name=nil, app_name=nil|
           if task_name.nil?
-            task_name = tm.select_task_interactive
-            next unless task_name
+            selected = tm.select_task_interactive
+            next unless selected
+
+            if selected.is_a?(Hash)
+              if selected[:type] == :session
+                h.start_tmux_session(selected[:name])
+                puts "Switched to session '#{selected[:name]}'"
+                next
+              else
+                task_name = selected[:name]
+              end
+            else
+              task_name = selected
+            end
           end
+
           task = tm.task_by_name(task_name)
+
+          # If no task found, check for a matching tmux session
+          unless task
+            session = tm.environment.find_session(task_name)
+            if session
+              h.start_tmux_session(session.name)
+              puts "Switched to session '#{session.name}'"
+              next
+            end
+          end
+
           tm.switch_to_task(task, app_name: app_name)
         end
 

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.179"
+  VERSION = "0.1.180"
 end

metadata

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