hiiro 0.1.28 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98bcbf770e1e25eeb2190918e4bf20e80d84732a77758eac57bcebf247db6a2c
-  data.tar.gz: 8e804419accbb33e83d241bb200e045889c872d92a99f465683e8d2e8c0868df
+  metadata.gz: 5ed8afa7ccba684e9508ee61648511cd08bc3ae84d74b43966a1b53d421f6b05
+  data.tar.gz: 3fc69daaad45903fda5a0123cecc0170698e35fdf0f130a78f8f8b05d17876fe
 SHA512:
-  metadata.gz: afbf8cb894b5815b2c3a8620fff092dcb91d4bf02b773e3350aa913ffc36878e5a28688f6059686525887ea616b211995d0f52c5cc7835573ee1fc202802da0b
-  data.tar.gz: 15b90ba14b1b0fd4485bd0bce87c5218c2ea0d7ce94beccccabd6587b56d9d22721add771ba66458bc09f444aa2767ecac94e8b3e2658413893b54e53a3e1b59
+  metadata.gz: a1dded26ad1d42ca16d2cf50cb2d2385eb1d4bcf02215e47b655a6eb36a2a1e37bb91f80ca378691c85ca1226513806ab6baa4c9dd26dc140e1208228c31de8c
+  data.tar.gz: 1b1510771c5fae9c2bf7210a65d100163d1446e3a2fef43d7af524cb32440783ca2b7234d00563a66fc62510bbf3a92dbe2c6891e64e91747d5d5aec72910b6b

data/bin/h-task

@@ -349,11 +349,6 @@ class TaskManager
     tree = tree_for_task(task_name)
     task_name = task_for_tree(tree)
 
-    if RESERVED_WORKTREES.key?(tree)
-      puts "Cannot stop reserved task '#{task_name}'"
-      return false
-    end
-
     unassign_task_from_tree(tree)
     puts "Stopped task '#{task_name}' (worktree '#{tree}' now available for reuse)"
     true
@@ -470,12 +465,9 @@ class TaskManager
     worktree_info[tree_name] || File.join(Dir.home, 'work', tree_name)
   end
 
-  # Worktrees with permanent task assignments (worktree => task)
-  RESERVED_WORKTREES = { 'carrot' => 'master' }.freeze
-
   # Find an available tree (one without an active task)
   def find_available_tree
-    trees.find { |tree| task_for_tree(tree).nil? && !RESERVED_WORKTREES.key?(tree) }
+    trees.find { |tree| task_for_tree(tree).nil? }
   end
 
   # Get the task currently assigned to a tree
@@ -505,7 +497,6 @@ class TaskManager
 
   # Unassign task from tree
   def unassign_task_from_tree(tree_name)
-    return if RESERVED_WORKTREES.key?(tree_name)
     data = assignments.dup
     data.delete(tree_name)
     save_assignments(data)
@@ -522,8 +513,7 @@ class TaskManager
     else
       {}
     end
-    # Always include reserved worktree assignments
-    RESERVED_WORKTREES.merge(data)
+    data
   end
 
   def save_assignments(data)
@@ -711,8 +701,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."
@@ -761,7 +751,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.28"
+  VERSION = "0.1.30"
 end

data/plugins/task.rb

@@ -143,16 +143,12 @@ module Task
         return true
       end
 
-      # If a specific tree was requested, verify it exists and isn't reserved
+      # If a specific tree was requested, verify it exists
       if tree
         if !trees.include?(tree)
           puts "ERROR: Worktree '#{tree}' not found"
           return false
         end
-        if RESERVED_WORKTREES.key?(tree)
-          puts "ERROR: Worktree '#{tree}' is reserved and cannot be used for tasks"
-          return false
-        end
       end
 
       # Find an available worktree to reuse, or create a new one
@@ -367,11 +363,6 @@ module Task
       tree = tree_for_task(task_name)
       task_name = task_for_tree(tree)
 
-      if RESERVED_WORKTREES.key?(tree)
-        puts "Cannot stop reserved task '#{task_name}'"
-        return false
-      end
-
       unassign_task_from_tree(tree)
       puts "Stopped task '#{task_name}' (worktree '#{tree}' now available for reuse)"
       true
@@ -440,6 +431,10 @@ module Task
       end
 
       parent_task = current[:task]
+      # Handle if we're in a subtask - get the parent
+      if parent_task.include?('/')
+        parent_task = parent_task.split('/').first
+      end
       subtasks = subtasks_for_task(parent_task)
 
       if subtasks.empty?
@@ -472,13 +467,16 @@ module Task
 
       parent_task = current[:task]
 
-      # Avoid nesting worktrees: if parent_task is itself a worktree,
-      # use parent_task_subtasks/ as the directory instead of parent_task/
-      parent_dir = if worktree_info.key?(parent_task)
-        "#{parent_task}_subtasks"
-      else
-        parent_task
+      if parent_task.include?('/')
+        parent_task = parent_task.split('/').first
       end
+
+      parent_dir =
+        if worktree_info.key?(parent_task)
+          "#{parent_task}_subtasks"
+        else
+          parent_task
+        end
       full_subtask_name = "#{parent_dir}/#{subtask_name}"
 
       # Check if subtask already exists
@@ -826,12 +824,9 @@ module Task
       worktree_info[tree_name] || File.join(Dir.home, 'work', tree_name)
     end
 
-    # Worktrees with permanent task assignments (worktree => task)
-    RESERVED_WORKTREES = { 'carrot' => 'master' }.freeze
-
     # Find an available tree (one without an active task)
     def find_available_tree
-      trees.find { |tree| task_for_tree(tree).nil? && !RESERVED_WORKTREES.key?(tree) }
+      trees.find { |tree| task_for_tree(tree).nil? }
     end
 
     # Get the task currently assigned to a tree
@@ -861,7 +856,6 @@ module Task
 
     # Unassign task from tree
     def unassign_task_from_tree(tree_name)
-      return if RESERVED_WORKTREES.key?(tree_name)
       data = assignments.dup
       data.delete(tree_name)
       save_assignments(data)
@@ -878,8 +872,7 @@ module Task
       else
         {}
       end
-      # Always include reserved worktree assignments
-      RESERVED_WORKTREES.merge(data)
+      data
     end
 
     def save_assignments(data)

metadata

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