railmux 0.4.0.dev7__tar.gz → 0.4.0.dev9__tar.gz

{railmux-0.4.0.dev7/src/railmux.egg-info → railmux-0.4.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.4.0.dev7
+Version: 0.4.0.dev9
 Summary: Terminal UI to navigate, resume, and start Claude Code and Codex sessions
 Author-email: Rightglow <zhang.taian@foxmail.com>
 License-Expression: MIT
@@ -374,7 +374,9 @@ 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.
+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.
 
 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.dev7 → railmux-0.4.0.dev9}/README.md

@@ -331,7 +331,9 @@ 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.
+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.
 
 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.dev9/src/railmux/__init__.py

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

{railmux-0.4.0.dev7 → railmux-0.4.0.dev9}/src/railmux/cli.py

@@ -24,12 +24,15 @@ from railmux.system_deps import ensure_tmux_available
 from railmux.ssh_args import AppendSshArgument, ExtendSshArguments
 
 
-def _show_startup_message() -> None:
+def _show_startup_message(
+    detail: str = "Reconnecting sessions and panes…",
+) -> None:
     """Paint immediate feedback before App performs its initial discovery."""
     if not sys.stdout.isatty():
         return
     size = shutil.get_terminal_size((80, 24))
-    sys.stdout.write(render_startup_surface(size.columns, size.lines))
+    sys.stdout.write(render_startup_surface(
+        size.columns, size.lines, detail=detail))
     sys.stdout.flush()
 
 
@@ -441,6 +444,7 @@ def main(argv: list[str] | None = None) -> int:
     _show_startup_message()
     # Lazy import so non-TUI invocations (--version etc) don't pull urwid.
     from railmux.ui.app import App
+    from railmux.provider_paths import running_in_windows_wrapper
     app = App(
         claude_home=Path(args.claude_home),
         config=config,
@@ -451,6 +455,10 @@ def main(argv: list[str] | None = None) -> int:
             is_ssh_session() if args.scroll_coalescing is None
             else args.scroll_coalescing
         ),
+        startup_progress=(
+            _show_startup_message
+            if running_in_windows_wrapper() else None
+        ),
     )
     app.run()
     return 0

{railmux-0.4.0.dev7 → railmux-0.4.0.dev9}/src/railmux/discovery.py

@@ -1,8 +1,10 @@
 """Enumerate Claude project directories from ~/.claude/projects/."""
 from __future__ import annotations
 
+import hashlib
 import json
 import os
+import stat
 from pathlib import Path
 
 from railmux.atomic_file import atomic_write_text
@@ -19,6 +21,134 @@ _cache: dict[Path, tuple[int, list[Project]]] = {}
 _session_validity: dict[
     Path, dict[Path, tuple[tuple[int, int, int], bool]]
 ] = {}
+_persistent_validity_loaded: set[Path] = set()
+_persistent_validity_exact_only: set[Path] = set()
+_persistent_validity_dirty: set[Path] = set()
+_VALIDITY_CACHE_SCHEMA = 1
+_VALIDITY_CACHE_LIMIT = 16 * 1024 * 1024
+_VALIDITY_RECORD_LIMIT = 100_000
+
+
+def _windows_validity_cache_enabled() -> bool:
+    return os.environ.get("RAILMUX_WINDOWS_RUNTIME") == "msys2"
+
+
+def _validity_cache_file(claude_home: Path) -> Path:
+    base = Path(os.environ.get("XDG_CACHE_HOME", Path.home() / ".cache"))
+    identity = hashlib.sha256(
+        os.fsencode(os.path.abspath(claude_home))
+    ).hexdigest()[:16]
+    return base / "railmux" / f"claude-validity-{identity}.json"
+
+
+def _load_persistent_validity(claude_home: Path) -> None:
+    if (
+        not _windows_validity_cache_enabled()
+        or claude_home in _persistent_validity_loaded
+    ):
+        return
+    _persistent_validity_loaded.add(claude_home)
+    path = _validity_cache_file(claude_home)
+    try:
+        info = path.lstat()
+        if (
+            not stat.S_ISREG(info.st_mode)
+            or info.st_uid != os.getuid()
+            or info.st_size > _VALIDITY_CACHE_LIMIT
+            or info.st_mode & 0o077
+        ):
+            return
+        raw = json.loads(path.read_text(encoding="utf-8"))
+    except (OSError, UnicodeError, json.JSONDecodeError):
+        return
+    if not isinstance(raw, dict) or raw.get("schema") != _VALIDITY_CACHE_SCHEMA:
+        return
+    records = raw.get("records")
+    if not isinstance(records, list) or len(records) > _VALIDITY_RECORD_LIMIT:
+        return
+    projects_dir = claude_home / "projects"
+    loaded: list[Path] = []
+    try:
+        for record in records:
+            if not isinstance(record, list) or len(record) != 6:
+                raise ValueError("invalid validity record")
+            project, filename, inode, mtime_ns, size, valid = record
+            if (
+                not isinstance(project, str)
+                or not is_encoded_project_name(project)
+                or not isinstance(filename, str)
+                or Path(filename).name != filename
+                or not filename.endswith(".jsonl")
+                or not _looks_like_uuid(Path(filename).stem)
+                or not all(isinstance(value, int) and value >= 0
+                           for value in (inode, mtime_ns, size))
+                or not isinstance(valid, bool)
+            ):
+                raise ValueError("invalid validity record")
+            project_dir = projects_dir / project
+            session_path = project_dir / filename
+            _session_validity.setdefault(project_dir, {})[session_path] = (
+                (inode, mtime_ns, size), valid,
+            )
+            loaded.append(session_path)
+    except ValueError:
+        for session_path in loaded:
+            cached = _session_validity.get(session_path.parent)
+            if cached is not None:
+                cached.pop(session_path, None)
+                if not cached:
+                    _session_validity.pop(session_path.parent, None)
+        return
+    _persistent_validity_exact_only.update(loaded)
+
+
+def _mark_persistent_validity_dirty(claude_dir: Path) -> None:
+    if _windows_validity_cache_enabled():
+        _persistent_validity_dirty.add(claude_dir.parent.parent)
+
+
+def _save_persistent_validity(claude_home: Path) -> None:
+    if (
+        not _windows_validity_cache_enabled()
+        or claude_home not in _persistent_validity_dirty
+    ):
+        return
+    projects_dir = claude_home / "projects"
+    records: list[list[object]] = []
+    for project_dir, values in _session_validity.items():
+        if (
+            project_dir.parent != projects_dir
+            or not is_encoded_project_name(project_dir.name)
+        ):
+            continue
+        for session_path, (signature, valid) in values.items():
+            if session_path.parent != project_dir:
+                continue
+            inode, mtime_ns, size = signature
+            records.append([
+                project_dir.name,
+                session_path.name,
+                inode,
+                mtime_ns,
+                size,
+                valid,
+            ])
+    records.sort(key=lambda item: int(item[3]), reverse=True)
+    records = records[:_VALIDITY_RECORD_LIMIT]
+    path = _validity_cache_file(claude_home)
+    try:
+        path.parent.mkdir(parents=True, exist_ok=True)
+        atomic_write_text(
+            path,
+            json.dumps(
+                {"schema": _VALIDITY_CACHE_SCHEMA, "records": records},
+                separators=(",", ":"),
+            ),
+        )
+        os.chmod(path, 0o600)
+    except OSError:
+        return
+    _persistent_validity_dirty.discard(claude_home)
 
 
 def invalidate_session(path: Path) -> None:
@@ -27,6 +157,8 @@ def invalidate_session(path: Path) -> None:
     if cached is None:
         return
     cached.pop(path, None)
+    _persistent_validity_exact_only.discard(path)
+    _mark_persistent_validity_dirty(path.parent)
     if not cached:
         _session_validity.pop(path.parent, None)
 
@@ -64,6 +196,7 @@ def list_projects(claude_home: Path) -> list[Project]:
     session counts and recency track files created, changed, or removed below
     the cached top-level directory.
     """
+    _load_persistent_validity(claude_home)
     projects_dir = claude_home / "projects"
     if not projects_dir.is_dir():
         return []
@@ -79,6 +212,7 @@ def list_projects(claude_home: Path) -> list[Project]:
         # without re-decoding every project name.
         refreshed = _refresh_activity(cached[1])
         _cache[claude_home] = (parent_mtime, refreshed)
+        _save_persistent_validity(claude_home)
         return refreshed
 
     # Full scan needed.
@@ -153,6 +287,7 @@ def list_projects(claude_home: Path) -> list[Project]:
 
     results.sort(key=lambda p: p.last_activity_ts, reverse=True)
     _cache[claude_home] = (parent_mtime, results)
+    _save_persistent_validity(claude_home)
     return results
 
 
@@ -198,6 +333,7 @@ def _count_and_latest_mtime(claude_dir: Path, real_path: Path) -> tuple[int, flo
             if cached is not None and cached[0] == signature:
                 valid = cached[1]
             elif (cached is not None and cached[1]
+                  and path not in _persistent_validity_exact_only
                   and cached[0][0] == stat.st_ino
                   and stat.st_size > cached[0][2]):
                 # Claude session JSONLs are append-only. Once a file is valid,
@@ -208,9 +344,12 @@ def _count_and_latest_mtime(claude_dir: Path, real_path: Path) -> tuple[int, flo
                 # explicitly via ``invalidate_session``).
                 valid = True
                 validity[path] = (signature, True)
+                _mark_persistent_validity_dirty(claude_dir)
             else:
                 valid = _scan_session(temp_project, path) is not None
                 validity[path] = (signature, valid)
+                _persistent_validity_exact_only.discard(path)
+                _mark_persistent_validity_dirty(claude_dir)
             if not valid:
                 continue
             count += 1
@@ -219,6 +358,8 @@ def _count_and_latest_mtime(claude_dir: Path, real_path: Path) -> tuple[int, flo
                 latest = m
     for stale in set(validity) - current_paths:
         del validity[stale]
+        _persistent_validity_exact_only.discard(stale)
+        _mark_persistent_validity_dirty(claude_dir)
     if not validity:
         _session_validity.pop(claude_dir, None)
     return count, latest

{railmux-0.4.0.dev7 → railmux-0.4.0.dev9}/src/railmux/fast_display_client.py

@@ -1074,7 +1074,7 @@ class TerminalSurface:
         self,
         requested: TerminalMode,
     ) -> TerminalMode:
-        """Mirror only input-affecting modes explicitly carried by protocol v14."""
+        """Mirror only input-affecting modes explicitly carried by protocol v15."""
         disabled = self.terminal_modes & ~requested
         enabled = requested & ~self.terminal_modes
         controls: list[bytes] = []
@@ -2013,7 +2013,7 @@ def _finish_remote_attach(
         raise ProbeError("remote display helper failed before attaching")
 
     _stop_unstarted_remote(process)
-    # A current v14 helper holds the mutex only while registering its exact tmux
+    # A current v15 helper holds the mutex only while registering its exact tmux
     # child. Give that ordinary race one fresh SSH process before presenting
     # the explicit legacy-lock takeover choice.
     time.sleep(_REMOTE_ATTACH_RETRY_DELAY)

{railmux-0.4.0.dev7 → railmux-0.4.0.dev9}/src/railmux/fast_display_history.py

@@ -207,7 +207,11 @@ class LocalHistoryView:
         restore_live = False
         for pane_id, viewport in tuple(self.viewports.items()):
             route = routes.get(pane_id)
-            if route is None or not self._same_geometry(viewport.snapshot, route):
+            if (
+                route is None
+                or not self._same_geometry(viewport.snapshot, route)
+                or not self._history_source_matches(viewport.snapshot, route)
+            ):
                 self.cancel_pane(pane_id)
                 restore_live = True
         return HistoryAction(restore_live=restore_live)
@@ -217,10 +221,11 @@ class LocalHistoryView:
         left: HistorySnapshot,
         right: HistorySnapshot,
     ) -> bool:
-        """Do not combine native, transcript, and undecided history."""
+        """Do not combine different providers or terminal generations."""
         return (
             left.transcript_backed == right.transcript_backed
             and left.history_choice_required == right.history_choice_required
+            and left.generation == right.generation
         )
 
     @staticmethod
@@ -813,7 +818,11 @@ class LocalHistoryView:
             ),
             None,
         )
-        if route is None or not self._same_geometry(route, snapshot):
+        if (
+            route is None
+            or not self._same_geometry(route, snapshot)
+            or not self._history_source_matches(route, snapshot)
+        ):
             return HistoryAction()
         viewport = self.viewports.get(pending.pane_id)
         if viewport is None:

{railmux-0.4.0.dev7 → railmux-0.4.0.dev9}/src/railmux/fast_display_protocol.py

@@ -1,4 +1,4 @@
-"""Private v14 framing for the coalesced full-window SSH display."""
+"""Private v15 framing for the coalesced full-window SSH display."""
 
 from __future__ import annotations
 
@@ -8,9 +8,9 @@ from dataclasses import dataclass
 from enum import IntEnum, IntFlag
 
 
-DISPLAY_MAGIC = b"RMUXD14\x00"
-INPUT_MAGIC = b"RMUXK14\x00"
-PROTOCOL_VERSION = 14
+DISPLAY_MAGIC = b"RMUXD15\x00"
+INPUT_MAGIC = b"RMUXK15\x00"
+PROTOCOL_VERSION = 15
 REMOTE_CONFIG_PROTOCOL = 1
 LENGTH_BYTES = 4
 REMOTE_HELLO_PREFIX = b"RAILMUX-REMOTE/1 "
@@ -28,10 +28,10 @@ MAX_HISTORY_PANES = 8
 MAX_CLIPBOARD_BYTES = 64 * 1024
 MAX_PATH_BYTES = 4096
 _UPDATE_METADATA = struct.Struct(">BIHHHHBHI")
-_HISTORY_METADATA = struct.Struct(">IIHHHHBI")
+_HISTORY_METADATA = struct.Struct(">IIHHHHBQI")
 _HISTORY_REQUEST = struct.Struct(">IHHH")
 _HISTORY_BATCH_METADATA = struct.Struct(">II")
-_HISTORY_PANE_METADATA = struct.Struct(">IHHHHB")
+_HISTORY_PANE_METADATA = struct.Struct(">IHHHHBQ")
 _PREFETCH_HISTORY_REQUEST = struct.Struct(">IH")
 _PATH_REQUEST = struct.Struct(">IIH")
 _PATH_RESULT = struct.Struct(">IBBH")
@@ -143,6 +143,7 @@ class HistorySnapshot:
     more_available: bool = False
     transcript_available: bool = False
     history_choice_required: bool = False
+    generation: int = 0
 
 
 @dataclass(frozen=True)
@@ -302,6 +303,7 @@ def encode_history_snapshot(snapshot: HistorySnapshot) -> bytes:
             snapshot.more_available,
             snapshot.transcript_available,
             snapshot.history_choice_required,
+            snapshot.generation,
         )):
             raise ValueError("a rejected history response must be empty")
         pane_number = 0
@@ -317,6 +319,8 @@ def encode_history_snapshot(snapshot: HistorySnapshot) -> bytes:
             raise ValueError("invalid history position")
         if len(snapshot.lines) < snapshot.height:
             raise ValueError("history snapshot is shorter than its viewport")
+        if not 0 <= snapshot.generation <= 0xFFFFFFFFFFFFFFFF:
+            raise ValueError("invalid history generation")
     raw_lines = _pack_history_lines(snapshot.lines)
     compressed = zlib.compress(raw_lines, level=3)
     metadata = _HISTORY_METADATA.pack(
@@ -327,6 +331,7 @@ def encode_history_snapshot(snapshot: HistorySnapshot) -> bytes:
         snapshot.width,
         snapshot.height,
         _history_capabilities(snapshot),
+        snapshot.generation,
         len(raw_lines),
     )
     payload = bytes((int(OutputKind.HISTORY),)) + metadata + compressed
@@ -360,6 +365,8 @@ def encode_history_batch(batch: HistoryBatch) -> bytes:
             raise ValueError("invalid history position")
         if len(snapshot.lines) < snapshot.height:
             raise ValueError("history snapshot is shorter than its viewport")
+        if not 0 <= snapshot.generation <= 0xFFFFFFFFFFFFFFFF:
+            raise ValueError("invalid history generation")
         packed_lines = _pack_history_lines(snapshot.lines)
         pane_metadata = _HISTORY_PANE_METADATA.pack(
             pane_number,
@@ -368,6 +375,7 @@ def encode_history_batch(batch: HistoryBatch) -> bytes:
             snapshot.width,
             snapshot.height,
             _history_capabilities(snapshot),
+            snapshot.generation,
         )
         total += len(pane_metadata) + len(packed_lines)
         if total > MAX_SCREEN_BYTES:
@@ -611,6 +619,7 @@ class ServerMessageDecoder:
                         width,
                         height,
                         raw_capabilities,
+                        generation,
                         raw_size,
                     ) = (
                         _HISTORY_METADATA.unpack(body[:_HISTORY_METADATA.size])
@@ -628,6 +637,7 @@ class ServerMessageDecoder:
                             height,
                             lines,
                             raw_capabilities,
+                            generation,
                         )):
                             raise ValueError("invalid rejected history response")
                         pane_id = None
@@ -662,6 +672,7 @@ class ServerMessageDecoder:
                         history_choice_required=bool(
                             raw_capabilities & _HISTORY_CHOICE_REQUIRED
                         ),
+                        generation=generation,
                     ))
                     continue
                 if output_kind is OutputKind.HISTORY_BATCH:
@@ -691,6 +702,7 @@ class ServerMessageDecoder:
                             width,
                             height,
                             raw_capabilities,
+                            generation,
                         ) = _HISTORY_PANE_METADATA.unpack(
                             raw[offset:offset + _HISTORY_PANE_METADATA.size]
                         )
@@ -729,6 +741,7 @@ class ServerMessageDecoder:
                             history_choice_required=bool(
                                 raw_capabilities & _HISTORY_CHOICE_REQUIRED
                             ),
+                            generation=generation,
                         ))
                     if offset != len(raw):
                         raise ValueError("trailing history batch data")
@@ -843,7 +856,7 @@ class ServerMessageDecoder:
 
 
 class ScreenUpdateDecoder:
-    """Compatibility view which ignores v14 control-response messages."""
+    """Compatibility view which ignores v15 control-response messages."""
 
     def __init__(self) -> None:
         self._decoder = ServerMessageDecoder()

{railmux-0.4.0.dev7 → railmux-0.4.0.dev9}/src/railmux/fast_display_server.py

@@ -45,6 +45,7 @@ from railmux import (
     __version__,
     local_open,
     restart_state,
+    tmux_ctl,
     tmux_health,
     tmux_server,
 )
@@ -403,6 +404,7 @@ class _PaneGeometry:
     transcript_source: str | None = None
     transcript_backed: bool = False
     claude_history_policy: str = "ask"
+    history_generation: int = 0
 
 
 @dataclass(frozen=True)
@@ -421,6 +423,24 @@ _INFERRED_TRANSCRIPT_LIMIT = 8
 _TRANSCRIPT_MAX_BYTES = 32 * 1024 * 1024
 _SESSION_BINDING_OPTION = "@railmux_binding_v1"
 _SWAP_OPTIONS = ("@railmux_swap_primary", "@railmux_swap_secondary")
+_HISTORY_GENERATION_RE = re.compile(
+    r"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-"
+    r"[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
+)
+
+
+def _history_generation(marker: str) -> int:
+    """Map one validated provider UUID to a bounded opaque wire epoch."""
+    if not _HISTORY_GENERATION_RE.fullmatch(marker):
+        return 0
+    return int.from_bytes(
+        hashlib.blake2b(
+            marker.lower().encode("ascii"),
+            digest_size=8,
+            person=b"railmux-history",
+        ).digest(),
+        "big",
+    )
 
 
 _ANSI_FG = {
@@ -834,6 +854,7 @@ def _list_agent_panes(
                 "#{history_size} #{alternate_on} #{mouse_any_flag} "
                 f"#{{{tmux_server.HISTORY_SOURCE_OPTION}}} "
                 f"#{{{tmux_server.TRANSCRIPT_SOURCE_OPTION}}} "
+                f"#{{{tmux_ctl.RAILMUX_HISTORY_GENERATION_OPTION}}} "
                 f"#{{{TOOL_PANE_OPTION}}}",
             ),
             stderr=subprocess.DEVNULL,
@@ -849,7 +870,7 @@ def _list_agent_panes(
     for raw_row in output.splitlines():
         fields = raw_row.split(" ")
         if (
-            len(fields) != 16
+            len(fields) != 17
             or fields[0] != session_id
             or fields[2] not in ("0", "1")
             or fields[3] not in ("0", "1")
@@ -880,7 +901,7 @@ def _list_agent_panes(
         ):
             return ()
         seen.add(pane_id)
-        if is_tool_pane_marker(fields[15], outer_session_id=session_id):
+        if is_tool_pane_marker(fields[16], outer_session_id=session_id):
             continue
         history_server = None
         history_pane_id = None
@@ -931,6 +952,7 @@ def _list_agent_panes(
                     transcript_source=transcript_marker,
                     transcript_backed=transcript_backed,
                     claude_history_policy=claude_history_policy,
+                    history_generation=_history_generation(fields[15]),
                 ),
             )
         )
@@ -1376,6 +1398,7 @@ def _capture_pane_history(
                 else pane.history_size + pane.height > len(lines)
             )
         ),
+        generation=pane.history_generation,
     )
 
 
@@ -1916,7 +1939,7 @@ def render_rows(screen: object) -> tuple[bytes, ...]:
 
 
 def terminal_modes_for_screen(screen: object) -> TerminalMode:
-    """Project pyte's private-mode set onto the bounded v14 wire allowlist."""
+    """Project pyte's private-mode set onto the bounded v15 wire allowlist."""
     terminal_modes = TerminalMode.NONE
     if 2004 << 5 in screen.mode:
         terminal_modes |= TerminalMode.BRACKETED_PASTE

{railmux-0.4.0.dev7 → railmux-0.4.0.dev9}/src/railmux/tmux_binding_manager.py

@@ -14,8 +14,14 @@ from railmux import restart_state, tmux_ctl
 from railmux.atomic_file import atomic_write_text
 
 
-_VERSION = 8
+_VERSION = 9
 _KEYS = ("F8", "F9")
+_STATUS_CLICK_KEYS = (
+    "MouseDown1Status",
+    "MouseDown1Control0",
+    "MouseDown1Control1",
+    "MouseDown1Control2",
+)
 _MAX_STATE_BYTES = 64 * 1024
 
 
@@ -114,12 +120,18 @@ class SharedTmuxBindingManager:
             and all(value is None or isinstance(value, str)
                     for value in right_click_backup.values())
         )
-        status_click_valid = (
+        legacy_status_click_valid = (
             isinstance(status_click_backup, dict)
             and set(status_click_backup) == {"MouseDown1Status"}
             and all(value is None or isinstance(value, str)
                     for value in status_click_backup.values())
         )
+        status_click_valid = (
+            isinstance(status_click_backup, dict)
+            and set(status_click_backup) == set(_STATUS_CLICK_KEYS)
+            and all(value is None or isinstance(value, str)
+                    for value in status_click_backup.values())
+        )
         termux_tap_valid = (
             isinstance(termux_tap_backup, dict)
             and set(termux_tap_backup) == {"MouseDown1Pane"}
@@ -149,7 +161,13 @@ class SharedTmuxBindingManager:
                          or (not selection_hook_managed
                              and selection_hook_index is not None)))
                 or (raw["version"] >= 5
-                    and (not status_click_valid
+                    and ((raw["version"] < 9
+                          and not (
+                              legacy_status_click_valid
+                              or status_click_valid
+                          ))
+                         or (raw["version"] >= 9
+                             and not status_click_valid)
                          or not isinstance(status_click_managed, bool)))
                 or (raw["version"] >= 8
                     and (not termux_tap_valid
@@ -293,6 +311,29 @@ class SharedTmuxBindingManager:
                             or {"MouseDown1Pane": None}
                         )
                         upgraded = True
+                    if state["version"] < 9:
+                        if state["status_click_managed"]:
+                            if set(state["status_click_backup"]) != set(
+                                _STATUS_CLICK_KEYS
+                            ):
+                                status_click_backup = (
+                                    tmux_ctl.upgrade_root_status_click_binding(
+                                        state["status_click_backup"],
+                                        state["token"],
+                                    )
+                                )
+                                if status_click_backup is None:
+                                    return False
+                                state["status_click_backup"] = (
+                                    status_click_backup)
+                        else:
+                            state["status_click_backup"] = {
+                                key: None for key in _STATUS_CLICK_KEYS
+                            }
+                        # tmux 3.7 routes control ranges through dedicated
+                        # MouseDown1ControlN keys. Capture all originals before
+                        # reinstalling the shared status-click lease.
+                        upgraded = True
                     if upgraded:
                         state["version"] = _VERSION
                         state["phase"] = "installing"
@@ -341,17 +382,14 @@ class SharedTmuxBindingManager:
                             )
                         if state["status_click_managed"]:
                             current_status = (
-                                tmux_ctl.read_root_status_click_binding()
-                                ["MouseDown1Status"]
-                            )
-                            safe = (
-                                safe
-                                and tmux_ctl.root_status_click_binding_is_original_or_owned(
-                                    current_status,
-                                    state["status_click_backup"].get(
-                                        "MouseDown1Status"),
+                                tmux_ctl.read_root_status_click_binding())
+                            safe = safe and all(
+                                tmux_ctl.root_status_click_binding_is_original_or_owned(
+                                    current_status.get(key),
+                                    state["status_click_backup"].get(key),
                                     token,
                                 )
+                                for key in _STATUS_CLICK_KEYS
                             )
                         if state["termux_tap_managed"]:
                             current_tap = (
@@ -543,7 +581,8 @@ class SharedTmuxBindingManager:
                     "selection_hook_index": selection_hook_index,
                     "status_click_managed": status_click_backup is not None,
                     "status_click_backup": (
-                        status_click_backup or {"MouseDown1Status": None}),
+                        status_click_backup
+                        or {key: None for key in _STATUS_CLICK_KEYS}),
                     "termux_tap_managed": termux_tap_backup is not None,
                     "termux_tap_backup": (
                         termux_tap_backup or {"MouseDown1Pane": None}),