railmux 0.4.0.dev10__tar.gz → 0.4.0.dev11__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.4.0.dev10
+Version: 0.4.0.dev11
 Summary: Terminal UI to navigate, resume, and start Claude Code and Codex sessions
 Author-email: Rightglow <zhang.taian@foxmail.com>
 License-Expression: MIT

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

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

{railmux-0.4.0.dev10 → railmux-0.4.0.dev11}/src/railmux/provider_paths.py

@@ -11,7 +11,11 @@ from pathlib import Path
 
 
 _DRIVE_PATH = re.compile(r"^(?:\\\\\?\\)?([A-Za-z]):[\\/](.*)\Z")
-_MANAGED_RUNTIME_MARKER = Path("/railmux-runtime.json")
+_MANAGED_BASE_MARKER = Path("/railmux-base.json")
+_MANAGED_APP_ROOT = Path("/opt/railmux/apps")
+_MANAGED_APP_ID = re.compile(
+    r"railmux-[0-9]+(?:\.[0-9]+)*(?:\.dev[0-9]+)?\Z"
+)
 
 
 def running_in_windows_wrapper(environ: Mapping[str, str] = os.environ) -> bool:
@@ -25,22 +29,40 @@ def running_in_managed_windows_wrapper(
     """Verify the installed MSYS2 runtime, not merely its environment hint."""
     if sys.platform != "cygwin" or not running_in_windows_wrapper(environ):
         return False
-    marker = _MANAGED_RUNTIME_MARKER
-    try:
-        info = marker.lstat()
-        if (
-            not stat.S_ISREG(info.st_mode)
-            or info.st_uid != os.getuid()
-            or info.st_mode & 0o022
-            or info.st_size > 4096
-        ):
-            return False
-        payload = json.loads(marker.read_text(encoding="utf-8"))
-    except (OSError, UnicodeError, json.JSONDecodeError):
+    runtime_id = environ.get("RAILMUX_MSYS2_RUNTIME_ID")
+    app_id = environ.get("RAILMUX_MSYS2_APP_ID")
+    if (
+        not isinstance(runtime_id, str)
+        or not runtime_id
+        or not isinstance(app_id, str)
+        or _MANAGED_APP_ID.fullmatch(app_id) is None
+    ):
         return False
+
+    def read_safe_marker(marker: Path) -> object | None:
+        try:
+            info = marker.lstat()
+            if (
+                not stat.S_ISREG(info.st_mode)
+                or info.st_uid != os.getuid()
+                or info.st_mode & 0o022
+                or info.st_size > 4096
+            ):
+                return None
+            return json.loads(marker.read_text(encoding="utf-8"))
+        except (OSError, UnicodeError, json.JSONDecodeError):
+            return None
+
+    base_payload = read_safe_marker(_MANAGED_BASE_MARKER)
+    app_payload = read_safe_marker(
+        _MANAGED_APP_ROOT / app_id / "railmux-app.json"
+    )
     from railmux import __version__
-    runtime_id = environ.get("RAILMUX_MSYS2_RUNTIME_ID")
-    return isinstance(runtime_id, str) and bool(runtime_id) and payload == {
+
+    return base_payload == {
+        "schema": 1,
+        "runtime": runtime_id,
+    } and app_payload == {
         "schema": 1,
         "runtime": runtime_id,
         "railmux": __version__,

{railmux-0.4.0.dev10 → railmux-0.4.0.dev11}/src/railmux/windows_bootstrap.py

@@ -14,6 +14,7 @@ from railmux.windows_msys2 import (
     find_runtime,
     install_managed_runtime,
     managed_root,
+    reusable_managed_base_candidate,
 )
 
 
@@ -45,7 +46,7 @@ def _runtime_status(
         ownership = "Railmux-managed" if runtime.managed else "user-owned override"
         print(f"Runtime: {ownership} at {runtime.root}")
     else:
-        root = managed_root(environ, version=__version__)
+        root = managed_root(environ)
         if root is not None:
             print(f"Managed location: {root}")
     print("Provider data: shared from the Windows user profile")
@@ -55,7 +56,8 @@ def _runtime_status(
 def _confirm_install(*, input_fn: Callable[[str], str] = input) -> bool:
     try:
         answer = input_fn(
-            "Install the private MSYS2/tmux runtime now? On Windows, Railmux "
+            "No reusable MSYS2 base was found. Install the private MSYS2/tmux "
+            "runtime now? On Windows, Railmux "
             "depends on a complete private MSYS2 compatibility wrapper, "
             "including tmux and Python. This downloads a 50 MB base plus "
             "required updates and packages, "
@@ -74,14 +76,30 @@ def _install(
     verbose: bool = False,
     input_fn: Callable[[str], str] = input,
 ) -> Msys2Runtime | None:
-    if not assume_yes and not _confirm_install(input_fn=input_fn):
-        print("MSYS2 runtime installation cancelled.", file=sys.stderr)
-        return None
+    reuse_only = False
+    if not assume_yes:
+        reusable = reusable_managed_base_candidate(environ)
+        if reusable is None:
+            if not _confirm_install(input_fn=input_fn):
+                print("MSYS2 runtime installation cancelled.", file=sys.stderr)
+                return None
+        else:
+            _root, source_version = reusable
+            detail = (
+                f" from Railmux {source_version}" if source_version else ""
+            )
+            print(
+                f"Reusing the matching MSYS2 {MSYS2_RELEASE} private base"
+                f"{detail}; only the Railmux {__version__} app layer will be "
+                "installed."
+            )
+            reuse_only = True
     try:
         runtime = install_managed_runtime(
             version=__version__,
             environ=environ,
             verbose=verbose,
+            reuse_only=reuse_only,
         )
     except RuntimeInstallError as exc:
         print(f"error: {exc}", file=sys.stderr)
@@ -166,7 +184,7 @@ def main(
         return 0 if runtime is not None else 2
 
     if runtime is None:
-        root = managed_root(environ, version=__version__)
+        root = managed_root(environ)
         print(
             "Railmux for Windows needs its private MSYS2/tmux runtime.\n"
             "The Windows Codex/Claude executables and their existing session "
@@ -175,7 +193,10 @@ def main(
         )
         if root is not None:
             print(f"Managed location: {root}", file=sys.stderr)
-        if not stdin_isatty():
+        if (
+            not stdin_isatty()
+            and reusable_managed_base_candidate(environ) is None
+        ):
             print(
                 "Run 'railmux runtime install' interactively or "
                 "'railmux runtime install --yes' to install it.",