From d4819a6c0270103fcaa8f1875c58929c4f043195 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sun, 17 Mar 2024 13:44:56 -0500
Subject: [PATCH 1/2] refactor: Simplify targets

---
 src/libtmux/session.py |  6 +++---
 src/libtmux/window.py  | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/libtmux/session.py b/src/libtmux/session.py
index 045acb0bd..a1e1ca29f 100644
--- a/src/libtmux/session.py
+++ b/src/libtmux/session.py
@@ -497,7 +497,7 @@ def switch_client(self) -> "Session":
         ------
         :exc:`exc.LibTmuxException`
         """
-        proc = self.cmd("switch-client", target=self.session_id)
+        proc = self.cmd("switch-client")
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
@@ -803,7 +803,7 @@ def attach_session(self) -> "Session":
             category=DeprecationWarning,
             stacklevel=2,
         )
-        proc = self.cmd("attach-session", target=self.session_id)
+        proc = self.cmd("attach-session")
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
@@ -824,7 +824,7 @@ def kill_session(self) -> None:
             category=DeprecationWarning,
             stacklevel=2,
         )
-        proc = self.cmd("kill-session", target=self.session_id)
+        proc = self.cmd("kill-session")
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
diff --git a/src/libtmux/window.py b/src/libtmux/window.py
index dd71fc0ad..7e1f11454 100644
--- a/src/libtmux/window.py
+++ b/src/libtmux/window.py
@@ -194,7 +194,7 @@ def select_pane(self, target_pane: t.Union[str, int]) -> t.Optional["Pane"]:
         :class:`Pane`
         """
         if target_pane in ["-l", "-U", "-D", "-L", "-R"]:
-            proc = self.cmd("select-pane", target_pane, target=self.window_id)
+            proc = self.cmd("select-pane", target_pane)
         else:
             proc = self.cmd("select-pane", target=target_pane)
 
@@ -378,7 +378,7 @@ def select_layout(self, layout: t.Optional[str] = None) -> "Window":
         if layout:  # tmux allows select-layout without args
             cmd.append(layout)
 
-        proc = self.cmd(*cmd, target=f"{self.session_id}:{self.window_index}")
+        proc = self.cmd(*cmd)
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
@@ -412,7 +412,6 @@ def set_window_option(self, option: str, value: t.Union[int, str]) -> "Window":
             "set-window-option",
             option,
             value,
-            target=f"{self.session_id}:{self.window_index}",
         )
 
         if isinstance(cmd.stderr, list) and len(cmd.stderr):
@@ -920,10 +919,7 @@ def kill_window(self) -> None:
             category=DeprecationWarning,
             stacklevel=2,
         )
-        proc = self.cmd(
-            "kill-window",
-            target=f"{self.session_id}:{self.window_index}",
-        )
+        proc = self.cmd("kill-window")
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)

From 22b51e8a5fe31292c19ffd6e2f7fdf7e94fd3f6f Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Sun, 17 Mar 2024 13:51:09 -0500
Subject: [PATCH 2/2] docs(CHANGES): Note target simplification

---
 CHANGES | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 01c5503fc..304c1ea56 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,10 @@ $ pip install --user --upgrade --pre libtmux
 
 <!-- To maintainers and contributors: Please add notes for the forthcoming version above -->
 
+### Breaking changes
+
+- Eliminate redundant targets / `window_index`'s across codebase (#536).
+
 ## libtmux 0.34.0 (2024-03-17)
 
 ### Breaking changes