railmux 0.3.3.dev5__tar.gz → 0.3.4.dev1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.3.3.dev5
+Version: 0.3.4.dev1
 Summary: Terminal UI to navigate, resume, and start Claude Code and Codex sessions
 Author-email: Rightglow <zhang.taian@foxmail.com>
 License-Expression: MIT
@@ -169,7 +169,7 @@ 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 |
+| Wheel over a live agent | Scroll its live terminal history (native locally, Railmux-managed over `railmux ssh`) |
 | 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) |
 
@@ -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 `/`
@@ -371,15 +372,21 @@ sessions move ahead of the other results.
 
 For a stopped session, left-click or press `␣` to view conversation history in
 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. 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.
+press `␣` or choose **Preview**. 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.
+
+Scrolling a live agent does not enter Preview. Direct `railmux` uses the
+terminal/tmux scrolling behavior; `railmux ssh` keeps its own bounded,
+per-pane history and normally preserves the live terminal's captured styling.
+When Railmux confirms that a running Codex session advanced after rewind or
+steering, it resets only the current terminal view before Codex redraws and
+invalidates that pane's SSH history generation. Retained tmux scrollback is not
+erased; the SSH history for that branched generation uses the canonical
+rollout so its abandoned suffix stays 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

{railmux-0.3.3.dev5 → railmux-0.3.4.dev1}/README.md

@@ -127,7 +127,7 @@ 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 |
+| Wheel over a live agent | Scroll its live terminal history (native locally, Railmux-managed over `railmux ssh`) |
 | 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) |
 
@@ -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 `/`
@@ -329,15 +330,21 @@ sessions move ahead of the other results.
 
 For a stopped session, left-click or press `␣` to view conversation history in
 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. 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.
+press `␣` or choose **Preview**. 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.
+
+Scrolling a live agent does not enter Preview. Direct `railmux` uses the
+terminal/tmux scrolling behavior; `railmux ssh` keeps its own bounded,
+per-pane history and normally preserves the live terminal's captured styling.
+When Railmux confirms that a running Codex session advanced after rewind or
+steering, it resets only the current terminal view before Codex redraws and
+invalidates that pane's SSH history generation. Retained tmux scrollback is not
+erased; the SSH history for that branched generation uses the canonical
+rollout so its abandoned suffix stays 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

railmux-0.3.4.dev1/src/railmux/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.4.dev1"

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

@@ -403,8 +403,10 @@ 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
+    canonical_history: bool = False
 
 
 @dataclass(frozen=True)
@@ -431,11 +433,14 @@ _HISTORY_GENERATION_RE = re.compile(
 
 def _history_generation(marker: str) -> int:
     """Map one validated provider UUID to a bounded opaque wire epoch."""
+    generation_marker = marker
+    if marker.startswith(tmux_ctl.RAILMUX_CANONICAL_HISTORY_PREFIX):
+        marker = marker[len(tmux_ctl.RAILMUX_CANONICAL_HISTORY_PREFIX):]
     if not _HISTORY_GENERATION_RE.fullmatch(marker):
         return 0
     return int.from_bytes(
         hashlib.blake2b(
-            marker.lower().encode("ascii"),
+            generation_marker.lower().encode("ascii"),
             digest_size=8,
             person=b"railmux-history",
         ).digest(),
@@ -916,10 +921,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,7 +939,17 @@ 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])
+        history_marker = fields[15]
+        canonical_history = bool(
+            transcript_backed
+            and transcript_locator is not None
+            and history_marker == (
+                f"{tmux_ctl.RAILMUX_CANONICAL_HISTORY_PREFIX}"
+                f"{transcript_locator.session_id}"
+            )
+        )
         rows.append(
             (
                 fields[2] == "1",
@@ -951,8 +967,14 @@ 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]),
+                    history_generation=_history_generation(history_marker),
+                    canonical_history=canonical_history,
                 ),
             )
         )
@@ -1267,7 +1289,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 +1354,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" and pane.canonical_history)
+            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 +1420,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.4.dev1}/src/railmux/tmux_ctl.py

@@ -1434,6 +1434,18 @@ def set_pane_user_option(target_pane: str, name: str,
         return False
 
 
+def pane_user_option(target_pane: str, name: str) -> str | None:
+    """Read one pane-local user option, returning ``None`` when unavailable."""
+    try:
+        value = subprocess.check_output(
+            ["tmux", "show-options", "-pv", "-t", target_pane, name],
+            stderr=subprocess.DEVNULL,
+        ).decode().strip()
+    except (OSError, subprocess.CalledProcessError, UnicodeError):
+        return None
+    return value or None
+
+
 def unset_pane_user_option_if_value(target_pane: str, name: str,
                                     expected: str) -> bool:
     """Unset a pane option only when Railmux still owns its exact value."""
@@ -1824,15 +1836,14 @@ _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"
 RAILMUX_HISTORY_GENERATION_OPTION = "@railmux_history_generation_v1"
-# tmux names function keys only through F12. Private controller routes use
+# A confirmed branch transition prefixes the opaque SSH history cache epoch.
+# Plain generations use native pane history; only this explicit marker permits
+# the canonical transcript fallback that removes an abandoned rewind suffix.
+RAILMUX_CANONICAL_HISTORY_PREFIX = "canonical:"
+# tmux names function keys only through F12. Private restore 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~"),
@@ -2165,69 +2176,30 @@ def set_root_wheel_forwarding(
     backup: RootWheelBindingBackup,
     token: str,
 ) -> bool:
-    """Open canonical live history on wheel-up, otherwise preserve tmux input.
+    """Preserve terminal-native wheel behavior under shared ownership.
 
     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.
+    Mouse-aware panes receive the original report, while non-mouse-aware panes
+    retain the exact stock fallback (including native copy-mode on wheel-up).
+    A live wheel must never be converted into Railmux's transcript Preview.
     """
     marker = f"{_ROOT_WHEEL_MARKER}-{token}"
     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", "=", mouse_condition,
+                "send-keys -M",
             ]
-            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)
+            if fallback:
+                args.append(fallback)
             subprocess.check_call(
                 args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     except (ValueError, subprocess.CalledProcessError, FileNotFoundError):
@@ -2248,7 +2220,7 @@ 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."""
+    """Whether the owned wrapper preserves native live-pane scrolling."""
     bindings = read_root_wheel_bindings()
     up = bindings.get("WheelUpPane")
     marker = f"{_ROOT_WHEEL_MARKER}-{token}"
@@ -2261,11 +2233,14 @@ def root_wheel_bindings_are_current(token: str) -> bool:
             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()
-        )
+        and "copy-mode -e" in up
+        # Reject the 0.3.3 wrapper during a soft upgrade. It routed live wheel
+        # input through private F21/F22 keys into transcript Preview.
+        and "@railmux_history_preview_v1" not in up
+        and r"\033[35~" not in up
+        and r"\033[36~" not in up
+        and "\x1b[35~" not in up
+        and "\x1b[36~" not in up
     )
 
 
@@ -3355,14 +3330,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 +3348,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.4.dev1}/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)