Merge current lab into agent runtime decomposition

tests/conftest.py

@@ -98,26 +98,23 @@ def pytest_collection_modifyitems(config, items):
 
 @pytest.fixture(scope="session", autouse=True)
 def _serve_test_static():
-    """Serve this worktree's assets; non-browser runs can request an ephemeral port."""
-    import socket
+    """Serve static assets on loopback for the browser integration tests.
+
+    Binds an ephemeral port so several worktrees can run their own suite at the
+    same time, and publishes the resulting origin through
+    ``ODYSSEUS_TEST_STATIC_ORIGIN``.  The browser tests shell out to node, which
+    inherits the environment, so the snippets read the origin from
+    ``process.env`` instead of hardcoding a port.
+
+    Set ``ODYSSEUS_TEST_STATIC_PORT`` to pin a specific port when something
+    outside pytest has to reach this server.
+    """
+    import os
     import threading
     import http.server
     import socketserver
     from pathlib import Path
 
-    port = int(os.environ.get("ODYSSEUS_TEST_STATIC_PORT", "7011"))
-    if not 0 <= port <= 65535:
-        raise ValueError("ODYSSEUS_TEST_STATIC_PORT must be between 0 and 65535")
-
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    try:
-        is_bound = (sock.connect_ex(("127.0.0.1", port)) == 0) if port else False
-    finally:
-        sock.close()
-
-    if is_bound:
-        raise RuntimeError(f"port {port} is already in use; browser tests require this worktree's static server")
-
     root_dir = Path(__file__).resolve().parent.parent
 
     class _Handler(http.server.SimpleHTTPRequestHandler):
@@ -137,11 +134,30 @@ def _serve_test_static():
     class _Server(socketserver.TCPServer):
         allow_reuse_address = True
 
-    server = _Server(("127.0.0.1", port), _Handler)
+    requested = int(os.environ.get("ODYSSEUS_TEST_STATIC_PORT") or 0)
+    if not 0 <= requested <= 65535:
+        raise ValueError("ODYSSEUS_TEST_STATIC_PORT must be between 0 and 65535")
+    try:
+        server = _Server(("127.0.0.1", requested), _Handler)
+    except OSError as exc:
+        # Port 0 cannot collide, so this only fires for an explicit pin.
+        raise RuntimeError(
+            f"ODYSSEUS_TEST_STATIC_PORT={requested} is not bindable; unset it to "
+            "let the browser tests pick an ephemeral port"
+        ) from exc
+
+    origin = f"http://127.0.0.1:{server.server_address[1]}"
+    previous_origin = os.environ.get("ODYSSEUS_TEST_STATIC_ORIGIN")
+    os.environ["ODYSSEUS_TEST_STATIC_ORIGIN"] = origin
+
     thread = threading.Thread(target=server.serve_forever, daemon=True)
     thread.start()
     try:
-        yield
+        yield origin
     finally:
+        if previous_origin is None:
+            os.environ.pop("ODYSSEUS_TEST_STATIC_ORIGIN", None)
+        else:
+            os.environ["ODYSSEUS_TEST_STATIC_ORIGIN"] = previous_origin
         server.shutdown()
         server.server_close()