na 1.2.85 → 1.2.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da5eb39ed44c356c713172455a60fe197de3d1d1f00dc2eedadeb24fe40c9dde
-  data.tar.gz: 5e58a4e4c17fac35a091b3cc49e7dca7aca06289b1fbc897be752bb4cdb93817
+  metadata.gz: 05b84c85234711e95bc6fae91b279577d0908ba7bc0b1fb254729d65c2823f99
+  data.tar.gz: acf70b87b92d32a81ae7802397e3f72fd72b28410c50556c680ad0f05c6ea21f
 SHA512:
-  metadata.gz: 053e5636721b5c9544e22099840ef279462cbba96bd8f561c6a37c3f5b5453d7872bf549da8e8f78009f2c0a417805711ee3c7eebe2dfdf05538bbad84f7aafc
-  data.tar.gz: 4626f2c6808056d9de394bd1eec109c0c56a8622015157ecc95bdf555523729254735550a775ae4542b5c20023d7bfc152152db0cf042661e07e5ec6ef1bc9ef
+  metadata.gz: 627981de849f31ca58ba38ff7e40915baf7cbf32f4a78d005f35a2590b853a477e28e71c209b5974cb9f4eae311d3f9e4c14c4fd690a253c16584bcac7d48fb1
+  data.tar.gz: 362e2719a19069a27cad8937d3ed7cabd81a7fd57a2b9f6a1dfa72ff439adf3fd64e691f651ad46020cdd4cdd08d0b6161b93adfcaf75c96040cf75451397a2f

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-10-26 12:18:27 UTC using RuboCop version 1.75.7.
+# on 2025-10-27 21:36:52 UTC using RuboCop version 1.75.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -21,46 +21,53 @@ Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/na/string.rb'
 
-# Offense count: 35
+# Offense count: 36
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 232
+  Max: 243
 
-# Offense count: 10
+# Offense count: 9
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 144
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 763
+  Max: 777
 
-# Offense count: 23
+# Offense count: 25
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 66
+  Max: 70
 
-# Offense count: 38
+# Offense count: 40
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 146
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 765
+  Max: 779
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 19
 
-# Offense count: 22
+# Offense count: 24
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 76
+  Max: 81
+
+# Offense count: 1
+# Configuration parameters: ForbiddenDelimiters.
+# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'lib/na/editor.rb'
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -69,21 +76,6 @@ Security/YAMLLoad:
     - 'lib/na/next_action.rb'
     - 'lib/na/theme.rb'
 
-# Offense count: 8
-# Configuration parameters: AllowedConstants.
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'lib/na/action.rb'
-    - 'lib/na/array.rb'
-    - 'lib/na/benchmark.rb'
-    - 'lib/na/editor.rb'
-    - 'lib/na/hash.rb'
-    - 'lib/na/project.rb'
-    - 'lib/na/theme.rb'
-    - 'lib/na/todo.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
@@ -99,13 +91,21 @@ Style/ModuleFunction:
   Exclude:
     - 'lib/na/colors.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiteralsInInterpolation:
+  Exclude:
+    - 'lib/na/action.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Style/YAMLFileRead:
   Exclude:
     - 'lib/na/theme.rb'
 
-# Offense count: 18
+# Offense count: 22
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.2.86
+
+2025-10-27 17:16
+
 ### 1.2.85
 
 2025-10-26 08:43

data/Gemfile

@@ -3,3 +3,5 @@
 source 'https://rubygems.org'
 gemspec
 gem 'rake'
+
+gem "simplecov", "~> 0.22.0", group: :development

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.85)
+    na (1.2.86)
       chronic (~> 0.10, >= 0.10.2)
       git (~> 3.0.0)
       gli (~> 2.21.0)
@@ -36,6 +36,7 @@ GEM
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
     diff-lcs (1.6.2)
+    docile (1.4.1)
     drb (2.2.3)
     git (3.0.2)
       activesupport (>= 5.0)
@@ -69,6 +70,12 @@ GEM
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
     securerandom (0.4.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
     tty-cursor (0.7.1)
     tty-reader (0.9.0)
       tty-cursor (~> 0.7)
@@ -103,6 +110,7 @@ DEPENDENCIES
   rake
   rdoc (~> 4.3)
   rspec (~> 3.0)
+  simplecov (~> 0.22.0)
   tty-spinner (~> 0.9, >= 0.9.0)
 
 BUNDLED WITH

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.85.
+The current version of `na` is 1.2.86.
 
 `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.85
+    1.2.86
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)

data/bin/commands/update.rb

@@ -164,13 +164,33 @@ class App
 
       options[:exact] = true unless options[:replace].nil?
 
+      # Check for PATH:LINE format in arguments
+      target_file = nil
+      target_line = nil
+      if args.count.positive?
+        pathline_match = args.join(' ').strip.match(/^(.+):(\d+)$/)
+        if pathline_match
+          target_file = pathline_match[1]
+          target_line = pathline_match[2].to_i
+
+          # Verify file exists
+          if File.exist?(target_file)
+            options[:file] = target_file
+            options[:target_line] = target_line
+            action = nil  # Skip search processing
+          else
+            NA.notify("#{NA.theme[:error]}File not found: #{target_file}", exit_code: 1)
+          end
+        end
+      end
+
       if args.count.positive?
         action = args.join(' ').strip
       else
         action = nil
       end
       tokens = nil
-      if action && !action.empty?
+      if action && !action.empty? && !target_line
         if options[:exact]
           tokens = action
         elsif options[:regex]
@@ -218,10 +238,11 @@ class App
           done: options[:done]
         })
         todo.actions.each do |action_obj|
-          # Format: filename:project:parent > action
-          display = "#{File.basename(action_obj.file)}:#{action_obj.project}:#{action_obj.parent.join('>')} | #{action_obj.action}"
+          # Format: filename:LINENUM:parent > action
+          # Include line number in display for unique matching
+          display = "#{File.basename(action_obj.file_path)}:#{action_obj.file_line}:#{action_obj.parent.join('>')} | #{action_obj.action}"
           candidate_actions << display
-          targets_for_selection << { file: action_obj.file, line: action_obj.line, action: action_obj }
+          targets_for_selection << { file: action_obj.file_path, line: action_obj.file_line, action: action_obj }
         end
       end
 
@@ -237,9 +258,24 @@ class App
         if selector
           require 'open3'
           input = candidate_actions.join("\n")
-          output, _ = Open3.capture2("echo \"#{input.gsub('"', '\"')}\" | #{selector}")
-          selected = output.split("\n").map(&:strip).reject(&:empty?)
-          selected_indices = candidate_actions.each_index.select { |i| selected.include?(candidate_actions[i]) }
+
+          # Use popen3 to properly handle stdin for fzf
+          Open3.popen3(selector) do |stdin, stdout, stderr, wait_thr|
+            stdin.write(input)
+            stdin.close
+
+            output = stdout.read
+
+            selected = output.split("\n").map(&:strip).reject(&:empty?)
+
+            # Track which candidates have been matched to avoid duplicates
+            selected_indices = []
+            candidate_actions.each_index do |i|
+              if selected.include?(candidate_actions[i])
+                selected_indices << i unless selected_indices.include?(i)
+              end
+            end
+          end
         else
           # Fallback: select all or prompt for search string
           selected_indices = (0...candidate_actions.size).to_a
@@ -326,12 +362,7 @@ class App
         when :finish
           options[:finish] = true
         when :edit
-          # Open editor for the selected action and update its content
-          edit_action = targets_for_selection[selected_indices.first][:action]
-          editor_content = "#{edit_action.action}\n#{edit_action.note.join("\n")}"
-          new_action, new_note = NA::Editor.format_input(NA::Editor.fork_editor(editor_content))
-          edit_action.action = new_action
-          edit_action.note = new_note
+          # Just set the flag - multi-action editor will handle it below
           options[:edit] = true
         when :priority
           options[:priority] = param_value
@@ -384,7 +415,17 @@ class App
         end
       end
       did_direct_update = false
+
+      # Group selected actions by file for batch processing
+      actions_by_file = {}
       selected_indices.each do |idx|
+        file = targets_for_selection[idx][:file]
+        actions_by_file[file] ||= []
+        actions_by_file[file] << targets_for_selection[idx][:action]
+      end
+
+      # Process each file's actions
+      actions_by_file.each do |file, action_list|
         # Rebuild all derived variables from options after menu-driven assignment
         add_tags = options[:tag] ? options[:tag].join(',').split(/ *, */).map { |t| t.sub(/^@/, '') } : []
         remove_tags = options[:remove] ? options[:remove].join(',').split(/ *, */).map { |t| t.sub(/^@/, '') } : []
@@ -399,29 +440,64 @@ class App
         if options[:note] && defined?(param_value) && param_value
           note_val = [param_value]
         end
-        # Pass the selected action object as 'add', set search to nil
-        # Pass the exact selected action object to update_action, bypassing all search/filter logic
-        target = targets_for_selection[idx][:file]
-        action_obj = targets_for_selection[idx][:action]
-        # Direct action mode: update only the selected action in the known file
-        NA.update_action(target, nil,
-          add: action_obj,
-          add_tag: add_tags,
-          all: true,
-          append: append,
-          delete: options[:delete],
-          done: options[:done],
-          edit: options[:edit],
-          finish: options[:finish],
-          move: target_proj,
-          note: note_val,
-          overwrite: options[:overwrite],
-          priority: priority,
-          project: options[:project],
-          remove_tag: remove_tags,
-          replace: options[:replace],
-          search_note: options[:search_notes],
-          tagged: nil)
+
+        # Handle edit with multiple actions
+        if options[:edit]
+          # Open editor once with all actions for this file
+          editor_content = NA::Editor.format_multi_action_input(action_list)
+          edited_content = NA::Editor.fork_editor(editor_content)
+          edited_actions = NA::Editor.parse_multi_action_output(edited_content)
+
+          # If markers were removed but we have the same number of actions, match by position
+          if edited_actions.empty? && action_list.size > 0
+            # Parse content line by line, skipping comments and blanks
+            non_comment_lines = edited_content.lines.map(&:strip).reject { |l| l.empty? || l.start_with?('#') }
+
+            # Match each non-comment line to an action by position
+            action_list.each_with_index do |action_obj, idx|
+              if non_comment_lines[idx]
+                # Split into action and notes
+                lines = non_comment_lines[idx..-1]
+                action_text = lines[0]
+                note_lines = lines[1..-1] || []
+
+                # Store by file:line key
+                key = "#{action_obj.file_path}:#{action_obj.file_line}"
+                edited_actions[key] = [action_text, note_lines]
+              end
+            end
+          end
+
+          # Update each action with edited content
+          action_list.each do |action_obj|
+            key = "#{action_obj.file_path}:#{action_obj.file_line}"
+            if edited_actions[key]
+              action_obj.action, action_obj.note = edited_actions[key]
+            end
+          end
+        end
+
+        # Update each action
+        action_list.each do |action_obj|
+          NA.update_action(file, nil,
+            add: action_obj,
+            add_tag: add_tags,
+            all: true,
+            append: append,
+            delete: options[:delete],
+            done: options[:done],
+            edit: false,  # Already handled above
+            finish: options[:finish],
+            move: target_proj,
+            note: note_val,
+            overwrite: options[:overwrite],
+            priority: priority,
+            project: options[:project],
+            remove_tag: remove_tags,
+            replace: options[:replace],
+            search_note: options[:search_notes],
+            tagged: nil)
+        end
         did_direct_update = true
       end
       if did_direct_update
@@ -539,8 +615,15 @@ class App
 
       NA.notify("#{NA.theme[:error]}No search terms provided", exit_code: 1) if tokens.nil? && options[:tagged].empty?
 
+      # Handle target_line if provided (from PATH:LINE format)
+      search_tokens = if options[:target_line]
+                       { target_line: options[:target_line] }
+                     else
+                       tokens
+                     end
+
       targets.each do |target|
-        NA.update_action(target, tokens,
+        NA.update_action(target, search_tokens,
                          add_tag: add_tags,
                          all: options[:all],
                          append: append,

data/lib/na/action.rb

@@ -14,7 +14,12 @@ module NA
     def initialize(file, project, parent, action, idx, note = [])
       super()
 
-      @file = file
+      # Store file in PATH:LINE format if line is available
+      @file = if idx.is_a?(Integer)
+                "#{file}:#{idx}"
+              else
+                file
+              end
       @project = project
       @parent = parent
       @action = action.gsub('{', '\\{')
@@ -23,6 +28,32 @@ module NA
       @note = note
     end
 
+    # Extract file path and line number from PATH:LINE format
+    #
+    # @return [Array] [file_path, line_number]
+    def file_line_parts
+      if @file.to_s.include?(':')
+        path, line = @file.split(':', 2)
+        [path, line.to_i]
+      else
+        [@file, @line]
+      end
+    end
+
+    # Get just the file path without line number
+    #
+    # @return [String] File path
+    def file_path
+      file_line_parts.first
+    end
+
+    # Get the line number
+    #
+    # @return [Integer] Line number
+    def file_line
+      file_line_parts.last
+    end
+
     # Update the action string and note with priority, tags, and completion status
     #
     # @param priority [Integer] Priority value to set
@@ -70,7 +101,7 @@ module NA
              else
                ''
              end
-      "(#{@file}:#{@line}) #{@project}:#{@parent.join('>')} | #{@action}#{note}"
+      "(#{file_path}:#{file_line}) #{@project}:#{@parent.join(">")} | #{@action}#{note}"
     end
 
     # Pretty string representation of the action with color formatting
@@ -82,7 +113,7 @@ module NA
              else
                ''
              end
-      "{x}#{NA.theme[:filename]}#{File.basename(@file)}:#{@line}{x}#{NA.theme[:bracket]}[{x}#{NA.theme[:project]}#{@project}:#{@parent.join('>')}{x}#{NA.theme[:bracket]}]{x} | #{NA.theme[:action]}#{@action}{x}#{NA.theme[:note]}#{note}"
+      "{x}#{NA.theme[:filename]}#{File.basename(file_path)}:#{file_line}{x}#{NA.theme[:bracket]}[{x}#{NA.theme[:project]}#{@project}:#{@parent.join('>')}{x}#{NA.theme[:bracket]}]{x} | #{NA.theme[:action]}#{@action}{x}#{NA.theme[:note]}#{note}"
     end
 
     # Inspect the action object
@@ -112,49 +143,67 @@ module NA
       NA::Benchmark.measure('Action.pretty') do
         # Use cached theme instead of loading every time
         theme = NA.theme
-        template = theme.merge(template)
+        # Merge templates if provided
+        if template[:templates]
+          theme = theme.dup
+          theme[:templates] = theme[:templates].merge(template[:templates])
+          template = theme.merge(template.reject { |k| k == :templates })
+        else
+          template = theme.merge(template)
+        end
 
         # Pre-compute common template parts to avoid repeated processing
         output_template = template[:templates][:output]
         needs_filename = output_template.include?('%filename')
+        needs_line = output_template.include?('%line')
         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}{x}#{template[:bracket]}]{x} ")
+                    # parent_parts already has color codes embedded, create final string directly
+                    "#{NA::Color.template("{x}#{template[:bracket]}[")}#{parent_parts}#{NA::Color.template("{x}#{template[:bracket]}]{x}")}"
                   else
                     ''
                   end
 
-        # Create the project string (optimized)
+        # Create the project string (optimized) - Ensure color reset before project
         project = if needs_project && !@project.empty?
-                    NA::Color.template("{x}#{template[:project]}#{@project}{x} ")
+                    NA::Color.template("{x}#{template[:project]}#{@project}{x}")
                   else
                     ''
                   end
 
         # Create the source filename string (optimized)
         filename = if needs_filename
-                     path = @file ? @file.sub(%r{^\./}, '').sub(/#{Dir.home}/, '~') : ''
+                     path_only = file_path # Extract just the path from PATH:LINE
+                     path = path_only.sub(%r{^\./}, '').sub(/#{Dir.home}/, '~')
                      if File.dirname(path) == '.'
                        fname = NA.include_ext ? File.basename(path) : File.basename(path, ".#{extension}")
                        fname = "./#{fname}" if NA.show_cwd_indicator
-                       NA::Color.template("#{template[:filename]}#{fname} {x}")
+                       NA::Color.template("#{template[:filename]}#{fname}{x}")
                      else
                        colored = (NA.include_ext ? path : path.sub(/\.#{extension}$/, '')).highlight_filename
-                       NA::Color.template("#{template[:filename]}#{colored} {x}")
+                       NA::Color.template("#{template[:filename]}#{colored}{x}")
                      end
                    else
                      ''
                    end
 
+        # Create the line number string (optimized)
+        line_num = if needs_line && @line
+                     NA::Color.template("#{template[:line]}:#{@line} {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}")
+        # Reset colors before action to prevent bleeding from parents/project
+        action = NA::Color.template("{x}#{template[:action]}#{action_text}{x}")
         action = action.highlight_tags(color: template[:tags],
                                        parens: template[:value_parens],
                                        value: template[:values],
@@ -169,8 +218,8 @@ module NA
               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)
+              base_output = base_template.gsub('%filename', filename).gsub('%line', line_num).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
@@ -185,7 +234,7 @@ module NA
         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)
+          base_output = base_template.gsub('%filename', filename).gsub('%line', line_num).gsub('%project', project).gsub(/%parents?/, parents)
           indent = NA::Color.uncolor(NA::Color.template(base_output)).length
           action = action.wrap(width, indent)
         end
@@ -193,6 +242,7 @@ module NA
         # Replace variables in template string and output colorized (optimized)
         final_output = output_template.dup
         final_output.gsub!('%filename', filename)
+        final_output.gsub!('%line', line_num)
         final_output.gsub!('%project', project)
         final_output.gsub!(/%parents?/, parents)
         final_output.gsub!('%action', action.highlight_search(regexes))

data/lib/na/editor.rb

@@ -100,7 +100,12 @@ module NA
           tmpfile.unlink
         end
 
-        input.split("\n").delete_if(&:ignore?).join("\n")
+        # Don't strip comments if this looks like multi-action format (has # ------ markers)
+        if input.include?('# ------ ')
+          input
+        else
+          input.split("\n").delete_if(&:ignore?).join("\n")
+        end
       end
 
       # Takes a multi-line string and formats it as an entry
@@ -129,6 +134,80 @@ module NA
 
         [title, note]
       end
+
+      # Format multiple actions for multi-edit
+      # @param actions [Array<Action>] Actions to edit
+      # @return [String] Formatted editor content
+      def format_multi_action_input(actions)
+        header = <<~EOF
+          # Instructions:
+          # - Edit the action text (the lines WITHOUT # comment markers)
+          # - DO NOT remove or edit the lines starting with "# ------"
+          # - Add notes on new lines after the action
+          # - Blank lines are ignored
+          #
+
+        EOF
+
+        # Use + to create a mutable string
+        content = +header
+
+        actions.each do |action|
+          # Use file_path to get the path and file_line to get the line number
+          content << "# ------ #{action.file_path}:#{action.file_line}\n"
+          content << "#{action.action}\n"
+          content << "#{action.note.join("\n")}\n" if action.note.any?
+          content << "\n" # Blank line separator
+        end
+
+        content
+      end
+
+      # Parse multi-action editor output
+      # @param content [String] Editor output
+      # @return [Hash] Hash mapping file:line to [action, note]
+      def parse_multi_action_output(content)
+        results = {}
+        current_file = nil
+        current_action = nil
+        current_note = []
+
+        content.lines.each do |line|
+          stripped = line.strip
+
+          # Check for file marker: # ------ path:line
+          match = stripped.match(/^# ------ (.+?):(\d+)$/)
+          if match
+            # Save previous action if exists
+            results[current_file] = [current_action, current_note] if current_file && current_action
+
+            # Start new action
+            current_file = "#{match[1]}:#{match[2]}"
+            current_action = nil
+            current_note = []
+            next
+          end
+
+          # Skip other comment lines
+          next if stripped.start_with?('#')
+
+          # Skip blank lines
+          next if stripped.empty?
+
+          # Store as action or note based on what we've seen so far
+          if current_action.nil?
+            current_action = stripped
+          else
+            # Subsequent lines are notes
+            current_note << stripped
+          end
+        end
+
+        # Save last action
+        results[current_file] = [current_action, current_note] if current_file && current_action
+
+        results
+      end
     end
   end
 end

data/lib/na/next_action.rb

@@ -169,8 +169,9 @@ module NA
     # @param done [Boolean] Include done actions
     # @param project [String, nil] Project name
     # @param search_note [Boolean] Search notes
+    # @param target_line [Integer] Specific line number to target
     # @return [Array] Projects and actions
-    def find_actions(target, search, tagged = nil, all: false, done: false, project: nil, search_note: true)
+    def find_actions(target, search, tagged = nil, all: false, done: false, project: nil, search_note: true, target_line: nil)
       todo = NA::Todo.new({ search: search,
                             search_note: search_note,
                             require_na: false,
@@ -187,7 +188,17 @@ module NA
 
       return [todo.projects, todo.actions] if todo.actions.count == 1 || all
 
-      options = todo.actions.map { |action| "#{action.line} % #{action.parent.join('/')} : #{action.action}" }
+      # If target_line is specified, find the action at that specific line
+      if target_line
+        matching_action = todo.actions.find { |a| a.line == target_line }
+        return [todo.projects, NA::Actions.new([matching_action])] if matching_action
+
+        NA.notify("#{NA.theme[:error]}No action found at line #{target_line}", exit_code: 1)
+        return [todo.projects, NA::Actions.new]
+
+      end
+
+      options = todo.actions.map { |action| "#{action.file} : #{action.action}" }
       res = choose_from(options, prompt: 'Make a selection: ', multiple: true, sorted: true)
 
       unless res&.length&.positive?
@@ -197,9 +208,14 @@ module NA
 
       selected = NA::Actions.new
       res.each do |result|
-        idx = result.match(/^(\d+)(?= % )/)[1]
-        action = todo.actions.select { |a| a.line == idx.to_i }.first
-        selected.push(action)
+        # Extract file:line from result (e.g., "./todo.taskpaper:21 : action text")
+        match = result.match(/^(.+?):(\d+) : /)
+        next unless match
+
+        file_path = match[1]
+        line_num = match[2].to_i
+        action = todo.actions.select { |a| a.file_path == file_path && a.file_line == line_num }.first
+        selected.push(action) if action
       end
       [todo.projects, selected]
     end
@@ -312,6 +328,9 @@ module NA
                       remove_tag: [],
                       replace: nil,
                       tagged: nil)
+      # Expand target to absolute path to avoid path resolution issues
+      target = File.expand_path(target) unless Pathname.new(target).absolute?
+
       projects = find_projects(target)
       affected_actions = []
 
@@ -336,11 +355,14 @@ module NA
       contents = target.read_file.split("\n")
 
       if add.is_a?(Action)
+        # NOTE: Edit is handled in the update command before calling update_action
+        # So we don't need to handle it here - the action is already edited
+
         add_tag ||= []
         add.process(priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
         # Remove the original action and its notes
-        action_line = add.line
+        action_line = add.file_line
         note_lines = add.note.is_a?(Array) ? add.note.count : 0
         contents.slice!(action_line, note_lines + 1)
 
@@ -389,27 +411,36 @@ module NA
         changes << "moved to #{target_proj.project}" if move && target_proj
         affected_actions << { action: add, desc: changes.join(', ') }
       else
+        # Check if search is actually target_line
+        target_line = search.is_a?(Hash) && search[:target_line] ? search[:target_line] : nil
         _, actions = find_actions(target, search, tagged, done: done, all: all, project: project,
-                                                          search_note: search_note)
+                                                          search_note: search_note, target_line: target_line)
 
         return if actions.nil?
 
-        actions.sort_by(&:line).reverse.each do |action|
-          contents.slice!(action.line, action.note.count + 1)
+        # Handle edit (single or multi-action)
+        if edit
+          editor_content = Editor.format_multi_action_input(actions)
+          edited_content = Editor.fork_editor(editor_content)
+          edited_actions = Editor.parse_multi_action_output(edited_content)
+
+          # Map edited content back to actions
+          actions.each do |action|
+            # Use file_path:file_line as the key
+            key = "#{action.file_path}:#{action.file_line}"
+            action.action, action.note = edited_actions[key] if edited_actions[key]
+          end
+        end
+
+        actions.sort_by(&:file_line).reverse.each do |action|
+          contents.slice!(action.file_line, action.note.count + 1)
           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)
-
-          if edit
-            editor_content = "#{action.action}\n#{action.note.join("\n")}"
-            new_action, new_note = Editor.format_input(Editor.fork_editor(editor_content))
-            action.action = new_action
-            action.note = new_note
-          end
+          projects = shift_index_after(projects, action.file_line, action.note.count + 1)
 
           # If replace is defined, use search to search and replace text in action
           action.action.sub!(Regexp.new(Regexp.escape(search), Regexp::IGNORECASE), replace) if replace

data/lib/na/string.rb

@@ -149,13 +149,17 @@ class ::String
   # @param color [String] The highlight color template
   # @param last_color [String] Color to restore after highlight
   def highlight_search(regexes, color: NA.theme[:search_highlight], last_color: NA.theme[:action])
+    # Skip if string already contains ANSI codes - applying regex to colored text
+    # will break escape sequences (e.g., searching for "3" will match "3" in "38;2;236;204;135m")
+    return self if include?("\e")
+
+    # Original simple approach for strings without ANSI codes
     string = dup
     color = NA::Color.template(color.dup)
     regexes.each do |rx|
       next if rx.nil?
 
       rx = Regexp.new(rx, Regexp::IGNORECASE) if rx.is_a?(String)
-
       string.gsub!(rx) do
         m = Regexp.last_match
         last = m.pre_match.last_color
@@ -190,9 +194,9 @@ class ::String
     output = []
     line = []
     length = 0
-    gsub!(/(@\S+)\((.*?)\)/) { "#{Regexp.last_match(1)}(#{Regexp.last_match(2).gsub(/ /, '†')})" }
+    text = gsub(/(@\S+)\((.*?)\)/) { "#{Regexp.last_match(1)}(#{Regexp.last_match(2).gsub(/ /, '†')})" }
 
-    split(' ').each do |word|
+    text.split.each do |word|
       uncolored = NA::Color.uncolor(word)
       if (length + uncolored.length + 1) <= width
         line << word

data/lib/na/theme.rb

@@ -37,51 +37,60 @@ module NA
       # @example
       #   NA::Theme.load_theme(template: { action: '{r}' })
       def load_theme(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}/',
-            action: '{bg}',
-            project: '{xbk}',
-            tags: '{m}',
-            value_parens: '{m}',
-            values: '{c}',
-            search_highlight: '{y}',
-            note: '{dw}',
-            dirname: '{xdw}',
-            filename: '{xb}{#eccc87}',
-            prompt: '{m}',
-            success: '{bg}',
-            error: '{b}{#b61d2a}',
-            warning: '{by}',
-            debug: '{dw}',
-            templates: {
-              output: '%filename%parents| %action',
-              default: '%parent%action',
-              single_file: '%parent%action',
-              multi_file: '%filename%parent%action',
-              no_file: '%parent%action'
-            }
-          }
+        if defined?(NA::Benchmark) && NA::Benchmark
+          NA::Benchmark.measure('Theme.load_theme') do
+            load_theme_internal(template: template)
+          end
+        else
+          load_theme_internal(template: template)
+        end
+      end
 
-          # Load custom theme
-          theme_file = NA.database_path(file: 'theme.yaml')
-          theme = if File.exist?(theme_file)
-                    YAML.load(File.read(theme_file)) || {}
-                  else
-                    {}
-                  end
-          theme = default_template.deep_merge(theme)
+      def load_theme_internal(template: {})
+        # Default colorization, can be overridden with full or partial template variable
+        default_template = {
+          parent: '{c}',
+          bracket: '{dc}',
+          parent_divider: '{xw}/',
+          action: '{bg}',
+          project: '{xbk}',
+          tags: '{m}',
+          value_parens: '{m}',
+          values: '{c}',
+          search_highlight: '{y}',
+          note: '{dw}',
+          dirname: '{xdw}',
+          filename: '{xb}{#eccc87}',
+          line: '{dw}',
+          prompt: '{m}',
+          success: '{bg}',
+          error: '{b}{#b61d2a}',
+          warning: '{by}',
+          debug: '{dw}',
+          templates: {
+            output: '%filename%line%parents| %action',
+            default: '%parents %line %action',
+            single_file: '%parents %line %action',
+            multi_file: '%filename%line%parents %action',
+            no_file: '%parents %line %action'
+          }
+        }
 
-          File.open(theme_file, 'w') do |f|
-            f.puts template_help.comment
-            f.puts YAML.dump(theme)
-          end
+        # Load custom theme
+        theme_file = NA.database_path(file: 'theme.yaml')
+        theme = if File.exist?(theme_file)
+                  YAML.load(File.read(theme_file)) || {}
+                else
+                  {}
+                end
+        theme = default_template.deep_merge(theme)
 
-          theme.merge(template)
+        File.open(theme_file, 'w') do |f|
+          f.puts template_help.comment
+          f.puts YAML.dump(theme)
         end
+
+        theme.merge(template)
       end
     end
   end

data/lib/na/version.rb

@@ -5,5 +5,5 @@
 module Na
   ##
   # Current version of the na gem.
-  VERSION = '1.2.85'
+  VERSION = '1.2.86'
 end

data/lib/na.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 
-require 'na/benchmark'
+require 'na/benchmark' if ENV['NA_BENCHMARK']
+# Define a dummy Benchmark if not available for tests
+unless defined?(NA::Benchmark)
+  module NA
+    module Benchmark
+      def self.measure(_label)
+        yield
+      end
+    end
+  end
+end
 require 'na/version'
 require 'na/pager'
 require 'time'

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.84<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.85<!--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.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.85
+  version: 1.2.86
 platform: ruby
 authors:
 - Brett Terpstra
@@ -245,6 +245,7 @@ extra_rdoc_files:
 - README.md
 - na.rdoc
 files:
+- ".cursor/commands/priority35m36m335m32m.md"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"