na 1.2.78 → 1.2.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f9de8bad22cccef320d35bec3e5dd840de73bd58e9288f3a079479135594333
-  data.tar.gz: 3bb87af83e65f8ceab63188502bc3018302d2755f6cc2dfde34d603bb37d0563
+  metadata.gz: 65f46379443596b7f52385686e09c6b558c2f6eaaab614a34cd55432921fc1f7
+  data.tar.gz: 5050ee855d909fb050ecde79cae733fcfa5d411b6f28d48e88661569f0ed9989
 SHA512:
-  metadata.gz: 12aa91ea7c15385478dd0ff8e351c180de3ada85ab818561302b258f058dada8b9fcc5e30ddc43a3c28ef2084df6fd47e53e0085494863984a6e536a6e2e0952
-  data.tar.gz: 62389ffca74e95eb4e91da17690c1f6d4d78546c38a8aae5b20c246805946ab5ed2041e3aeac0a7c9bd1abbba0a36dc6027d66a3384f3529b739ecffb96d7d4a
+  metadata.gz: 2aa83793e127693a7481e4f0294ff98067f7b32ad288445d6b23ce2744f2f975ecc4b854c48eb8faee91f2e5fc720e05732001003eb04a0ccede62b48bf3c685
+  data.tar.gz: 21560b1ae71aa1559070ad8768d0ddacaa3e60a6287bff35bc07a0c3ffb6208c23d83da39baee6ffc5e470d76d2c4e6793163ee08c2e2a7fd6ae6763af1900fc

data/CHANGELOG.md

@@ -1,3 +1,58 @@
+### 1.2.80
+
+2025-10-23 05:26
+
+#### CHANGED
+
+- Default behavior: git integration now opt-in with --repo-top flag
+- Pager execution: use spawn for better performance than fork+exec
+- Color template processing: cache compiled templates and colors hash
+- Action processing: batch regex highlighting instead of per-action processing
+
+#### NEW
+
+- Add comprehensive benchmarking system with NA_BENCHMARK=1
+- Add template caching in Color.template to avoid repeated regex processing
+- Add colors hash caching to eliminate repeated hash creation
+- Add smart pagination that skips pager for small outputs (<2000 chars, <50 lines)
+- Add --repo-top flag to make git integration opt-in instead of default
+
+#### IMPROVED
+
+- Optimize performance
+- Theme loading now uses cached NA.theme instead of loading on every Action.pretty call
+- Action.pretty method with conditional processing and optimized string operations
+- Actions.output with batch regex processing - compile all output first, then apply regexes once
+- Pager performance using spawn instead of fork+exec and removing IO.select delays
+- Lazy loading of heavy gems (git, chronic, mdless) only when needed
+- String operations in Action.pretty with pre-computed template parts
+
+#### FIXED
+
+- Performance variability caused by git system calls running by default
+- Pager overhead causing 300-479ms delays on small outputs
+- Repeated regex compilation in color template processing
+- Theme loading bottleneck in Action.pretty method
+
+### 1.2.79
+
+2025-09-29 06:51
+
+#### NEW
+
+- Track affected actions in `update_action` and output per-action summaries
+
+#### IMPROVED
+
+- Prompt to select a project when multiple suffix matches are found
+- Distinguish summaries: Task deleted vs Task updated/added
+- Display affected actions using `action.to_s_pretty` with colored change descriptions
+
+#### FIXED
+
+- Resolve project matching for `na add --to Ideas` by supporting unique suffix matches (e.g. `rnkd:Ideas`)
+- Validate `na update` requires at least one actionable option; error with No action specified, see `na help update`
+
 ### 1.2.78
 
 2025-06-02 10:07

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.78)
+    na (1.2.80)
       chronic (~> 0.10, >= 0.10.2)
       git (~> 3.0.0)
       gli (~> 2.21.0)
@@ -31,7 +31,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.1)
+    bigdecimal (3.2.3)
     chronic (0.10.2)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.3)

data/README.md

@@ -9,7 +9,7 @@
 _If you're one of the rare people like me who find this useful, feel free to
 [buy me some coffee][donate]._
 
-The current version of `na` is 1.2.78.
+The current version of `na` is 1.2.80.
 
 `na` ("next action") is a command line tool designed to make it easy to see what your next actions are for any project, right from the command line. It works with TaskPaper-formatted files (but any plain text format will do), looking for `@na` tags (or whatever you specify) in todo files in your current folder. 
 
@@ -76,7 +76,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.78
+    1.2.80
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -93,7 +93,7 @@ GLOBAL OPTIONS
     -p, --priority=PRIORITY - Set a priority 0-5 (deprecated, for backwards compatibility) (default: none)
     --[no-]pager            - Enable pagination (default: enabled)
     -r, --[no-]recurse      - Recurse 3 directories deep (deprecated, for backwards compatability)
-    --[no-]repo             - Use a taskpaper file named after the git repository (default: enabled)
+    --[no-]repo-top         - Use a taskpaper file named after the git repository (enables git integration)
     -t, --na_tag=TAG        - Tag to consider a next action (default: na)
     --template=arg          - Provide a template for new/blank todo files, use initconfig to make permanent (default: none)
     --version               - Display the program version

data/bin/commands/update.rb

@@ -189,6 +189,23 @@ class App
       note = stdin_note.empty? ? [] : stdin_note
       note.concat(line_note) unless line_note.nil? || line_note.empty?
 
+      # Require at least one actionable option to be provided
+      actionable = [
+        options[:note],
+        (options[:priority].to_i if options[:priority]).to_i > 0,
+        !options[:move].to_s.empty?,
+        !(options[:tag].nil? || options[:tag].empty?),
+        !(options[:remove].nil? || options[:remove].empty?),
+        !options[:replace].to_s.empty?,
+        options[:finish],
+        options[:archive],
+        options[:restore],
+        options[:delete],
+        options[:edit]
+      ].any?
+
+      NA.notify("#{NA.theme[:error]}No action specified, see `na help update`", exit_code: 1) unless actionable
+
       target_proj = if options[:move]
                       options[:move]
                     elsif NA.cwd_is == :project

data/bin/na

@@ -5,9 +5,13 @@ $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
 require 'gli'
 require 'na/help_monkey_patch'
 require 'na'
+require 'na/benchmark'
 require 'fcntl'
 require 'tempfile'
 
+NA::Benchmark.init
+NA::Benchmark.measure('Gem loading') { nil }  # Measures time up to this point
+
 # Search for XDG compliant config first. Default to ~/.na.rc for compatibility
 def self.find_config_file
   home = ENV['HOME']
@@ -75,9 +79,9 @@ class App
   arg_name 'PATH'
   flag %i[f file]
 
-  desc 'Use a taskpaper file named after the git repository'
-  arg_name 'REPO'
-  switch %i[repo], negatable: true, default_value: true
+  desc 'Use a taskpaper file named after the git repository (enables git integration)'
+  arg_name 'REPO_TOP'
+  switch %i[repo-top], default_value: false
 
   desc 'Provide a template for new/blank todo files, use initconfig to make permanent'
   flag %[template]
@@ -125,8 +129,8 @@ class App
                 end
 
     # start of git repo addition ==================================
-    # defaut to git repo if in a git managed directory
-    if global[:repo]
+    # Use git repo if --repo-top flag is specified
+    if global[:repo_top]
       begin
         require 'git'
 
@@ -209,4 +213,6 @@ ARGV.each do |arg|
 end
 NA.command = NA.command_line[0]
 
-exit App.run(ARGV)
+exit_code = App.run(ARGV)
+NA::Benchmark.report
+exit exit_code

data/lib/na/action.rb

@@ -53,6 +53,15 @@ module NA
       "(#{@file}:#{@line}) #{@project}:#{@parent.join('>')} | #{@action}#{note}"
     end
 
+    def to_s_pretty
+      note = if @note.count.positive?
+               "\n#{@note.join("\n")}"
+             else
+               ''
+             end
+      "#{NA.theme[:filename]}#{File.basename(@file)}:#{@line}#{NA.theme[:bracket]}[#{NA.theme[:project]}#{@project}:#{@parent.join(">")}#{NA.theme[:bracket]}]{x} | #{NA.theme[:action]}#{@action}#{NA.theme[:note]}#{note}"
+    end
+
     def inspect
       <<~EOINSPECT
       @file: #{@file}
@@ -75,65 +84,92 @@ module NA
     ## @param      notes      [Boolean] Include notes
     ##
     def pretty(extension: 'taskpaper', template: {}, regexes: [], notes: false, detect_width: true)
-      theme = NA::Theme.load_theme
-      template = theme.merge(template)
-
-      # Create the hierarchical parent string
-      parents = @parent.map do |par|
-        NA::Color.template("{x}#{template[:parent]}#{par}")
-      end.join(NA::Color.template(template[:parent_divider]))
-      parents = "#{NA.theme[:bracket]}[#{NA.theme[:error]}#{parents}#{NA.theme[:bracket]}]{x} "
-
-      # Create the project string
-      project = NA::Color.template("#{template[:project]}#{@project}{x} ")
-
-      # Create the source filename string, substituting ~ for HOME and removing extension
-      file = @file.sub(%r{^\./}, '').sub(/#{ENV['HOME']}/, '~')
-      file = file.sub(/\.#{extension}$/, '') unless NA.include_ext
-      # colorize the basename
-      file = file.highlight_filename
-      file_tpl = "#{template[:file]}#{file} {x}"
-      filename = NA::Color.template(file_tpl)
-
-      # colorize the action and highlight tags
-      @action.gsub!(/\{(.*?)\}/, '\\{\1\\}')
-      action = NA::Color.template("#{template[:action]}#{@action.sub(/ @#{NA.na_tag}\b/, '')}{x}")
-      action = action.highlight_tags(color: template[:tags],
-                                     parens: template[:value_parens],
-                                     value: template[:values],
-                                     last_color: template[:action])
-
-      if detect_width
-        width = TTY::Screen.columns
-        prefix = NA::Color.uncolor(pretty(template: { templates: { output: template[:templates][:output].sub(/%action/, '').sub(/%note/, '') } }, detect_width: false))
-        indent = prefix.length
-
-        # Add notes if needed
-        note = if notes && @note.count.positive?
-                 NA::Color.template(@note.wrap(width, indent, template[:note]))
-               elsif !notes && @note.count.positive?
-                 action += "#{template[:note]}*"
-               else
-                 ''
-               end
-
-        action = action.wrap(width, indent)
-      else
-        note = if notes && @note.count.positive?
-                 NA::Color.template("\n#{@note.map { |l| "  #{template[:note]}• #{l.wrap(width, indent)}{x}" }.join("\n")}")
-               elsif !notes && @note.count.positive?
-                 action += "#{template[:note]}*"
-               else
-                 ''
-               end
-      end
+      NA::Benchmark.measure('Action.pretty') do
+        # Use cached theme instead of loading every time
+        theme = NA.theme
+        template = theme.merge(template)
+
+        # Pre-compute common template parts to avoid repeated processing
+        output_template = template[:templates][:output]
+        needs_filename = output_template.include?('%filename')
+        needs_parents = output_template.include?('%parents') || output_template.include?('%parent')
+        needs_project = output_template.include?('%project')
+
+        # Create the hierarchical parent string (optimized)
+        parents = if needs_parents && @parent.any?
+                    parent_parts = @parent.map { |par| "#{template[:parent]}#{par}" }.join(template[:parent_divider])
+                    NA::Color.template("{x}#{template[:bracket]}[#{template[:error]}#{parent_parts}#{template[:bracket]}]{x} ")
+                  else
+                    ''
+                  end
+
+        # Create the project string (optimized)
+        project = if needs_project && !@project.empty?
+                    NA::Color.template("#{template[:project]}#{@project}{x} ")
+                  else
+                    ''
+                  end
+
+        # Create the source filename string (optimized)
+        filename = if needs_filename
+                     file = @file.sub(%r{^\./}, '').sub(/#{ENV['HOME']}/, '~')
+                     file = file.sub(/\.#{extension}$/, '') unless NA.include_ext
+                     file = file.highlight_filename
+                     NA::Color.template("#{template[:filename]}#{file} {x}")
+                   else
+                     ''
+                   end
+
+        # colorize the action and highlight tags (optimized)
+        action_text = @action.dup
+        action_text.gsub!(/\{(.*?)\}/, '\\{\1\\}')
+        action_text = action_text.sub(/ @#{NA.na_tag}\b/, '')
+        action = NA::Color.template("#{template[:action]}#{action_text}{x}")
+        action = action.highlight_tags(color: template[:tags],
+                                       parens: template[:value_parens],
+                                       value: template[:values],
+                                       last_color: template[:action])
+
+        # Handle notes and wrapping (optimized)
+        note = ''
+        if @note.any?
+          if notes
+            if detect_width
+              # Cache width calculation
+              width = @cached_width ||= TTY::Screen.columns
+              # Calculate indent more efficiently - avoid repeated template processing
+              base_template = output_template.gsub(/%action/, '').gsub(/%note/, '')
+              base_output = base_template.gsub(/%filename/, filename).gsub(/%project/, project).gsub(/%parents?/, parents)
+              indent = NA::Color.uncolor(NA::Color.template(base_output)).length
+              note = NA::Color.template(@note.wrap(width, indent, template[:note]))
+            else
+              note = NA::Color.template("\n#{@note.map { |l| "  #{template[:note]}• #{l}{x}" }.join("\n")}")
+            end
+          else
+            action += "#{template[:note]}*"
+          end
+        end
+
+        # Wrap action if needed (optimized)
+        if detect_width && !action.empty?
+          width = @cached_width ||= TTY::Screen.columns
+          base_template = output_template.gsub(/%action/, '').gsub(/%note/, '')
+          base_output = base_template.gsub(/%filename/, filename).gsub(/%project/, project).gsub(/%parents?/, parents)
+          indent = NA::Color.uncolor(NA::Color.template(base_output)).length
+          action = action.wrap(width, indent)
+        end
+
+        # Replace variables in template string and output colorized (optimized)
+        final_output = output_template.dup
+        final_output.gsub!(/%filename/, filename)
+        final_output.gsub!(/%project/, project)
+        final_output.gsub!(/%parents?/, parents)
+        final_output.gsub!(/%action/, action.highlight_search(regexes))
+        final_output.gsub!(/%note/, note)
+        final_output.gsub!(/\\\{/, '{')
 
-      # Replace variables in template string and output colorized
-      NA::Color.template(template[:templates][:output].gsub(/%filename/, filename)
-                          .gsub(/%project/, project)
-                          .gsub(/%parents?/, parents)
-                          .gsub(/%action/, action.highlight_search(regexes))
-                          .gsub(/%note/, note)).gsub(/\\\{/, '{')
+        NA::Color.template(final_output)
+      end
     end
 
     def tags_match?(any: [], all: [], none: [])
@@ -150,8 +186,9 @@ module NA
 
     def search_matches_none(regexes, include_note: true)
       regexes.each do |rx|
-        note_matches = include_note && @note.join(' ').match(Regexp.new(rx, Regexp::IGNORECASE))
-        return false if @action.match(Regexp.new(rx, Regexp::IGNORECASE)) || note_matches
+        regex = rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE)
+        note_matches = include_note && @note.join(' ').match(regex)
+        return false if @action.match(regex) || note_matches
       end
       true
     end
@@ -160,16 +197,18 @@ module NA
       return true if regexes.empty?
 
       regexes.each do |rx|
-        note_matches = include_note && @note.join(' ').match(Regexp.new(rx, Regexp::IGNORECASE))
-        return true if @action.match(Regexp.new(rx, Regexp::IGNORECASE)) || note_matches
+        regex = rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE)
+        note_matches = include_note && @note.join(' ').match(regex)
+        return true if @action.match(regex) || note_matches
       end
       false
     end
 
     def search_matches_all(regexes, include_note: true)
       regexes.each do |rx|
-        note_matches = include_note && @note.join(' ').match(Regexp.new(rx, Regexp::IGNORECASE))
-        return false unless @action.match(Regexp.new(rx, Regexp::IGNORECASE)) || note_matches
+        regex = rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE)
+        note_matches = include_note && @note.join(' ').match(regex)
+        return false unless @action.match(regex) || note_matches
       end
       true
     end
@@ -198,7 +237,8 @@ module NA
     end
 
     def compare_tag(tag)
-      keys = @tags.keys.delete_if { |k| k !~ Regexp.new(tag[:tag], Regexp::IGNORECASE) }
+      tag_regex = tag[:tag].is_a?(Regexp) ? tag[:tag] : Regexp.new(tag[:tag], Regexp::IGNORECASE)
+      keys = @tags.keys.delete_if { |k| k !~ tag_regex }
       return false if keys.empty?
 
       key = keys[0]
@@ -211,6 +251,7 @@ module NA
 
       begin
         tag_date = Time.parse(tag_val)
+        require 'chronic' unless defined?(Chronic)
         date = Chronic.parse(val)
 
         raise ArgumentError if date.nil?

data/lib/na/actions.rb

@@ -24,15 +24,16 @@ module NA
     ## @return [String] The output string
     ##
     def output(depth, config = {})
-      defaults = {
-        files: nil,
-        regexes: [],
-        notes: false,
-        nest: false,
-        nest_projects: false,
-        no_files: false,
-      }
-      config = defaults.merge(config)
+      NA::Benchmark.measure('Actions.output') do
+        defaults = {
+          files: nil,
+          regexes: [],
+          notes: false,
+          nest: false,
+          nest_projects: false,
+          no_files: false,
+        }
+        config = defaults.merge(config)
 
       return if config[:files].nil?
 
@@ -73,21 +74,43 @@ module NA
         end
         NA::Pager.page out.join("\n")
       else
-        template = if config[:no_files]
-            NA.theme[:templates][:no_file]
-          elsif config[:files].count.positive?
-            config[:files].count == 1 ? NA.theme[:templates][:single_file] : NA.theme[:templates][:multi_file]
-          elsif NA.find_files(depth: depth).count > 1
-            depth > 1 ? NA.theme[:templates][:multi_file] : NA.theme[:templates][:single_file]
-          else
-            NA.theme[:templates][:default]
-          end
+        # Optimize template selection
+        template = case
+        when config[:no_files]
+          NA.theme[:templates][:no_file]
+        when config[:files]&.count&.positive?
+          config[:files].count == 1 ? NA.theme[:templates][:single_file] : NA.theme[:templates][:multi_file]
+        when depth > 1
+          NA.theme[:templates][:multi_file]
+        else
+          NA.theme[:templates][:default]
+        end
         template += "%note" if config[:notes]
 
-        config[:files].map { |f| NA.notify(f, debug: true) } if config[:files]
+        # Skip debug output if not verbose
+        config[:files]&.each { |f| NA.notify(f, debug: true) } if config[:files] && NA.verbose
+
+        # Optimize output generation - compile all output first, then apply regexes
+        output = String.new
+        NA::Benchmark.measure('Generate action strings') do
+          each_with_index do |action, idx|
+            # Generate raw output without regex processing
+            output << action.pretty(template: { templates: { output: template } }, regexes: [], notes: config[:notes])
+            output << "\n" unless idx == size - 1
+          end
+        end
 
-        output = map { |action| action.pretty(template: { templates: { output: template } }, regexes: config[:regexes], notes: config[:notes]) }
-        NA::Pager.page(output.join("\n"))
+        # Apply regex highlighting to the entire output at once
+        if config[:regexes].any?
+          NA::Benchmark.measure('Apply regex highlighting') do
+            output = output.highlight_search(config[:regexes])
+          end
+        end
+
+        NA::Benchmark.measure('Pager.page call') do
+          NA::Pager.page(output)
+        end
+      end
       end
     end
   end

data/lib/na/benchmark.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module NA
+  module Benchmark
+    class << self
+      attr_accessor :enabled, :timings
+
+      def init
+        @enabled = ENV['NA_BENCHMARK'] == '1' || ENV['NA_BENCHMARK'] == 'true'
+        @timings = []
+        @start_time = Time.now
+      end
+
+      def measure(label)
+        return yield unless @enabled
+
+        start = Time.now
+        result = yield
+        duration = ((Time.now - start) * 1000).round(2)
+        @timings << { label: label, duration: duration, timestamp: (start - @start_time) * 1000 }
+        result
+      end
+
+      def report
+        return unless @enabled
+
+        total = @timings.sum { |t| t[:duration] }
+        $stderr.puts "\n#{NA::Color.template('{y}=== NA Performance Report ===')}"
+        $stderr.puts NA::Color.template("{dw}Total: {bw}#{total.round(2)}ms{x}")
+        $stderr.puts NA::Color.template("{dw}GC Count: {bw}#{GC.count}{x}") if defined?(GC)
+        $stderr.puts NA::Color.template("{dw}Memory: {bw}#{(GC.stat[:heap_live_slots] * 40 / 1024.0).round(1)}KB{x}") if defined?(GC)
+        $stderr.puts ""
+
+        @timings.each do |timing|
+          pct = total > 0 ? ((timing[:duration] / total) * 100).round(1) : 0
+          bar = '█' * [(pct / 2).round, 50].min
+          $stderr.puts NA::Color.template(
+            "{dw}[{y}#{bar.ljust(25)}{dw}] {bw}#{timing[:duration].to_s.rjust(7)}ms {dw}(#{pct.to_s.rjust(5)}%) {x}#{timing[:label]}"
+          )
+        end
+        $stderr.puts NA::Color.template("{y}#{'=' * 50}{x}\n")
+      end
+    end
+  end
+end

data/lib/na/colors.rb

@@ -196,6 +196,24 @@ module NA
 
       attr_writer :coloring
 
+      # Cache for compiled templates to avoid repeated regex processing
+      def template_cache
+        @template_cache ||= {}
+      end
+
+      def clear_template_cache
+        @template_cache = {}
+      end
+
+      # Pre-computed colors hash (expensive to create, so we cache it)
+      def colors_hash
+        @colors_hash ||= { w: white, k: black, g: green, l: blue,
+                          y: yellow, c: cyan, m: magenta, r: red,
+                          W: bgwhite, K: bgblack, G: bggreen, L: bgblue,
+                          Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
+                          d: dark, b: bold, u: underline, i: italic, x: reset }
+      end
+
       ##
       ## Enables colored output
       ##
@@ -236,23 +254,28 @@ module NA
         input = input.join(' ') if input.is_a? Array
         return input.gsub(/(?<!\\)\{#?(\w+)\}/i, '') unless NA::Color.coloring?
 
-        input = input.gsub(/(?<!\\)\{((?:[fb]g?)?#[a-f0-9]{3,6})\}/i) do
-                  hex = Regexp.last_match(1)
-                  rgb(hex)
-                end
+        # Check cache first
+        cache_key = input.hash
+        return template_cache[cache_key] if template_cache.key?(cache_key)
+
+        # Process hex colors first
+        processed_input = input.gsub(/(?<!\\)\{((?:[fb]g?)?#[a-f0-9]{3,6})\}/i) do
+          hex = Regexp.last_match(1)
+          rgb(hex)
+        end
 
-        fmt = input.gsub(/%/, '%%')
+        # Convert to format string
+        fmt = processed_input.gsub(/%/, '%%')
         fmt = fmt.gsub(/(?<!\\)\{(\w+)\}/i) do
           Regexp.last_match(1).split('').map { |c| "%<#{c}>s" }.join('')
         end
 
-        colors = { w: white, k: black, g: green, l: blue,
-                   y: yellow, c: cyan, m: magenta, r: red,
-                   W: bgwhite, K: bgblack, G: bggreen, L: bgblue,
-                   Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
-                   d: dark, b: bold, u: underline, i: italic, x: reset }
+        # Use pre-computed colors hash
+        result = format(fmt, colors_hash)
 
-        format(fmt, colors)
+        # Cache the result
+        template_cache[cache_key] = result
+        result
       end
     end
 

data/lib/na/next_action.rb

@@ -259,6 +259,7 @@ module NA
                       tagged: nil)
 
       projects = find_projects(target)
+      affected_actions = []
 
       target_proj = nil
 
@@ -287,9 +288,22 @@ module NA
         target_proj = if target_proj
                         projects.select { |proj| proj.project =~ /^#{target_proj.project}$/i }.first
                       else
+                        # First try exact full-path match
                         projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/i }.first
                       end
 
+        # If no exact match, try unique suffix match (e.g., :Ideas at end)
+        if target_proj.nil?
+          leaf = Regexp.escape(add.parent.join(':'))
+          suffix_matches = projects.select { |proj| proj.project =~ /(^|:)#{leaf}$/i }
+          if suffix_matches.count == 1
+            target_proj = suffix_matches.first
+          elsif suffix_matches.count > 1 && $stdout.isatty
+            choice = choose_from(suffix_matches.map(&:project), prompt: 'Select a target project: ', multiple: false)
+            target_proj = projects.select { |proj| proj.project == choice }.first if choice
+          end
+        end
+
         if target_proj.nil?
           res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{add.project}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
 
@@ -336,6 +350,15 @@ module NA
         contents.insert(target_line, "#{indent}\t- #{add.action}#{note}")
 
         notify(add.pretty)
+
+        # Track affected action and description
+        changes = ["added"]
+        changes << "finished" if finish
+        changes << "priority=#{priority}" if priority.to_i.positive?
+        changes << "tags+#{add_tag.join(',')}" unless add_tag.nil? || add_tag.empty?
+        changes << "tags-#{remove_tag.join(',')}" unless remove_tag.nil? || remove_tag.empty?
+        changes << "note updated" unless note.nil? || note.empty?
+        affected_actions << { action: add, desc: changes.join(', ') }
       else
         _, actions = find_actions(target, search, tagged, done: done, all: all, project: project, search_note: search_note)
 
@@ -343,7 +366,11 @@ module NA
 
         actions.sort_by(&:line).reverse.each do |action|
           contents.slice!(action.line, action.note.count + 1)
-          next if delete
+          if delete
+            # Track deletion before skipping re-insert
+            affected_actions << { action: action, desc: 'deleted' }
+            next
+          end
 
           projects = shift_index_after(projects, action.line, action.note.count + 1)
 
@@ -395,16 +422,44 @@ module NA
           contents.insert(target_line, "#{indent}\t- #{action.action}#{note}")
 
           notify(action.pretty)
+
+          # Track affected action and description
+          changes = []
+          changes << "finished" if finish
+          changes << "edited" if edit
+          changes << "priority=#{priority}" if priority.to_i.positive?
+          changes << "tags+#{add_tag.join(',')}" unless add_tag.nil? || add_tag.empty?
+          changes << "tags-#{remove_tag.join(',')}" unless remove_tag.nil? || remove_tag.empty?
+          changes << "text replaced" if replace
+          changes << "moved to #{target_proj.project}" if target_proj
+          changes << "note updated" unless note.nil? || note.empty?
+          changes = ["updated"] if changes.empty?
+          affected_actions << { action: action, desc: changes.join(', ') }
         end
       end
 
       backup_file(target)
       File.open(target, 'w') { |f| f.puts contents.join("\n") }
 
-      if add
-        notify("#{NA.theme[:success]}Task added to #{NA.theme[:filename]}#{target}")
+      if affected_actions.any?
+        if affected_actions.all? { |e| e[:desc] =~ /^deleted/ }
+          notify("#{NA.theme[:success]}Task deleted in #{NA.theme[:filename]}#{target}")
+        elsif add
+          notify("#{NA.theme[:success]}Task added to #{NA.theme[:filename]}#{target}")
+        else
+          notify("#{NA.theme[:success]}Task updated in #{NA.theme[:filename]}#{target}")
+        end
+
+        affected_actions.reverse.each do |entry|
+          action_color = delete ? NA.theme[:error] : NA.theme[:success]
+          notify("  #{entry[:action].to_s_pretty} — #{action_color}#{entry[:desc]}")
+        end
       else
-        notify("#{NA.theme[:success]}Task updated in #{NA.theme[:filename]}#{target}")
+        if add
+          notify("#{NA.theme[:success]}Task added to #{NA.theme[:filename]}#{target}")
+        else
+          notify("#{NA.theme[:success]}Task updated in #{NA.theme[:filename]}#{target}")
+        end
       end
     end
 
@@ -499,11 +554,19 @@ module NA
     ## @param      depth  [Number] The depth at which to search
     ##
     def find_files(depth: 1)
-      return [NA.global_file] if NA.global_file
-
-      files = `find . -maxdepth #{depth} -name "*.#{NA.extension}"`.strip.split("\n")
-      files.each { |f| save_working_dir(File.expand_path(f)) }
-      files
+      NA::Benchmark.measure("find_files (depth=#{depth})") do
+        return [NA.global_file] if NA.global_file
+
+        pattern = if depth == 1
+                    "*.#{NA.extension}"
+                  else
+                    "{#{'*,' * (depth - 1)}*}.#{NA.extension}"
+                  end
+
+        files = Dir.glob(pattern, File::FNM_DOTMATCH).reject { |f| f.start_with?('.') }
+        files.each { |f| save_working_dir(File.expand_path(f)) }
+        files
+      end
     end
 
     def find_files_matching(options = {})
@@ -616,12 +679,14 @@ module NA
     ## @param      todo_file  The todo file path
     ##
     def save_working_dir(todo_file)
-      file = database_path
-      content = File.exist?(file) ? file.read_file : ''
-      dirs = content.split(/\n/)
-      dirs.push(File.expand_path(todo_file))
-      dirs.sort!.uniq!
-      File.open(file, 'w') { |f| f.puts dirs.join("\n") }
+      NA::Benchmark.measure('save_working_dir') do
+        file = database_path
+        content = File.exist?(file) ? file.read_file : ''
+        dirs = content.split(/\n/)
+        dirs.push(File.expand_path(todo_file))
+        dirs.sort!.uniq!
+        File.open(file, 'w') { |f| f.puts dirs.join("\n") }
+      end
     end
 
     ##

data/lib/na/pager.rb

@@ -29,38 +29,37 @@ module NA
           return
         end
 
+        # Skip pagination for small outputs (faster than starting a pager)
+        if text.length < 2000 && text.lines.count < 50
+          puts text
+          return
+        end
+
         pager = which_pager
+        return false unless pager
 
+        # Optimized pager execution - use spawn instead of fork+exec
         read_io, write_io = IO.pipe
 
-        input = $stdin
-
-        pid = Kernel.fork do
-          write_io.close
-          input.reopen(read_io)
-          read_io.close
-
-          # Wait until we have input before we start the pager
-          IO.select [input]
-
-          begin
-            NA.notify("#{NA.theme[:debug]}Pager #{pager}", debug: true)
-            exec(pager)
-          rescue SystemCallError => e
-            raise Errors::DoingStandardError, "Pager error, #{e}"
-          end
-        end
+        # Use spawn for better performance than fork+exec
+        pid = spawn(pager, in: read_io, out: $stdout, err: $stderr)
+        read_io.close
 
         begin
-          read_io.close
+          # Write data to pager
           write_io.write(text)
           write_io.close
-        rescue SystemCallError # => e
-          # raise Errors::DoingStandardError, "Pager error, #{e}"
-        end
 
-        _, status = Process.waitpid2(pid)
-        status.success?
+          # Wait for pager to complete
+          _, status = Process.waitpid2(pid)
+          status.success?
+        rescue SystemCallError => e
+          # Clean up on error
+          write_io.close rescue nil
+          Process.kill('TERM', pid) rescue nil
+          Process.waitpid(pid) rescue nil
+          false
+        end
       end
 
       private
@@ -89,6 +88,11 @@ module NA
       def which_pager
         @which_pager ||= find_executable(*pagers)
       end
+
+      # Clear pager cache (useful for testing)
+      def clear_pager_cache
+        @which_pager = nil
+      end
     end
   end
 end

data/lib/na/string.rb

@@ -355,6 +355,7 @@ class ::String
       date_string = 'today' if date_string.match(REGEX_DAY) && now.strftime('%a') =~ /^#{Regexp.last_match(1)}/i
       date_string = "#{options[:context].to_s} #{date_string}" if date_string =~ REGEX_TIME && options[:context]
 
+      require 'chronic' unless defined?(Chronic)
       res = Chronic.parse(date_string, {
                             guess: options.fetch(:guess, :begin),
                             context: options.fetch(:future, false) ? :future : :past,

data/lib/na/theme.rb

@@ -23,8 +23,9 @@ module NA
       end
 
       def load_theme(template: {})
-        # Default colorization, can be overridden with full or partial template variable
-        default_template = {
+        NA::Benchmark.measure('Theme.load_theme') do
+          # Default colorization, can be overridden with full or partial template variable
+          default_template = {
           parent: '{c}',
           bracket: '{dc}',
           parent_divider: '{xw}/',
@@ -58,14 +59,15 @@ module NA
                 else
                   {}
                 end
-        theme = default_template.deep_merge(theme)
+          theme = default_template.deep_merge(theme)
 
-        File.open(theme_file, 'w') do |f|
-          f.puts template_help.comment
-          f.puts YAML.dump(theme)
-        end
+          File.open(theme_file, 'w') do |f|
+            f.puts template_help.comment
+            f.puts YAML.dump(theme)
+          end
 
-        theme.merge(template)
+          theme.merge(template)
+        end
       end
     end
   end

data/lib/na/todo.rb

@@ -27,21 +27,22 @@ module NA
     ## @option      file_path   [String] file path to parse
     ##
     def parse(options)
-      defaults = {
-        depth: 1,
-        done: false,
-        file_path: nil,
-        negate: false,
-        project: nil,
-        query: nil,
-        regex: false,
-        require_na: true,
-        search: nil,
-        search_note: true,
-        tag: nil
-      }
-
-      settings = defaults.merge(options)
+      NA::Benchmark.measure('Todo.parse') do
+        defaults = {
+          depth: 1,
+          done: false,
+          file_path: nil,
+          negate: false,
+          project: nil,
+          query: nil,
+          regex: false,
+          require_na: true,
+          search: nil,
+          search_note: true,
+          tag: nil
+        }
+
+        settings = defaults.merge(options)
 
       actions = NA::Actions.new
       required = []
@@ -87,6 +88,11 @@ module NA
         end
       end
 
+      # Pre-compile regexes for better performance
+      optional = optional.map { |rx| rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE) }
+      required = required.map { |rx| rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE) }
+      negated = negated.map { |rx| rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE) }
+
       files = if !settings[:file_path].nil?
                 [settings[:file_path]]
               elsif settings[:query].nil?
@@ -96,14 +102,21 @@ module NA
               end
 
       NA.notify("Files: #{files.join(', ')}", debug: true)
-      files.each do |file|
-        NA.save_working_dir(File.expand_path(file))
-        content = file.read_file
-        indent_level = 0
-        parent = []
-        in_yaml = false
-        in_action = false
-        content.split(/\n/).each.with_index do |line, idx|
+      # Cache project regex compilation outside the line loop for better performance
+      project_regex = if settings[:project]
+                        rx = settings[:project].split(%r{[/:]}).join('.*?/')
+                        Regexp.new("#{rx}.*?", Regexp::IGNORECASE)
+                      end
+
+        files.each do |file|
+          NA::Benchmark.measure("Parse file: #{File.basename(file)}") do
+            NA.save_working_dir(File.expand_path(file))
+            content = file.read_file
+            indent_level = 0
+            parent = []
+            in_yaml = false
+            in_action = false
+            content.split(/\n/).each.with_index do |line, idx|
           if in_yaml && line !~ /^(---|~~~)\s*$/
             NA.notify("YAML: #{line}", debug: true)
           elsif line =~ /^(---|~~~)\s*$/
@@ -130,20 +143,22 @@ module NA
           elsif line.action?
             in_action = false
 
-            action = line.action
-            new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action, idx)
-
-            projects[-1].last_line = idx if projects.count.positive?
-
+            # Early exits before creating Action object
             next if line.done? && !settings[:done]
 
             next if settings[:require_na] && !line.na?
 
-            if settings[:project]
-              rx = settings[:project].split(%r{[/:]}).join('.*?/')
-              next unless parent.join('/') =~ Regexp.new("#{rx}.*?", Regexp::IGNORECASE)
+            if project_regex
+              next unless parent.join('/') =~ project_regex
             end
 
+            # Only create Action if we passed basic filters
+            action = line.action
+            new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action, idx)
+
+            projects[-1].last_line = idx if projects.count.positive?
+
+            # Tag matching
             has_tag = !optional_tag.empty? || !required_tag.empty? || !negated_tag.empty?
             next if has_tag && !new_action.tags_match?(any: optional_tag,
                                                        all: required_tag,
@@ -155,19 +170,23 @@ module NA
             actions[-1].note.push(line.strip) if actions.count.positive?
             projects[-1].last_line = idx if projects.count.positive?
           end
+            end
+            projects = projects.dup
+          end
         end
-        projects = projects.dup
-      end
 
-      actions.delete_if do |new_action|
-        has_search = !optional.empty? || !required.empty? || !negated.empty?
-        has_search && !new_action.search_match?(any: optional,
-                                                all: required,
-                                                none: negated,
-                                                include_note: settings[:search_note])
-      end
+        NA::Benchmark.measure('Filter actions by search') do
+          actions.delete_if do |new_action|
+            has_search = !optional.empty? || !required.empty? || !negated.empty?
+            has_search && !new_action.search_match?(any: optional,
+                                                   all: required,
+                                                   none: negated,
+                                                   include_note: settings[:search_note])
+          end
+        end
 
-      [files, actions, projects]
+        [files, actions, projects]
+      end
     end
 
     def parse_search(tag, negate)

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.78'
+  VERSION = '1.2.80'
 end

data/lib/na.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require 'na/benchmark'
 require 'na/version'
 require 'na/pager'
 require 'time'
 require 'fileutils'
 require 'shellwords'
-require 'chronic'
+# Lazy load heavy gems - only load when needed
+# require 'chronic'  # Loaded in action.rb and string.rb when needed
 require 'tty-screen'
 require 'tty-reader'
 require 'tty-which'

data/src/_README.md

@@ -9,7 +9,7 @@
 _If you're one of the rare people like me who find this useful, feel free to
 [buy me some coffee][donate]._
 
-The current version of `na` is <!--VER-->1.2.77<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.79<!--END VER-->.
 
 `na` ("next action") is a command line tool designed to make it easy to see what your next actions are for any project, right from the command line. It works with TaskPaper-formatted files (but any plain text format will do), looking for `@na` tags (or whatever you specify) in todo files in your current folder. 
 

data/test_performance.rb

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Simple performance test script that doesn't require bundler
+require_relative 'lib/na/benchmark'
+
+# Mock the required dependencies
+module NA
+  module Color
+    def self.template(input)
+      input.to_s  # Simple mock
+    end
+  end
+
+  module Theme
+    def self.load_theme
+      {
+        parent: '{c}',
+        bracket: '{dc}',
+        parent_divider: '{xw}/',
+        action: '{bg}',
+        project: '{xbk}',
+        templates: {
+          output: '%parent%action',
+          default: '%parent%action'
+        }
+      }
+    end
+  end
+
+  def self.theme
+    @theme ||= Theme.load_theme
+  end
+
+  def self.notify(msg, debug: false)
+    puts msg if debug
+  end
+end
+
+# Initialize benchmark
+NA::Benchmark.init
+
+# Test the optimizations
+puts "Testing performance optimizations..."
+
+# Test 1: Theme caching
+NA::Benchmark.measure('Theme loading (first time)') do
+  theme1 = NA::Theme.load_theme
+end
+
+NA::Benchmark.measure('Theme loading (cached)') do
+  theme2 = NA.theme
+end
+
+# Test 2: Color template caching
+NA::Benchmark.measure('Color template (first time)') do
+  NA::Color.template('{bg}Test action{x}')
+end
+
+NA::Benchmark.measure('Color template (cached)') do
+  NA::Color.template('{bg}Test action{x}')
+end
+
+# Test 3: Multiple operations
+NA::Benchmark.measure('Multiple theme calls') do
+  100.times do
+    NA.theme
+  end
+end
+
+NA::Benchmark.measure('Multiple color templates') do
+  100.times do
+    NA::Color.template('{bg}Action {c}#{rand(1000)}{x}')
+  end
+end
+
+# Report results
+NA::Benchmark.report

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.78
+  version: 1.2.80
 platform: ruby
 authors:
 - Brett Terpstra
@@ -261,6 +261,7 @@ files:
 - lib/na/action.rb
 - lib/na/actions.rb
 - lib/na/array.rb
+- lib/na/benchmark.rb
 - lib/na/colors.rb
 - lib/na/editor.rb
 - lib/na/hash.rb
@@ -281,6 +282,7 @@ files:
 - src/_README.md
 - test.md
 - test2.txt
+- test_performance.rb
 homepage: https://brettterpstra.com/projects/na/
 licenses:
 - MIT