pgbus 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cba1a8a8eaf3c351cd3c42a2af74a0355fdafd2dc26727227ee667037dfb0ed9
-  data.tar.gz: 7fea4f964087fa5fcfb7381dc449344ff156d5607d49be3b855569ce5fafb12b
+  metadata.gz: 35114da580e6620d0e519cd3d7bf4340728273a2e945eb30d228464d8b8dcc2c
+  data.tar.gz: ce2d743e27e02e05b2d94a7632403670cbeb5bf305be1fab0b39823cb87ce4e2
 SHA512:
-  metadata.gz: 10b2ca7d95e05b23597578f7b91e52a76a450df4a30b80f38289048ad440153349388112a029c451d899a1118710e8d0e46c0453d1278f6c385f27b99299aa54
-  data.tar.gz: 51adda432c7ec2cf2977e62e37432982954e8da267e4687bc42303d690e3adda492bcb9663769259f29f419cc9ba0a2eb616993f8b78338725cdf6396ccaa9e2
+  metadata.gz: 6f917b1f6c754fd12b687d714653e87a8766156498c468a9708b05aa26e51d0f852de3e0b6a9445b1f02f2569d18bd28e35c76cba40adcc09b089fa4bb2b7093
+  data.tar.gz: 1f54ebbd27831d925d2b73de1ac763461d1712e965cf79f1dc20c1c6cc9a99c1955cb777072a0aeee0b6ef4c8d0423bcb063b67cd6291faf3510c4efadda8069

data/app/controllers/pgbus/dead_letter_controller.rb

@@ -46,5 +46,22 @@ module Pgbus
       count = data_source.discard_all_dlq
       redirect_to dead_letter_index_path, notice: "Discarded #{count} DLQ messages."
     end
+
+    def discard_selected
+      selections = Array(params[:messages]).reject { |s| s[:queue_name].blank? || s[:msg_id].blank? }
+      if selections.empty?
+        redirect_to dead_letter_index_path, alert: t("pgbus.dead_letter.index.none_selected")
+        return
+      end
+
+      count = 0
+      selections.each do |sel|
+        queue_name = sel[:queue_name].to_s
+        next unless queue_name.end_with?(Pgbus.configuration.dead_letter_queue_suffix)
+
+        count += 1 if data_source.discard_dlq_message(queue_name, sel[:msg_id])
+      end
+      redirect_to dead_letter_index_path, notice: t("pgbus.dead_letter.index.discarded_selected", count: count)
+    end
   end
 end

data/app/controllers/pgbus/jobs_controller.rb

@@ -49,5 +49,41 @@ module Pgbus
       count = data_source.discard_all_enqueued
       redirect_to jobs_path, notice: t("pgbus.jobs.index.discard_all_enqueued_notice", count: count)
     end
+
+    def discard_selected_failed
+      ids = Array(params[:ids]).map(&:to_i).reject(&:zero?)
+      if ids.empty?
+        redirect_to jobs_path, alert: t("pgbus.jobs.index.none_selected")
+        return
+      end
+
+      count = 0
+      ids.each do |id|
+        count += 1 if data_source.discard_failed_event(id)
+      end
+      redirect_to jobs_path, notice: t("pgbus.jobs.index.discarded_selected", count: count)
+    end
+
+    def discard_selected_enqueued
+      selections = Array(params[:messages]).filter_map do |s|
+        next unless s.respond_to?(:[])
+
+        queue_name = s[:queue_name]
+        msg_id = s[:msg_id]
+        next if queue_name.blank? || msg_id.blank?
+
+        { queue_name: queue_name, msg_id: msg_id }
+      end
+      if selections.empty?
+        redirect_to jobs_path, alert: t("pgbus.jobs.index.none_selected")
+        return
+      end
+
+      count = 0
+      selections.each do |sel|
+        count += 1 if data_source.discard_job(sel[:queue_name], sel[:msg_id])
+      end
+      redirect_to jobs_path, notice: t("pgbus.jobs.index.discarded_selected", count: count)
+    end
   end
 end

data/app/controllers/pgbus/locks_controller.rb

@@ -5,5 +5,30 @@ module Pgbus
     def index
       @locks = data_source.job_locks
     end
+
+    def discard
+      count = data_source.discard_lock(params[:id])
+      if count.positive?
+        redirect_to locks_path, notice: t("pgbus.locks.index.lock_discarded")
+      else
+        redirect_to locks_path, alert: t("pgbus.locks.index.lock_discard_failed")
+      end
+    end
+
+    def discard_selected
+      keys = Array(params[:lock_keys]).reject(&:blank?)
+      if keys.empty?
+        redirect_to locks_path, alert: t("pgbus.locks.index.none_selected")
+        return
+      end
+
+      count = data_source.discard_locks(keys)
+      redirect_to locks_path, notice: t("pgbus.locks.index.locks_discarded", count: count)
+    end
+
+    def discard_all
+      count = data_source.discard_all_locks
+      redirect_to locks_path, notice: t("pgbus.locks.index.all_locks_discarded", count: count)
+    end
   end
 end

data/app/frontend/pgbus/application.js

@@ -69,6 +69,51 @@ function renderFlashToasts() {
 renderFlashToasts();
 document.addEventListener("turbo:load", renderFlashToasts);
 
+// -- Bulk checkbox selection --
+function initBulkSelect() {
+  document.querySelectorAll("[data-bulk-select-all]").forEach(selectAll => {
+    if (selectAll.dataset.bulkInitialized === "true") return;
+    selectAll.dataset.bulkInitialized = "true";
+
+    const scope = selectAll.closest("[data-bulk-scope]") || document;
+    const checkboxes = () => scope.querySelectorAll("input[data-bulk-item]");
+    // Look for bulk-actions in the parent page container (outside the table scope)
+    const pageScope = scope.closest("[data-bulk-page]") || scope.closest("turbo-frame") || scope.parentElement?.closest("div") || document;
+    const countEl = pageScope.querySelector("[data-bulk-count]");
+    const actions = pageScope.querySelector("[data-bulk-actions]");
+
+    function updateUI() {
+      const checked = scope.querySelectorAll("input[data-bulk-item]:checked");
+      if (countEl) countEl.textContent = checked.length;
+      if (actions) actions.classList.toggle("hidden", checked.length === 0);
+
+      const all = checkboxes();
+      selectAll.checked = all.length > 0 && checked.length === all.length;
+      selectAll.indeterminate = checked.length > 0 && checked.length < all.length;
+    }
+
+    let inSelectAll = false;
+    selectAll.addEventListener("change", () => {
+      inSelectAll = true;
+      checkboxes().forEach(cb => {
+        cb.checked = selectAll.checked;
+        // Dispatch change event so inline onchange handlers fire (e.g., hidden input sync)
+        cb.dispatchEvent(new Event("change", { bubbles: false }));
+      });
+      inSelectAll = false;
+      updateUI();
+    });
+
+    scope.addEventListener("change", (e) => {
+      if (e.target.matches("input[data-bulk-item]")) updateUI();
+    });
+  });
+
+}
+initBulkSelect();
+document.addEventListener("turbo:load", initBulkSelect);
+document.addEventListener("turbo:frame-load", initBulkSelect);
+
 // -- Auto-refresh --
 const refreshInterval = parseInt(document.body?.dataset.pgbusRefreshInterval || "0", 10);
 if (refreshInterval > 0) {

data/app/models/pgbus/job_lock.rb

@@ -62,23 +62,31 @@ module Pgbus
       !result.nil?
     end
 
-    # Reap orphaned locks: locks in 'executing' state whose owner_pid
-    # has no healthy entry in pgbus_processes.
-    # Returns the number of orphaned locks released.
-    # Reap orphaned locks by matching (pid, hostname) against live process entries.
-    # A lock is orphaned if no healthy process exists with the same pid AND hostname.
+    # Reap orphaned locks whose owner is no longer alive, plus stale queued
+    # locks that were never claimed by a worker.
+    # Returns the total number of orphaned locks released.
     def self.reap_orphaned!
+      reaped = 0
+
+      # 1. Executing locks whose owner process has no healthy heartbeat
       alive_workers = ProcessEntry
                       .where("last_heartbeat_at >= ?", Time.current - Process::Heartbeat::ALIVE_THRESHOLD)
                       .pluck(:pid, :hostname)
 
-      orphaned = executing.select do |lock|
+      orphaned_executing = executing.select do |lock|
         alive_workers.none? { |pid, hostname| pid == lock.owner_pid && hostname == lock.owner_hostname }
       end
 
-      return 0 if orphaned.empty?
+      reaped += where(id: orphaned_executing.map(&:id)).delete_all if orphaned_executing.any?
+
+      # 2. Queued locks older than the visibility timeout that were never
+      #    claimed. These are left behind when enqueue fails after lock
+      #    acquisition (e.g. network error, process crash).
+      threshold = Pgbus.configuration.visibility_timeout
+      stale_queued = queued_locks.where("locked_at < ?", Time.current - threshold)
+      reaped += stale_queued.delete_all if stale_queued.exists?
 
-      where(id: orphaned.map(&:id)).delete_all
+      reaped
     end
 
     # Last-resort cleanup: delete locks whose expires_at has passed.

data/app/models/pgbus/uniqueness_key.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Pgbus
+  class UniquenessKey < BusRecord
+    self.table_name = "pgbus_uniqueness_keys"
+    self.primary_key = "lock_key"
+
+    # Atomically try to acquire a uniqueness lock via INSERT ... ON CONFLICT.
+    # PostgreSQL's unique index on lock_key guarantees at most one caller wins.
+    # Returns true if acquired (row inserted), false if already locked.
+    def self.acquire!(lock_key, queue_name:, msg_id:) # rubocop:disable Naming/PredicateMethod
+      connection.exec_query(
+        "INSERT INTO #{table_name} (lock_key, queue_name, msg_id) " \
+        "VALUES ($1, $2, $3) ON CONFLICT (lock_key) DO NOTHING RETURNING lock_key",
+        "UniquenessKey Acquire", [lock_key, queue_name, msg_id]
+      ).rows.any?
+    end
+
+    # Release a uniqueness lock after job completion or DLQ.
+    def self.release!(lock_key)
+      connection.exec_delete(
+        "DELETE FROM #{table_name} WHERE lock_key = $1",
+        "UniquenessKey Release", [lock_key]
+      )
+    end
+
+    # Check if a key is currently locked.
+    def self.locked?(lock_key)
+      result = connection.select_value(
+        "SELECT 1 FROM #{table_name} WHERE lock_key = $1 LIMIT 1",
+        "UniquenessKey Check", [lock_key]
+      )
+      !result.nil?
+    end
+  end
+end

data/app/views/pgbus/dead_letter/_messages_table.html.erb

@@ -1,8 +1,19 @@
 <turbo-frame id="dlq-messages" data-auto-refresh data-src="<%= pgbus.dead_letter_index_path(frame: 'list') %>">
-  <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">
+  <%# Bulk form outside table to avoid nested form issues %>
+  <form id="bulk-discard-dlq-form" action="<%= pgbus.discard_selected_dead_letter_index_path %>" method="post" data-turbo-frame="_top" class="hidden">
+    <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
+  </form>
+  <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700" data-bulk-scope="dlq">
     <table class="pgbus-table min-w-full divide-y divide-gray-200 dark:divide-gray-700">
       <thead class="bg-gray-50 dark:bg-gray-900">
         <tr>
+          <% if @messages.any? %>
+            <th class="w-10 px-4 py-3">
+              <input type="checkbox" data-bulk-select-all
+                     aria-label="<%= t("pgbus.helpers.bulk_select_all") %>"
+                     class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
+            </th>
+          <% end %>
           <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.dead_letter.messages_table.headers.id") %></th>
           <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.dead_letter.messages_table.headers.job_class") %></th>
           <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.dead_letter.messages_table.headers.source_queue") %></th>
@@ -16,6 +27,15 @@
           <% dlq_suffix = Pgbus.configuration.dead_letter_queue_suffix %>
           <% source_queue = m[:queue_name].to_s.delete_suffix(dlq_suffix) %>
           <tr>
+            <td class="w-10 px-4 py-3 align-top">
+              <input type="checkbox" data-bulk-item
+                     aria-label="<%= t("pgbus.helpers.bulk_select_row", id: m[:msg_id]) %>"
+                     data-queue-name="<%= m[:queue_name] %>" data-msg-id="<%= m[:msg_id] %>"
+                     class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600 mt-1"
+                     onchange="this.nextElementSibling.disabled = !this.checked; this.nextElementSibling.nextElementSibling.disabled = !this.checked">
+              <input type="hidden" name="messages[][queue_name]" value="<%= m[:queue_name] %>" form="bulk-discard-dlq-form" disabled>
+              <input type="hidden" name="messages[][msg_id]" value="<%= m[:msg_id] %>" form="bulk-discard-dlq-form" disabled>
+            </td>
             <td colspan="5" class="p-0">
               <details class="group">
                 <summary class="flex cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700/50 dark:bg-gray-900 list-none">
@@ -69,7 +89,7 @@
           </tr>
         <% end %>
         <% if @messages.empty? %>
-          <tr><td colspan="5" class="px-4 py-8 text-center text-sm text-gray-400"><%= t("pgbus.dead_letter.messages_table.empty") %></td></tr>
+          <tr><td colspan="6" class="px-4 py-8 text-center text-sm text-gray-400"><%= t("pgbus.dead_letter.messages_table.empty") %></td></tr>
         <% end %>
       </tbody>
     </table>

data/app/views/pgbus/dead_letter/index.html.erb

@@ -1,7 +1,15 @@
 <div class="flex items-center justify-between mb-6">
   <h1 class="text-2xl font-bold text-gray-900 dark:text-white"><%= t("pgbus.dead_letter.index.title") %></h1>
   <% if @messages.any? %>
-    <div class="flex space-x-2">
+    <div class="flex items-center space-x-2">
+      <div data-bulk-actions class="hidden flex items-center space-x-2">
+        <span class="text-sm text-gray-500 dark:text-gray-400"><span data-bulk-count>0</span> <%= t("pgbus.helpers.bulk_selected") %></span>
+        <button type="submit" form="bulk-discard-dlq-form"
+                class="rounded-md bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-500"
+                data-turbo-confirm="<%= t("pgbus.dead_letter.index.discard_selected_confirm") %>">
+          <%= t("pgbus.dead_letter.index.discard_selected") %>
+        </button>
+      </div>
       <%= button_to t("pgbus.dead_letter.index.retry_all"), pgbus.retry_all_dead_letter_index_path, method: :post,
             class: "rounded-md bg-indigo-600 px-3 py-2 text-sm font-medium text-white hover:bg-indigo-500",
             data: { turbo_confirm: t("pgbus.dead_letter.index.retry_all_confirm") } %>

data/app/views/pgbus/jobs/_enqueued_table.html.erb

@@ -1,17 +1,38 @@
 <turbo-frame id="jobs-enqueued" data-auto-refresh data-src="<%= pgbus.jobs_path(request.query_parameters.merge(frame: 'enqueued')) %>">
-  <div>
+  <div data-bulk-page>
     <div class="flex items-center justify-between mb-3">
       <h2 class="text-lg font-semibold text-gray-900 dark:text-white"><%= t("pgbus.jobs.enqueued_table.title") %></h2>
       <% if @jobs.any? %>
-        <%= button_to t("pgbus.jobs.enqueued_table.discard_all"), pgbus.discard_all_enqueued_jobs_path, method: :post,
-              class: "rounded-md bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-500",
-              data: { turbo_confirm: t("pgbus.jobs.enqueued_table.discard_all_confirm"), turbo_frame: "_top" } %>
+        <div class="flex items-center space-x-2">
+          <div data-bulk-actions class="hidden flex items-center space-x-2">
+            <span class="text-sm text-gray-500 dark:text-gray-400"><span data-bulk-count>0</span> <%= t("pgbus.helpers.bulk_selected") %></span>
+            <button type="submit" form="bulk-discard-enqueued-form"
+                    class="rounded-md bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-500"
+                    data-turbo-confirm="<%= t("pgbus.jobs.index.discard_selected_confirm") %>">
+              <%= t("pgbus.jobs.index.discard_selected") %>
+            </button>
+          </div>
+          <%= button_to t("pgbus.jobs.enqueued_table.discard_all"), pgbus.discard_all_enqueued_jobs_path, method: :post,
+                class: "rounded-md bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-500",
+                data: { turbo_confirm: t("pgbus.jobs.enqueued_table.discard_all_confirm"), turbo_frame: "_top" } %>
+        </div>
       <% end %>
     </div>
-    <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">
+    <%# Bulk form outside table to avoid nested form issues %>
+    <form id="bulk-discard-enqueued-form" action="<%= pgbus.discard_selected_enqueued_jobs_path %>" method="post" data-turbo-frame="_top" class="hidden">
+      <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
+    </form>
+    <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700" data-bulk-scope="enqueued">
       <table class="pgbus-table min-w-full divide-y divide-gray-200 dark:divide-gray-700">
         <thead class="bg-gray-50 dark:bg-gray-900">
           <tr>
+            <% if @jobs.any? %>
+              <th class="w-10 px-4 py-3">
+                <input type="checkbox" data-bulk-select-all
+                       aria-label="<%= t("pgbus.helpers.bulk_select_all") %>"
+                       class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
+              </th>
+            <% end %>
             <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.jobs.enqueued_table.headers.id") %></th>
             <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.jobs.enqueued_table.headers.job_class") %></th>
             <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.jobs.enqueued_table.headers.queue") %></th>
@@ -23,6 +44,15 @@
           <% @jobs.each do |j| %>
             <% payload = pgbus_parse_message(j[:message]) %>
             <tr>
+              <td class="w-10 px-4 py-3 align-top">
+                <input type="checkbox" data-bulk-item
+                       aria-label="<%= t("pgbus.helpers.bulk_select_row", id: j[:msg_id]) %>"
+                       data-queue-name="<%= j[:queue_name] %>" data-msg-id="<%= j[:msg_id] %>"
+                       class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600 mt-1"
+                       onchange="this.nextElementSibling.disabled = !this.checked; this.nextElementSibling.nextElementSibling.disabled = !this.checked">
+                <input type="hidden" name="messages[][queue_name]" value="<%= j[:queue_name] %>" form="bulk-discard-enqueued-form" disabled>
+                <input type="hidden" name="messages[][msg_id]" value="<%= j[:msg_id] %>" form="bulk-discard-enqueued-form" disabled>
+              </td>
               <td colspan="5" class="p-0">
                 <details class="group">
                   <summary class="flex cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700/50 dark:bg-gray-900 list-none">
@@ -80,7 +110,7 @@
             </tr>
           <% end %>
           <% if @jobs.empty? %>
-            <tr><td colspan="5" class="px-4 py-8 text-center text-sm text-gray-400"><%= t("pgbus.jobs.enqueued_table.empty") %></td></tr>
+            <tr><td colspan="6" class="px-4 py-8 text-center text-sm text-gray-400"><%= t("pgbus.jobs.enqueued_table.empty") %></td></tr>
           <% end %>
         </tbody>
       </table>

data/app/views/pgbus/jobs/_failed_table.html.erb

@@ -1,10 +1,35 @@
 <turbo-frame id="jobs-failed" data-auto-refresh data-src="<%= pgbus.jobs_path(frame: 'failed') %>">
-  <div class="mb-8">
-    <h2 class="text-lg font-semibold text-gray-900 dark:text-white mb-3"><%= t("pgbus.jobs.failed_table.title") %></h2>
-    <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">
+  <div class="mb-8" data-bulk-page>
+    <div class="flex items-center justify-between mb-3">
+      <h2 class="text-lg font-semibold text-gray-900 dark:text-white"><%= t("pgbus.jobs.failed_table.title") %></h2>
+      <% if @failed.any? %>
+        <div class="flex items-center space-x-2">
+          <div data-bulk-actions class="hidden flex items-center space-x-2">
+            <span class="text-sm text-gray-500 dark:text-gray-400"><span data-bulk-count>0</span> <%= t("pgbus.helpers.bulk_selected") %></span>
+            <button type="submit" form="bulk-discard-failed-form"
+                    class="rounded-md bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-500"
+                    data-turbo-confirm="<%= t("pgbus.jobs.index.discard_selected_confirm") %>">
+              <%= t("pgbus.jobs.index.discard_selected") %>
+            </button>
+          </div>
+        </div>
+      <% end %>
+    </div>
+    <%# Bulk form outside table to avoid nested form issues %>
+    <form id="bulk-discard-failed-form" action="<%= pgbus.discard_selected_failed_jobs_path %>" method="post" data-turbo-frame="_top" class="hidden">
+      <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
+    </form>
+    <div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700" data-bulk-scope="failed">
       <table class="pgbus-table min-w-full divide-y divide-gray-200 dark:divide-gray-700">
         <thead class="bg-gray-50 dark:bg-gray-900">
           <tr>
+            <% if @failed.any? %>
+              <th class="w-10 px-4 py-3">
+                <input type="checkbox" data-bulk-select-all
+                       aria-label="<%= t("pgbus.helpers.bulk_select_all") %>"
+                       class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
+              </th>
+            <% end %>
             <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.jobs.failed_table.headers.id") %></th>
             <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.jobs.failed_table.headers.queue") %></th>
             <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500"><%= t("pgbus.jobs.failed_table.headers.error") %></th>
@@ -16,6 +41,12 @@
         <tbody class="divide-y divide-gray-100 dark:divide-gray-700">
           <% @failed.each do |f| %>
             <tr class="hover:bg-gray-50 dark:hover:bg-gray-700/50 dark:bg-gray-900">
+              <td class="w-10 px-4 py-3">
+                <input type="checkbox" name="ids[]" value="<%= f["id"] %>" form="bulk-discard-failed-form"
+                       aria-label="<%= t("pgbus.helpers.bulk_select_row", id: f["id"]) %>"
+                       data-bulk-item
+                       class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
+              </td>
               <td data-label="ID" class="px-4 py-3 text-sm font-mono text-gray-900 dark:text-white">
                 <%= link_to f["id"], pgbus.job_path(f["id"]), class: "text-indigo-600 hover:text-indigo-500", data: { turbo_frame: "_top" } %>
               </td>
@@ -36,7 +67,7 @@
             </tr>
           <% end %>
           <% if @failed.empty? %>
-            <tr><td colspan="6" class="px-4 py-8 text-center text-sm text-gray-400"><%= t("pgbus.jobs.failed_table.empty") %></td></tr>
+            <tr><td colspan="7" class="px-4 py-8 text-center text-sm text-gray-400"><%= t("pgbus.jobs.failed_table.empty") %></td></tr>
           <% end %>
         </tbody>
       </table>

data/app/views/pgbus/locks/index.html.erb

@@ -1,52 +1,77 @@
-<div class="mb-6">
-  <h1 class="text-2xl font-bold text-gray-900 dark:text-white"><%= t("pgbus.locks.index.title") %></h1>
-  <p class="mt-1 text-sm text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.description") %></p>
+<div class="flex items-center justify-between mb-6">
+  <div>
+    <h1 class="text-2xl font-bold text-gray-900 dark:text-white"><%= t("pgbus.locks.index.title") %></h1>
+    <p class="mt-1 text-sm text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.description") %></p>
+  </div>
+  <% if @locks.any? %>
+    <div class="flex items-center space-x-2">
+      <div data-bulk-actions class="hidden flex items-center space-x-2">
+        <span class="text-sm text-gray-500 dark:text-gray-400"><span data-bulk-count>0</span> <%= t("pgbus.helpers.bulk_selected") %></span>
+        <button type="submit" form="bulk-discard-locks-form"
+                class="rounded-md bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-500"
+                data-turbo-confirm="<%= t("pgbus.locks.index.discard_selected_confirm") %>">
+          <%= t("pgbus.locks.index.discard_selected") %>
+        </button>
+      </div>
+      <%= button_to t("pgbus.locks.index.discard_all"), pgbus.discard_all_locks_path, method: :post,
+            class: "rounded-md bg-red-600 px-3 py-2 text-sm font-medium text-white hover:bg-red-500",
+            data: { turbo_confirm: t("pgbus.locks.index.discard_all_confirm") } %>
+    </div>
+  <% end %>
 </div>
 
-<div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700">
+<%# Bulk form lives outside the table to avoid nested form issues with button_to %>
+<form id="bulk-discard-locks-form" action="<%= pgbus.discard_selected_locks_path %>" method="post" data-turbo-frame="_top" class="hidden">
+  <%= hidden_field_tag :authenticity_token, form_authenticity_token %>
+</form>
+
+<div class="overflow-hidden rounded-lg bg-white dark:bg-gray-800 shadow ring-1 ring-gray-200 dark:ring-gray-700" data-bulk-scope="locks">
   <table class="pgbus-table min-w-full divide-y divide-gray-200 dark:divide-gray-700">
     <thead class="bg-gray-50 dark:bg-gray-900">
       <tr>
+        <% if @locks.any? %>
+          <th class="w-10 px-4 py-3">
+            <input type="checkbox" data-bulk-select-all
+                   aria-label="<%= t("pgbus.helpers.bulk_select_all") %>"
+                   class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
+          </th>
+        <% end %>
         <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.headers.lock_key") %></th>
-        <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.headers.job_class") %></th>
-        <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.headers.state") %></th>
-        <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.headers.owner") %></th>
+        <th class="px-4 py-3 text-left text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.headers.queue_name", default: "Queue") %></th>
+        <th class="px-4 py-3 text-right text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.headers.msg_id", default: "Message ID") %></th>
         <th class="px-4 py-3 text-right text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.headers.age") %></th>
-        <th class="px-4 py-3 text-right text-xs font-medium uppercase text-gray-500 dark:text-gray-400"><%= t("pgbus.locks.index.headers.expires") %></th>
+        <% if @locks.any? %>
+          <th class="px-4 py-3 text-right text-xs font-medium uppercase text-gray-500 dark:text-gray-400"></th>
+        <% end %>
       </tr>
     </thead>
     <tbody class="divide-y divide-gray-100 dark:divide-gray-700">
       <% @locks.each do |lock| %>
         <tr class="hover:bg-gray-50 dark:hover:bg-gray-700/50">
-          <td data-label="Lock Key" class="px-4 py-3 text-sm font-mono text-gray-700 dark:text-gray-300 max-w-xs truncate"><%= lock[:lock_key] %></td>
-          <td data-label="Job Class" class="px-4 py-3 text-sm text-gray-700 dark:text-gray-300"><%= lock[:job_class] %></td>
-          <td data-label="State" class="px-4 py-3 text-sm">
-            <% if lock[:state] == "executing" %>
-              <span class="inline-flex items-center rounded-full bg-blue-100 dark:bg-blue-900/50 px-2.5 py-0.5 text-xs font-medium text-blue-800 dark:text-blue-300"><%= t("pgbus.locks.index.executing") %></span>
-            <% else %>
-              <span class="inline-flex items-center rounded-full bg-yellow-100 dark:bg-yellow-900/50 px-2.5 py-0.5 text-xs font-medium text-yellow-800 dark:text-yellow-300"><%= t("pgbus.locks.index.queued") %></span>
-            <% end %>
-          </td>
-          <td data-label="Owner" class="px-4 py-3 text-sm text-gray-500 dark:text-gray-400">
-            <% if lock[:owner_pid] %>
-              <span class="font-mono"><%= lock[:owner_pid] %></span>
-              <% if lock[:owner_hostname] %>
-                <span class="text-xs text-gray-400 dark:text-gray-500">@<%= lock[:owner_hostname] %></span>
-              <% end %>
-            <% else %>
-              <span class="text-gray-400 dark:text-gray-500">—</span>
-            <% end %>
+          <td class="w-10 px-4 py-3">
+            <input type="checkbox" name="lock_keys[]" value="<%= lock[:lock_key] %>"
+                   aria-label="<%= t("pgbus.helpers.bulk_select_row", id: lock[:lock_key]) %>"
+                   form="bulk-discard-locks-form" data-bulk-item
+                   class="h-4 w-4 rounded border-gray-300 text-indigo-600 focus:ring-indigo-600">
           </td>
+          <td data-label="Lock Key" class="px-4 py-3 text-sm font-mono text-gray-700 dark:text-gray-300 max-w-xs truncate"><%= lock[:lock_key] %></td>
+          <td data-label="Queue" class="px-4 py-3 text-sm text-gray-700 dark:text-gray-300"><%= lock[:queue_name] %></td>
+          <td data-label="Message ID" class="px-4 py-3 text-sm text-right font-mono text-gray-500 dark:text-gray-400"><%= lock[:msg_id] %></td>
           <td data-label="Age" class="px-4 py-3 text-sm text-right text-gray-500 dark:text-gray-400">
             <% if lock[:age_seconds] %>
               <%= pgbus_duration(lock[:age_seconds]) %>
             <% end %>
           </td>
-          <td data-label="Expires" class="px-4 py-3 text-sm text-right text-gray-500 dark:text-gray-400"><%= pgbus_time_ago_future(lock[:expires_at]) %></td>
+          <td class="px-4 py-3 text-sm text-right">
+            <%= button_to t("pgbus.locks.index.discard"), pgbus.discard_lock_path(lock[:lock_key]),
+                  method: :post,
+                  class: "text-xs text-red-600 hover:text-red-800 font-medium",
+                  data: { turbo_confirm: t("pgbus.locks.index.discard_confirm"), turbo_frame: "_top" } %>
+          </td>
         </tr>
       <% end %>
       <% if @locks.empty? %>
-        <tr><td colspan="6" class="px-4 py-8 text-center text-sm text-gray-400 dark:text-gray-500"><%= t("pgbus.locks.index.empty") %></td></tr>
+        <tr><td colspan="5" class="px-4 py-8 text-center text-sm text-gray-400 dark:text-gray-500"><%= t("pgbus.locks.index.empty") %></td></tr>
       <% end %>
     </tbody>
   </table>

data/config/locales/da.yml

@@ -239,16 +239,12 @@ da:
       index:
         description: Aktive unikke låse forhindrer duplikeret jobudførelse
         empty: Ingen aktive låse
-        executing: Udfører
         headers:
           age: Alder
-          expires: Udløber
-          job_class: Jobklasse
           lock_key: Låsenøgle
-          owner: Ejer
-          state: Status
-        queued: I kø
-        title: Joblåse
+          msg_id: Besked-ID
+          queue_name: Kø
+        title: Unikhedsnøgler
     outbox:
       index:
         description: Transaktionelle udbakke-poster, der venter på publicering til PGMQ

data/config/locales/de.yml

@@ -239,16 +239,12 @@ de:
       index:
         description: Aktive Einzigartigkeitssperren verhindern doppelte Auftragserstellung
         empty: Keine aktiven Sperren
-        executing: Ausführen
         headers:
           age: Alter
-          expires: Läuft ab
-          job_class: Auftragsklasse
           lock_key: Sperrschlüssel
-          owner: Besitzer
-          state: Status
-        queued: In Warteschlange
-        title: Auftragssperren
+          msg_id: Nachrichten-ID
+          queue_name: Warteschlange
+        title: Eindeutigkeitsschlüssel
     outbox:
       index:
         description: Transaktionale Postausgangseinträge ausstehend zur Veröffentlichung an PGMQ