portacode 1.5.21.dev2__tar.gz → 1.5.21.dev4__tar.gz

portacode-1.5.21.dev4/AGENTS.md

@@ -0,0 +1,53 @@
+# Portacode agent guidance
+
+These rules apply to the whole repository. More specific `AGENTS.md` files add
+instructions for their subtrees.
+
+## Private server submodule
+
+- `server/` is a private, confidential submodule available only to authorized
+  Portacode team members. Do not copy its source, credentials, configuration,
+  deployment details, or other non-public information into the public parent
+  repository, public issues, release notes, logs, or responses to unauthorized
+  users.
+- When a task touches server-side behavior, enter the `server/` submodule and
+  read `server/AGENTS.md` completely before inspecting or changing server code.
+  Follow both files, with the more specific server instructions taking
+  precedence for that subtree.
+- Keep parent-repository and server-submodule changes clearly separated when
+  reviewing status, diffs, tests, commits, and releases. Never assume committing
+  the parent repository also commits unpublished server changes.
+
+## Device-side CLI deployment and live debugging
+
+- Treat the repository checkout and the installed `portacode` CLI as separate
+  artifacts. The system service runs the installed PyPI package; restarting
+  `portacode.service` does **not** load Python changes from this checkout.
+- Never run `systemctl restart portacode.service`, kill its process, or otherwise
+  manipulate the Portacode system service merely to activate source edits.
+  Doing so interrupts the device connection and active Codex app-server
+  sessions without deploying the edited code.
+- The normal device-side deployment workflow is:
+  1. After tests pass and the user has authorized publishing, publish an explicit
+     development version with `make release VERSION=<version>`.
+  2. Install and activate that package with `portacode setversion <version>`.
+     This command owns installation and the appropriate supervised restart.
+- Publishing a package/tag is an external release action. Do not choose a
+  version or run `make release` without the user's explicit authorization.
+- Before running `portacode setversion`, check the device and privilege context
+  with a non-mutating test such as `sudo -n true`. When the required privileges
+  are unavailable, ask the user to run the command. Do not substitute direct
+  `systemctl`, process signals, or ad hoc `pip` installation. On an authorized
+  managed device with verified passwordless sudo, the agent may run the command
+  after the user has authorized the update.
+- For a faster edit/debug loop, use `./connect.sh [log-categories]` to run the
+  checkout directly instead of publishing and installing a package. It starts
+  a non-interactive debug connection and enforces the singleton connection.
+- Do not launch `./connect.sh` from a session hosted by the active Portacode
+  connection. Replacing the singleton connection can terminate the session that
+  launched it. Arrange an independent shell with the user first, then have the
+  user stop/replace the installed connection or start the debug connection from
+  that independent shell.
+- Before any device-side activation, state which mode is being used: published
+  PyPI version via `portacode setversion`, or live checkout via `./connect.sh`.
+  Confirm the installed/running version or process source afterward.

{portacode-1.5.21.dev2 → portacode-1.5.21.dev4}/PKG-INFO

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

{portacode-1.5.21.dev2 → portacode-1.5.21.dev4}/portacode/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.5.21.dev2'
-__version_tuple__ = version_tuple = (1, 5, 21, 'dev2')
+__version__ = version = '1.5.21.dev4'
+__version_tuple__ = version_tuple = (1, 5, 21, 'dev4')
 
 __commit_id__ = commit_id = None

{portacode-1.5.21.dev2 → portacode-1.5.21.dev4}/portacode/connection/handlers/codex_handlers.py

@@ -195,6 +195,9 @@ class CodexChatManager:
             # its reconnect snapshot would make resume return the same turn in
             # both `items` and `liveItems`.
             self._thread_live_items.pop(str(thread_id), None)
+        elif thread_id and method == "error" and not params.get("willRetry"):
+            self._thread_active_turn.pop(str(thread_id), None)
+            self._thread_live_items.pop(str(thread_id), None)
         if thread_id:
             params = self._materialize_and_bound_notification(str(thread_id), method, params)
         project_id = self._resolve_project_id(params)
@@ -694,6 +697,20 @@ class CodexThreadListHandler(CodexAsyncHandler):
 
         result = await manager.bridge.call("thread/list", params)
         threads, next_cursor = _threads_from_list_result(result)
+        # app-server metadata is not consistently refreshed while a turn is
+        # running. The manager receives the authoritative lifecycle events.
+        for thread in threads:
+            if not isinstance(thread, dict) or not thread.get("id"):
+                continue
+            active_turn_id = manager._thread_active_turn.get(str(thread["id"]))
+            listed_status = str(thread.get("status") or "").lower().replace("_", "")
+            thread["isWorking"] = bool(active_turn_id) or listed_status in {
+                "inprogress", "active", "running", "working"
+            }
+            if active_turn_id:
+                thread["activeTurnId"] = active_turn_id
+            else:
+                thread.pop("activeTurnId", None)
         payload = {
             "event": "codex_thread_list",
             "threads": threads,

{portacode-1.5.21.dev2 → portacode-1.5.21.dev4}/portacode/connection/handlers/system_handlers.py

@@ -27,6 +27,7 @@ from .base import SyncHandler
 from .proxmox_infra import get_infra_snapshot
 from .runtime_user import get_default_runtime_user, get_runtime_user_home
 from portacode.tunneling.forwarding_state import load_forwarding_state
+from portacode.connection.codex_app_server import CodexAppServer
 
 logger = logging.getLogger(__name__)
 
@@ -617,6 +618,14 @@ class SystemInfoHandler(SyncHandler):
         info["proxmox"] = _get_proxmox_info()
         info["cloudflare_tunnel"] = _get_cloudflare_tunnel_state()
         info["cloudflare_forwarding"] = _get_cloudflare_forwarding_state()
+        # Capability discovery belongs in the device snapshot. The dashboard
+        # receives system_info on connect and periodically, so it should not
+        # need a separate request merely to decide whether to show Codex UI.
+        codex_installed = bool(CodexAppServer.get_binary_path())
+        info["codex"] = {
+            "installed": codex_installed,
+            "app_server_supported": codex_installed,
+        }
         # logger.info("System info collected successfully with OS info: %s", info.get("os_info", {}).get("os_type", "Unknown"))
         
         info["portacode_version"] = __version__

{portacode-1.5.21.dev2 → portacode-1.5.21.dev4}/portacode/tests/test_codex_handlers.py

@@ -133,6 +133,31 @@ async def test_codex_thread_list():
     assert "useStateDbOnly" not in list_call[1]
 
 
+@pytest.mark.asyncio
+async def test_codex_thread_list_marks_all_manager_active_threads():
+    channel = DummyControlChannel()
+    context = _context()
+    manager = CodexChatManager(channel, context)
+    manager.bridge = FakeBridge()
+    manager.bridge.responses["thread/list"] = {
+        "data": [{"id": "th-idle"}, {"id": "th-live"}],
+        "nextCursor": None,
+    }
+    manager._thread_active_turn["th-live"] = "turn-live"
+    context["codex_manager"] = manager
+
+    handler = CodexThreadListHandler(channel, context)
+    await handler.handle(
+        {"cmd": "codex_thread_list", "project_id": "p-1", "cwd": "/tmp/proj"},
+        reply_channel="rc-1",
+    )
+
+    threads = {thread["id"]: thread for thread in channel.sent[0]["threads"]}
+    assert threads["th-idle"]["isWorking"] is False
+    assert threads["th-live"]["isWorking"] is True
+    assert threads["th-live"]["activeTurnId"] == "turn-live"
+
+
 @pytest.mark.asyncio
 async def test_codex_thread_start_records_mapping():
     channel = DummyControlChannel()

{portacode-1.5.21.dev2 → portacode-1.5.21.dev4}/portacode.egg-info/PKG-INFO

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

{portacode-1.5.21.dev2 → portacode-1.5.21.dev4}/portacode.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 .gitignore
 .gitmodules
+AGENTS.md
 LICENSE
 MANIFEST.in
 Makefile

{portacode-1.5.21.dev2 → portacode-1.5.21.dev4}/test_modules/test_play_store_screenshots.py

@@ -24,8 +24,10 @@ class PlayStoreScreenshotLogic:
                 f"document.body.style.zoom='{percent}%'"
             )
 
-    async def seed_codex_review(self, page):
-        """Create one small, deterministic Terra review for the fixture."""
+    CODEX_PROMPT_MARKER = "exactly three short bullets"
+
+    async def select_terra(self, page):
+        """Select the inexpensive model used by the screenshot fixture."""
         model_trigger = page.locator("codex-chat .model-trigger").first
         await model_trigger.click()
         terra = page.locator("codex-chat .model-option").filter(
@@ -34,6 +36,35 @@ class PlayStoreScreenshotLogic:
         await terra.wait_for(timeout=10000)
         await terra.click()
 
+    async def close_codex_sidebar(self, page):
+        await page.locator("codex-chat").first.evaluate(
+            """chat => {
+                if (chat._layoutCompact && chat._showSidebar) {
+                    chat._showSidebar = false;
+                    chat.requestUpdate();
+                }
+            }"""
+        )
+        await page.wait_for_timeout(200)
+
+    async def hide_duplicate_codex_messages(self, page):
+        """Keep reconnect replay duplicates out of the marketing capture."""
+        for role in ("user", "assistant"):
+            messages = page.locator(f"codex-chat .message.{role}")
+            seen = set()
+            for index in range(await messages.count()):
+                message = messages.nth(index)
+                text = " ".join((await message.text_content() or "").split())
+                if text in seen:
+                    await message.evaluate("element => element.style.display = 'none'")
+                elif text:
+                    seen.add(text)
+
+    async def seed_codex_review(self, page):
+        """Create one small, deterministic Terra review for the fixture."""
+        await self.close_codex_sidebar(page)
+        await self.select_terra(page)
+
         composer = page.locator('codex-chat textarea[placeholder="Ask Codex…"]').first
         await composer.fill(
             "Without using tools or modifying files, reply with exactly three "
@@ -43,9 +74,18 @@ class PlayStoreScreenshotLogic:
         )
         await page.locator('codex-chat button[aria-label="Send"]').first.click()
         await page.locator("codex-chat .message.user").last.wait_for(timeout=30000)
-        await page.locator("codex-chat .message.assistant").last.wait_for(
-            timeout=60000
-        )
+        reply = page.locator("codex-chat .message.assistant").last
+        await reply.wait_for(timeout=90000)
+        for _ in range(45):
+            reply_text = (await reply.text_content() or "").strip()
+            streaming = await page.locator("codex-chat").first.evaluate(
+                "chat => chat._isStreaming"
+            )
+            if len(reply_text) > 20 and not streaming:
+                await self.hide_duplicate_codex_messages(page)
+                return
+            await page.wait_for_timeout(2000)
+        raise TimeoutError("Codex Terra response did not finish within 90 seconds")
 
     async def open_first_codex_thread(self, page):
         """Open the newest Codex thread, creating the fixture thread if needed."""
@@ -59,22 +99,35 @@ class PlayStoreScreenshotLogic:
             await thread.wait_for(timeout=5000)
             await thread.click(force=True)
             await page.wait_for_timeout(700)
-            setup_error = page.locator("codex-chat .message.assistant").filter(
-                has_text="ai_setup_required"
-            ).last
-            if await setup_error.count():
-                await page.locator("codex-chat .header-new").first.click()
-                await self.seed_codex_review(page)
+            await self.close_codex_sidebar(page)
+
+            user_text = await page.locator(
+                "codex-chat .message.user"
+            ).all_text_contents()
+            assistant_text = await page.locator(
+                "codex-chat .message.assistant"
+            ).all_text_contents()
+            last_reply = assistant_text[-1].strip() if assistant_text else ""
+            invalid_reply = any(
+                word in last_reply.lower()
+                for word in ("error", "insufficient", "balance", "ai_setup_required")
+            )
+            if (
+                any(self.CODEX_PROMPT_MARKER in text for text in user_text)
+                and len(last_reply) > 20
+                and not invalid_reply
+            ):
+                await self.select_terra(page)
+                await self.hide_duplicate_codex_messages(page)
+                return
+
+            await page.locator("codex-chat .header-new").first.click()
+            await self.seed_codex_review(page)
             return
         except Exception:
             pass
 
-        close_chats = page.locator(
-            'codex-chat button[aria-label="Close sidebar"]'
-        ).first
-        if await close_chats.count() and await close_chats.is_visible():
-            await close_chats.click()
-
+        await self.close_codex_sidebar(page)
         await self.seed_codex_review(page)
 
     async def expand_demo_tree(self, page):