hiiro 0.1.368 → 0.1.369

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 975c627734daa28e7efa5c45802cd3f296ec3f338c7e2ad73835e22d219223e6
-  data.tar.gz: bcd42f9f3b2ca7bbaf33b67e1535aa4729d3701f353d313bfe3a7f64c27b3e19
+  metadata.gz: 3565b794ff2dd7e61d45810479a5bed58621c54ac4e3afa51f12adeb9626c639
+  data.tar.gz: 75073d800fee5ab0185eea6062b39961b7f68c4200a1f428f8ac72f090edabd5
 SHA512:
-  metadata.gz: 22b19c645b77356da44007ab866f00f769ef875444b9ad5b4d00ae080ff5797b3b4cc3c500b65118ba3801f025c061f8ef01bb885aff7a63692c83c3b1ee09cc
-  data.tar.gz: aad14264c543596424e10c301401e618e13adbef8dd7e6088b9d1b6c3e9374a357040d2886843057c290f0dda65a6f6100992bfbf3bdd3d1049eb914984ea8c5
+  metadata.gz: 9435184f96a4b71ea43ecb873180411326aaf5ebb866153748be8f9e5fdbe7605d92c71df4506498029772f510374e91034ce74748663a9d1b4de8ff264d5c17
+  data.tar.gz: 8a8a5539086877c051ce05639fdb2c72a626c88d92284981c551fff2a3b6a8d6e048250d969b6fedb4e811c720da0a4c58a1e6aa97dddebeba1a478f1c26194e

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.1.369] - 2026-09-14
+
+### Added
+- `t switch NAME` matches live Herdr workspaces that belong to no task, and the fuzzy finder for `switch` lists tasks plus those workspaces, numbering duplicate workspace names
+- `t` opens the fuzzy finder instead of failing when a task prefix is ambiguous or no current task can be resolved, when stdin is a terminal
+
 ## [0.1.368] - 2026-09-14
 
 ### Added
@@ -97,4 +103,4 @@
 - Focus the exact Herdr pane through the socket API and read the CLI's plain-text pane output without JSON parsing.
 - Restore the missing `Hiiro::Bins` helper so `require "hiiro"` boots and commands like `h jumplist record` dispatch correctly.
 - Make Hiiro's Ruby requirement explicit as Ruby 3.2+ and have rbenv-wide gem installs skip incompatible Ruby versions.
-- Update the publish script to preserve the Ruby support constant, run only on supported Ruby, and install releases only into compatible rbenv versions.
+- Update the publish script to preserve the Ruby support constant, run only on supported Ruby, and install releases only into compatible rbenv versions.

data/README.md

@@ -73,7 +73,8 @@ Commands that act on a task take it from the first positional argument when
 that word names a task (exact or unique case-sensitive prefix); otherwise the
 current task is used and the word stays in the payload, exactly like the old
 `h task` commands. `-t TASK` forces a task, `-f` picks one with a fuzzy finder,
-`.` is the current task, and `-` selects orphan todos. Ambiguous prefixes fail.
+`.` is the current task, and `-` selects orphan todos. On a terminal, an ambiguous
+prefix or a missing current task opens the fuzzy finder; non-interactive runs fail.
 
 The current task is the calling Herdr workspace, then the current directory
 inside a task home, code directory, worktree, or registered directory, then the

data/docs/t.md

@@ -17,11 +17,11 @@ The command comes first. Commands that act on a task take it from the first posi
 
 1. If the first positional word names a task, exactly or by a unique case-sensitive prefix, it is the task and is removed from the arguments.
 2. Otherwise the current task is used and the word stays in the payload. So `t todo add fix build` adds to the current task and `t todo add prez fix build` adds to `prez`.
-3. An ambiguous prefix is an error rather than a guess.
+3. An ambiguous prefix opens the fuzzy finder over the matching tasks when stdin is a terminal, and is an error otherwise.
 
 `-t TASK` / `--task TASK` forces a task and fails if it does not exist. `-f` / `--find` picks one with `sk` or `fzf`. `.` is the current task, useful when a payload could be mistaken for a name: `t next . Finish slides`. `-` selects orphan todos in todo commands only. Words starting with `-` are never treated as task names. Passthrough commands (`todo add`, `sh`, `pane run`, and the AI launchers) accept `-t`, `--task=NAME`, and `-f` only as their leading arguments.
 
-The current task is resolved by `Hiiro::CurrentTask`: the calling Herdr workspace when `HERDR_*` variables identify one, then the working directory inside a task home, primary directory, worktree, or registered directory, then the task saved by `t use`. Ambiguous matches and stale or conflicting Herdr IDs are errors. Commands that only list, create, or show help never resolve the current task.
+The current task is resolved by `Hiiro::CurrentTask`: the calling Herdr workspace when `HERDR_*` variables identify one, then the working directory inside a task home, primary directory, worktree, or registered directory, then the task saved by `t use`. With no context at all, a terminal gets the fuzzy finder over every task; non-interactive runs fail. Ambiguous directory or workspace matches and stale or conflicting Herdr IDs are always errors. Commands that only list, create, or show help never resolve the current task.
 
 Task names may be `parent/child` for subtasks. `t new NAME` creates exactly `NAME`; nothing else creates tasks. Only `help`, `ls`, and `list` are reserved words; a task literally named `show` or `new` is reachable with `-t show`.
 
@@ -112,7 +112,7 @@ t pane run [TASK] ID|LABEL [--] COMMAND...
 t pane split [TASK] ID|LABEL [--direction right|down] [--directory PATH] [--command COMMAND]
 ```
 
-These require a running Herdr server. The workspace label is the task session or name with `.` replaced by `_`. `switch` focuses the existing workspace or creates it in the start directory (`--directory`, else primary directory, worktree, or home), and saves the task as the fallback when it was named explicitly. `--show` only prints the workspace, tabs, and panes. Tab and pane references match a live ID or label, then a unique prefix; with no reference and several candidates a fuzzy finder opens.
+These require a running Herdr server. The workspace label is the task session or name with `.` replaced by `_`. `switch` also accepts the name of a live Herdr workspace that belongs to no task, exactly or by unique prefix, and focuses it; a task with the same name wins. When the name is ambiguous, or no task or context is given, a terminal gets a fuzzy finder over tasks and loose workspaces, with duplicate workspace names numbered in the label only. `switch` focuses the existing task workspace or creates it in the start directory (`--directory`, else primary directory, worktree, or home), and saves the task as the fallback when it was named explicitly. `--show` only prints the workspace, tabs, and panes. Tab and pane references match a live ID or label, then a unique prefix; with no reference and several candidates a fuzzy finder opens.
 
 ## Native AI sessions
 

data/lib/hiiro/task_cli.rb

@@ -40,24 +40,37 @@ class Hiiro
         add_flag :find, short: :f, desc: 'Choose the task with a fuzzy finder'
       end
 
-      def task_names
-        Hiiro::TaskRecord.all_as_list.map(&:name)
-      end
-
       # Exact name, else unique prefix; ambiguous prefixes fail; nil when nothing matches.
+      # Exact name, else unique prefix. An ambiguous prefix opens the fuzzy finder
+      # over the candidates on a TTY and fails otherwise. nil when nothing matches.
       def lookup_task(reference)
         result = Hiiro::Matcher.new(Hiiro::TaskRecord.all_as_list, :name).by_prefix(reference.to_s)
         match = result.resolved
-        raise Error, "Ambiguous task #{reference}: #{result.matches.map { |m| m.item.name }.join(', ')}" if !match && result.ambiguous?
-        match&.item
+        return match.item if match
+        return nil unless result.ambiguous?
+        candidates = result.matches.map(&:item)
+        raise Error, "Ambiguous task #{reference}: #{candidates.map(&:name).join(', ')}" unless $stdin.tty?
+        pick_task(candidates)
+      end
+
+      def pick_task(candidates)
+        raise Error, 'No tasks; create one with t new NAME' if candidates.empty?
+        name = fuzzyfind(candidates.map(&:name))
+        raise Error, 'No task selected' if name.nil? || name.strip.empty?
+        candidates.find { |task| task.name == name.strip } || raise(Error, "No task named #{name.strip}")
       end
 
       def lookup_task!(reference)
         lookup_task(reference) || raise(Error, "Task not found: #{reference}; run t new #{reference}")
       end
 
+      # Current task from Herdr, directory, or the saved pin. With no context at all,
+      # a TTY gets the fuzzy finder over every task; ambiguous or stale context still fails.
       def current_task
         Hiiro::CurrentTask.new(herdr: -> { herdr_client }, pin: true).resolve!
+      rescue Hiiro::Error => e
+        raise unless $stdin.tty? && e.message.start_with?('No current task')
+        pick_task(Hiiro::TaskRecord.all_as_list)
       end
 
       # Old h task rule: [task, remaining_args]. The first positional is the task
@@ -80,11 +93,7 @@ class Hiiro
           end
         end
         return [lookup_task!(forced), args] if forced
-        if find
-          name = fuzzyfind(task_names)
-          raise Error, 'No task selected' if name.nil? || name.strip.empty?
-          return [lookup_task!(name.strip), args]
-        end
+        return [pick_task(Hiiro::TaskRecord.all_as_list), args] if find
         first = args.first
         if first == '.'
           args.shift
@@ -450,6 +459,65 @@ class Hiiro
         puts workspace
       end
 
+      # --- switch targets: tasks plus live Herdr workspaces that are not task workspaces ---
+
+      def loose_workspaces
+        return [] unless herdr_client.server_running?
+        labels = Hiiro::TaskRecord.all_as_list.map { |task| workspace_label(task) }
+        client.workspaces.reject { |workspace| labels.include?(workspace.name) }
+      end
+
+      # Fuzzy map over tasks and loose workspaces; duplicate workspace names are numbered
+      # in the label only, so the choice still maps to the exact workspace.
+      def pick_switch_target(tasks, workspaces)
+        raise Error, 'No tasks or workspaces to choose from' if tasks.empty? && workspaces.empty?
+        counts = workspaces.group_by(&:name).transform_values(&:length)
+        seen = Hash.new(0)
+        map = tasks.to_h { |task| [task.name, task] }
+        workspaces.each do |workspace|
+          seen[workspace.name] += 1
+          label = counts[workspace.name] > 1 ? "#{workspace.name} ##{seen[workspace.name]}" : workspace.name
+          map["#{label} (workspace)"] = workspace
+        end
+        fuzzyfind_from_map(map) || raise(Error, 'Nothing selected')
+      end
+
+      # [target, explicit]. A task wins over a workspace with the same name.
+      def switch_target(args)
+        args = args.dup
+        return [lookup_task!(opts.task), true] if opts.task
+        return [pick_switch_target(Hiiro::TaskRecord.all_as_list, loose_workspaces), true] if opts.find
+        first = args.first
+        if first && first != '.' && !first.start_with?('-')
+          args.shift
+          no_args!(args)
+          tasks = Hiiro::TaskRecord.all_as_list
+          workspaces = loose_workspaces
+          exact = tasks.find { |task| task.name == first }
+          return [exact, true] if exact
+          exact_ws = workspaces.select { |workspace| workspace.name == first }
+          return [exact_ws.first, false] if exact_ws.one?
+          task_matches = tasks.select { |task| task.name.start_with?(first) }
+          ws_matches = exact_ws.any? ? exact_ws : workspaces.select { |workspace| workspace.name.start_with?(first) }
+          return [task_matches.first, true] if task_matches.one? && ws_matches.empty?
+          return [ws_matches.first, false] if ws_matches.one? && task_matches.empty?
+          raise Error, "No task or workspace matches #{first}" if task_matches.empty? && ws_matches.empty?
+          names = (task_matches.map(&:name) + ws_matches.map { |w| "#{w.name} (workspace)" }).join(', ')
+          raise Error, "Ambiguous #{first}: #{names}" unless $stdin.tty?
+          target = pick_switch_target(task_matches, ws_matches)
+          return [target, target.is_a?(Hiiro::TaskRecord)]
+        end
+        args.shift if first == '.'
+        no_args!(args)
+        begin
+          [Hiiro::CurrentTask.new(herdr: -> { herdr_client }, pin: true).resolve!, false]
+        rescue Hiiro::Error => e
+          raise unless $stdin.tty? && e.message.start_with?('No current task')
+          target = pick_switch_target(Hiiro::TaskRecord.all_as_list, loose_workspaces)
+          [target, target.is_a?(Hiiro::TaskRecord)]
+        end
+      end
+
       # --- Worktrees (shared with h task via Hiiro::TaskManager) ---
 
       def tree_manager
@@ -668,10 +736,15 @@ class Hiiro
         end
 
         add_option :directory, desc: 'Existing start directory'
-        add_cmd(:switch, :workspace, args: ['task?'], opts: [*TASK_OPTIONS, :directory, :show]) do
-          explicit = opts.task || opts.find || (opts.args.first && opts.args.first != '.')
-          task = take_task_only(opts.args)
-          opts.show ? show_workspace(task) : open_workspace(task, save: explicit)
+        add_cmd(:switch, :workspace, args: ['task-or-workspace?'], opts: [*TASK_OPTIONS, :directory, :show]) do
+          target, explicit = switch_target(opts.args)
+          if target.is_a?(Hiiro::Herdr::Workspace)
+            raise Error, '--show applies to task workspaces' if opts.show
+            check_result(client.focus_workspace(target.id))
+            puts target
+          else
+            opts.show ? show_workspace(target) : open_workspace(target, save: explicit)
+          end
         end
 
         [%w[omp], %w[codex cdx], %w[claude cld]].each do |names|

data/lib/hiiro/version.rb

@@ -1,4 +1,4 @@
 class Hiiro
-  VERSION = "0.1.368"
+  VERSION = "0.1.369"
   SUPPORTED_RUBY_VERSION = ">= 3.2.0"
 end

metadata

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