hiiro 0.1.366 → 0.1.367

data/lib/hiiro/task_scope.rb

@@ -1,6 +1,6 @@
 class Hiiro
   class TaskScope
-    class Error < StandardError; end
+    class Error < Hiiro::Error; end
 
     attr_reader :reference
 
@@ -45,48 +45,7 @@ class Hiiro
     private
 
     def current_task
-      tasks = TaskRecord.all_as_list
-      if 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']
-        if ENV['HERDR_PANE_ID'] && !pane
-          raise Error, 'Cannot resolve the current Herdr pane; supply a task name'
-        end
-        workspace_id = ENV['HERDR_WORKSPACE_ID'] || pane&.workspace_id
-        if pane && workspace_id != pane.workspace_id
-          raise Error, 'Conflicting Herdr pane/workspace context; supply a task name'
-        end
-        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| (task.session || task.name).tr('.', '_') == workspace.name }
-        raise Error, "Ambiguous workspace task: #{matches.map(&:name).join(', ')}" if matches.length > 1
-        return matches.first if matches.one?
-      end
-
-      cwd = File.realpath(Dir.pwd)
-      matches = tasks.select do |task|
-        directory = task.primary_directory || (task.tree && (task.tree.start_with?('/') ? task.tree : File.join(Hiiro::WORK_DIR, task.tree)))
-        paths = [task.home, directory, *task.resources.where(kind: 'directory').select_map(:target)].compact
-        paths.any? { |path| inside?(cwd, path) }
-      end
-      raise Error, "Ambiguous directory task: #{matches.map(&:name).join(', ')}" if matches.length > 1
-      return matches.first if matches.one?
-
-      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 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)
+      CurrentTask.new(herdr: @herdr, pin: true).resolve!
     end
   end
 end

data/lib/hiiro/task_sessions.rb

@@ -2,7 +2,7 @@ require 'shellwords'
 
 class Hiiro
   class TaskSessions
-    class Error < StandardError; end
+    class Error < Hiiro::Error; end
 
     def initialize(client, workspace:, directory:)
       @client = client

data/lib/hiiro/tasks.rb

@@ -175,6 +175,28 @@ class Hiiro
       task_name = scope == :subtask ? "#{current_parent_task.name}/#{name}" : name
       subtree_name = scope == :subtask ? "#{current_parent_task.name}/#{name}" : "#{name}/main"
 
+      target_path = create_tree(subtree_name, sparse_groups: sparse_groups)
+      return unless target_path
+
+      session_name = task_name
+      task = Task.new(name: task_name, tree: subtree_name, session: session_name)
+      config.save_task(task)
+
+      base_dir = target_path
+      if app_name
+        app = environment.find_app(app_name)
+        base_dir = app.resolve(target_path) if app
+      end
+
+      Dir.chdir(base_dir)
+      hiiro.start_herdr_workspace(session_name, start_directory: Dir.pwd)
+
+      puts "Started task '#{task_name}' in worktree '#{subtree_name}'"
+    end
+
+    # Create (or reuse an unassigned) worktree under WORK_DIR and return its path,
+    # or nil on failure. Shared by `h task start` and `t TASK tree new`.
+    def create_tree(subtree_name, sparse_groups: [])
       target_path = File.join(Hiiro::WORK_DIR, subtree_name)
 
       git = Hiiro::Git.new(nil, Hiiro::REPO_PATH)
@@ -184,33 +206,19 @@ class Hiiro
         FileUtils.mkdir_p(File.dirname(target_path))
         unless git.move_worktree(available.path, target_path, repo_path: Hiiro::REPO_PATH)
           puts "ERROR: Failed to rename worktree"
-          return
+          return nil
         end
       else
         puts "Creating new worktree '#{subtree_name}'..."
         FileUtils.mkdir_p(File.dirname(target_path))
         unless git.add_worktree_detached(target_path, repo_path: Hiiro::REPO_PATH)
           puts "ERROR: Failed to create worktree"
-          return
+          return nil
         end
       end
 
       apply_sparse_checkout(target_path, sparse_groups) if sparse_groups.any?
-
-      session_name = task_name
-      task = Task.new(name: task_name, tree: subtree_name, session: session_name)
-      config.save_task(task)
-
-      base_dir = target_path
-      if app_name
-        app = environment.find_app(app_name)
-        base_dir = app.resolve(target_path) if app
-      end
-
-      Dir.chdir(base_dir)
-      hiiro.start_herdr_workspace(session_name, start_directory: Dir.pwd)
-
-      puts "Started task '#{task_name}' in worktree '#{subtree_name}'"
+      target_path
     end
 
     def switch_to_task(task, app_name: nil, force: false)
@@ -1463,10 +1471,11 @@ class Hiiro
     end
 
     def name
-      @name ||= if path.start_with?(Hiiro::WORK_DIR + '/')
-        path.sub(Hiiro::WORK_DIR + '/', '')
-      else
-        File.basename(path)
+      @name ||= begin
+        roots = [Hiiro::WORK_DIR]
+        roots << File.realpath(Hiiro::WORK_DIR) if Dir.exist?(Hiiro::WORK_DIR)
+        root = roots.uniq.find { |dir| path.start_with?(dir + '/') }
+        root ? path.delete_prefix(root + '/') : File.basename(path)
       end
     end
 
@@ -1683,13 +1692,17 @@ class Hiiro
     end
 
     def task
+      return @task if defined?(@task)
+
+      s = session
+      t = tree
+      @task = all_tasks.find { |task|
+        (s && task.session_name == s.name) ||
+          (t && (task.tree_name == t.name || task.tree_name == t.path))
+      }
       @task ||= begin
-        s = session
-        t = tree
-        all_tasks.find { |task|
-          (s && task.session_name == s.name) ||
-            (t && (task.tree_name == t.name || task.tree_name == t.path))
-        }
+        record = CurrentTask.new(herdr: -> { Hiiro::Herdr.client }, cwd: path, pin: false).resolve
+        record && all_tasks.find { |task| task.name == record.name }
       end
     end
 

data/lib/hiiro/version.rb

@@ -1,4 +1,4 @@
 class Hiiro
-  VERSION = "0.1.366"
+  VERSION = "0.1.367"
   SUPPORTED_RUBY_VERSION = ">= 3.2.0"
 end

data/lib/hiiro.rb

@@ -6,6 +6,7 @@ require "ostruct"
 require 'awesome_print'
 
 require_relative "hiiro/version"
+require_relative "hiiro/error"
 require_relative "hiiro/config"
 require_relative "hiiro/effects"
 require_relative "hiiro/db"
@@ -46,6 +47,10 @@ require_relative "hiiro/pane_home"
 require_relative "hiiro/pin_record"
 require_relative "hiiro/reminder"
 require_relative 'hiiro/registry'
+require_relative 'hiiro/current_task'
+require_relative 'hiiro/task_scope'
+require_relative 'hiiro/task_sessions'
+require_relative 'hiiro/task_cli'
 require_relative 'hiiro/tui'
 
 class String
@@ -65,7 +70,7 @@ class Hiiro
   WORK_DIR = File.join(Dir.home, 'work')
   REPO_PATH = File.join(WORK_DIR, '.git')
 
-  def self.init(*oargs, plugins: [], logging: false, tasks: false, task_scope: nil, **values, &block)
+  def self.init(*oargs, plugins: [], logging: false, tasks: false, task_scope: nil, builtin_commands: true, **values, &block)
     load_env
     Hiiro::DB.setup!
 
@@ -98,24 +103,14 @@ class Hiiro
     new(h_bin, *h_args, logging: logging, tasks: tasks, task_scope: task_scope, **values).tap do |hiiro|
       hiiro.load_plugins(plugins)
 
-      hiiro.add_subcommand(:pry) { |*args|
-        binding.pry
-      }
-
-      hiiro.add_subcmd(:edit, **values) { |*args|
-        hiiro.edit_files(hiiro.bin)
-      }
-
-      if hiiro.tasks_enabled?
-        hiiro.add_subcmd(:task) do |*args|
-          tm = TaskManager.new(hiiro, scope: :task)
-          Tasks.build_hiiro(hiiro, tm).run
-        end
+      if builtin_commands
+        hiiro.add_subcommand(:pry) { |*args|
+          binding.pry
+        }
 
-        hiiro.add_subcmd(:subtask) do |*args|
-          tm = TaskManager.new(hiiro, scope: :subtask)
-          Tasks.build_hiiro(hiiro, tm).run
-        end
+        hiiro.add_subcmd(:edit, **values) { |*args|
+          hiiro.edit_files(hiiro.bin)
+        }
       end
 
       if block
@@ -132,8 +127,8 @@ class Hiiro
     Options.setup(&block)
   end
 
-  def self.run(*args, plugins: [], logging: false, tasks: false, task_scope: nil, **values, &block)
-    hiiro = init(*args, plugins:, logging:, tasks:, task_scope:, **values, &block)
+  def self.run(*args, plugins: [], logging: false, tasks: false, task_scope: nil, builtin_commands: true, **values, &block)
+    hiiro = init(*args, plugins:, logging:, tasks:, task_scope:, builtin_commands:, **values, &block)
 
     hiiro.run
   end
@@ -227,6 +222,12 @@ class Hiiro
     Hiiro::Config.open(file, dir: dir)
   end
 
+  # Open a file, directory, or URL with the OS default handler.
+  def open_default(target)
+    executable = RUBY_PLATFORM.include?('darwin') ? 'open' : 'xdg-open'
+    system(executable, target)
+  end
+
   def herdr_client
     @herdr_client ||= Herdr.client!(self)
   end
@@ -276,6 +277,8 @@ class Hiiro
     handle_result(result)
 
     exit 1
+  rescue Hiiro::Error => e
+    abort "ERROR: #{e.message}"
   rescue => e
     puts "ERROR: #{e.message}"
     puts e.backtrace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.366
+  version: 0.1.367
 platform: ruby
 authors:
 - Joshua Toyota
@@ -129,6 +129,8 @@ email:
 executables:
 - h
 - hiiro
+- t
+- tt
 extensions: []
 extra_rdoc_files: []
 files:
@@ -170,6 +172,7 @@ files:
 - bin/h-sha
 - bin/h-sparse
 - bin/h-tags
+- bin/h-task
 - bin/h-time
 - bin/h-title
 - bin/h-todo
@@ -336,6 +339,8 @@ files:
 - examples/sparse_groups.yml
 - exe/h
 - exe/hiiro
+- exe/t
+- exe/tt
 - h-tmux-plugins.tmux
 - hiiro.gemspec
 - lib/hiiro.rb
@@ -349,8 +354,10 @@ files:
 - lib/hiiro/capture.rb
 - lib/hiiro/check_run.rb
 - lib/hiiro/config.rb
+- lib/hiiro/current_task.rb
 - lib/hiiro/db.rb
 - lib/hiiro/effects.rb
+- lib/hiiro/error.rb
 - lib/hiiro/fuzzyfind.rb
 - lib/hiiro/git.rb
 - lib/hiiro/git/branch.rb
@@ -383,6 +390,7 @@ files:
 - lib/hiiro/service_manager.rb
 - lib/hiiro/shell.rb
 - lib/hiiro/tags.rb
+- lib/hiiro/task_cli.rb
 - lib/hiiro/task_record.rb
 - lib/hiiro/task_scope.rb
 - lib/hiiro/task_sessions.rb