portacode 2.2.20.dev7__tar.gz → 2.2.20.dev8__tar.gz

{portacode-2.2.20.dev7 → portacode-2.2.20.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 2.2.20.dev7
+Version: 2.2.20.dev8
 Summary: Device agent for the AI platform that builds, tests, deploys, and operates real software
 Home-page: https://portacode.com/
 Author: Meena Erian

{portacode-2.2.20.dev7 → portacode-2.2.20.dev8}/portacode/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.2.20.dev7'
-__version_tuple__ = version_tuple = (2, 2, 20, 'dev7')
+__version__ = version = '2.2.20.dev8'
+__version_tuple__ = version_tuple = (2, 2, 20, 'dev8')
 
 __commit_id__ = commit_id = None

{portacode-2.2.20.dev7 → portacode-2.2.20.dev8}/portacode/connection/handlers/browser_handlers.py

@@ -104,7 +104,23 @@ def update_browser_config(updates: dict, message: dict | None = None) -> dict:
 _RUNNER = r"""
 const fs = require('fs');
 const readline = require('readline');
-const { chromium } = require(process.env.PORTACODE_PLAYWRIGHT_JS || 'playwright');
+const playwrightCandidates = JSON.parse(process.env.PORTACODE_PLAYWRIGHT_CANDIDATES || '["playwright"]');
+let chromium;
+const playwrightErrors = [];
+for (const candidate of playwrightCandidates) {
+ try {
+  const loaded = require(candidate);
+  const executable = loaded.chromium.executablePath();
+  if (process.env.PORTACODE_BROWSER_EXECUTABLE || (fs.existsSync(executable) && fs.statSync(executable).isFile())) {
+   chromium = loaded.chromium;
+   break;
+  }
+  playwrightErrors.push(`${candidate}: browser executable not found at ${executable}`);
+ } catch (error) {
+  playwrightErrors.push(`${candidate}: ${error}`);
+ }
+}
+if (!chromium) throw new Error(`Unable to find a usable Playwright installation. ${playwrightErrors.join('; ')}`);
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
 const locator = (p,s) => {
   let l;
@@ -287,6 +303,19 @@ def _playwright_js_package() -> str | None:
     return None
 
 
+def _playwright_js_candidates() -> list[str]:
+    """Return browser packages in managed, Node, then Python-driver order."""
+    candidates = []
+    managed = Path("/opt/portacode-playwright/node_modules/playwright")
+    if (managed / "package.json").is_file():
+        candidates.append(str(managed))
+    candidates.append("playwright")
+    bundled = _playwright_js_package()
+    if bundled and bundled not in candidates:
+        candidates.append(bundled)
+    return candidates
+
+
 class _BrowserWorker:
     def __init__(self, *, user: str, session_id: str, argv: list[str], env: dict[str, str]):
         self.user = user
@@ -487,8 +516,9 @@ class BrowserRunHandler(AsyncHandler):
         env = dict(os.environ)
         env["NODE_PATH"] = await _node_path()
         env.setdefault("PLAYWRIGHT_BROWSERS_PATH", "/opt/ms-playwright")
-        if playwright_js := _playwright_js_package():
-            env["PORTACODE_PLAYWRIGHT_JS"] = playwright_js
+        env["PORTACODE_PLAYWRIGHT_CANDIDATES"] = json.dumps(_playwright_js_candidates())
+        if executable:
+            env["PORTACODE_BROWSER_EXECUTABLE"] = executable
         argv = wrap_argv_for_user([_node_executable(), "-e", _RUNNER], user, login=False)
         existing_worker = _WORKERS.get((user, session_id))
         session_is_live = bool(

{portacode-2.2.20.dev7 → portacode-2.2.20.dev8}/portacode/connection/handlers/test_browser_handlers.py

@@ -92,6 +92,20 @@ class BrowserRunHandlerTests(unittest.IsolatedAsyncioTestCase):
                 "/opt/venv/playwright/driver/package",
             )
 
+    def test_playwright_candidates_prefer_managed_then_node_then_python(self):
+        with (
+            patch.object(browser_handlers.Path, "is_file", side_effect=[True, True]),
+            patch.object(browser_handlers, "_playwright_js_package", return_value="/opt/venv/playwright/driver/package"),
+        ):
+            self.assertEqual(
+                browser_handlers._playwright_js_candidates(),
+                [
+                    "/opt/portacode-playwright/node_modules/playwright",
+                    "playwright",
+                    "/opt/venv/playwright/driver/package",
+                ],
+            )
+
     async def test_reuses_worker_for_same_runtime_user_and_session(self):
         worker = AsyncMock()
         worker.run.return_value = {"ok": True, "steps": [], "screenshots": []}
@@ -118,8 +132,8 @@ class BrowserRunHandlerTests(unittest.IsolatedAsyncioTestCase):
         self.assertEqual(keys, [("tester", "safe"), ("tester", "safe")])
         self.assertEqual(worker.run.await_count, 2)
         self.assertEqual(
-            get_worker.await_args_list[0].kwargs["env"]["PORTACODE_PLAYWRIGHT_JS"],
-            "/bundled/playwright/package",
+            json.loads(get_worker.await_args_list[0].kwargs["env"]["PORTACODE_PLAYWRIGHT_CANDIDATES"]),
+            ["playwright", "/bundled/playwright/package"],
         )
 
     async def test_failed_browser_run_is_not_reported_as_successful(self):

{portacode-2.2.20.dev7 → portacode-2.2.20.dev8}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 2.2.20.dev7
+Version: 2.2.20.dev8
 Summary: Device agent for the AI platform that builds, tests, deploys, and operates real software
 Home-page: https://portacode.com/
 Author: Meena Erian