railmux 0.4.0.dev12__tar.gz → 0.4.0.dev14__tar.gz

{railmux-0.4.0.dev12/src/railmux.egg-info → railmux-0.4.0.dev14}/PKG-INFO

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

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

{railmux-0.4.0.dev12 → railmux-0.4.0.dev14}/src/railmux/diagnostics.py

@@ -15,6 +15,7 @@ from typing import TextIO
 from railmux import __version__
 from railmux import legacy_sessions, tmux_health, tmux_server
 from railmux.config import Config, ConfigError, default_config_path, load_config
+from railmux.provider_paths import running_in_windows_wrapper
 from railmux.runtime_config import normalized_command, runtime_environment
 from railmux.ssh_display_diagnostics import (
     SshDisplayDiagnostic,
@@ -204,8 +205,10 @@ def _dedicated_tmux_diagnostic(
     )
     if found is None:
         return TmuxServerDiagnostic("unavailable")
+    source = os.environ if environ is None else environ
+    timeout = None if running_in_windows_wrapper(source) else 1.0
     try:
-        target = tmux_server.discover_target(timeout=1.0, env=environ)
+        target = tmux_server.discover_target(timeout=timeout, env=environ)
     except tmux_server.TmuxClientServerMismatch:
         return TmuxServerDiagnostic("client_server_mismatch")
     except tmux_server.TmuxServerUnresponsive:

{railmux-0.4.0.dev12 → railmux-0.4.0.dev14}/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)
 
 

{railmux-0.4.0.dev12 → railmux-0.4.0.dev14/src/railmux.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.4.0.dev12
+Version: 0.4.0.dev14
 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.dev12 → railmux-0.4.0.dev14}/tests/test_diagnostics.py

@@ -6,6 +6,7 @@ from unittest.mock import MagicMock
 
 from railmux.diagnostics import (
     TmuxServerDiagnostic,
+    _dedicated_tmux_diagnostic,
     _tool_diagnostic,
     collect_doctor_snapshot,
     run_doctor,
@@ -36,6 +37,30 @@ def test_version_preserves_tmux_letter_suffix(monkeypatch):
     assert diagnostic.version == "3.2a"
 
 
+def test_windows_doctor_allows_stale_socket_settle_without_changing_posix(
+    monkeypatch,
+):
+    observed = []
+    monkeypatch.setattr(
+        "railmux.diagnostics.shutil.which", lambda *_args, **_kwargs: "tmux")
+
+    def discover(*, timeout, env):
+        observed.append((timeout, env))
+        return None
+
+    monkeypatch.setattr(
+        "railmux.diagnostics.tmux_server.discover_target", discover)
+    posix_env = {"PATH": "/bin"}
+    windows_env = {
+        "PATH": "/usr/bin",
+        "RAILMUX_WINDOWS_RUNTIME": "msys2",
+    }
+
+    assert _dedicated_tmux_diagnostic(posix_env).status == "not_running"
+    assert _dedicated_tmux_diagnostic(windows_env).status == "not_running"
+    assert observed == [(1.0, posix_env), (None, windows_env)]
+
+
 def test_doctor_report_is_useful_and_redacts_user_values(
     monkeypatch, tmp_path,
 ):

{railmux-0.4.0.dev12 → railmux-0.4.0.dev14}/tests/test_tmux_server.py

@@ -101,6 +101,32 @@ def test_discover_target_uses_explicit_label_and_times_out(monkeypatch):
     }
 
 
+@pytest.mark.parametrize(
+    ("env", "expected_timeout"),
+    [
+        ({}, 2.0),
+        ({"RAILMUX_WINDOWS_RUNTIME": "msys2"}, 5.0),
+    ],
+)
+def test_discover_target_allows_managed_msys_stale_socket_settle(
+    monkeypatch, env, expected_timeout,
+):
+    observed = {}
+
+    def discover(label, *, timeout, env):
+        observed.update(label=label, timeout=timeout, env=env)
+        return None
+
+    monkeypatch.setattr(tmux_server, "_discover_label_target", discover)
+
+    assert tmux_server.discover_target(env=env) is None
+    assert observed == {
+        "label": "railmux",
+        "timeout": expected_timeout,
+        "env": env,
+    }
+
+
 def test_discover_target_classifies_tmux_client_server_mismatch(monkeypatch):
     monkeypatch.setattr(
         subprocess,

{railmux-0.4.0.dev12 → railmux-0.4.0.dev14}/tests/test_windows_msys2.py

@@ -33,7 +33,7 @@ from railmux.windows_msys2 import (
 from railmux.windows_pacman import PacmanMirrorDecision
 
 
-VERSION = "0.4.0.dev12"
+VERSION = "0.4.0.dev14"
 LEGACY_VERSION = "0.4.0.dev10"
 _ANSI_STYLE_RE = re.compile(r"\x1b\[[0-9;]*m")
 

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

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