na 1.2.81 → 1.2.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4dc73a85eb981ab0057e442baca77e7711423d6d613e2a2325c4f010edb9d9a
-  data.tar.gz: 10c305c69642775ec7ad174a5e443738a62b13620a6c1ff5c24429253ba612b3
+  metadata.gz: 742c746b884aa5ac75841f771fb9f13c95ead1a161d340ca0ea362c52b584914
+  data.tar.gz: 9b62bb218a75b19767dc7d2ebc59b1a49d2770df1ee44c28077cc077add2e1a4
 SHA512:
-  metadata.gz: 527ba9b2d9e437542948a258266f931eca7ee2c273120e5da3dd070e76dd6c459f83b38ed23164d78927b26704af2b52c4eff574c5b8e089a544039d0efb4cdc
-  data.tar.gz: '04324826716a3515782f38148350f965d9e9779f9d1802d2e2b454c0fb599af1ebbbbf75606b0383093229014c408cbb875356d0b825ebd47155c5f587cda3e4'
+  metadata.gz: 4a57ecae0c67beb917c7b1f9986acbdd8f8cd4315c50cef6800da7dc3707a0b19919d2aff2496dd786dd7373fce45ec361feb2b36e768a04f0653545196d08f0
+  data.tar.gz: f4c5bf1a7d6169d8fd77eb94816469e196c626357e0c73ca25a7084e9e2e94480036c739f4880cbd98ffddae351e872ca667c31e54901473ec0bc19c92edad0a

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-10-25 12:09:08 UTC using RuboCop version 1.75.7.
+# on 2025-10-25 14:39:51 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
@@ -29,33 +29,33 @@ Lint/UnusedMethodArgument:
 # Offense count: 35
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 274
+  Max: 232
 
 # Offense count: 10
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 141
+  Max: 144
 
 # Offense count: 4
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 788
+  Max: 762
 
 # Offense count: 22
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 73
+  Max: 66
 
 # Offense count: 38
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 170
+  Max: 146
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 790
+  Max: 764
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
@@ -65,7 +65,7 @@ Metrics/ParameterLists:
 # Offense count: 21
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 87
+  Max: 76
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -110,7 +110,7 @@ Style/YAMLFileRead:
   Exclude:
     - 'lib/na/theme.rb'
 
-# Offense count: 19
+# Offense count: 18
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 1.2.82
+
+2025-10-25 09:47
+
+#### NEW
+
+- Multi-select menu when using `na update`
+
 ### 1.2.81
 
 2025-10-25 07:32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.81)
+    na (1.2.82)
       chronic (~> 0.10, >= 0.10.2)
       git (~> 3.0.0)
       gli (~> 2.21.0)

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.81.
+The current version of `na` is 1.2.82.
 
 `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.81
+    1.2.82
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -478,46 +478,48 @@ To perform a string comparison, you can use `*=` (contains), `^=` (starts with),
 
 ```
 NAME
-    next - Show next actions
+    tagged - Find actions matching a tag
 
 SYNOPSIS
 
-    na [global options] next [command options] [QUERY]
+    na [global options] tagged [command options] TAG[=VALUE]
 
 DESCRIPTION
-    Next actions are actions which contain the next action tag (default @na),   do not contain @done, and are not in the Archive project.   Arguments will target a todo file from history, whether it's in the current   directory or not. Todo file queries can include path components separated by /   or :, and may use wildcards (`*` to match any text, `?` to match a single character). Multiple queries allowed (separate arguments or separated by comma). 
+    Finds actions with tags matching the arguments. An action is shown if it   contains all of the tags listed. Add a + before a tag to make it required   and others optional. You can specify values using TAG=VALUE pairs.   Use <, >, and = for numeric comparisons, and *=, ^=, $=, or =~ (regex) for text comparisons.   Date comparisons use natural language (`na tagged "due<=today"`) and   are detected automatically. 
 
 COMMAND OPTIONS
-    --all                                  - Show next actions from all known todo files (in any directory)
-    -d, --depth=DEPTH                      - Recurse to depth (default: none)
+    -d, --depth=DEPTH                      - Recurse to depth (default: 1)
     --[no-]done                            - Include @done actions
     --exact                                - Search query is exact text match (not tokens)
-    --file=TODO_FILE                       - Display matches from specific todo file ([relative] path) (default: none)
-    --hidden                               - Include hidden directories while traversing
-    --in, --todo=TODO                      - Display matches from a known todo file anywhere in history (short name) (may be used more than once, default: none)
+    --in=TODO_PATH                         - Show actions from a specific todo file in history. May use wildcards (* and ?) (default: none)
     --nest                                 - Output actions nested by file
     --no_file                              - No filename in output
     --[no-]notes                           - Include notes in output
+    -o, --or                               - Combine tags with OR, displaying actions matching ANY of the tags
     --omnifocus                            - Output actions nested by file and project
-    -p, --prio, --priority=PRIORITY        - Match actions with priority, allows <>= comparison (may be used more than once, default: none)
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --regex                                - Search query is regular expression
     --save=TITLE                           - Save this search for future use (default: none)
     --search, --find, --grep=QUERY         - Filter results using search terms (may be used more than once, default: none)
     --[no-]search_notes                    - Include notes in search (default: enabled)
-    -t, --tag=TAG                          - Alternate tag to search for (default: none)
-    --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    -v, --invert                           - Show actions not matching tags
 
 EXAMPLES
 
-    # display the next actions from any todo files in the current directory
-    na next
+    # Show all actions tagged @maybe
+    na tagged maybe
 
-    # display the next actions from the current directory, traversing 3 levels deep
-    na next -d 3
+    # Show all actions tagged @feature AND @idea, recurse 3 levels
+    na tagged -d 3 "feature, idea"
 
-    # display next actions for a project you visited in the past
-    na next marked
+    # Show all actions tagged @feature OR @idea
+    na tagged --or "feature, idea"
+
+    # Show actions with @priority(4) or @priority(5)
+    na tagged "priority>=4"
+
+    # Show actions with a due date coming up in the next 2 days
+    na tagged "due<in 2 days"
 ```
 
 ##### todos
@@ -553,6 +555,8 @@ If more than one file is matched, a menu will be presented, multiple selections
 
 Any time an update action is carried out, a backup of the file before modification will be made in the same directory with a `.` prepended and `.bak` appended (e.g. `marked.taskpaper` is copied to `.marked.taskpaper.bak`). Only one undo step is available, but if something goes wrong (and this feature is still experimental, so be wary), you can just copy the ".bak" file back to the original.
 
+> **Note:** When using the `update` command, if you have [fzf](https://github.com/junegunn/fzf) installed, menus for selecting files or actions will support multi-select (tab to mark multiple, return to confirm). If [gum](https://github.com/charmbracelet/gum) is installed, multi-select is also supported (use j/k/x to navigate and mark). If neither is available, a simple prompt is used. This makes it easy to apply updates to multiple actions at once.
+
 ###### Marking a task as complete
 
 You can mark an action complete using `--finish`, which will add a dated @done tag to the action. You can also mark it @done and immediately move it to the Archive project using `--archive`.

data/bin/commands/update.rb

@@ -104,6 +104,49 @@ class App
     c.switch %i[x exact], negatable: false
 
     c.action do |global_options, options, args|
+      # Ensure all variables used in update loop are declared
+      target_proj = if options[:move]
+                      options[:move]
+                    elsif NA.respond_to?(:cwd_is) && NA.cwd_is == :project
+                      NA.cwd
+                    end
+
+      priority = options[:priority].to_i if options[:priority]&.to_i&.positive?
+      remove_tags = options[:remove] ? options[:remove].join(',').split(/ *, */).map { |t| t.sub(/^@/, '').respond_to?(:wildcard_to_rx) ? t.wildcard_to_rx : t } : []
+      remove_tags << 'done' if options[:restore]
+
+      stdin_note = NA.respond_to?(:stdin) && NA.stdin ? NA.stdin.split("\n") : []
+      line_note = if options[:note] && $stdin.isatty
+                    puts stdin_note unless stdin_note.nil?
+                    if TTY::Which.exist?('gum')
+                      args = ['--placeholder "Enter a note, CTRL-d to save"']
+                      args << '--char-limit 0'
+                      args << '--width $(tput cols)'
+                      gum = TTY::Which.which('gum')
+                      `#{gum} write #{args.join(' ')}`.strip.split("\n")
+                    else
+                      NA.notify("#{NA.theme[:prompt]}Enter a note, {bw}CTRL-d#{NA.theme[:prompt]} to end editing:#{NA.theme[:action]}")
+                      reader.read_multiline
+                    end
+                  end
+      note = stdin_note.empty? ? [] : stdin_note
+      note.concat(line_note) unless line_note.nil? || line_note.empty?
+
+      append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/i
+  add_tags = options[:tag] ? options[:tag].join(',').split(/ *, */).map { |t| t.sub(/^@/, '').respond_to?(:wildcard_to_rx) ? t.wildcard_to_rx : t } : []
+      # Build tags array from options[:tagged]
+      all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]
+      tags = []
+      options[:tagged].join(',').split(/ *, */).each do |arg|
+        m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$~\^]+?) *(?:(?<op>[=<>~]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
+        tags.push({
+          tag: m['tag'].respond_to?(:wildcard_to_rx) ? m['tag'].wildcard_to_rx : m['tag'],
+          comp: m['op'],
+          value: m['val'],
+          required: all_req || (!m['req'].nil? && m['req'] == '+'),
+          negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+        })
+      end
       reader = TTY::Reader.new
 
       args.concat(options[:search]) unless options[:search].nil?
@@ -121,13 +164,13 @@ class App
 
       options[:exact] = true unless options[:replace].nil?
 
-      action = if args.count.positive?
-                 args.join(' ').strip
-               else
-                 NA.request_input(options, prompt: 'Enter a task to search for')
-               end
-      if action
-        tokens = nil
+      if args.count.positive?
+        action = args.join(' ').strip
+      else
+        action = nil
+      end
+      tokens = nil
+      if action && !action.empty?
         if options[:exact]
           tokens = action
         elsif options[:regex]
@@ -135,20 +178,254 @@ class App
         else
           tokens = []
           all_req = action !~ /[+!-]/ && !options[:or]
-
           action.split(/ /).each do |arg|
             m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
             tokens.push({
-                          token: m['tok'],
-                          required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                          negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
-                        })
+              token: m['tok'],
+              required: all_req || (!m['req'].nil? && m['req'] == '+'),
+              negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+            })
           end
         end
       end
 
+      # If no search query or tags, list all tasks for selection
       if (action.nil? || action.empty?) && options[:tagged].empty?
-        NA.notify("#{NA.theme[:error]}Empty input, cancelled", exit_code: 1)
+        tokens = nil # No search, list all
+      end
+
+      # Gather all candidate actions for selection
+      candidate_actions = []
+      targets_for_selection = []
+      files = NA.find_files_matching({
+        depth: options[:depth],
+        done: options[:done],
+        project: options[:project],
+        regex: options[:regex],
+        require_na: false,
+        search: tokens,
+        tag: tags
+      })
+      files.each do |file|
+        safe_search = (tokens.is_a?(String) || tokens.is_a?(Array) || tokens.is_a?(Regexp)) ? tokens : nil
+        todo = NA::Todo.new({
+          search: safe_search,
+          search_note: options[:search_notes],
+          require_na: false,
+          file_path: file,
+          project: options[:project],
+          tag: tags,
+          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}"
+          candidate_actions << display
+          targets_for_selection << { file: action_obj.file, line: action_obj.line, action: action_obj }
+        end
+      end
+
+      # Multi-select using fzf or gum if available
+      selected_indices = []
+      if candidate_actions.any?
+        selector = nil
+        if TTY::Which.exist?('fzf')
+          selector = 'fzf --multi --prompt="Select tasks> "'
+        elsif TTY::Which.exist?('gum')
+          selector = 'gum choose --no-limit'
+        end
+        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]) }
+        else
+          # Fallback: select all or prompt for search string
+          selected_indices = (0...candidate_actions.size).to_a
+        end
+      end
+
+      # If no actions found, notify and exit
+      if selected_indices.empty?
+        NA.notify("#{NA.theme[:error]}No matching actions found for selection", exit_code: 1)
+      end
+
+      # Apply update to selected actions
+      actionable = [
+        options[:note],
+        (options[:priority].to_i if options[:priority]).to_i.positive?,
+        !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?
+      unless actionable
+        # Interactive menu for actions
+        actions_menu = [
+          { key: :add_tag, label: 'Add Tag', param: 'Tag' },
+          { key: :remove_tag, label: 'Remove Tag', param: 'Tag' },
+          { key: :delete, label: 'Delete', param: nil },
+          { key: :finish, label: 'Finish (mark done)', param: nil },
+          { key: :edit, label: 'Edit', param: nil },
+          { key: :priority, label: 'Set Priority', param: 'Priority (1-5)' },
+          { key: :move, label: 'Move to Project', param: 'Project' },
+          { key: :restore, label: 'Restore', param: nil },
+          { key: :archive, label: 'Archive', param: nil },
+          { key: :note, label: 'Add Note', param: 'Note' }
+        ]
+        selector = nil
+        if TTY::Which.exist?('fzf')
+          selector = 'fzf --prompt="Select action> "'
+        elsif TTY::Which.exist?('gum')
+          selector = 'gum choose'
+        end
+        menu_labels = actions_menu.map { |a| a[:label] }
+        selected_action = nil
+        if selector
+          require 'open3'
+          input = menu_labels.join("\n")
+          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
+          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
+        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
+          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, 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]
+        end
+      end
+      did_direct_update = false
+      selected_indices.each do |idx|
+        # 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(/^@/, '') } : []
+        remove_tags << 'done' if options[:restore]
+        priority = options[:priority].to_i if options[:priority]&.to_i&.positive?
+        target_proj = if options[:move]
+                        options[:move]
+                      elsif NA.respond_to?(:cwd_is) && NA.cwd_is == :project
+                        NA.cwd
+                      end
+        note_val = note
+        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)
+        did_direct_update = true
+      end
+      if did_direct_update
+        next
       end
 
       all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]

data/lib/na/action.rb

@@ -2,9 +2,8 @@
 
 module NA
   class Action < Hash
-    attr_reader :file, :project, :parent, :tags, :line
-
-    attr_accessor :action, :note
+    attr_reader :file, :project, :tags, :line
+    attr_accessor :parent, :action, :note
 
     def initialize(file, project, parent, action, idx, note = [])
       super()

data/lib/na/next_action.rb

@@ -117,10 +117,15 @@ module NA
     # @return [String, Array<String>] Selected file(s)
     def select_file(files, multiple: false)
       res = choose_from(files, prompt: multiple ? 'Select files' : 'Select a file', multiple: multiple)
-
-      notify("#{NA.theme[:error]}No file selected, cancelled", exit_code: 1) unless res&.length&.positive?
-
-      res
+      if res.nil? || res == false || (res.respond_to?(:length) && res.empty?)
+        notify("#{NA.theme[:error]}No file selected, cancelled", exit_code: 1)
+        return nil
+      end
+      if multiple
+        res
+      else
+        res.is_a?(Array) ? res.first : res
+      end
     end
 
     def shift_index_after(projects, idx, length = 1)
@@ -321,86 +326,54 @@ module NA
         add_tag ||= []
         add.process(priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
-        projects = find_projects(target)
-
-        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
-          )
-
-          if res
-            target_proj = insert_project(target, project, projects)
-            projects << target_proj
-          else
-            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
-          end
-
-          if target_proj.nil?
-            NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}",
-                      exit_code: 1)
-          end
+        # Remove the original action and its notes
+        action_line = add.line
+        note_lines = add.note.is_a?(Array) ? add.note.count : 0
+        contents.slice!(action_line, note_lines + 1)
 
-          projects = find_projects(target)
-          contents = target.read_file.split("\n")
-        end
+        # Prepare updated note
+        note = note.to_s.split("\n") unless note.is_a?(Array)
+        updated_note = if note.empty?
+                         add.note
+                       else
+                         overwrite ? note : add.note.concat(note)
+                       end
 
-        indent = "\t" * target_proj.indent
-        note = note.split("\n") unless note.is_a?(Array)
-        note = if note.empty?
-                 add.note
-               else
-                 overwrite ? note : add.note.concat(note)
-               end
-
-        note = note.empty? ? '' : "\n#{indent}\t\t#{note.join("\n#{indent}\t\t").strip}"
-
-        if append
-          this_idx = 0
-          projects.each_with_index do |proj, idx|
-            if proj.line == target_proj.line
-              this_idx = idx
-              break
-            end
-          end
-          target_line = if this_idx == projects.length - 1
-                          contents.count
+        # Prepare indentation
+        projects = find_projects(target)
+        # If move is set, update add.parent to the target project
+        add.parent = target_proj.project.split(':') if move && target_proj
+        target_proj = projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/i }.first
+        indent = target_proj ? ("\t" * target_proj.indent) : ''
+
+        # Format note for insertion
+        note_str = updated_note.empty? ? '' : "\n#{indent}\t\t#{updated_note.join("\n#{indent}\t\t").strip}"
+
+        # Insert at correct location: if moving, insert at start/end of target project
+        if move && target_proj
+          insert_line = if append
+                          # End of project
+                          target_proj.last_line + 1
                         else
-                          projects[this_idx].last_line + 1
+                          # Start of project (after project header)
+                          target_proj.line + 1
                         end
+          contents.insert(insert_line, "#{indent}\t- #{add.action}#{note_str}")
         else
-          target_line = target_proj.line + 1
+          # Not moving, update in-place
+          contents.insert(action_line, "#{indent}\t- #{add.action}#{note_str}")
         end
 
-        contents.insert(target_line, "#{indent}\t- #{add.action}#{note}")
-
         notify(add.pretty)
 
         # Track affected action and description
-        changes = ['added']
+        changes = ['updated']
         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?
+        changes << "moved to #{target_proj.project}" if move && target_proj
         affected_actions << { action: add, desc: changes.join(', ') }
       else
         _, actions = find_actions(target, search, tagged, done: done, all: all, project: project,

data/lib/na/string.rb

@@ -153,22 +153,23 @@ class ::String
 
     output = []
     line = []
-    length = indent
+    length = 0
     gsub!(/(@\S+)\((.*?)\)/) { "#{Regexp.last_match(1)}(#{Regexp.last_match(2).gsub(/ /, '†')})" }
 
     split(' ').each do |word|
       uncolored = NA::Color.uncolor(word)
-      if (length + uncolored.length + 1) < width
+      if (length + uncolored.length + 1) <= width
         line << word
         length += uncolored.length + 1
       else
         output << line.join(' ')
         line = [word]
-        length = indent + uncolored.length + 1
+        length = uncolored.length + 1
       end
     end
     output << line.join(' ')
-    output.join("\n#{' ' * (indent + 2)}").gsub(/†/, ' ')
+    # Indent all lines after the first
+    output.each_with_index.map { |l, i| i.zero? ? l : (' ' * indent) + l }.join("\n").gsub(/†/, ' ')
   end
 
   # Returns the last escape sequence from a string.

data/lib/na/todo.rb

@@ -44,6 +44,10 @@ module NA
         }
 
         settings = defaults.merge(options)
+        # Coerce settings[:search] to a string or nil if it's an integer
+        if settings[:search].is_a?(Integer)
+          settings[:search] = settings[:search] <= 0 ? nil : settings[:search].to_s
+        end
         # Ensure tag is always an Array
         if settings[:tag].nil?
           settings[:tag] = []
@@ -82,8 +86,7 @@ module NA
             optional_tag.push({ tag: t })
           end
         end
-
-        unless settings[:search].nil? || settings[:search].empty?
+        unless settings[:search].nil? || (settings[:search].respond_to?(:empty?) && settings[:search].empty?)
           if settings[:regex] || settings[:search].is_a?(String)
             if settings[:negate]
               negated.push(settings[:search])

data/lib/na/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Na
-  VERSION = '1.2.81'
+  VERSION = '1.2.82'
 end

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.80<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.81<!--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.
 
@@ -184,7 +184,7 @@ You can also perform value comparisons on tags. A value in a TaskPaper tag is ad
 To perform a string comparison, you can use `*=` (contains), `^=` (starts with), `$=` (ends with), or `=` (matches). E.g. `na tagged "note*=video"`.
 
 ```
-@cli(bundle exec bin/na help show)
+@cli(bundle exec bin/na help tagged)
 ```
 
 ##### todos
@@ -209,6 +209,8 @@ If more than one file is matched, a menu will be presented, multiple selections
 
 Any time an update action is carried out, a backup of the file before modification will be made in the same directory with a `.` prepended and `.bak` appended (e.g. `marked.taskpaper` is copied to `.marked.taskpaper.bak`). Only one undo step is available, but if something goes wrong (and this feature is still experimental, so be wary), you can just copy the ".bak" file back to the original.
 
+> **Note:** When using the `update` command, if you have [fzf](https://github.com/junegunn/fzf) installed, menus for selecting files or actions will support multi-select (tab to mark multiple, return to confirm). If [gum](https://github.com/charmbracelet/gum) is installed, multi-select is also supported (use j/k/x to navigate and mark). If neither is available, a simple prompt is used. This makes it easy to apply updates to multiple actions at once.
+
 ###### Marking a task as complete
 
 You can mark an action complete using `--finish`, which will add a dated @done tag to the action. You can also mark it @done and immediately move it to the Archive project using `--archive`.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.81
+  version: 1.2.82
 platform: ruby
 authors:
 - Brett Terpstra