portacode 1.5.14.dev2__tar.gz → 1.5.14.dev3__tar.gz

{portacode-1.5.14.dev2 → portacode-1.5.14.dev3}/PKG-INFO

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

{portacode-1.5.14.dev2 → portacode-1.5.14.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.14.dev2'
-__version_tuple__ = version_tuple = (1, 5, 14, 'dev2')
+__version__ = version = '1.5.14.dev3'
+__version_tuple__ = version_tuple = (1, 5, 14, 'dev3')
 
 __commit_id__ = commit_id = None

{portacode-1.5.14.dev2 → portacode-1.5.14.dev3}/portacode/connection/handlers/codex_handlers.py

@@ -86,6 +86,71 @@ def _project_id(message: Dict[str, Any]) -> Optional[str]:
     return message.get("project_id")
 
 
+def _thread_from_result(result: Dict[str, Any]) -> Dict[str, Any]:
+    """Normalize thread/start|resume|read results to a thread object.
+
+    Current app-server returns `{ "thread": { "id": ... } }`. Older fakes /
+    builds may return the thread fields at the top level.
+    """
+    if not isinstance(result, dict):
+        return {}
+    thread = result.get("thread")
+    if isinstance(thread, dict):
+        return thread
+    return result
+
+
+def _thread_id_from_result(result: Dict[str, Any]) -> Optional[str]:
+    thread = _thread_from_result(result)
+    return thread.get("id") or result.get("id") or result.get("threadId")
+
+
+def _threads_from_list_result(result: Dict[str, Any]) -> tuple[list, Optional[str]]:
+    """Normalize thread/list results.
+
+    Current app-server returns `{ "data": [...], "nextCursor": ... }`.
+    """
+    if not isinstance(result, dict):
+        return [], None
+    threads = result.get("data")
+    if threads is None:
+        threads = result.get("threads")
+    if not isinstance(threads, list):
+        threads = []
+    return threads, result.get("nextCursor")
+
+
+def _items_from_read_result(result: Dict[str, Any]) -> list:
+    """Extract conversation items from thread/read (or legacy shapes)."""
+    if not isinstance(result, dict):
+        return []
+    if isinstance(result.get("items"), list):
+        return result["items"]
+    if isinstance(result.get("messages"), list):
+        return result["messages"]
+
+    thread = _thread_from_result(result)
+    turns = thread.get("turns") or result.get("turns") or []
+    items: list = []
+    if isinstance(turns, list):
+        for turn in turns:
+            if not isinstance(turn, dict):
+                continue
+            turn_items = turn.get("items")
+            if isinstance(turn_items, list):
+                items.extend(turn_items)
+    return items
+
+
+def _turn_from_result(result: Dict[str, Any]) -> Dict[str, Any]:
+    if not isinstance(result, dict):
+        return {}
+    turn = result.get("turn")
+    if isinstance(turn, dict):
+        return turn
+    return result
+
+
 class CodexAsyncHandler(AsyncHandler):
     """AsyncHandler that replies to `source_client_session` per WEBSOCKET_PROTOCOL.md."""
 
@@ -173,19 +238,23 @@ class CodexThreadListHandler(CodexAsyncHandler):
         manager = _get_manager(self)
         await manager.ensure_started()
 
-        params: Dict[str, Any] = {"cwd": cwd, "useStateDbOnly": True}
-        limit = message.get("limit")
+        # Default sourceKinds is cli+vscode only; include appServer so IDE chats appear.
+        # Avoid useStateDbOnly:true — it has returned empty lists in some Codex builds.
+        params: Dict[str, Any] = {
+            "cwd": cwd,
+            "sourceKinds": ["cli", "vscode", "appServer"],
+            "limit": message.get("limit") if message.get("limit") is not None else 50,
+        }
         cursor = message.get("cursor")
-        if limit is not None:
-            params["limit"] = limit
         if cursor is not None:
             params["cursor"] = cursor
 
         result = await manager.bridge.call("thread/list", params)
+        threads, next_cursor = _threads_from_list_result(result)
         payload = {
             "event": "codex_thread_list",
-            "threads": result.get("threads", []),
-            "nextCursor": result.get("nextCursor"),
+            "threads": threads,
+            "nextCursor": next_cursor,
         }
         project_id = _project_id(message)
         if project_id:
@@ -217,7 +286,8 @@ class CodexThreadStartHandler(CodexAsyncHandler):
             params["modelProvider"] = message["modelProvider"]
 
         result = await manager.bridge.call("thread/start", params)
-        thread_id = result.get("id") or result.get("threadId")
+        thread = _thread_from_result(result)
+        thread_id = _thread_id_from_result(result)
         if not thread_id:
             raise CodexAppServerError("thread/start did not return a thread id")
 
@@ -226,7 +296,7 @@ class CodexThreadStartHandler(CodexAsyncHandler):
         payload = {
             "event": "codex_thread_started",
             "threadId": thread_id,
-            "thread": result,
+            "thread": thread,
         }
         if project_id:
             payload["project_id"] = project_id
@@ -255,8 +325,11 @@ class CodexThreadResumeHandler(CodexAsyncHandler):
             resume_params["cwd"] = cwd
         await manager.bridge.call("thread/resume", resume_params)
 
-        read_result = await manager.bridge.call("thread/read", {"threadId": thread_id})
-        items = read_result.get("items", read_result.get("messages", []))
+        read_result = await manager.bridge.call(
+            "thread/read",
+            {"threadId": thread_id, "includeTurns": True},
+        )
+        items = _items_from_read_result(read_result)
 
         if cwd and project_id:
             manager.record_thread(thread_id, cwd, project_id)
@@ -305,7 +378,7 @@ class CodexTurnStartHandler(CodexAsyncHandler):
         payload = {
             "event": "codex_turn_started",
             "threadId": thread_id,
-            "turn": result,
+            "turn": _turn_from_result(result),
         }
         if project_id:
             payload["project_id"] = project_id

{portacode-1.5.14.dev2 → portacode-1.5.14.dev3}/portacode/tests/test_codex_handlers.py

@@ -43,11 +43,20 @@ class FakeBridge:
     def __init__(self) -> None:
         self.calls: list[tuple[str, dict]] = []
         self.responses: dict[str, Any] = {
-            "thread/start": {"id": "th-1", "name": "New chat"},
-            "thread/list": {"threads": [{"id": "th-1", "name": "Existing chat"}], "nextCursor": None},
-            "thread/resume": {},
-            "thread/read": {"items": [{"id": "msg-1", "role": "user", "text": "hello"}]},
-            "turn/start": {"id": "turn-1", "threadId": "th-1"},
+            # Match current Codex app-server response shapes.
+            "thread/start": {"thread": {"id": "th-1", "name": "New chat"}},
+            "thread/list": {
+                "data": [{"id": "th-1", "name": "Existing chat", "preview": "hi"}],
+                "nextCursor": None,
+            },
+            "thread/resume": {"thread": {"id": "th-1"}},
+            "thread/read": {
+                "thread": {
+                    "id": "th-1",
+                    "turns": [{"id": "turn-1", "items": [{"id": "msg-1", "role": "user", "text": "hello"}]}],
+                }
+            },
+            "turn/start": {"turn": {"id": "turn-1", "threadId": "th-1"}},
             "turn/interrupt": {},
         }
 
@@ -103,6 +112,11 @@ async def test_codex_thread_list():
     assert payload["event"] == "codex_thread_list"
     assert payload["threads"][0]["id"] == "th-1"
     assert payload["project_id"] == "p-1"
+    list_call = manager.bridge.calls[-1]
+    assert list_call[0] == "thread/list"
+    assert list_call[1]["cwd"] == "/tmp/proj"
+    assert "appServer" in list_call[1]["sourceKinds"]
+    assert "useStateDbOnly" not in list_call[1]
 
 
 @pytest.mark.asyncio
@@ -138,6 +152,8 @@ async def test_codex_thread_resume():
     assert payload["event"] == "codex_thread_resumed"
     assert payload["items"][0]["text"] == "hello"
     assert manager._thread_project["th-1"] == "p-1"
+    read_call = next(c for c in manager.bridge.calls if c[0] == "thread/read")
+    assert read_call[1]["includeTurns"] is True
 
 
 @pytest.mark.asyncio

{portacode-1.5.14.dev2 → portacode-1.5.14.dev3}/portacode.egg-info/PKG-INFO

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