na 1.2.28 → 1.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a331d16e9572f0a63e251c2de46348880b73dbce47838968ac9ac987e6a053f5
-  data.tar.gz: dec5319c89b04f65eb039867a5e01f6e1906c7287af2542bc7feab40f93dbf97
+  metadata.gz: 3d0dbc271a5a8f1812c5ef0596031d5ca9fc726efe0cde91e1172840d15acb61
+  data.tar.gz: 44599dadd458ebfcb610fcf80b5326231404f199f61b6e195b103bb4a095ff06
 SHA512:
-  metadata.gz: 4ac0842dbf415b87ffa200662eea10ac9fd382406d2e953342f7c81777504e05710cf6bf622fc831309d58178c8d1622103713b82f81bfe5df07001366fb5058
-  data.tar.gz: 975091dac71d91659df9c1c9b69722aad42cb74a69d6a030b7a2a335d0273925e72e87cce0afb9cc4507d7c5f376bf304a6f8a806dbeb25b7d03ff259e8031a1
+  metadata.gz: 448bea330450c05446027995d4ea6ccdb5cdf80fa43672d8ccb08a808ca9a171fbd80aa2d7e2054568c458411b25037db66b644e0bde43e8ac614b9b469d97cc
+  data.tar.gz: 146ed95b595f010a5964134f4eba2701ccd7a9b103c692941a8fb68052023f29b09ffabffba74dbc93a20a64397fe8417f9ab0343bde9a3af8d292bfa2351e6f

data/CHANGELOG.md

@@ -1,3 +1,33 @@
+### 1.2.30
+
+2023-08-29 06:50
+
+#### NEW
+
+- `na completed` to show completed actions with date ranges and search patterns
+- Pagination using system pager
+
+#### IMPROVED
+
+- When replacing a priority tag, remove any space before it the action text
+- Restore command decomposition
+- Allow multiple saved searches to be executed at once
+- `--restore` flag for update command to remove @done tags
+- Pagination for help output
+
+#### FIXED
+
+- `--done` flag not working on `na next`
+- Missing descriptions in help examples
+
+### 1.2.29
+
+2023-08-21 11:08
+
+#### FIXED
+
+- Reverting subcommand breakup
+
 ### 1.2.28
 
 2023-08-21 11:01

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.28)
+    na (1.2.30)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)

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.28
+The current version of `na` is 1.2.30
 .
 
 `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. 
@@ -77,42 +77,44 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.28
+    1.2.30
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
     --add_at=POSITION       - Add all new/moved entries at [s]tart or [e]nd of target project (default: start)
     --[no-]color            - Colorize output (default: enabled)
     --cwd_as=TYPE           - Use current working directory as [p]roject, [t]ag, or [n]one (default: none)
-    -d, --depth=DEPTH       - Recurse to depth (default: 3)
+    -d, --depth=DEPTH       - Recurse to depth (default: 1)
     --[no-]debug            - Display verbose output
     --ext=EXT               - File extension to consider a todo file (default: taskpaper)
     -f, --file=PATH         - Use a single file as global todo, use initconfig to make permanent (default: none)
     --help                  - Show this message
     -n, --note              - Prompt for additional notes (deprecated, for backwards compatibility)
     -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)
     -t, --na_tag=TAG        - Tag to consider a next action (default: na)
     --template=PATH         - Provide a template for new/blank todo files, use initconfig to make permanent (default: none)
     --version               - Display the program version
 
 COMMANDS
-    add                - Add a new next action
-    archive            - Mark an action as @done and archive
-    changes, changelog - Display the changelog
-    complete, finish   - Find and mark an action as @done
-    edit               - Open a todo file in the default editor
-    find, grep         - Find actions matching a search pattern
-    help               - Shows a list of commands or help for one command
-    init, create       - Create a new todo file in the current directory
-    initconfig         - Initialize the config file using current global options
-    next, show         - Show next actions
-    projects           - Show list of projects for a file
-    prompt             - Show or install prompt hooks for the current shell
-    saved              - Execute a saved search
-    tagged             - Find actions matching a tag
-    todos              - Show list of known todo files
-    update             - Update an existing action
+    add                 - Add a new next action
+    archive             - Mark an action as @done and archive
+    changes, changelog  - Display the changelog
+    complete, finish    - Find and mark an action as @done
+    completed, finished - Display completed actions
+    edit                - Open a todo file in the default editor
+    find, grep          - Find actions matching a search pattern
+    help                - Shows a list of commands or help for one command
+    init, create        - Create a new todo file in the current directory
+    initconfig          - Initialize the config file using current global options
+    next, show          - Show next actions
+    projects            - Show list of projects for a file
+    prompt              - Show or install prompt hooks for the current shell
+    saved               - Execute a saved search
+    tagged              - Find actions matching a tag
+    todos               - Show list of known todo files
+    update              - Update an existing action
 ```
 
 #### Commands
@@ -138,7 +140,7 @@ SYNOPSIS
     na [global options] add [command options] ACTION
 
 DESCRIPTION
-    Provides an easy way to store todos while you work. Add quick reminders and (if you set up Prompt Hooks) they'll automatically display next time you enter the directory. If multiple todo files are found in the current directory, a menu will allow you to pick to which file the action gets added. 
+    Provides an easy way to store todos while you work. Add quick   reminders and (if you set up Prompt Hooks) they'll automatically display   next time you enter the directory.   If multiple todo files are found in the current directory, a menu will   allow you to pick to which file the action gets added. 
 
 COMMAND OPTIONS
     --at=POSITION                   - Add task at [s]tart or [e]nd of target project (default: none)
@@ -175,7 +177,7 @@ SYNOPSIS
     na [global options] edit [command options] 
 
 DESCRIPTION
-    Let the system choose the defualt, (e.g. TaskPaper), or specify a command line utility (e.g. vim).            If more than one todo file is found, a menu is displayed. 
+    Let the system choose the defualt, (e.g. TaskPaper), or specify a command line utility (e.g. vim).              If more than one todo file is found, a menu is displayed. 
 
 COMMAND OPTIONS
     -a, --app=EDITOR    - Specify a Mac app (default: none)
@@ -188,7 +190,7 @@ EXAMPLES
     na edit
 
     # Display a menu of all todo files three levels deep from the
-             current directory, open selection in vim.
+               current directory, open selection in vim.
     na edit -d 3 -a vim
 ```
 
@@ -207,7 +209,7 @@ SYNOPSIS
     na [global options] find [command options] PATTERN
 
 DESCRIPTION
-    Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`, add a - or ! to ignore matches containing that token. 
+    Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`,   add a - or ! to ignore matches containing that token. 
 
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
@@ -274,7 +276,7 @@ SYNOPSIS
     na [global options] next [command options] [QUERY]
 
 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). 
+    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). 
 
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
@@ -315,7 +317,7 @@ SYNOPSIS
     na [global options] projects [command options] [QUERY]
 
 DESCRIPTION
-    Arguments will be interpreted as a query for a known todo file, fuzzy matched. Separate directories with /, :, or a space, e.g. `na projects code/marked` 
+    Arguments will be interpreted as a query for a known todo file,   fuzzy matched. Separate directories with /, :, or a space, e.g. `na projects code/marked` 
 
 COMMAND OPTIONS
     -d, --depth=DEPTH - Search for files X directories deep (default: 1)
@@ -339,7 +341,7 @@ NAME
 
 SYNOPSIS
 
-    na [global options] saved [command options] [SEARCH_TITLE]
+    na [global options] saved [command options] [SEARCH_TITLE]...
 
 DESCRIPTION
     Run without argument to list saved searches 
@@ -350,14 +352,19 @@ COMMAND OPTIONS
 
 EXAMPLES
 
+    # save a search called "maybelater"
     na tagged "+maybe,+priority<=3" --save maybelater
 
+    # perform the search named "maybelater"
     na saved maybelater
 
+    # perform the search named "maybelater", assuming no other searches match "maybe"
     na saved maybe
 
+    # na run with no command and a single argument automatically performs a matching saved search
     na maybe
 
+    # list available searches
     na saved
 ```
 
@@ -380,7 +387,7 @@ SYNOPSIS
     na [global options] next [command options] [QUERY]
 
 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). 
+    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). 
 
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
@@ -421,7 +428,7 @@ SYNOPSIS
     na [global options] todos [QUERY]
 
 DESCRIPTION
-    Arguments will be interpreted as a query against which the list of todos will be fuzzy matched. Separate directories with /, :, or a space, e.g. `na todos code/marked`
+    Arguments will be interpreted as a query against which the   list of todos will be fuzzy matched. Separate directories with   /, :, or a space, e.g. `na todos code/marked`
 ```
 
 ##### update
@@ -467,7 +474,7 @@ SYNOPSIS
     na [global options] update [command options] ACTION
 
 DESCRIPTION
-    Provides an easy way to complete, prioritize, and tag existing actions. If multiple todo files are found in the current directory, a menu will allow you to pick which file to act on. 
+    Provides an easy way to complete, prioritize, and tag existing actions.   If multiple todo files are found in the current directory, a menu will   allow you to pick which file to act on. 
 
 COMMAND OPTIONS
     -a, --archive                   - Add a @done tag to action and move to Archive
@@ -480,10 +487,11 @@ COMMAND OPTIONS
     -f, --finish                    - Add a @done tag to action
     --file=PATH                     - Specify the file to search for the task (default: none)
     --in, --todo=TODO_FILE          - Use a known todo file, partial matches allowed (default: none)
-    -n, --note                      - Prompt for additional notes. Input will be appended to any existing note.   If STDIN input (piped) is detected, it will be used as a note.
+    -n, --note                      - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
     -o, --overwrite                 - Overwrite note instead of appending
     -p, --priority=PRIO             - Add/change a priority level 1-5 (default: 0)
     -r, --remove=TAG                - Remove a tag to the action (may be used more than once, default: none)
+    --restore                       - Remove @done tag from action
     -t, --tag=TAG                   - Add a tag to the action, @tag(values) allowed (may be used more than once, default: none)
     --tagged=TAG                    - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
     --to, --project, --proj=PROJECT - Move action to specific project (default: none)

data/bin/commands/add.rb

@@ -1,183 +1,186 @@
 # frozen_string_literal: true
 
-desc 'Add a new next action'
-long_desc 'Provides an easy way to store todos while you work. Add quick
-reminders and (if you set up Prompt Hooks) they\'ll automatically display
-next time you enter the directory.
-
-If multiple todo files are found in the current directory, a menu will
-allow you to pick to which file the action gets added.'
-arg_name 'ACTION'
-command :add do |c|
-  c.example 'na add "A cool feature I thought of @idea"', desc: 'Add a new action to the Inbox, including a tag'
-  c.example 'na add "A bug I need to fix" -p 4 -n',
-            desc: 'Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note.'
-  c.example 'na add "An action item (with a note)"',
-            desc: 'A parenthetical at the end of an action is interpreted as a note'
-
-  c.desc 'Prompt for additional notes. STDIN input (piped) will be treated as a note if present.'
-  c.switch %i[n note], negatable: false
-
-  c.desc 'Add a priority level 1-5'
-  c.arg_name 'PRIO'
-  c.flag %i[p priority], must_match: /[1-5]/, type: :integer, default_value: 0
-
-  c.desc 'Add action to specific project'
-  c.arg_name 'PROJECT'
-  c.default_value 'Inbox'
-  c.flag %i[to project proj]
-
-  c.desc 'Add task at [s]tart or [e]nd of target project'
-  c.arg_name 'POSITION'
-  c.flag %i[at], must_match: /^[sbea].*?$/i
-
-  c.desc 'Add to a known todo file, partial matches allowed'
-  c.arg_name 'TODO_FILE'
-  c.flag %i[in todo]
-
-  c.desc 'Use a tag other than the default next action tag'
-  c.arg_name 'TAG'
-  c.flag %i[t tag]
-
-  c.desc 'Don\'t add next action tag to new entry'
-  c.switch %i[x], negatable: false
-
-  c.desc 'Specify the file to which the task should be added'
-  c.arg_name 'PATH'
-  c.flag %i[f file]
-
-  c.desc 'Mark task as @done with date'
-  c.switch %i[finish done], negatable: false
-
-  c.desc 'Search for files X directories deep'
-  c.arg_name 'DEPTH'
-  c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
-
-  c.action do |global_options, options, args|
-    reader = TTY::Reader.new
-    append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/
-
-    if NA.global_file
-      target = File.expand_path(NA.global_file)
-      unless File.exist?(target)
-        res = NA.yn(NA::Color.template('{by}Specified file not found, create it'), default: true)
-        if res
-          basename = File.basename(target, ".#{NA.extension}")
-          NA.create_todo(target, basename, template: global_options[:template])
-        else
-          puts NA::Color.template('{r}Cancelled{x}')
-          Process.exit 1
-        end
-      end
-    elsif options[:file]
-      target = File.expand_path(options[:file])
-      unless File.exist?(target)
-        res = NA.yn(NA::Color.template('{by}Specified file not found, create it'), default: true)
-        if res
-          basename = File.basename(target, ".#{NA.extension}")
-          NA.create_todo(target, basename, template: global_options[:template])
-        else
-          puts NA::Color.template('{r}Cancelled{x}')
-          Process.exit 1
+class App
+  extend GLI::App
+  desc 'Add a new next action'
+  long_desc 'Provides an easy way to store todos while you work. Add quick
+  reminders and (if you set up Prompt Hooks) they\'ll automatically display
+  next time you enter the directory.
+
+  If multiple todo files are found in the current directory, a menu will
+  allow you to pick to which file the action gets added.'
+  arg_name 'ACTION'
+  command :add do |c|
+    c.example 'na add "A cool feature I thought of @idea"', desc: 'Add a new action to the Inbox, including a tag'
+    c.example 'na add "A bug I need to fix" -p 4 -n',
+              desc: 'Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note.'
+    c.example 'na add "An action item (with a note)"',
+              desc: 'A parenthetical at the end of an action is interpreted as a note'
+
+    c.desc 'Prompt for additional notes. STDIN input (piped) will be treated as a note if present.'
+    c.switch %i[n note], negatable: false
+
+    c.desc 'Add a priority level 1-5'
+    c.arg_name 'PRIO'
+    c.flag %i[p priority], must_match: /[1-5]/, type: :integer, default_value: 0
+
+    c.desc 'Add action to specific project'
+    c.arg_name 'PROJECT'
+    c.default_value 'Inbox'
+    c.flag %i[to project proj]
+
+    c.desc 'Add task at [s]tart or [e]nd of target project'
+    c.arg_name 'POSITION'
+    c.flag %i[at], must_match: /^[sbea].*?$/i
+
+    c.desc 'Add to a known todo file, partial matches allowed'
+    c.arg_name 'TODO_FILE'
+    c.flag %i[in todo]
+
+    c.desc 'Use a tag other than the default next action tag'
+    c.arg_name 'TAG'
+    c.flag %i[t tag]
+
+    c.desc 'Don\'t add next action tag to new entry'
+    c.switch %i[x], negatable: false
+
+    c.desc 'Specify the file to which the task should be added'
+    c.arg_name 'PATH'
+    c.flag %i[f file]
+
+    c.desc 'Mark task as @done with date'
+    c.switch %i[finish done], negatable: false
+
+    c.desc 'Search for files X directories deep'
+    c.arg_name 'DEPTH'
+    c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
+
+    c.action do |global_options, options, args|
+      reader = TTY::Reader.new
+      append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/
+
+      if NA.global_file
+        target = File.expand_path(NA.global_file)
+        unless File.exist?(target)
+          res = NA.yn(NA::Color.template('{by}Specified file not found, create it'), default: true)
+          if res
+            basename = File.basename(target, ".#{NA.extension}")
+            NA.create_todo(target, basename, template: global_options[:template])
+          else
+            puts NA::Color.template('{r}Cancelled{x}')
+            Process.exit 1
+          end
         end
-      end
-    elsif options[:todo]
-      todo = []
-      all_req = options[:todo] !~ /[+!\-]/
-      options[:todo].split(/ *, */).each do |a|
-        m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
-        todo.push({
-                    token: m['tok'],
-                    required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                    negate: !m['req'].nil? && m['req'] =~ /[!\-]/
-                  })
-      end
-      dirs = NA.match_working_dir(todo)
-      if dirs.count.positive?
-        target = dirs[0]
-      else
-        todo = "#{options[:todo].sub(/#{NA.extension}$/, '')}.#{NA.extension}"
-        target = File.expand_path(todo)
+      elsif options[:file]
+        target = File.expand_path(options[:file])
         unless File.exist?(target)
+          res = NA.yn(NA::Color.template('{by}Specified file not found, create it'), default: true)
+          if res
+            basename = File.basename(target, ".#{NA.extension}")
+            NA.create_todo(target, basename, template: global_options[:template])
+          else
+            puts NA::Color.template('{r}Cancelled{x}')
+            Process.exit 1
+          end
+        end
+      elsif options[:todo]
+        todo = []
+        all_req = options[:todo] !~ /[+!\-]/
+        options[:todo].split(/ *, */).each do |a|
+          m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+          todo.push({
+                      token: m['tok'],
+                      required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                      negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                    })
+        end
+        dirs = NA.match_working_dir(todo)
+        if dirs.count.positive?
+          target = dirs[0]
+        else
+          todo = "#{options[:todo].sub(/#{NA.extension}$/, '')}.#{NA.extension}"
+          target = File.expand_path(todo)
+          unless File.exist?(target)
 
-          res = NA.yn(NA::Color.template("{by}Specified file not found, create #{todo}"), default: true)
-          NA.notify('{r}Cancelled{x}', exit_code: 1) unless res
+            res = NA.yn(NA::Color.template("{by}Specified file not found, create #{todo}"), default: true)
+            NA.notify('{r}Cancelled{x}', exit_code: 1) unless res
 
-          basename = File.basename(target, ".#{NA.extension}")
-          NA.create_todo(target, basename, template: global_options[:template])
-        end
+            basename = File.basename(target, ".#{NA.extension}")
+            NA.create_todo(target, basename, template: global_options[:template])
+          end
 
-      end
-    else
-      files = NA.find_files(depth: options[:depth])
-      if files.count.zero?
-        res = NA.yn(NA::Color.template('{by}No todo file found, create one'), default: true)
-        if res
-          basename = File.expand_path('.').split('/').last
-          target = "#{basename}.#{NA.extension}"
-          NA.create_todo(target, basename, template: global_options[:template])
-          files = NA.find_files(depth: 1)
         end
-      end
-      target = files.count > 1 ? NA.select_file(files) : files[0]
-      NA.notify('{r}Cancelled{x}', exit_code: 1) unless files.count.positive? && File.exist?(target)
-
-    end
+      else
+        files = NA.find_files(depth: options[:depth])
+        if files.count.zero?
+          res = NA.yn(NA::Color.template('{by}No todo file found, create one'), default: true)
+          if res
+            basename = File.expand_path('.').split('/').last
+            target = "#{basename}.#{NA.extension}"
+            NA.create_todo(target, basename, template: global_options[:template])
+            files = NA.find_files(depth: 1)
+          end
+        end
+        target = files.count > 1 ? NA.select_file(files) : files[0]
+        NA.notify('{r}Cancelled{x}', exit_code: 1) unless files.count.positive? && File.exist?(target)
 
-    action = if args.count.positive?
-               args.join(' ').strip
-             elsif $stdin.isatty && TTY::Which.exist?('gum')
-               `gum input --placeholder "Enter a task" --char-limit=500 --width=#{TTY::Screen.columns}`.strip
-             elsif $stdin.isatty
-               puts NA::Color.template('{bm}Enter task:{x}')
-               reader.read_line(NA::Color.template('{by}> {bw}')).strip
-             end
-
-    if action.nil? || action.empty?
-      puts 'Empty input, cancelled'
-      Process.exit 1
-    end
+      end
 
-    if options[:priority]&.to_i&.positive?
-      action = "#{action.gsub(/@priority\(\d+\)/, '')} @priority(#{options[:priority]})"
-    end
+      action = if args.count.positive?
+                 args.join(' ').strip
+               elsif $stdin.isatty && TTY::Which.exist?('gum')
+                 `gum input --placeholder "Enter a task" --char-limit=500 --width=#{TTY::Screen.columns}`.strip
+               elsif $stdin.isatty
+                 puts NA::Color.template('{bm}Enter task:{x}')
+                 reader.read_line(NA::Color.template('{by}> {bw}')).strip
+               end
+
+      if action.nil? || action.empty?
+        puts 'Empty input, cancelled'
+        Process.exit 1
+      end
 
-    note_rx = /^(.+) \((.*?)\)$/
-    split_note = if action =~ note_rx
-                   n = Regexp.last_match(2)
-                   action.sub!(note_rx, '\1').strip!
-                   n
-                 end
-
-    na_tag = NA.na_tag
-    if options[:x]
-      na_tag = ''
-    else
-      na_tag = options[:tag] unless options[:tag].nil?
-      na_tag = " @#{na_tag}"
-    end
+      if options[:priority]&.to_i&.positive?
+        action = "#{action.gsub(/@priority\(\d+\)/, '')} @priority(#{options[:priority]})"
+      end
 
-    action = "#{action.gsub(/#{na_tag}\b/, '')}#{na_tag}"
+      note_rx = /^(.+) \((.*?)\)$/
+      split_note = if action =~ note_rx
+                     n = Regexp.last_match(2)
+                     action.sub!(note_rx, '\1').strip!
+                     n
+                   end
 
-    stdin_note = NA.stdin ? NA.stdin.split("\n") : []
+      na_tag = NA.na_tag
+      if options[:x]
+        na_tag = ''
+      else
+        na_tag = options[:tag] unless options[:tag].nil?
+        na_tag = " @#{na_tag}"
+      end
 
-    line_note = if options[:note] && $stdin.isatty
-                  puts stdin_note unless stdin_note.nil?
-                  if TTY::Which.exist?('gum')
-                    args = ['--placeholder "Enter additional note, CTRL-d to save"']
-                    args << '--char-limit 0'
-                    args << '--width $(tput cols)'
-                    `gum write #{args.join(' ')}`.strip.split("\n")
-                  else
-                    puts NA::Color.template('{bm}Enter a note, {bw}CTRL-d{bm} to end editing{bw}')
-                    reader.read_multiline
+      action = "#{action.gsub(/#{na_tag}\b/, '')}#{na_tag}"
+
+      stdin_note = 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 additional note, CTRL-d to save"']
+                      args << '--char-limit 0'
+                      args << '--width $(tput cols)'
+                      `gum write #{args.join(' ')}`.strip.split("\n")
+                    else
+                      puts NA::Color.template('{bm}Enter a note, {bw}CTRL-d{bm} to end editing{bw}')
+                      reader.read_multiline
+                    end
                   end
-                end
 
-    note = stdin_note.empty? ? [] : stdin_note
-    note.concat(split_note) unless split_note.nil?
-    note.concat(line_note) unless line_note.nil?
+      note = stdin_note.empty? ? [] : stdin_note
+      note.concat(split_note) unless split_note.nil?
+      note.concat(line_note) unless line_note.nil?
 
-    NA.add_action(target, options[:project], action, note, finish: options[:finish], append: append)
+      NA.add_action(target, options[:project], action, note, finish: options[:finish], append: append)
+    end
   end
 end