aidp 0.28.0 → 0.29.0

data/lib/aidp/providers/base.rb

@@ -37,6 +37,16 @@ module Aidp
       TIMEOUT_REFACTORING_RECOMMENDATIONS = 600 # 10 minutes - refactoring
       TIMEOUT_IMPLEMENTATION = 900 # 15 minutes - implementation (write files, run tests, fix issues)
 
+      # Tier-based timeout multipliers (applied on top of base timeouts)
+      # Higher tiers need more time for deeper reasoning
+      TIER_TIMEOUT_MULTIPLIERS = {
+        "mini" => 1.0,      # 5 minutes default (300s base)
+        "standard" => 2.0,  # 10 minutes default (600s base)
+        "thinking" => 6.0,  # 30 minutes default (1800s base)
+        "pro" => 6.0,       # 30 minutes default (1800s base)
+        "max" => 12.0       # 60 minutes default (3600s base)
+      }.freeze
+
       attr_reader :activity_state, :last_activity_time, :start_time, :step_name, :model
 
       def initialize(output: nil, prompt: TTY::Prompt.new)
@@ -78,10 +88,12 @@ module Aidp
       # Configure the provider with options
       # @param config [Hash] Configuration options, may include :model
       def configure(config)
-        @model = config[:model] if config[:model]
+        if config[:model]
+          @model = resolve_model_name(config[:model].to_s)
+        end
       end
 
-      def send_message(prompt:, session: nil)
+      def send_message(prompt:, session: nil, options: {})
         raise NotImplementedError, "#{self.class} must implement #send_message"
       end
 
@@ -482,11 +494,12 @@ module Aidp
       # Priority order:
       # 1. Quick mode (for testing)
       # 2. Provider-specific environment variable override
-      # 3. Adaptive timeout based on step type
-      # 4. Default timeout
+      # 3. Adaptive timeout based on step type and thinking tier
+      # 4. Default timeout (with tier multiplier)
       #
       # Override provider_env_var to customize the environment variable name
-      def calculate_timeout
+      # @param options [Hash] Options hash that may include :tier
+      def calculate_timeout(options = {})
         if ENV["AIDP_QUICK_MODE"]
           display_message("⚡ Quick mode enabled - #{TIMEOUT_QUICK_MODE / 60} minute timeout", type: :highlight)
           return TIMEOUT_QUICK_MODE
@@ -495,47 +508,104 @@ module Aidp
         provider_env_var = "AIDP_#{name.upcase}_TIMEOUT"
         return ENV[provider_env_var].to_i if ENV[provider_env_var]
 
-        step_timeout = adaptive_timeout
+        tier = options[:tier]&.to_s
+        step_timeout = adaptive_timeout(tier)
         if step_timeout
-          display_message("🧠 Using adaptive timeout: #{step_timeout} seconds", type: :info)
+          tier_label = tier ? " (tier: #{tier})" : ""
+          display_message("🧠 Using adaptive timeout: #{step_timeout} seconds#{tier_label}", type: :info)
           return step_timeout
         end
 
-        # Default timeout
-        display_message("📋 Using default timeout: #{TIMEOUT_DEFAULT / 60} minutes", type: :info)
-        TIMEOUT_DEFAULT
+        # Default timeout with tier multiplier
+        base_timeout = TIMEOUT_DEFAULT
+        final_timeout = apply_tier_multiplier(base_timeout, tier)
+        tier_label = tier ? " (tier: #{tier})" : ""
+        display_message("📋 Using default timeout: #{final_timeout / 60} minutes#{tier_label}", type: :info)
+        final_timeout
       end
 
-      # Get adaptive timeout based on step type
+      # Get adaptive timeout based on step type and thinking tier
       #
       # This method returns different timeout values based on the type of operation
-      # being performed, as indicated by the AIDP_CURRENT_STEP environment variable.
+      # being performed, as indicated by the AIDP_CURRENT_STEP environment variable,
+      # and applies a multiplier based on the thinking tier (mini/standard/thinking/pro/max).
       # Returns nil for unknown steps to allow calculate_timeout to use the default.
-      def adaptive_timeout
-        @adaptive_timeout ||= begin
-          # Timeout recommendations based on step type patterns
-          step_name = ENV["AIDP_CURRENT_STEP"] || ""
-
-          case step_name
-          when /REPOSITORY_ANALYSIS/
-            TIMEOUT_REPOSITORY_ANALYSIS
-          when /ARCHITECTURE_ANALYSIS/
-            TIMEOUT_ARCHITECTURE_ANALYSIS
-          when /TEST_ANALYSIS/
-            TIMEOUT_TEST_ANALYSIS
-          when /FUNCTIONALITY_ANALYSIS/
-            TIMEOUT_FUNCTIONALITY_ANALYSIS
-          when /DOCUMENTATION_ANALYSIS/
-            TIMEOUT_DOCUMENTATION_ANALYSIS
-          when /STATIC_ANALYSIS/
-            TIMEOUT_STATIC_ANALYSIS
-          when /REFACTORING_RECOMMENDATIONS/
-            TIMEOUT_REFACTORING_RECOMMENDATIONS
-          when /IMPLEMENTATION/
-            TIMEOUT_IMPLEMENTATION
+      #
+      # @param tier [String, nil] The thinking tier (mini, standard, thinking, pro, max)
+      def adaptive_timeout(tier = nil)
+        # Don't cache - tier may change between calls
+        step_name = ENV["AIDP_CURRENT_STEP"] || ""
+
+        base_timeout = case step_name
+        when /REPOSITORY_ANALYSIS/
+          TIMEOUT_REPOSITORY_ANALYSIS
+        when /ARCHITECTURE_ANALYSIS/
+          TIMEOUT_ARCHITECTURE_ANALYSIS
+        when /TEST_ANALYSIS/
+          TIMEOUT_TEST_ANALYSIS
+        when /FUNCTIONALITY_ANALYSIS/
+          TIMEOUT_FUNCTIONALITY_ANALYSIS
+        when /DOCUMENTATION_ANALYSIS/
+          TIMEOUT_DOCUMENTATION_ANALYSIS
+        when /STATIC_ANALYSIS/
+          TIMEOUT_STATIC_ANALYSIS
+        when /REFACTORING_RECOMMENDATIONS/
+          TIMEOUT_REFACTORING_RECOMMENDATIONS
+        when /IMPLEMENTATION/
+          TIMEOUT_IMPLEMENTATION
+        else
+          nil # Return nil for unknown steps
+        end
+
+        return nil unless base_timeout
+
+        apply_tier_multiplier(base_timeout, tier)
+      end
+
+      # Apply tier-based multiplier to a base timeout
+      #
+      # @param base_timeout [Integer] The base timeout in seconds
+      # @param tier [String, nil] The thinking tier (mini, standard, thinking, pro, max)
+      # @return [Integer] The adjusted timeout with tier multiplier applied
+      def apply_tier_multiplier(base_timeout, tier)
+        return base_timeout unless tier
+
+        multiplier = TIER_TIMEOUT_MULTIPLIERS[tier.to_s] || 1.0
+        (base_timeout * multiplier).to_i
+      end
+
+      # Resolve a model name using the RubyLLM registry
+      #
+      # Attempts to resolve a model family name (e.g., "claude-3-5-haiku") to a
+      # versioned model name (e.g., "claude-3-5-haiku-20241022") using the RubyLLM
+      # registry. Falls back to using the name as-is if resolution fails.
+      #
+      # @param model_name [String] The model family name or versioned name
+      # @return [String] The resolved model name (versioned if found, original if not)
+      def resolve_model_name(model_name)
+        require_relative "../harness/ruby_llm_registry" unless defined?(Aidp::Harness::RubyLLMRegistry)
+
+        begin
+          registry = Aidp::Harness::RubyLLMRegistry.new
+          resolved = registry.resolve_model(model_name, provider: name)
+
+          if resolved
+            Aidp.log_debug(name, "Resolved model using registry",
+              requested: model_name,
+              resolved: resolved)
+            resolved
           else
-            nil # Return nil for unknown steps
+            # Fall back to using the name as-is
+            Aidp.log_warn(name, "Model not found in registry, using as-is",
+              model: model_name)
+            model_name
           end
+        rescue => e
+          # If registry fails, fall back to using the name as-is
+          Aidp.log_error(name, "Registry lookup failed, using model name as-is",
+            model: model_name,
+            error: e.message)
+          model_name
         end
       end
 

data/lib/aidp/providers/codex.rb

@@ -76,7 +76,7 @@ module Aidp
         end
       end
 
-      def send_message(prompt:, session: nil)
+      def send_message(prompt:, session: nil, options: {})
         raise "codex CLI not available" unless self.class.available?
 
         # Smart timeout calculation (store prompt length for adaptive logic)

data/lib/aidp/providers/cursor.rb

@@ -117,7 +117,7 @@ module Aidp
         fetch_mcp_servers_cli || fetch_mcp_servers_config
       end
 
-      def send_message(prompt:, session: nil)
+      def send_message(prompt:, session: nil, options: {})
         raise "cursor-agent not available" unless self.class.available?
 
         # Smart timeout calculation

data/lib/aidp/providers/gemini.rb

@@ -76,7 +76,7 @@ module Aidp
         "Google Gemini"
       end
 
-      def send_message(prompt:, session: nil)
+      def send_message(prompt:, session: nil, options: {})
         raise "gemini CLI not available" unless self.class.available?
 
         # Smart timeout calculation

data/lib/aidp/providers/github_copilot.rb

@@ -51,7 +51,7 @@ module Aidp
         end
       end
 
-      def send_message(prompt:, session: nil)
+      def send_message(prompt:, session: nil, options: {})
         raise "copilot CLI not available" unless self.class.available?
 
         # Smart timeout calculation

data/lib/aidp/providers/kilocode.rb

@@ -56,7 +56,7 @@ module Aidp
         "Kilocode"
       end
 
-      def send_message(prompt:, session: nil)
+      def send_message(prompt:, session: nil, options: {})
         raise "kilocode not available" unless self.class.available?
 
         # Smart timeout calculation

data/lib/aidp/providers/opencode.rb

@@ -56,7 +56,7 @@ module Aidp
         "OpenCode"
       end
 
-      def send_message(prompt:, session: nil)
+      def send_message(prompt:, session: nil, options: {})
         raise "opencode not available" unless self.class.available?
 
         # Smart timeout calculation

data/lib/aidp/setup/wizard.rb

@@ -59,9 +59,6 @@ module Aidp
         configure_modes
         configure_devcontainer
 
-        # Finalize any background model discovery
-        finalize_background_discovery
-
         yaml_content = generate_yaml
         display_preview(yaml_content)
         display_diff(yaml_content) if @existing_config.any?
@@ -355,110 +352,14 @@ module Aidp
         end
       end
 
-      # Trigger background model discovery for a provider
-      # Runs asynchronously and caches results without blocking the wizard
-      def trigger_background_discovery(provider_name)
-        return unless provider_available_for_discovery?(provider_name)
-
-        # Store reference to display notification later
-        @discovery_threads ||= []
-
-        thread = Thread.new do
-          discover_and_cache_models(provider_name)
-        rescue => e
-          Aidp.log_debug("setup_wizard", "background discovery failed",
-            provider: provider_name, error: e.message)
-        end
-
-        @discovery_threads << {thread: thread, provider: provider_name}
-      end
-
-      # Check if provider CLI is available for discovery
-      def provider_available_for_discovery?(provider_name)
-        provider_class = get_provider_class(provider_name)
-        return false unless provider_class
-
-        provider_class.respond_to?(:available?) && provider_class.available?
-      rescue => e
-        Aidp.log_debug("setup_wizard", "provider availability check failed",
-          provider: provider_name, error: e.message)
-        false
-      end
-
-      # Perform model discovery and cache results
-      def discover_and_cache_models(provider_name)
-        require_relative "../harness/model_discovery_service"
-
-        service = Aidp::Harness::ModelDiscoveryService.new
-        models = service.discover_models(provider_name, use_cache: false)
-
-        if models.any?
-          Aidp.log_info("setup_wizard", "discovered models in background",
-            provider: provider_name, count: models.size)
-        end
-
-        models
-      rescue => e
-        Aidp.log_debug("setup_wizard", "background discovery failed",
-          provider: provider_name, error: e.message)
-        []
-      end
-
-      # Get provider class for discovery
-      def get_provider_class(provider_name)
-        class_name = "Aidp::Providers::#{provider_name.capitalize}"
-        Object.const_get(class_name)
-      rescue NameError
-        nil
-      end
-
-      # Wait for background discovery to complete and show notifications
-      #
-      # @param timeout [Numeric] Maximum seconds to wait per thread (default: 5)
-      def finalize_background_discovery(timeout: 5)
-        return unless @discovery_threads&.any?
-
-        @discovery_threads.each do |entry|
-          thread = entry[:thread]
-          provider = entry[:provider]
-
-          # Wait up to timeout seconds for discovery to complete
-          thread.join(timeout)
-
-          if thread.alive?
-            Aidp.log_debug("setup_wizard", "discovery timeout, killing thread",
-              provider: provider)
-            # Kill thread to prevent hanging
-            thread.kill
-            thread.join(0.1) # Brief wait for cleanup
-          else
-            # Discovery completed - show notification
-            begin
-              require_relative "../harness/model_cache"
-              cache = Aidp::Harness::ModelCache.new
-              cached_models = cache.get_cached_models(provider)
-
-              if cached_models&.any?
-                prompt.say("  💾 Discovered #{cached_models.size} model#{"s" unless cached_models.size == 1} for #{provider}")
-              end
-            rescue => e
-              Aidp.log_debug("setup_wizard", "failed to check cached models",
-                provider: provider, error: e.message)
-            end
-          end
-        end
-
-        @discovery_threads = []
-      end
-
       def discover_models_for_providers(providers)
-        require_relative "../harness/model_discovery_service"
+        require_relative "../harness/ruby_llm_registry"
 
-        service = Aidp::Harness::ModelDiscoveryService.new
+        registry = Aidp::Harness::RubyLLMRegistry.new
         all_models = {}
 
         providers.each do |provider|
-          models = service.discover_models(provider, use_cache: true)
+          models = discover_models_from_registry(provider, registry)
           all_models[provider] = models if models.any?
         rescue => e
           Aidp.log_debug("setup_wizard", "discovery failed", provider: provider, error: e.message)
@@ -468,6 +369,30 @@ module Aidp
         all_models
       end
 
+      # Discover models for a provider from RubyLLM registry
+      #
+      # @param provider [String] Provider name (e.g., "anthropic")
+      # @param registry [RubyLLMRegistry] Registry instance
+      # @return [Array<Hash>] Models with tier classification
+      def discover_models_from_registry(provider, registry)
+        model_ids = registry.models_for_provider(provider)
+
+        # Convert to model info hashes with tier classification
+        model_ids.map do |model_id|
+          info = registry.get_model_info(model_id)
+          {
+            name: model_id,
+            tier: info[:tier],
+            context_window: info[:context_window],
+            capabilities: info[:capabilities]
+          }
+        end
+      rescue => e
+        Aidp.log_error("setup_wizard", "failed to discover models from registry",
+          provider: provider, error: e.message)
+        []
+      end
+
       def display_discovered_models(discovered_models)
         discovered_models.each do |provider, models|
           prompt.say("\n✓ Found #{models.size} models for #{provider}:")
@@ -510,13 +435,19 @@ module Aidp
       def find_model_for_tier(models, target_tier)
         return nil unless models
 
-        models.find { |m| m[:tier] == target_tier }
+        # Map pro -> advanced for registry compatibility
+        registry_tier = (target_tier == "pro") ? "advanced" : target_tier
+
+        models.find { |m| m[:tier] == registry_tier }
       end
 
       def find_models_for_tier(models, target_tier)
         return [] unless models
 
-        models.select { |m| m[:tier] == target_tier }
+        # Map pro -> advanced for registry compatibility
+        registry_tier = (target_tier == "pro") ? "advanced" : target_tier
+
+        models.select { |m| m[:tier] == registry_tier }
       end
 
       def display_provider_tier_preview(provider_configs)
@@ -1717,9 +1648,6 @@ module Aidp
         # Enhance messaging with display name when available
         display_name = discover_available_providers.invert.fetch(provider_name, provider_name)
         prompt.say("  • #{action_word.capitalize} provider '#{display_name}' (#{provider_name}) with billing type '#{provider_type}' and model family '#{model_family}'")
-
-        # Trigger background model discovery for newly added/updated provider
-        trigger_background_discovery(provider_name) unless @dry_run
       end
 
       def edit_or_remove_provider(provider_name, primary_provider, fallbacks)

data/lib/aidp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aidp
-  VERSION = "0.28.0"
+  VERSION = "0.29.0"
 end

data/lib/aidp.rb

@@ -49,6 +49,15 @@ require_relative "aidp/analyze/seams"
 require_relative "aidp/analyze/tree_sitter_scan"
 require_relative "aidp/analyze/kb_inspector"
 
+# Metadata system
+require_relative "aidp/metadata/tool_metadata"
+require_relative "aidp/metadata/validator"
+require_relative "aidp/metadata/parser"
+require_relative "aidp/metadata/scanner"
+require_relative "aidp/metadata/compiler"
+require_relative "aidp/metadata/query"
+require_relative "aidp/metadata/cache"
+
 # Workflows
 require_relative "aidp/workflows/definitions"
 require_relative "aidp/workflows/selector"
@@ -83,6 +92,8 @@ require_relative "aidp/harness/config_schema"
 require_relative "aidp/harness/config_validator"
 require_relative "aidp/harness/config_loader"
 require_relative "aidp/harness/config_manager"
+require_relative "aidp/harness/ruby_llm_registry"
+require_relative "aidp/harness/model_registry"
 require_relative "aidp/harness/condition_detector"
 require_relative "aidp/harness/user_interface"
 require_relative "aidp/harness/simple_user_interface"

data/templates/implementation/implement_features.md

@@ -23,7 +23,10 @@ You are a senior engineer writing **implementation guidance** for domain agents.
 
 ## Output
 
-- `docs/ImplementationGuide.md` with examples and a pattern-to-use-case matrix.
+- `docs/<FEATURE_NAME>_IMPLEMENTATION.md` with examples and a pattern-to-use-case matrix.
+  - Use a descriptive name based on the feature/issue (e.g., `METADATA_TOOL_DISCOVERY.md`, `WORKTREE_PR_CHANGE_REQUESTS.md`)
+  - Do NOT use generic names like `ImplementationGuide.md`, `IMPLEMENTATION_SUMMARY.md`, or `SESSION_SUMMARY.md`
+  - Do NOT create files at the project root
 
 ## Regeneration Policy
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aidp
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Bart Agapinan
@@ -219,6 +219,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: ruby_llm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 description: The AI-Dev-Pipeline (AIDP) CLI provides a powerful, markdown-driven workflow
   for software development. It supports in-depth project analysis to understand existing
   codebases and an execution mode to systematically implement new features.
@@ -269,6 +283,7 @@ files:
 - lib/aidp/cli/models_command.rb
 - lib/aidp/cli/providers_command.rb
 - lib/aidp/cli/terminal_io.rb
+- lib/aidp/cli/tools_command.rb
 - lib/aidp/concurrency.rb
 - lib/aidp/concurrency/backoff.rb
 - lib/aidp/concurrency/exec.rb
@@ -314,7 +329,6 @@ files:
 - lib/aidp/harness/filter_strategy.rb
 - lib/aidp/harness/generic_filter_strategy.rb
 - lib/aidp/harness/model_cache.rb
-- lib/aidp/harness/model_discovery_service.rb
 - lib/aidp/harness/model_registry.rb
 - lib/aidp/harness/output_filter.rb
 - lib/aidp/harness/provider_config.rb
@@ -324,6 +338,7 @@ files:
 - lib/aidp/harness/provider_metrics.rb
 - lib/aidp/harness/provider_type_checker.rb
 - lib/aidp/harness/rspec_filter_strategy.rb
+- lib/aidp/harness/ruby_llm_registry.rb
 - lib/aidp/harness/runner.rb
 - lib/aidp/harness/simple_user_interface.rb
 - lib/aidp/harness/state/errors.rb
@@ -365,6 +380,13 @@ files:
 - lib/aidp/jobs/background_runner.rb
 - lib/aidp/logger.rb
 - lib/aidp/message_display.rb
+- lib/aidp/metadata/cache.rb
+- lib/aidp/metadata/compiler.rb
+- lib/aidp/metadata/parser.rb
+- lib/aidp/metadata/query.rb
+- lib/aidp/metadata/scanner.rb
+- lib/aidp/metadata/tool_metadata.rb
+- lib/aidp/metadata/validator.rb
 - lib/aidp/planning/analyzers/feedback_analyzer.rb
 - lib/aidp/planning/builders/agile_plan_builder.rb
 - lib/aidp/planning/builders/project_plan_builder.rb