na 1.2.87 → 1.2.89

data/lib/na/action.rb

@@ -28,6 +28,25 @@ module NA
       @note = note
     end
 
+    # Returns true if this action contains the current next-action tag (e.g. @na)
+    # @return [Boolean]
+    def na?
+      @tags.key?(NA.na_tag)
+    end
+
+    # Convert action to plugin IO hash
+    # @return [Hash]
+    def to_plugin_io_hash
+      {
+        'file_path' => file_path,
+        'line' => file_line,
+        'parents' => [@project].concat(@parent),
+        'text' => @action.dup,
+        'note' => @note.join("\n"),
+        'tags' => @tags.map { |k, v| { 'name' => k, 'value' => (v || '').to_s } }
+      }
+    end
+
     # Extract file path and line number from PATH:LINE format
     #
     # @return [Array] [file_path, line_number]

data/lib/na/actions.rb

@@ -40,7 +40,8 @@ module NA
         filtered_actions = if config[:only_timed]
                              self.select do |a|
                                t = a.tags
-                               (t['started'] || t['start']) && t['done']
+                               tl = t.transform_keys { |k| k.to_s.downcase }
+                               (tl['started'] || tl['start']) && tl['done']
                              end
                            else
                              self
@@ -118,7 +119,7 @@ module NA
 
               if config[:times]
                 # compute duration from @started/@done
-                tags = action.tags
+                tags = action.tags.transform_keys { |k| k.to_s.downcase }
                 begun = tags['started'] || tags['start']
                 finished = tags['done']
                 if begun && finished

data/lib/na/next_action.rb

@@ -3,6 +3,97 @@
 # Next Action methods
 module NA
   class << self
+    # Select actions across files using existing search pipeline
+    # @return [Array<NA::Action>]
+    def select_actions(file: nil, depth: 1, search: [], tagged: [], include_done: false)
+      files = if file
+                [file]
+              else
+                find_files(depth: depth)
+              end
+      out = []
+      files.each do |f|
+        _projects, actions = find_actions(f, search, tagged, done: include_done, all: true)
+        out.concat(actions) if actions
+      end
+      out
+    end
+
+    # Apply a plugin result hash back to the underlying file
+    # - Move if parents changed (project path differs)
+    # - Update text/note/tags
+    def apply_plugin_result(io_hash)
+      file = io_hash['file_path']
+      line = io_hash['line'].to_i
+      parents = Array(io_hash['parents']).map(&:to_s)
+      text = io_hash['text'].to_s
+      note = io_hash['note'].to_s
+      tags = Array(io_hash['tags']).to_h { |t| [t['name'].to_s, t['value'].to_s] }
+      action_block = io_hash['action'] || { 'action' => 'UPDATE', 'arguments' => [] }
+      action_name = action_block['action'].to_s.upcase
+      action_args = Array(action_block['arguments'])
+
+      # Load current action
+      _projects, actions = find_actions(file, nil, nil, all: true, done: true, project: nil, search_note: true, target_line: line)
+      action = actions&.first
+      return unless action
+
+      # Determine new project path from parents array
+      new_project = ''
+      new_parent_chain = []
+      if parents.any?
+        new_project = parents.first.to_s
+        new_parent_chain = parents[1..] || []
+      end
+
+      case action_name
+      when 'DELETE'
+        update_action(file, { target_line: line }, delete: true, all: true)
+        return
+      when 'COMPLETE'
+        update_action(file, { target_line: line }, finish: true, all: true)
+        return
+      when 'RESTORE'
+        update_action(file, { target_line: line }, restore: true, all: true)
+        return
+      when 'ARCHIVE'
+        update_action(file, { target_line: line }, finish: true, move: 'Archive', all: true)
+        return
+      when 'ADD_TAG'
+        add_tags = action_args.map { |t| t.sub(/^@/, '') }
+        update_action(file, { target_line: line }, add: action, add_tag: add_tags, all: true)
+        return
+      when 'DELETE_TAG', 'REMOVE_TAG'
+        remove_tags = action_args.map { |t| t.sub(/^@/, '') }
+        update_action(file, { target_line: line }, add: action, remove_tag: remove_tags, all: true)
+        return
+      when 'MOVE'
+        move_to = action_args.first.to_s
+        update_action(file, { target_line: line }, add: action, move: move_to, all: true, suppress_prompt: true)
+        return
+      end
+
+      # Replace content on the existing action then write back in-place
+      original_line = action.file_line
+      original_project = action.project
+      original_parent_chain = action.parent.dup
+
+      # Update action content
+      action.action = text
+      action.note = note.to_s.split("\n")
+      action.action.gsub!(/(?<=\A| )@\S+(?:\(.*?\))?/, '')
+      unless tags.empty?
+        tag_str = tags.map { |k, v| v.to_s.empty? ? "@#{k}" : "@#{k}(#{v})" }.join(' ')
+        action.action = action.action.strip + (tag_str.empty? ? "" : " #{tag_str}")
+      end
+
+      # Check if parents changed
+      parents_changed = new_project.to_s.strip != original_project || new_parent_chain != original_parent_chain
+      move_to = parents_changed ? ([new_project] + new_parent_chain).join(':') : nil
+
+      # Update in-place (with move if parents changed)
+      update_action(file, { target_line: original_line }, add: action, move: move_to, all: true, suppress_prompt: true)
+    end
     include NA::Editor
 
     attr_accessor :verbose, :extension, :include_ext, :na_tag, :command_line, :command, :globals, :global_file,
@@ -51,6 +142,7 @@ module NA
     # @return     [Boolean] result
     #
     def yn(prompt, default: true)
+      return default if ENV['NA_TEST'] == '1'
       return default unless $stdout.isatty
 
       tty_state = `stty -g`
@@ -330,7 +422,8 @@ module NA
                       tagged: nil,
                       started_at: nil,
                       done_at: nil,
-                      duration_seconds: nil)
+                      duration_seconds: nil,
+                      suppress_prompt: false)
       # Coerce date/time inputs if passed as strings
       begin
         started_at = NA::Types.parse_date_begin(started_at) if started_at && !started_at.is_a?(Time)
@@ -355,14 +448,19 @@ module NA
         move = move.sub(/:$/, '')
         target_proj = projects.select { |pr| pr.project =~ /#{move.gsub(':', '.*?:.*?')}/i }.first
         if target_proj.nil?
-          res = NA.yn(
-            NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{move}#{NA.theme[:warning]} doesn't exist, add it"), default: true
-          )
-          if res
-            target_proj = insert_project(target, move, projects)
+          if suppress_prompt || !$stdout.isatty
+            target_proj = insert_project(target, move)
             projects << target_proj
           else
-            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
+            res = NA.yn(
+              NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{move}#{NA.theme[:warning]} doesn't exist, add it"), default: true
+            )
+            if res
+              target_proj = insert_project(target, move)
+              projects << target_proj
+            else
+              NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
+            end
           end
         end
       end