Auto-detach when all agents in window exit

Add agent-cmd.sh wrapper that detaches the client when all panes in the
current window have exited. This allows multiple agent windows (one per
directory) while automatically returning to the shell when done with a
particular window's agents.

- remain-on-exit keeps panes alive after agent exits to check status
- Wrapper counts running panes and detaches when it's the last one

agent-cmd.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Wrapper that runs an agent command, then detaches if all panes in window are dead
+
+# Run the agent command (don't use set -e, agent may exit non-zero)
+"$@" || true
+
+# Brief delay to let tmux update pane status
+sleep 0.1
+
+# Count panes still running (pane_dead=0)
+# Note: our own pane counts as running since this script is executing
+running=$(tmux list-panes -F '#{pane_dead}' | grep -c '^0$' || true)
+
+# If we're the only pane still running, all others are dead - detach
+[ "$running" -le 1 ] && tmux detach-client

agent.sh

@@ -2,39 +2,56 @@
 
 set -e
 
-# Get the directory passed as argument (from #{pane_current_path})
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-dir="${1:-$HOME}"
+
+# Check which agent commands are available
+agents=()
+command -v claude &>/dev/null && agents+=(claude)
+command -v opencode &>/dev/null && agents+=(opencode)
+command -v gemini &>/dev/null && agents+=(gemini)
+
+if [ ${#agents[@]} -eq 0 ]; then
+  echo "No agent commands found (claude, gemini)"
+  exit 1
+fi
+
+# Use the current directory (set via display-popup -d)
+dir="${PWD:-$HOME}"
 # Use the directory basename as window name
-window_name="$(basename "$dir")"
+window_name=$dir
-session_name="agent"
 
 # Create the agent session if it doesn't exist
-if ! tmux has-session -t "$session_name" 2>/dev/null; then
+if ! tmux has-session -t agent; then
-  tmux new-session -ds "$session_name" -c "$dir" -n "$window_name" claude
+  tmux new-session -ds agent -c "$dir" -n "$window_name" "$script_dir/agent-cmd.sh" "${agents[0]}"
+  [ ${#agents[@]} -gt 1 ] && tmux split-window -h -t agent:0 "$script_dir/agent-cmd.sh" "${agents[1]}"
   # Store the directory in a window option for later matching
-  tmux set-window-option -t "$session_name" @agent_dir "$dir"
+  tmux set-window-option -t agent @agent_dir "$dir"
-  tmux attach-session -t "$session_name"
+  tmux set-option -t agent status off
+  tmux set-option -t agent remain-on-exit on
+  tmux attach-session -t agent
   exit 0
 fi
 
 # Search for an existing window with matching directory
 target_window=""
-while IFS=$'\t' read -r window_id window_dir; do
+for window_id in $(tmux list-windows -t agent -F '#{window_id}'); do
+  window_dir=$(tmux show-window-option -t "$window_id" -v @agent_dir 2>/dev/null || true)
   if [ "$window_dir" = "$dir" ]; then
     target_window="$window_id"
     break
   fi
-done < <(tmux list-windows -t "$session_name" -F '#{window_id}	#{@agent_dir}')
+done
 
 if [ -n "$target_window" ]; then
   # Select the existing window
   tmux select-window -t "$target_window"
 else
-  # Create a new window with claude
+  # Create a new window with agents
-  tmux new-window -t "$session_name" -n "$window_name" -c "$dir" claude
+  tmux new-window -t agent -c "$dir" -n "$window_name" "$script_dir/agent-cmd.sh" "${agents[0]}"
+  [ ${#agents[@]} -gt 1 ] && tmux split-window -h -t agent -c "$dir" "$script_dir/agent-cmd.sh" "${agents[1]}"
   # Store the directory in a window option for later matching
-  tmux set-window-option -t "$session_name" @agent_dir "$dir"
+  tmux set-window-option -t agent @agent_dir "$dir"
 fi
 
 # Attach to the session
-tmux attach-session -t "$session_name"
+tmux attach-session -t agent

tmux.conf

@@ -66,17 +66,19 @@ bind a run-shell ~/.local/share/tmux/layouts/window-auto
 if -b '[ "`uname`" = "Darwin" ]' \
   'set -g default-command "reattach-to-user-namespace -l $SHELL"'
 
-if -b '~/.config/tmux/check-version.sh ">" 3.2' {
+if -b '~/.config/tmux/check-version.sh ">=" 3.2 && ~/.config/tmux/check-version.sh "<" 3.3' {
-  # Open a popup with running the default shell
+  bind A display-popup -d '#{pane_current_path}' -w 75% -h 90% -E ~/.config/tmux/agent.sh
-  bind T display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -E $SHELL
+  bind I display-popup -d '#{pane_current_path}' -E '$SHELL -i ~/.config/tmux/interpreter.sh'
-  # Open a popup with session creator/switcher
+  bind P display-popup -w 60 -h 10 -E '~/.config/tmux/project.sh'
-  bind S display-popup -B -w 60 -h 10 -E '~/.config/tmux/session.sh'
+  bind S display-popup -w 60 -h 10 -E '~/.config/tmux/session.sh'
-  # Open a popup with project selector
+  bind T display-popup -d '#{pane_current_path}' -E $SHELL
-  bind P display-popup -B -w 60 -h 10 -E '~/.config/tmux/project.sh'
+}
-  # Open a popup to pick an interpreter then launch it
+if -b '~/.config/tmux/check-version.sh ">=" 3.3' {
+  bind A display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -w 75% -h 90% -E ~/.config/tmux/agent.sh
   bind I display-popup -S fg=#54546D -b rounded -d '#{pane_current_path}' -E '$SHELL -i ~/.config/tmux/interpreter.sh'
-  # Open a popup with AI agent session for current directory
+  bind P display-popup -B -w 60 -h 10 -E '~/.config/tmux/project.sh'
-  bind A display-popup -S fg=#54546D -b rounded -w 90% -h 90% -E '~/.config/tmux/agent.sh "#{pane_current_path}"'
+  bind S display-popup -B -w 60 -h 10 -E '~/.config/tmux/session.sh'
+  bind T display-popup -S fg=#54546D -d '#{pane_current_path}' -E $SHELL
 }
 
 # Restore old next/previous window bindings