railmux 0.4.0.dev27__tar.gz → 0.4.0.dev29__tar.gz

{railmux-0.4.0.dev27/src/railmux.egg-info → railmux-0.4.0.dev29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.4.0.dev27
+Version: 0.4.0.dev29
 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.dev29/src/railmux/__init__.py

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

{railmux-0.4.0.dev27 → railmux-0.4.0.dev29}/src/railmux/windows_install_log.py

@@ -56,6 +56,11 @@ _PIP_NETWORK_ERROR_MARKERS = (
     "connection aborted",
     "temporary failure in name resolution",
 )
+_MSYS2_RESTART_MARKER = (
+    "to complete this update all msys2 processes including this terminal "
+    "will be closed"
+)
+_ANSI_ESCAPE_RE = re.compile(r"\x1b\[[0-?]*[ -/]*[@-~]")
 _EXTRACTION_PERCENT_RE = re.compile(r"(?:^|\s)([0-9]{1,3})%\s")
 _PACKAGE_COUNT_RE = re.compile(r"^Packages \(([0-9]+)\)")
 _PACKAGE_DOWNLOAD_RE = re.compile(r"^\s*([^ ]+) downloading\.\.\.\s*$")
@@ -87,7 +92,12 @@ def install_log_path(
     )
 
 
-def _prune_install_logs(directory: Path, *, keep: int = _LOG_KEEP_COUNT) -> None:
+def _prune_install_logs(
+    directory: Path,
+    *,
+    keep: int = _LOG_KEEP_COUNT,
+    preserve: Path | None = None,
+) -> None:
     candidates: list[Path] = []
     try:
         entries = list(directory.iterdir())
@@ -103,7 +113,11 @@ def _prune_install_logs(directory: Path, *, keep: int = _LOG_KEEP_COUNT) -> None
         )
     except OSError:
         return
-    for stale in candidates[max(keep, 1) :]:
+    preserved = preserve if preserve in candidates else None
+    others = [candidate for candidate in candidates if candidate != preserved]
+    other_limit = max(keep, 1) - (1 if preserved is not None else 0)
+    stale_candidates = others[max(other_limit, 0) :]
+    for stale in stale_candidates:
         try:
             stale.unlink()
         except OSError:
@@ -142,12 +156,16 @@ class InstallReporter:
         self._network_failure = False
         self._pip_network_failure = False
         self._hard_failed_hosts: set[str] = set()
+        self._msys2_restart_requested = False
+        self._msys2_restart_lines: deque[str] = deque(maxlen=3)
 
     def __enter__(self) -> InstallReporter:
         self.path.parent.mkdir(parents=True, exist_ok=True)
         self._log = self.path.open("x", encoding="utf-8", newline="\n")
         self._write_log("Railmux Windows runtime installation\n")
-        _prune_install_logs(self.path.parent)
+        # Windows may defer the visible last-write timestamp of an open file.
+        # Never let retention mistake the active evidence log for an old one.
+        _prune_install_logs(self.path.parent, preserve=self.path)
         return self
 
     def __exit__(self, _exc_type, _exc, _traceback) -> None:
@@ -209,6 +227,8 @@ class InstallReporter:
         self._network_failure = False
         self._pip_network_failure = False
         self._hard_failed_hosts.clear()
+        self._msys2_restart_requested = False
+        self._msys2_restart_lines.clear()
         self._write_log(f"\n--- {label} ---\n")
 
     def command_output(self, output: bytes | str | None) -> None:
@@ -259,6 +279,11 @@ class InstallReporter:
         if line.strip():
             self._tail.append(line)
         lowered = line.lower()
+        normalized = " ".join(_ANSI_ESCAPE_RE.sub("", lowered).split())
+        if normalized:
+            self._msys2_restart_lines.append(normalized)
+        if _MSYS2_RESTART_MARKER in " ".join(self._msys2_restart_lines):
+            self._msys2_restart_requested = True
         if any(marker in lowered for marker in _NETWORK_ERROR_MARKERS):
             self._network_failure = True
         if any(marker in lowered for marker in _PIP_NETWORK_ERROR_MARKERS):
@@ -364,6 +389,10 @@ class InstallReporter:
     def hard_failed_mirror_hosts(self) -> frozenset[str]:
         return frozenset(self._hard_failed_hosts)
 
+    @property
+    def command_requested_msys2_restart(self) -> bool:
+        return self._msys2_restart_requested
+
     def heartbeat(self) -> None:
         now = self._clock()
         if now - self._last_heartbeat < _HEARTBEAT_SECONDS:

{railmux-0.4.0.dev27 → railmux-0.4.0.dev29}/src/railmux/windows_msys2.py

@@ -119,6 +119,32 @@ _PACKAGE_URL_COMMAND = (
 _PACKAGE_INVENTORY_COMMAND = "set -o pipefail; pacman -Q | LC_ALL=C sort"
 _PACKAGE_INVENTORY_LIMIT = 1024 * 1024
 _CORE_RUNTIME_PACKAGES = ("tmux", "python", "python-pip")
+_MAX_BASE_UPDATE_PASSES = 3
+_PACMAN_LOG_RELATIVE = Path("var") / "log" / "pacman.log"
+_PACMAN_LOG_MAX_SIZE = 8 * 1024 * 1024
+_PACMAN_LOG_APPEND_LIMIT = 2 * 1024 * 1024
+_PACMAN_LOCAL_DB_ENTRY_LIMIT = 4096
+_PACMAN_LOCAL_DESC_LIMIT = 64 * 1024
+# Keep this aligned with alpm_pkg_is_core_package in the pacman build shipped
+# by the pinned base. Any one of these packages makes MSYS2 close its processes.
+_PACMAN_CORE_PACKAGES = frozenset(
+    {
+        "bash",
+        "filesystem",
+        "mintty",
+        "msys2-runtime",
+        "msys2-runtime-devel",
+        "pacman",
+        "pacman-mirrors",
+    }
+)
+_PACMAN_CORE_CHANGE_RE = re.compile(
+    r"\[ALPM] (?:upgraded|downgraded) ([^ ]+) \(([^ ]+) -> ([^)]+)\)",
+    re.IGNORECASE,
+)
+_PRIVATE_GPG_SHUTDOWN_COMMAND = (
+    "gpgconf --homedir /etc/pacman.d/gnupg --kill all"
+)
 _IN_USE_APPS_COMMAND = (
     "for f in /proc/[0-9]*/cmdline; do "
     "[ -r \"$f\" ] || continue; tr '\\0' '\\n' <\"$f\"; done"
@@ -196,6 +222,16 @@ ArchiveProbe = Callable[[str, str, int], _ArchiveProbe]
 ArchiveResume = Callable[[str, str, int, int, Callable[[bytes], None]], None]
 
 
+@dataclass(frozen=True)
+class _PacmanLogCheckpoint:
+    existed: bool
+    size: int
+    identity: tuple[int, int] | None
+    tail_offset: int
+    tail_digest: str
+    core_versions: tuple[tuple[str, str], ...]
+
+
 def _format_download_size(size: int) -> str:
     if size >= 1024 * 1024:
         return f"{size / (1024 * 1024):.1f} MiB"
@@ -1624,18 +1660,25 @@ def _run_checked(
     if returncode:
         if allow_failure:
             return returncode
-        if _NATIVE_WINDOWS and returncode & 0xFFFFFFFF == 0xC0000135:
-            reporter.note(
-                "Windows reported STATUS_DLL_NOT_FOUND. Check whether security "
-                "software quarantined a file in the private MSYS2 staging tree.",
-                level="error",
-            )
+        _explain_windows_status(returncode, reporter)
         reporter.command_failed(label, returncode)
         raise RuntimeInstallError(f"{label} failed with exit code {returncode}")
     reporter.command_succeeded()
     return 0
 
 
+def _explain_windows_status(returncode: int, reporter: InstallReporter) -> None:
+    if _NATIVE_WINDOWS and returncode & 0xFFFFFFFF == 0xC0000135:
+        reporter.note(
+            "Windows reported STATUS_DLL_NOT_FOUND, but this pass had neither "
+            "pacman's restart announcement nor a newly completed core "
+            "transaction with a matching package-database version change. "
+            "The temporary base will not be published; a missing or "
+            "quarantined staged DLL remains possible.",
+            level="error",
+        )
+
+
 def _pacman_command(*, packages: bool, relaxed: bool) -> str:
     timeout = " --disable-download-timeout" if relaxed else ""
     needed = f" --needed {_PACMAN_PACKAGES}" if packages else ""
@@ -1644,10 +1687,11 @@ def _pacman_command(*, packages: bool, relaxed: bool) -> str:
         if not packages
         else ""
     )
+    operation = "-Syu" if packages else "-Syuu"
     return (
         'cache=$(cygpath -u "$1") && mkdir -p "$cache" && '
         f"{keyring}pacman --config {_PACMAN_CONFIG} --cachedir \"$cache\" "
-        f"-Syu --noconfirm{timeout}{needed}"
+        f"{operation} --noconfirm{timeout}{needed}"
     )
 
 
@@ -1666,6 +1710,215 @@ def _report_mirror_decision(
         )
 
 
+def _pacman_desc_value(text: str, field: str) -> str | None:
+    lines = text.splitlines()
+    marker = f"%{field}%"
+    for index, line in enumerate(lines[:-1]):
+        if line == marker and lines[index + 1]:
+            return lines[index + 1]
+    return None
+
+
+def _pacman_core_versions(root: Path) -> dict[str, str]:
+    local_db = root / "var" / "lib" / "pacman" / "local"
+    try:
+        if _path_is_link_or_reparse(local_db) or not local_db.is_dir():
+            raise RuntimeInstallError("the private pacman database is unsafe")
+        entries = list(local_db.iterdir())
+    except FileNotFoundError:
+        return {}
+    except OSError as exc:
+        raise RuntimeInstallError("could not inspect the private pacman database") from exc
+    if len(entries) > _PACMAN_LOCAL_DB_ENTRY_LIMIT:
+        raise RuntimeInstallError("the private pacman database is unexpectedly large")
+    versions: dict[str, str] = {}
+    for entry in entries:
+        if not any(
+            entry.name.startswith(prefix)
+            for prefix in (
+                "bash-",
+                "filesystem-",
+                "mintty-",
+                "msys2-runtime-",
+                "pacman-",
+            )
+        ):
+            continue
+        desc = entry / "desc"
+        try:
+            if (
+                _path_is_link_or_reparse(entry)
+                or not entry.is_dir()
+                or _path_is_link_or_reparse(desc)
+                or not desc.is_file()
+                or desc.stat().st_size > _PACMAN_LOCAL_DESC_LIMIT
+            ):
+                raise RuntimeInstallError("the private pacman database is unsafe")
+            text = desc.read_text(encoding="utf-8")
+        except RuntimeInstallError:
+            raise
+        except (OSError, UnicodeError) as exc:
+            raise RuntimeInstallError(
+                "could not read the private pacman database"
+            ) from exc
+        name = _pacman_desc_value(text, "NAME")
+        version = _pacman_desc_value(text, "VERSION")
+        if name is None or version is None or not _is_pacman_core_package(name):
+            continue
+        if name in versions:
+            raise RuntimeInstallError(
+                "the private pacman database contains duplicate core packages"
+            )
+        versions[name] = version
+    return versions
+
+
+def _pacman_log_checkpoint(root: Path) -> _PacmanLogCheckpoint:
+    """Pin the append-only pacman journal before a staged transaction."""
+    path = root / _PACMAN_LOG_RELATIVE
+    try:
+        info = path.lstat()
+    except FileNotFoundError:
+        return _PacmanLogCheckpoint(
+            False,
+            0,
+            None,
+            0,
+            hashlib.sha256().hexdigest(),
+            tuple(sorted(_pacman_core_versions(root).items())),
+        )
+    except OSError as exc:
+        raise RuntimeInstallError("could not inspect the private pacman log") from exc
+    try:
+        unsafe = _path_is_link_or_reparse(path)
+    except OSError as exc:
+        raise RuntimeInstallError("could not inspect the private pacman log") from exc
+    if (
+        unsafe
+        or not stat.S_ISREG(info.st_mode)
+        or info.st_size < 0
+        or info.st_size > _PACMAN_LOG_MAX_SIZE
+    ):
+        raise RuntimeInstallError("the private pacman log is unsafe")
+    tail_offset = max(0, info.st_size - 4096)
+    try:
+        with path.open("rb") as stream:
+            stream.seek(tail_offset)
+            tail = stream.read(info.st_size - tail_offset)
+    except OSError as exc:
+        raise RuntimeInstallError("could not read the private pacman log") from exc
+    return _PacmanLogCheckpoint(
+        True,
+        info.st_size,
+        (info.st_dev, info.st_ino),
+        tail_offset,
+        hashlib.sha256(tail).hexdigest(),
+        tuple(sorted(_pacman_core_versions(root).items())),
+    )
+
+
+def _is_pacman_core_package(name: str) -> bool:
+    return name in _PACMAN_CORE_PACKAGES or name.startswith("msys2-runtime-")
+
+
+def _pacman_log_core_transaction(
+    root: Path, checkpoint: _PacmanLogCheckpoint
+) -> tuple[str, ...]:
+    """Return core packages from one newly completed journal transaction."""
+    path = root / _PACMAN_LOG_RELATIVE
+    try:
+        info = path.lstat()
+        unsafe = _path_is_link_or_reparse(path)
+    except OSError:
+        return ()
+    if (
+        unsafe
+        or not stat.S_ISREG(info.st_mode)
+        or info.st_size < checkpoint.size
+        or info.st_size > _PACMAN_LOG_MAX_SIZE
+        or info.st_size - checkpoint.size > _PACMAN_LOG_APPEND_LIMIT
+    ):
+        return ()
+    if checkpoint.existed and (info.st_dev, info.st_ino) != checkpoint.identity:
+        return ()
+    try:
+        with path.open("rb") as stream:
+            if checkpoint.existed:
+                stream.seek(checkpoint.tail_offset)
+                previous_tail = stream.read(checkpoint.size - checkpoint.tail_offset)
+                if hashlib.sha256(previous_tail).hexdigest() != checkpoint.tail_digest:
+                    return ()
+            stream.seek(checkpoint.size)
+            appended = stream.read(_PACMAN_LOG_APPEND_LIMIT + 1)
+    except OSError:
+        return ()
+    if not appended or len(appended) > _PACMAN_LOG_APPEND_LIMIT:
+        return ()
+
+    core_started = False
+    transaction_started = False
+    changed: dict[str, tuple[str, str]] = {}
+    for line in appended.decode("utf-8", errors="replace").splitlines():
+        lowered = line.lower()
+        if "[pacman] starting core system upgrade" in lowered:
+            core_started = True
+            transaction_started = False
+            changed.clear()
+            continue
+        if not core_started:
+            continue
+        if "[alpm] transaction started" in lowered:
+            transaction_started = True
+            changed.clear()
+            continue
+        if not transaction_started:
+            continue
+        match = _PACMAN_CORE_CHANGE_RE.search(line)
+        if match is not None and _is_pacman_core_package(match.group(1)):
+            changed[match.group(1)] = (match.group(2), match.group(3))
+        if "[alpm] transaction completed" in lowered:
+            if changed:
+                try:
+                    after = _pacman_core_versions(root)
+                except RuntimeInstallError:
+                    return ()
+                before = dict(checkpoint.core_versions)
+                proven = tuple(
+                    sorted(
+                        name
+                        for name, (old_version, new_version) in changed.items()
+                        if before.get(name) == old_version
+                        and after.get(name) == new_version
+                        and old_version != new_version
+                    )
+                )
+                if proven:
+                    return proven
+            transaction_started = False
+    return ()
+
+
+def _restart_evidence(
+    root: Path,
+    checkpoint: _PacmanLogCheckpoint,
+    reporter: InstallReporter,
+    returncode: int,
+) -> bool:
+    if reporter.command_requested_msys2_restart:
+        return True
+    if returncode & 0xFFFFFFFF != 0xC0000135:
+        return False
+    packages = _pacman_log_core_transaction(root, checkpoint)
+    if not packages:
+        return False
+    reporter.note(
+        "The private pacman journal confirms a completed core update "
+        f"({', '.join(packages)}); its final console prompt was not captured.",
+        level="warning",
+    )
+    return True
+
+
 def _refresh_pacman_mirrors(
     root: Path,
     *,
@@ -1693,7 +1946,9 @@ def _run_pacman_with_recovery(
     runner: Runner | None,
     label: str,
     mirror_optimizer: MirrorOptimizer,
-) -> None:
+    allow_core_restart: bool = False,
+) -> bool:
+    checkpoint = _pacman_log_checkpoint(root) if not packages else None
     argv = _bash_command(root, _pacman_command(packages=packages, relaxed=False), str(cache))
     returncode = _run_checked(
         argv,
@@ -1704,11 +1959,34 @@ def _run_pacman_with_recovery(
         progress="pacman",
         allow_failure=True,
     )
+    restart_requested = (
+        _restart_evidence(root, checkpoint, reporter, returncode)
+        if checkpoint is not None
+        else False
+    )
     if returncode == 0:
-        return
+        return restart_requested
+    if not packages and restart_requested and not allow_core_restart:
+        reporter.note(
+            "MSYS2 requested another core restart on the final permitted "
+            "update pass; the temporary base will not be published.",
+            level="error",
+        )
+        reporter.command_failed(label, returncode)
+        raise RuntimeInstallError(
+            f"{label} exhausted the permitted core-update restarts"
+        )
+    if allow_core_restart and not packages and restart_requested:
+        reporter.note(
+            "MSYS2 replaced core runtime files and closed its own process as "
+            "expected; continuing from a fresh Windows-launched shell.",
+            level="warning",
+        )
+        return True
     network_failure = reporter.command_had_network_failure
     hard_failed_hosts = reporter.hard_failed_mirror_hosts
     if not network_failure:
+        _explain_windows_status(returncode, reporter)
         reporter.command_failed(label, returncode)
         raise RuntimeInstallError(f"{label} failed with exit code {returncode}")
     reporter.note(
@@ -1739,13 +2017,128 @@ def _run_pacman_with_recovery(
         _pacman_command(packages=packages, relaxed=True),
         str(cache),
     )
-    _run_checked(
+    retry_checkpoint = _pacman_log_checkpoint(root) if not packages else None
+    retry_returncode = _run_checked(
         retry_argv,
         env=env,
         reporter=reporter,
         runner=runner,
         label=f"{label} resilient retry",
         progress="pacman",
+        allow_failure=True,
+    )
+    restart_requested = (
+        _restart_evidence(root, retry_checkpoint, reporter, retry_returncode)
+        if retry_checkpoint is not None
+        else False
+    )
+    if retry_returncode == 0:
+        return restart_requested
+    if not packages and restart_requested and not allow_core_restart:
+        reporter.note(
+            "MSYS2 requested another core restart on the final permitted "
+            "update pass; the temporary base will not be published.",
+            level="error",
+        )
+        reporter.command_failed(f"{label} resilient retry", retry_returncode)
+        raise RuntimeInstallError(
+            f"{label} resilient retry exhausted the permitted "
+            "core-update restarts"
+        )
+    if allow_core_restart and not packages and restart_requested:
+        reporter.note(
+            "MSYS2 replaced core runtime files and closed its own process as "
+            "expected; continuing from a fresh Windows-launched shell.",
+            level="warning",
+        )
+        return True
+    _explain_windows_status(retry_returncode, reporter)
+    reporter.command_failed(f"{label} resilient retry", retry_returncode)
+    raise RuntimeInstallError(
+        f"{label} resilient retry failed with exit code {retry_returncode}"
+    )
+
+
+def _run_base_update_with_restarts(
+    root: Path,
+    *,
+    cache: Path,
+    env: Mapping[str, str],
+    reporter: InstallReporter,
+    runner: Runner | None,
+    mirror_optimizer: MirrorOptimizer,
+) -> None:
+    """Run MSYS2's full upgrade in fresh processes until restart-safe."""
+    try:
+        for pass_number in range(1, _MAX_BASE_UPDATE_PASSES + 1):
+            restart_requested = _run_pacman_with_recovery(
+                root,
+                packages=False,
+                cache=cache,
+                env=env,
+                reporter=reporter,
+                runner=runner,
+                label=f"MSYS2 base update pass {pass_number}",
+                mirror_optimizer=mirror_optimizer,
+                allow_core_restart=pass_number < _MAX_BASE_UPDATE_PASSES,
+            )
+            if restart_requested:
+                reporter.note(
+                    "Starting a new MSYS2 process for the remaining update…"
+                )
+                continue
+            if pass_number == 1:
+                # MSYS2's supported unattended update procedure invokes Syuu
+                # twice, even when the first pass did not request a restart.
+                reporter.note(
+                    "Starting the required second MSYS2 update pass in a new "
+                    "process…"
+                )
+                continue
+            return
+        raise RuntimeInstallError(
+            "MSYS2 repeatedly requested a core-runtime restart; the temporary "
+            "base was not published"
+        )
+    finally:
+        _stop_private_gpg_agents(
+            root,
+            env=env,
+            reporter=reporter,
+            runner=runner,
+            strict=sys.exc_info()[0] is None,
+        )
+
+
+def _stop_private_gpg_agents(
+    root: Path,
+    *,
+    env: Mapping[str, str],
+    reporter: InstallReporter,
+    runner: Runner | None,
+    strict: bool,
+) -> None:
+    returncode = _run_checked(
+        _bash_command(root, _PRIVATE_GPG_SHUTDOWN_COMMAND),
+        env=env,
+        reporter=reporter,
+        runner=runner,
+        label="Stopping private MSYS2 keyring agents",
+        allow_failure=True,
+    )
+    if returncode == 0:
+        return
+    if not strict:
+        reporter.note(
+            "Could not stop a private MSYS2 keyring agent while recovering "
+            "from another installation failure.",
+            level="warning",
+        )
+        return
+    reporter.command_failed("Stopping private MSYS2 keyring agents", returncode)
+    raise RuntimeInstallError(
+        "stopping private MSYS2 keyring agents failed with exit code "
+        f"{returncode}"
     )
 
 
@@ -2399,16 +2792,20 @@ def install_managed_runtime(
                         "pacman is noninteractive; displayed [Y/n] prompts do "
                         "not require input."
                     )
+                    reporter.note(
+                        "Core updates may close the first MSYS2 process; "
+                        "Railmux will start the required fresh process "
+                        "automatically.",
+                        level="muted",
+                    )
                     package_cache = cache_base / f"pacman-{MSYS2_RUNTIME_ID}"
                     package_cache.mkdir(parents=True, exist_ok=True)
-                    _run_pacman_with_recovery(
+                    _run_base_update_with_restarts(
                         root,
-                        packages=False,
                         cache=package_cache,
                         env=child_env,
                         reporter=reporter,
                         runner=runner,
-                        label="MSYS2 base update",
                         mirror_optimizer=mirror_optimizer,
                     )
                     reporter.done()
@@ -2445,16 +2842,25 @@ def install_managed_runtime(
                         reporter=reporter,
                         runner=runner,
                     )
-                    _run_pacman_with_recovery(
-                        root,
-                        packages=True,
-                        cache=package_cache,
-                        env=child_env,
-                        reporter=reporter,
-                        runner=runner,
-                        label="MSYS2 package installation",
-                        mirror_optimizer=mirror_optimizer,
-                    )
+                    try:
+                        _run_pacman_with_recovery(
+                            root,
+                            packages=True,
+                            cache=package_cache,
+                            env=child_env,
+                            reporter=reporter,
+                            runner=runner,
+                            label="MSYS2 package installation",
+                            mirror_optimizer=mirror_optimizer,
+                        )
+                    finally:
+                        _stop_private_gpg_agents(
+                            root,
+                            env=child_env,
+                            reporter=reporter,
+                            runner=runner,
+                            strict=sys.exc_info()[0] is None,
+                        )
                     reporter.done()
 
                     identity = _ensure_base_content_identity(

{railmux-0.4.0.dev27 → railmux-0.4.0.dev29/src/railmux.egg-info}/PKG-INFO

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