railmux 0.4.0.dev11__tar.gz → 0.4.0.dev13__tar.gz

{railmux-0.4.0.dev11/src/railmux.egg-info → railmux-0.4.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.4.0.dev11
+Version: 0.4.0.dev13
 Summary: Terminal UI to navigate, resume, and start Claude Code and Codex sessions
 Author-email: Rightglow <zhang.taian@foxmail.com>
 License-Expression: MIT
@@ -205,7 +205,7 @@ see [FAQ 1](#1-how-do-i-copy-text-from-the-agent-pane).
 | `r` | Rename the focused session |
 | `s` | Toggle star — starred sessions pinned to top with ⭐ |
 | `k` | Kill the running agent process (keeps session file) |
-| `d` | Delete the focused session (prompts for confirmation) |
+| `d` | Delete the focused session (confirms, then finishes in background) |
 | `t` | Open or return to the managed terminal below the Target agent |
 | `T` | Return to that agent's managed Vim viewer, when open |
 | `m` | Switch agent mode (Claude Code ⇄ Codex) |
@@ -243,6 +243,11 @@ The rename popup starts with the current title pre-filled. Press
 `Ctrl-U` to clear the entire input, `Enter` to save a non-empty title, or `Esc`
 to cancel.
 
+After a delete is confirmed, its popup closes immediately. The bottom-right
+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 `/`
 shows the current value. Press `Ctrl-U` in the filter editor to clear it, then
@@ -375,8 +380,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.4.0.dev11 → railmux-0.4.0.dev13}/README.md

@@ -162,7 +162,7 @@ see [FAQ 1](#1-how-do-i-copy-text-from-the-agent-pane).
 | `r` | Rename the focused session |
 | `s` | Toggle star — starred sessions pinned to top with ⭐ |
 | `k` | Kill the running agent process (keeps session file) |
-| `d` | Delete the focused session (prompts for confirmation) |
+| `d` | Delete the focused session (confirms, then finishes in background) |
 | `t` | Open or return to the managed terminal below the Target agent |
 | `T` | Return to that agent's managed Vim viewer, when open |
 | `m` | Switch agent mode (Claude Code ⇄ Codex) |
@@ -200,6 +200,11 @@ The rename popup starts with the current title pre-filled. Press
 `Ctrl-U` to clear the entire input, `Enter` to save a non-empty title, or `Esc`
 to cancel.
 
+After a delete is confirmed, its popup closes immediately. The bottom-right
+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 `/`
 shows the current value. Press `Ctrl-U` in the filter editor to clear it, then
@@ -332,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.4.0.dev13/src/railmux/__init__.py

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

{railmux-0.4.0.dev11 → railmux-0.4.0.dev13}/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.4.0.dev11 → railmux-0.4.0.dev13}/src/railmux/tmux_ctl.py

@@ -3457,14 +3457,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
@@ -3474,10 +3475,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.4.0.dev11 → railmux-0.4.0.dev13}/src/railmux/tmux_server.py

@@ -22,6 +22,8 @@ _SESSION_ID_RE = re.compile(r"[A-Za-z0-9-]{1,256}\Z")
 _HISTORY_SOURCE_SCHEMA = 1
 _TRANSCRIPT_SOURCE_SCHEMA = 1
 _MAX_TRANSCRIPT_SOURCE_BYTES = 8192
+_DEFAULT_DISCOVERY_TIMEOUT = 2.0
+_WINDOWS_DISCOVERY_TIMEOUT = 5.0
 
 
 class TmuxServerError(RuntimeError):
@@ -179,10 +181,25 @@ def current_target(
 
 def discover_target(
     *,
-    timeout: float = 2.0,
+    timeout: float | None = None,
     env: Mapping[str, str] | None = None,
 ) -> TmuxServerTarget | None:
-    """Resolve the live dedicated server without starting a new server."""
+    """Resolve the live dedicated server without starting a new server.
+
+    MSYS2 tmux can need slightly more than two seconds to classify an
+    abandoned AF_UNIX pathname as having no live server.  Give only the
+    managed Windows wrapper enough time to receive that authoritative result;
+    explicit watchdog probes retain their caller-selected bounds.
+    """
+    if timeout is None:
+        from railmux.provider_paths import running_in_windows_wrapper
+
+        source = os.environ if env is None else env
+        timeout = (
+            _WINDOWS_DISCOVERY_TIMEOUT
+            if running_in_windows_wrapper(source)
+            else _DEFAULT_DISCOVERY_TIMEOUT
+        )
     return _discover_label_target(socket_label(env), timeout=timeout, env=env)
 
 
@@ -307,11 +324,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 +375,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 +384,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)