railmux 0.4.1.dev1__tar.gz → 0.4.1.dev2__tar.gz

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

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

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

{railmux-0.4.1.dev1 → railmux-0.4.1.dev2}/src/railmux/fast_display_input.py

@@ -550,6 +550,8 @@ _EMBEDDED_WINDOWS_PATH_RE = re.compile(
     r"(?:^|(?<=[^A-Za-z0-9_.@+~\\/-]))"
     r"(?:[A-Za-z]:[\\/]|\\\\[^\\/\s]+[\\/][^\\/\s]+(?:[\\/]|$))"
 )
+_TOOL_COMMAND_START_RE = re.compile(r"^\s*[•●]\s+Ran\s+")
+_TOOL_COMMAND_CONTINUATION_RE = re.compile(r"^\s*│\s?")
 
 
 def _clicked_character_index(
@@ -893,6 +895,169 @@ def _hard_wrapped_target(
     return best
 
 
+def _decorated_tool_target(
+    rows: tuple[tuple[str | None, ...], ...],
+    row: int,
+    column: int,
+    *,
+    route: HistorySnapshot,
+) -> ClickTarget | None:
+    """Join a token split across Codex's decorated ``Ran`` command rows."""
+    if not 0 <= row < len(rows) or route.width <= 0:
+        return None
+
+    # A continuation glyph alone is not authority: it can occur in ordinary
+    # program output. Walk back through one bounded chain and require Codex's
+    # explicit ``Ran`` header before interpreting the prefixes as decoration.
+    block_first = row
+    while (
+        block_first > 0
+        and row - block_first < 7
+        and _TOOL_COMMAND_CONTINUATION_RE.match(_row_text(rows[block_first]))
+    ):
+        block_first -= 1
+    if _TOOL_COMMAND_START_RE.match(_row_text(rows[block_first])) is None:
+        return None
+
+    block_last = block_first
+    while (
+        block_last + 1 < len(rows)
+        and block_last - block_first < 7
+        and _TOOL_COMMAND_CONTINUATION_RE.match(_row_text(rows[block_last + 1]))
+    ):
+        block_last += 1
+    if not block_first <= row <= block_last:
+        return None
+
+    best: ClickTarget | None = None
+    for first in range(block_first, row + 1):
+        first_text = _row_text(rows[first])
+        prefix = (
+            _TOOL_COMMAND_START_RE.match(first_text)
+            if first == block_first
+            else _TOOL_COMMAND_CONTINUATION_RE.match(first_text)
+        )
+        if prefix is None:
+            continue
+        tail = re.search(r"""[^\s<>"'`]+\s*$""", first_text[prefix.end() :])
+        if tail is None:
+            continue
+        fragment = tail.group(0).rstrip()
+        fragment_index = prefix.end() + tail.start()
+        fragment, fragment_index, _fragment_end = _trim_click_token(
+            fragment,
+            fragment_index,
+            fragment_index + len(fragment),
+        )
+        lower = fragment.lower()
+        is_url = lower.startswith(("http://", "https://"))
+        is_path = (
+            _path_parts(fragment) is not None
+            or fragment.startswith(("/", "./", "../", "~/"))
+            or _WINDOWS_ABSOLUTE_PATH_RE.match(fragment) is not None
+        )
+        if not (is_url or is_path):
+            continue
+        fragment_column = _display_column(first_text, fragment_index)
+        fragments: list[tuple[int, int, str]] = [(first, fragment_column, fragment)]
+        joined = fragment
+        previous_end = fragment_column + sum(
+            _display_width(character) for character in fragment
+        )
+
+        for following in range(first + 1, block_last + 1):
+            # The formatter may place a new shell token on the following
+            # decorated row. Only a fragment ending near the physical edge is
+            # proof that the token itself, rather than the command, wrapped.
+            if route.width - previous_end > 8:
+                break
+            following_text = _row_text(rows[following])
+            following_prefix = _TOOL_COMMAND_CONTINUATION_RE.match(following_text)
+            if following_prefix is None:
+                break
+            continuation = re.match(
+                r"""([^\s<>"'`]+)""",
+                following_text[following_prefix.end() :],
+            )
+            if continuation is None:
+                break
+            next_fragment = continuation.group(1)
+            next_index = following_prefix.end() + continuation.start()
+            next_fragment, next_index, _next_end = _trim_click_token(
+                next_fragment,
+                next_index,
+                next_index + len(next_fragment),
+            )
+            if not next_fragment:
+                break
+            if is_path and (
+                next_fragment[0] not in "._~" and not next_fragment[0].isalnum()
+            ):
+                break
+            if is_url and (
+                next_fragment[0] not in "._~/%?&#"
+                and not next_fragment[0].isalnum()
+            ):
+                break
+            next_column = _display_column(following_text, next_index)
+            fragments.append((following, next_column, next_fragment))
+            joined += next_fragment
+            previous_end = next_column + sum(
+                _display_width(character) for character in next_fragment
+            )
+
+            clicked = any(
+                fragment_row == row
+                and start_column
+                <= column
+                < start_column
+                + sum(_display_width(character) for character in fragment_text)
+                for fragment_row, start_column, fragment_text in fragments
+            )
+            if not clicked:
+                continue
+            if is_url:
+                value = _bounded_url_token(joined)
+                parsed = urlsplit(value)
+                if (
+                    parsed.scheme.lower() not in ("http", "https")
+                    or parsed.hostname is None
+                    or len(value.encode("utf-8")) > 8192
+                ):
+                    continue
+                kind = "url"
+                line = None
+                target_column = None
+            else:
+                path = _path_parts(joined)
+                if path is None:
+                    continue
+                value, line, target_column = path
+                kind = "path"
+            segments = tuple(
+                (
+                    route.y + fragment_row,
+                    route.x + start_column,
+                    fragment_text.encode("utf-8"),
+                )
+                for fragment_row, start_column, fragment_text in fragments
+            )
+            candidate = ClickTarget(
+                kind,
+                value,
+                route.pane_id or "",
+                line,
+                target_column,
+                highlight_row=segments[0][0],
+                highlight_column=segments[0][1],
+                highlight_text=segments[0][2],
+                highlight_segments=segments,
+            )
+            if best is None or len(candidate.value) > len(best.value):
+                best = candidate
+    return best
+
+
 def _highlight_runs(
     target: ClickTarget,
     *,
@@ -963,6 +1128,14 @@ def _target_in_rows(
     """Resolve a semantic target across one bounded visual-wrap chain."""
     if not 0 <= row < len(rows) or route.width <= 0:
         return None
+    decorated = _decorated_tool_target(
+        rows,
+        row,
+        column,
+        route=route,
+    )
+    if decorated is not None:
+        return decorated
     # A full terminal row followed by a non-indented row is an authoritative
     # visual soft-wrap chain.  Do not let the more permissive agent hard-wrap
     # heuristic accept a shorter prefix first: on a three-row URL that made

{railmux-0.4.1.dev1 → railmux-0.4.1.dev2}/src/railmux/windows_attach_relay.py

@@ -1236,6 +1236,8 @@ class LocalPtyClient:
         self._session_id = session_id
         self._input_decoder = TerminalInputDecoder()
         self._selection = LocalTextSelection()
+        self._passthrough_left_gesture = False
+        self._suppressed_left_gesture = False
         self._routes: tuple[HistorySnapshot, ...] = ()
         self._routes_checked_at = 0.0
         self._routes_force_refresh = True
@@ -1508,15 +1510,50 @@ class LocalPtyClient:
             part,
             logical_height=logical_height,
         )
+        left_drag = (
+            event.pressed
+            and bool(event.button & 32)
+            and event.button & 3 == 0
+            and not event.button & 64
+        )
+        left_release = not event.pressed and event.button & 3 == 0
+        plain_left_press = LocalTextSelection._is_plain_left_press(event)
+        if getattr(self, "_suppressed_left_gesture", False):
+            if left_drag or left_release:
+                if left_release:
+                    self._suppressed_left_gesture = False
+                return
+            if plain_left_press:
+                self._suppressed_left_gesture = False
+        if getattr(self, "_passthrough_left_gesture", False):
+            if left_drag or left_release:
+                if left_release:
+                    self._passthrough_left_gesture = False
+                _write_pty_input(self.master_fd, event.raw)
+                return
+            if plain_left_press:
+                self._passthrough_left_gesture = False
         if not self._renderer.presentation_stable:
-            if self._selection.cancel():
+            if not self._selection.capturing and self._selection.cancel():
                 self._renderer.set_selection(self._selection.segments())
             # A queued frame can already represent a new tmux pane topology
             # while the user still sees the prior one.  Dropping only pointer
-            # input during this bounded transition is safer than forwarding a
-            # click to Quit or a wheel event into stock tmux copy-mode.
-            return
-        source = self._selection_source(event)
+            # input during this bounded transition is safer than forwarding it
+            # to Quit or stock tmux copy-mode. A capture already owns an
+            # immutable visible snapshot and therefore keeps the whole gesture.
+            if not self._selection.capturing:
+                if plain_left_press or left_drag:
+                    self._suppressed_left_gesture = not left_release
+                return
+        if self._selection.capturing:
+            # Once the newer frame is physically visible, revalidate the
+            # captured route before consuming another event. During a queued
+            # transition the old snapshot remains the visible authority.
+            if self._renderer.presentation_stable:
+                self._refresh_routes()
+            source = None
+        else:
+            source = self._selection_source(event)
         if event.is_hover_motion:
             if self._selection.hover(event, source):
                 self._renderer.set_selection(self._selection.segments())
@@ -1533,6 +1570,13 @@ class LocalPtyClient:
         if action.open_target is not None:
             self._open_target(action.open_target)
         if not action.handled:
+            if plain_left_press:
+                self._passthrough_left_gesture = True
+            elif left_drag or left_release:
+                # Never give tmux half a left-button gesture. An orphan means
+                # its press was suppressed or a captured route was invalidated.
+                self._suppressed_left_gesture = left_drag
+                return
             _write_pty_input(self.master_fd, event.raw)
 
     def poll(self) -> int | None:

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

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

@@ -677,6 +677,118 @@ def test_local_text_selection_resolves_all_three_soft_wrapped_url_rows():
         assert action.open_target.value == expected
 
 
+def test_local_text_selection_joins_url_across_codex_ran_decoration():
+    first = "• Ran curl https://example.test/releases/rail"
+    second = "  │ mux/0.4.1.dev1/index.html --head"
+    width = max(len(first), len(second))
+    route = HistorySnapshot(1, "%8", 3, 2, width, 2)
+    source = SelectionSource(
+        route,
+        tuple((line + " " * (width - len(line))).encode() for line in (first, second)),
+        0,
+    )
+    expected = "https://example.test/releases/railmux/0.4.1.dev1/index.html"
+    expected_segments = (
+        (2, 3 + first.index("https://"), b"https://example.test/releases/rail"),
+        (3, 3 + second.index("mux/"), b"mux/0.4.1.dev1/index.html"),
+    )
+
+    for screen_row, text, token in (
+        (3, first, "https://"),
+        (4, second, "mux/"),
+    ):
+        selection = LocalTextSelection()
+        screen_column = 3 + text.index(token) + 2
+        assert selection.hover(
+            SgrMouseEvent(b"hover", 35, screen_column, screen_row, True),
+            source,
+        )
+        assert selection.segments() == expected_segments
+        selection.pointer_event(
+            SgrMouseEvent(b"down", 0, screen_column, screen_row, True),
+            source,
+        )
+        action = selection.pointer_event(
+            SgrMouseEvent(b"up", 0, screen_column, screen_row, False),
+            source,
+        )
+        assert action.open_target is not None
+        assert action.open_target.kind == "url"
+        assert action.open_target.value == expected
+
+
+def test_local_text_selection_joins_path_across_codex_ran_decoration():
+    first = "• Ran /tmp/railmux-published-0.4.1.dev1-"
+    second = "  │ 20260816/bin/pip --isolated"
+    width = max(len(first), len(second))
+    route = HistorySnapshot(1, "%8", 0, 0, width, 2)
+    source = SelectionSource(
+        route,
+        tuple((line + " " * (width - len(line))).encode() for line in (first, second)),
+        0,
+    )
+    selection = LocalTextSelection()
+    column = second.index("20260816") + 2
+
+    assert selection.hover(SgrMouseEvent(b"hover", 35, column, 2, True), source)
+    assert selection.segments() == (
+        (0, first.index("/tmp/"), b"/tmp/railmux-published-0.4.1.dev1-"),
+        (1, second.index("20260816"), b"20260816/bin/pip"),
+    )
+    selection.pointer_event(SgrMouseEvent(b"down", 0, column, 2, True), source)
+    action = selection.pointer_event(
+        SgrMouseEvent(b"up", 0, column, 2, False),
+        source,
+    )
+    assert action.open_target is not None
+    assert action.open_target.kind == "path"
+    assert action.open_target.value == (
+        "/tmp/railmux-published-0.4.1.dev1-20260816/bin/pip"
+    )
+
+
+def test_local_text_selection_does_not_join_undecorated_box_drawing_rows():
+    first = "Output /home/user/project/"
+    second = "  │ sibling/file.py"
+    width = max(len(first), len(second))
+    route = HistorySnapshot(1, "%8", 0, 0, width, 2)
+    source = SelectionSource(
+        route,
+        tuple((line + " " * (width - len(line))).encode() for line in (first, second)),
+        0,
+    )
+    selection = LocalTextSelection()
+
+    selection.pointer_event(SgrMouseEvent(b"down", 0, 12, 1, True), source)
+    action = selection.pointer_event(
+        SgrMouseEvent(b"up", 0, 12, 1, False),
+        source,
+    )
+    assert action.open_target is not None
+    assert action.open_target.value == "/home/user/project/"
+
+
+def test_local_text_selection_does_not_join_next_decorated_shell_option():
+    first = "• Ran cat /home/user/project/"
+    second = "  │ --verbose"
+    width = len(first)
+    route = HistorySnapshot(1, "%8", 0, 0, width, 2)
+    source = SelectionSource(
+        route,
+        tuple((line + " " * (width - len(line))).encode() for line in (first, second)),
+        0,
+    )
+    selection = LocalTextSelection()
+
+    selection.pointer_event(SgrMouseEvent(b"down", 0, 12, 1, True), source)
+    action = selection.pointer_event(
+        SgrMouseEvent(b"up", 0, 12, 1, False),
+        source,
+    )
+    assert action.open_target is not None
+    assert action.open_target.value == "/home/user/project/"
+
+
 def test_local_text_selection_strips_label_before_absolute_path():
     route = HistorySnapshot(1, "%8", 0, 0, 40, 1)
     source = SelectionSource(

{railmux-0.4.1.dev1 → railmux-0.4.1.dev2}/tests/test_windows_attach_relay.py

@@ -302,6 +302,41 @@ def test_local_semantic_drag_copies_without_forwarding_mouse(monkeypatch):
         child_socket.close()
 
 
+def test_local_semantic_drag_keeps_ownership_during_frame_transition():
+    proxy_socket, child_socket = socket.socketpair()
+    client = windows_attach_relay.LocalPtyClient.__new__(
+        windows_attach_relay.LocalPtyClient
+    )
+    client.master_fd = proxy_socket.detach()
+    client._session_id = "$4"
+    client._selection = LocalTextSelection()
+    client._routes = (HistorySnapshot(0, "%8", 0, 0, 20, 1),)
+    client._routes_checked_at = time.monotonic()
+    client._path_prompt = None
+    client._path_prompt_mouse_button = None
+    client._size = (20, 1)
+    renderer = MagicMock()
+    renderer.presentation_stable = True
+    renderer.screen = SimpleNamespace(
+        width=20, height=1, cursor_x=1, cursor_y=0, rows=(b"select me",)
+    )
+    renderer.surface.translate_mouse_event.side_effect = lambda event, **_kwargs: event
+    client._renderer = renderer
+    child_socket.setblocking(False)
+    try:
+        client._forward_input_part(SgrMouseEvent(b"down", 0, 1, 1, True))
+        renderer.presentation_stable = False
+        client._forward_input_part(SgrMouseEvent(b"drag", 32, 6, 1, True))
+        client._forward_input_part(SgrMouseEvent(b"up", 0, 6, 1, False))
+
+        renderer.copy_to_clipboard.assert_called_once_with(b"select")
+        with pytest.raises(BlockingIOError):
+            child_socket.recv(64)
+    finally:
+        os.close(client.master_fd)
+        child_socket.close()
+
+
 def test_local_semantic_url_in_unfocused_agent_replays_focus_click():
     client = windows_attach_relay.LocalPtyClient.__new__(
         windows_attach_relay.LocalPtyClient
@@ -922,6 +957,9 @@ def test_local_pointer_is_dropped_while_visible_frame_is_transitioning():
     child_socket.setblocking(False)
     try:
         client._forward_input_part(SgrMouseEvent(b"stale-click", 0, 4, 5, True))
+        renderer.presentation_stable = True
+        client._forward_input_part(SgrMouseEvent(b"orphan-drag", 32, 8, 5, True))
+        client._forward_input_part(SgrMouseEvent(b"orphan-up", 0, 8, 5, False))
         with pytest.raises(BlockingIOError):
             child_socket.recv(64)
     finally:
@@ -929,6 +967,42 @@ def test_local_pointer_is_dropped_while_visible_frame_is_transitioning():
         child_socket.close()
 
 
+def test_local_left_gesture_outside_agent_route_remains_tmux_owned():
+    client = windows_attach_relay.LocalPtyClient.__new__(
+        windows_attach_relay.LocalPtyClient
+    )
+    proxy_socket, child_socket = socket.socketpair()
+    client.master_fd = proxy_socket.detach()
+    client._session_id = "$4"
+    client._selection = LocalTextSelection()
+    client._routes = (HistorySnapshot(0, "%8", 0, 0, 20, 1),)
+    client._routes_checked_at = time.monotonic()
+    client._path_prompt = None
+    client._path_prompt_mouse_button = None
+    client._size = (20, 2)
+    renderer = MagicMock()
+    renderer.presentation_stable = True
+    renderer.screen = SimpleNamespace(
+        width=20,
+        height=2,
+        cursor_x=1,
+        cursor_y=0,
+        rows=(b"agent", b"status"),
+    )
+    renderer.surface.translate_mouse_event.side_effect = lambda event, **_kwargs: event
+    client._renderer = renderer
+    child_socket.settimeout(0.5)
+    try:
+        client._forward_input_part(SgrMouseEvent(b"down", 0, 2, 2, True))
+        client._forward_input_part(SgrMouseEvent(b"drag", 32, 4, 2, True))
+        client._forward_input_part(SgrMouseEvent(b"up", 0, 4, 2, False))
+
+        assert child_socket.recv(64) == b"downdragup"
+    finally:
+        os.close(client.master_fd)
+        child_socket.close()
+
+
 def test_local_explicit_tmux_copy_mode_key_remains_byte_exact():
     client = windows_attach_relay.LocalPtyClient.__new__(
         windows_attach_relay.LocalPtyClient

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

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