fix: resolve conflicts for PR #455

Merge prgs/master into PR branch.

tests/test_webui_skeleton.py

@@ -46,10 +46,14 @@ class TestWebuiSkeleton(unittest.TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertIn("Gitea-Tools", response.text)
 
+    def test_leases_is_implemented(self):
+        response = self.client.get("/leases")
+        self.assertEqual(response.status_code, 200)
+        self.assertIn("Leases", response.text)
+        self.assertIn("Collision warnings", response.text)
+
     def test_extra_stub_routes(self):
-        for path in ("/worktrees", "/leases"):
-            with self.subTest(path=path):
-                self.assertEqual(self.client.get(path).status_code, 200)
+        self.assertEqual(self.client.get("/worktrees").status_code, 200)
 
     def test_actions_is_implemented(self):
         response = self.client.get("/actions")
@@ -67,12 +71,12 @@ class TestWebuiSkeleton(unittest.TestCase):
         self.assertIn("Live queue", response.text)
 
     def test_nav_links_on_all_pages(self):
-        for path in ("/", "/queue", "/projects", "/prompts", "/runtime", "/audit", "/actions"):
+        paths = ('/', '/queue', '/projects', '/prompts', '/runtime', '/audit', '/leases', '/actions')
+        hrefs = ('/queue', '/projects', '/prompts', '/runtime', '/audit', '/leases', '/actions')
+        for path in paths:
             with self.subTest(path=path):
                 text = self.client.get(path).text
-                for href in (
-                    "/queue", "/projects", "/prompts", "/runtime", "/audit", "/actions",
-                ):
+                for href in hrefs:
                     self.assertIn(f'href="{href}"', text)