hiiro 0.1.29 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb0956fd77df5e3e941a772cedc2fb51376f7be1adb7ce40b217d73a300d058
-  data.tar.gz: 9436e79dae25ae352dcadfbea5e3dcaf1e3be6d435fc4ea5823b71e7425fc739
+  metadata.gz: f9acf06495590129ec1870e030280f89addc30177e768c360aa8e6891d69ece7
+  data.tar.gz: afdc44652ae0ea1efbc107f8bd4b972c88477f07cf247665a66104859f49a0c2
 SHA512:
-  metadata.gz: 3b84f6e8bb918e7029af357a84bf4debe20a2467e9be85d77ea5e931e1b8ac64097c45b9d29b88e8db6514b7303798ef051adcb88144ff7e534c6ab0b2f4bbab
-  data.tar.gz: d901ce7695933da9452d7a08cd95cdf28b706af8e46c34eb68dbc0d4500ce7a8b4d0a479fe5b58e8201afe55131b6aa6249d682ef166632a819e11a878440b5a
+  metadata.gz: 74d7b72bcb20c9cfdde0ef7c63d02d270f6f95fd05510fb5ff25f0543c4830f15418718f693fce532c8388f9c9a80851a9d13969646d75b187119f08d3d9cd64
+  data.tar.gz: 5f00c18b9bf9c47f8063a37dd6984bcbf97d7bdc4d06f06d918e1aa93aa48c316a14fd76301c56e029eafab2acacbc163f3e50c040b6d85f64217611554a56ae

data/bin/h-subtask

@@ -16,7 +16,7 @@ hiiro.add_subcmd(:edit) { system(ENV['EDITOR'] || 'nvim', __FILE__) }
 hiiro.add_subcmd(:list) { tasks.list_subtasks }
 hiiro.add_subcmd(:ls) { tasks.list_subtasks }
 hiiro.add_subcmd(:new) { |subtask_name| tasks.new_subtask(subtask_name) }
-hiiro.add_subcmd(:switch) { |subtask_name| tasks.switch_subtask(subtask_name) }
+hiiro.add_subcmd(:switch) { |subtask_name=nil| tasks.switch_subtask(subtask_name) }
 hiiro.add_subcmd(:app) { |app_name| tasks.subtask_open_app(app_name) }
 hiiro.add_subcmd(:path) { |app_name=nil| tasks.subtask_app_path(app_name) }
 hiiro.add_subcmd(:cd) { |*args| tasks.subtask_cd_app(*args) }

data/bin/h-task

@@ -44,23 +44,55 @@ class TaskManager
     active, available = trees.partition { |tree_name| task_for_tree(tree_name) }
     sessions = tmux_sessions
 
+    # Group active trees by parent task
+    groups = {}
     active.each do |tree_name|
       task = task_for_tree(tree_name)
-      marker = (current && current[:tree] == tree_name) ? "*" : " "
-
-      # Check if there's a tmux session for this task
-      session_name = session_name_for(task)
-      has_session = sessions.include?(session_name)
-      session_marker = has_session ? "+" : " "
-      session_info = has_session ? " (#{session_name})" : ""
-
-      puts format("%s%s %-20s => %s%s", marker, session_marker, tree_name, task, session_info)
+      parent = task.include?('/') ? task.split('/').first : task
+      groups[parent] ||= []
+      groups[parent] << { tree: tree_name, task: task }
+    end
+
+    first_group = true
+    groups.each do |parent, entries|
+      puts unless first_group
+      first_group = false
+
+      # Sort so the main entry (parent itself or parent/main) comes first
+      entries.sort_by! { |e| e[:task] == parent || e[:task].end_with?('/main') ? 0 : 1 }
+
+      entries.each_with_index do |entry, i|
+        tree_name = entry[:tree]
+        task = entry[:task]
+        marker = (current && current[:tree] == tree_name) ? "*" : " "
+        branch = worktree_branch(tree_name)
+        branch_str = branch ? "  [#{branch}]" : ""
+
+        # Check if there's a tmux session for this task
+        session_name = session_name_for(task)
+        has_session = sessions.include?(session_name)
+        session_marker = has_session ? "+" : " "
+
+        if i == 0
+          # Parent task line
+          display_name = parent
+          puts format("%s%s %s%s", marker, session_marker, display_name, branch_str)
+        else
+          # Subtask line: align /child_name under the parent name
+          child_name = task.include?('/') ? task.split('/', 2).last : task
+          padding = " " * parent.length
+          puts format("%s%s %s/%s%s", marker, session_marker, padding, child_name, branch_str)
+        end
+      end
     end
 
-    puts if active.any? && available.any?
-
-    available.each do |tree_name|
-      puts format("   %-20s    (available)", tree_name)
+    if available.any?
+      puts
+      available.each do |tree_name|
+        branch = worktree_branch(tree_name)
+        branch_str = branch ? "  [#{branch}]" : ""
+        puts format("   %-20s  (available)%s", tree_name, branch_str)
+      end
     end
 
     # List tmux sessions without associated tasks
@@ -415,11 +447,11 @@ class TaskManager
     worktree_info.keys.sort
   end
 
-  # Parse git worktree list output into { name => path } hash
-  def worktree_info
-    @worktree_info ||= begin
+  # Parse git worktree list output into { name => { path:, branch: } } hash
+  def worktree_details
+    @worktree_details ||= begin
       output = `git -C #{main_repo_path} worktree list --porcelain 2>/dev/null`
-      info = {}
+      details = {}
       current_path = nil
 
       work_dir = File.join(Dir.home, 'work')
@@ -433,6 +465,12 @@ class TaskManager
           # Skip bare repo
           current_path = nil
         elsif line.start_with?('branch ') || line == 'detached'
+          branch = if line.start_with?('branch ')
+            line.sub('branch refs/heads/', '')
+          else
+            '(detached)'
+          end
+
           # Capture worktree (both named branches and detached HEAD)
           if current_path && current_path != main_repo_path
             # Use relative path from ~/work/ to support nested worktrees
@@ -442,17 +480,28 @@ class TaskManager
             else
               File.basename(current_path)
             end
-            info[name] = current_path
+            details[name] = { path: current_path, branch: branch }
           end
           current_path = nil
         end
       end
 
-      info
+      details
     end
   end
 
+  # Backward-compatible { name => path } hash
+  def worktree_info
+    @worktree_info ||= worktree_details.transform_values { |v| v[:path] }
+  end
+
+  # Get branch name for a worktree
+  def worktree_branch(tree_name)
+    worktree_details.dig(tree_name, :branch)
+  end
+
   def clear_worktree_cache
+    @worktree_details = nil
     @worktree_info = nil
   end
 
@@ -701,8 +750,8 @@ class TaskManager
 
   # Migrate flat worktrees (~/work/task) to nested (~/work/task/main)
   def migrate_worktrees
-    # Find flat worktrees that need migration (not already nested, not reserved)
-    flat_trees = trees.reject { |name| name.include?('/') || RESERVED_WORKTREES.key?(name) }
+    # Find flat worktrees that need migration (not already nested)
+    flat_trees = trees.reject { |name| name.include?('/') }
 
     if flat_trees.empty?
       puts "No flat worktrees to migrate."
@@ -751,7 +800,7 @@ class TaskManager
         data = load_assignments
         data.delete(name)
         data[new_tree_name] = task
-        save_assignments(RESERVED_WORKTREES.merge(data))
+        save_assignments(data)
       end
 
       # Step 4: Update task metadata

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.29"
+  VERSION = "0.1.31"
 end

data/plugins/task.rb

@@ -58,6 +58,8 @@ module Task
         tasks.new_subtask(subtask_name)
       in ['subtask', 'switch', subtask_name]
         tasks.switch_subtask(subtask_name)
+      in ['subtask', 'switch']
+        tasks.switch_subtask
       in [subcmd, *sargs]
         match = runner_map.keys.find { |full_subcmd| full_subcmd.to_s.start_with?(subcmd) }
 
@@ -119,16 +121,50 @@ module Task
       current = current_task
       active, available = trees.partition { |tree_name| task_for_tree(tree_name) }
 
+      # Group active trees by parent task
+      groups = {}
       active.each do |tree_name|
         task = task_for_tree(tree_name)
-        marker = (current && current[:tree] == tree_name) ? "*" : " "
-        puts format("%s %-20s => %s", marker, tree_name, task)
+        parent = task.include?('/') ? task.split('/').first : task
+        groups[parent] ||= []
+        groups[parent] << { tree: tree_name, task: task }
       end
 
-      puts if active.any? && available.any?
+      first_group = true
+      groups.each do |parent, entries|
+        puts unless first_group
+        first_group = false
+
+        # Sort so the main entry (parent itself or parent/main) comes first
+        entries.sort_by! { |e| e[:task] == parent || e[:task].end_with?('/main') ? 0 : 1 }
+
+        entries.each_with_index do |entry, i|
+          tree_name = entry[:tree]
+          task = entry[:task]
+          marker = (current && current[:tree] == tree_name) ? "*" : " "
+          branch = worktree_branch(tree_name)
+          branch_str = branch ? "  [#{branch}]" : ""
+
+          if i == 0
+            # Parent task line
+            display_name = parent
+            puts format("%s %s%s", marker, display_name, branch_str)
+          else
+            # Subtask line: align /child_name under the parent name
+            child_name = task.include?('/') ? task.split('/', 2).last : task
+            padding = " " * parent.length
+            puts format("%s %s/%s%s", marker, padding, child_name, branch_str)
+          end
+        end
+      end
 
-      available.each do |tree_name|
-        puts format("  %-20s    (available)", tree_name)
+      if available.any?
+        puts
+        available.each do |tree_name|
+          branch = worktree_branch(tree_name)
+          branch_str = branch ? "  [#{branch}]" : ""
+          puts format("  %-20s  (available)%s", tree_name, branch_str)
+        end
       end
     end
 
@@ -395,6 +431,8 @@ module Task
         list_subtasks
       in ['new', subtask_name]
         new_subtask(subtask_name)
+      in ['switch']
+        switch_subtask
       in ['switch', subtask_name]
         switch_subtask(subtask_name)
       in ['app', app_name]
@@ -437,22 +475,27 @@ module Task
       end
       subtasks = subtasks_for_task(parent_task)
 
-      if subtasks.empty?
-        puts "No subtasks for task '#{parent_task}'."
-        puts
-        puts "Create one with 'h subtask new SUBTASK_NAME'"
-        return
-      end
-
       puts "Subtasks for '#{parent_task}':"
       puts
+
+      # Always show the parent (main) task first
+      parent_tree = tree_for_task(parent_task)
+      current_tree = current[:tree]
+      parent_marker = (parent_tree && parent_tree == current_tree) ? "*" : " "
+      parent_branch = worktree_branch(parent_tree) if parent_tree
+      branch_info = parent_branch ? "  branch: #{parent_branch}" : ""
+      puts format("%s %-25s  tree: %-15s%s", parent_marker, "(main)", parent_tree || '(none)', branch_info)
+
       subtasks.each do |subtask|
-        marker = subtask['active'] ? "*" : " "
-        puts format("%s %-25s  tree: %-15s  created: %s",
+        marker = (subtask['worktree'] == current_tree) ? "*" : " "
+        st_branch = worktree_branch(subtask['worktree']) if subtask['worktree']
+        st_branch_info = st_branch ? "  branch: #{st_branch}" : ""
+        puts format("%s %-25s  tree: %-15s  created: %s%s",
           marker,
           subtask['name'],
           subtask['worktree'] || '(none)',
-          subtask['created_at']&.split('T')&.first || '?'
+          subtask['created_at']&.split('T')&.first || '?',
+          st_branch_info
         )
       end
     end
@@ -519,7 +562,7 @@ module Task
       true
     end
 
-    def switch_subtask(subtask_name)
+    def switch_subtask(subtask_name = nil)
       current = current_task
       unless current
         puts "ERROR: Not currently in a task session"
@@ -533,6 +576,41 @@ module Task
         parent_task = parent_task.split('/').first
       end
 
+      # If no subtask name, use interactive selection
+      if subtask_name.nil? || subtask_name.empty?
+        subtask_name = select_subtask_interactive(parent_task)
+        return false unless subtask_name
+      end
+
+      # Switch to parent task if "main" or "parent"
+      if subtask_name == 'main' || subtask_name == 'parent'
+        session_name = session_name_for(parent_task)
+        tree_name = tree_for_task(parent_task)
+
+        unless tree_name
+          puts "ERROR: Parent task '#{parent_task}' has no worktree"
+          return false
+        end
+
+        session_exists = system('tmux', 'has-session', '-t', session_name, err: File::NULL)
+
+        if session_exists
+          hiiro.start_tmux_session(session_name)
+        else
+          path = tree_path(tree_name)
+          if Dir.exist?(path)
+            Dir.chdir(path)
+            hiiro.start_tmux_session(session_name)
+          else
+            puts "ERROR: Worktree path '#{path}' does not exist"
+            return false
+          end
+        end
+
+        puts "Switched to parent task '#{parent_task}'"
+        return true
+      end
+
       subtask = find_subtask(parent_task, subtask_name)
       unless subtask
         puts "Subtask '#{subtask_name}' not found for task '#{parent_task}'"
@@ -565,6 +643,36 @@ module Task
       true
     end
 
+    # Interactive subtask selection using sk
+    def select_subtask_interactive(parent_task)
+      subtasks = subtasks_for_task(parent_task)
+      parent_tree = tree_for_task(parent_task)
+
+      # Build selection lines: include parent (main) and all subtasks
+      lines = []
+      lines << "(main)" if parent_tree
+      subtasks.each do |subtask|
+        next unless subtask['active']
+        lines << subtask['name']
+      end
+
+      if lines.empty?
+        puts "No subtasks to switch to."
+        return nil
+      end
+
+      require 'open3'
+      selected, status = Open3.capture2('sk', stdin_data: lines.join("\n"))
+
+      if status.success? && !selected.strip.empty?
+        choice = selected.strip
+        return 'main' if choice == '(main)'
+        return choice
+      end
+
+      nil
+    end
+
     # Show status for the current subtask
     def subtask_status
       current = current_task
@@ -774,11 +882,11 @@ module Task
       worktree_info.keys.sort
     end
 
-    # Parse git worktree list output into { name => path } hash
-    def worktree_info
-      @worktree_info ||= begin
+    # Parse git worktree list output into { name => { path:, branch: } } hash
+    def worktree_details
+      @worktree_details ||= begin
         output = `git -C #{main_repo_path} worktree list --porcelain 2>/dev/null`
-        info = {}
+        details = {}
         current_path = nil
 
         work_dir = File.join(Dir.home, 'work')
@@ -792,6 +900,12 @@ module Task
             # Skip bare repo
             current_path = nil
           elsif line.start_with?('branch ') || line == 'detached'
+            branch = if line.start_with?('branch ')
+              line.sub('branch refs/heads/', '')
+            else
+              '(detached)'
+            end
+
             # Capture worktree (both named branches and detached HEAD)
             if current_path && current_path != main_repo_path
               # Use relative path from ~/work/ to support nested worktrees
@@ -801,17 +915,28 @@ module Task
               else
                 File.basename(current_path)
               end
-              info[name] = current_path
+              details[name] = { path: current_path, branch: branch }
             end
             current_path = nil
           end
         end
 
-        info
+        details
       end
     end
 
+    # Backward-compatible { name => path } hash
+    def worktree_info
+      @worktree_info ||= worktree_details.transform_values { |v| v[:path] }
+    end
+
+    # Get branch name for a worktree
+    def worktree_branch(tree_name)
+      worktree_details.dig(tree_name, :branch)
+    end
+
     def clear_worktree_cache
+      @worktree_details = nil
       @worktree_info = nil
     end
 

metadata

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