Files
gastown/internal/cmd/crew_cycle.go
Steve Yegge 921e57309b fix: gt crew next returns success for non-crew sessions (gt-1s89v)
When run in a non-crew session (Mayor, Witness, Refinery, Deacon),
gt crew next/prev now returns success (exit 0) instead of an error.

These sessions don't have cycle groups, so pressing C-b n should
simply do nothing rather than fail with an error message.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-27 16:48:26 -08:00

97 lines
2.5 KiB
Go

package cmd
import (
"fmt"
"os/exec"
"sort"
"github.com/spf13/cobra"
)
// crewCycleSession is the --session flag for crew next/prev commands.
// When run via tmux key binding (run-shell), the session context may not be
// correct, so we pass the session name explicitly via #{session_name} expansion.
var crewCycleSession string
// cycleCrewSession switches to the next or previous crew session in the same rig.
// direction: 1 for next, -1 for previous
// sessionOverride: if non-empty, use this instead of detecting current session
func cycleCrewSession(direction int, sessionOverride string) error {
var currentSession string
var err error
if sessionOverride != "" {
// Use the provided session name (from tmux key binding)
currentSession = sessionOverride
} else {
// Get current session (uses existing function from handoff.go)
currentSession, err = getCurrentTmuxSession()
if err != nil {
return fmt.Errorf("not in a tmux session: %w", err)
}
if currentSession == "" {
return fmt.Errorf("not in a tmux session")
}
}
// Parse rig name from current session
rigName, _, ok := parseCrewSessionName(currentSession)
if !ok {
// Not a crew session (e.g., Mayor, Witness, Refinery) - no cycling, just stay put
return nil
}
// Find all crew sessions for this rig
sessions, err := findRigCrewSessions(rigName)
if err != nil {
return fmt.Errorf("listing sessions: %w", err)
}
if len(sessions) == 0 {
return fmt.Errorf("no crew sessions found for rig %s", rigName)
}
// Sort for consistent ordering
sort.Strings(sessions)
// Find current position
currentIdx := -1
for i, s := range sessions {
if s == currentSession {
currentIdx = i
break
}
}
if currentIdx == -1 {
// Current session not in list (shouldn't happen)
return fmt.Errorf("current session not found in crew list")
}
// Calculate target index (with wrapping)
targetIdx := (currentIdx + direction + len(sessions)) % len(sessions)
if targetIdx == currentIdx {
// Only one session, nothing to switch to
return nil
}
targetSession := sessions[targetIdx]
// Switch to target session
cmd := exec.Command("tmux", "switch-client", "-t", targetSession)
if err := cmd.Run(); err != nil {
return fmt.Errorf("switching to %s: %w", targetSession, err)
}
return nil
}
func runCrewNext(cmd *cobra.Command, args []string) error {
return cycleCrewSession(1, crewCycleSession)
}
func runCrewPrev(cmd *cobra.Command, args []string) error {
return cycleCrewSession(-1, crewCycleSession)
}