4 files changed, 87 insertions, 4 deletions
diff --git a/Biz/PodcastItLater/Admin.py b/Biz/PodcastItLater/Admin.py
index 10a8e58..6faf7fb 100644
--- a/Biz/PodcastItLater/Admin.py
+++ b/Biz/PodcastItLater/Admin.py
@@ -795,7 +795,7 @@ def admin_queue_status(request: Request) -> AdminView | Response | html.div:
 def retry_queue_item(request: Request, job_id: int) -> Response:
     """Retry a failed queue item."""
     try:
-        # Check if user owns this job
+        # Check if user owns this job or is admin
         user_id = request.session.get("user_id")
         if not user_id:
             return Response("Unauthorized", status_code=401)
@@ -803,15 +803,30 @@ def retry_queue_item(request: Request, job_id: int) -> Response:
         job = Core.Database.get_job_by_id(
             job_id,
         )
-        if job is None or job.get("user_id") != user_id:
+        if job is None:
+            return Response("Job not found", status_code=404)
+
+        # Check ownership or admin status
+        user = Core.Database.get_user_by_id(user_id)
+        if job.get("user_id") != user_id and not Core.is_admin(user):
             return Response("Forbidden", status_code=403)
 
         Core.Database.retry_job(job_id)
-        # Redirect back to admin view
+
+        # Check if request is from admin page via referer header
+        is_from_admin = "/admin" in request.headers.get("referer", "")
+
+        # Redirect to admin if from admin page, trigger update otherwise
+        if is_from_admin:
+            return Response(
+                "",
+                status_code=200,
+                headers={"HX-Redirect": "/admin"},
+            )
         return Response(
             "",
             status_code=200,
-            headers={"HX-Redirect": "/admin"},
+            headers={"HX-Trigger": "queue-updated"},
         )
     except (ValueError, KeyError) as e:
         return Response(
diff --git a/Biz/PodcastItLater/Core.py b/Biz/PodcastItLater/Core.py
index 8d31956..a2c1b3b 100644
--- a/Biz/PodcastItLater/Core.py
+++ b/Biz/PodcastItLater/Core.py
@@ -1785,6 +1785,40 @@ class TestQueueOperations(Test.TestCase):
         self.assertEqual(counts.get("processing", 0), 1)
         self.assertEqual(counts.get("error", 0), 1)
 
+    def test_queue_position(self) -> None:
+        """Verify queue position calculation."""
+        # Add multiple pending jobs
+        job1 = Database.add_to_queue(
+            "https://example.com/1",
+            "test@example.com",
+            self.user_id,
+        )
+        time.sleep(0.01)
+        job2 = Database.add_to_queue(
+            "https://example.com/2",
+            "test@example.com",
+            self.user_id,
+        )
+        time.sleep(0.01)
+        job3 = Database.add_to_queue(
+            "https://example.com/3",
+            "test@example.com",
+            self.user_id,
+        )
+
+        # Check positions
+        self.assertEqual(Database.get_queue_position(job1), 1)
+        self.assertEqual(Database.get_queue_position(job2), 2)
+        self.assertEqual(Database.get_queue_position(job3), 3)
+
+        # Move job 2 to processing
+        Database.update_job_status(job2, "processing")
+
+        # Check positions (job 3 should now be 2nd pending job)
+        self.assertEqual(Database.get_queue_position(job1), 1)
+        self.assertIsNone(Database.get_queue_position(job2))
+        self.assertEqual(Database.get_queue_position(job3), 2)
+
 
 class TestEpisodeManagement(Test.TestCase):
     """Test episode management functionality."""
diff --git a/Biz/PodcastItLater/Test.py b/Biz/PodcastItLater/Test.py
index b2a1d24..b2a1d24 100644..100755
--- a/Biz/PodcastItLater/Test.py
+++ b/Biz/PodcastItLater/Test.py
diff --git a/Biz/PodcastItLater/Web.py b/Biz/PodcastItLater/Web.py
index b7845b3..6134a98 100644
--- a/Biz/PodcastItLater/Web.py
+++ b/Biz/PodcastItLater/Web.py
@@ -379,6 +379,11 @@ class QueueStatus(Component[AnyChildren, QueueStatusAttrs]):
             badge_class = status_classes.get(item["status"], "bg-secondary")
             icon_class = status_icons.get(item["status"], "bi-question-circle")
 
+            # Get queue position for pending items
+            queue_pos = None
+            if item["status"] == "pending":
+                queue_pos = Core.Database.get_queue_position(item["id"])
+
             queue_items.append(
                 html.div(
                     html.div(
@@ -430,6 +435,14 @@ class QueueStatus(Component[AnyChildren, QueueStatusAttrs]):
                             f"Created: {item['created_at']}",
                             classes=["text-muted", "d-block", "mt-1"],
                         ),
+                        # Display queue position if available
+                        html.small(
+                            html.i(classes=["bi", "bi-hourglass-split", "me-1"]),
+                            f"Position in queue: #{queue_pos}",
+                            classes=["text-info", "d-block", "mt-1"],
+                        )
+                        if queue_pos
+                        else html.span(),
                         *(
                             [
                                 html.div(
@@ -457,6 +470,27 @@ class QueueStatus(Component[AnyChildren, QueueStatusAttrs]):
                         ),
                         # Add cancel button for pending jobs, remove for others
                         html.div(
+                            # Retry button for error items
+                            html.button(
+                                html.i(classes=["bi", "bi-arrow-clockwise", "me-1"]),
+                                "Retry",
+                                hx_post=f"/queue/{item['id']}/retry",
+                                hx_trigger="click",
+                                hx_on=(
+                                    "htmx:afterRequest: "
+                                    "if(event.detail.successful) "
+                                    "htmx.trigger('body', 'queue-updated')"
+                                ),
+                                classes=[
+                                    "btn",
+                                    "btn-sm",
+                                    "btn-outline-primary",
+                                    "mt-2",
+                                    "me-2",
+                                ],
+                            )
+                            if item["status"] == "error"
+                            else html.span(),
                             html.button(
                                 html.i(classes=["bi", "bi-x-lg", "me-1"]),
                                 "Cancel",