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

feat: Unify C-b n/p cycling across session types

Browse Source 
The previous implementation set separate bindings for crew vs town
sessions, but tmux key bindings are global. This meant whichever
session type was started last would overwrite the other's bindings.

New approach:
- Add unified `gt cycle next/prev` command that auto-detects session type
- Town sessions (gt-mayor, gt-deacon) cycle within town group
- Crew sessions (gt-*-crew-*) cycle within their rig's crew
- Other sessions (polecats, witness, refinery) do nothing on cycle

The old SetCrewCycleBindings and SetTownCycleBindings are now aliases
for the unified SetCycleBindings function.

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-12-28 16:07:58 -08:00
parent faee888a9f
commit 40977b1ccc
2 changed files with 112 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
internal/tmux/tmux.go
View File

@@ -653,39 +653,42 @@ func (t *Tmux) SwitchClient(targetSession string) error {
return err
}
// SetCrewCycleBindings sets up C-b n/p to cycle through crew sessions in the same rig.
// This allows quick switching between crew members without using the session picker.
// SetCrewCycleBindings sets up C-b n/p to cycle through sessions.
// This is now an alias for SetCycleBindings - the unified command detects
// session type automatically.
//
// IMPORTANT: We pass #{session_name} to the command because run-shell doesn't
// reliably preserve the session context. tmux expands #{session_name} at binding
// resolution time (when the key is pressed), giving us the correct session.
func (t *Tmux) SetCrewCycleBindings(session string) error {
// C-b n → gt crew next (switch to next crew session)
// #{session_name} is expanded by tmux when the key is pressed
if _, err := t.run("bind-key", "-T", "prefix", "n",
"run-shell", "gt crew next --session '#{session_name}'"); err != nil {
return err
}
// C-b p → gt crew prev (switch to previous crew session)
if _, err := t.run("bind-key", "-T", "prefix", "p",
"run-shell", "gt crew prev --session '#{session_name}'"); err != nil {
return err
}
return nil
return t.SetCycleBindings(session)
}
// SetTownCycleBindings sets up C-b n/p to cycle through town-level sessions.
// Town-level sessions are Mayor and Deacon - the global coordinators.
// This allows quick switching between them without using the session picker.
// SetTownCycleBindings sets up C-b n/p to cycle through sessions.
// This is now an alias for SetCycleBindings - the unified command detects
// session type automatically.
func (t *Tmux) SetTownCycleBindings(session string) error {
// C-b n → gt town next (switch to next town session)
return t.SetCycleBindings(session)
}
// SetCycleBindings sets up C-b n/p to cycle through related sessions.
// The gt cycle command automatically detects the session type and cycles
// within the appropriate group:
// - Town sessions: Mayor ↔ Deacon
// - Crew sessions: All crew members in the same rig
//
// IMPORTANT: We pass #{session_name} to the command because run-shell doesn't
// reliably preserve the session context. tmux expands #{session_name} at binding
// resolution time (when the key is pressed), giving us the correct session.
func (t *Tmux) SetCycleBindings(session string) error {
// C-b n → gt cycle next (auto-detects session type)
if _, err := t.run("bind-key", "-T", "prefix", "n",
"run-shell", "gt town next --session '#{session_name}'"); err != nil {
"run-shell", "gt cycle next --session '#{session_name}'"); err != nil {
return err
}
// C-b p → gt town prev (switch to previous town session)
// C-b p → gt cycle prev (auto-detects session type)
if _, err := t.run("bind-key", "-T", "prefix", "p",
"run-shell", "gt town prev --session '#{session_name}'"); err != nil {
"run-shell", "gt cycle prev --session '#{session_name}'"); err != nil {
return err
}
return nil