na 1.2.88 → 1.2.89

data/bin/commands/plugin.rb

@@ -3,73 +3,287 @@
 class App
   extend GLI::App
 
-  desc 'Run a plugin on selected actions'
-  arg_name 'NAME'
+  desc 'Manage and run plugins'
   command %i[plugin] do |c|
-    c.desc 'Input format (json|yaml|text)'
-    c.arg_name 'TYPE'
-    c.flag %i[input]
+    c.desc "Regenerate sample plugins and README"
+    c.switch %i[generate-examples]
 
-    c.desc 'Output format (json|yaml|text)'
-    c.arg_name 'TYPE'
-    c.flag %i[output]
+    c.action do |_global, options, args|
+      # If --generate-examples flag is used
+      if options[:generate_examples]
+        NA::Plugins.generate_sample_plugins
+        readme = File.join(NA::Plugins.plugins_home, 'README.md')
+        File.write(readme, NA::Plugins.default_readme_contents)
+        NA.notify("#{NA.theme[:success]}Sample plugins and README regenerated")
+      elsif args.any? && !args.first.match?(/^(new|n|edit|run|x|enable|e|disable|d|list|ls)$/i)
+        # If first argument is not a recognized subcommand, treat it as a plugin name
+        # and default to 'run' command
+        # Note: GLI will route to subcommands first, so this only triggers if no subcommand matches
+        # Note: This shortcut doesn't support run command flags - use 'na plugin run NAME' for flags
+        plugin_name = args.first
+        path = NA::Plugins.resolve_plugin(plugin_name)
+        if path
+          # Execute run logic inline with defaults (no flags supported in shortcut)
+          NA::Plugins.ensure_plugins_home
+          meta = NA::Plugins.parse_plugin_metadata(path)
+          input_fmt = (meta['input'] || 'json').to_s
+          output_fmt = (meta['output'] || input_fmt).to_s
+          divider = '||'
 
-    c.desc 'Text divider when using --input/--output text'
-    c.arg_name 'STRING'
-    c.flag %i[divider]
+          # No filters for shortcut - always shows interactive menu
+          files = NA.find_files(depth: 1)
+          options_list = []
+          selection = []
+          files.each do |f|
+            todo = NA::Todo.new(file_path: f, done: false, require_na: false)
+            todo.actions.each do |a|
+              options_list << "#{File.basename(a.file_path)}:#{a.file_line}:#{a.parent.join('>')} | #{a.action}"
+              selection << a
+            end
+          end
+          NA.notify("#{NA.theme[:error]}No actions found", exit_code: 1) if options_list.empty?
+          chosen = NA.choose_from(options_list, prompt: 'Select actions to run plugin on', multiple: true)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless chosen && !chosen.empty?
+          idxs = Array(chosen).map { |label| options_list.index(label) }.compact
+          actions = idxs.map { |i| selection[i] }
 
-    c.desc 'Specify the file to search for the task'
-    c.arg_name 'PATH'
-    c.flag %i[file in]
+          io_actions = actions.map(&:to_plugin_io_hash)
+          stdin_str = NA::Plugins.serialize_actions(io_actions, format: input_fmt, divider: divider)
+          stdout = NA::Plugins.run_plugin(path, stdin_str)
+          returned = NA::Plugins.parse_actions(stdout, format: output_fmt, divider: divider)
+          Array(returned).each { |h| NA.apply_plugin_result(h) }
+        else
+          NA.notify("#{NA.theme[:error]}Unknown plugin command or plugin name: #{plugin_name}", exit_code: 1)
+        end
+      end
+    end
 
-    c.desc 'Search for files X directories deep'
-    c.arg_name 'DEPTH'
-    c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
+    c.desc 'Create a new plugin'
+    c.arg_name 'NAME'
+    c.command %i[new n] do |cc|
+      cc.desc 'Language/ext (e.g. rb, py, /usr/bin/env bash)'
+      cc.arg_name 'LANG'
+      cc.flag %i[language lang]
+      cc.action do |_g, opts, args|
+        NA::Plugins.ensure_plugins_home
+        name = args.first
+        NA.notify("#{NA.theme[:error]}Plugin name required", exit_code: 1) unless name
+        file = NA::Plugins.create_plugin(name, language: opts[:language])
+        NA.notify("#{NA.theme[:success]}Created #{NA.theme[:filename]}#{file}")
+        NA.os_open(file)
+      end
+    end
 
-    c.desc 'Filter results using search terms'
-    c.arg_name 'QUERY'
-    c.flag %i[search find grep], multiple: true
+    c.desc 'Edit an existing plugin'
+    c.arg_name 'NAME'
+    c.command %i[edit] do |cc|
+      cc.action do |_g, _o, args|
+        NA::Plugins.ensure_plugins_home
+        target = args.first
+        unless target
+          all = NA::Plugins.list_plugins.merge(NA::Plugins.list_plugins_disabled)
+          names = all.values.map { |p| File.basename(p) }
+          chosen = NA.choose_from(names, prompt: 'Select plugin to edit', multiple: false)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless chosen
+          target = chosen
+        end
+        path = NA::Plugins.resolve_plugin(target) || File.join(NA::Plugins.plugins_home, target)
+        NA.notify("#{NA.theme[:error]}Plugin not found: #{target}", exit_code: 1) unless File.exist?(path)
+        NA.os_open(path)
+      end
+    end
 
-    c.desc 'Include @done actions'
-    c.switch %i[done]
+    c.desc 'List available plugins'
+    c.command %i[list ls] do |cc|
+      cc.desc 'Filter by type: enabled or disabled (or e/d)'
+      cc.arg_name 'TYPE'
+      cc.flag %i[type t]
+      cc.action do |_g, options, _a|
+        NA::Plugins.ensure_plugins_home
+        enabled = NA::Plugins.list_plugins
+        disabled = NA::Plugins.list_plugins_disabled
 
-    c.desc 'Match actions containing tag. Allows value comparisons'
-    c.arg_name 'TAG'
-    c.flag %i[tagged], multiple: true
+        # If --type is specified, output plain text only
+        if options[:type]
+          type_arg = options[:type].to_s.downcase
+          if type_arg.start_with?("e")
+            # Enabled only, plain text
+            enabled.each_value do |path|
+              basename = File.basename(path)
+              meta = NA::Plugins.parse_plugin_metadata(path)
+              display_name = meta['name'] || meta['title'] || basename
+              puts display_name
+            end
+          elsif type_arg.start_with?('d')
+            # Disabled only, plain text
+            disabled.each_value do |path|
+              basename = File.basename(path)
+              meta = NA::Plugins.parse_plugin_metadata(path)
+              display_name = meta['name'] || meta['title'] || basename
+              puts display_name
+            end
+          else
+            NA.notify("#{NA.theme[:error]}Invalid type: #{options[:type]}. Use 'enabled' or 'disabled' (or 'e'/'d')", exit_code: 1)
+          end
+        else
+          # Default formatted output
+          output = []
+          output << 'Available Plugins'
+          output << ''
+          output << '-' * 12
+          output << ''
 
-    c.action do |_global, options, args|
-      plugin_name = args.first
-      NA.notify("#{NA.theme[:error]}Plugin name required", exit_code: 1) unless plugin_name
-
-      NA::Plugins.ensure_plugins_home
-      path = NA::Plugins.resolve_plugin(plugin_name)
-      NA.notify("#{NA.theme[:error]}Plugin not found: #{plugin_name}", exit_code: 1) unless path
-
-      meta = NA::Plugins.parse_plugin_metadata(path)
-      input_fmt = (options[:input] || meta['input'] || 'json').to_s
-      output_fmt = (options[:output] || meta['output'] || input_fmt).to_s
-      divider = (options[:divider] || '||')
-
-      # Build selection using the same plumbing as update/find
-      actions = NA.select_actions(
-        file: options[:file],
-        depth: options[:depth],
-        search: options[:search],
-        tagged: options[:tagged],
-        include_done: options[:done]
-      )
-
-      io_actions = actions.map(&:to_plugin_io_hash)
-      stdin_str = NA::Plugins.serialize_actions(io_actions, format: input_fmt, divider: divider)
-      stdout = NA::Plugins.run_plugin(path, stdin_str)
-      returned = NA::Plugins.parse_actions(stdout, format: output_fmt, divider: divider)
-
-      # Apply updates
-      returned.each do |h|
-        NA.apply_plugin_result(h)
+          if enabled.any?
+            output << NA::Color.template('{bg}Enabled:{x}')
+            enabled.each_value do |path|
+              basename = File.basename(path)
+              meta = NA::Plugins.parse_plugin_metadata(path)
+              display_name = meta['name'] || meta['title'] || basename
+              output << NA::Color.template("{x}- {by}#{display_name}{x}")
+            end
+            output << ''
+          end
+
+          if disabled.any?
+            output << NA::Color.template('{br}Disabled:{x}')
+            disabled.each_value do |path|
+              basename = File.basename(path)
+              meta = NA::Plugins.parse_plugin_metadata(path)
+              display_name = meta['name'] || meta['title'] || basename
+              output << NA::Color.template("{x}- {by}#{display_name}{x}")
+            end
+            output << ''
+          end
+
+          output << NA::Color.template("{x}No plugins found.{x}") if enabled.empty? && disabled.empty?
+
+          puts output.join("\n")
+        end
       end
     end
-  end
-end
 
+    c.desc 'Run a plugin on selected actions'
+    c.arg_name 'NAME'
+    c.command %i[run x] do |cc|
+      cc.desc 'Input format (json|yaml|csv|text)'
+      cc.arg_name 'TYPE'
+      cc.flag %i[input]
+
+      cc.desc 'Output format (json|yaml|csv|text)'
+      cc.arg_name 'TYPE'
+      cc.flag %i[output]
+
+      cc.desc 'Text divider when using --input/--output text'
+      cc.arg_name 'STRING'
+      cc.flag %i[divider]
+
+      cc.desc 'Specify the file to search for the task'
+      cc.arg_name 'PATH'
+      cc.flag %i[file in]
+
+      cc.desc 'Search for files X directories deep'
+      cc.arg_name 'DEPTH'
+      cc.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
 
+      cc.desc 'Filter results using search terms'
+      cc.arg_name 'QUERY'
+      cc.flag %i[search find grep], multiple: true
+
+      cc.desc 'Include @done actions'
+      cc.switch %i[done]
+
+      cc.desc 'Match actions containing tag. Allows value comparisons'
+      cc.arg_name 'TAG'
+      cc.flag %i[tagged], multiple: true
+
+      cc.action do |_global, options, args|
+        NA::Plugins.ensure_plugins_home
+        plugin_name = args.first
+        unless plugin_name
+          names = NA::Plugins.list_plugins.values.map { |p| File.basename(p) }
+          plugin_name = NA.choose_from(names, prompt: 'Select plugin to run', multiple: false)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless plugin_name
+        end
+        path = NA::Plugins.resolve_plugin(plugin_name)
+        NA.notify("#{NA.theme[:error]}Plugin not found: #{plugin_name}", exit_code: 1) unless path
+
+        meta = NA::Plugins.parse_plugin_metadata(path)
+        input_fmt = (options[:input] || meta['input'] || 'json').to_s
+        output_fmt = (options[:output] || meta['output'] || input_fmt).to_s
+        divider = (options[:divider] || '||')
+
+        # Normalize empty arrays to nil for proper "no filter" detection
+        search_filter = (options[:search] && !options[:search].empty?) ? options[:search] : nil
+        tagged_filter = (options[:tagged] && !options[:tagged].empty?) ? options[:tagged] : nil
+        file_filter = options[:file]
+
+        # If no filters provided, show menu immediately
+        if !file_filter && !search_filter && !tagged_filter
+          files = NA.find_files(depth: options[:depth] || 1)
+          options_list = []
+          selection = []
+          files.each do |f|
+            todo = NA::Todo.new(file_path: f, done: options[:done], require_na: false)
+            todo.actions.each do |a|
+              options_list << "#{File.basename(a.file_path)}:#{a.file_line}:#{a.parent.join('>')} | #{a.action}"
+              selection << a
+            end
+          end
+          NA.notify("#{NA.theme[:error]}No actions found", exit_code: 1) if options_list.empty?
+          chosen = NA.choose_from(options_list, prompt: 'Select actions to run plugin on', multiple: true)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless chosen && !chosen.empty?
+          idxs = Array(chosen).map { |label| options_list.index(label) }.compact
+          actions = idxs.map { |i| selection[i] }
+        else
+          # Use filters to find actions
+          actions = NA.select_actions(
+            file: file_filter,
+            depth: options[:depth],
+            search: search_filter,
+            tagged: tagged_filter,
+            include_done: options[:done]
+          )
+          NA.notify("#{NA.theme[:error]}No matching actions found", exit_code: 1) if actions.empty?
+        end
+
+        io_actions = actions.map(&:to_plugin_io_hash)
+        stdin_str = NA::Plugins.serialize_actions(io_actions, format: input_fmt, divider: divider)
+        stdout = NA::Plugins.run_plugin(path, stdin_str)
+        returned = NA::Plugins.parse_actions(stdout, format: output_fmt, divider: divider)
+        Array(returned).each { |h| NA.apply_plugin_result(h) }
+      end
+    end
+
+    c.desc 'Enable a disabled plugin'
+    c.arg_name 'NAME'
+    c.command %i[enable e] do |cc|
+      cc.action do |_g, _o, args|
+        NA::Plugins.ensure_plugins_home
+        name = args.first
+        unless name
+          names = NA::Plugins.list_plugins_disabled.values.map { |p| File.basename(p) }
+          name = NA.choose_from(names, prompt: 'Enable which plugin?', multiple: false)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless name
+        end
+        path = NA::Plugins.enable_plugin(name)
+        NA.notify("#{NA.theme[:success]}Enabled #{NA.theme[:filename]}#{File.basename(path)}")
+      end
+    end
+
+    c.desc 'Disable an enabled plugin'
+    c.arg_name 'NAME'
+    c.command %i[disable d] do |cc|
+      cc.action do |_g, _o, args|
+        NA::Plugins.ensure_plugins_home
+        name = args.first
+        unless name
+          names = NA::Plugins.list_plugins.values.map { |p| File.basename(p) }
+          name = NA.choose_from(names, prompt: 'Disable which plugin?', multiple: false)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless name
+        end
+        path = NA::Plugins.disable_plugin(name)
+        NA.notify("#{NA.theme[:warning]}Disabled #{NA.theme[:filename]}#{File.basename(path)}")
+      end
+    end
+  end
+end

data/bin/commands/update.rb

@@ -344,14 +344,19 @@ class App
           { key: :archive, label: 'Archive', param: nil },
           { key: :note, label: 'Add Note', param: 'Note' }
         ]
-        # Append available plugins
+        # Add "Run Plugin" option if there are enabled plugins with metadata
+        available_plugins = []
         begin
           NA::Plugins.ensure_plugins_home
-          NA::Plugins.list_plugins.each do |_key, path|
+          NA::Plugins.list_plugins.each_value do |path|
             meta = NA::Plugins.parse_plugin_metadata(path)
+            # Only include plugins with both input and output metadata
+            next unless meta['input'] && meta['output']
+
             disp = meta['name'] || File.basename(path, File.extname(path))
-            actions_menu << { key: :_plugin, label: "Plugin: #{disp}", param: nil, plugin_path: path }
+            available_plugins << { key: :_plugin, label: disp, param: nil, plugin_path: path }
           end
+          actions_menu << { key: :run_plugin, label: 'Run Plugin', param: nil } if available_plugins.any?
         rescue StandardError
           # ignore plugin discovery errors in menu
         end
@@ -366,110 +371,136 @@ class App
         if selector
           require 'open3'
           input = menu_labels.join("\n")
-          output, _ = Open3.capture2("echo \"#{input.gsub('"', '\"')}\" | #{selector}")
+          output, = Open3.capture2("echo \"#{input.gsub('"', '\"')}\" | #{selector}")
           selected_action = output.strip
         else
           puts 'Select an action:'
-          menu_labels.each_with_index { |label, i| puts "#{i+1}. #{label}" }
-          idx = (STDIN.gets || '').strip.to_i - 1
+          menu_labels.each_with_index { |label, i| puts "#{i + 1}. #{label}" }
+          idx = ($stdin.gets || '').strip.to_i - 1
           selected_action = menu_labels[idx] if idx >= 0 && idx < menu_labels.size
         end
         action_obj = actions_menu.find { |a| a[:label] == selected_action }
-        if action_obj.nil?
-          NA.notify("#{NA.theme[:error]}No action selected, cancelled", exit_code: 1)
-        end
-        # Prompt for parameter if needed
-        param_value = nil
-        # Only prompt for param if not :move (which has custom menu logic)
-        if action_obj[:param] && action_obj[:key] != :move
-          if TTY::Which.exist?('gum')
-            gum = TTY::Which.which('gum')
-            prompt = "Enter #{action_obj[:param]}: "
-            param_value = `#{gum} input --placeholder "#{prompt}"`.strip
-          else
-            print "Enter #{action_obj[:param]}: "
-            param_value = (STDIN.gets || '').strip
-          end
-        end
-        # Set options for update
-        case action_obj[:key]
-        when :add_tag
-          options[:tag] = [param_value]
-        when :remove_tag
-          options[:remove] = [param_value]
-        when :delete
-          options[:delete] = true
-        when :finish
-          options[:finish] = true
-          # Timed finish? Prompt user for optional start/date inputs
-          if NA.yn(NA::Color.template("#{NA.theme[:prompt]}Timed?"), default: false)
-            # Ask for start date expression
-            start_expr = nil
-            if TTY::Which.exist?('gum')
-              gum = TTY::Which.which('gum')
-              prompt = 'Enter start date/time (e.g. "30 minutes ago" or "3pm"):'
-              start_expr = `#{gum} input --placeholder "#{prompt}"`.strip
-            else
-              print 'Enter start date/time (e.g. "30 minutes ago" or "3pm"): '
-              start_expr = (STDIN.gets || '').strip
-            end
-            start_time = NA::Types.parse_date_begin(start_expr)
-            options[:started] = start_time if start_time
-          end
-        when :edit
-          # Just set the flag - multi-action editor will handle it below
-          options[:edit] = true
-        when :priority
-          options[:priority] = param_value
-        when :move
-          # Gather projects from the same file as the selected action
-          selected_file = targets_for_selection[selected_indices.first][:file]
-          todo = NA::Todo.new(file_path: selected_file)
-          project_names = todo.projects.map { |proj| proj.project }
-          project_menu = project_names + ['New project']
-          move_selector = nil
+        NA.notify("#{NA.theme[:error]}No action selected, cancelled", exit_code: 1) if action_obj.nil?
+
+        # If "Run Plugin" was selected, show plugin selection menu
+        if action_obj[:key] == :run_plugin
+          plugin_labels = available_plugins.map { |p| p[:label] }
+          plugin_selector = nil
           if TTY::Which.exist?('fzf')
-            move_selector = 'fzf --prompt="Select project> "'
+            plugin_selector = 'fzf --prompt="Select plugin> "'
           elsif TTY::Which.exist?('gum')
-            move_selector = 'gum choose'
+            plugin_selector = 'gum choose'
           end
-          selected_project = nil
-          if move_selector
+          selected_plugin = nil
+          if plugin_selector
             require 'open3'
-            input = project_menu.join("\n")
-            output, _ = Open3.capture2("echo \"#{input.gsub('"', '\"')}\" | #{move_selector}")
-            selected_project = output.strip
+            input = plugin_labels.join("\n")
+            output, = Open3.capture2("echo \"#{input.gsub('"', '\"')}\" | #{plugin_selector}")
+            selected_plugin = output.strip
           else
-            puts 'Select a project:'
-            project_menu.each_with_index { |label, i| puts "#{i+1}. #{label}" }
-            idx = (STDIN.gets || '').strip.to_i - 1
-            selected_project = project_menu[idx] if idx >= 0 && idx < project_menu.size
+            puts 'Select a plugin:'
+            plugin_labels.each_with_index { |label, i| puts "#{i + 1}. #{label}" }
+            idx = ($stdin.gets || '').strip.to_i - 1
+            selected_plugin = plugin_labels[idx] if idx >= 0 && idx < plugin_labels.size
           end
-          if selected_project == 'New project'
+          plugin_obj = available_plugins.find { |p| p[:label] == selected_plugin }
+          NA.notify("#{NA.theme[:error]}No plugin selected, cancelled", exit_code: 1) if plugin_obj.nil?
+          # Set plugin path directly
+          options[:plugin] = plugin_obj[:plugin_path]
+        elsif action_obj[:key] == :_plugin
+          # Legacy support: if somehow a plugin was selected directly
+          options[:plugin] = action_obj[:plugin_path]
+        else
+          # Prompt for parameter if needed
+          param_value = nil
+          # Only prompt for param if not :move (which has custom menu logic)
+          if action_obj[:param] && action_obj[:key] != :move
             if TTY::Which.exist?('gum')
               gum = TTY::Which.which('gum')
-              prompt = 'Enter new project name: '
-              new_proj_name = `#{gum} input --placeholder "#{prompt}"`.strip
+              prompt = "Enter #{action_obj[:param]}: "
+              param_value = `#{gum} input --placeholder "#{prompt}"`.strip
             else
-              print 'Enter new project name: '
-              new_proj_name = (STDIN.gets || '').strip
+              print "Enter #{action_obj[:param]}: "
+              param_value = (STDIN.gets || '').strip
             end
-            # Create the new project in the file
-            NA.insert_project(selected_file, new_proj_name, todo.projects)
-            options[:move] = new_proj_name
-          else
-            options[:move] = selected_project
           end
-        when :restore
-          options[:restore] = true
-        when :archive
-          options[:archive] = true
-        when :note
-          options[:note] = true
-          note = [param_value]
-        when :_plugin
-          # Set plugin path directly
-          options[:plugin] = action_obj[:plugin_path]
+          # Set options for update
+          case action_obj[:key]
+          when :add_tag
+            options[:tag] = [param_value]
+          when :remove_tag
+            options[:remove] = [param_value]
+          when :delete
+            options[:delete] = true
+          when :finish
+            options[:finish] = true
+            # Timed finish? Prompt user for optional start/date inputs
+            if NA.yn(NA::Color.template("#{NA.theme[:prompt]}Timed?"), default: false)
+              # Ask for start date expression
+              start_expr = nil
+              if TTY::Which.exist?('gum')
+                gum = TTY::Which.which('gum')
+                prompt = 'Enter start date/time (e.g. "30 minutes ago" or "3pm"):'
+                start_expr = `#{gum} input --placeholder "#{prompt}"`.strip
+              else
+                print 'Enter start date/time (e.g. "30 minutes ago" or "3pm"): '
+                start_expr = (STDIN.gets || '').strip
+              end
+              start_time = NA::Types.parse_date_begin(start_expr)
+              options[:started] = start_time if start_time
+            end
+          when :edit
+            # Just set the flag - multi-action editor will handle it below
+            options[:edit] = true
+          when :priority
+            options[:priority] = param_value
+          when :move
+            # Gather projects from the same file as the selected action
+            selected_file = targets_for_selection[selected_indices.first][:file]
+            todo = NA::Todo.new(file_path: selected_file)
+            project_names = todo.projects.map { |proj| proj.project }
+            project_menu = project_names + ['New project']
+            move_selector = nil
+            if TTY::Which.exist?('fzf')
+              move_selector = 'fzf --prompt="Select project> "'
+            elsif TTY::Which.exist?('gum')
+              move_selector = 'gum choose'
+            end
+            selected_project = nil
+            if move_selector
+              require 'open3'
+              input = project_menu.join("\n")
+              output, _ = Open3.capture2("echo \"#{input.gsub('"', '\"')}\" | #{move_selector}")
+              selected_project = output.strip
+            else
+              puts 'Select a project:'
+              project_menu.each_with_index { |label, i| puts "#{i+1}. #{label}" }
+              idx = (STDIN.gets || '').strip.to_i - 1
+              selected_project = project_menu[idx] if idx >= 0 && idx < project_menu.size
+            end
+            if selected_project == 'New project'
+              if TTY::Which.exist?('gum')
+                gum = TTY::Which.which('gum')
+                prompt = 'Enter new project name: '
+                new_proj_name = `#{gum} input --placeholder "#{prompt}"`.strip
+              else
+                print 'Enter new project name: '
+                new_proj_name = (STDIN.gets || '').strip
+              end
+              # Create the new project in the file
+              NA.insert_project(selected_file, new_proj_name)
+              options[:move] = new_proj_name
+            else
+              options[:move] = selected_project
+            end
+          when :restore
+            options[:restore] = true
+          when :archive
+            options[:archive] = true
+          when :note
+            options[:note] = true
+            note = [param_value]
+          end
         end
       end
       did_direct_update = false

data/lib/na/action.rb

@@ -28,6 +28,12 @@ module NA
       @note = note
     end
 
+    # Returns true if this action contains the current next-action tag (e.g. @na)
+    # @return [Boolean]
+    def na?
+      @tags.key?(NA.na_tag)
+    end
+
     # Convert action to plugin IO hash
     # @return [Hash]
     def to_plugin_io_hash

data/lib/na/actions.rb

@@ -40,7 +40,8 @@ module NA
         filtered_actions = if config[:only_timed]
                              self.select do |a|
                                t = a.tags
-                               (t['started'] || t['start']) && t['done']
+                               tl = t.transform_keys { |k| k.to_s.downcase }
+                               (tl['started'] || tl['start']) && tl['done']
                              end
                            else
                              self
@@ -118,7 +119,7 @@ module NA
 
               if config[:times]
                 # compute duration from @started/@done
-                tags = action.tags
+                tags = action.tags.transform_keys { |k| k.to_s.downcase }
                 begun = tags['started'] || tags['start']
                 finished = tags['done']
                 if begun && finished