Handle /api query paths without duplicate prefixing

Co-authored-by: Shri Sukhani <shrisukhani@users.noreply.github.com>

Author: cursoragent

hyperbrowser/client/base.py

@@ -82,16 +82,27 @@ def _build_url(self, path: str) -> str:
         if parsed_path.fragment:
             raise HyperbrowserError("path must not include URL fragments")
         normalized_path = f"/{stripped_path.lstrip('/')}"
+        normalized_parts = urlparse(normalized_path)
+        normalized_path_only = normalized_parts.path
+        normalized_query_suffix = (
+            f"?{normalized_parts.query}" if normalized_parts.query else ""
+        )
         base_has_api_suffix = (
             urlparse(self.config.base_url).path.rstrip("/").endswith("/api")
         )
 
-        if normalized_path == "/api" or normalized_path.startswith("/api/"):
+        if normalized_path_only == "/api" or normalized_path_only.startswith("/api/"):
             if base_has_api_suffix:
-                deduped_path = normalized_path[len("/api") :]
-                return f"{self.config.base_url}{deduped_path}"
-            return f"{self.config.base_url}{normalized_path}"
+                deduped_path = normalized_path_only[len("/api") :]
+                return f"{self.config.base_url}{deduped_path}{normalized_query_suffix}"
+            return (
+                f"{self.config.base_url}{normalized_path_only}{normalized_query_suffix}"
+            )
 
         if base_has_api_suffix:
-            return f"{self.config.base_url}{normalized_path}"
-        return f"{self.config.base_url}/api{normalized_path}"
+            return (
+                f"{self.config.base_url}{normalized_path_only}{normalized_query_suffix}"
+            )
+        return (
+            f"{self.config.base_url}/api{normalized_path_only}{normalized_query_suffix}"
+        )

tests/test_url_building.py

@@ -20,6 +20,10 @@ def test_client_build_url_normalizes_leading_slash():
             client._build_url("api/session")
             == "https://api.hyperbrowser.ai/api/session"
         )
+        assert (
+            client._build_url("/api?foo=bar")
+            == "https://api.hyperbrowser.ai/api?foo=bar"
+        )
         assert (
             client._build_url("//api/session")
             == "https://api.hyperbrowser.ai/api/session"
@@ -49,6 +53,7 @@ def test_client_build_url_avoids_duplicate_api_when_base_url_already_has_api():
     try:
         assert client._build_url("/session") == "https://example.local/api/session"
         assert client._build_url("/api/session") == "https://example.local/api/session"
+        assert client._build_url("/api?foo=bar") == "https://example.local/api?foo=bar"
     finally:
         client.close()
 
@@ -116,5 +121,9 @@ def test_client_build_url_allows_query_values_containing_absolute_urls():
             client._build_url("/web/fetch?target=https://example.com")
             == "https://api.hyperbrowser.ai/api/web/fetch?target=https://example.com"
         )
+        assert (
+            client._build_url("/session?foo=bar")
+            == "https://api.hyperbrowser.ai/api/session?foo=bar"
+        )
     finally:
         client.close()