railmux 0.3.3.dev1__tar.gz → 0.3.3.dev2__tar.gz

{railmux-0.3.3.dev1/src/railmux.egg-info → railmux-0.3.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.3.3.dev1
+Version: 0.3.3.dev2
 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.3.3.dev2/src/railmux/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.3.dev2"

{railmux-0.3.3.dev1 → railmux-0.3.3.dev2}/src/railmux/display_transport.py

@@ -738,6 +738,22 @@ class AgentDisplayTransport:
     def _with_phase(state: SwapState, phase: str) -> SwapState:
         return SwapState(**{**asdict(state), "phase": phase})
 
+    @staticmethod
+    def _fit_home_to_display(state: SwapState) -> None:
+        """Best-effort preserve the provider's visible geometry at home.
+
+        While a real pane is displayed, its named session contains only the
+        inert placeholder.  Resize that detached home window to the real
+        pane's current size before swapping back.  Otherwise background output
+        is formatted at the placeholder's older (often much narrower) launch
+        geometry and later appears as a narrow discontinuity in scrollback.
+
+        Geometry is presentation-only: failure must never weaken or abort the
+        identity-pinned return transaction.
+        """
+        tmux_ctl.fit_session_to_pane(
+            state.agent_tmux_name, state.agent_pane_id)
+
     def park(self, slot: AgentSlot) -> bool:
         """Move one displayed swap agent home without forgetting its slot.
 
@@ -764,6 +780,7 @@ class AgentDisplayTransport:
         parking = self._with_phase(state, "parking")
         if not _write_marker_pair(parking, slot.key):
             return False
+        self._fit_home_to_display(state)
         if not tmux_ctl.swap_panes(
                 state.agent_pane_id, state.placeholder_pane_id):
             _write_marker_pair(state, slot.key)
@@ -857,6 +874,7 @@ class AgentDisplayTransport:
                 return False
             returning = SwapState(**{**asdict(state), "phase": "returning"})
             _write_marker_pair(returning, slot.key)
+            self._fit_home_to_display(state)
             if not tmux_ctl.swap_panes(
                     state.agent_pane_id, state.placeholder_pane_id):
                 return False

{railmux-0.3.3.dev1 → railmux-0.3.3.dev2}/src/railmux/ui/app.py

@@ -8520,6 +8520,7 @@ class App:
         # Codex New Project can use its in-memory synthetic project earlier.
         by_path = {p.real_path: p for p in projects}
         claimed = self._running_session_ids() | set(self._running)
+        resolved_any = False
         for r in placeholders:
             # Codex New Project owns an in-memory synthetic project before its
             # first rollout makes that cwd visible in the Codex index. Claude
@@ -8605,15 +8606,30 @@ class App:
             r.project = candidate.project
             r.placeholder_path = None
             r.created_at = 0.0
+            # Publish the same provider generation atomically to Running.  The
+            # normal refinement pass below may add process-derived status, but
+            # the promoted row must never retain its stale ``(new)`` label,
+            # zero mtime, or placeholder activity for one extra refresh.
+            r.status = candidate.status
+            r.last_mtime = candidate.last_mtime
+            r.attention = candidate.attention
             self._running[candidate.session_id] = r
             self._stamp_running(r)
             claimed.add(candidate.session_id)
+            resolved_any = True
             displayed_slot = self._agent_workspace().slot_for_agent(r.tmux_name)
             if displayed_slot is not None:
                 self._set_slot_active_target(
                     displayed_slot, candidate.session_id, r.tmux_name)
                 if displayed_slot is self._agent_workspace().target:
                     self._set_current_project(candidate.project)
+        if resolved_any:
+            # Placeholder launch time may already have consumed the ordinary
+            # one-minute sort budget.  Its first authoritative provider
+            # generation is a one-time identity transition, so allow the
+            # immediately following Running refresh to place it by real
+            # activity without enabling per-poll row movement.
+            self._running_sort_ts = 0.0
 
     def _correlate_codex_rollout(self, r: "_Running") -> set[str] | None:
         """Exact child→rollout correlation for a Codex placeholder (#12).
@@ -8628,6 +8644,20 @@ class App:
         (heuristic) rather than raising into the UI."""
         try:
             sessions_dir = self._codex_home_path() / "sessions"
+            # Swap display moves the real provider pane out of its named home
+            # session, leaving an inert placeholder there.  Follow the exact
+            # displayed pane identity just as status aggregation does;
+            # querying the home session in this state can only inspect the
+            # placeholder and leaves every new session unresolved until the
+            # first preview happens to return it home.
+            real_pane = self._display_transport().displayed_real_pane(
+                r.tmux_name)
+            if real_pane is not None:
+                identity = tmux_ctl.pane_identity(real_pane)
+                if identity is None:
+                    return set() if tmux_ctl.proc_fs_available() else None
+                return tmux_ctl.process_tree_rollout_ids(
+                    identity.pane_pid, sessions_dir)
             return tmux_ctl.session_rollout_ids(r.tmux_name, sessions_dir)
         except Exception:
             # On a procfs platform an inspection failure is ambiguity, not

{railmux-0.3.3.dev1 → railmux-0.3.3.dev2/src/railmux.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: railmux
-Version: 0.3.3.dev1
+Version: 0.3.3.dev2
 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.3.3.dev1 → railmux-0.3.3.dev2}/tests/test_display_transport.py

@@ -41,6 +41,7 @@ class FakeTmux:
         self.next_pane = 10
         self.next_session = 10
         self.swap_calls: list[tuple[str, str]] = []
+        self.fit_calls: list[tuple[str, str]] = []
         self.killed_sessions: list[str] = []
         self.fail_marker_window: str | None = None
         self.fail_swap_at: int | None = None
@@ -69,7 +70,7 @@ class FakeTmux:
             "split_window_v": self.split_window_h,
             "create_dual_pane_layout": self.create_dual_pane_layout,
             "respawn_pane": self.respawn_pane,
-            "fit_session_to_pane": lambda *_args: True,
+            "fit_session_to_pane": self.fit_session_to_pane,
             "wait_session_detached": lambda name, timeout=1.0: (
                 self.sessions[name]["attached"] == 0),
             "create_grouped_session": self.create_grouped_session,
@@ -218,6 +219,10 @@ class FakeTmux:
         self._relocate(target, source_window)
         return True
 
+    def fit_session_to_pane(self, session, pane):
+        self.fit_calls.append((session, pane))
+        return True
+
     def kill_session(self, name):
         session = self.sessions.pop(name, None)
         if session is None:
@@ -310,6 +315,7 @@ def test_successful_swap_out_and_home(rig):
     assert fake.window_options
 
     assert manager.return_home(workspace.primary)
+    assert fake.fit_calls == [("agent-a", "%2")]
     assert fake.panes["%2"].window_id == "@2"
     assert workspace.primary.pane_id == placeholder
     assert workspace.primary.swap_state is None
@@ -324,6 +330,7 @@ def test_compact_parking_keeps_agent_home_and_slot_placeholder_stable(rig):
     assert state is not None
 
     assert manager.park(workspace.primary)
+    assert fake.fit_calls == [("agent-a", "%2")]
     assert workspace.primary.display_parked is True
     assert workspace.primary.agent_tmux_name == "agent-a"
     assert workspace.primary.pane_id == state.placeholder_pane_id
@@ -356,6 +363,19 @@ def test_compact_park_swap_failure_leaves_agent_displayed(rig):
     assert fake.panes["%2"].window_id == "@1"
 
 
+def test_return_geometry_failure_does_not_weaken_identity_transaction(
+    rig, monkeypatch,
+):
+    fake, workspace, manager = rig
+    assert manager.attach(workspace.primary, "agent-a").ok
+    monkeypatch.setattr(
+        transport_mod.tmux_ctl, "fit_session_to_pane", lambda *_args: False)
+
+    assert manager.return_home(workspace.primary)
+    assert fake.panes["%2"].window_id == "@2"
+    assert workspace.primary.swap_state is None
+
+
 def test_compact_park_marker_commit_failure_rolls_back_display(rig, monkeypatch):
     fake, workspace, manager = rig
     assert manager.attach(workspace.primary, "agent-a").ok

{railmux-0.3.3.dev1 → railmux-0.3.3.dev2}/tests/test_soft_quit.py

@@ -2817,6 +2817,7 @@ def test_resolve_placeholders_codex_rekeys_to_real_uuid():
     app = App.__new__(App)
     app._codex_mode = True
     app._right_pane_claude = None
+    app._running_sort_ts = 1234.0
     app._running = {
         "__new__-1": _Running(
             key="__new__-1", tmux_name="cx-new----1",
@@ -2840,6 +2841,10 @@ def test_resolve_placeholders_codex_rekeys_to_real_uuid():
     entry = app._running[real_id]
     assert entry.tmux_name == "cx-new----1"      # same tmux session, re-keyed
     assert not entry.is_placeholder
+    assert entry.label == "test-proj/Real session"
+    assert entry.status == "idle"
+    assert entry.last_mtime == 1000.0
+    assert app._running_sort_ts == 0.0
     app._codex_index.sessions_for_cwd.assert_called_once_with(
         proj.real_path, refresh=False)
 
@@ -3180,6 +3185,40 @@ def test_correlate_codex_rollout_fails_closed_without_config(monkeypatch):
     assert app._correlate_codex_rollout(r) == set()
 
 
+def test_correlate_codex_rollout_follows_swap_displayed_real_pane(monkeypatch):
+    """A swap leaves only an inert placeholder in the named home session."""
+    session_id = "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+    sessions_dir = Path("/codex/sessions")
+    app = App.__new__(App)
+    app._codex_home_path = lambda: sessions_dir.parent
+    manager = MagicMock()
+    manager.displayed_real_pane.return_value = "%42"
+    app._display_transport_manager = manager
+    running = _Running(
+        key="__new__-tok-1",
+        tmux_name="cx-new----tok-1",
+        label="test-proj/(new)",
+        session_type="codex",
+    )
+    monkeypatch.setattr(
+        tmux_ctl,
+        "pane_identity",
+        lambda pane: tmux_ctl.PaneIdentity(
+            pane, 4242, "railmux", "$1", "@1", False, 100, 30
+        ),
+    )
+    process_probe = MagicMock(return_value={session_id})
+    monkeypatch.setattr(tmux_ctl, "process_tree_rollout_ids", process_probe)
+    home_probe = MagicMock(side_effect=AssertionError(
+        "the home session contains only the swap placeholder"
+    ))
+    monkeypatch.setattr(tmux_ctl, "session_rollout_ids", home_probe)
+
+    assert app._correlate_codex_rollout(running) == {session_id}
+    process_probe.assert_called_once_with(4242, sessions_dir)
+    home_probe.assert_not_called()
+
+
 def test_launch_snapshots_pre_existing_ids(monkeypatch):
     """_launch captures the cwd's existing session ids into the placeholder's
     pre_launch_ids before starting the child (#12)."""

{railmux-0.3.3.dev1 → railmux-0.3.3.dev2}/tests/test_tmux_integration.py

@@ -2308,7 +2308,7 @@ def test_real_compact_parking_keeps_hidden_provider_geometry_stable(
         check=True,
     )
     subprocess.run(
-        ["tmux", "new-session", "-d", "-x", "82", "-y", "39",
+        ["tmux", "new-session", "-d", "-x", "46", "-y", "25",
          "-s", "compact-park-agent", "sleep 60"],
         check=True,
     )
@@ -2327,10 +2327,17 @@ def test_real_compact_parking_keeps_hidden_provider_geometry_stable(
     state = workspace.primary.swap_state
     assert state is not None
     provider_pid = tmux_ctl.pane_identity(state.agent_pane_id).pane_pid
+    visible_size = tmux_ctl.pane_size(state.agent_pane_id)
+    assert visible_size is not None
+    assert visible_size[0] == 82
+    assert visible_size != (46, 25)
 
     assert manager.park(workspace.primary)
     parked_size = tmux_ctl.pane_size(state.agent_pane_id)
-    assert parked_size is not None
+    # The detached home began at 46x25. Parking must carry over the real
+    # pane's visible geometry instead of narrowing background output back to
+    # that stale launch size.
+    assert parked_size == visible_size
     subprocess.run(
         ["tmux", "resize-window", "-t", display_session, "-x", "105", "-y", "20"],
         check=True,

railmux-0.3.3.dev1/src/railmux/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.3.dev1"