aidp 0.16.0 → 0.17.1

data/lib/aidp/execute/checkpoint.rb

@@ -40,7 +40,7 @@ module Aidp
       # Get the latest checkpoint data
       def latest_checkpoint
         return nil unless File.exist?(@checkpoint_file)
-        YAML.load_file(@checkpoint_file)
+        YAML.safe_load_file(@checkpoint_file, permitted_classes: [Date, Time, Symbol], aliases: true)
       end
 
       # Get checkpoint history for analysis

data/lib/aidp/execute/future_work_backlog.rb

@@ -218,7 +218,7 @@ module Aidp
       def load_existing_backlog
         return unless File.exist?(@backlog_file)
 
-        data = YAML.load_file(@backlog_file)
+        data = YAML.safe_load_file(@backlog_file, permitted_classes: [Date, Time, Symbol], aliases: true)
         @entries = data["entries"] || [] if data.is_a?(Hash)
         @entries = symbolize_keys_deep(@entries)
       rescue => e

data/lib/aidp/execute/progress.rb

@@ -9,9 +9,10 @@ module Aidp
     class Progress
       attr_reader :project_dir, :progress_file
 
-      def initialize(project_dir)
+      def initialize(project_dir, skip_persistence: false)
         @project_dir = project_dir
         @progress_file = File.join(project_dir, ".aidp", "progress", "execute.yml")
+        @skip_persistence = skip_persistence
         load_progress
       end
 
@@ -61,23 +62,19 @@ module Aidp
       private
 
       def load_progress
-        # In test mode, only skip file operations if no progress file exists
-        if (ENV["RACK_ENV"] == "test" || defined?(RSpec)) && !File.exist?(@progress_file)
+        if @skip_persistence && !File.exist?(@progress_file)
           @progress = {}
           return
         end
-
-        @progress = if File.exist?(@progress_file)
-          YAML.load_file(@progress_file) || {}
+        @progress = if !@skip_persistence && File.exist?(@progress_file)
+          YAML.safe_load_file(@progress_file, permitted_classes: [Date, Time, Symbol], aliases: true) || {}
         else
           {}
         end
       end
 
       def save_progress
-        # In test mode, skip file operations to avoid hanging
-        return if ENV["RACK_ENV"] == "test" || defined?(RSpec)
-
+        return if @skip_persistence
         FileUtils.mkdir_p(File.dirname(@progress_file))
         File.write(@progress_file, @progress.to_yaml)
       end

data/lib/aidp/execute/repl_macros.rb

@@ -9,7 +9,7 @@ module Aidp
     # - /split - Divide work into smaller contracts
     # - /halt-on <pattern> - Pause on specific test failures
     class ReplMacros
-      attr_reader :pinned_files, :focus_patterns, :halt_patterns, :split_mode, :current_workstream
+      attr_reader :pinned_files, :focus_patterns, :halt_patterns, :split_mode, :current_workstream, :current_skill
 
       def initialize(project_dir: Dir.pwd)
         @pinned_files = Set.new
@@ -18,6 +18,7 @@ module Aidp
         @split_mode = false
         @project_dir = project_dir
         @current_workstream = nil
+        @current_skill = nil
         @commands = register_commands
       end
 
@@ -65,6 +66,7 @@ module Aidp
           halt_patterns: @halt_patterns,
           split_mode: @split_mode,
           current_workstream: @current_workstream,
+          current_skill: @current_skill,
           active_constraints: active_constraints_count
         }
       end
@@ -113,6 +115,30 @@ module Aidp
         true
       end
 
+      # Retrieve the current skill object, or nil if none is selected
+      #
+      # This method provides access to the full skill object (with content, providers, etc.)
+      # for the currently selected skill via `/skill use <id>`.
+      #
+      # @return [Aidp::Skills::Skill, nil] The current skill object or nil
+      #
+      # @example
+      #   repl = ReplMacros.new(project_dir: Dir.pwd)
+      #   repl.execute("/skill use repository_analyst")
+      #   skill = repl.current_skill_object
+      #   puts skill.content if skill  # => skill's markdown content
+      def current_skill_object
+        return nil unless @current_skill
+
+        require_relative "../skills"
+        registry = Aidp::Skills::Registry.new(project_dir: @project_dir)
+        registry.load_skills
+        registry.find(@current_skill)
+      rescue => e
+        Aidp.log_error("repl_macros", "Failed to load current skill object", error: e.message)
+        nil
+      end
+
       private
 
       # Register all available REPL commands
@@ -1257,25 +1283,25 @@ module Aidp
             lines = ["Available Skills:", ""]
             by_source = registry.by_source
 
-            if by_source[:builtin].any?
-              lines << "Built-in Skills:"
-              by_source[:builtin].each do |skill_id|
+            if by_source[:template].any?
+              lines << "Template Skills:"
+              by_source[:template].each do |skill_id|
                 skill = registry.find(skill_id)
                 lines << "  • #{skill_id} - #{skill.description}"
               end
               lines << ""
             end
 
-            if by_source[:custom].any?
-              lines << "Custom Skills:"
-              by_source[:custom].each do |skill_id|
+            if by_source[:project].any?
+              lines << "Project Skills:"
+              by_source[:project].each do |skill_id|
                 skill = registry.find(skill_id)
-                lines << "  • #{skill_id} - #{skill.description} [CUSTOM]"
+                lines << "  • #{skill_id} - #{skill.description} [PROJECT]"
               end
               lines << ""
             end
 
-            lines << "Use '/skill show <id>' for details"
+            lines << "Use '/skill show <id>' for details or '/skill use <id>' to activate"
 
             {
               success: true,
@@ -1412,10 +1438,53 @@ module Aidp
             }
           end
 
+        when "use"
+          # Switch to a specific skill
+          skill_id = args.shift
+
+          unless skill_id
+            return {
+              success: false,
+              message: "Usage: /skill use <skill-id>",
+              action: :none
+            }
+          end
+
+          begin
+            registry = Aidp::Skills::Registry.new(project_dir: @project_dir)
+            registry.load_skills
+
+            skill = registry.find(skill_id)
+
+            unless skill
+              return {
+                success: false,
+                message: "Skill not found: #{skill_id}\nUse '/skill list' to see available skills",
+                action: :none
+              }
+            end
+
+            # Store the current skill for the session
+            @current_skill = skill_id
+
+            {
+              success: true,
+              message: "✓ Now using skill: #{skill.name} (#{skill_id})\n\n#{skill.description}",
+              action: :switch_skill,
+              data: {skill_id: skill_id, skill: skill}
+            }
+          rescue => e
+            {
+              success: false,
+              message: "Failed to switch skill: #{e.message}",
+              action: :none
+            }
+          end
+
         else
           {
             success: false,
-            message: "Usage: /skill <command> [args]\n\nCommands:\n  list           - List all available skills\n  show <id>      - Show detailed skill information\n  search <query> - Search skills by keyword\n\nExamples:\n  /skill list\n  /skill show repository_analyst\n  /skill search git",
+            message: "Usage: /skill <command> [args]\n\nCommands:\n  list           - List all available skills\n  show <id>      - Show detailed skill information\n  search <query> - Search skills by keyword\n  use <id>       - Switch to a specific skill\n\nExamples:\n  /skill list\n  /skill show repository_analyst\n  /skill search git\n  /skill use repository_analyst",
             action: :none
           }
         end

data/lib/aidp/harness/config_loader.rb

@@ -9,9 +9,9 @@ module Aidp
   module Harness
     # Enhanced configuration loader for harness
     class ConfigLoader
-      def initialize(project_dir = Dir.pwd)
+      def initialize(project_dir = Dir.pwd, validator: nil)
         @project_dir = project_dir
-        @validator = ConfigValidator.new(project_dir)
+        @validator = validator || ConfigValidator.new(project_dir)
         @config_cache = nil
         @last_loaded = nil
         @last_signature = nil # stores {mtime:, size:, hash:}

data/lib/aidp/harness/config_validator.rb

@@ -256,7 +256,7 @@ module Aidp
         return unless @config_file
 
         begin
-          @config = YAML.load_file(@config_file) || {}
+          @config = YAML.safe_load_file(@config_file, permitted_classes: [Date, Time, Symbol], aliases: true) || {}
         rescue => e
           @config = {}
           @validation_result = {

data/lib/aidp/harness/enhanced_runner.rb

@@ -22,10 +22,19 @@ module Aidp
         error: "error"
       }.freeze
 
-      def initialize(project_dir, mode = :analyze, options = {})
+      # Simple sleeper abstraction for test control
+      class Sleeper
+        def sleep(duration)
+          Kernel.sleep(duration)
+        end
+      end
+
+      def initialize(project_dir, mode = :analyze, options = {}, prompt: TTY::Prompt.new, sleeper: Sleeper.new)
         @project_dir = project_dir
         @mode = mode.to_sym
         @options = options
+        @prompt = prompt
+        @sleeper = sleeper
         @state = STATES[:idle]
         @start_time = nil
         @current_step = nil
@@ -50,7 +59,7 @@ module Aidp
         @configuration = Configuration.new(project_dir)
         @state_manager = StateManager.new(project_dir, @mode)
         @condition_detector = ConditionDetector.new
-        @provider_manager = ProviderManager.new(@configuration, prompt: TTY::Prompt.new)
+        @provider_manager = ProviderManager.new(@configuration, prompt: @prompt)
         @error_handler = ErrorHandler.new(@provider_manager, @configuration)
         @completion_checker = CompletionChecker.new(@project_dir, @workflow_type)
       end
@@ -240,7 +249,7 @@ module Aidp
         # Remove job after a delay to show completion
         # UI delay to let user see completion status before removal
         Thread.new do
-          sleep 2  # Acceptable for UI timing
+          @sleeper.sleep(2) # UI timing delay
           @tui.remove_job(step_job_id)
         end
 
@@ -349,9 +358,9 @@ module Aidp
       def get_mode_runner
         case @mode
         when :analyze
-          Aidp::Analyze::Runner.new(@project_dir, self, prompt: TTY::Prompt.new)
+          Aidp::Analyze::Runner.new(@project_dir, self, prompt: @prompt)
         when :execute
-          Aidp::Execute::Runner.new(@project_dir, self, prompt: TTY::Prompt.new)
+          Aidp::Execute::Runner.new(@project_dir, self, prompt: @prompt)
         else
           raise ArgumentError, "Unsupported mode: #{@mode}"
         end
@@ -376,7 +385,7 @@ module Aidp
       def handle_pause_condition
         case @state
         when STATES[:paused]
-          sleep(1)
+          @sleeper.sleep(1)
         when STATES[:waiting_for_user]
           # User interface handles this
           nil
@@ -503,7 +512,7 @@ module Aidp
         while Time.now < reset_time && @state == STATES[:waiting_for_rate_limit]
           remaining = reset_time - Time.now
           @tui.show_message("⏳ Rate limit reset in #{remaining.to_i} seconds", :info)
-          sleep(1)
+          @sleeper.sleep(1)
         end
       end
 

data/lib/aidp/harness/error_handler.rb

@@ -10,10 +10,19 @@ module Aidp
     class ErrorHandler
       include Aidp::DebugMixin
 
-      def initialize(provider_manager, configuration, metrics_manager = nil)
+      # Simple wrapper to allow dependency injection of sleep behavior in tests
+      class Sleeper
+        def sleep(seconds)
+          Kernel.sleep(seconds)
+        end
+      end
+
+      # @param sleeper [#sleep] object responding to sleep(seconds); injectable for tests
+      def initialize(provider_manager, configuration, metrics_manager = nil, sleeper: nil)
         @provider_manager = provider_manager
         @configuration = configuration
         @metrics_manager = metrics_manager
+        @sleeper = sleeper || Sleeper.new
         @retry_strategies = {}
         @retry_counts = {}
         @error_history = []
@@ -112,7 +121,7 @@ module Aidp
               if should_retry?(error_info, strategy)
                 delay = @backoff_calculator.calculate_delay(attempt, strategy[:backoff_strategy] || :exponential, 1, 10)
                 debug_log("🔁 Retry attempt #{attempt} for #{current_provider}", level: :info, data: {delay: delay, error_type: error_info[:error_type]})
-                sleep(delay) if delay > 0
+                @sleeper.sleep(delay) if delay > 0
                 retry
               end
             end
@@ -191,9 +200,7 @@ module Aidp
         )
 
         # Wait for backoff delay
-        if delay > 0
-          sleep(delay)
-        end
+        @sleeper.sleep(delay) if delay > 0
 
         # Execute the retry
         retry_result = execute_retry_attempt(error_info, strategy, context)

data/lib/aidp/harness/provider_manager.rb

@@ -12,9 +12,10 @@ module Aidp
       include Aidp::MessageDisplay
       include Aidp::RescueLogging
 
-      def initialize(configuration, prompt: TTY::Prompt.new)
+      def initialize(configuration, prompt: TTY::Prompt.new, binary_checker: Aidp::Util)
         @configuration = configuration
         @prompt = prompt
+        @binary_checker = binary_checker
         @current_provider = nil
         @current_model = nil
         @provider_history = []
@@ -1069,18 +1070,6 @@ module Aidp
       def provider_cli_available?(provider_name)
         normalized = normalize_provider_name(provider_name)
 
-        # Handle test environment overrides
-        if defined?(RSpec) || ENV["RSPEC_RUNNING"]
-          # Force claude to be missing for testing
-          if ENV["AIDP_FORCE_CLAUDE_MISSING"] == "1" && normalized == "claude"
-            return [false, "binary_missing"]
-          end
-          # Force claude to be available for testing
-          if ENV["AIDP_FORCE_CLAUDE_AVAILABLE"] == "1" && normalized == "claude"
-            return [true, "available"]
-          end
-        end
-
         cache_key = "#{provider_name}:#{normalized}"
         cached = @binary_check_cache[cache_key]
         if cached && (Time.now - cached[:checked_at] < @binary_check_ttl)
@@ -1098,7 +1087,7 @@ module Aidp
           return [true, nil]
         end
         path = begin
-          Aidp::Util.which(binary)
+          @binary_checker.which(binary)
         rescue => e
           log_rescue(e, component: "provider_manager", action: "locate_binary", fallback: nil, binary: binary)
           nil
@@ -1164,10 +1153,6 @@ module Aidp
         statuses = provider_health_status
         metrics = all_metrics
         configured = configured_providers
-        # Ensure fresh binary probe results in test mode so stubs of Aidp::Util.which take effect
-        if defined?(RSpec) || ENV["RSPEC_RUNNING"]
-          @binary_check_cache.clear
-        end
         rows_by_normalized = {}
         configured.each do |prov|
           # Temporarily hide macos provider until it's user-configurable
@@ -1384,7 +1369,7 @@ module Aidp
         @current_provider = provider_type
 
         # Execute the prompt with the provider
-        result = provider.send(prompt: prompt, session: nil)
+        result = provider.send_message(prompt: prompt, session: nil)
 
         # Return structured result
         {

data/lib/aidp/harness/runner.rb

@@ -188,9 +188,9 @@ module Aidp
       def get_mode_runner
         case @mode
         when :analyze
-          Aidp::Analyze::Runner.new(@project_dir, self, prompt: TTY::Prompt.new)
+          Aidp::Analyze::Runner.new(@project_dir, self, prompt: @prompt)
         when :execute
-          Aidp::Execute::Runner.new(@project_dir, self, prompt: TTY::Prompt.new)
+          Aidp::Execute::Runner.new(@project_dir, self, prompt: @prompt)
         else
           raise ArgumentError, "Unsupported mode: #{@mode}"
         end

data/lib/aidp/harness/state/persistence.rb

@@ -8,22 +8,25 @@ module Aidp
     module State
       # Handles file I/O and persistence for state management
       class Persistence
-        def initialize(project_dir, mode)
+        def initialize(project_dir, mode, skip_persistence: false)
           @project_dir = project_dir
           @mode = mode
           @state_dir = File.join(project_dir, ".aidp", "harness")
           @state_file = File.join(@state_dir, "#{mode}_state.json")
           @lock_file = File.join(@state_dir, "#{mode}_state.lock")
+          # Use explicit skip_persistence flag for dependency injection
+          # Callers should set skip_persistence: true for test/dry-run scenarios
+          @skip_persistence = skip_persistence
           ensure_state_directory
         end
 
         def has_state?
-          return false if test_mode?
+          return false if @skip_persistence
           File.exist?(@state_file)
         end
 
         def load_state
-          return {} if test_mode? || !has_state?
+          return {} if @skip_persistence || !has_state?
 
           with_lock do
             content = File.read(@state_file)
@@ -35,7 +38,7 @@ module Aidp
         end
 
         def save_state(state_data)
-          return if test_mode?
+          return if @skip_persistence
 
           with_lock do
             state_with_metadata = add_metadata(state_data)
@@ -44,7 +47,7 @@ module Aidp
         end
 
         def clear_state
-          return if test_mode?
+          return if @skip_persistence
 
           with_lock do
             File.delete(@state_file) if File.exist?(@state_file)
@@ -53,10 +56,6 @@ module Aidp
 
         private
 
-        def test_mode?
-          ENV["RACK_ENV"] == "test" || defined?(RSpec)
-        end
-
         def add_metadata(state_data)
           state_data.merge(
             mode: @mode,
@@ -76,7 +75,7 @@ module Aidp
         end
 
         def with_lock(&block)
-          return yield if test_mode?
+          return yield if @skip_persistence
 
           acquire_lock_with_timeout(&block)
         ensure

data/lib/aidp/harness/state/workflow_state.rb

@@ -10,11 +10,12 @@ module Aidp
     module State
       # Manages workflow-specific state and progress tracking
       class WorkflowState
-        def initialize(persistence, project_dir, mode)
+        def initialize(persistence, project_dir, mode, progress_tracker_factory: nil)
           @persistence = persistence
           @project_dir = project_dir
           @mode = mode
-          @progress_tracker = create_progress_tracker
+          @progress_tracker_factory = progress_tracker_factory
+          @progress_tracker = @progress_tracker_factory ? @progress_tracker_factory.call : create_progress_tracker
         end
 
         def completed_steps