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

fix(witness): explicitly kill tmux session in NukePolecat

Browse Source 
The Witness lifecycle was not reliably killing polecat tmux sessions after
POLECAT_DONE. Sessions were piling up because gt polecat nuke may fail to
kill the session due to rig loading issues or race conditions with
IsRunning checks.

Fix: Kill the tmux session FIRST and unconditionally in NukePolecat,
before calling gt polecat nuke. This ensures the session is always killed
regardless of what happens in the downstream nuke command.

The session name pattern is deterministic (gt-<rig>-<polecat>), so we can
construct it directly from the rigName and polecatName parameters.

Fixes: gt-g9ft5

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
glory
2026-01-04 12:32:53 -08:00
committed by Steve Yegge
parent 15e9c210b9
commit a0e5831f69
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/witness/handlers.go
View File

@@ -12,6 +12,7 @@ import (
"github.com/steveyegge/gastown/internal/beads" "github.com/steveyegge/gastown/internal/beads"
"github.com/steveyegge/gastown/internal/git" "github.com/steveyegge/gastown/internal/git"
"github.com/steveyegge/gastown/internal/mail" "github.com/steveyegge/gastown/internal/mail"
"github.com/steveyegge/gastown/internal/tmux"
"github.com/steveyegge/gastown/internal/workspace" "github.com/steveyegge/gastown/internal/workspace"
) )
@@ -645,6 +646,28 @@ func UpdateCleanupWispState(workDir, wispID, newState string) error {
// This kills the tmux session, removes the worktree, and cleans up beads. // This kills the tmux session, removes the worktree, and cleans up beads.
// Should only be called after all safety checks pass. // Should only be called after all safety checks pass.
func NukePolecat(workDir, rigName, polecatName string) error { func NukePolecat(workDir, rigName, polecatName string) error {
// CRITICAL: Kill the tmux session FIRST and unconditionally.
// The session name follows the pattern gt-<rig>-<polecat>.
// We do this explicitly here because gt polecat nuke may fail to kill the
// session due to rig loading issues or race conditions with IsRunning checks.
// See: gt-g9ft5 - sessions were piling up because nuke wasn't killing them.
sessionName := fmt.Sprintf("gt-%s-%s", rigName, polecatName)
t := tmux.NewTmux()
// Check if session exists and kill it
if running, _ := t.HasSession(sessionName); running {
// Try graceful shutdown first (Ctrl-C), then force kill
_ = t.SendKeysRaw(sessionName, "C-c")
// Brief delay for graceful handling
time.Sleep(100 * time.Millisecond)
// Force kill the session
if err := t.KillSession(sessionName); err != nil {
// Log but continue - session might already be dead
// The important thing is we tried
}
}
// Now run gt polecat nuke to clean up worktree, branch, and beads
address := fmt.Sprintf("%s/%s", rigName, polecatName) address := fmt.Sprintf("%s/%s", rigName, polecatName)
cmd := exec.Command("gt", "polecat", "nuke", address) //nolint:gosec // G204: address is constructed from validated internal data cmd := exec.Command("gt", "polecat", "nuke", address) //nolint:gosec // G204: address is constructed from validated internal data