Merge branch 'feature/cw-7513' into feature/cw-7513-specs

app/jobs/automation_rules/trigger_pending_executions_job.rb

@@ -9,7 +9,7 @@ class AutomationRules::TriggerPendingExecutionsJob < ApplicationJob
     started_at = Time.current
     purged = AutomationRulePendingExecution.purge_terminal!
 
-    rows = AutomationRulePendingExecution.sweepable.order(:due_at).limit(sweep_limit).to_a
+    rows = AutomationRulePendingExecution.sweepable.for_enabled_accounts.order(:due_at).limit(sweep_limit).to_a
     rows.each { |row| AutomationRules::ProcessPendingExecutionJob.perform_later(row) }
 
     log_summary(enqueued: rows.size, capped: rows.size >= sweep_limit, purged: purged, started_at: started_at)

app/models/automation_rule_pending_execution.rb

@@ -45,6 +45,10 @@ class AutomationRulePendingExecution < ApplicationRecord
   # Non-terminal rows still bound to fire (a stale processing row is reclaimed by the sweep).
   scope :armed, -> { where(status: [statuses[:pending], statuses[:processing]]) }
 
+  # Excludes rows whose account paused delayed automations, so one disabled account's backlog
+  # can't fill the sweep limit and starve enabled accounts (paused rows resume on re-enable).
+  scope :for_enabled_accounts, -> { joins(:account).merge(Account.feature_delayed_automations) }
+
   def self.schedule(rule:, conversation:, message: nil)
     key = arm_episode_key_for(conversation, message)
     create!(