aidp 0.31.0 → 0.33.0

data/lib/aidp/watch/repository_client.rb

@@ -120,6 +120,47 @@ module Aidp
         gh_available? ? fetch_pr_comments_via_gh(number) : fetch_pr_comments_via_api(number)
       end
 
+      # Create or update a categorized comment (e.g., under a header) on an issue.
+      # If a comment with the category header exists, either append to it or
+      # replace it while archiving the previous content inline.
+      def consolidate_category_comment(issue_number, category_header, content, append: false)
+        existing_comment = find_comment(issue_number, category_header)
+
+        if existing_comment.nil?
+          Aidp.log_debug("repository_client", "creating_category_comment",
+            issue: issue_number,
+            header: category_header)
+          return post_comment(issue_number, "#{category_header}\n\n#{content}")
+        end
+
+        existing_body = existing_comment[:body] || existing_comment["body"] || ""
+        content_without_header = existing_body.sub(/\A#{Regexp.escape(category_header)}\s*/, "").strip
+
+        new_body =
+          if append
+            Aidp.log_debug("repository_client", "appending_category_comment",
+              issue: issue_number,
+              header: category_header)
+            segments = [category_header, content_without_header, content].reject(&:empty?)
+            segments.join("\n\n")
+          else
+            Aidp.log_debug("repository_client", "replacing_category_comment",
+              issue: issue_number,
+              header: category_header)
+            timestamp = Time.now.utc.iso8601
+            archive_marker = "<!-- ARCHIVED_PLAN_START #{timestamp} ARCHIVED_PLAN_END -->"
+            [category_header, content, archive_marker, content_without_header].join("\n\n")
+          end
+
+        update_comment(existing_comment[:id] || existing_comment["id"], new_body)
+      rescue => e
+        Aidp.log_error("repository_client", "consolidate_category_comment_failed",
+          issue: issue_number,
+          header: category_header,
+          error: e.message)
+        raise "GitHub error: #{e.message}"
+      end
+
       private
 
       # Retry a GitHub CLI operation with exponential backoff

data/lib/aidp/watch/runner.rb

@@ -2,21 +2,6 @@
 
 require "tty-prompt"
 
-require_relative "../message_display"
-require_relative "repository_client"
-require_relative "repository_safety_checker"
-require_relative "state_store"
-require_relative "github_state_extractor"
-require_relative "plan_generator"
-require_relative "plan_processor"
-require_relative "build_processor"
-require_relative "../auto_update"
-require_relative "review_processor"
-require_relative "ci_fix_processor"
-require_relative "change_request_processor"
-require_relative "auto_processor"
-require_relative "auto_pr_processor"
-
 module Aidp
   module Watch
     # Coordinates the watch mode loop: monitors issues, handles plan/build
@@ -522,14 +507,21 @@ module Aidp
         return unless @auto_update_coordinator.policy.enabled
         return unless time_for_update_check?
 
+        @last_update_check = Time.now
         update_check = @auto_update_coordinator.check_for_update
 
         if update_check.should_update?
           display_message("🔄 Update available: #{update_check.current_version} → #{update_check.available_version}", type: :highlight)
-          display_message("   Saving checkpoint and initiating update...", type: :muted)
 
-          initiate_update(update_check)
-          # Never returns - exits with code 75
+          # Prefer hot reloading if available (Zeitwerk enabled with reloading)
+          if @auto_update_coordinator.hot_reload_available?
+            perform_hot_reload(update_check)
+          else
+            # Fall back to checkpoint + exit approach
+            display_message("   Saving checkpoint and initiating update...", type: :muted)
+            initiate_update(update_check)
+            # Never returns - exits with code 75
+          end
         end
       rescue Aidp::AutoUpdate::UpdateLoopError => e
         # Restart loop detected - disable auto-update
@@ -540,6 +532,25 @@ module Aidp
         Aidp.log_error("watch_runner", "update_check_failed", error: e.message)
       end
 
+      # Perform hot code reload without restarting
+      # @param update_check [Aidp::AutoUpdate::UpdateCheck] Update check result
+      def perform_hot_reload(update_check)
+        display_message("   Performing hot code reload (no restart needed)...", type: :muted)
+
+        if @auto_update_coordinator.hot_reload_update(update_check)
+          display_message("✨ Hot reload complete! Now running #{Aidp::VERSION}", type: :success)
+          Aidp.log_info("watch_runner", "hot_reload_success",
+            version: Aidp::VERSION)
+        else
+          display_message("⚠️  Hot reload skipped (no update needed)", type: :muted)
+        end
+      rescue Aidp::AutoUpdate::UpdateError => e
+        display_message("⚠️  Hot reload failed: #{e.message}", type: :warning)
+        display_message("   Falling back to checkpoint + restart...", type: :muted)
+        # Fall back to cold restart
+        initiate_update(update_check)
+      end
+
       # Determine if it's time to check for updates
       # @return [Boolean]
       def time_for_update_check?

data/lib/aidp/watch.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "message_display"
-require_relative "watch/repository_client"
-require_relative "watch/state_store"
-require_relative "watch/plan_generator"
-require_relative "watch/plan_processor"
-require_relative "watch/build_processor"
-require_relative "watch/runner"
+module Aidp
+  # Watch mode functionality for monitoring GitHub issues and PRs
+  module Watch
+  end
+end

data/lib/aidp/workstream_cleanup.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "worktree"
-require_relative "workstream_state"
 require "open3"
 require "tty-prompt"
 

data/lib/aidp/workstream_executor.rb

@@ -2,10 +2,6 @@
 
 require "concurrent-ruby"
 require "time"
-require_relative "worktree"
-require_relative "workstream_state"
-require_relative "harness/runner"
-require_relative "message_display"
 
 module Aidp
   # Executes multiple workstreams in parallel using concurrent-ruby.

data/lib/aidp/worktree.rb

@@ -3,7 +3,6 @@
 require "fileutils"
 require "json"
 require "open3"
-require_relative "workstream_state"
 
 module Aidp
   # Manages git worktree operations for parallel workstreams.

data/lib/aidp/worktree_branch_manager.rb

@@ -12,6 +12,7 @@ module Aidp
       @project_dir = project_dir
       @logger = logger
       @worktree_registry_path = File.join(project_dir, ".aidp", "worktrees.json")
+      @pr_worktree_registry_path = File.join(project_dir, ".aidp", "pr_worktrees.json")
     end
 
     # Find an existing worktree for a given branch or PR
@@ -20,7 +21,7 @@ module Aidp
 
       raise WorktreeLookupError, "Invalid git repository: #{@project_dir}" unless git_repository?
 
-      # Check registry first
+      # First, check registry first for exact branch match
       worktree_info = read_registry.find { |w| w["branch"] == branch }
 
       if worktree_info
@@ -42,6 +43,38 @@ module Aidp
       raise
     end
 
+    # Find or create a worktree for a PR, with advanced lookup strategies
+    def find_or_create_pr_worktree(pr_number:, head_branch:, base_branch: "main")
+      Aidp.log_debug("worktree_branch_manager", "finding_or_creating_pr_worktree",
+        pr_number: pr_number, head_branch: head_branch, base_branch: base_branch)
+
+      # First, check the PR-specific registry
+      pr_registry = read_pr_registry
+      pr_worktree = pr_registry.find { |w| w["pr_number"] == pr_number }
+
+      # If a valid worktree exists in the registry, return it
+      if pr_worktree
+        worktree_path = pr_worktree["path"]
+        return worktree_path if File.directory?(worktree_path)
+      end
+
+      # Attempt to find worktree by branch name
+      existing_worktree = find_worktree(branch: head_branch)
+      return existing_worktree if existing_worktree
+
+      # If no existing worktree, create a new one
+      worktree_path = create_worktree(branch: head_branch, base_branch: base_branch)
+
+      # Update PR-specific registry
+      update_pr_registry(pr_number, head_branch, worktree_path, base_branch)
+
+      worktree_path
+    rescue => e
+      Aidp.log_error("worktree_branch_manager", "pr_worktree_creation_failed",
+        error: e.message, pr_number: pr_number, head_branch: head_branch)
+      raise
+    end
+
     # Create a new worktree for a branch
     def create_worktree(branch:, base_branch: "main")
       Aidp.log_debug("worktree_branch_manager", "creating_worktree",
@@ -123,6 +156,19 @@ module Aidp
       end
     end
 
+    # Read the PR-specific worktree registry
+    def read_pr_registry
+      return [] unless File.exist?(@pr_worktree_registry_path)
+
+      begin
+        JSON.parse(File.read(@pr_worktree_registry_path))
+      rescue JSON::ParserError
+        Aidp.log_warn("worktree_branch_manager", "invalid_pr_registry",
+          path: @pr_worktree_registry_path)
+        []
+      end
+    end
+
     # Update the worktree registry
     def update_registry(branch, path)
       # Ensure .aidp directory exists
@@ -143,5 +189,28 @@ module Aidp
       # Write updated registry
       File.write(@worktree_registry_path, JSON.pretty_generate(registry))
     end
+
+    # Update the PR-specific worktree registry
+    def update_pr_registry(pr_number, head_branch, worktree_path, base_branch)
+      # Ensure .aidp directory exists
+      FileUtils.mkdir_p(File.dirname(@pr_worktree_registry_path))
+
+      registry = read_pr_registry
+
+      # Remove existing entries for the same PR
+      registry.reject! { |w| w["pr_number"] == pr_number }
+
+      # Add new entry
+      registry << {
+        "pr_number" => pr_number,
+        "head_branch" => head_branch,
+        "base_branch" => base_branch,
+        "path" => worktree_path,
+        "created_at" => Time.now.to_i
+      }
+
+      # Write updated registry
+      File.write(@pr_worktree_registry_path, JSON.pretty_generate(registry))
+    end
   end
 end

data/lib/aidp.rb

@@ -1,115 +1,30 @@
 # frozen_string_literal: true
 
-# Core extensions
-require_relative "aidp/core_ext/class_attribute"
+# Bootstrap: Load essential files before Zeitwerk
+# These files must be loaded first and are excluded from autoloading:
+# - version.rb: Needed for version checks during load
+# - core_ext: Ruby core extensions that need to be available globally
+# - logger.rb: Logging infrastructure used throughout loading
 
-# Shared modules
 require_relative "aidp/version"
-require_relative "aidp/config"
-require_relative "aidp/util"
-require_relative "aidp/rescue_logging"
-require_relative "aidp/message_display"
-require_relative "aidp/concurrency"
-require_relative "aidp/setup/wizard"
-require_relative "aidp/init"
-require_relative "aidp/watch"
-require_relative "aidp/cli"
-
-# Jobs and background execution
-require_relative "aidp/jobs/background_runner"
-
-# CLI commands
-require_relative "aidp/cli/jobs_command"
-
-# Providers
-require_relative "aidp/providers/base"
-require_relative "aidp/providers/cursor"
-require_relative "aidp/providers/anthropic"
-require_relative "aidp/providers/gemini"
-require_relative "aidp/providers/kilocode"
-# Supervised providers removed - using direct execution model
-require_relative "aidp/provider_manager"
-
-# Simple file-based storage
-require_relative "aidp/storage/json_storage"
-require_relative "aidp/storage/csv_storage"
-require_relative "aidp/storage/file_manager"
-
-# Analyze mode (simplified - file-based storage only)
-require_relative "aidp/analyze/json_file_storage"
-require_relative "aidp/analyze/error_handler"
-require_relative "aidp/analyze/ruby_maat_integration"
-require_relative "aidp/analyze/runner"
-require_relative "aidp/analyze/steps"
-require_relative "aidp/analyze/progress"
-
-# Tree-sitter analysis
-require_relative "aidp/analyze/tree_sitter_grammar_loader"
-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"
-
-# Execute mode
-require_relative "aidp/execute/steps"
-require_relative "aidp/execute/runner"
-require_relative "aidp/execute/progress"
-require_relative "aidp/execute/checkpoint"
-require_relative "aidp/execute/checkpoint_display"
-require_relative "aidp/execute/work_loop_state"
-require_relative "aidp/execute/instruction_queue"
-require_relative "aidp/execute/persistent_tasklist"
-require_relative "aidp/execute/async_work_loop_runner"
-require_relative "aidp/execute/interactive_repl"
-
-# Logging
+require_relative "aidp/core_ext/class_attribute"
 require_relative "aidp/logger"
 
-# Daemon mode
-require_relative "aidp/daemon/process_manager"
-require_relative "aidp/daemon/runner"
-
-# Workstream/worktree management
-require_relative "aidp/worktree"
-require_relative "aidp/workstream_state"
-require_relative "aidp/workstream_executor"
+# Now set up Zeitwerk autoloader for the rest of the codebase
+require_relative "aidp/loader"
 
-# Harness mode
-require_relative "aidp/harness/configuration"
-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"
-require_relative "aidp/harness/provider_manager"
-require_relative "aidp/harness/provider_config"
-require_relative "aidp/harness/provider_factory"
-require_relative "aidp/harness/state_manager"
-require_relative "aidp/harness/error_handler"
-require_relative "aidp/harness/status_display"
-require_relative "aidp/harness/runner"
-require_relative "aidp/harness/filter_strategy"
-require_relative "aidp/harness/generic_filter_strategy"
-require_relative "aidp/harness/rspec_filter_strategy"
-require_relative "aidp/harness/output_filter"
+# Configure Zeitwerk based on environment
+# In watch mode or development, enable reloading for hot code updates
+# In production, disable reloading and eager load for performance
+reloading_enabled = ENV["AIDP_ENABLE_RELOADING"] == "1" ||
+  ENV["AIDP_WATCH_MODE"] == "1"
 
-# UI components
-require_relative "aidp/harness/ui/spinner_helper"
+Aidp::Loader.setup(
+  enable_reloading: reloading_enabled,
+  eager_load: !reloading_enabled && ENV["AIDP_EAGER_LOAD"] == "1"
+)
 
-# CLI commands
+# Manually require files that contain multiple constants (not autoloadable by Zeitwerk)
+require_relative "aidp/errors"
+require_relative "aidp/auto_update/errors"
+require_relative "aidp/harness/state/errors"