railmux 0.4.0.dev3__tar.gz → 0.4.0.dev4__tar.gz

{railmux-0.4.0.dev3/src/railmux.egg-info → railmux-0.4.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.4.0.dev3
+Version: 0.4.0.dev4
 Summary: Terminal UI to navigate, resume, and start Claude Code and Codex sessions
 Author-email: Rightglow <zhang.taian@foxmail.com>
 License-Expression: MIT
@@ -14,6 +14,7 @@ Classifier: Environment :: Console :: Curses
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -26,12 +27,12 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: packaging>=23.0
-Requires-Dist: tomlkit<1,>=0.13.2
-Requires-Dist: urwid>=2.6.16
-Requires-Dist: tomli>=2.0.1; python_version < "3.11"
+Requires-Dist: packaging>=23.0; sys_platform != "win32"
+Requires-Dist: tomlkit<1,>=0.13.2; sys_platform != "win32"
+Requires-Dist: urwid>=2.6.16; sys_platform != "win32"
+Requires-Dist: tomli>=2.0.1; python_version < "3.11" and sys_platform != "win32"
 Provides-Extra: ssh
-Requires-Dist: pyte<0.9,>=0.8.2; extra == "ssh"
+Requires-Dist: pyte<0.9,>=0.8.2; sys_platform != "win32" and extra == "ssh"
 Provides-Extra: dev
 Requires-Dist: pytest>=8.0; extra == "dev"
 Requires-Dist: build>=1.2; extra == "dev"
@@ -169,12 +170,14 @@ for focus and layout limits.
 |--------|--------|
 | Left-click (non-running) | Preview session history in the Target pane |
 | Left-click (running) | Switch the Target pane to that session |
+| Wheel up over a live agent | Open its canonical current-branch history |
 | Double-click | Open/attach in the Target pane and move focus there |
 | Right-click | Context menu (Open, Preview, Info, Rename, Star, Copy title, Kill, Term, Delete) |
 
 Unavailable context-menu actions are hidden for the selected session state.
-Single-click and `␣` act in the Target pane without moving keyboard focus;
-double-click and `Enter` also move focus there. The terminal must report mouse
+Single-click and `␣` act in the Target pane without moving keyboard focus, but
+`␣` always means history while a click on a running row means live attach.
+Double-click and `Enter` also move focus there. The terminal must report mouse
 buttons to applications for these actions to reach Railmux. Right-click
 reporting is sometimes a separate setting from ordinary mouse reporting; see
 [FAQ 2](#2-mouse-buttons-or-f8f9-dont-work--whats-wrong).
@@ -207,7 +210,7 @@ see [FAQ 1](#1-how-do-i-copy-text-from-the-agent-pane).
 | `T` | Return to that agent's managed Vim viewer, when open |
 | `m` | Switch agent mode (Claude Code ⇄ Codex) |
 | `o` | Open persistent Railmux options |
-| `␣` | Preview stopped or switch running target (like single-click) |
+| `␣` | Preview canonical history for the selected stopped or running session |
 | `F8` | Cycle agent layout: single → side-by-side → stacked |
 | `F9` | Fullscreen the focused agent, managed terminal, or Vim (toggle) |
 | `?` | Full help popup with all keybindings |
@@ -299,7 +302,8 @@ to single leaves Pane 2's agent running in the background.
 
 In a split, focus an agent pane to make it the Target pane. After focus returns
 to the sidebar, single-click or `␣` acts in that pane without moving keyboard
-focus; double-click or `Enter` opens there and transfers focus. The status bar
+focus; a running-row click attaches live while `␣` previews history.
+Double-click or `Enter` opens there and transfers focus. The status bar
 at the bottom-left shows the current layout and Target pane:
 
 | Symbol | Meaning |
@@ -363,15 +367,20 @@ sessions move ahead of the other results.
 ## History preview
 
 For a stopped session, left-click or press `␣` to view conversation history in
-the Target pane without starting or resuming the agent. Preview is read-only: it
-cannot send a message or change the session. User and assistant messages, tool
-calls, and abbreviated tool output are colour-coded, while internal context and
-encrypted reasoning are hidden.
+the Target pane without starting or resuming the agent. For a running session,
+press `␣`, choose **Preview**, or wheel up over its live pane. Preview is
+read-only: it cannot send a message or change the session. User and assistant
+messages, tool calls, and abbreviated tool output are colour-coded, while
+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.
 
 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
-matches, and `q` to exit and restore the pane. Double-click to skip preview and
-open the session directly.
+matches, and `q` to exit. If preview began from a live pane, `q` restores that
+exact session; otherwise it restores the prior Target pane. Double-click to
+skip preview and open the session directly.
 
 ## Status indicators
 

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/README.md

@@ -127,12 +127,14 @@ for focus and layout limits.
 |--------|--------|
 | Left-click (non-running) | Preview session history in the Target pane |
 | Left-click (running) | Switch the Target pane to that session |
+| Wheel up over a live agent | Open its canonical current-branch history |
 | Double-click | Open/attach in the Target pane and move focus there |
 | Right-click | Context menu (Open, Preview, Info, Rename, Star, Copy title, Kill, Term, Delete) |
 
 Unavailable context-menu actions are hidden for the selected session state.
-Single-click and `␣` act in the Target pane without moving keyboard focus;
-double-click and `Enter` also move focus there. The terminal must report mouse
+Single-click and `␣` act in the Target pane without moving keyboard focus, but
+`␣` always means history while a click on a running row means live attach.
+Double-click and `Enter` also move focus there. The terminal must report mouse
 buttons to applications for these actions to reach Railmux. Right-click
 reporting is sometimes a separate setting from ordinary mouse reporting; see
 [FAQ 2](#2-mouse-buttons-or-f8f9-dont-work--whats-wrong).
@@ -165,7 +167,7 @@ see [FAQ 1](#1-how-do-i-copy-text-from-the-agent-pane).
 | `T` | Return to that agent's managed Vim viewer, when open |
 | `m` | Switch agent mode (Claude Code ⇄ Codex) |
 | `o` | Open persistent Railmux options |
-| `␣` | Preview stopped or switch running target (like single-click) |
+| `␣` | Preview canonical history for the selected stopped or running session |
 | `F8` | Cycle agent layout: single → side-by-side → stacked |
 | `F9` | Fullscreen the focused agent, managed terminal, or Vim (toggle) |
 | `?` | Full help popup with all keybindings |
@@ -257,7 +259,8 @@ to single leaves Pane 2's agent running in the background.
 
 In a split, focus an agent pane to make it the Target pane. After focus returns
 to the sidebar, single-click or `␣` acts in that pane without moving keyboard
-focus; double-click or `Enter` opens there and transfers focus. The status bar
+focus; a running-row click attaches live while `␣` previews history.
+Double-click or `Enter` opens there and transfers focus. The status bar
 at the bottom-left shows the current layout and Target pane:
 
 | Symbol | Meaning |
@@ -321,15 +324,20 @@ sessions move ahead of the other results.
 ## History preview
 
 For a stopped session, left-click or press `␣` to view conversation history in
-the Target pane without starting or resuming the agent. Preview is read-only: it
-cannot send a message or change the session. User and assistant messages, tool
-calls, and abbreviated tool output are colour-coded, while internal context and
-encrypted reasoning are hidden.
+the Target pane without starting or resuming the agent. For a running session,
+press `␣`, choose **Preview**, or wheel up over its live pane. Preview is
+read-only: it cannot send a message or change the session. User and assistant
+messages, tool calls, and abbreviated tool output are colour-coded, while
+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.
 
 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
-matches, and `q` to exit and restore the pane. Double-click to skip preview and
-open the session directly.
+matches, and `q` to exit. If preview began from a live pane, `q` restores that
+exact session; otherwise it restores the prior Target pane. Double-click to
+skip preview and open the session directly.
 
 ## Status indicators
 

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/pyproject.toml

@@ -20,6 +20,7 @@ classifiers = [
   "Intended Audience :: Developers",
   "Operating System :: POSIX :: Linux",
   "Operating System :: MacOS",
+  "Operating System :: Microsoft :: Windows",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
@@ -31,15 +32,15 @@ classifiers = [
   "Topic :: Utilities",
 ]
 dependencies = [
-  "packaging>=23.0",
-  "tomlkit>=0.13.2,<1",
-  "urwid>=2.6.16",
-  "tomli>=2.0.1; python_version < '3.11'",
+  "packaging>=23.0; sys_platform != 'win32'",
+  "tomlkit>=0.13.2,<1; sys_platform != 'win32'",
+  "urwid>=2.6.16; sys_platform != 'win32'",
+  "tomli>=2.0.1; python_version < '3.11' and sys_platform != 'win32'",
 ]
 
 [project.optional-dependencies]
 ssh = [
-  "pyte>=0.8.2,<0.9",
+  "pyte>=0.8.2,<0.9; sys_platform != 'win32'",
 ]
 dev = [
   "pytest>=8.0",

railmux-0.4.0.dev4/src/railmux/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.0.dev4"

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/src/railmux/codex_index.py

@@ -25,6 +25,7 @@ from railmux.models import (
     Project,
     SessionMeta,
 )
+from railmux.provider_paths import provider_path
 from railmux.renames import Renames
 
 # Codex has no reliable provider-neutral signal that distinguishes a long
@@ -97,9 +98,10 @@ class HiddenCodexStatus:
 def persistent_cache_path(codex_home: Path) -> Path:
     """Return a private cache path unique to one Codex sessions root."""
     raw_base = os.environ.get("XDG_CACHE_HOME")
+    requested_base = provider_path(raw_base).expanduser() if raw_base else None
     base = (
-        Path(raw_base).expanduser()
-        if raw_base and Path(raw_base).expanduser().is_absolute()
+        requested_base
+        if requested_base is not None and requested_base.is_absolute()
         else Path.home() / ".cache"
     )
     try:
@@ -1036,7 +1038,7 @@ def _parse_codex_session(
     cwd_str = payload.get("cwd")
     if not isinstance(cwd_str, str) or not cwd_str.strip():
         return None
-    cwd = Path(cwd_str)
+    cwd = provider_path(cwd_str)
     forked_from = payload.get("forked_from_id")
     forked_from_id = (
         forked_from

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/src/railmux/config.py

@@ -18,6 +18,7 @@ from railmux.setting_contracts import (
     bounds_for,
     choices_for,
 )
+from railmux.provider_paths import provider_path
 
 
 class ConfigError(ValueError):
@@ -47,7 +48,7 @@ class Config:
         and relative paths are made absolute before a launched Codex changes to
         its project cwd. The directory is not required to exist.
         """
-        path = Path(self.codex_home).expanduser()
+        path = provider_path(self.codex_home).expanduser()
         try:
             return path.resolve()
         except OSError:

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/src/railmux/discovery.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 from railmux.atomic_file import atomic_write_text
 from railmux.models import Project
-from railmux.path_codec import decode
+from railmux.path_codec import decode, is_encoded_project_name
 from railmux.session_index import _looks_like_uuid, _scan_session
 
 
@@ -94,7 +94,7 @@ def list_projects(claude_home: Path) -> list[Project]:
         for entry in scan:
             if not entry.is_dir(follow_symlinks=False):
                 continue
-            if not entry.name.startswith("-"):
+            if not is_encoded_project_name(entry.name):
                 continue
             seen.add(entry.name)
 

railmux-0.4.0.dev4/src/railmux/entrypoint.py

@@ -0,0 +1,21 @@
+"""Platform-safe public console entry point."""
+from __future__ import annotations
+
+import os
+from collections.abc import Sequence
+
+
+def main(
+    argv: Sequence[str] | None = None,
+    *,
+    platform_name: str = os.name,
+) -> int:
+    """Dispatch before importing modules that require a POSIX terminal."""
+    if platform_name == "nt":
+        from railmux.windows_bootstrap import main as windows_main
+
+        return windows_main(argv)
+
+    from railmux.cli import main as posix_main
+
+    return posix_main(list(argv) if argv is not None else None)

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/src/railmux/mouse_manager.py

@@ -157,6 +157,14 @@ class RootWheelForwardingManager:
                             state["backup"], token=token)
                         self._remove_state()
                         state = None
+                    elif not tmux_ctl.root_wheel_bindings_are_current(token):
+                        # The ownership transaction can survive a soft upgrade
+                        # in the same tmux pane. Refresh only an exactly-owned
+                        # wrapper so the new pane-local history route becomes
+                        # active without treating it as a user binding.
+                        if not tmux_ctl.set_root_wheel_forwarding(
+                                state["backup"], token):
+                            return False
                     if state is not None:
                         state["owners"] = sorted(
                             {*state["owners"], self._owner_pane_id})

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/src/railmux/path_codec.py

@@ -9,6 +9,7 @@ directory listings to recover segments with non-ASCII characters.
 from __future__ import annotations
 
 import functools
+import re
 from pathlib import Path
 
 
@@ -21,6 +22,20 @@ from pathlib import Path
 _exists_memo: dict[str, bool] = {}
 _is_dir_memo: dict[str, bool] = {}
 _iterdir_memo: dict[str, list[Path]] = {}
+_WINDOWS_PROJECT_NAME = re.compile(r"^([A-Za-z])--")
+
+
+def is_encoded_project_name(name: str) -> bool:
+    """Return whether *name* is a POSIX or native-Windows Claude project key."""
+    return name.startswith("-") or _WINDOWS_PROJECT_NAME.match(name) is not None
+
+
+def normalize_encoded_project_name(name: str) -> str:
+    """Map Claude's ``C--Users-...`` form to MSYS2's ``-c-Users-...`` form."""
+    match = _WINDOWS_PROJECT_NAME.match(name)
+    if match is None:
+        return name
+    return f"-{match.group(1).lower()}-{name[3:]}"
 
 
 def _m_exists(p: Path) -> bool:
@@ -200,6 +215,7 @@ def decode(encoded: str) -> Path:
     filesystem scan — see ``_scan_recover`` — to recover segments whose
     non-ASCII characters were replaced by dashes during encoding.
     """
+    encoded = normalize_encoded_project_name(encoded)
     if not encoded.startswith("-"):
         raise ValueError(f"encoded name must start with '-': {encoded!r}")
 

railmux-0.4.0.dev4/src/railmux/provider_paths.py

@@ -0,0 +1,41 @@
+"""Translate provider-owned native Windows paths inside the MSYS2 preview."""
+from __future__ import annotations
+
+import os
+import re
+from collections.abc import Mapping
+from pathlib import Path
+
+
+_DRIVE_PATH = re.compile(r"^(?:\\\\\?\\)?([A-Za-z]):[\\/](.*)\Z")
+
+
+def running_in_windows_wrapper(environ: Mapping[str, str] = os.environ) -> bool:
+    """Return whether Railmux is running in its native-Windows MSYS2 wrapper."""
+    return environ.get("RAILMUX_WINDOWS_RUNTIME") == "msys2"
+
+
+def provider_path(
+    raw: str,
+    *,
+    environ: Mapping[str, str] = os.environ,
+) -> Path:
+    """Return a POSIX-visible path for provider metadata.
+
+    Native providers write Windows paths into session metadata. Railmux runs
+    under MSYS2, where the same locations are mounted as ``/c/...`` (or
+    ``//server/share/...`` for UNC paths). Outside the wrapper, preserve the
+    existing POSIX behavior exactly.
+    """
+    if not running_in_windows_wrapper(environ):
+        return Path(raw)
+
+    match = _DRIVE_PATH.match(raw)
+    if match is not None:
+        drive, tail = match.groups()
+        return Path(f"/{drive.lower()}/{tail.replace(chr(92), '/')}")
+
+    if raw.startswith("\\\\"):
+        return Path("//" + raw[2:].replace("\\", "/"))
+
+    return Path(raw.replace("\\", "/"))

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/src/railmux/self_update.py

@@ -141,6 +141,11 @@ def maybe_upgrade_before_launch(
     settings: Settings,
 ) -> None:
     """Check once in the outer launcher and restart after an accepted update."""
+    # Native Windows owns this private venv through the verified bootstrap.
+    # Updating only the inner copy would break its exact-version marker and
+    # could replace files while a tmux generation is still alive.
+    if os.environ.get("RAILMUX_WINDOWS_RUNTIME") == "msys2":
+        return
     policy = settings.update_policy
     if policy == "never":
         return

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/src/railmux/tmux_ctl.py

@@ -1817,6 +1817,18 @@ _PREFIX_TARGET_KEY = "Tab"
 _PREFIX_TARGET_MARKER = "railmux-target-toggle-v1"
 RAILMUX_CONTROLLER_OPTION = "@railmux_controller_pane"
 RAILMUX_TARGET_OPTION = "@railmux_target_pane"
+RAILMUX_HISTORY_PREVIEW_OPTION = "@railmux_history_preview_v1"
+# tmux names function keys only through F12. Private controller routes use
+# canonical xterm sequences in literal mode, so they cannot be confused with
+# user input forwarded to an agent pane.
+RAILMUX_HISTORY_PREVIEW_KEYS = {
+    "primary": ("F21", "\x1b[35~"),
+    "secondary": ("F22", "\x1b[36~"),
+}
+RAILMUX_HISTORY_RESTORE_KEYS = {
+    "primary": ("F23", "\x1b[42~"),
+    "secondary": ("F24", "\x1b[43~"),
+}
 RAILMUX_SELECTION_KEY_OPTION = "@railmux_selection_key"
 RAILMUX_SELECTION_PEER_OPTION = "@railmux_selection_peer"
 RAILMUX_SELECTION_FROZEN_OPTION = "@railmux_selection_frozen_by"
@@ -2145,28 +2157,69 @@ def set_root_wheel_forwarding(
     backup: RootWheelBindingBackup,
     token: str,
 ) -> bool:
-    """Forward both wheel directions to mouse-aware pane applications.
+    """Open canonical live history on wheel-up, otherwise preserve tmux input.
 
     The literal marker makes crash recovery able to distinguish Railmux's
     wrapper from a binding the user installed while Railmux was running.
+    A pane-local primary/secondary marker routes the first live-agent wheel-up
+    to Railmux's controller; the transcript viewer clears that marker, so its
+    subsequent wheel events are forwarded normally.
     Non-mouse-aware panes retain the exact stock fallback; WheelDownPane was
     unbound by default and therefore has no false branch.
     """
     marker = f"{_ROOT_WHEEL_MARKER}-{token}"
-    condition = (
+    mouse_condition = (
         "#{&&:#{mouse_any_flag},"
         f"#{{==:{marker},{marker}}}}}"
     )
+    controller_present = f"#{{!=:#{{{RAILMUX_CONTROLLER_OPTION}}},}}"
+
+    def _preview_condition(slot_key: str) -> str:
+        return (
+            "#{&&:"
+            f"#{{==:#{{{RAILMUX_HISTORY_PREVIEW_OPTION}}},{slot_key}}},"
+            f"{controller_present}}}"
+        )
+
+    def _send_preview(slot_key: str) -> str:
+        _key, sequence = RAILMUX_HISTORY_PREVIEW_KEYS[slot_key]
+        return (
+            f"send-keys -l -t '#{{{RAILMUX_CONTROLLER_OPTION}}}' -- "
+            f"'{sequence}'"
+        )
+
     try:
         for key in _ROOT_WHEEL_KEYS:
+            binding = backup.get(key)
+            fallback = _binding_command(binding) if binding is not None else ""
+            mouse_fallback = (
+                f"if-shell -F -t = '{mouse_condition}' 'send-keys -M'"
+            )
+            if fallback:
+                mouse_fallback += f" '{fallback}'"
             args = [
                 "tmux", "bind-key", "-T", "root", key,
-                "if-shell", "-F", "-t", "=", condition,
-                "send-keys -M",
             ]
-            binding = backup.get(key)
-            if binding is not None:
-                args.append(_binding_command(binding))
+            if key == "WheelUpPane":
+                secondary_fallback = (
+                    "if-shell -F -t = "
+                    f"'{_preview_condition('secondary')}' "
+                    f"\"{_send_preview('secondary')}\" "
+                    f"\"{mouse_fallback}\""
+                )
+                args.extend([
+                    "if-shell", "-F", "-t", "=",
+                    _preview_condition("primary"),
+                    _send_preview("primary"),
+                    secondary_fallback,
+                ])
+            else:
+                args.extend([
+                    "if-shell", "-F", "-t", "=", mouse_condition,
+                    "send-keys -M",
+                ])
+                if fallback:
+                    args.append(fallback)
             subprocess.check_call(
                 args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     except (ValueError, subprocess.CalledProcessError, FileNotFoundError):
@@ -2186,6 +2239,28 @@ def root_wheel_bindings_owned_by(token: str) -> bool:
     )
 
 
+def root_wheel_bindings_are_current(token: str) -> bool:
+    """Whether the owned wrapper includes canonical-history routing."""
+    bindings = read_root_wheel_bindings()
+    up = bindings.get("WheelUpPane")
+    marker = f"{_ROOT_WHEEL_MARKER}-{token}"
+    return (
+        all(
+            binding is not None
+            and marker in binding
+            and "mouse_any_flag" in binding
+            and "send-keys -M" in binding
+            for binding in bindings.values()
+        )
+        and up is not None
+        and RAILMUX_HISTORY_PREVIEW_OPTION in up
+        and all(
+            sequence in up or sequence.replace("\x1b", r"\033") in up
+            for _key, sequence in RAILMUX_HISTORY_PREVIEW_KEYS.values()
+        )
+    )
+
+
 def root_wheel_binding_is_original_or_owned(
     key: str,
     binding: str | None,

{railmux-0.4.0.dev3 → railmux-0.4.0.dev4}/src/railmux/transcript.py

@@ -295,6 +295,81 @@ def _render_claude_native_tool_results(
         yield RESET
 
 
+def _claude_current_branch(records: list[dict]) -> list[dict]:
+    """Project an append-only Claude JSONL onto its current main branch.
+
+    Claude Code links semantic records with ``uuid`` / ``parentUuid``. Editing
+    or rewinding a prompt appends a second child instead of removing the old
+    suffix, so file order is not conversation order. The newest non-sidechain
+    UUID is the active tip; walking its parents retains the shared prefix and
+    the replacement suffix while excluding abandoned and sub-agent branches.
+
+    UUID-less metadata is retained for the normal renderer filters. If the
+    input is a bounded tail, walking stops safely at the first missing parent.
+    """
+    by_uuid: dict[str, dict] = {}
+    tip: str | None = None
+    for record in records:
+        uuid = record.get("uuid")
+        if not isinstance(uuid, str) or not uuid:
+            continue
+        by_uuid[uuid] = record
+        if record.get("isSidechain") is not True:
+            tip = uuid
+    if tip is None:
+        return records
+
+    current: set[str] = set()
+    cursor: str | None = tip
+    while cursor and cursor not in current:
+        record = by_uuid.get(cursor)
+        if record is None:
+            break
+        current.add(cursor)
+        parent = record.get("parentUuid")
+        cursor = parent if isinstance(parent, str) and parent else None
+
+    return [
+        record for record in records
+        if not isinstance(record.get("uuid"), str)
+        or not record.get("uuid")
+        or record["uuid"] in current
+    ]
+
+
+def _render_claude_records(
+    records: list[dict], *, claude_native: bool,
+):
+    """Render only the active Claude branch from buffered JSONL records."""
+    calls: dict[str, str] = {}
+    for record in _claude_current_branch(records):
+        rtype = record.get("type", "")
+        if rtype in _SKIP_TYPES:
+            continue
+        if _is_real_user(record):
+            rendered = (
+                _render_claude_native_user(record)
+                if claude_native
+                else _render_user(record)
+            )
+            if rendered:
+                yield rendered
+        if rtype == "user":
+            renderer = (
+                _render_claude_native_tool_results
+                if claude_native
+                else _render_claude_tool_results
+            )
+            yield from renderer(record, calls)
+        elif rtype == "assistant":
+            renderer = (
+                _render_claude_native_assistant
+                if claude_native
+                else _render_assistant_blocks
+            )
+            yield from renderer(record, calls)
+
+
 def format_transcript(
     source: Path | object,
     fmt: str | None = None,
@@ -326,7 +401,10 @@ def format_transcript(
     # call_id -> tool name, so Codex tool outputs can be labelled with the
     # call that produced them (issue #3).
     codex_calls: dict[str, str] = {}
-    claude_calls: dict[str, str] = {}
+    # Claude rewind/edit branches live in one append-only JSONL, so those
+    # records must be buffered until the active tip is known. Production
+    # callers bound the input to the latest 2,000 records.
+    claude_records: list[dict] = []
     try:
         if isinstance(source, Path):
             fh = open(source, "r", encoding="utf-8")
@@ -360,33 +438,10 @@ def format_transcript(
             if _codex:
                 yield from _render_codex(record, codex_calls)
                 continue
-
-            # -- Claude format (legacy) --------------------------------
-            if rtype in _SKIP_TYPES:
-                continue
-
-            if _is_real_user(record):
-                rendered = (
-                    _render_claude_native_user(record)
-                    if claude_native
-                    else _render_user(record)
-                )
-                if rendered:
-                    yield rendered
-            if rtype == "user":
-                renderer = (
-                    _render_claude_native_tool_results
-                    if claude_native
-                    else _render_claude_tool_results
-                )
-                yield from renderer(record, claude_calls)
-            elif rtype == "assistant":
-                renderer = (
-                    _render_claude_native_assistant
-                    if claude_native
-                    else _render_assistant_blocks
-                )
-                yield from renderer(record, claude_calls)
+            claude_records.append(record)
+        if _codex is False:
+            yield from _render_claude_records(
+                claude_records, claude_native=claude_native)
     except OSError:
         yield f"{YELLOW}Could not read: {source}{RESET}\n"
     finally: