portacode 1.5.17.dev3__tar.gz → 1.5.17.dev5__tar.gz

{portacode-1.5.17.dev3 → portacode-1.5.17.dev5}/PKG-INFO

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

{portacode-1.5.17.dev3 → portacode-1.5.17.dev5}/portacode/_version.py

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

{portacode-1.5.17.dev3 → portacode-1.5.17.dev5}/portacode/codex_prepare.py

@@ -332,6 +332,7 @@ def ensure_codex_home() -> Path:
 
     root_codex = Path("/root/.codex")
     root_sessions = root_codex / "sessions"
+    seeded_paths: list[Path] = []
     if (
         hasattr(os, "geteuid")
         and os.geteuid() == 0
@@ -349,6 +350,8 @@ def ensure_codex_home() -> Path:
             dest.parent.mkdir(parents=True, exist_ok=True)
             try:
                 shutil.copy2(src, dest)
+                seeded_paths.append(dest)
+                seeded_paths.append(dest.parent)
             except OSError:
                 continue
         for name in ("config.toml", "auth.json"):
@@ -357,10 +360,11 @@ def ensure_codex_home() -> Path:
             if src.is_file() and not dest.exists():
                 try:
                     shutil.copy2(src, dest)
+                    seeded_paths.append(dest)
                 except OSError:
                     pass
-        # Only chown newly created paths — full-tree chown on every spawn made
-        # Codex app-server initialize race the 10s handshake timeout.
+        # Chown seeded files (copy2 preserves root ownership). Avoid a full-tree
+        # walk on every spawn — that raced the initialize handshake.
         try:
             from portacode.connection.handlers.runtime_user import (
                 chown_path_if_possible,
@@ -370,6 +374,11 @@ def ensure_codex_home() -> Path:
             owner = get_default_runtime_user()
             chown_path_if_possible(codex_home, owner)
             chown_path_if_possible(sessions_dir, owner)
+            for path in seeded_paths:
+                chown_path_if_possible(path, owner)
+            for extra in (codex_home / "tmp", codex_home / ".tmp"):
+                if extra.exists():
+                    chown_path_if_possible(extra, owner)
         except Exception:
             pass
     try:

{portacode-1.5.17.dev3 → portacode-1.5.17.dev5}/portacode/connection/codex_app_server.py

@@ -128,19 +128,27 @@ class CodexAppServer:
             preserve_env_names=preserve,
             login=False,
         )
+        # Critical: the agent often runs with cwd=/root (mode 0700). Spawning a
+        # non-root Codex via runuser/setpriv while cwd is inaccessible makes
+        # Node/Codex hang or exit before answering initialize.
+        spawn_cwd = runtime_home if Path(runtime_home).is_dir() else None
         LOGGER.info(
-            "Spawning Codex app-server as %s: %s",
+            "Spawning Codex app-server as %s (cwd=%s): %s",
             runtime_user,
+            spawn_cwd or ".",
             " ".join(spawn_cmd),
         )
+        self._recent_stderr: List[str] = []
         try:
-            self._proc = await self._process_factory(
-                *spawn_cmd,
-                stdin=asyncio.subprocess.PIPE,
-                stdout=asyncio.subprocess.PIPE,
-                stderr=asyncio.subprocess.PIPE,
-                env=child_env,
-            )
+            spawn_kwargs: Dict[str, Any] = {
+                "stdin": asyncio.subprocess.PIPE,
+                "stdout": asyncio.subprocess.PIPE,
+                "stderr": asyncio.subprocess.PIPE,
+                "env": child_env,
+            }
+            if spawn_cwd:
+                spawn_kwargs["cwd"] = spawn_cwd
+            self._proc = await self._process_factory(*spawn_cmd, **spawn_kwargs)
         except Exception as exc:
             raise CodexAppServerError(f"Failed to spawn codex app-server: {exc}") from exc
 
@@ -241,7 +249,13 @@ class CodexAppServer:
             return await asyncio.wait_for(future, timeout=timeout)
         except asyncio.TimeoutError as exc:
             self._pending.pop(request_id, None)
-            raise CodexAppServerError(f"codex app-server request timed out: {method}") from exc
+            detail = f"codex app-server request timed out: {method}"
+            recent = getattr(self, "_recent_stderr", None) or []
+            if recent:
+                detail = f"{detail} (stderr: {' | '.join(recent[-5:])})"
+            if self._proc is not None and self._proc.returncode is not None:
+                detail = f"{detail} (process exited code {self._proc.returncode})"
+            raise CodexAppServerError(detail) from exc
 
     async def _write_notification_on_running_proc(
         self, method: str, params: Dict[str, Any]
@@ -305,7 +319,16 @@ class CodexAppServer:
                     break
                 text = line.decode("utf-8", errors="replace").rstrip()
                 if text:
-                    LOGGER.debug("codex app-server stderr: %s", text)
+                    # Keep a small ring for timeout errors; use WARNING so
+                    # initialize failures are visible at default journal levels.
+                    buf = getattr(self, "_recent_stderr", None)
+                    if buf is None:
+                        self._recent_stderr = []
+                        buf = self._recent_stderr
+                    buf.append(text)
+                    if len(buf) > 40:
+                        del buf[:-40]
+                    LOGGER.warning("codex app-server stderr: %s", text)
         except asyncio.CancelledError:
             raise
         except Exception:
@@ -350,6 +373,14 @@ class CodexAppServer:
         async with self._lock:
             if self._closed or self._proc is None:
                 return
+            # If initialize never completed, the caller still holding start()
+            # will surface the error — avoid a restart storm on bad cwd/env.
+            if not self._initialized.is_set():
+                LOGGER.warning(
+                    "Codex app-server process exited during startup (code %s)",
+                    self._proc.returncode,
+                )
+                return
             LOGGER.warning("Codex app-server process exited (code %s); restarting", self._proc.returncode)
             await self._kill_locked()
         try:

{portacode-1.5.17.dev3 → portacode-1.5.17.dev5}/portacode/connection/handlers/codex_handlers.py

@@ -572,14 +572,16 @@ class CodexThreadResumeHandler(CodexAsyncHandler):
         manager = _get_manager(self)
         await manager.ensure_started()
 
+        # thread/resume can emit notifications before its RPC response. Route
+        # those notifications to the requesting project from the outset.
+        if project_id:
+            manager.record_thread(thread_id, cwd, project_id)
+
         resume_result, items, active_turn = await _resume_thread_history(
             manager, thread_id=thread_id, cwd=cwd
         )
         thread = _thread_from_result(resume_result)
 
-        if project_id:
-            manager.record_thread(thread_id, cwd, project_id)
-
         payload = {
             "event": "codex_thread_resumed",
             "threadId": thread_id,
@@ -614,6 +616,14 @@ class CodexTurnStartHandler(CodexAsyncHandler):
         manager = _get_manager(self)
         await manager.ensure_started()
 
+        project_id = _project_id(message)
+        cwd = message.get("cwd")
+        # Codex may emit turn/started, retry, or terminal error notifications
+        # before the turn/start RPC response. Establish routing before the call
+        # so the browser cannot miss the event that clears its streaming state.
+        if project_id:
+            manager.record_thread(thread_id, cwd, project_id)
+
         params = {
             "threadId": thread_id,
             "input": _build_turn_input(text or "", attachments),
@@ -627,10 +637,6 @@ class CodexTurnStartHandler(CodexAsyncHandler):
             params["summary"] = message["summary"]
 
         result = await manager.bridge.call("turn/start", params)
-        project_id = _project_id(message)
-        cwd = message.get("cwd")
-        if project_id:
-            manager.record_thread(thread_id, cwd, project_id)
 
         payload = {
             "event": "codex_turn_started",

{portacode-1.5.17.dev3 → portacode-1.5.17.dev5}/portacode/tests/test_codex_app_server.py

@@ -119,19 +119,21 @@ async def test_spawn_injects_openai_api_key(tmp_path, monkeypatch):
     env_file.write_text("OPENAI_API_KEY=portacode-local\n", encoding="utf-8")
     monkeypatch.setattr("portacode.codex_prepare.CODEX_ENV_PATH", env_file)
     monkeypatch.delenv("OPENAI_API_KEY", raising=False)
+    home = tmp_path / "home"
+    home.mkdir()
     monkeypatch.setattr(
         "portacode.connection.handlers.runtime_user.get_default_runtime_user",
         lambda message=None: "bishoy",
     )
     monkeypatch.setattr(
         "portacode.connection.handlers.runtime_user.get_runtime_user_home",
-        lambda message=None: str(tmp_path / "home"),
+        lambda message=None: str(home),
     )
     monkeypatch.setattr(
         "portacode.connection.handlers.runtime_user.should_switch_user",
         lambda user: True,
     )
-    monkeypatch.setattr("portacode.codex_prepare.ensure_codex_home", lambda: tmp_path / "home" / ".codex")
+    monkeypatch.setattr("portacode.codex_prepare.ensure_codex_home", lambda: home / ".codex")
 
     proc = FakeProcess([{"jsonrpc": "2.0", "id": 1, "result": {"protocolVersion": "v2"}}])
     bridge = CodexAppServer(_process_factory=_factory_for(proc))
@@ -139,9 +141,10 @@ async def test_spawn_injects_openai_api_key(tmp_path, monkeypatch):
 
     env = getattr(proc, "spawn_kwargs", {}).get("env") or {}
     assert env.get("OPENAI_API_KEY") == "portacode-local"
-    assert env.get("HOME") == str(tmp_path / "home")
+    assert env.get("HOME") == str(home)
     assert env.get("USER") == "bishoy"
-    assert env.get("CODEX_HOME") == str(tmp_path / "home" / ".codex")
+    assert env.get("CODEX_HOME") == str(home / ".codex")
+    assert getattr(proc, "spawn_kwargs", {}).get("cwd") == str(home)
     # factory receives argv as *args before stdout/stdin kwargs
     await bridge.stop()
 
@@ -150,6 +153,8 @@ async def test_spawn_injects_openai_api_key(tmp_path, monkeypatch):
 async def test_spawn_runs_as_runtime_user(tmp_path, monkeypatch):
     env_file = tmp_path / "codex.env"
     env_file.write_text("OPENAI_API_KEY=portacode-local\n", encoding="utf-8")
+    home = tmp_path / "home"
+    home.mkdir()
     monkeypatch.setattr("portacode.codex_prepare.CODEX_ENV_PATH", env_file)
     monkeypatch.setattr(
         "portacode.connection.handlers.runtime_user.get_default_runtime_user",
@@ -157,7 +162,7 @@ async def test_spawn_runs_as_runtime_user(tmp_path, monkeypatch):
     )
     monkeypatch.setattr(
         "portacode.connection.handlers.runtime_user.get_runtime_user_home",
-        lambda message=None: "/home/bishoy",
+        lambda message=None: str(home),
     )
     monkeypatch.setattr(
         "portacode.connection.handlers.runtime_user.should_switch_user",
@@ -172,12 +177,14 @@ async def test_spawn_runs_as_runtime_user(tmp_path, monkeypatch):
 
     monkeypatch.setattr("portacode.connection.handlers.runtime_user.shutil.which", _which)
     monkeypatch.setattr("portacode.connection.codex_app_server.shutil.which", _which)
-    monkeypatch.setattr("portacode.codex_prepare.ensure_codex_home", lambda: tmp_path / ".codex")
+    monkeypatch.setattr("portacode.codex_prepare.ensure_codex_home", lambda: home / ".codex")
 
     seen: list[tuple] = []
+    seen_kwargs: list[dict] = []
 
     async def factory(*args, **kwargs):
         seen.append(args)
+        seen_kwargs.append(kwargs)
         proc = FakeProcess([{"jsonrpc": "2.0", "id": 1, "result": {"protocolVersion": "v2"}}])
         proc.spawn_kwargs = kwargs
         return proc
@@ -187,6 +194,7 @@ async def test_spawn_runs_as_runtime_user(tmp_path, monkeypatch):
     assert seen
     assert seen[0][:5] == ("/usr/sbin/runuser", "-u", "bishoy", "--preserve-environment", "--")
     assert "codex" in seen[0]
+    assert seen_kwargs[0].get("cwd") == str(home)
     await bridge.stop()
 
 

{portacode-1.5.17.dev3 → portacode-1.5.17.dev5}/portacode/tests/test_codex_handlers.py

@@ -378,6 +378,45 @@ async def test_codex_turn_start_records_thread_mapping():
     assert manager._cwd_project["/tmp/proj"] == "p-1"
 
 
+@pytest.mark.asyncio
+async def test_codex_turn_start_routes_notification_before_rpc_response():
+    channel = DummyControlChannel()
+    context = _context()
+    manager = CodexChatManager(channel, context)
+    manager.bridge = FakeBridge()
+    context["codex_manager"] = manager
+
+    async def call(method: str, params: dict, timeout: float = 60.0):
+        assert method == "turn/start"
+        await manager._on_notification(
+            "error",
+            {
+                "threadId": "th-9",
+                "turnId": "turn-1",
+                "willRetry": False,
+                "error": {"message": "request failed"},
+            },
+        )
+        return {"turn": {"id": "turn-1"}}
+
+    manager.bridge.call = call  # type: ignore[method-assign]
+    handler = CodexTurnStartHandler(channel, context)
+    await handler.handle(
+        {
+            "cmd": "codex_turn_start",
+            "project_id": "p-1",
+            "threadId": "th-9",
+            "cwd": "/tmp/proj",
+            "text": "hi",
+        },
+        reply_channel="rc-1",
+    )
+
+    notification = next(item for item in channel.sent if item.get("event") == "codex_event")
+    assert notification["project_id"] == "p-1"
+    assert notification["notification"]["method"] == "error"
+
+
 @pytest.mark.asyncio
 async def test_codex_thread_resume_includes_active_turn():
     channel = DummyControlChannel()

{portacode-1.5.17.dev3 → portacode-1.5.17.dev5}/portacode.egg-info/PKG-INFO

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