hiiro 0.1.211 → 0.1.212

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93161b29e527a19a17c9e478558ab0d33a925e27ac04851151d4d86fd1f59f49
-  data.tar.gz: 775639bdc0be84af6ea30e8edf33251c5ed769614e51c59c12ab1c681be33ebc
+  metadata.gz: 595b4d37c446a020b8c28e0698d57f918844638f564a13fbb5cc1eaf63ac8ae1
+  data.tar.gz: 85dee985c6307a9e9d818d4bec6be82b8f2b6dea4192ad3ac948548070ffecf0
 SHA512:
-  metadata.gz: 30c25c505dc5bfcc956a3be84245f3c3a680f6fe326963083a101f41781cb8a4437fa94d5655cb99fe40a9b0a051b9db73c3eeac3bf1fbbe4f42c2011f4dace2
-  data.tar.gz: e09c57d45a81c8c2334ab779d96da3ce024ad01904213895d874889697cc26ec6773d8f1589d43cc192a15a99d9da97d206215e725494af92ce6cbf4398bfb2b
+  metadata.gz: 9cdd2c615aa42d82551f50fc00c97166f90f6c6918e888daf0570897eb036d6a251d20c96f46160744dae06d01035daca31ed65532a516249bdb5af4a263d1e2
+  data.tar.gz: c74ad66f0945e8689e6f0d414365d4760c16d6115d67566fece2848f683d88b328bb614101b2b5a704d2a1e591e160c890f82b84cd30e10c7ef7bda2b5d98d54

data/bin/h-pr

@@ -9,168 +9,6 @@ require "tempfile"
 
 Hiiro.load_env
 
-class PRManager
-  attr_reader :hiiro
-
-  def initialize(hiiro)
-    @hiiro = hiiro
-  end
-
-  def save(pr_number = nil)
-    pr_info = fetch_pr_info(pr_number)
-    unless pr_info
-      puts "ERROR: Could not find PR"
-      puts "Make sure you have the gh CLI installed and authenticated."
-      return false
-    end
-
-    entry = build_entry(pr_info)
-    unless entry[:task]
-      puts "WARNING: Not in a task session, saving without task info"
-    end
-
-    data = load_data
-    data['prs'] ||= []
-
-    # Check if this PR is already recorded for this task
-    existing = data['prs'].find do |p|
-      p['number'] == pr_info['number'] && p['task'] == entry[:task]
-    end
-
-    if existing
-      # Update existing entry
-      existing.merge!(entry.transform_keys(&:to_s))
-      existing['updated_at'] = Time.now.iso8601
-      puts "Updated PR ##{pr_info['number']} for task '#{entry[:task]}'"
-    else
-      # Add new entry
-      data['prs'] << entry.transform_keys(&:to_s).merge('created_at' => Time.now.iso8601)
-      puts "Saved PR ##{pr_info['number']} for task '#{entry[:task]}'"
-    end
-
-    save_data(data)
-    show_entry(entry)
-    true
-  end
-
-  def current
-    pr_info = fetch_pr_info
-    unless pr_info
-      puts "No PR found for current branch."
-      puts "Create one with 'gh pr create' or specify a PR number."
-      return false
-    end
-
-    entry = build_entry(pr_info)
-    puts "Current PR info:"
-    puts
-    show_entry(entry)
-  end
-
-  def open(pr_number = nil)
-    if pr_number
-      system('gh', 'pr', 'view', pr_number.to_s, '--web')
-    else
-      system('gh', 'pr', 'view', '--web')
-    end
-  end
-
-  def view(pr_number = nil)
-    if pr_number
-      system('gh', 'pr', 'view', pr_number.to_s)
-    else
-      system('gh', 'pr', 'view')
-    end
-  end
-
-  private
-
-  def fetch_pr_info(pr_number = nil)
-    cmd = if pr_number
-      ['gh', 'pr', 'view', pr_number.to_s, '--json', 'number,title,url,headRefName,state']
-    else
-      ['gh', 'pr', 'view', '--json', 'number,title,url,headRefName,state']
-    end
-
-    output = `#{cmd.join(' ')} 2>/dev/null`
-    return nil if output.empty?
-
-    JSON.parse(output)
-  rescue JSON::ParserError
-    nil
-  end
-
-  def build_entry(pr_info)
-    current_task = Environment.current.task
-    tmux_info = capture_tmux_info
-
-    {
-      number: pr_info['number'],
-      title: pr_info['title'],
-      url: pr_info['url'],
-      branch: pr_info['headRefName'],
-      state: pr_info['state'],
-      worktree: current_task&.tree_name,
-      task: current_task&.name,
-      tmux: tmux_info
-    }
-  end
-
-  def capture_tmux_info
-    return nil unless ENV['TMUX']
-
-    {
-      'session' => `tmux display-message -p '#S'`.strip,
-      'window' => `tmux display-message -p '#W'`.strip,
-      'pane' => ENV['TMUX_PANE']
-    }
-  end
-
-  def format_entry(entry, num)
-    lines = []
-    lines << "#{num}. PR ##{entry['number']}: #{entry['title']}"
-    lines << "   Branch: #{entry['branch']}"
-    lines << "   State: #{entry['state']}"
-    lines << "   Task: #{entry['task'] || '(none)'}"
-    lines << "   Worktree: #{entry['worktree'] || '(none)'}"
-    if entry['tmux']
-      lines << "   Tmux: #{entry['tmux']['session']}/#{entry['tmux']['window']}"
-    end
-    lines << "   Created: #{entry['created_at']}"
-    lines << "   URL: #{entry['url']}"
-    lines.join("\n")
-  end
-
-  def show_entry(entry)
-    puts "  PR: ##{entry[:number]}"
-    puts "  Title: #{entry[:title]}"
-    puts "  Branch: #{entry[:branch]}"
-    puts "  State: #{entry[:state]}"
-    puts "  URL: #{entry[:url]}"
-    puts "  Task: #{entry[:task] || '(none)'}"
-    puts "  Worktree: #{entry[:worktree] || '(none)'}"
-    if entry[:tmux]
-      puts "  Tmux session: #{entry[:tmux]['session']}"
-      puts "  Tmux window: #{entry[:tmux]['window']}"
-      puts "  Tmux pane: #{entry[:tmux]['pane']}"
-    end
-  end
-
-  def data_file
-    File.join(Dir.home, '.config', 'hiiro', 'prs.yml')
-  end
-
-  def load_data
-    return {} unless File.exist?(data_file)
-    YAML.safe_load_file(data_file) || {}
-  end
-
-  def save_data(data)
-    FileUtils.mkdir_p(File.dirname(data_file))
-    File.write(data_file, YAML.dump(data))
-  end
-end
-
 class PinnedPRManager
   PINNED_FILE = File.join(Dir.home, '.config/hiiro/pinned_prs.yml')
 
@@ -618,14 +456,13 @@ class PinnedPRManager
 end
 
 Hiiro.run(*ARGV, plugins: [Pins]) do
-  manager = PRManager.new(self)
   pinned_manager = PinnedPRManager.new
 
   resolve_pr = ->(ref) {
     if ref.nil?
       pinned = pinned_manager.load_pinned
       if pinned.empty?
-        STDERR.puts "No pinned PRs. Use a PR number or 'h pr pin' to track PRs."
+        STDERR.puts "No tracked PRs. Use a PR number or 'h pr track' to track PRs."
         return nil
       end
       lines = pinned.each_with_index.each_with_object({}) do |(pr, idx), h|
@@ -724,15 +561,13 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   }
 
   add_subcmd(:edit) { edit_files(__FILE__) }
-  add_subcmd(:save) { |pr_number=nil| manager.save(pr_number) }
-  add_subcmd(:current) { manager.current }
   add_subcmd(:open) { |pr_number=nil|
     pr_number = resolve_pr.call(pr_number)
-    manager.open(pr_number) if pr_number
+    system('gh', 'pr', 'view', pr_number.to_s, '--web') if pr_number
   }
   add_subcmd(:view) { |pr_number=nil|
     pr_number = resolve_pr.call(pr_number)
-    manager.view(pr_number) if pr_number
+    system('gh', 'pr', 'view', pr_number.to_s) if pr_number
   }
 
   add_subcmd(:select) do |*args|
@@ -789,107 +624,68 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     end
   end
 
-  # === PR Pinning ===
+  # === PR Tracking ===
 
-  add_subcmd(:pin) do |ref = nil, *pin_args|
+  add_subcmd(:track) do |ref = nil|
     pr_info = nil
 
     case ref
-    when '-', nil
-      if ref == '-'
-        # Pin current branch's PR
-        pr_info = pinned_manager.fetch_current_branch_pr
-        unless pr_info
-          puts "No PR found for current branch"
-          next
-        end
-      else
-        # Select from my PRs
-        my_prs = pinned_manager.fetch_my_prs
-        if my_prs.empty?
-          puts "No open PRs found"
-          next
-        end
+    when nil
+      # Select from my open PRs
+      my_prs = pinned_manager.fetch_my_prs
+      if my_prs.empty?
+        puts "No open PRs found"
+        next
+      end
 
-        lines = my_prs.each_with_object({}) do |pr, h|
-          display = "##{pr['number']} [#{pr['headRefName']}] #{pr['title']}"
-          h[display] = pr
-        end
+      lines = my_prs.each_with_object({}) do |pr, h|
+        display = "##{pr['number']} [#{pr['headRefName']}] #{pr['title']}"
+        h[display] = pr
+      end
 
-        pr_info = fuzzyfind_from_map(lines)
-        unless pr_info
-          puts "No PR selected"
-          next
-        end
+      pr_info = fuzzyfind_from_map(lines)
+      unless pr_info
+        puts "No PR selected"
+        next
+      end
+    when '-'
+      # Track current branch's PR
+      pr_info = pinned_manager.fetch_current_branch_pr
+      unless pr_info
+        puts "No PR found for current branch"
+        next
       end
     when /^\d+$/
-      # Pin by PR number
+      # Track by PR number
       pr_info = pinned_manager.fetch_pr_info(ref)
       unless pr_info
         puts "PR ##{ref} not found"
         next
       end
     else
-      puts "Usage: h pr pin [-|PR_NUMBER]"
-      puts "  -       Pin current branch's PR"
-      puts "  <num>   Pin PR by number"
+      puts "Usage: h pr track [-|PR_NUMBER]"
+      puts "  -       Track current branch's PR"
+      puts "  <num>   Track PR by number"
       puts "  (none)  Select from your open PRs"
       next
     end
 
-    pinned_manager.pin(pr_info)
-    puts "Pinned PR ##{pr_info['number']}: #{pr_info['title']}"
-  end
-
-  add_subcmd(:unpin) do |ref = nil, *unpin_args|
-    pinned = pinned_manager.load_pinned
-
-    if pinned.empty?
-      puts "No pinned PRs"
-      next
-    end
-
-    pr_number = nil
-
-    if ref.nil?
-      # Select from pinned PRs
-      lines = pinned.each_with_index.each_with_object({}) do |(pr, idx), h|
-        h[pinned_manager.display_pinned(pr, idx)] = pr['number'].to_s
-      end
-
-      pr_number = fuzzyfind_from_map(lines)
-      unless pr_number
-        puts "No PR selected"
-        next
-      end
-    elsif ref =~ /^\d+$/
-      pr_number = ref
-    else
-      puts "Usage: h pr unpin [PR_NUMBER]"
+    if pinned_manager.pinned?(pr_info['number'])
+      puts "Already tracking ##{pr_info['number']}"
       next
     end
 
-    if pinned_manager.unpin(pr_number)
-      puts "Unpinned PR ##{pr_number}"
-    else
-      puts "PR ##{pr_number} was not pinned"
+    context = {}
+    env = Environment.current rescue nil
+    if env
+      task = env.task
+      context['task']         = task.name      if task
+      context['worktree']     = task.tree_name if task&.tree_name
+      context['tmux_session'] = env.session&.name
     end
-  end
 
-  add_subcmd(:pinned) do |*args|
-    pinned = pinned_manager.load_pinned
-
-    if pinned.empty?
-      puts "No pinned PRs"
-      next
-    end
-
-    puts "Pinned PRs:"
-    puts
-
-    pinned.each_with_index do |pr, idx|
-      puts pinned_manager.display_pinned(pr, idx)
-    end
+    pinned_manager.pin(pr_info.merge(context))
+    puts "Now tracking ##{pr_info['number']}: #{pr_info['title']}"
   end
 
   add_subcmd(:ls) do |*ls_args|
@@ -898,7 +694,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     pinned = pinned_manager.load_pinned
 
     if pinned.empty?
-      puts "No pinned PRs"
+      puts "No tracked PRs"
       next
     end
 
@@ -922,19 +718,13 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     pinned = pinned_manager.load_pinned
 
     if pinned.empty?
-      puts "No pinned PRs"
+      puts "No tracked PRs"
       next
     end
 
-    compact = status_args.include?('-c') || status_args.include?('--compact')
-
     pinned.each_with_index do |pr, idx|
-      if compact
-        puts pinned_manager.display_pinned(pr, idx)
-      else
-        puts pinned_manager.display_detailed(pr, idx)
-        puts
-      end
+      puts pinned_manager.display_detailed(pr, idx)
+      puts
     end
 
     last_checked = pinned.filter_map { |pr| pr['last_checked'] }.max
@@ -946,7 +736,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     pinned = pinned_manager.load_pinned
 
     if pinned.empty?
-      puts "No pinned PRs to update"
+      puts "No tracked PRs to update"
       next
     end
 
@@ -1014,11 +804,10 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
   end
 
   add_subcmd(:prune) do |*args|
-    # Alias to auto-unpin
     pinned = pinned_manager.load_pinned
 
     if pinned.empty?
-      puts "No pinned PRs"
+      puts "No tracked PRs"
       next
     end
 
@@ -1212,25 +1001,7 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     system('tmux', 'switch-client', '-t', target_session)
   end
 
-  add_subcmd(:track) do
-    pr_info = pinned_manager.fetch_current_branch_pr
-    unless pr_info
-      puts "No PR for current branch"
-      next
-    end
-
-    if pinned_manager.pinned?(pr_info['number'])
-      puts "Already tracking ##{pr_info['number']}"
-      next
-    end
-
-    full_info = pinned_manager.fetch_pr_info(pr_info['number'])
-    pinned_manager.pin(full_info)
-    puts "Now tracking ##{pr_info['number']}: #{pr_info['title']}"
-  end
-
-  add_subcmd(:ignore) do |ref = nil|
-    # Alias to unpin
+  add_subcmd(:rm) do |ref = nil|
     pinned = pinned_manager.load_pinned
 
     if pinned.empty?
@@ -1253,103 +1024,165 @@ Hiiro.run(*ARGV, plugins: [Pins]) do
     elsif ref =~ /^\d+$/
       pr_number = ref
     else
-      puts "Usage: h pr ignore [PR_NUMBER]"
+      puts "Usage: h pr rm [PR_NUMBER]"
       next
     end
 
     if pinned_manager.unpin(pr_number)
-      puts "Stopped tracking PR ##{pr_number}"
+      puts "Removed PR ##{pr_number} from tracking"
     else
       puts "PR ##{pr_number} was not tracked"
     end
   end
 
-  add_subcmd(:rm) do |ref = nil|
-    # Alias to ignore/unpin
-    pinned = pinned_manager.load_pinned
+  # === PR State ===
 
-    if pinned.empty?
-      puts "No tracked PRs"
+  add_subcmd(:ready) do |ref = nil|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+    system('gh', 'pr', 'ready', pr_number.to_s)
+  end
+
+  add_subcmd(:'to-draft') do |ref = nil|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+    system('gh', 'pr', 'ready', '--draft', pr_number.to_s)
+  end
+
+  # === PR Actions ===
+
+  add_subcmd(:diff) do |ref = nil|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+    system('gh', 'pr', 'diff', pr_number.to_s)
+  end
+
+  add_subcmd(:checkout) do |ref = nil|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+    system('gh', 'pr', 'checkout', pr_number.to_s)
+  end
+
+  add_subcmd(:merge) do |ref = nil, *merge_args|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+    system('gh', 'pr', 'merge', pr_number.to_s, *merge_args)
+  end
+
+  add_subcmd(:comment) do |ref = nil|
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+
+    tmpfile = Tempfile.new(['pr-comment-', '.md'])
+    tmpfile.close
+    edit_files(tmpfile.path)
+
+    body = File.read(tmpfile.path).strip
+    tmpfile.unlink
+
+    if body.empty?
+      puts "Aborted: empty comment"
       next
     end
 
-    pr_number = nil
+    system('gh', 'pr', 'comment', pr_number.to_s, '--body', body)
+  end
 
-    if ref.nil?
-      lines = pinned.each_with_index.each_with_object({}) do |(pr, idx), h|
-        h[pinned_manager.display_pinned(pr, idx)] = pr['number'].to_s
-      end
+  # === Comment Templates ===
 
-      pr_number = fuzzyfind_from_map(lines)
-      unless pr_number
-        puts "No PR selected"
-        next
-      end
-    elsif ref =~ /^\d+$/
-      pr_number = ref
-    else
-      puts "Usage: h pr rm [PR_NUMBER]"
+  TEMPLATES_DIR = File.join(Dir.home, '.config', 'hiiro', 'pr_templates')
+
+  add_subcmd(:templates) do
+    FileUtils.mkdir_p(TEMPLATES_DIR)
+    files = Dir.glob(File.join(TEMPLATES_DIR, '*.md')).sort
+
+    if files.empty?
+      puts "No templates found. Use 'h pr new-template <name>' to create one."
       next
     end
 
-    if pinned_manager.unpin(pr_number)
-      puts "Removed PR ##{pr_number} from tracking"
-    else
-      puts "PR ##{pr_number} was not tracked"
+    puts "Comment templates:"
+    puts
+    files.each do |f|
+      name = File.basename(f, '.md')
+      first_line = File.readlines(f).first&.strip || ''
+      puts "  #{name.ljust(20)}  #{first_line}"
     end
   end
 
-  add_subcmd(:'suggest-unpin') do |*args|
-    pinned = pinned_manager.load_pinned
+  add_subcmd(:'new-template') do |name = nil|
+    FileUtils.mkdir_p(TEMPLATES_DIR)
 
-    if pinned.empty?
-      puts "No pinned PRs"
+    unless name
+      STDERR.puts "Usage: h pr new-template <name>"
       next
     end
 
-    merged = pinned.select { |pr| pr['state'] == 'MERGED' }
-    closed = pinned.select { |pr| pr['state'] == 'CLOSED' }
+    path = File.join(TEMPLATES_DIR, "#{name}.md")
 
-    if merged.empty? && closed.empty?
-      puts "No merged or closed PRs to unpin"
-      next
+    if File.exist?(path)
+      puts "Template '#{name}' already exists, opening for edit..."
     end
 
-    puts "PRs that can be unpinned:"
-    puts
+    edit_files(path)
+    puts "Template saved: #{path}"
+  end
 
-    (merged + closed).each_with_index do |pr, idx|
-      puts pinned_manager.display_pinned(pr, idx)
+  add_subcmd(:'from-template') do |ref = nil|
+    FileUtils.mkdir_p(TEMPLATES_DIR)
+    files = Dir.glob(File.join(TEMPLATES_DIR, '*.md')).sort
+
+    if files.empty?
+      STDERR.puts "No templates found. Use 'h pr new-template <name>' to create one."
+      next
     end
 
-    puts
-    puts "Run 'h pr auto-unpin' to unpin all merged/closed PRs"
+    template_map = files.each_with_object({}) do |f, h|
+      name = File.basename(f, '.md')
+      first_line = File.readlines(f).first&.strip || ''
+      h["#{name.ljust(20)}  #{first_line}"] = f
+    end
+
+    template_path = fuzzyfind_from_map(template_map)
+    next unless template_path
+
+    pr_number = resolve_pr.call(ref)
+    next unless pr_number
+
+    body = File.read(template_path).strip
+    system('gh', 'pr', 'comment', pr_number.to_s, '--body', body)
   end
 
-  add_subcmd(:'auto-unpin') do |*args|
-    pinned = pinned_manager.load_pinned
+  # === PR List by Context ===
 
-    if pinned.empty?
-      puts "No pinned PRs"
+  add_subcmd(:'for-task') do |task_name = nil|
+    tracked = pinned_manager.load_pinned
+
+    if tracked.empty?
+      puts "No tracked PRs"
       next
     end
 
-    merged_or_closed = pinned.select { |pr| pr['state'] == 'MERGED' || pr['state'] == 'CLOSED' }
+    task_name ||= begin
+      env = Environment.current rescue nil
+      env&.task&.name
+    end
 
-    if merged_or_closed.empty?
-      puts "No merged or closed PRs to unpin"
+    unless task_name
+      STDERR.puts "Not in a task context. Pass a task name: h pr for-task <name>"
       next
     end
 
-    puts "Unpinning #{merged_or_closed.length} merged/closed PR(s):"
-    puts
+    matches = tracked.select { |pr| pr['task'] == task_name }
 
-    merged_or_closed.each do |pr|
-      puts "  ##{pr['number']}: #{pr['title']} [#{pr['state']}]"
-      pinned_manager.unpin(pr['number'])
+    if matches.empty?
+      puts "No tracked PRs for task '#{task_name}'"
+      next
     end
 
+    puts "PRs for task '#{task_name}':"
     puts
-    puts "Done. #{pinned_manager.load_pinned.length} PR(s) still pinned."
+    matches.each_with_index { |pr, i| puts pinned_manager.display_pinned(pr, i) }
   end
+
 end

data/lib/hiiro/queue.rb

@@ -238,7 +238,7 @@ class Hiiro
 
       mapping = tasks.each_with_object({}) do |task, h|
         line = format("%-25s  tree: %-20s", task.name, task.tree_name || '(none)')
-        h[line] = task.name
+        h[line] = task
       end
 
       hiiro.fuzzyfind_from_map(mapping)
@@ -246,7 +246,7 @@ class Hiiro
 
     def resolve_task_info(opts, hiiro, default_task_info)
       task_name = if opts.choose
-        select_task(hiiro)
+        select_task(hiiro)&.name
       elsif opts.task
         opts.task
       else
@@ -322,7 +322,7 @@ class Hiiro
       parent_hiiro.make_child do |h|
         h.add_subcmd(:watch) {
           q.queue_dirs
-          current_version = Gem.loaded_specs['hiiro']&.version&.to_s
+          current_version = `gem which hiiro`.sub(/.*hiiro-/, '').sub(/\/.*/, '')
           puts current_version:;
           puts "Watching #{File.join(DIR, 'pending')} ..."
           puts "Press Ctrl-C to stop"
@@ -330,8 +330,8 @@ class Hiiro
           loop do
             loops += 1
             if current_version
-              latest = Gem::Specification.find_by_name('hiiro')&.version&.to_s rescue nil
-              if loops % 50 == 0
+              latest = `gem which hiiro`.sub(/.*hiiro-/, '').sub(/\/.*/, '') rescue nil
+              if loops % 20 == 0
                 puts current_version:, latest:;
               end
 

data/lib/hiiro/tasks.rb

@@ -401,10 +401,9 @@ class Hiiro
       branch_col = all_data.map { |_, d| d[:branch].length }.max || 0
 
       all_data.each do |task, d|
-        display_name = scope == :subtask ? task.short_name : task.name
         line = format("%-#{name_col}s  %-#{tree_col}s  %-#{branch_col}s  %s",
                       d[:name], d[:tree], d[:branch], d[:session])
-        mapping[line] = { type: :task, name: display_name }
+        mapping[line] = task
       end
 
       # Add non-task tmux sessions (exclude sessions that belong to tasks)
@@ -413,7 +412,7 @@ class Hiiro
         extra_sessions = environment.all_sessions.reject { |s| task_session_names.include?(s.name) }
         extra_sessions.sort_by(&:name).each do |session|
           line = format("%-25s  (tmux session)", session.name)
-          mapping[line] = { type: :session, name: session.name }
+          mapping[line] = session
         end
       end
 
@@ -623,16 +622,14 @@ class Hiiro
             selected = tm.select_task_interactive
             next unless selected
 
-            if selected.is_a?(Hash)
-              if selected[:type] == :session
-                h.start_tmux_session(selected[:name])
-                puts "Switched to session '#{selected[:name]}'"
-                next
-              else
-                task_name = selected[:name]
-              end
-            else
-              task_name = selected
+            case selected
+            when Hiiro::Tmux::Session
+              h.start_tmux_session(selected.name)
+              puts "Switched to session '#{selected.name}'"
+              next
+            when Hiiro::Task
+              tm.switch_to_task(selected, app_name: app_name)
+              next
             end
           end
 
@@ -713,9 +710,9 @@ class Hiiro
 
         h.add_subcmd(:stop) do |task_name=nil|
           if task_name.nil?
-            task_name = tm.select_task_interactive
-            next unless task_name
-            task_name = task_name[:name]
+            selected = tm.select_task_interactive
+            next unless selected
+            task_name = selected.name
           end
           task = tm.task_by_name(task_name)
           tm.stop_task(task)

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.211"
+  VERSION = "0.1.212"
 end

metadata

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