.gitmodules

@@ -22,3 +22,6 @@
 [submodule "dependencies/fzf"]
 	path = dependencies/fzf
 	url = https://github.com/junegunn/fzf.git
+[submodule "config/tmux/plugins/tmux-fzf"]
+	path = config/tmux/plugins/tmux-fzf
+	url = https://github.com/sainnhe/tmux-fzf

config/tmux.conf

@@ -47,6 +47,21 @@ bind -r C-l select-window -t :+
 
 bind a setw synchronize-panes
 
+# Fuzzy pickers over every session/window/pane, each with a live preview of
+# what it's running (tmux-fzf). prefix+F opens the plugin's own top-level
+# menu; these skip straight to the panels used most -- pane.sh is where
+# break/join/swap live, i.e. moving a pane into another window without
+# hand-typing a target the way join-pane needs.
+#
+# TMUX_FZF_CLIENT pins the action to the client that opened it, exactly as
+# the plugin's own binding does: a command run via run-shell has no client
+# context of its own, so tmux otherwise falls back to the most recently
+# active client -- the wrong terminal whenever a second client (e.g. a
+# browser one over ttyd) is attached to the same session.
+bind P run-shell -b "TMUX_FZF_CLIENT='#{client_tty}' ~/.tmux/plugins/tmux-fzf/scripts/pane.sh"
+bind W run-shell -b "TMUX_FZF_CLIENT='#{client_tty}' ~/.tmux/plugins/tmux-fzf/scripts/window.sh"
+bind S run-shell -b "TMUX_FZF_CLIENT='#{client_tty}' ~/.tmux/plugins/tmux-fzf/scripts/session.sh"
+
 # ----------------------------------------------------------------------------
 # Copy mode and mouse
 # ----------------------------------------------------------------------------
@@ -155,6 +170,13 @@ set -g status-style "#{?client_prefix,#{@status_style_armed},#{@status_style_nor
 # ----------------------------------------------------------------------------
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
+# Checked out as a submodule under config/tmux/plugins rather than left for
+# TPM to clone on first prefix+I: ~/.tmux is a symlink to that directory, so
+# a TPM-installed plugin lands inside this repo as untracked files. The
+# submodule pins a version, installs with the existing "git submodule
+# update --init" in install.sh, and keeps git status clean. TPM still sources
+# it from the @plugin line below and can still update it.
+set -g @plugin 'sainnhe/tmux-fzf'
 
 # Local overrides
 if-shell "[ -f ~/.tmux_local.conf ]" 'source ~/.tmux_local.conf'