doing 2.1.11 → 2.1.15

data/bin/doing

@@ -27,6 +27,7 @@ autocomplete_commands true
 
 REGEX_BOOL = /^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$/i
 REGEX_SORT_ORDER = /^(?:a(?:sc)?|d(?:esc)?)$/i
+REGEX_VALUE_QUERY = /^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$/
 
 InvalidExportType = Class.new(RuntimeError)
 MissingConfigFile = Class.new(RuntimeError)
@@ -69,6 +70,12 @@ if settings.dig('plugins', 'command_path')
   commands_from File.expand_path(settings.dig('plugins', 'command_path'))
 end
 
+class TagArray < Array; end
+
+accept TagArray do |value|
+  value.gsub(/[, ]+/, ' ').split(' ').map { |tag| tag.sub(/^@/, '')}.map(&:strip)
+end
+
 program_desc 'A CLI for a What Was I Doing system'
 program_long_desc %(Doing uses a TaskPaper-like formatting to keep a plain text
 record of what you've been doing, complete with tag-based time tracking. The
@@ -110,7 +117,7 @@ switch %i[q quiet], default_value: false, negatable: false
 desc 'Verbose output'
 switch %i[debug], default_value: false, negatable: false
 
-desc 'Use a specific configuration file. Deprecated, set $DOING_CONFIG instead.'
+desc 'Use a specific configuration file. Deprecated, set $DOING_CONFIG instead'
 flag [:config_file], default_value: config.config_file
 
 desc 'Specify a different doing_file'
@@ -120,7 +127,7 @@ flag %i[f doing_file]
 
 # @@again @@resume
 desc 'Repeat last entry as new entry'
-long_desc 'This command is designed to allow multiple time intervals to be created for an entry by duplicating it with a new start (and end, eventually) time.'
+long_desc 'This command is designed to allow multiple time intervals to be created for an entry by duplicating it with a new start (and end, eventually) time'
 command %i[again resume] do |c|
   c.example 'doing resume', desc: 'Duplicate the most recent entry with a new start time, removing any @done tag'
   c.example 'doing again', desc: 'again is an alias for resume'
@@ -136,15 +143,19 @@ command %i[again resume] do |c|
   c.arg_name 'SECTION_NAME'
   c.flag [:in]
 
-  c.desc 'Repeat last entry matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?).'
+  c.desc 'Repeat last entry matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Repeat last entry matching search. Surround with
   slashes for regex (e.g. "/query/"), start with a single quote for exact match ("\'query").'
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -158,23 +169,26 @@ command %i[again resume] do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
   c.desc "Edit duplicated entry with #{Doing::Util.default_editor} before adding"
   c.switch %i[e editor], negatable: false, default_value: false
 
-  c.desc 'Note'
+  c.desc 'Add a note'
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.desc 'Select item to resume from a menu of matching entries'
   c.switch %i[i interactive], negatable: false, default_value: false
 
   c.action do |_global_options, options, _args|
     options[:fuzzy] = false
-    tags = options[:tag].nil? ? [] : options[:tag].to_tags
+    tags = options[:tag].nil? ? [] : options[:tag]
 
     options[:case] = options[:case].normalize_case
 
@@ -184,6 +198,11 @@ command %i[again resume] do |c|
       options[:search] = search
     end
 
+    note = Doing::Note.new(options[:note])
+    note.add(Doing::Prompt.request_lines(prompt: 'Add a note')) if options[:ask]
+
+    options[:note] = note
+
     opts = options.dup
 
     opts[:tag] = tags
@@ -196,7 +215,7 @@ end
 
 # @@cancel
 desc 'End last X entries with no time tracked'
-long_desc 'Adds @done tag without datestamp so no elapsed time is recorded. Alias for `doing finish --no-date`.'
+long_desc 'Adds @done tag without datestamp so no elapsed time is recorded. Alias for `doing finish --no-date`'
 arg_name 'COUNT'
 command :cancel do |c|
   c.example 'doing cancel', desc: 'Cancel the last entry'
@@ -209,11 +228,11 @@ command :cancel do |c|
   c.arg_name 'NAME'
   c.flag %i[s section]
 
-  c.desc 'Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2). Wildcards allowed (*, ?).'
+  c.desc 'Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2). Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -221,6 +240,10 @@ command :cancel do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -251,7 +274,7 @@ command :cancel do |c|
     if options[:tag].nil?
       tags = []
     else
-      tags = options[:tag].to_tags
+      tags = options[:tag]
     end
 
     raise InvalidArgument, 'Only one argument allowed' if args.length > 1
@@ -285,7 +308,8 @@ command :cancel do |c|
       tag: tags,
       tag_bool: options[:bool].normalize_bool,
       tags: ['done'],
-      unfinished: options[:unfinished]
+      unfinished: options[:unfinished],
+      val: options[:val]
     }
 
     wwid.tag_last(opts)
@@ -293,7 +317,7 @@ command :cancel do |c|
 end
 
 # @@done @@did
-desc 'Add a completed item with @done(date). No argument finishes last entry.'
+desc 'Add a completed item with @done(date). No argument finishes last entry'
 long_desc 'Use this command to add an entry after you\'ve already finished it. It will be immediately marked as @done.
 You can modify the start and end times of the entry using the --back, --took, and --at flags, making it an easy
 way to add entries in post and maintain accurate (albeit manual) time tracking.'
@@ -326,7 +350,7 @@ command %i[done did] do |c|
   If used without the --back option, the start date will be moved back to allow
   the completion date to be the current time.)
   c.arg_name 'INTERVAL'
-  c.flag %i[t took]
+  c.flag %i[t took for]
 
   c.desc 'Section'
   c.arg_name 'NAME'
@@ -339,6 +363,9 @@ command %i[done did] do |c|
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.desc 'Finish last entry not already marked @done'
   c.switch %i[u unfinished], negatable: false, default_value: false
 
@@ -374,6 +401,8 @@ command %i[done did] do |c|
     end
 
     if options[:date]
+      finish_date = wwid.verify_duration(date, finish_date) unless options[:took]
+
       donedate = finish_date.strftime('%F %R')
     end
 
@@ -385,6 +414,7 @@ command %i[done did] do |c|
 
     note = Doing::Note.new
     note.add(options[:note]) if options[:note]
+    note.add(Doing::Prompt.request_lines(prompt: 'Add a note')) if options[:ask]
 
     if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
@@ -439,7 +469,6 @@ command %i[done did] do |c|
       if options[:remove]
         wwid.tag_last({ tags: ['done'], count: 1, section: section, remove: true })
       else
-        note = options[:note] ? Doing::Note.new(options[:note]) : nil
         opt = {
           archive: options[:archive],
           back: finish_date,
@@ -520,7 +549,7 @@ command :finish do |c|
 
   c.desc 'Set the completed date to the start date plus XX[hmd]'
   c.arg_name 'INTERVAL'
-  c.flag %i[t took]
+  c.flag %i[t took for]
 
   c.desc %(Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm). If used, ignores --back.)
   c.arg_name 'DATE_STRING'
@@ -529,12 +558,16 @@ command :finish do |c|
   c.desc 'Finish the last X entries containing TAG.
   Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Finish the last X entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -548,7 +581,7 @@ command :finish do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -604,7 +637,7 @@ command :finish do |c|
     if options[:tag].nil?
       tags = []
     else
-      tags = options[:tag].to_tags
+      tags = options[:tag]
     end
 
     raise InvalidArgument, 'Only one argument allowed' if args.length > 1
@@ -641,7 +674,8 @@ command :finish do |c|
       tag_bool: options[:bool].normalize_bool,
       tags: ['done'],
       took: options[:took],
-      unfinished: options[:unfinished]
+      unfinished: options[:unfinished],
+      val: options[:val]
     }
 
     wwid.tag_last(opts)
@@ -666,6 +700,9 @@ command :later do |c|
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.action do |_global_options, options, args|
     if options[:back]
       date = options[:back].chronify(guess: :begin)
@@ -674,11 +711,16 @@ command :later do |c|
       date = Time.now
     end
 
+    ask_note = options[:ask] ? Doing::Prompt.request_lines(prompt: 'Add a note') : ''
+
     if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input += date.strftime('%F %R | ')
       input += args.empty? ? '' : args.join(' ')
+      input += "\n#{options[:note]}" if options[:note]
+      input += "\n#{ask_note}" unless ask_note.empty?
+
       input = wwid.fork_editor(input).strip
       raise EmptyInput, 'No content' unless input && !input.empty?
 
@@ -691,6 +733,7 @@ command :later do |c|
       d, title, note = wwid.format_input(args.join(' '))
       date = d.nil? ? date : d
       note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     elsif $stdin.stat.size.positive?
@@ -700,6 +743,7 @@ command :later do |c|
         date = d
       end
       note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
       wwid.add_item(title.cap_first, 'Later', { note: note, back: date })
       wwid.write(wwid.doing_file)
     else
@@ -739,12 +783,16 @@ command %i[mark flag] do |c|
   c.desc 'Flag the last entry containing TAG.
   Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Flag the last entry matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -758,7 +806,7 @@ command %i[mark flag] do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -780,7 +828,7 @@ command %i[mark flag] do |c|
     if options[:tag].nil?
       search_tags = []
     else
-      search_tags = options[:tag].to_tags
+      search_tags = options[:tag]
     end
 
     if options[:interactive]
@@ -862,6 +910,9 @@ command :meanwhile do |c|
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.action do |_global_options, options, args|
     if options[:back]
       date = options[:back].chronify(guess: :begin)
@@ -878,10 +929,15 @@ command :meanwhile do |c|
     end
     input = ''
 
+    ask_note = options[:ask] ? Doing::Prompt.request_lines(prompt: 'Add a note') : []
+
     if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
       input += date.strftime('%F %R | ')
       input += args.join(' ') unless args.empty?
+      input += "\n#{options[:note]}" if options[:note]
+      input += "\n#{ask_note}" unless ask_note.empty?
+
       input = wwid.fork_editor(input).strip
     elsif !args.empty?
       input = args.join(' ')
@@ -900,10 +956,9 @@ command :meanwhile do |c|
       note = []
     end
 
-    if options[:note]
-      note.push(options[:note])
-    elsif note.empty?
-      note = nil
+    unless options[:editor]
+      note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
     end
 
     wwid.stop_start('meanwhile', { new_item: input, back: date, section: section, archive: options[:archive], note: note })
@@ -937,14 +992,18 @@ command :note do |c|
   c.desc "Replace/Remove last entry's note (default append)"
   c.switch %i[r remove], negatable: false, default_value: false
 
-  c.desc 'Add/remove note from last entry matching tag. Wildcards allowed (*, ?).'
+  c.desc 'Add/remove note from last entry matching tag. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Add/remove note from last entry matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -958,13 +1017,16 @@ command :note do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
   c.desc 'Select item for new note from a menu of matching entries'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
     if options[:section]
@@ -991,8 +1053,9 @@ command :note do |c|
 
     last_note = last_entry.note || Doing::Note.new
     new_note = Doing::Note.new
+    ask_note = options[:ask] ? Doing::Prompt.request_lines(prompt: 'Add a note') : ''
 
-    if options[:editor] || (args.empty? && $stdin.stat.size.zero? && !options[:remove])
+    if options[:editor] || (args.empty? && $stdin.stat.size.zero? && !options[:remove] && !options[:ask])
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input = !args.empty? ? args.join(' ') : ''
@@ -1003,7 +1066,9 @@ command :note do |c|
         prev_input = last_entry.note || Doing::Note.new
       end
 
+
       input = prev_input.add(input)
+      input.add(ask_note) unless ask_note.empty?
 
       input = wwid.fork_editor(prev_input.strip_lines.join("\n"), message: nil).strip
       note = input
@@ -1014,9 +1079,12 @@ command :note do |c|
     elsif $stdin.stat.size.positive?
       new_note.add($stdin.read.strip)
     else
-      raise EmptyInput, 'You must provide content when adding a note' unless options[:remove]
+      raise EmptyInput, 'You must provide content when adding a note' unless options[:remove] || !ask_note.empty?
+
     end
 
+    new_note.add(ask_note) unless ask_note.empty?
+
     if last_note.equal?(new_note)
       Doing.logger.debug('Skipped:', 'No note change')
     else
@@ -1062,6 +1130,9 @@ command %i[now next] do |c|
   c.arg_name 'TEXT'
   c.flag %i[n note]
 
+  c.desc 'Prompt for note via multi-line input'
+  c.switch %i[ask], negatable: false, default_value: false
+
   # c.desc "Edit entry with specified app"
   # c.arg_name 'editor_app'
   # # c.flag [:a, :app]
@@ -1081,23 +1152,28 @@ command %i[now next] do |c|
       options[:section] = settings['current_section']
     end
 
+    ask_note = options[:ask] ? Doing::Prompt.request_lines(prompt: 'Add a note') : ''
+
     if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       input = date.strftime('%F %R | ')
       input += args.join(' ') unless args.empty?
+      input += "\n#{options[:note]}" if options[:note]
+      input += "\n#{ask_note}" unless ask_note.empty?
       input = wwid.fork_editor(input).strip
 
       raise EmptyInput, 'No content' if input.empty?
 
       date, title, note = wwid.format_input(input)
-      note.add(options[:note]) if options[:note]
+
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
     elsif args.length.positive?
       d, title, note = wwid.format_input(args.join(' '))
       date = d.nil? ? date : d
       note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
     elsif $stdin.stat.size.positive?
@@ -1108,6 +1184,7 @@ command %i[now next] do |c|
         date = d
       end
       note.add(options[:note]) if options[:note]
+      note.add(ask_note) unless ask_note.empty?
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
     else
@@ -1135,7 +1212,7 @@ command %i[reset begin] do |c|
   c.desc 'Resume entry (remove @done)'
   c.switch %i[r resume], default_value: true
 
-  c.desc 'Reset last entry matching tag. Wildcards allowed (*, ?).'
+  c.desc 'Reset last entry matching tag. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
@@ -1143,6 +1220,10 @@ command %i[reset begin] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -1156,7 +1237,7 @@ command %i[reset begin] do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1256,13 +1337,21 @@ command :select do |c|
 
   c.desc 'Initial search query for filtering. Matching is fuzzy. For exact matching, start query with a single quote, e.g. `--query "\'search"'
   c.arg_name 'QUERY'
-  c.flag %i[q query search]
+  c.flag %i[q query]
+
+  c.desc 'Select from entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
 
-  c.desc 'Select from entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Select from entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:before]
 
-  c.desc 'Select from entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Select from entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
@@ -1287,7 +1376,7 @@ command :select do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically. Test with `--output doing` to preview matches.'
+  c.desc 'Use --no-menu to skip the interactive menu. Use with --query to filter items and act on results automatically. Test with `--output doing` to preview matches'
   c.switch %i[menu], negatable: true, default_value: true
 
   c.desc 'Cancel selected items (add @done without timestamp)'
@@ -1305,7 +1394,7 @@ command :select do |c|
   c.desc 'Add flag to selected item(s)'
   c.switch %i[flag], negatable: false, default_value: false
 
-  c.desc 'Perform action without confirmation.'
+  c.desc 'Perform action without confirmation'
   c.switch %i[force], negatable: false, default_value: false
 
   c.desc 'Save selected entries to file using --output format'
@@ -1365,6 +1454,10 @@ command :tag do |c|
   c.arg_name 'ORIG_TAG'
   c.flag %i[rename]
 
+  c.desc 'Include a value, e.g. @tag(value)'
+  c.arg_name 'VALUE'
+  c.flag %i[v value]
+
   c.desc 'Don\'t ask permission to tag all entries when count is 0'
   c.switch %i[force], negatable: false, default_value: false
 
@@ -1386,12 +1479,16 @@ command :tag do |c|
   c.desc 'Tag the last X entries containing TAG.
   Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool. Wildcards allowed (*, ?).'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
   c.desc 'Tag entries matching search filter, surround with slashes for regex (e.g. "/query.*/"), start with single quote for exact match ("\'query")'
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -1405,7 +1502,7 @@ command :tag do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1428,7 +1525,7 @@ command :tag do |c|
     if options[:tag].nil?
       search_tags = []
     else
-      search_tags = options[:tag].to_tags
+      search_tags = options[:tag]
     end
 
     if options[:autotag]
@@ -1528,11 +1625,11 @@ command %i[grep search] do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Search entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Search entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:before]
 
-  c.desc 'Search entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Search entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
@@ -1591,6 +1688,13 @@ command %i[grep search] do |c|
   c.desc 'Display an interactive menu of results to perform further operations'
   c.switch %i[i interactive], default_value: false, negatable: false
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
+  c.desc 'Combine multiple tags or value queries using AND, OR, or NOT'
+  c.flag [:bool], must_match: REGEX_BOOL, default_value: 'AND'
+
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
@@ -1601,6 +1705,7 @@ command %i[grep search] do |c|
     section = wwid.guess_section(options[:section]) if options[:section]
 
     options[:case] = options[:case].normalize_case
+    options[:bool] = options[:bool].normalize_bool
 
     search = args.join(' ')
     search.sub!(/^'?/, "'") if options[:exact]
@@ -1639,11 +1744,11 @@ command :last do |c|
   c.desc "Delete the last entry"
   c.switch %i[d delete], negatable: false, default_value: false
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?).'
+  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
-  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1651,6 +1756,10 @@ command :last do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   c.desc 'Show elapsed time if entry is not tagged @done'
   c.switch [:duration]
 
@@ -1674,7 +1783,7 @@ command :last do |c|
     if options[:tag].nil?
       options[:tag] = []
     else
-      options[:tag] = options[:tag].to_tags
+      options[:tag] = options[:tag]
       options[:bool] = options[:bool].normalize_bool
     end
 
@@ -1685,12 +1794,14 @@ command :last do |c|
     if options[:editor]
       wwid.edit_last(section: options[:section],
                      options: {
-                       search: search,
+                       search: options[:search],
                        fuzzy: options[:fuzzy],
                        case: options[:case],
-                       tag: tags,
+                       tag: options[:tag],
                        tag_bool: options[:bool],
-                       not: options[:not]
+                       not: options[:not],
+                       val: options[:val],
+                       bool: options[:bool]
                      })
     else
       last = wwid.last(times: true, section: options[:section],
@@ -1702,7 +1813,9 @@ command :last do |c|
                         negate: options[:not],
                         tag: options[:tag],
                         tag_bool: options[:bool],
-                        delete: options[:delete]
+                        delete: options[:delete],
+                        bool: options[:bool],
+                        val: options[:val]
                       })
       Doing::Pager::page last.strip if last
     end
@@ -1798,11 +1911,15 @@ command :show do |c|
   c.example 'doing show Ideas @doing --from "mon to fri"', desc: 'Show entries tagged @doing from the Ideas section added between monday and friday of the current week.'
   c.example 'doing show --interactive Later @doing', desc: 'Create a menu from entries from the Later section tagged @doing to perform batch actions'
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Use `--tag pick` for a menu of available tags. Wildcards allowed (*, ?). Added for compatibility with other commands.'
+  c.desc 'Tag filter, combine multiple tags with a comma. Use `--tag pick` for a menu of available tags. Wildcards allowed (*, ?). Added for compatibility with other commands'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
+
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
 
-  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag %i[b bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -1814,11 +1931,11 @@ command :show do |c|
   c.arg_name 'AGE'
   c.flag %i[a age], default_value: 'newest'
 
-  c.desc 'Show entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Show entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:before]
 
-  c.desc 'Show entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'Show entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
@@ -1929,7 +2046,7 @@ command :show do |c|
       section ||= 'All'
     end
 
-    tags.concat(options[:tag].to_tags) if options[:tag]
+    tags.concat(options[:tag]) if options[:tag]
 
     options[:times] = true if options[:totals]
 
@@ -2012,7 +2129,7 @@ command :tags do |c|
   c.arg_name 'ORDER'
   c.flag %i[o order], must_match: REGEX_SORT_ORDER, default_value: 'asc'
 
-  c.desc 'Get tags for entries matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?).'
+  c.desc 'Get tags for entries matching tags. Combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
@@ -2021,6 +2138,10 @@ command :tags do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -2034,7 +2155,7 @@ command :tags do |c|
   c.arg_name 'TYPE'
   c.flag [:case], must_match: /^[csi]/, default_value: settings.dig('search', 'case')
 
-  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans.'
+  c.desc 'Boolean used to combine multiple tags. Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -2291,11 +2412,15 @@ command :view do |c|
   c.desc 'Include colors in output'
   c.switch [:color], default_value: true, negatable: true
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?).'
+  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
+  c.desc 'Tag boolean (AND,OR,NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag %i[b bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -2324,11 +2449,11 @@ command :view do |c|
   c.arg_name 'DIRECTION'
   c.flag [:tag_order], must_match: REGEX_SORT_ORDER
 
-  c.desc 'View entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'View entries older than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:before]
 
-  c.desc 'View entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day.'
+  c.desc 'View entries newer than date. If this is only a time (8am, 1:30pm, 15:00), all dates will be included, but entries will be filtered by time of day'
   c.arg_name 'DATE_STRING'
   c.flag [:after]
 
@@ -2935,11 +3060,11 @@ command %i[archive move] do |c|
   c.desc 'Label moved items with @from(SECTION_NAME)'
   c.switch [:label], default_value: true, negatable: true
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands.'
+  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands'
   c.arg_name 'TAG'
-  c.flag [:tag]
+  c.flag [:tag], type: TagArray
 
-  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -2947,6 +3072,10 @@ command %i[archive move] do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -2982,7 +3111,7 @@ command %i[archive move] do |c|
 
     raise InvalidArgument, '--keep and --count can not be used together' if options[:keep] && options[:count]
 
-    tags.concat(options[:tag].to_tags) if options[:tag]
+    tags.concat(options[:tag]) if options[:tag]
 
     search = nil
 
@@ -3042,7 +3171,7 @@ command :import do |c|
 
   c.desc 'Tag all imported entries'
   c.arg_name 'TAGS'
-  c.flag :tag
+  c.flag %i[t tag]
 
   c.desc 'Autotag entries'
   c.switch :autotag, negatable: true, default_value: true
@@ -3077,6 +3206,12 @@ command :import do |c|
       options[:section] = wwid.guess_section(options[:section]) || options[:section].cap_first
     end
 
+    if options[:search]
+      search = options[:search]
+      search.sub!(/^'?/, "'") if options[:exact]
+      options[:search] = search
+    end
+
     if options[:from]
       date_string = options[:from]
       if date_string =~ / (to|through|thru|(un)?til|-+) /
@@ -3085,7 +3220,7 @@ command :import do |c|
         finish = dates[2].chronify(guess: :end)
       else
         start = date_string.chronify(guess: :begin)
-        finish = false
+        finish = date_string.chronify(guess: :end)
       end
       raise InvalidTimeExpression, 'Unrecognized date string' unless start
       dates = [start, finish]
@@ -3122,11 +3257,11 @@ command :rotate do |c|
   c.arg_name 'SECTION_NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands.'
+  c.desc 'Tag filter, combine multiple tags with a comma. Wildcards allowed (*, ?). Added for compatibility with other commands'
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans.'
+  c.desc 'Tag boolean (AND|OR|NOT). Use PATTERN to parse + and - as booleans'
   c.arg_name 'BOOLEAN'
   c.flag [:bool], must_match: REGEX_BOOL, default_value: 'PATTERN'
 
@@ -3134,6 +3269,10 @@ command :rotate do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
+  c.arg_name 'QUERY'
+  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
+
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
@@ -3357,7 +3496,7 @@ command :undo do |c|
   c.arg_name 'COUNT'
   c.flag %i[p prune], type: Integer
 
-  c.desc 'Redo last undo. Note: you cannot undo a redo.'
+  c.desc 'Redo last undo. Note: you cannot undo a redo'
   c.switch %i[r redo]
 
   c.action do |_global_options, options, args|
@@ -3384,7 +3523,7 @@ command :undo do |c|
 end
 
 # @@redo
-long_desc 'Shortcut for `doing undo -r`, reverses the last undo command. You cannot undo a redo.'
+long_desc 'Shortcut for `doing undo -r`, reverses the last undo command. You cannot undo a redo'
 arg_name 'COUNT'
 command :redo do |c|
   c.desc 'Specify alternate doing file'