portacode 1.4.34.dev7__tar.gz → 1.4.35.dev0__tar.gz

{portacode-1.4.34.dev7 → portacode-1.4.35.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.34.dev7
+Version: 1.4.35.dev0
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.34.dev7 → portacode-1.4.35.dev0}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.34.dev7'
-__version_tuple__ = version_tuple = (1, 4, 34, 'dev7')
+__version__ = version = '1.4.35.dev0'
+__version_tuple__ = version_tuple = (1, 4, 35, 'dev0')
 
 __commit_id__ = commit_id = None

{portacode-1.4.34.dev7 → portacode-1.4.35.dev0}/portacode/connection/handlers/automation_v2_handlers.py

@@ -648,22 +648,19 @@ class _AutomationRuntimeV2:
         automation_task_id: Any,
         automation_step_index: int,
     ) -> dict[str, Any]:
-        try:
-            resolved_url = self._resolve_wait_for_url(target)
-        except Exception as exc:
-            return {
-                "returncode": 1,
-                "stdout": "",
-                "stderr": str(exc),
-                "timed_out": False,
-                "resolved_url": None,
-            }
-
         deadline = time.monotonic() + max(1.0, float(timeout_seconds))
         attempts = 0
         last_error = ""
+        resolved_url: str | None = None
         while time.monotonic() < deadline:
             attempts += 1
+            try:
+                resolved_url = self._resolve_wait_for_url(target)
+            except Exception as exc:
+                last_error = str(exc)
+                await asyncio.sleep(WAIT_FOR_STEP_INTERVAL_SECONDS)
+                continue
+
             ok, status, error = await asyncio.to_thread(self._probe_http_url, resolved_url)
             if ok:
                 message = (
@@ -697,7 +694,7 @@ class _AutomationRuntimeV2:
         return {
             "returncode": 1,
             "stdout": "",
-            "stderr": f"wait_for timeout url={resolved_url} last_error={last_error}",
+            "stderr": f"wait_for timeout target={target} resolved_url={resolved_url or ''} last_error={last_error}",
             "timed_out": True,
             "resolved_url": resolved_url,
         }

portacode-1.4.35.dev0/portacode/test_updater.py

@@ -0,0 +1,44 @@
+from unittest import TestCase
+from unittest.mock import patch
+
+from portacode.updater import build_pip_install_command
+
+
+class UpdaterCommandTests(TestCase):
+    @patch("portacode.updater._running_in_virtualenv", return_value=True)
+    def test_venv_omits_user_flag_for_non_root(self, _mock_venv):
+        with patch("portacode.updater.sys.executable", "/opt/portacode-venv/bin/python"):
+            with patch("portacode.updater.os.geteuid", return_value=1000):
+                cmd = build_pip_install_command(version="1.4.34.dev7")
+
+        self.assertEqual(
+            cmd,
+            [
+                "/opt/portacode-venv/bin/python",
+                "-m",
+                "pip",
+                "install",
+                "--upgrade",
+                "portacode==1.4.34.dev7",
+            ],
+        )
+
+    @patch("portacode.updater._running_in_virtualenv", return_value=False)
+    def test_non_root_outside_venv_uses_user_flag(self, _mock_venv):
+        with patch("portacode.updater.sys.executable", "/usr/bin/python3"):
+            with patch("portacode.updater.os.geteuid", return_value=1000):
+                cmd = build_pip_install_command(version="1.4.34.dev7")
+
+        self.assertEqual(cmd[-1], "--user")
+        self.assertEqual(cmd[:6], ["/usr/bin/python3", "-m", "pip", "install", "--upgrade", "portacode==1.4.34.dev7"])
+
+    @patch("portacode.updater._running_in_virtualenv", return_value=False)
+    @patch("portacode.updater.shutil.which", return_value="/usr/bin/sudo")
+    def test_root_with_sudo_user_outside_venv_switches_to_invoking_user(self, _mock_which, _mock_venv):
+        with patch("portacode.updater.sys.executable", "/usr/bin/python3"):
+            with patch("portacode.updater.os.geteuid", return_value=0):
+                with patch.dict("portacode.updater.os.environ", {"SUDO_USER": "ubuntu"}, clear=False):
+                    cmd = build_pip_install_command(version="1.4.34.dev7")
+
+        self.assertEqual(cmd[:4], ["sudo", "-u", "ubuntu", "-H"])
+        self.assertEqual(cmd[-1], "--user")

{portacode-1.4.34.dev7 → portacode-1.4.35.dev0}/portacode/updater.py

@@ -8,6 +8,14 @@ import shutil
 from typing import List, Optional, Sequence
 
 
+def _running_in_virtualenv() -> bool:
+    """Return True when the current interpreter is inside a virtual environment."""
+    if hasattr(sys, "real_prefix"):
+        return True
+    base_prefix = getattr(sys, "base_prefix", sys.prefix)
+    return sys.prefix != base_prefix
+
+
 def build_pip_install_command(
     package: str = "portacode",
     version: Optional[str] = None,
@@ -22,6 +30,8 @@ def build_pip_install_command(
       load the same version.
     - If running as root via sudo, we try to install into the invoking user's
       `--user` site-packages (SUDO_USER) to avoid installing into root's Python.
+    - If running from a virtualenv interpreter, install directly into that
+      virtualenv (never pass `--user`, which pip rejects in venvs).
 
     For non-interactive contexts, callers should ensure the environment has
     permission to write to the chosen install target; we intentionally avoid
@@ -32,6 +42,9 @@ def build_pip_install_command(
     if extra_args:
         cmd.extend(extra_args)
 
+    if _running_in_virtualenv():
+        return cmd
+
     geteuid = getattr(os, "geteuid", None)
     is_root = bool(geteuid and geteuid() == 0)
 

{portacode-1.4.34.dev7 → portacode-1.4.35.dev0}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.34.dev7
+Version: 1.4.35.dev0
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.34.dev7 → portacode-1.4.35.dev0}/portacode.egg-info/SOURCES.txt

@@ -282,6 +282,7 @@ portacode/logging_categories.py
 portacode/pairing.py
 portacode/restart.py
 portacode/service.py
+portacode/test_updater.py
 portacode/updater.py
 portacode.egg-info/PKG-INFO
 portacode.egg-info/SOURCES.txt