railmux 0.3.3.dev5__tar.gz → 0.3.3.dev6__tar.gz

{railmux-0.3.3.dev5/src/railmux.egg-info → railmux-0.3.3.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.3.3.dev5
+Version: 0.3.3.dev6
 Summary: Terminal UI to navigate, resume, and start Claude Code and Codex sessions
 Author-email: Rightglow <zhang.taian@foxmail.com>
 License-Expression: MIT
@@ -243,8 +243,9 @@ The rename popup starts with the current title pre-filled. Press
 to cancel.
 
 After a delete is confirmed, its popup closes immediately. The bottom-right
-status shows **Deleting…** while Railmux stops the exact provider session and
-removes its history in the background, then reports the final result.
+status shows **Deleting “session name”…** while Railmux stops the exact
+provider session and removes its history in the background, then reports the
+final result.
 
 Press `/` in Projects, Sessions, or Running to filter that section. Active
 filters are marked with `[filtered]` and survive a soft restart; reopening `/`
@@ -378,8 +379,9 @@ internal context and encrypted reasoning are hidden. Codex rewind lineages and
 Claude Code `parentUuid` branches are projected onto the provider's current
 conversation: the retained prefix and replacement suffix remain visible, while
 the abandoned suffix is hidden. When Railmux observes a running Codex session
-advance to its rewind child, it also removes the abandoned terminal screen and
-tmux scrollback before Codex redraws the live pane.
+advance after rewind or steering, it resets only the current terminal view
+before Codex redraws. Retained tmux scrollback is not erased, and managed
+history continues from the canonical rollout without its abandoned suffix.
 
 Preview opens at the latest activity in `less`; large sessions are limited to
 their latest 2,000 saved records. Press `/` to search, `n`/`N` to move between

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6}/README.md

@@ -201,8 +201,9 @@ The rename popup starts with the current title pre-filled. Press
 to cancel.
 
 After a delete is confirmed, its popup closes immediately. The bottom-right
-status shows **Deleting…** while Railmux stops the exact provider session and
-removes its history in the background, then reports the final result.
+status shows **Deleting “session name”…** while Railmux stops the exact
+provider session and removes its history in the background, then reports the
+final result.
 
 Press `/` in Projects, Sessions, or Running to filter that section. Active
 filters are marked with `[filtered]` and survive a soft restart; reopening `/`
@@ -336,8 +337,9 @@ internal context and encrypted reasoning are hidden. Codex rewind lineages and
 Claude Code `parentUuid` branches are projected onto the provider's current
 conversation: the retained prefix and replacement suffix remain visible, while
 the abandoned suffix is hidden. When Railmux observes a running Codex session
-advance to its rewind child, it also removes the abandoned terminal screen and
-tmux scrollback before Codex redraws the live pane.
+advance after rewind or steering, it resets only the current terminal view
+before Codex redraws. Retained tmux scrollback is not erased, and managed
+history continues from the canonical rollout without its abandoned suffix.
 
 Preview opens at the latest activity in `less`; large sessions are limited to
 their latest 2,000 saved records. Press `/` to search, `n`/`N` to move between

railmux-0.3.3.dev6/src/railmux/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.3.dev6"

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6}/src/railmux/fast_display_server.py

@@ -403,6 +403,7 @@ class _PaneGeometry:
     alternate_on: bool = False
     transcript_source: str | None = None
     transcript_backed: bool = False
+    transcript_provider: str | None = None
     claude_history_policy: str = "ask"
     history_generation: int = 0
 
@@ -916,10 +917,11 @@ def _list_agent_panes(
                 if history_pane_id is None:
                     history_server = None
         transcript_marker = fields[14] or None
-        transcript_backed = (
-            transcript_marker is not None
-            and tmux_server.decode_transcript_source(transcript_marker) is not None
+        transcript_locator = (
+            tmux_server.decode_transcript_source(transcript_marker)
+            if transcript_marker is not None else None
         )
+        transcript_backed = transcript_locator is not None
         if not transcript_backed and fields[11] == "1" and fields[12] == "1":
             transcript_backed, transcript_marker = _inferred_transcript_source(
                 session_id=session_id,
@@ -933,6 +935,7 @@ def _list_agent_panes(
             opened = tmux_server.open_transcript_source(transcript_marker)
             transcript_backed = opened is not None
             if opened is not None:
+                transcript_locator = opened[0]
                 os.close(opened[1])
         rows.append(
             (
@@ -951,6 +954,11 @@ def _list_agent_panes(
                     alternate_on=fields[11] == "1",
                     transcript_source=transcript_marker,
                     transcript_backed=transcript_backed,
+                    transcript_provider=(
+                        transcript_locator.provider
+                        if transcript_backed and transcript_locator is not None
+                        else None
+                    ),
                     claude_history_policy=claude_history_policy,
                     history_generation=_history_generation(fields[15]),
                 ),
@@ -1267,7 +1275,9 @@ def _transcript_rows(
             return None
         formatted = "".join(
             transcript_renderer.format_transcript(
-                io.StringIO(raw), "claude", claude_native=True
+                io.StringIO(raw),
+                source.provider,
+                claude_native=source.provider == "claude",
             )
         )
         rows, dropped = _wrap_transcript_rows(pyte, formatted, width)
@@ -1330,12 +1340,21 @@ def _capture_pane_history(
     # pane's current viewport merely to retain older scrollback.
     current_raw = raw_lines[-pane.height :]
     transcript_entry = None
+    # ``None`` is retained only for old/test geometry that predates the
+    # provider field; every validated live marker carries an explicit value.
+    transcript_provider = pane.transcript_provider or "claude"
     if (
         pane.transcript_backed
-        and pane.claude_history_policy == "local"
-        and pane.alternate_on
-        and pane.history_size == 0
         and pane.transcript_source
+        and (
+            transcript_provider == "codex"
+            or (
+                transcript_provider == "claude"
+                and pane.claude_history_policy == "local"
+                and pane.alternate_on
+                and pane.history_size == 0
+            )
+        )
     ):
         transcript_entry = _transcript_rows(
             pyte,
@@ -1387,7 +1406,9 @@ def _capture_pane_history(
         transcript_backed=transcript_used,
         transcript_available=pane.transcript_backed,
         history_choice_required=(
-            pane.transcript_backed and pane.claude_history_policy == "ask"
+            pane.transcript_backed
+            and transcript_provider == "claude"
+            and pane.claude_history_policy == "ask"
         ),
         more_available=(
             budget_truncated

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6}/src/railmux/tmux_ctl.py

@@ -3355,14 +3355,15 @@ def exact_pane_alive(identity: PaneIdentity) -> bool:
     )
 
 
-def reset_pane_history(identity: PaneIdentity) -> bool:
-    """Reset visible bytes and scrollback for the exact observed live pane.
+def reset_pane_view(identity: PaneIdentity) -> bool:
+    """Reset visible terminal state without deleting retained scrollback.
 
     Revalidate the immutable session, pane process, and window before issuing
-    one tmux command queue that resets the terminal model and clears history.
-    Then send the pane's foreground process group an ordinary same-size
-    ``SIGWINCH`` so its TUI repaints and reasserts terminal modes without a
-    geometry change or injected keyboard input.
+    tmux's terminal reset. Then send the pane's foreground process group an
+    ordinary same-size ``SIGWINCH`` so its TUI repaints and reasserts terminal
+    modes without a geometry change or injected keyboard input. The reset can
+    push the old viewport into tmux history, but never destroys the retained
+    prefix; managed history surfaces use the provider's canonical transcript.
     """
     current = pane_identity(identity.pane_id)
     if (current is None or current.dead
@@ -3372,10 +3373,7 @@ def reset_pane_history(identity: PaneIdentity) -> bool:
         return False
     try:
         subprocess.check_call(
-            [
-                "tmux", "send-keys", "-R", "-t", identity.pane_id,
-                ";", "clear-history", "-t", identity.pane_id,
-            ],
+            ["tmux", "send-keys", "-R", "-t", identity.pane_id],
             stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
         )
     except (OSError, subprocess.CalledProcessError):

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6}/src/railmux/tmux_server.py

@@ -307,11 +307,21 @@ def encode_transcript_source(
 ) -> str | None:
     """Encode an exact transcript hint for a displayed managed agent pane."""
     raw_path = str(path)
+    valid_name = (
+        path.name == f"{session_id}.jsonl"
+        if provider == "claude"
+        else (
+            path.name.startswith("rollout-")
+            and path.name.endswith(f"-{session_id}.jsonl")
+        )
+        if provider == "codex"
+        else False
+    )
     if (
-        provider != "claude"
+        provider not in {"claude", "codex"}
         or not _SESSION_ID_RE.fullmatch(session_id)
         or not path.is_absolute()
-        or path.name != f"{session_id}.jsonl"
+        or not valid_name
         or len(raw_path) > 4096
     ):
         return None
@@ -348,7 +358,7 @@ def decode_transcript_source(raw: str) -> TranscriptSource | None:
     raw_path = payload.get("path")
     if (
         payload.get("schema_version") != _TRANSCRIPT_SOURCE_SCHEMA
-        or provider != "claude"
+        or provider not in {"claude", "codex"}
         or not isinstance(session_id, str)
         or not _SESSION_ID_RE.fullmatch(session_id)
         or not isinstance(raw_path, str)
@@ -357,7 +367,15 @@ def decode_transcript_source(raw: str) -> TranscriptSource | None:
     ):
         return None
     path = Path(raw_path)
-    if not path.is_absolute() or path.name != f"{session_id}.jsonl":
+    valid_name = (
+        path.name == f"{session_id}.jsonl"
+        if provider == "claude"
+        else (
+            path.name.startswith("rollout-")
+            and path.name.endswith(f"-{session_id}.jsonl")
+        )
+    )
+    if not path.is_absolute() or not valid_name:
         return None
     return TranscriptSource(provider, session_id, path)
 

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6}/src/railmux/ui/app.py

@@ -553,6 +553,7 @@ class App:
     _status_text: str | None = None
     _status_level: str = "info"
     _status_since: float = 0.0
+    _delete_progress_text: str = "Deleting…"
     _attention_notice_key: tuple[str, int] | None = None
     _tip_index: int = 0
     _tip_since: float = 0.0
@@ -748,6 +749,7 @@ class App:
         self._status_text: str | None = None
         self._status_level: str = "info"
         self._status_since: float = 0.0
+        self._delete_progress_text: str = "Deleting…"
         self._rendered_status_text: str | None = None
         self._rendered_status_level: str = "tip"
         self._status_feedback_alarm: object | None = None
@@ -1136,6 +1138,19 @@ class App:
                 logical_id,
                 running.project.claude_dir / f"{logical_id}.jsonl",
             )
+        elif (
+            running is not None
+            and running.session_type == "codex"
+            and logical_id is not None
+            and not running.is_placeholder
+        ):
+            representative = self._codex_representative(logical_id)
+            if representative is not None:
+                marker = tmux_server.encode_transcript_source(
+                    "codex",
+                    representative.session_id,
+                    representative.jsonl_path,
+                )
         tmux_ctl.set_pane_user_option(
             pane_id,
             tmux_server.TRANSCRIPT_SOURCE_OPTION,
@@ -8605,26 +8620,28 @@ class App:
         server: tmux_ctl.ServerSnapshot | None,
         codex_rollout_probes: dict[str, set[str] | None] | None,
     ) -> None:
-        """Drop stale tmux bytes after an exact live Codex rewind transition.
+        """Advance managed history after an exact live Codex branch transition.
 
         The provider rollout is the history authority, but Codex keeps using
         the same terminal pane after a rewind.  Its abandoned suffix can
-        therefore survive in tmux scrollback even though the canonical JSONL
-        is already correct.  Baseline the first observed rollout, then clear
-        only when the next canonical rollout names that baseline as its parent.
-        On procfs systems the new rollout must also be open in this exact pane's
-        process tree; an unavailable probe degrades to the provider lineage
-        link, while a negative probe waits for a later refresh.
+        therefore survive in raw tmux scrollback even though the canonical
+        JSONL is already correct. Baseline the first observed rollout, then
+        reset only the live terminal view when the next canonical rollout names
+        that baseline as its parent. Managed local/SSH history reads the stamped
+        canonical transcript instead of the abandoned raw suffix. On procfs
+        systems the new rollout must also be open in this exact pane's process
+        tree; an unavailable probe degrades to the provider lineage link, while
+        a negative probe waits for a later refresh.
         """
         current_id = meta.session_id
         previous_id = running.codex_canonical_session_id
         if previous_id is None:
             running.codex_canonical_session_id = current_id
-            self._stamp_codex_history_generation(running, current_id)
+            self._stamp_codex_history_state(running, meta)
             return
         if current_id == previous_id:
             if not running.codex_history_generation_stamped:
-                self._stamp_codex_history_generation(running, current_id)
+                self._stamp_codex_history_state(running, meta)
             return
         if (running.is_legacy or meta.forked_from_id != previous_id
                 or current_id not in self._codex_lineage_ids(previous_id)):
@@ -8643,14 +8660,10 @@ class App:
             return
 
         identity = self._codex_real_pane_identity(running)
-        if identity is None or not tmux_ctl.reset_pane_history(identity):
+        if identity is None or not tmux_ctl.reset_pane_view(identity):
             return
         running.codex_canonical_session_id = current_id
-        running.codex_history_generation_stamped = tmux_ctl.set_pane_user_option(
-            identity.pane_id,
-            tmux_ctl.RAILMUX_HISTORY_GENERATION_OPTION,
-            current_id,
-        )
+        self._stamp_codex_history_state(running, meta)
 
     def _codex_real_pane_identity(
         self, running: _Running,
@@ -8663,20 +8676,46 @@ class App:
         topology = tmux_ctl.session_topology(running.tmux_name)
         return topology.single_live_pane if topology is not None else None
 
-    def _stamp_codex_history_generation(
-        self, running: _Running, session_id: str,
+    def _stamp_codex_history_state(
+        self, running: _Running, meta: SessionMeta,
     ) -> None:
-        """Publish a content-free epoch for full-window SSH history caches."""
+        """Publish the canonical transcript and its content-free cache epoch."""
         if running.is_legacy:
             return
         identity = self._codex_real_pane_identity(running)
         if identity is None:
             return
-        running.codex_history_generation_stamped = tmux_ctl.set_pane_user_option(
-            identity.pane_id,
-            tmux_ctl.RAILMUX_HISTORY_GENERATION_OPTION,
-            session_id,
+        marker = tmux_server.encode_transcript_source(
+            "codex", meta.session_id, meta.jsonl_path)
+        pane_ids = {identity.pane_id}
+        workspace = getattr(self, "_workspace", None)
+        if workspace is not None:
+            pane_ids.update(
+                slot.pane_id
+                for slot in workspace.slots
+                if slot.agent_tmux_name == running.tmux_name
+                and slot.pane_id is not None
+            )
+        transcript_results = (
+            [tmux_ctl.set_pane_user_option(
+                pane_id,
+                tmux_server.TRANSCRIPT_SOURCE_OPTION,
+                marker,
+            ) for pane_id in sorted(pane_ids)]
+            if marker is not None else []
         )
+        generation_results = [
+            tmux_ctl.set_pane_user_option(
+                pane_id,
+                tmux_ctl.RAILMUX_HISTORY_GENERATION_OPTION,
+                meta.session_id,
+            )
+            for pane_id in sorted(pane_ids)
+        ]
+        transcript_stamped = marker is not None and all(transcript_results)
+        generation_stamped = all(generation_results)
+        running.codex_history_generation_stamped = bool(
+            transcript_stamped and generation_stamped)
 
     def _maybe_resort_running(self) -> None:
         """Re-order the Running registry by recency, at most once per minute.
@@ -9159,7 +9198,8 @@ class App:
         # Paint the closed confirmation and durable progress message before
         # even the bounded tmux preparation probes run. This makes Enter feel
         # immediate on slow homes and provider installations.
-        self._set_status("Deleting…", "info", force=True)
+        self._delete_progress_text = self._deleting_status(label)
+        self._set_status(self._delete_progress_text, "info", force=True)
         self._redraw_focus_state_now()
 
         if tmux_name is None and session_id is not None:
@@ -9248,6 +9288,16 @@ class App:
         self._delete_thread = thread
         thread.start()
 
+    @staticmethod
+    def _deleting_status(label: str) -> str:
+        """Return one stable, bounded progress label for the status bar."""
+        display = " ".join(label.split())
+        if not display:
+            return "Deleting…"
+        if len(display) > 40:
+            display = display[:39].rstrip() + "…"
+        return f"Deleting “{display}”…"
+
     def _execute_delete_task(self, task: _DeleteTask) -> _DeleteResult:
         """Perform blocking exact kill and provider cleanup without UI state."""
         if task.pane_identity is not None:
@@ -10489,9 +10539,10 @@ class App:
             # This is operation state, not a one-shot acknowledgement. Keep it
             # alive past the ordinary info TTL. A newly raised warning/error
             # retains its short severity hold, after which progress returns.
-            if self._status_text != "Deleting…":
-                self._set_status("Deleting…", "info")
-            if self._status_text == "Deleting…":
+            progress = getattr(self, "_delete_progress_text", "Deleting…")
+            if self._status_text != progress:
+                self._set_status(progress, "info")
+            if self._status_text == progress:
                 self._status_since = now
             return
         if self._status_text is not None:

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6/src/railmux.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.3.3.dev5
+Version: 0.3.3.dev6
 Summary: Terminal UI to navigate, resume, and start Claude Code and Codex sessions
 Author-email: Rightglow <zhang.taian@foxmail.com>
 License-Expression: MIT
@@ -243,8 +243,9 @@ The rename popup starts with the current title pre-filled. Press
 to cancel.
 
 After a delete is confirmed, its popup closes immediately. The bottom-right
-status shows **Deleting…** while Railmux stops the exact provider session and
-removes its history in the background, then reports the final result.
+status shows **Deleting “session name”…** while Railmux stops the exact
+provider session and removes its history in the background, then reports the
+final result.
 
 Press `/` in Projects, Sessions, or Running to filter that section. Active
 filters are marked with `[filtered]` and survive a soft restart; reopening `/`
@@ -378,8 +379,9 @@ internal context and encrypted reasoning are hidden. Codex rewind lineages and
 Claude Code `parentUuid` branches are projected onto the provider's current
 conversation: the retained prefix and replacement suffix remain visible, while
 the abandoned suffix is hidden. When Railmux observes a running Codex session
-advance to its rewind child, it also removes the abandoned terminal screen and
-tmux scrollback before Codex redraws the live pane.
+advance after rewind or steering, it resets only the current terminal view
+before Codex redraws. Retained tmux scrollback is not erased, and managed
+history continues from the canonical rollout without its abandoned suffix.
 
 Preview opens at the latest activity in `less`; large sessions are limited to
 their latest 2,000 saved records. Press `/` to search, `n`/`N` to move between

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6}/tests/test_codex_delete.py

@@ -295,7 +295,7 @@ def test_cleanup_runs_blocking_work_in_background_and_publishes_on_refresh(
     assert started.wait(0.5)
     assert app._delete_thread is not None
     assert app._delete_thread.is_alive()
-    assert statuses[-1] == ("Deleting…", "info")
+    assert statuses[-1] == ("Deleting “x”…", "info")
     assert redraws == [True]
 
     # A second destructive request cannot race the in-flight transaction.

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6}/tests/test_codex_lineage.py

@@ -4,10 +4,11 @@ from __future__ import annotations
 from pathlib import Path
 from unittest.mock import MagicMock
 
-from railmux import tmux_ctl
+from railmux import tmux_ctl, tmux_server
 from railmux.favorites import Favorites
 from railmux.models import Project, SessionMeta
 from railmux.ui.app import App, _Running
+from railmux.ui.workspace import AgentWorkspace
 
 
 class _LineageIndex:
@@ -66,7 +67,7 @@ def test_existing_root_favorite_marks_visible_leaf(
     assert app._favorite_ids_for_view() == {"root", "middle", "leaf"}
 
 
-def test_live_rewind_clears_only_exact_new_rollout_scrollback(
+def test_live_rewind_resets_view_and_stamps_canonical_transcript(
     monkeypatch, tmp_path,
 ) -> None:
     root_id = "019fc605-5188-7212-bc48-ea023fe8b73c"
@@ -101,8 +102,8 @@ def test_live_rewind_clears_only_exact_new_rollout_scrollback(
     transport.displayed_real_pane.return_value = "%9"
     app._display_transport = MagicMock(return_value=transport)
     monkeypatch.setattr(tmux_ctl, "pane_identity", lambda _pane: identity)
-    cleared = MagicMock(return_value=True)
-    monkeypatch.setattr(tmux_ctl, "reset_pane_history", cleared)
+    reset = MagicMock(return_value=True)
+    monkeypatch.setattr(tmux_ctl, "reset_pane_view", reset)
     stamped = MagicMock(return_value=True)
     monkeypatch.setattr(tmux_ctl, "set_pane_user_option", stamped)
     probes: dict[str, set[str] | None] = {}
@@ -110,16 +111,22 @@ def test_live_rewind_clears_only_exact_new_rollout_scrollback(
     # An indexed child is not enough: on procfs the exact live writer must
     # first expose that rollout through its open file descriptors.
     app._sync_codex_rewind_scrollback(running, meta, None, probes)
-    cleared.assert_not_called()
+    reset.assert_not_called()
     assert running.codex_canonical_session_id == root_id
 
     probes.clear()
     app._codex_rollout_ids.return_value = {root_id, leaf_id}
     app._sync_codex_rewind_scrollback(running, meta, None, probes)
 
-    cleared.assert_called_once_with(identity)
+    reset.assert_called_once_with(identity)
     assert running.codex_canonical_session_id == leaf_id
-    stamped.assert_called_once_with(
+    assert stamped.call_count == 2
+    transcript_call, generation_call = stamped.call_args_list
+    assert transcript_call.args[:2] == (
+        "%9", tmux_server.TRANSCRIPT_SOURCE_OPTION,
+    )
+    assert leaf_id in transcript_call.args[2]
+    assert generation_call.args == (
         "%9", tmux_ctl.RAILMUX_HISTORY_GENERATION_OPTION, leaf_id)
 
 
@@ -147,11 +154,52 @@ def test_first_codex_generation_only_establishes_scrollback_baseline(
         session_type="codex",
     )
     app = App.__new__(App)
-    app._stamp_codex_history_generation = MagicMock()
-    cleared = MagicMock(return_value=True)
-    monkeypatch.setattr(tmux_ctl, "reset_pane_history", cleared)
+    app._stamp_codex_history_state = MagicMock()
+    reset = MagicMock(return_value=True)
+    monkeypatch.setattr(tmux_ctl, "reset_pane_view", reset)
 
     app._sync_codex_rewind_scrollback(running, meta, None, {})
 
     assert running.codex_canonical_session_id == session_id
-    cleared.assert_not_called()
+    reset.assert_not_called()
+    app._stamp_codex_history_state.assert_called_once_with(running, meta)
+
+
+def test_codex_history_state_stamps_nested_wrapper_and_real_pane(
+    monkeypatch, tmp_path,
+) -> None:
+    session_id = "019fc7c1-a27c-7ae0-9937-7570552a112a"
+    project = Project(tmp_path, "-project", Path(), 1, 0.0)
+    running = _Running(
+        key=session_id,
+        tmux_name="cx-live",
+        label="project/conversation",
+        project=project,
+        session_type="codex",
+    )
+    meta = SessionMeta(
+        project=project,
+        session_id=session_id,
+        jsonl_path=tmp_path / (
+            f"rollout-2026-08-03T13-13-03-{session_id}.jsonl"),
+        title="current",
+        message_count=2,
+        token_total=0,
+        last_mtime=2.0,
+        session_type="codex",
+    )
+    identity = tmux_ctl.PaneIdentity(
+        "%9", 123, "cx-live", "$4", "@5", False, 80, 24)
+    app = App.__new__(App)
+    app._workspace = AgentWorkspace()
+    app._workspace.primary.pane_id = "%10"
+    app._workspace.primary.agent_tmux_name = "cx-live"
+    app._codex_real_pane_identity = MagicMock(return_value=identity)
+    stamped = MagicMock(return_value=True)
+    monkeypatch.setattr(tmux_ctl, "set_pane_user_option", stamped)
+
+    app._stamp_codex_history_state(running, meta)
+
+    assert running.codex_history_generation_stamped
+    assert {call.args[0] for call in stamped.call_args_list} == {"%9", "%10"}
+    assert stamped.call_count == 4

{railmux-0.3.3.dev5 → railmux-0.3.3.dev6}/tests/test_fast_full_window.py

@@ -6827,6 +6827,57 @@ def test_server_waits_for_local_choice_before_rendering_claude_transcript(
     transcript_rows.assert_not_called()
 
 
+def test_server_codex_history_uses_canonical_transcript_after_rewind(
+    monkeypatch,
+):
+    pane = fast_display_server._PaneGeometry(
+        "%8",
+        31,
+        0,
+        40,
+        2,
+        mouse_forwardable=True,
+        history_size=500,
+        alternate_on=False,
+        transcript_source="codex-marker",
+        transcript_backed=True,
+        transcript_provider="codex",
+        history_generation=19,
+    )
+    canonical = (b"retained prompt", b"replacement answer")
+    monkeypatch.setattr(
+        subprocess,
+        "check_output",
+        lambda *_args, **_kwargs: (
+            b"abandoned red interruption\nlive-a\nlive-b\n"
+        ),
+    )
+    monkeypatch.setattr(
+        fast_display_server,
+        "_transcript_rows",
+        lambda *_args, **_kwargs: fast_display_server._TranscriptCacheEntry(
+            (1, 2, 3, 4), canonical, False
+        ),
+    )
+    monkeypatch.setattr(
+        fast_display_server,
+        "_render_history_line",
+        lambda _pyte, line, _width: line,
+    )
+
+    snapshot = fast_display_server._capture_pane_history(
+        object(), pane, 7, 100)
+
+    assert snapshot is not None
+    assert snapshot.transcript_backed
+    assert not snapshot.history_choice_required
+    assert snapshot.generation == 19
+    assert b"retained prompt" in snapshot.lines
+    assert snapshot.lines[-2:] == (b"live-a", b"live-b")
+    assert all(b"abandoned red interruption" not in line
+               for line in snapshot.lines)
+
+
 def test_server_unreadable_claude_transcript_preserves_native_wheel_fallback(
     monkeypatch,
 ):
@@ -6902,6 +6953,28 @@ def test_transcript_cache_evicts_least_recent_file_width(monkeypatch, tmp_path):
         fast_display_server._TRANSCRIPT_CACHE.clear()
 
 
+def test_transcript_rows_render_codex_locator_with_codex_formatter(tmp_path):
+    pyte = fast_display_server._extended_pyte(__import__("pyte"))
+    session_id = "019fcaad-27a1-70c0-8029-8a9c7803fa6b"
+    path = tmp_path / f"rollout-2026-08-04T02-49-33-{session_id}.jsonl"
+    path.write_text(
+        '{"type":"response_item","payload":{"type":"message",'
+        '"role":"user","content":[{"type":"input_text",'
+        '"text":"retained question"}]}}\n'
+    )
+    marker = fast_display_server.tmux_server.encode_transcript_source(
+        "codex", session_id, path)
+    assert marker is not None
+    fast_display_server._TRANSCRIPT_CACHE.clear()
+    try:
+        entry = fast_display_server._transcript_rows(
+            pyte, marker, 60, allow_stale=False)
+        assert entry is not None
+        assert any(b"retained question" in row for row in entry.rows)
+    finally:
+        fast_display_server._TRANSCRIPT_CACHE.clear()
+
+
 def test_server_history_capture_truncates_to_newest_styled_byte_budget(
     monkeypatch,
 ):