Window(fix[move_window]): refresh moved window state

why: move-window can land on an index different from the requested target and can
also change the owning session, leaving the returned Window stale.
what:
- refresh Window state after every successful move-window command
- add regressions for relative move freshness
- add a cross-session move regression with an explicit destination

Author: tony

src/libtmux/window.py

@@ -1013,10 +1013,7 @@ def move_window(
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
 
-        if destination != "" and session is not None:
-            self.window_index = destination
-        else:
-            self.refresh()
+        self.refresh()
 
         return self
 

tests/test_window.py

@@ -400,6 +400,54 @@ def test_move_window_to_other_session(server: Server, session: Session) -> None:
     assert new_session.windows.get(window_id=window_id) == window
 
 
+@pytest.mark.parametrize(
+    ("flag_name", "destination_offset"), [("after", 0), ("before", 1)]
+)
+def test_move_window_relative_returns_fresh_window(
+    flag_name: str,
+    destination_offset: int,
+    session: Session,
+) -> None:
+    """Window.move_window() returns fresh state for relative moves."""
+    destination_window = session.active_window
+    session.new_window(window_name="move_middle")
+    moving_window = session.new_window(window_name="move_relative")
+    assert destination_window.window_index is not None
+    assert moving_window.window_id is not None
+
+    destination = str(int(destination_window.window_index) + destination_offset)
+    if flag_name == "after":
+        moving_window.move_window(destination, after=True)
+    else:
+        moving_window.move_window(destination, before=True)
+
+    fresh_window = Window.from_window_id(
+        server=session.server,
+        window_id=moving_window.window_id,
+    )
+    assert moving_window.window_index == fresh_window.window_index
+    assert moving_window.session_id == fresh_window.session_id
+
+
+def test_move_window_to_other_session_with_destination(
+    server: Server,
+    session: Session,
+) -> None:
+    """Window.move_window() returns fresh state for cross-session moves."""
+    window = session.new_window(window_name="move_cross_session")
+    assert window.window_id is not None
+    new_session = server.new_session("test_move_window_destination")
+    destination = "99"
+
+    window.move_window(destination=destination, session=new_session.session_id)
+
+    fresh_window = Window.from_window_id(server=server, window_id=window.window_id)
+    assert fresh_window.session_id == new_session.session_id
+    assert fresh_window.window_index == destination
+    assert window.session_id == fresh_window.session_id
+    assert window.window_index == fresh_window.window_index
+
+
 def test_select_layout_accepts_no_arg(server: Server, session: Session) -> None:
     """Tmux allows select-layout with no arguments, so let's allow it here."""
     window = session.new_window(window_name="test_window")