hiiro 0.1.366 → 0.1.368

data/docs/why-t.md

@@ -44,13 +44,13 @@ tt fix-checkout add Inspect --help output
 t fix-checkout todo
 ```
 
-Task display and todo listing show every todo with its ID, status, and text. To remove one, use its displayed ID, such as `t fix-checkout todo rm 42`. The ID must belong to that scope. Adding or removing todos does not change the task's next action or status, and `t` does not choose the next todo for you.
+Task display and todo listing show every todo with its ID, status, and text. To remove one, use its displayed ID, such as `t todo rm fix-checkout 42`, or print just its text with `t todo show 42`. The ID must belong to that scope. Adding or removing todos does not change the task's next action or status, and `t` does not choose the next todo for you.
 
-Task references prefer an exact name, then a unique case-sensitive prefix. Ambiguous prefixes fail. If `todo add` finds no task, it creates one with the usual name and notes-home rules before adding the item. Other commands never create unknown tasks except explicit `t NAME new`, which creates that exact name rather than resolving a prefix.
+Task references prefer an exact name, then a unique case-sensitive prefix. Ambiguous prefixes fail. A first word that names no task is treated as payload for the current task, so `t todo add fix build` never creates a task named `fix`. Only `t new NAME` creates tasks, and it creates that exact name rather than resolving a prefix.
 
-`tt TASK ...` delegates to `t TASK todo ...`. Bare `tt` lists current-task todos, and `tt help` shows todo help. Use `t - todo` or `tt -` to list orphan todos, with `add` and `rm` in that scope. `-` is not a task and works only for todos.
+`tt ...` is `t todo ...`. Bare `tt` lists current-task todos, and `tt help` shows todo help. Use `t todo -` or `tt add - TEXT` for orphan todos. `-` is not a task and works only for todos.
 
-Every word after `add` is literal text, including flags and `--`, except that leading `add -h` or `add --help` shows help. Empty text fails before any task is created.
+Every word after the task in `add` is literal text, including flags and `--`, except a leading `-h` or `--help`, which shows help. Empty text fails.
 
 Todos share the existing database table with `h todo`. `t` does not rewrite `todo.yml` or change `h task` behavior. Keep the longer investigation in a document.
 
@@ -73,7 +73,7 @@ That saves the explanation and changes the task's status to `waiting`. The next
 }
 ```
 
-Bare `t` lists every task and status, including done and archived work. Active and waiting rows show their next-action and blocker text, so you can review what needs attention without opening every terminal.
+Bare `t` (or `t ls` / `t list`) lists every task and status, including done and archived work. Each name carries its open todo count, such as `prez (3)`, and active and waiting rows show their next-action and blocker text, so you can review what needs attention without opening every terminal.
 
 When the answer arrives:
 
@@ -205,26 +205,24 @@ The workspace identifies running terminals, not a separate persisted-session sto
 
 ## Context can save typing without making scripts guess
 
-The first argument is always the task reference. `t TASK` shows the task, and `t TASK COMMAND...` runs a command in that task's scope. Only exact root `t help` is special: it prints usage and native scoped help without task lookup. Names such as `new`, `show`, `edit`, and `he` remain task names at the root.
-
-Use `.` when the calling Herdr workspace, directory, or saved fallback identifies the task:
+The command comes first, and the task is optional: `t show fix-checkout` names it, `t show` uses the current task. A first word that names a task, exactly or by unique prefix, is the task; anything else is payload for the current task, the same rule the old `h task` commands used. `-t TASK` forces a task, `-f` picks one with a fuzzy finder, and `.` stands for the current task when a payload could look like a name:
 
 ```bash
-t . current
-t .
-t . next
-t . next 'Check the new test against the original failing payload'
+t current
+t show
+t next
+t next . 'Check the new test against the original failing payload'
 ```
 
-A named reference bypasses context lookup. For `.`, the calling Herdr workspace wins over a conflicting current directory. The directory is next, followed by the saved task. Ambiguous matches and invalid, stale, or conflicting Herdr IDs are errors.
+The calling Herdr workspace wins over a conflicting current directory. The directory is next, followed by the saved task. Ambiguous matches and invalid, stale, or conflicting Herdr IDs are errors.
 
 You can set that fallback without moving terminal focus:
 
 ```bash
-t fix-checkout current
+t use fix-checkout
 ```
 
-`t . current` only prints the selected name. Reads and workspace opens through `.` leave the saved fallback unchanged. A deleted saved task causes an error if selection reaches it. Bare `t` always lists all tasks rather than selecting one.
+`t current` only prints the selected name. Reads leave the saved fallback unchanged; `t switch NAME` saves it after a successful switch. A deleted saved task causes an error if selection reaches it. Bare `t` always lists all tasks rather than selecting one.
 
 ## An agent can leave you a useful place to resume
 
@@ -284,16 +282,16 @@ You do not need to use every command for this to pay off.
 
 | Moment | Useful command | What it gives you |
 |---|---|---|
-| You capture a new piece of work | `t TASK new` | An exact named record and notes home |
-| You capture another step | `tt TASK add 'Compare the retry settings'` | A todo without replacing the next action; creates a task if no name or prefix matches |
+| You capture a new piece of work | `t new TASK` | An exact named record and notes home |
+| You capture another step | `tt add 'Compare the retry settings'` | A todo on the current task without replacing the next action |
 | You decide what to work on | `t` | Every task and status, with next-action and blocker text |
-| You resume a task | `t TASK` | The context you recorded for it |
-| You want a fallback outside task directories and Herdr | `t TASK current` | Saved selection without moving terminal focus |
-| You need its terminals | `t TASK switch` | The associated workspace and a saved fallback after success |
-| You want a fresh AI session | `t TASK omp` | A new focused tab running the native tool |
-| You are about to switch away | `t TASK next 'The next concrete action'` | An instruction for your next session |
-| Someone else is blocking progress | `t TASK waiting 'Who or what I need'` | A waiting state and explanation |
-| The work is complete | `t TASK done` | A done status without deleting the supporting context |
+| You resume a task | `t show TASK` | The context you recorded for it |
+| You want a fallback outside task directories and Herdr | `t use TASK` | Saved selection without moving terminal focus |
+| You need its terminals | `t switch TASK` | The associated workspace and a saved fallback after success |
+| You want a fresh AI session | `t omp TASK` | A new focused tab running the native tool |
+| You are about to switch away | `t next 'The next concrete action'` | An instruction for your next session |
+| Someone else is blocking progress | `t waiting 'Who or what I need'` | A waiting state and explanation |
+| The work is complete | `t done TASK` | A done status without deleting the supporting context |
 
 Start with task names and useful next actions. Add documents, links, and terminal organization when they make a particular task easier to resume.
 
@@ -303,4 +301,4 @@ Start with task names and useful next actions. Add documents, links, and termina
 
 ## Read next
 
-[The complete t command reference](t.md) covers every subcommand, option, alias, state transition, storage location, and Herdr/worktree side effect. The canonical implementation is the repository's `bin/t`, with `~/bin/t` as its symlink. Gem installation does not install the launcher.
+[The complete t command reference](t.md) covers every subcommand, option, alias, state transition, storage location, and Herdr/worktree side effect. The implementation is `Hiiro::TaskCli` in `lib/hiiro/task_cli.rb`, launched by the `t` and `tt` gem executables in `exe/`.

data/exe/h

@@ -97,6 +97,7 @@ Hiiro.run(*ARGV, cwd: Dir.pwd, tasks: true) do
       'github' => %w[pr],
       'claude' => %w[claude],
       'hiiro'  => %w[bin plugin],
+      'task'   => %w[task],
       'other'  => %w[app bg config link misc project todo],
     }
 

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/herdr-plugin/herdr-plugin.toml

@@ -0,0 +1,47 @@
+# Hiiro task actions for Herdr. Install with `h herdr install`, which copies this
+# directory to ~/.config/hiiro/herdr-plugin and links it. Every action opens the
+# popup pane with HIIRO_HERDR_ACTION set; `h herdr popup` does the work there.
+id = "hiiro"
+name = "Hiiro tasks"
+version = "0.1.0"
+min_herdr_version = "0.7.4"
+description = "Fuzzy task switcher, todo capture, and task shell/editor popups backed by the t CLI."
+platforms = ["linux", "macos"]
+
+[[actions]]
+id = "switch"
+title = "Switch to task…"
+contexts = ["workspace"]
+command = ["h", "herdr", "action", "switch"]
+
+[[actions]]
+id = "todo-add"
+title = "Add todo to task…"
+contexts = ["workspace"]
+command = ["h", "herdr", "action", "todo-add"]
+
+[[actions]]
+id = "todos"
+title = "Copy a todo from the current task…"
+contexts = ["workspace"]
+command = ["h", "herdr", "action", "todos"]
+
+[[actions]]
+id = "shell"
+title = "Shell in the current task directory"
+contexts = ["workspace"]
+command = ["h", "herdr", "action", "shell"]
+
+[[actions]]
+id = "nvim"
+title = "nvim in the current task notes"
+contexts = ["workspace"]
+command = ["h", "herdr", "action", "nvim"]
+
+[[panes]]
+id = "popup"
+title = "hiiro"
+placement = "popup"
+width = "70%"
+height = "70%"
+command = ["h", "herdr", "popup"]

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 use NAME' unless @pin
+
+      saved = PinRecord.find_key('t', 'current_task')
+      raise Error, 'No current task; supply a task name or run t use NAME' unless saved
+
+      TaskRecord[saved.value] || raise(Error, 'Saved task no longer exists; run t use NAME')
+    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