hiiro 0.1.27 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50b6c4372984b628ce714e2a29249f93f8f869af5298752b5983bc9d18edebcf
-  data.tar.gz: 9477252f59c4afcd35dca01b6b576a233c7352c6f40d640b5f019609287655f7
+  metadata.gz: 9bb0956fd77df5e3e941a772cedc2fb51376f7be1adb7ce40b217d73a300d058
+  data.tar.gz: 9436e79dae25ae352dcadfbea5e3dcaf1e3be6d435fc4ea5823b71e7425fc739
 SHA512:
-  metadata.gz: bc6efdae4f2a2b948436dc7551c8acd89098c21a42e53c53b5bb5034a10679dc34f680fb5cc0e6361226efce00ed4bafd95a9776eeda3582147d1c41ac8c7c82
-  data.tar.gz: 542dcc0dbf7a72c8b063c38bc02cf629a60522549a71dbdb44c20bca9c6de20a40d294c4fa417140436403fa5a6bb0fb40330399e8e8e45249dd5343a03aef83
+  metadata.gz: 3b84f6e8bb918e7029af357a84bf4debe20a2467e9be85d77ea5e931e1b8ac64097c45b9d29b88e8db6514b7303798ef051adcb88144ff7e534c6ab0b2f4bbab
+  data.tar.gz: d901ce7695933da9452d7a08cd95cdf28b706af8e46c34eb68dbc0d4500ce7a8b4d0a479fe5b58e8201afe55131b6aa6249d682ef166632a819e11a878440b5a

data/README.md

@@ -69,6 +69,78 @@ h ping
 # => pong
 ```
 
+## Subcommands
+
+### Base Commands
+
+| Command | Description |
+|---------|-------------|
+| `h version` | Display the Hiiro version |
+| `h ping` | Simple test command (returns "pong") |
+| `h setup` | Install plugins and subcommands to system paths |
+| `h edit` | Open the h script in your editor |
+| `h path` | Print the current directory |
+| `h ppath` | Print project path (git root + relative dir) |
+| `h rpath` | Print relative path from git root |
+| `h pin` | Per-command key-value storage (via Pins plugin) |
+| `h project` | Project navigation with tmux integration (via Project plugin) |
+| `h task` | Task management across git worktrees (via Task plugin) |
+| `h notify` | macOS desktop notifications via terminal-notifier (via Notify plugin) |
+
+### External Subcommands
+
+| Command | Description |
+|---------|-------------|
+| `h branch` | Record and manage git branch history for tasks |
+| `h buffer` | Tmux paste buffer management |
+| `h dot` | Compare directories and generate symlink/diff commands |
+| `h dotfiles` | Manage dotfiles in ~/proj/home |
+| `h home` | Manage home directory files with edit and search |
+| `h html` | Generate an HTML index of MP4 videos in current directory |
+| `h link` | Manage saved links with URL, description, and shorthand |
+| `h mic` | Control macOS microphone input volume |
+| `h note` | Create, edit, list, and display notes |
+| `h pane` | Tmux pane management |
+| `h plugin` | Manage hiiro plugins (list, edit, search) |
+| `h pr` | Record PR information linked to tasks |
+| `h pr-monitor` | Monitor pull requests |
+| `h pr-watch` | Watch pull requests for updates |
+| `h project` | Open projects with tmux session management |
+| `h runtask` | Run templated task scripts |
+| `h serve` | Start a miniserve HTTP server on port 1111 |
+| `h session` | Tmux session management |
+| `h sha` | Extract short SHA from git log |
+| `h subtask` | Shorthand for task subtask management |
+| `h task` | Comprehensive task manager for git worktrees |
+| `h video` | Video inspection and operations via ffprobe/ffmpeg |
+| `h vim` | Manage nvim configuration with edit and search |
+| `h window` | Tmux window management |
+| `h wtree` | Git worktree management |
+
+## Abbreviations
+
+Any subcommand can be abbreviated as long as the prefix uniquely matches:
+
+```sh
+h ex hel    # matches h example hello
+h te        # matches h test (if unique)
+h pp        # matches h ppath
+```
+
+If multiple commands match, the first match wins and a warning is logged (when logging is enabled).
+
+## Plugins
+
+Plugins are Ruby modules loaded from `~/.config/hiiro/plugins/`:
+
+| Plugin | Description |
+|--------|-------------|
+| Pins | Per-command YAML key-value storage |
+| Project | Project directory navigation with tmux session management |
+| Task | Task lifecycle management across git worktrees with subtask support |
+| Tmux | Tmux session helpers used by Project and Task |
+| Notify | macOS desktop notifications via terminal-notifier |
+
 ## Adding Subcommands
 
 ### Method 1: External Executables
@@ -127,114 +199,6 @@ hiiro.add_subcommand(:pwd) do |*args, **values|
 end
 ```
 
-## Abbreviations
-
-Any subcommand can be abbreviated as long as the prefix uniquely matches:
-
-```sh
-h ex hel    # matches h example hello
-h te        # matches h test (if unique)
-h pp        # matches h ppath
-```
-
-If multiple commands match, the first match wins and a warning is logged (when logging is enabled).
-
-## Built-in Plugins
-
-### Pins
-
-Key-value storage persisted per command:
-
-```sh
-h pin                     # List all pins
-h pin mykey               # Get value
-h pin mykey myvalue       # Set value
-h pin set mykey myvalue   # Set value (explicit)
-h pin rm mykey            # Remove pin
-```
-
-Pins are stored in `~/.config/hiiro/pins/<command>.yml`.
-
-### Tmux Subcommands
-
-Hiiro includes several tmux wrapper commands for managing sessions, windows, panes, and buffers. See [docs/](docs/) for full documentation.
-
-```sh
-h session ls              # List tmux sessions
-h window new              # Create new window
-h pane split              # Split current pane
-h buffer ls               # List paste buffers
-```
-
-### Project
-
-Quick project navigation with tmux integration:
-
-```sh
-h project myproj          # cd to ~/proj/myproj and start tmux session
-```
-
-Projects can be configured in `~/.config/hiiro/projects.yml`:
-
-```yaml
-myproject: /path/to/project
-work: ~/work/main
-```
-
-### Task
-
-Manage development tasks across git worktrees in `~/work/`:
-
-```sh
-h task list               # Show trees and their active tasks
-h task start TICKET-123   # Start working on a task
-h task status             # Show current task info
-h task app frontend       # Open app directory in new tmux window
-h task save               # Save current tmux window state
-h task stop               # Release tree for other tasks
-```
-
-Configure apps in `~/.config/hiiro/apps.yml`:
-
-```yaml
-frontend: apps/frontend
-api: services/api
-admin: admin_portal/admin
-```
-
-### Notify (macOS)
-
-Desktop notifications via `terminal-notifier`:
-
-```sh
-h notify "Build complete"
-h notify "Click me" "https://example.com"
-```
-
-### Video
-
-FFmpeg wrapper for common video operations:
-
-```sh
-h video info movie.mp4        # Human-readable video summary
-h video resize720 movie.mp4   # Resize to 720p
-h video clip movie.mp4 00:01:30 60  # Extract 60s clip starting at 1:30
-h video gif movie.mp4         # Create animated GIF
-h video help                  # Full command list
-```
-
-See [docs/h-video.md](docs/h-video.md) for complete documentation.
-
-### Plugin
-
-Manage hiiro plugins:
-
-```sh
-h plugin ls                   # List installed plugins
-h plugin edit pins            # Edit a plugin file
-h plugin rg "some_method"     # Search plugin code
-```
-
 ## Writing Plugins
 
 Plugins are Ruby modules that extend Hiiro instances:

data/bin/h-subtask

@@ -13,10 +13,20 @@ hiiro = Hiiro.init(*ARGV, plugins: [Tmux, Task])
 tasks = hiiro.task_manager
 
 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(: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) }
+hiiro.add_subcmd(:apps) { tasks.list_configured_apps }
+hiiro.add_subcmd(:status) { tasks.subtask_status }
+hiiro.add_subcmd(:st) { tasks.subtask_status }
+hiiro.add_subcmd(:save) { tasks.save_subtask }
+hiiro.add_subcmd(:stop) { |subtask_name=nil| subtask_name ? tasks.stop_subtask(subtask_name) : tasks.stop_subtask }
+hiiro.add_subcmd(:current) { print tasks.current_subtask_name }
 
-# hiiro.add_default { tasks.subtask_help }
+hiiro.add_default { tasks.subtask_help }
 
 hiiro.run

data/bin/h-task

@@ -90,13 +90,18 @@ class TaskManager
     # Find an available worktree to reuse, or create a new one
     available_tree = find_available_tree
 
+    # New tasks get a nested structure: task_name/main
+    # so subtasks can live alongside as task_name/subtask_name
+    subtree_name = "#{task_name}/main"
+
     if available_tree
-      # Rename the available worktree to the task name
+      # Rename the available worktree to the task's main subtree
       old_path = tree_path(available_tree)
-      new_path = File.join(File.dirname(old_path), task_name)
+      new_path = File.join(Dir.home, 'work', subtree_name)
 
-      if available_tree != task_name
-        puts "Renaming worktree '#{available_tree}' to '#{task_name}'..."
+      if available_tree != subtree_name
+        puts "Renaming worktree '#{available_tree}' to '#{subtree_name}'..."
+        FileUtils.mkdir_p(File.dirname(new_path))
         result = system('git', '-C', main_repo_path, 'worktree', 'move', old_path, new_path)
         unless result
           puts "ERROR: Failed to rename worktree"
@@ -105,14 +110,15 @@ class TaskManager
         clear_worktree_cache
       end
 
-      final_tree_name = task_name
+      final_tree_name = subtree_name
       final_tree_path = new_path
     else
       # No available worktree, create a new one
       puts "Creating new worktree for '#{task_name}'..."
-      new_path = File.join(Dir.home, 'work', task_name)
+      new_path = File.join(Dir.home, 'work', subtree_name)
 
       # Create worktree from main branch (detached to avoid branch conflicts)
+      FileUtils.mkdir_p(File.dirname(new_path))
       result = system('git', '-C', main_repo_path, 'worktree', 'add', '--detach', new_path)
       unless result
         puts "ERROR: Failed to create worktree"
@@ -120,7 +126,7 @@ class TaskManager
       end
       clear_worktree_cache
 
-      final_tree_name = task_name
+      final_tree_name = subtree_name
       final_tree_path = new_path
     end
 
@@ -343,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
@@ -421,6 +422,9 @@ class TaskManager
       info = {}
       current_path = nil
 
+      work_dir = File.join(Dir.home, 'work')
+      work_prefix = work_dir + '/'
+
       output.lines.each do |line|
         line = line.strip
         if line.start_with?('worktree ')
@@ -431,7 +435,13 @@ class TaskManager
         elsif line.start_with?('branch ') || line == 'detached'
           # Capture worktree (both named branches and detached HEAD)
           if current_path && current_path != main_repo_path
-            name = File.basename(current_path)
+            # Use relative path from ~/work/ to support nested worktrees
+            # e.g. ~/work/my-task/main -> "my-task/main"
+            name = if current_path.start_with?(work_prefix)
+              current_path.sub(work_prefix, '')
+            else
+              File.basename(current_path)
+            end
             info[name] = current_path
           end
           current_path = nil
@@ -455,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
@@ -490,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)
@@ -507,8 +513,7 @@ class TaskManager
     else
       {}
     end
-    # Always include reserved worktree assignments
-    RESERVED_WORKTREES.merge(data)
+    data
   end
 
   def save_assignments(data)
@@ -693,6 +698,103 @@ class TaskManager
     return [] unless $?.success?
     output.lines.map(&:strip)
   end
+
+  # 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) }
+
+    if flat_trees.empty?
+      puts "No flat worktrees to migrate."
+      return
+    end
+
+    sessions = tmux_sessions
+
+    puts "Worktrees to migrate:"
+    puts
+    flat_trees.each do |name|
+      task = task_for_tree(name)
+      session_marker = sessions.include?(session_name_for(task || name)) ? " (tmux session running)" : ""
+      puts format("  %-20s => %s/main%s", name, name, session_marker)
+    end
+    puts
+
+    flat_trees.each do |name|
+      task = task_for_tree(name)
+      old_path = tree_path(name)
+      temp_name = "__migrating_#{name}"
+      temp_path = File.join(Dir.home, 'work', temp_name)
+      new_tree_name = "#{name}/main"
+      new_path = File.join(Dir.home, 'work', new_tree_name)
+
+      puts "Migrating '#{name}' -> '#{new_tree_name}'..."
+
+      # Step 1: Move worktree to temp location (frees up the directory name)
+      result = system('git', '-C', main_repo_path, 'worktree', 'move', old_path, temp_path)
+      unless result
+        puts "  ERROR: Failed to move to temp location, skipping"
+        next
+      end
+
+      # Step 2: Create parent directory and move to final nested location
+      FileUtils.mkdir_p(File.join(Dir.home, 'work', name))
+      result = system('git', '-C', main_repo_path, 'worktree', 'move', temp_path, new_path)
+      unless result
+        puts "  ERROR: Failed to move to final location, rolling back..."
+        system('git', '-C', main_repo_path, 'worktree', 'move', temp_path, old_path)
+        next
+      end
+
+      # Step 3: Update assignments (tree name changes, task name stays)
+      if task
+        data = load_assignments
+        data.delete(name)
+        data[new_tree_name] = task
+        save_assignments(RESERVED_WORKTREES.merge(data))
+      end
+
+      # Step 4: Update task metadata
+      if task
+        meta = task_metadata(task)
+        if meta
+          meta['tree'] = new_tree_name
+          FileUtils.mkdir_p(task_dir)
+          File.write(task_metadata_file(task), YAML.dump(meta))
+        end
+      end
+
+      # Step 5: Update tmux panes if a session is running
+      session_name = session_name_for(task || name)
+      if sessions.include?(session_name)
+        update_tmux_panes(session_name, old_path, new_path)
+      end
+
+      clear_worktree_cache
+      @assignments = nil
+      puts "  Done."
+    end
+
+    puts
+    puts "Migration complete."
+  end
+
+  # Send `cd` to tmux panes whose cwd is under the old path
+  def update_tmux_panes(session_name, old_path, new_path)
+    output = `tmux list-panes -s -t '#{session_name}' -F '\#{pane_id}:\#{pane_current_path}' 2>/dev/null`
+    return unless $?.success?
+
+    output.lines.each do |line|
+      pane_id, pane_path = line.strip.split(':', 2)
+      next unless pane_path
+
+      if pane_path == old_path || pane_path.start_with?(old_path + '/')
+        updated_path = pane_path.sub(old_path, new_path)
+        system('tmux', 'send-keys', '-t', pane_id, "cd #{updated_path}", 'Enter')
+        puts "  Updated pane #{pane_id}: cd #{updated_path}"
+      end
+    end
+  end
 end
 
 # Create task manager instance
@@ -713,5 +815,6 @@ hiiro.add_subcmd(:st) { tasks.status }
 hiiro.add_subcmd(:save) { tasks.save_current }
 hiiro.add_subcmd(:stop) { |task_name=nil| task_name ? tasks.stop_task(task_name) : tasks.stop_current }
 hiiro.add_subcmd(:current) { print tasks.task_name }
+hiiro.add_subcmd(:migrate) { tasks.migrate_worktrees }
 
 hiiro.run

data/docs/README.md

@@ -9,11 +9,30 @@ This directory contains detailed documentation for all Hiiro subcommands.
 | Command | Description |
 |---------|-------------|
 | [h-buffer](h-buffer.md) | Tmux paste buffer management |
+| h-branch | Record and manage git branch history for tasks |
+| h-dot | Compare directories and generate symlink/diff commands |
+| h-dotfiles | Manage dotfiles in ~/proj/home |
+| h-home | Manage home directory files with edit and search |
+| h-html | Generate an HTML index of MP4 videos in current directory |
+| h-link | Manage saved links with URL, description, and shorthand |
+| h-mic | Control macOS microphone input volume |
+| h-note | Create, edit, list, and display notes |
 | [h-pane](h-pane.md) | Tmux pane management |
-| [h-plugin](h-plugin.md) | Hiiro plugin management |
+| [h-plugin](h-plugin.md) | Manage hiiro plugins (list, edit, search) |
+| h-pr | Record PR information linked to tasks |
+| h-pr-monitor | Monitor pull requests |
+| h-pr-watch | Watch pull requests for updates |
+| h-project | Open projects with tmux session management |
+| h-runtask | Run templated task scripts |
+| h-serve | Start a miniserve HTTP server on port 1111 |
 | [h-session](h-session.md) | Tmux session management |
-| [h-video](h-video.md) | FFmpeg wrapper for video operations |
+| h-sha | Extract short SHA from git log |
+| h-subtask | Shorthand for task subtask management |
+| h-task | Comprehensive task manager for git worktrees |
+| [h-video](h-video.md) | Video inspection and operations via ffprobe/ffmpeg |
+| h-vim | Manage nvim configuration with edit and search |
 | [h-window](h-window.md) | Tmux window management |
+| h-wtree | Git worktree management |
 
 ## Base Commands
 
@@ -21,14 +40,27 @@ The main `h` command includes these built-in subcommands:
 
 | Command | Description |
 |---------|-------------|
+| `h version` | Display the Hiiro version |
+| `h ping` | Simple test command (returns "pong") |
+| `h setup` | Install plugins and subcommands to system paths |
 | `h edit` | Open the h script in your editor |
 | `h path` | Print the current directory |
 | `h ppath` | Print project path (git root + relative dir) |
 | `h rpath` | Print relative path from git root |
-| `h ping` | Simple test command (returns "pong") |
-| `h pin` | Key-value storage (via Pins plugin) |
-| `h project` | Project navigation (via Project plugin) |
-| `h task` | Task management (via Task plugin) |
+| `h pin` | Per-command key-value storage (via Pins plugin) |
+| `h project` | Project navigation with tmux integration (via Project plugin) |
+| `h task` | Task management across git worktrees (via Task plugin) |
+| `h notify` | macOS desktop notifications via terminal-notifier (via Notify plugin) |
+
+## Plugins
+
+| Plugin | Description |
+|--------|-------------|
+| Pins | Per-command YAML key-value storage |
+| Project | Project directory navigation with tmux session management |
+| Task | Task lifecycle management across git worktrees with subtask support |
+| Tmux | Tmux session helpers used by Project and Task |
+| Notify | macOS desktop notifications via terminal-notifier |
 
 ## Abbreviations
 

data/lib/hiiro/version.rb

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

data/plugins/task.rb

@@ -143,28 +143,29 @@ 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
       available_tree = tree || find_available_tree
 
+      # New tasks get a nested structure: task_name/main
+      # so subtasks can live alongside as task_name/subtask_name
+      subtree_name = "#{task_name}/main"
+
       if available_tree
-        # Rename the available worktree to the task name
+        # Rename the available worktree to the task's main subtree
         old_path = tree_path(available_tree)
-        new_path = File.join(File.dirname(old_path), task_name)
+        new_path = File.join(Dir.home, 'work', subtree_name)
 
-        if available_tree != task_name
-          puts "Renaming worktree '#{available_tree}' to '#{task_name}'..."
+        if available_tree != subtree_name
+          puts "Renaming worktree '#{available_tree}' to '#{subtree_name}'..."
+          FileUtils.mkdir_p(File.dirname(new_path))
           result = system('git', '-C', main_repo_path, 'worktree', 'move', old_path, new_path)
           unless result
             puts "ERROR: Failed to rename worktree"
@@ -173,14 +174,15 @@ module Task
           clear_worktree_cache
         end
 
-        final_tree_name = task_name
+        final_tree_name = subtree_name
         final_tree_path = new_path
       else
         # No available worktree, create a new one
         puts "Creating new worktree for '#{task_name}'..."
-        new_path = File.join(Dir.home, 'work', task_name)
+        new_path = File.join(Dir.home, 'work', subtree_name)
 
         # Create worktree from main branch (detached to avoid branch conflicts)
+        FileUtils.mkdir_p(File.dirname(new_path))
         result = system('git', '-C', main_repo_path, 'worktree', 'add', '--detach', new_path)
         unless result
           puts "ERROR: Failed to create worktree"
@@ -188,7 +190,7 @@ module Task
         end
         clear_worktree_cache
 
-        final_tree_name = task_name
+        final_tree_name = subtree_name
         final_tree_path = new_path
       end
 
@@ -361,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
@@ -377,21 +374,49 @@ module Task
       puts "       h subtask <subcommand> [args]"
       puts
       puts "Subcommands:"
-      puts "  ls                    List subtasks for current task"
+      puts "  list, ls              List subtasks for current task"
       puts "  new SUBTASK_NAME      Start a new subtask (creates worktree and session)"
       puts "  switch SUBTASK_NAME   Switch to subtask's tmux session"
+      puts "  app APP_NAME          Open a tmux window for an app in current subtask"
+      puts "  apps                  List configured apps from apps.yml"
+      puts "  cd [APP_NAME]         Change directory to app in current subtask"
+      puts "  path [APP_NAME]       Print app path in current subtask"
+      puts "  status, st            Show current subtask status"
+      puts "  save                  Save current subtask session info"
+      puts "  stop [SUBTASK_NAME]   Stop working on current/named subtask"
+      puts "  current               Print current subtask name"
     end
 
     def handle_subtask(*args)
       case args
       in []
         subtask_help
-      in ['ls']
+      in ['list'] | ['ls']
         list_subtasks
       in ['new', subtask_name]
         new_subtask(subtask_name)
       in ['switch', subtask_name]
         switch_subtask(subtask_name)
+      in ['app', app_name]
+        subtask_open_app(app_name)
+      in ['apps']
+        list_configured_apps
+      in ['cd', *cd_args]
+        subtask_cd_app(*cd_args)
+      in ['path']
+        subtask_app_path
+      in ['path', app_name]
+        subtask_app_path(app_name)
+      in ['status'] | ['st']
+        subtask_status
+      in ['save']
+        save_subtask
+      in ['stop']
+        stop_subtask
+      in ['stop', subtask_name]
+        stop_subtask(subtask_name)
+      in ['current']
+        print current_subtask_name
       else
         puts "Unknown subtask command: #{args.inspect}"
         subtask_help
@@ -406,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?
@@ -437,7 +466,18 @@ module Task
       end
 
       parent_task = current[:task]
-      full_subtask_name = "#{parent_task}/#{subtask_name}"
+
+      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
       existing = subtasks_for_task(parent_task).find { |s| s['name'] == subtask_name }
@@ -525,6 +565,122 @@ module Task
       true
     end
 
+    # Show status for the current subtask
+    def subtask_status
+      current = current_task
+      unless current
+        puts "Not currently in a task session"
+        return
+      end
+
+      parent_task = parent_task_name(current[:task])
+      subtask_name = current_subtask_name_from(current[:task])
+
+      puts "Parent task: #{parent_task}"
+      if subtask_name
+        puts "Subtask: #{subtask_name}"
+      else
+        puts "Subtask: (main)"
+      end
+      puts "Worktree: #{current[:tree]}"
+      puts "Path: #{tree_path(current[:tree])}"
+      puts "Session: #{current[:session]}"
+    end
+
+    # Save current subtask tmux session state
+    def save_subtask
+      current = current_task
+      unless current
+        puts "ERROR: Not currently in a task session"
+        return false
+      end
+
+      parent_task = parent_task_name(current[:task])
+      session = current[:session]
+
+      windows = capture_tmux_windows(session)
+
+      save_task_metadata(parent_task,
+        tree: current[:tree],
+        session: session,
+        windows: windows,
+        saved_at: Time.now.iso8601
+      )
+
+      puts "Saved subtask session state (#{windows.count} windows)"
+      true
+    end
+
+    # Stop a subtask (remove from parent's subtask list, unassign tree)
+    def stop_subtask(subtask_name = nil)
+      current = current_task
+      unless current
+        puts "Not currently in a task session"
+        return false
+      end
+
+      parent_task = parent_task_name(current[:task])
+
+      if subtask_name.nil?
+        # Stop the current subtask
+        subtask_name = current_subtask_name_from(current[:task])
+        unless subtask_name
+          puts "Not currently in a subtask (in main task)"
+          return false
+        end
+      end
+
+      subtask = find_subtask(parent_task, subtask_name)
+      unless subtask
+        puts "Subtask '#{subtask_name}' not found for task '#{parent_task}'"
+        return false
+      end
+
+      tree_name = subtask['worktree']
+      if tree_name
+        unassign_task_from_tree(tree_name)
+      end
+
+      # Mark subtask as inactive in parent metadata
+      meta = task_metadata(parent_task) || {}
+      if meta['subtasks']
+        meta['subtasks'].each do |s|
+          if s['name'].start_with?(subtask_name)
+            s['active'] = false
+          end
+        end
+        FileUtils.mkdir_p(task_dir)
+        File.write(task_metadata_file(parent_task), YAML.dump(meta))
+      end
+
+      puts "Stopped subtask '#{subtask_name}' (worktree available for reuse)"
+      true
+    end
+
+    # Print the current subtask name
+    def current_subtask_name
+      current = current_task
+      return nil unless current
+
+      subtask_name = current_subtask_name_from(current[:task])
+      subtask_name || current[:task]
+    end
+
+    # Open an app window scoped to the current subtask's tree
+    def subtask_open_app(app_name)
+      open_app(app_name)
+    end
+
+    # cd to app in current subtask's tree
+    def subtask_cd_app(*args)
+      cd_app(*args)
+    end
+
+    # Print app path in current subtask's tree
+    def subtask_app_path(app_name = nil, task: nil)
+      app_path(app_name, task: task || current_task&.dig(:task))
+    end
+
     private
 
     def subtasks_for_task(task_name)
@@ -546,6 +702,18 @@ module Task
       File.write(task_metadata_file(parent_task), YAML.dump(meta))
     end
 
+    # Extract parent task name from a potentially nested task/subtask name
+    def parent_task_name(task_name)
+      task_name.include?('/') ? task_name.split('/').first : task_name
+    end
+
+    # Extract subtask name from a nested task name (returns nil if main)
+    def current_subtask_name_from(task_name)
+      return nil unless task_name.include?('/')
+      parts = task_name.split('/', 2)
+      parts.last == 'main' ? nil : parts.last
+    end
+
     public
 
     def list_configured_apps
@@ -613,6 +781,9 @@ module Task
         info = {}
         current_path = nil
 
+        work_dir = File.join(Dir.home, 'work')
+        work_prefix = work_dir + '/'
+
         output.lines.each do |line|
           line = line.strip
           if line.start_with?('worktree ')
@@ -623,7 +794,13 @@ module Task
           elsif line.start_with?('branch ') || line == 'detached'
             # Capture worktree (both named branches and detached HEAD)
             if current_path && current_path != main_repo_path
-              name = File.basename(current_path)
+              # Use relative path from ~/work/ to support nested worktrees
+              # e.g. ~/work/my-task/main -> "my-task/main"
+              name = if current_path.start_with?(work_prefix)
+                current_path.sub(work_prefix, '')
+              else
+                File.basename(current_path)
+              end
               info[name] = current_path
             end
             current_path = nil
@@ -647,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
@@ -682,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)
@@ -699,8 +872,7 @@ module Task
       else
         {}
       end
-      # Always include reserved worktree assignments
-      RESERVED_WORKTREES.merge(data)
+      data
     end
 
     def save_assignments(data)

data/script/compare

@@ -1,9 +1,9 @@
 #!/bin/bash
 
 diff_dirs() {
-  diff -qrs ~/bin/ bin/ | egrep '\bbin(: |\/)h(\b|-)' | egrep -v 'identical'
+  diff -qrs bin/ ~/bin/ | egrep '\bbin(: |\/)h(\b|-)' | egrep -v 'identical'
 
-  diff -qrs ~/.config/hiiro/plugins/ plugins/ | egrep -v 'identical'
+  diff -qrs plugins/ ~/.config/hiiro/plugins/ | egrep -v 'identical'
 }
 
 # s@Only in \(bin|plugins\): \(.*\)@cp -v \1/\2 $HOME/\1/@;

metadata

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