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

fix(polecat): kill orphan sessions and clear stale hooks during allocation (#448)

Browse Source 
ReconcilePool now detects and kills orphan tmux sessions (sessions without
corresponding polecat directories). This prevents allocation from being
blocked by broken state from crashed polecats.

Changes:
- Add tmux to Manager to check for orphan sessions during reconciliation
- Add ReconcilePoolWith for testable session/directory reconciliation logic
- Always clear hook_bead slot when reopening agent beads (fixes stale hooks)
- Prune stale git worktree entries during reconciliation

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Julian Knutsen
2026-01-13 21:37:00 +00:00
committed by GitHub
parent bd2a5ab56a
commit 65c5e05c43
10 changed files with 297 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/cmd/polecat.go
View File

@@ -330,7 +330,8 @@ func getPolecatManager(rigName string) (*polecat.Manager, *rig.Rig, error) {
}
polecatGit := git.NewGit(r.Path)
mgr := polecat.NewManager(r, polecatGit)
t := tmux.NewTmux()
mgr := polecat.NewManager(r, polecatGit, t)
return mgr, r, nil
}
@@ -363,7 +364,7 @@ func runPolecatList(cmd *cobra.Command, args []string) error {
for _, r := range rigs {
polecatGit := git.NewGit(r.Path)
mgr := polecat.NewManager(r, polecatGit)
mgr := polecat.NewManager(r, polecatGit, t)
polecatMgr := polecat.NewSessionManager(t, r)
polecats, err := mgr.List()

7
internal/cmd/polecat_identity.go
View File

@@ -221,7 +221,8 @@ func runPolecatIdentityAdd(cmd *cobra.Command, args []string) error {
// Generate name if not provided
if polecatName == "" {
polecatGit := git.NewGit(r.Path)
mgr := polecat.NewManager(r, polecatGit)
t := tmux.NewTmux()
mgr := polecat.NewManager(r, polecatGit, t)
polecatName, err = mgr.AllocateName()
if err != nil {
return fmt.Errorf("generating polecat name: %w", err)
@@ -294,7 +295,7 @@ func runPolecatIdentityList(cmd *cobra.Command, args []string) error {
// Check if worktree exists
worktreeExists := false
mgr := polecat.NewManager(r, nil)
mgr := polecat.NewManager(r, nil, t)
if p, err := mgr.Get(name); err == nil && p != nil {
worktreeExists = true
}
@@ -396,7 +397,7 @@ func runPolecatIdentityShow(cmd *cobra.Command, args []string) error {
// Check worktree and session
t := tmux.NewTmux()
polecatMgr := polecat.NewSessionManager(t, r)
mgr := polecat.NewManager(r, nil)
mgr := polecat.NewManager(r, nil, t)
worktreeExists := false
var clonePath string

8
internal/cmd/polecat_spawn.go
View File

@@ -64,9 +64,10 @@ func SpawnPolecatForSling(rigName string, opts SlingSpawnOptions) (*SpawnedPolec
return nil, fmt.Errorf("rig '%s' not found", rigName)
}
// Get polecat manager
// Get polecat manager (with tmux for session-aware allocation)
polecatGit := git.NewGit(r.Path)
polecatMgr := polecat.NewManager(r, polecatGit)
t := tmux.NewTmux()
polecatMgr := polecat.NewManager(r, polecatGit, t)
// Allocate a new polecat name
polecatName, err := polecatMgr.AllocateName()
@@ -124,8 +125,7 @@ func SpawnPolecatForSling(rigName string, opts SlingSpawnOptions) (*SpawnedPolec
fmt.Printf("Using account: %s\n", accountHandle)
}
// Start session
t := tmux.NewTmux()
// Start session (reuse tmux from manager)
polecatSessMgr := polecat.NewSessionManager(t, r)
// Check if already running

8
internal/cmd/rig.go
View File

@@ -921,7 +921,7 @@ func runRigShutdown(cmd *cobra.Command, args []string) error {
// Check all polecats for uncommitted work (unless nuclear)
if !rigShutdownNuclear {
polecatGit := git.NewGit(r.Path)
polecatMgr := polecat.NewManager(r, polecatGit)
polecatMgr := polecat.NewManager(r, polecatGit, nil) // nil tmux: just listing
polecats, err := polecatMgr.List()
if err == nil && len(polecats) > 0 {
var problemPolecats []struct {
@@ -1105,7 +1105,7 @@ func runRigStatus(cmd *cobra.Command, args []string) error {
// Polecats
polecatGit := git.NewGit(r.Path)
polecatMgr := polecat.NewManager(r, polecatGit)
polecatMgr := polecat.NewManager(r, polecatGit, t)
polecats, err := polecatMgr.List()
fmt.Printf("%s", style.Bold.Render("Polecats"))
if err != nil || len(polecats) == 0 {
@@ -1198,7 +1198,7 @@ func runRigStop(cmd *cobra.Command, args []string) error {
// Check all polecats for uncommitted work (unless nuclear)
if !rigStopNuclear {
polecatGit := git.NewGit(r.Path)
polecatMgr := polecat.NewManager(r, polecatGit)
polecatMgr := polecat.NewManager(r, polecatGit, nil) // nil tmux: just listing
polecats, err := polecatMgr.List()
if err == nil && len(polecats) > 0 {
var problemPolecats []struct {
@@ -1330,7 +1330,7 @@ func runRigRestart(cmd *cobra.Command, args []string) error {
// Check all polecats for uncommitted work (unless nuclear)
if !rigRestartNuclear {
polecatGit := git.NewGit(r.Path)
polecatMgr := polecat.NewManager(r, polecatGit)
polecatMgr := polecat.NewManager(r, polecatGit, nil) // nil tmux: just listing
polecats, err := polecatMgr.List()
if err == nil && len(polecats) > 0 {
var problemPolecats []struct {

2
internal/cmd/start.go
View File

@@ -682,7 +682,7 @@ func cleanupPolecats(townRoot string) {
for _, r := range rigs {
polecatGit := git.NewGit(r.Path)
polecatMgr := polecat.NewManager(r, polecatGit)
polecatMgr := polecat.NewManager(r, polecatGit, nil) // nil tmux: just listing, not allocating
polecats, err := polecatMgr.List()
if err != nil {

2
internal/cmd/swarm.go
View File

@@ -494,7 +494,7 @@ func spawnSwarmWorkersFromBeads(r *rig.Rig, townRoot string, swarmID string, wor
t := tmux.NewTmux()
polecatSessMgr := polecat.NewSessionManager(t, r)
polecatGit := git.NewGit(r.Path)
polecatMgr := polecat.NewManager(r, polecatGit)
polecatMgr := polecat.NewManager(r, polecatGit, t)
// Pair workers with tasks (round-robin if more tasks than workers)
workerIdx := 0