agent-session-bridge 0.2.1__tar.gz → 0.2.3__tar.gz

{agent_session_bridge-0.2.1/src/agent_session_bridge.egg-info → agent_session_bridge-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-session-bridge
-Version: 0.2.1
+Version: 0.2.3
 Summary: Local-first cross-harness agent-session portability: export a live coding-agent session from one harness and resume it in another.
 Author: Prakash Chaudhary
 License: MIT
@@ -60,7 +60,7 @@ and fail closed (no write) when it doesn't match.
 | Harness | Last verified against | Verification |
 |---|---|---|
 | Claude Code | 2.1.x transcripts | Round-trip + live `claude --resume` recall of a converted-only fact |
-| Codex | Codex CLI 0.145.0 (`state_5.sqlite`) | Live `codex resume` recall of a converted-only sentinel |
+| Codex | Codex CLI 0.145.0 (`state_5.sqlite`) | Live `codex resume` recall of a converted-only sentinel, and the registered session listed in the resume picker |
 | Hermes | `state.db` schema as of 2026-07 | Live `hermes --resume` replay of a registered session |
 | Python | 3.11 – 3.13 | CI test matrix |
 

{agent_session_bridge-0.2.1 → agent_session_bridge-0.2.3}/README.md

@@ -29,7 +29,7 @@ and fail closed (no write) when it doesn't match.
 | Harness | Last verified against | Verification |
 |---|---|---|
 | Claude Code | 2.1.x transcripts | Round-trip + live `claude --resume` recall of a converted-only fact |
-| Codex | Codex CLI 0.145.0 (`state_5.sqlite`) | Live `codex resume` recall of a converted-only sentinel |
+| Codex | Codex CLI 0.145.0 (`state_5.sqlite`) | Live `codex resume` recall of a converted-only sentinel, and the registered session listed in the resume picker |
 | Hermes | `state.db` schema as of 2026-07 | Live `hermes --resume` replay of a registered session |
 | Python | 3.11 – 3.13 | CI test matrix |
 

{agent_session_bridge-0.2.1 → agent_session_bridge-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agent-session-bridge"
-version = "0.2.1"
+version = "0.2.3"
 description = "Local-first cross-harness agent-session portability: export a live coding-agent session from one harness and resume it in another."
 readme = "README.md"
 requires-python = ">=3.11"

{agent_session_bridge-0.2.1 → agent_session_bridge-0.2.3/src/agent_session_bridge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-session-bridge
-Version: 0.2.1
+Version: 0.2.3
 Summary: Local-first cross-harness agent-session portability: export a live coding-agent session from one harness and resume it in another.
 Author: Prakash Chaudhary
 License: MIT
@@ -60,7 +60,7 @@ and fail closed (no write) when it doesn't match.
 | Harness | Last verified against | Verification |
 |---|---|---|
 | Claude Code | 2.1.x transcripts | Round-trip + live `claude --resume` recall of a converted-only fact |
-| Codex | Codex CLI 0.145.0 (`state_5.sqlite`) | Live `codex resume` recall of a converted-only sentinel |
+| Codex | Codex CLI 0.145.0 (`state_5.sqlite`) | Live `codex resume` recall of a converted-only sentinel, and the registered session listed in the resume picker |
 | Hermes | `state.db` schema as of 2026-07 | Live `hermes --resume` replay of a registered session |
 | Python | 3.11 – 3.13 | CI test matrix |
 

{agent_session_bridge-0.2.1 → agent_session_bridge-0.2.3}/src/session_bridge/writers/codex.py

@@ -23,6 +23,16 @@ def _codex_role(role: Role) -> str:
 
 
 def _msg_payload(role: str, text: str) -> dict[str, Any]:
+    if role == "assistant":
+        # Codex's history reconstruction keeps assistant messages by channel
+        # phase; without this the resumed model sees only the user turns.
+        block_type = "output_text"
+        return {
+            "type": "message",
+            "role": role,
+            "content": [{"type": block_type, "text": text}],
+            "phase": "final_answer",
+        }
     # Assistant emits output_text; user/system emit input_text.
     block_type = "output_text" if role == "assistant" else "input_text"
     return {"type": "message", "role": role, "content": [{"type": block_type, "text": text}]}
@@ -150,5 +160,46 @@ def write_codex(
         # Preserve an otherwise-empty message so message count survives the round trip.
         if not emitted and msg.role in (Role.USER, Role.ASSISTANT, Role.SYSTEM):
             add(_msg_payload(role, ""), ts)
+        # Codex writes an event_msg twin for every user turn, and its resume
+        # picker only lists sessions whose rollout contains at least one
+        # user_message event — without this the imported session resumes by
+        # id but never appears in the picker. The reader ignores event_msg
+        # as a response_item duplicate, so round-trips are unaffected.
+        if msg.role is Role.USER:
+            user_text = msg.text()
+            if user_text.strip():
+                records.append(
+                    {
+                        "timestamp": ts,
+                        "type": "event_msg",
+                        "payload": {
+                            "type": "user_message",
+                            "message": user_text,
+                            "images": [],
+                            "local_images": [],
+                            "audio": [],
+                            "local_audio": [],
+                            "text_elements": [],
+                        },
+                    }
+                )
+        elif msg.role is Role.ASSISTANT:
+            # Same twin discipline for assistant turns: the transcript view
+            # renders from event_msg records, so without agent_message events
+            # a resumed session displays as user-messages-only.
+            assistant_text = msg.text()
+            if assistant_text.strip():
+                records.append(
+                    {
+                        "timestamp": ts,
+                        "type": "event_msg",
+                        "payload": {
+                            "type": "agent_message",
+                            "message": assistant_text,
+                            "phase": "final_answer",
+                            "memory_citation": None,
+                        },
+                    }
+                )
 
     return records, report

{agent_session_bridge-0.2.1 → agent_session_bridge-0.2.3}/src/session_bridge/writers/codex_db.py

@@ -16,7 +16,9 @@ from __future__ import annotations
 
 import json
 import os
+import shutil
 import sqlite3
+import subprocess
 import tempfile
 import time
 import uuid
@@ -81,6 +83,43 @@ def validate_codex_store(codex_home: str | Path) -> Path:
     return db_path
 
 
+def infer_codex_cli_version(codex_home: str | Path) -> str:
+    """The installed Codex CLI's version, for stamping imported sessions.
+
+    Asks the binary first (`codex --version` -> "codex-cli 0.145.0"): the
+    store's rows are not a trustworthy source because previously imported
+    sessions land there too, so inferring from rows can echo an earlier
+    import's value back. The newest store row is only the fallback when no
+    codex binary is on PATH; empty string for a fresh store, which Codex
+    tolerates (the column defaults to '' for pre-column rows).
+    """
+    exe = shutil.which("codex")
+    if exe:
+        try:
+            out = subprocess.run(
+                [exe, "--version"], capture_output=True, text=True, timeout=10
+            ).stdout.strip()
+            if out:
+                return out.split()[-1]
+        except (OSError, subprocess.SubprocessError):
+            pass
+    db_path = validate_codex_store(codex_home)
+    conn = sqlite3.connect(db_path.resolve().as_uri() + "?mode=ro", uri=True)
+    try:
+        row = conn.execute(
+            """
+            SELECT cli_version
+            FROM threads
+            WHERE cli_version IS NOT NULL AND cli_version != ''
+            ORDER BY recency_at_ms DESC, updated_at_ms DESC, updated_at DESC
+            LIMIT 1
+            """
+        ).fetchone()
+    finally:
+        conn.close()
+    return row[0] if row else ""
+
+
 def infer_codex_model(codex_home: str | Path, model_provider: str = "openai") -> str | None:
     """Return the most recently used model for a configured Codex provider."""
     db_path = validate_codex_store(codex_home)
@@ -161,6 +200,8 @@ def _thread_values(
         "tokens_used": 0,
         "has_user_event": int(bool(first_user_message)),
         "archived": 0,
+        # meta.version here is the TARGET Codex version (the registrar
+        # replaces the source harness's with the installed Codex's).
         "cli_version": session.meta.version or "",
         "first_user_message": first_user_message,
         "memory_mode": "enabled",
@@ -221,8 +262,13 @@ def register_codex_session(
 
     timestamp = started_at if started_at is not None else time.time()
     iso_timestamp = datetime.fromtimestamp(timestamp, UTC).strftime("%Y-%m-%dT%H:%M:%S.000Z")
-    day_path = datetime.fromtimestamp(timestamp, UTC).strftime("%Y/%m/%d")
-    rollout_path = home / "sessions" / day_path / f"rollout-{iso_timestamp.replace(':', '-')}-{session_id}.jsonl"
+    # The resume picker parses rollout filenames strictly: local time,
+    # second precision, no timezone suffix — matching what Codex itself
+    # writes. Record timestamps inside the file stay UTC.
+    local = datetime.fromtimestamp(timestamp)
+    day_path = local.strftime("%Y/%m/%d")
+    file_stamp = local.strftime("%Y-%m-%dT%H-%M-%S")
+    rollout_path = home / "sessions" / day_path / f"rollout-{file_stamp}-{session_id}.jsonl"
     if rollout_path.exists():
         raise CodexRegistrationError(f"Codex rollout already exists: {rollout_path}")
 
@@ -232,6 +278,9 @@ def register_codex_session(
         cwd=resolved_cwd,
         model=model,
         model_provider=model_provider,
+        # The source harness's version must not masquerade as Codex's;
+        # stamp the installed Codex's version observed from its own store.
+        version=infer_codex_cli_version(home),
     )
     target_session = replace(session, meta=target_meta)
     transcript_sandbox, index_sandbox = workspace_write_policies(resolved_cwd)

{agent_session_bridge-0.2.1 → agent_session_bridge-0.2.3}/tests/test_codex_db.py

@@ -315,3 +315,83 @@ def test_cli_register_codex_backs_up_and_adds_handshake(tmp_path):
         ]
     ) == 0
     assert len(list(home.glob("state_5.sqlite.session-bridge-backup-*"))) == 2
+
+
+def test_registration_matches_native_picker_requirements(tmp_path, monkeypatch):
+    """The resume picker only lists sessions whose rollout carries an
+    event_msg user_message and whose filename matches the native pattern."""
+    import re
+
+    monkeypatch.setattr('session_bridge.writers.codex_db.shutil.which', lambda _: None)
+
+    home = tmp_path / "codex"
+    _make_codex_home(home)
+    session = _sample_session()
+    rollout = register_codex_session(
+        session, home, "1e8400e2-9b1d-4716-a4f6-426655440000",
+        cwd=str(tmp_path), title="picker check", model="gpt-5", model_provider="openai",
+    )
+    # Native filename: local time, no milliseconds/Z suffix.
+    assert re.fullmatch(
+        r"rollout-\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-[0-9a-f-]{36}\.jsonl",
+        rollout.name,
+    ), rollout.name
+    records = [json.loads(line) for line in rollout.read_text().splitlines()]
+    user_events = [
+        r for r in records
+        if r.get("type") == "event_msg" and r["payload"].get("type") == "user_message"
+    ]
+    assert user_events, "picker requires an event_msg user_message in the rollout"
+    assert user_events[0]["payload"]["message"].strip()
+    agent_events = [
+        r for r in records
+        if r.get("type") == "event_msg" and r["payload"].get("type") == "agent_message"
+    ]
+    assert agent_events, "transcript rendering requires agent_message events"
+    assistant_items = [
+        r for r in records
+        if r.get("type") == "response_item" and r["payload"].get("type") == "message"
+        and r["payload"].get("role") == "assistant"
+    ]
+    assert assistant_items and all(
+        i["payload"].get("phase") == "final_answer" for i in assistant_items
+    ), "history reconstruction drops assistant messages without a phase"
+    conn = sqlite3.connect(home / "state_5.sqlite")
+    row = dict(zip([c[0] for c in conn.execute("SELECT model, first_user_message, preview, cli_version FROM threads").description],
+                   conn.execute("SELECT model, first_user_message, preview, cli_version FROM threads").fetchone()))
+    conn.close()
+    assert row["model"] == "gpt-5"
+    assert row["first_user_message"].strip()
+    assert row["preview"].strip()
+    # The source harness's version must not masquerade as Codex's
+    # cli_version; a fresh isolated store has no native row to infer from.
+    assert row["cli_version"] == ""
+
+
+def test_cli_version_inferred_from_native_rows(tmp_path, monkeypatch):
+    monkeypatch.setattr('session_bridge.writers.codex_db.shutil.which', lambda _: None)
+    home = tmp_path / "codex"
+    _make_codex_home(home)
+    conn = sqlite3.connect(home / "state_5.sqlite")
+    conn.execute(
+        "INSERT INTO threads (id, rollout_path, created_at, updated_at, source, "
+        "model_provider, cwd, title, sandbox_policy, approval_mode, cli_version, "
+        "recency_at_ms, updated_at_ms) "
+        "VALUES (?, ?, 1, 1, 'cli', 'openai', '/tmp', 'native', '{}', 'on-request', "
+        "'0.145.0', 1, 1)",
+        (str(uuid.uuid4()), "/tmp/native.jsonl"),
+    )
+    conn.commit()
+    conn.close()
+    rollout = register_codex_session(
+        _sample_session(), home, "2e8400e2-9b1d-4716-a4f6-426655440000",
+        cwd=str(tmp_path), title="version check", model="gpt-5", model_provider="openai",
+    )
+    conn = sqlite3.connect(home / "state_5.sqlite")
+    got = conn.execute(
+        "SELECT cli_version FROM threads WHERE id='2e8400e2-9b1d-4716-a4f6-426655440000'"
+    ).fetchone()[0]
+    conn.close()
+    assert got == "0.145.0"
+    meta = json.loads(rollout.read_text().splitlines()[0])
+    assert meta["payload"]["cli_version"] == "0.145.0"