hiiro 0.1.353 → 0.1.354

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd7598e65b8521905ec67a960f09700d7260c5329e066e6cfcbb4661c180c99
-  data.tar.gz: 189ca275fa4cc2af210c1d67c8976bc4b90343e68eb4a0fe86ebedea1421bb9f
+  metadata.gz: 9a368e5a5a2c932aa609faa46c699b3a112e835908fe7788cdab234f583a92ee
+  data.tar.gz: 2153cf58429b63859d220615d9a5404fa14e1388ce735bc385d399c2856ca204
 SHA512:
-  metadata.gz: 50b6f3d077471531303d04f9ef234ff4ade40dbea85b52f575e6c9e3c48088ba1318dd0798eaeef15acdeb4ce0ca8fcf13100d4963fb5174dccdefaf87de228f
-  data.tar.gz: 4c852f5cea47667811dd2dd461b5c1bdfe3935cc7fecad2c95c7d3d43f28d3c7aea0554ea415cfda812e776b047bf4dee9ef77b34fdb0ffc5b806170864e2705
+  metadata.gz: 422c65b26c19e47db3a28eb5643f9b525ba862dbfcdab1d75ada76f43b1c3add1bc70ce97183d4934a06403fc6bb4fa244b8821127c0a0e6ec8b9778e8e022a0
+  data.tar.gz: 1b005ce7ebb9acec393d6587d939ef1623c5d69a1d8869bf9540ca1e4e4095008bc4d6a3f0fa76bbcac6ac7849059b8166ae2e6fb08073ed31d48d186356459f

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## [Unreleased]
 
+### Added
+- `h task from <worktree-path> <task-name>` registers an existing git worktree from any path as a Hiiro task and switches to it.
+
 ## [0.1.353] - 2026-04-26
 
 ### Added
@@ -329,4 +332,4 @@
 - `h db cleanup` subcommand to preview and prune duplicate rows from SQLite tables
 
 ### Fixed
-- Prevent duplicate pinned_prs during import with `insert_conflict` and per-row rescue
+- Prevent duplicate pinned_prs during import with `insert_conflict` and per-row rescue

data/CLAUDE.md

@@ -2,6 +2,10 @@
 
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
+## Safety
+
+- NEVER commit secrets, tokens, api keys, etc. do not include any work-related content or information
+
 ## Project Overview
 
 Hiiro is a lightweight CLI framework for Ruby that enables building multi-command tools similar to `git` or `docker`. It provides subcommand dispatch, abbreviation matching (e.g., `h ex hel` matches `h example hello`), and a plugin system.
@@ -546,4 +550,3 @@ All config lives in `~/.config/hiiro/`:
 - lib/hiiro/tmux.rb
 - lib/hiiro/tmux/*
 
-

data/README.md

@@ -65,7 +65,7 @@ h ping
 | `h setup` | Install plugins and subcommands to system paths |
 | `h edit` | Open the h script in your editor |
 | `h alert` | macOS desktop notifications via terminal-notifier |
-| `h task` | Task management across git worktrees (via Tasks plugin) |
+| `h task` | Task management across git worktrees, including existing external worktrees (via Tasks plugin) |
 | `h subtask` | Subtask management within tasks (via Tasks plugin) |
 
 ### External Subcommands
@@ -116,7 +116,7 @@ Plugins are Ruby modules loaded from `~/.config/hiiro/plugins/`:
 |--------|-------------|
 | Pins | Per-command YAML key-value storage |
 | Project | Project directory navigation with tmux session management |
-| Tasks | Task lifecycle management across git worktrees with subtask support |
+| Tasks | Task lifecycle management across git worktrees with external-worktree registration and subtask support |
 | Notify | macOS desktop notifications via terminal-notifier |
 
 ## Adding Subcommands

data/docs/h-task.md

@@ -1,6 +1,6 @@
 # h task
 
-Manage top-level tasks. Each task is a worktree + tmux session pair. Tasks enable parallel development across multiple features — each with an isolated checkout and its own tmux session.
+Manage top-level tasks. Each task is a worktree + tmux session pair. Tasks enable parallel development across multiple features — each with an isolated checkout and its own tmux session. `h task start` creates worktrees under Hiiro's default work root; `h task from` can register an existing worktree from any repo/path.
 
 Tasks are stored in `~/.config/hiiro/tasks/tasks.yml` (SQLite-backed with YAML backup).
 
@@ -164,6 +164,30 @@ h task file add myapp path/to/file.rb
 
 ---
 
+### from
+
+Register an existing git worktree as a Hiiro task and switch to it. The path is normalized to the worktree root with `git rev-parse --show-toplevel`, then stored as the task's tree path.
+
+**Examples**
+
+```bash
+h task from ~/ic_repos/other_repo_base_dir other-task
+h task path other-task
+h task switch other-task
+```
+
+Stored task shape:
+
+```js
+{
+  name: "other-task",
+  tree: "/Users/josh/ic_repos/other_repo_base_dir",
+  session: "other-task"
+}
+```
+
+---
+
 ### ls / list
 
 List all tasks with their worktree, branch, and session. Also shows available (unassigned) worktrees and extra tmux sessions.
@@ -548,4 +572,3 @@ h task untag my-feature          # remove all tags
 List worktrees for the current task. Delegates to `h wtree`.
 
 ---
-

data/docs/h.md

@@ -30,7 +30,7 @@ These subcommands are defined directly in `exe/h` or loaded from `lib/`:
 | [`h service`](h-service.md) | Dev service management with tmux, env files, and service groups | `lib/hiiro/service_manager.rb` |
 | `h setup` | Install plugins and bin scripts to `~/bin` | `exe/h` |
 | [`h subtask`](h-subtask.md) | Subtask management scoped to the current parent task | `lib/hiiro/tasks.rb` |
-| [`h task`](h-task.md) | Task management — worktree + tmux session pairs for parallel development | `lib/hiiro/tasks.rb` |
+| [`h task`](h-task.md) | Task management — worktree + tmux session pairs, including existing external worktrees | `lib/hiiro/tasks.rb` |
 | `h version` | Print installed hiiro version (`-a` for all rbenv versions) | `exe/h` |
 
 ## External subcommands

data/lib/hiiro/tasks.rb

@@ -91,7 +91,10 @@ class Hiiro
       return target.path if target.is_a?(FallbackTarget)
 
       tree = environment.find_tree(target.tree_name)
-      tree ? tree.path : File.join(Hiiro::WORK_DIR, target.tree_name)
+      return tree.path if tree
+      return target.tree_name if target.absolute_tree?
+
+      File.join(Hiiro::WORK_DIR, target.tree_name)
     end
 
     def task_by_tree(tree_name)
@@ -116,6 +119,43 @@ class Hiiro
 
     # --- Actions ---
 
+    def task_from_worktree(path, name)
+      if path.nil? || name.nil? || name.empty?
+        puts "Usage: h #{scope} from <worktree-path> <task-name>"
+        return
+      end
+
+      root = git_worktree_root(path)
+      unless root
+        puts "ERROR: '#{path}' is not inside a git worktree"
+        return
+      end
+
+      existing = task_by_name(name)
+      if existing
+        existing_path = resolve_path(existing)
+        if same_path?(existing_path, root)
+          puts "Task '#{existing.name}' already uses '#{root}'. Switching..."
+          return existing
+        end
+
+        puts "ERROR: Task '#{existing.name}' already exists for '#{existing_path}'"
+        return
+      end
+
+      existing_for_path = environment.all_tasks.find { |task| same_path?(resolve_path(task), root) }
+      if existing_for_path
+        puts "Worktree '#{root}' is already registered as task '#{existing_for_path.name}'. Switching..."
+        return existing_for_path
+      end
+
+      color_index = Hiiro::TaskColors.next_index(config.tasks.map(&:color_index).compact)
+      task = Task.new(name: name, tree: root, session: name, color_index: color_index)
+      config.save_task(task)
+      puts "Added task '#{name}' from worktree '#{root}'"
+      task
+    end
+
     def start_task(name, app_name: nil, sparse_groups: [])
       existing = task_by_name(name)
       if existing
@@ -185,8 +225,7 @@ class Hiiro
         return
       end
 
-      tree = environment.find_tree(task.tree_name)
-      tree_path = tree ? tree.path : File.join(Hiiro::WORK_DIR, task.tree_name)
+      tree_path = resolve_path(task)
 
       session_name = task.session_name
       session_exists = system('tmux', 'has-session', '-t', "=#{session_name}", err: File::NULL)
@@ -369,8 +408,7 @@ class Hiiro
 
       puts "Task: #{task.name}"
       puts "Worktree: #{task.tree_name}"
-      tree = environment.find_tree(task.tree_name)
-      puts "Path: #{tree&.path || '(unknown)'}"
+      puts "Path: #{resolve_path(task) || '(unknown)'}"
       puts "Session: #{task.session_name}"
       puts "Parent: #{task.parent_name}" if task.subtask?
     end
@@ -445,9 +483,7 @@ class Hiiro
         return
       end
 
-      tree = environment.find_tree(task.tree_name)
-      path = tree ? tree.path : File.join(Hiiro::WORK_DIR, task.tree_name)
-      send_cd(path)
+      send_cd(resolve_path(task))
     end
 
     def cd_to_app(app_name = nil)
@@ -458,8 +494,7 @@ class Hiiro
       end
 
       if app_name.nil? || app_name.empty?
-        tree = environment.find_tree(task.tree_name)
-        send_cd(tree&.path || File.join(Hiiro::WORK_DIR, task.tree_name))
+        send_cd(resolve_path(task))
         return
       end
 
@@ -473,8 +508,7 @@ class Hiiro
     def app_path(app_name = nil)
       task = current_task
       tree_root = if task
-        tree = environment.find_tree(task.tree_name)
-        tree&.path || File.join(Hiiro::WORK_DIR, task.tree_name)
+        resolve_path(task)
       else
         Hiiro::Git.new(nil, Dir.pwd).root
       end
@@ -596,14 +630,31 @@ class Hiiro
       end
     end
 
+    def git_worktree_root(path)
+      expanded = File.expand_path(path.to_s)
+      return nil unless Dir.exist?(expanded)
+
+      root = IO.popen(['git', '-C', expanded, 'rev-parse', '--show-toplevel'], err: File::NULL, &:read).to_s.strip
+      return nil if root.empty?
+
+      File.expand_path(root)
+    rescue
+      nil
+    end
+
+    def same_path?(left, right)
+      return false if left.nil? || right.nil?
+
+      File.expand_path(left) == File.expand_path(right)
+    end
+
     def find_available_tree
       assigned_tree_names = environment.all_tasks.map(&:tree_name)
       environment.all_trees.find { |tree| !assigned_tree_names.include?(tree.name) }
     end
 
     def resolve_app(app_name, task)
-      tree = environment.find_tree(task.tree_name)
-      tree_root = tree ? tree.path : File.join(Hiiro::WORK_DIR, task.tree_name)
+      tree_root = resolve_path(task)
 
       result = environment.app_matcher.find_all(app_name)
 
@@ -1036,6 +1087,13 @@ class Hiiro
 
         h.add_subcmd(:apps) { tm.list_apps }
 
+        if tm.scope == :task
+          h.add_subcmd(:from) do |path = nil, task_name = nil|
+            task = tm.task_from_worktree(path, task_name)
+            tm.switch_to_task(task) if task
+          end
+        end
+
         h.add_subcmd(:cd) do |*raw_args|
           opts = Hiiro::Options.parse(raw_args, &task_opts_block)
           task, positional = resolve_task.call(opts, opts.args)
@@ -1419,6 +1477,13 @@ class Hiiro
   class Tree
     attr_reader :path, :head, :branch
 
+    def self.from_path(path)
+      expanded = File.expand_path(path.to_s)
+      branch = Hiiro::Git.new(nil, expanded).branch if Dir.exist?(expanded)
+      branch = nil if branch.nil? || branch.empty? || branch == 'HEAD'
+      new(path: expanded, branch: branch)
+    end
+
     def self.all(repo_path: Hiiro::REPO_PATH)
       git = Hiiro::Git.new(nil, repo_path)
       git.worktrees(repo_path: repo_path).filter_map do |wt|
@@ -1485,6 +1550,10 @@ class Hiiro
       !subtask?
     end
 
+    def absolute_tree?
+      tree_name.to_s.start_with?('/')
+    end
+
     def tree
       @tree ||= Environment.current&.find_tree(tree_name)
     end
@@ -1649,7 +1718,7 @@ class Hiiro
         t = tree
         all_tasks.find { |task|
           (s && task.session_name == s.name) ||
-            (t && task.tree_name == t.name)
+            (t && (task.tree_name == t.name || task.tree_name == t.path))
         }
       end
     end
@@ -1659,7 +1728,7 @@ class Hiiro
     end
 
     def tree
-      @tree ||= all_trees.find { |t| t.match?(path) }
+      @tree ||= all_trees.find { |t| t.match?(path) } || external_task_tree
     end
 
     def find_task(abbreviated)
@@ -1682,6 +1751,8 @@ class Hiiro
 
     def find_tree(abbreviated)
       return nil if abbreviated.nil?
+      return Tree.from_path(abbreviated) if abbreviated.to_s.start_with?('/') && Dir.exist?(abbreviated)
+
       tree_matcher.find(abbreviated).first&.item
     end
 
@@ -1694,5 +1765,10 @@ class Hiiro
       return nil if abbreviated.nil?
       app_matcher.find(abbreviated).first&.item
     end
+
+    def external_task_tree
+      task = all_tasks.find { |t| t.absolute_tree? && t.tree_name && (path == t.tree_name || path.start_with?(t.tree_name + '/')) }
+      Tree.from_path(task.tree_name) if task
+    end
   end
 end

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.353"
+  VERSION = "0.1.354"
 end

metadata

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