Merge pull request activerabbit-ai#109 from Zoncovsky/feature/update-pr-description-by-ai

Enhance PR content generation and code fix application

Author: alexshapalov

app/jobs/quota_alert_job.rb

@@ -121,6 +121,10 @@ def send_appropriate_alert(account, resource_type, level, last_alert_info)
         # First time exceeding
         QuotaAlertMailer.quota_exceeded(account, resource_type).deliver_now
         Rails.logger.info "[QuotaAlert] Sent exceeded alert for #{account.name} - #{resource_type}"
+
+        # Track when first exceeded - initialize hash if needed
+        account.last_quota_alert_sent_at[resource_type.to_s] ||= {}
+        account.last_quota_alert_sent_at[resource_type.to_s]["first_exceeded_at"] = Time.current.iso8601
       elsif is_free_plan
         # Free plan: send upgrade reminder every 2 days
         QuotaAlertMailer.free_plan_upgrade_reminder(account, resource_type, days_over_quota).deliver_now

app/services/github/pr_content_generator.rb

@@ -264,7 +264,7 @@ def build_enhanced_pr_body(issue, sample_event, parsed)
       # Header with issue link
       lines << "## 🐛 Bug Fix: #{issue.exception_class}"
       lines << ""
-      lines << "**Issue ID:** ##{issue.id}"
+      lines << "**Issue ID:** [##{issue.id}](#{error_url(issue)})"
       lines << "**Controller:** `#{issue.controller_action}`"
       lines << "**Occurrences:** #{issue.count} times"
       lines << "**First seen:** #{issue.first_seen_at&.strftime('%Y-%m-%d %H:%M')}"
@@ -354,7 +354,7 @@ def build_basic_pr_body(issue, sample_event)
 
       lines << "## 🐛 Bug Fix: #{issue.exception_class}"
       lines << ""
-      lines << "**Issue ID:** ##{issue.id}"
+      lines << "**Issue ID:** [##{issue.id}](#{error_url(issue)})"
       lines << "**Controller:** `#{issue.controller_action}`"
       lines << ""
 
@@ -512,5 +512,10 @@ def validate_method_structure(code)
 
       has_def && has_end && def_count <= end_count
     end
+
+    def error_url(issue)
+      host = Rails.env.development? ? "http://localhost:3000" : ENV.fetch("APP_HOST", "https://activerabbit.com")
+      "#{host}/#{issue.project.slug}/errors/#{issue.id}"
+    end
   end
 end

app/services/github/simple_code_fix_applier.rb

@@ -120,18 +120,18 @@ def try_apply_fix_to_file(owner, repo, file_path, before_code, after_code)
       # Try direct replacement if before_code is provided
       if before_code.present?
         direct_result = try_direct_replacement(current_content, before_code, after_code, 1)
-        if direct_result && direct_result["replacements"].present?
+        if direct_result && direct_result[:replacements].present?
           Rails.logger.info "[SimpleFixApplier] Direct replacement succeeded for #{normalized_path}"
 
           # Apply the replacements
           lines = current_content.lines
-          direct_result["replacements"].sort_by { |r| -r["line"] }.each do |replacement|
-            line_idx = replacement["line"] - 1
+          direct_result[:replacements].sort_by { |r| -r[:line] }.each do |replacement|
+            line_idx = replacement[:line] - 1
             next if line_idx < 0 || line_idx >= lines.size
 
             original_indent = lines[line_idx].match(/^(\s*)/)[1]
             line_ending = lines[line_idx].end_with?("\n") ? "\n" : ""
-            new_stripped = replacement["new"].strip
+            new_stripped = replacement[:new].strip
             lines[line_idx] = "#{original_indent}#{new_stripped}#{line_ending}"
           end
           new_content = lines.join
@@ -387,11 +387,15 @@ def try_direct_replacement(file_content, before_code, after_code, error_line)
         # Preserve original indentation from file
         original_indent = lines[match_start + idx]&.match(/^(\s*)/)&.[](1) || ""
         new_content = original_indent + new_line.lstrip
+        old_content = lines[match_start + idx]&.chomp || old_line
+
+        # Only include replacement if old != new (skip unchanged lines)
+        next if old_content.strip == new_content.strip
 
         replacements << {
-          "line" => line_num,
-          "old" => lines[match_start + idx]&.chomp || old_line,
-          "new" => new_content.chomp
+          line: line_num,
+          old: old_content,
+          new: new_content.chomp
         }
       end
 
@@ -402,14 +406,16 @@ def try_direct_replacement(file_content, before_code, after_code, error_line)
           insert_after = match_start + before_lines.size + idx
           original_indent = lines[match_start]&.match(/^(\s*)/)&.[](1) || ""
           insertions << {
-            "after_line" => insert_after,
-            "content" => original_indent + new_line.lstrip.chomp
+            after_line: insert_after,
+            content: original_indent + new_line.lstrip.chomp
           }
         end
-        return { "replacements" => replacements, "insertions" => insertions } if insertions.any?
+        return { replacements: replacements, insertions: insertions } if insertions.any?
       end
 
-      { "replacements" => replacements }
+      return nil if replacements.empty?
+
+      { replacements: replacements }
     rescue => e
       Rails.logger.warn "[SimpleFixApplier] Direct replacement failed: #{e.message}"
       nil
@@ -609,9 +615,9 @@ def apply_line_replacements(lines, fix_instructions)
 
       # First, apply insertions (in reverse order to maintain line numbers)
       if fix_instructions[:insertions].present?
-        fix_instructions[:insertions].sort_by { |i| -i["after_line"] }.each do |insertion|
-          after_idx = insertion["after_line"] # 1-indexed, insert after this line
-          content = insertion["content"]
+        fix_instructions[:insertions].sort_by { |i| -(i[:after_line] || i["after_line"]) }.each do |insertion|
+          after_idx = insertion[:after_line] || insertion["after_line"] # 1-indexed, insert after this line
+          content = insertion[:content] || insertion["content"]
 
           next if after_idx < 0 || after_idx > new_lines.size
 
@@ -643,10 +649,11 @@ def apply_line_replacements(lines, fix_instructions)
       end
 
       # Then, apply replacements
-      (fix_instructions[:replacements] || []).sort_by { |r| -r["line"] }.each do |replacement|
-        line_idx = replacement["line"] - 1
-        old_content = replacement["old"]
-        new_content = replacement["new"]
+      (fix_instructions[:replacements] || []).sort_by { |r| -(r[:line] || r["line"]) }.each do |replacement|
+        line_num = replacement[:line] || replacement["line"]
+        line_idx = line_num - 1
+        old_content = replacement[:old] || replacement["old"]
+        new_content = replacement[:new] || replacement["new"]
 
         next if line_idx < 0 || line_idx >= new_lines.size
 
@@ -668,9 +675,9 @@ def apply_line_replacements(lines, fix_instructions)
           end
 
           changes_made += 1
-          Rails.logger.info "[SimpleFixApplier] Replaced line #{replacement['line']}: #{old_content.strip[0..50]} -> #{new_stripped[0..50]}"
+          Rails.logger.info "[SimpleFixApplier] Replaced line #{line_num}: #{old_content.strip[0..50]} -> #{new_stripped[0..50]}"
         else
-          Rails.logger.warn "[SimpleFixApplier] Line #{replacement['line']} mismatch:"
+          Rails.logger.warn "[SimpleFixApplier] Line #{line_num} mismatch:"
           Rails.logger.warn "  Expected: #{old_content.inspect}"
           Rails.logger.warn "  Actual:   #{current_line.inspect}"
 
@@ -681,7 +688,7 @@ def apply_line_replacements(lines, fix_instructions)
             line_ending = current_line.end_with?("\n") ? "\n" : ""
             new_lines[line_idx] = "#{original_indent}#{new_stripped}#{line_ending}"
             changes_made += 1
-            Rails.logger.info "[SimpleFixApplier] Fuzzy match succeeded for line #{replacement['line']}"
+            Rails.logger.info "[SimpleFixApplier] Fuzzy match succeeded for line #{line_num}"
           end
         end
       end

app/services/github/token_manager.rb

@@ -14,7 +14,8 @@ def initialize(project_pat:, installation_id:, env_pat:, project_app_id:, projec
     end
 
     def get_token
-      @project_pat.presence || generate_installation_token || @env_pat
+      # Prefer installation token (GitHub App) for PR authorship, fallback to PAT
+      generate_installation_token || @project_pat.presence || @env_pat
     end
 
     def configured?

app/services/issues/fingerprint_recomputer.rb

@@ -15,6 +15,9 @@ class FingerprintRecomputer
     def initialize(dry_run: true)
       @dry_run = dry_run
       @stats = { processed: 0, merged: 0, updated: 0, unchanged: 0, errors: 0 }
+      # Track virtual fingerprint changes for dry run mode
+      # Key: [project_id, new_fingerprint] => issue_id that "owns" this fingerprint
+      @virtual_fingerprints = {}
     end
 
     def call
@@ -53,9 +56,8 @@ def process_issue(issue)
       end
 
       # Check if there's already an issue with the new fingerprint in the same project
-      existing = Issue.where(project_id: issue.project_id, fingerprint: new_fingerprint)
-                      .where.not(id: issue.id)
-                      .first
+      # In dry run mode, also check virtual fingerprints
+      existing = find_existing_issue(issue.project_id, new_fingerprint, issue.id)
 
       if existing
         merge_issues(issue, existing)
@@ -64,6 +66,25 @@ def process_issue(issue)
       end
     end
 
+    def find_existing_issue(project_id, new_fingerprint, current_issue_id)
+      # First check actual database
+      existing = Issue.where(project_id: project_id, fingerprint: new_fingerprint)
+                      .where.not(id: current_issue_id)
+                      .first
+      return existing if existing
+
+      # In dry run mode, also check virtual fingerprints
+      if dry_run
+        virtual_key = [project_id, new_fingerprint]
+        virtual_owner_id = @virtual_fingerprints[virtual_key]
+        if virtual_owner_id && virtual_owner_id != current_issue_id
+          return Issue.find_by(id: virtual_owner_id)
+        end
+      end
+
+      nil
+    end
+
     def merge_issues(source_issue, target_issue)
       action = dry_run ? "[DRY RUN] Would merge" : "Merging"
       puts "  #{action} issue ##{source_issue.id} into ##{target_issue.id}"
@@ -98,7 +119,10 @@ def update_fingerprint(issue, new_fingerprint)
       puts "    Old fingerprint: #{issue.fingerprint[0..16]}..."
       puts "    New fingerprint: #{new_fingerprint[0..16]}..."
 
-      unless dry_run
+      if dry_run
+        # Track virtual fingerprint for detecting merges in dry run mode
+        @virtual_fingerprints[[issue.project_id, new_fingerprint]] = issue.id
+      else
         issue.update_column(:fingerprint, new_fingerprint)
       end
 

config/environments/development.rb

@@ -100,4 +100,5 @@
   config.hosts << "127.0.0.1"
   config.hosts << "host.docker.internal"
   config.hosts << "host.docker.internal:3000"
+  config.hosts << "160ec4227c78.ngrok-free.app"
 end

spec/factories/users.rb

@@ -32,6 +32,10 @@
       provider { "github" }
       uid { SecureRandom.hex(10) }
       confirmed_at { nil } # OAuth users don't need confirmed_at
+
+      after(:build) do |user|
+        user.skip_confirmation_notification!
+      end
     end
   end
 end

spec/integration/email_delivery_spec.rb

@@ -6,6 +6,12 @@
   # These tests verify that emails are actually queued for delivery,
   # not just that the mailer methods return mail objects.
 
+  before do
+    # Ensure we use the :test delivery method so emails are captured in deliveries array
+    ActionMailer::Base.delivery_method = :test
+    ActionMailer::Base.deliveries.clear
+  end
+
   describe "QuotaAlertJob email delivery" do
     let(:account) do
       create(:account, :free_plan,

spec/jobs/alert_job_spec.rb

@@ -35,6 +35,10 @@
         "channels" => { "email" => true }
       }
     })
+
+    # Stub Resend API for email delivery
+    stub_request(:post, "https://api.resend.com/emails")
+      .to_return(status: 200, body: '{"id": "test-email-id"}', headers: { 'Content-Type' => 'application/json' })
   end
 
   describe "#perform" do

spec/jobs/quota_alert_job_spec.rb

@@ -10,6 +10,12 @@
   let(:account) { create(:account, :with_stats) }
   let!(:user) { create(:user, :confirmed, account: account) }
 
+  before do
+    # Stub Resend API for email delivery
+    stub_request(:post, "https://api.resend.com/emails")
+      .to_return(status: 200, body: '{"id": "test-email-id"}', headers: { 'Content-Type' => 'application/json' })
+  end
+
   describe "#perform" do
     it "checks quotas for all accounts" do
       create(:account, :with_stats)