From 46ce96ae62a1611e6a83c88360cc5a429696a356 Mon Sep 17 00:00:00 2001
From: Steve Yegge <steve.yegge@gmail.com>
Date: Tue, 23 Dec 2025 04:48:14 -0800
Subject: [PATCH] merge: resolve conflict in tmux.go (keep SwitchClient)

---
 internal/tmux/tmux.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/internal/tmux/tmux.go b/internal/tmux/tmux.go
index f08ae719..b7e1fec6 100644
--- a/internal/tmux/tmux.go
+++ b/internal/tmux/tmux.go
@@ -561,3 +561,10 @@ func (t *Tmux) RespawnPane(pane, command string) error {
 	_, err := t.run("respawn-pane", "-k", "-t", pane, command)
 	return err
 }
+
+// SwitchClient switches the current tmux client to a different session.
+// Used after remote recycle to move the user's view to the recycled session.
+func (t *Tmux) SwitchClient(targetSession string) error {
+	_, err := t.run("switch-client", "-t", targetSession)
+	return err
+}