portacode 1.5.13.dev1__tar.gz → 1.5.13.dev3__tar.gz

{portacode-1.5.13.dev1 → portacode-1.5.13.dev3}/PKG-INFO

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

{portacode-1.5.13.dev1 → portacode-1.5.13.dev3}/portacode/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.5.13.dev1'
-__version_tuple__ = version_tuple = (1, 5, 13, 'dev1')
+__version__ = version = '1.5.13.dev3'
+__version_tuple__ = version_tuple = (1, 5, 13, 'dev3')
 
 __commit_id__ = commit_id = None

{portacode-1.5.13.dev1 → portacode-1.5.13.dev3}/portacode/cli.py

@@ -48,6 +48,7 @@ def prepare() -> None:
 def prepare_codex_command() -> None:
     """Install and configure Codex CLI for the local device-authenticated proxy."""
     try:
+        click.echo("Preparing Codex. First-time installation can take a few minutes...")
         config_path = prepare_codex()
     except CodexPreparationError as exc:
         raise click.ClickException(str(exc)) from exc

{portacode-1.5.13.dev1 → portacode-1.5.13.dev3}/portacode/codex_loopback_proxy.py

@@ -135,10 +135,11 @@ class CodexLoopbackProxy:
         content_type = request_headers.get("content-type")
         if content_type:
             headers["Content-Type"] = content_type
+        gateway_path = path[3:] if path.startswith("/v1") else path
         async with httpx.AsyncClient(timeout=None) as client:
             async with client.stream(
                 method,
-                f"{self.gateway_url}/device{path.removeprefix('/v1')}",
+                f"{self.gateway_url}/device{gateway_path}",
                 content=body,
                 headers=headers,
             ) as response:

{portacode-1.5.13.dev1 → portacode-1.5.13.dev3}/portacode/codex_prepare.py

@@ -37,9 +37,12 @@ class CodexPreparationError(RuntimeError):
 
 
 def _run(command: Iterable[str]) -> None:
-    result = subprocess.run(list(command), text=True)
+    """Run setup tools without letting their progress controls corrupt the PTY."""
+    result = subprocess.run(list(command), text=True, capture_output=True)
     if result.returncode:
-        raise CodexPreparationError(f"Command failed ({result.returncode}): {' '.join(command)}")
+        output = "\n".join(part for part in (result.stdout, result.stderr) if part).strip()
+        detail = f"\n{output[-4000:]}" if output else ""
+        raise CodexPreparationError(f"Command failed ({result.returncode}): {' '.join(command)}{detail}")
 
 
 def _node_major() -> int:
@@ -63,6 +66,15 @@ def _sudo_prefix() -> list[str]:
     return ["sudo"]
 
 
+def _authorize_sudo_if_needed() -> None:
+    """Prompt before captured installer output would otherwise hide sudo's prompt."""
+    if platform.system().lower() not in {"linux", "darwin"} or not _sudo_prefix():
+        return
+    result = subprocess.run(["sudo", "-v"], text=True)
+    if result.returncode:
+        raise CodexPreparationError("Administrator authorization is required to prepare Codex.")
+
+
 def _install_node_if_needed() -> None:
     if _node_major() >= 18:
         return
@@ -129,6 +141,18 @@ def _set_local_sentinel() -> None:
     system = platform.system().lower()
     os.environ["OPENAI_API_KEY"] = LOCAL_SENTINEL
     if system == "linux":
+        # Portacode terminals load this directly, including sessions started by
+        # a long-running agent that pre-dates the prepare command.
+        managed_setup = (
+            "install -d -m 755 /etc/portacode && "
+            "printf '%s\\n' 'OPENAI_API_KEY=portacode-local' > /etc/portacode/codex.env && "
+            "chmod 644 /etc/portacode/codex.env && "
+            "printf '%s\\n' '# Managed by portacode prepare codex.' "
+            "'if [ -r /etc/portacode/codex.env ]; then' '  set -a' "
+            "'  . /etc/portacode/codex.env' '  set +a' 'fi' > /etc/profile.d/portacode_codex.sh && "
+            "chmod 644 /etc/profile.d/portacode_codex.sh"
+        )
+        _run([*_sudo_prefix(), "sh", "-c", managed_setup])
         _run([*_sudo_prefix(), "sh", "-c", 'grep -q "^OPENAI_API_KEY=portacode-local$" /etc/environment || printf "%s\\n" "OPENAI_API_KEY=portacode-local" >> /etc/environment'])
     elif system == "darwin":
         zshenv = Path.home() / ".zshenv"
@@ -156,6 +180,7 @@ def _verify_loopback_proxy() -> None:
 
 def prepare_codex() -> Path:
     """Install Codex and configure it to use the device-authenticated proxy."""
+    _authorize_sudo_if_needed()
     _install_node_if_needed()
     _install_codex()
     config_path = _write_config()

{portacode-1.5.13.dev1 → portacode-1.5.13.dev3}/portacode/connection/handlers/session.py

@@ -38,6 +38,7 @@ _LINK_EVENT_ROOT = Path(user_data_dir("portacode", "portacode")) / "link_events"
 _LINK_EVENT_POLL_INTERVAL = 0.5  # seconds
 LINK_EVENT_THROTTLE_SECONDS = 5.0
 LINK_CAPTURE_ORIGINAL_BROWSER_ENV = "PORTACODE_LINK_CAPTURE_ORIGINAL_BROWSER"
+CODEX_ENV_PATH = Path("/etc/portacode/codex.env")
 
 logger = logging.getLogger(__name__)
 
@@ -69,8 +70,16 @@ _DEFAULT_ENV = {
 
 
 def _build_child_env() -> Dict[str, str]:
-    """Return a copy of os.environ with sensible fallbacks added."""
+    """Return a copy of os.environ with sensible fallbacks and managed vars."""
     env = os.environ.copy()
+    try:
+        for raw_line in CODEX_ENV_PATH.read_text(encoding="utf-8").splitlines():
+            key, separator, value = raw_line.partition("=")
+            if separator and key == "OPENAI_API_KEY" and value:
+                # The file is managed locally by ``portacode prepare codex``.
+                env[key] = value
+    except OSError:
+        pass
     for k, v in _DEFAULT_ENV.items():
         env.setdefault(k, v)
     env.setdefault("COLUMNS", str(TERMINAL_COLUMNS))

{portacode-1.5.13.dev1 → portacode-1.5.13.dev3}/portacode/connection/handlers/terminal_handlers.py

@@ -7,7 +7,7 @@ from typing import Any, Dict, List, Optional
 
 from .base import AsyncHandler
 from .runtime_user import get_default_runtime_user, wrap_shell_command
-from .session import SessionManager
+from .session import SessionManager, _build_child_env
 
 logger = logging.getLogger(__name__)
 
@@ -314,11 +314,14 @@ class TerminalExecHandler(AsyncHandler):
             except (TypeError, ValueError) as exc:
                 raise ValueError("timeout must be a positive number") from exc
 
-        env = None
+        # Start from the same managed environment as interactive PTY sessions.
+        # In particular, Codex's local marker is loaded from Portacode's
+        # environment file instead of relying on PAM or a login shell.
+        env = _build_child_env()
         if env_spec is not None:
             if not isinstance(env_spec, dict):
                 raise ValueError("env must be an object/dict of environment variables")
-            env = {str(k): str(v) for k, v in env_spec.items()}
+            env.update({str(k): str(v) for k, v in env_spec.items()})
 
         project_id = message.get("project_id")
 

{portacode-1.5.13.dev1 → portacode-1.5.13.dev3}/portacode.egg-info/PKG-INFO

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