hiiro 0.1.366 → 0.1.367

data/exe/t

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+
+Hiiro.run(*ARGV, external_commands: false, builtin_commands: false) do
+  Hiiro::TaskCli.setup(self)
+end

data/exe/tt

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'hiiro'
+
+Hiiro.run(*ARGV, external_commands: false, builtin_commands: false) do
+  Hiiro::TaskCli.setup_todo(self)
+end

data/lib/hiiro/current_task.rb

@@ -0,0 +1,92 @@
+class Hiiro
+  # Resolves the current task record shared by `t` (via TaskScope) and
+  # Environment#task (via `h` commands):
+  #
+  #   1. Herdr workspace, when HERDR_* env vars identify one
+  #   2. Working directory inside a task home, code directory, or registered directory
+  #   3. Saved `t TASK current` pin (only when pin: true)
+  #
+  # resolve! raises Hiiro::Error with a user-facing message; resolve returns nil instead.
+  class CurrentTask
+    def initialize(herdr: nil, cwd: Dir.pwd, pin: true, tasks: nil)
+      @herdr = herdr
+      @cwd = cwd
+      @pin = pin
+      @tasks = tasks
+    end
+
+    def resolve
+      resolve!
+    rescue Hiiro::Error
+      nil
+    end
+
+    def resolve!
+      herdr_task || directory_task || pinned_task
+    end
+
+    private
+
+    def tasks
+      @tasks ||= TaskRecord.all_as_list
+    end
+
+    def herdr_task
+      return nil unless @herdr && (ENV['HERDR_WORKSPACE_ID'] || ENV['HERDR_PANE_ID'] || ENV['HERDR_ENV'] == '1')
+
+      herdr = @herdr.call
+      unless herdr.server_running?
+        raise Error, 'Herdr is not running; start Herdr for workspace/tab/pane commands, or supply a task name for task data'
+      end
+      pane = herdr.get_pane(ENV['HERDR_PANE_ID']) if ENV['HERDR_PANE_ID']
+      raise Error, 'Cannot resolve the current Herdr pane; supply a task name' if ENV['HERDR_PANE_ID'] && !pane
+
+      workspace_id = ENV['HERDR_WORKSPACE_ID'] || pane&.workspace_id
+      raise Error, 'Conflicting Herdr pane/workspace context; supply a task name' if pane && workspace_id != pane.workspace_id
+
+      workspace = workspace_id ? herdr.get_workspace(workspace_id) : herdr.current_workspace
+      raise Error, 'Cannot resolve the current Herdr workspace; supply a task name' unless workspace
+
+      matches = tasks.select { |task| workspace_label(task) == workspace.name }
+      raise Error, "Ambiguous workspace task: #{matches.map(&:name).join(', ')}" if matches.length > 1
+
+      matches.first
+    end
+
+    def directory_task
+      cwd = File.realpath(@cwd)
+      registered = TaskResource.where(kind: 'directory').select_map([:task_id, :target]).group_by(&:first)
+      matches = tasks.select do |task|
+        paths = [task.home, code_directory(task), *registered.fetch(task.id, []).map(&:last)].compact
+        paths.any? { |path| inside?(cwd, path) }
+      end
+      raise Error, "Ambiguous directory task: #{matches.map(&:name).join(', ')}" if matches.length > 1
+
+      matches.first
+    end
+
+    def pinned_task
+      raise Error, 'No current task; supply a task name or run t TASK current' unless @pin
+
+      saved = PinRecord.find_key('t', 'current_task')
+      raise Error, 'No current task; supply a task name or run t TASK current' unless saved
+
+      TaskRecord[saved.value] || raise(Error, 'Saved task no longer exists; run t TASK current')
+    end
+
+    def workspace_label(task)
+      (task.session || task.name).tr('.', '_')
+    end
+
+    def code_directory(task)
+      task.primary_directory || (task.tree && (task.tree.start_with?('/') ? task.tree : File.join(Hiiro::WORK_DIR, task.tree)))
+    end
+
+    def inside?(path, directory)
+      return false unless Dir.exist?(directory)
+
+      root = File.realpath(directory)
+      path == root || path.start_with?(root == File::SEPARATOR ? root : root + File::SEPARATOR)
+    end
+  end
+end

data/lib/hiiro/error.rb

@@ -0,0 +1,5 @@
+class Hiiro
+  # Raise for expected user-facing failures (bad arguments, missing records).
+  # Hiiro#run prints only the message for these, with no backtrace.
+  class Error < StandardError; end
+end

data/lib/hiiro/git/worktrees.rb

@@ -26,7 +26,7 @@ class Hiiro
 
       def self.fetch(repo_path: nil)
         output = if repo_path
-          `git -C #{repo_path.shellescape} worktree list --porcelain 2>/dev/null`
+          `git -C #{Hiiro::Git.repo_dir(repo_path).shellescape} worktree list --porcelain 2>/dev/null`
         else
           `git worktree list --porcelain 2>/dev/null`
         end

data/lib/hiiro/git.rb

@@ -7,6 +7,12 @@ require_relative 'git/pr'
 
 class Hiiro
   class Git
+    # Directory to pass to `git -C` for a repo path. REPO_PATH points at
+    # ~/work/.git, which is a gitfile in the bare layout, so use its parent.
+    def self.repo_dir(repo_path)
+      File.file?(repo_path.to_s) ? File.dirname(repo_path) : repo_path
+    end
+
     def self.root
       `git rev-parse --show-toplevel 2>/dev/null`.strip
     end
@@ -128,7 +134,7 @@ class Hiiro
 
     def add_worktree_detached(path, repo_path: nil)
       if repo_path
-        run_system('-C', repo_path, 'worktree', 'add', '--detach', path)
+        run_system('-C', self.class.repo_dir(repo_path), 'worktree', 'add', '--detach', path)
       else
         run_system('worktree', 'add', '--detach', path)
       end
@@ -136,7 +142,7 @@ class Hiiro
 
     def move_worktree(from, to, repo_path: nil)
       if repo_path
-        run_system('-C', repo_path, 'worktree', 'move', from, to)
+        run_system('-C', self.class.repo_dir(repo_path), 'worktree', 'move', from, to)
       else
         run_system('worktree', 'move', from, to)
       end