johno/gastown
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(tmux): use switch-client when already inside tmux session

Browse Source 
When attaching to a session from within tmux, use 'tmux switch-client'
instead of 'tmux attach-session' to avoid the nested session error.

Fixes #603

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
gastown/crew/dennis
2026-01-16 15:27:45 -08:00
committed by Steve Yegge
parent 29f8dd67e2
commit 7af7634022
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/cmd/crew_helpers.go
View File

@@ -214,14 +214,22 @@ func isInTmuxSession(targetSession string) bool {
}
// attachToTmuxSession attaches to a tmux session.
// Should only be called from outside tmux.
// If already inside tmux, uses switch-client instead of attach-session.
func attachToTmuxSession(sessionID string) error {
tmuxPath, err := exec.LookPath("tmux")
if err != nil {
return fmt.Errorf("tmux not found: %w", err)
}
cmd := exec.Command(tmuxPath, "attach-session", "-t", sessionID)
// Check if we're already inside a tmux session
var cmd *exec.Cmd
if os.Getenv("TMUX") != "" {
// Inside tmux: switch to the target session
cmd = exec.Command(tmuxPath, "switch-client", "-t", sessionID)
} else {
// Outside tmux: attach to the session
cmd = exec.Command(tmuxPath, "attach-session", "-t", sessionID)
}
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr