railmux 0.4.0.dev17__tar.gz → 0.4.0.dev18__tar.gz

{railmux-0.4.0.dev17/src/railmux.egg-info → railmux-0.4.0.dev18}/PKG-INFO

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

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

{railmux-0.4.0.dev17 → railmux-0.4.0.dev18}/src/railmux/cli.py

@@ -593,14 +593,28 @@ def main(argv: list[str] | None = None) -> int:
             if Path(sys.argv[0]).name == "__main__.py"
             else [sys.argv[0]]
         )
-        cmd = tmux_server.launcher_argv(launch_prefix, raw_args)
+        client_env = tmux_server.exec_environment()
         dedicated_session_id = (
             tmux_server.target_session_id(dedicated_target, "railmux")
             if dedicated_target is not None else None
         )
+        if dedicated_target is not None and dedicated_session_id is None:
+            from railmux.provider_paths import (
+                running_in_managed_windows_wrapper,
+            )
+            if running_in_managed_windows_wrapper():
+                dedicated_session_id = (
+                    tmux_server.ensure_detached_launcher_session(
+                        dedicated_target,
+                        launch_prefix,
+                        raw_args,
+                        env=client_env,
+                    )
+                )
+        cmd = tmux_server.launcher_argv(launch_prefix, raw_args)
         return _run_tmux_client_with_watchdog(
             cmd,
-            tmux_server.exec_environment(),
+            client_env,
             expected_target=dedicated_target,
             expected_session_id=dedicated_session_id,
         )

{railmux-0.4.0.dev17 → railmux-0.4.0.dev18}/src/railmux/tmux_server.py

@@ -645,3 +645,53 @@ def launcher_argv(
         "--inside-tmux",
         *forwarded_args,
     )
+
+
+def ensure_detached_launcher_session(
+    target: TmuxServerTarget,
+    launch_prefix: Sequence[str],
+    forwarded_args: Sequence[str],
+    *,
+    env: Mapping[str, str] | None = None,
+    timeout: float = 5.0,
+) -> str | None:
+    """Create the outer UI detached on one already-proven server.
+
+    Managed Windows uses this only when a proven existing server has no outer
+    UI, commonly because Soft Quit left provider sessions alive in another
+    Terminal Services session.  A new tmux client can then reject
+    ``new-session -A`` before the outer session exists, so the server-origin
+    terminal bridge has no immutable session to attach.
+
+    An exact pre/post server-PID check fences the mutation.  A concurrent
+    launcher may win the create race; resolving one exact resulting session is
+    success regardless of this client's ``new-session`` return code.
+    """
+    existing = target_session_id(target, "railmux", timeout=0.5)
+    if existing is not None:
+        return existing
+    if not launch_prefix or not target_is_live(target, timeout=1.0, env=env):
+        return None
+    try:
+        subprocess.run(
+            target_argv(
+                target,
+                "new-session",
+                "-d",
+                "-s",
+                "railmux",
+                *launch_prefix,
+                "--inside-tmux",
+                *forwarded_args,
+            ),
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            timeout=timeout,
+            check=False,
+            env=None if env is None else dict(env),
+        )
+    except (OSError, subprocess.TimeoutExpired):
+        return None
+    if not target_is_live(target, timeout=1.0, env=env):
+        return None
+    return target_session_id(target, "railmux", timeout=1.0)

{railmux-0.4.0.dev17 → railmux-0.4.0.dev18/src/railmux.egg-info}/PKG-INFO

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

@@ -472,6 +472,73 @@ def test_prelaunch_recovery_is_scoped_to_the_dedicated_server(monkeypatch):
     assert os.environ["TMUX_PANE"] == "%9"
 
 
+def test_managed_windows_precreates_missing_outer_session_for_bridge(
+    monkeypatch,
+):
+    target = TmuxServerTarget("/tmp/tmux-private/railmux", 789)
+    monkeypatch.setattr(
+        "railmux.cli.tmux_server.discover_target", lambda: target)
+    monkeypatch.setattr(
+        "railmux.cli.tmux_server.is_current_server", lambda _target: False)
+    monkeypatch.setattr(
+        "railmux.cli.tmux_server.target_session_id", lambda *_a, **_kw: None)
+    monkeypatch.setattr("railmux.cli.sys.argv", ["/opt/railmux/bin/railmux"])
+    monkeypatch.setattr(
+        "railmux.provider_paths.running_in_managed_windows_wrapper",
+        lambda: True,
+    )
+    prepared = MagicMock(return_value="$9")
+    monkeypatch.setattr(
+        "railmux.cli.tmux_server.ensure_detached_launcher_session", prepared)
+    run_client = MagicMock(return_value=0)
+    monkeypatch.setattr(
+        "railmux.cli._run_tmux_client_with_watchdog", run_client)
+
+    assert main(["--project", "/work"]) == 0
+
+    client_env = tmux_server.exec_environment()
+    prepared.assert_called_once_with(
+        target,
+        ["/opt/railmux/bin/railmux"],
+        ["--project", "/work"],
+        env=client_env,
+    )
+    assert run_client.call_args.kwargs == {
+        "expected_target": target,
+        "expected_session_id": "$9",
+    }
+
+
+def test_posix_missing_outer_session_keeps_ordinary_new_session_path(
+    monkeypatch,
+):
+    target = TmuxServerTarget("/tmp/tmux-private/railmux", 789)
+    monkeypatch.setattr(
+        "railmux.cli.tmux_server.discover_target", lambda: target)
+    monkeypatch.setattr(
+        "railmux.cli.tmux_server.is_current_server", lambda _target: False)
+    monkeypatch.setattr(
+        "railmux.cli.tmux_server.target_session_id", lambda *_a, **_kw: None)
+    monkeypatch.setattr(
+        "railmux.provider_paths.running_in_managed_windows_wrapper",
+        lambda: False,
+    )
+    prepared = MagicMock()
+    monkeypatch.setattr(
+        "railmux.cli.tmux_server.ensure_detached_launcher_session", prepared)
+    run_client = MagicMock(return_value=0)
+    monkeypatch.setattr(
+        "railmux.cli._run_tmux_client_with_watchdog", run_client)
+
+    assert main([]) == 0
+
+    prepared.assert_not_called()
+    assert run_client.call_args.kwargs == {
+        "expected_target": target,
+        "expected_session_id": None,
+    }
+
+
 def test_local_tmux_watchdog_exits_and_records_after_consecutive_failures(
     monkeypatch, capsys,
 ):

{railmux-0.4.0.dev17 → railmux-0.4.0.dev18}/tests/test_tmux_server.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import os
 import subprocess
 from types import SimpleNamespace
+from unittest.mock import MagicMock
 
 import pytest
 
@@ -37,6 +38,68 @@ def test_launcher_argv_preserves_multi_argument_python_module_prefix():
     ]
 
 
+def test_detached_launcher_session_is_pinned_before_and_after_create(
+    monkeypatch,
+):
+    target = tmux_server.TmuxServerTarget("/tmp/private", 44)
+    live = []
+    session_ids = iter((None, "$7"))
+    # Another launcher can win after our initial absence check. tmux then
+    # rejects this duplicate create, while the exact resulting session is the
+    # safe shared outcome.
+    run = SimpleNamespace(returncode=1)
+    launched = []
+
+    def target_is_live(candidate, **kwargs):
+        live.append((candidate, kwargs))
+        return True
+
+    monkeypatch.setattr(tmux_server, "target_is_live", target_is_live)
+    monkeypatch.setattr(
+        tmux_server,
+        "target_session_id",
+        lambda *_args, **_kwargs: next(session_ids),
+    )
+    monkeypatch.setattr(
+        subprocess,
+        "run",
+        lambda argv, **kwargs: launched.append((argv, kwargs)) or run,
+    )
+
+    assert tmux_server.ensure_detached_launcher_session(
+        target,
+        ["/opt/railmux/bin/python", "-m", "railmux"],
+        ["--mode", "codex"],
+        env={"PATH": "/usr/bin"},
+    ) == "$7"
+
+    assert len(live) == 2
+    assert launched[0][0] == [
+        "tmux", "-S", "/tmp/private",
+        "new-session", "-d", "-s", "railmux",
+        "/opt/railmux/bin/python", "-m", "railmux", "--inside-tmux",
+        "--mode", "codex",
+    ]
+    assert launched[0][1]["env"] == {"PATH": "/usr/bin"}
+
+
+def test_detached_launcher_session_refuses_changed_server_identity(
+    monkeypatch,
+):
+    target = tmux_server.TmuxServerTarget("/tmp/private", 44)
+    session_id = MagicMock(return_value=None)
+    monkeypatch.setattr(tmux_server, "target_session_id", session_id)
+    monkeypatch.setattr(
+        tmux_server, "target_is_live", MagicMock(side_effect=(True, False)))
+    monkeypatch.setattr(
+        subprocess, "run", MagicMock(return_value=SimpleNamespace(returncode=0)))
+
+    assert tmux_server.ensure_detached_launcher_session(
+        target, ["railmux"], [],
+    ) is None
+    session_id.assert_called_once_with(target, "railmux", timeout=0.5)
+
+
 def test_current_socket_parser_allows_commas_in_the_path():
     env = {"TMUX": "/tmp/with,comma/railmux,123,0"}
     assert tmux_server.current_socket_path(env) == "/tmp/with,comma/railmux"

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

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