Previously, gt doctor --fix would kill workers whose spawning process had exited, even though the Claude session was still running in tmux. Now both identity_check.go and CleanStaleLocks check if the tmux session exists before declaring a lock stale. A lock is only truly stale if BOTH the PID is dead AND the session does not exist. Also added ListSessionIDs() to tmux package to handle locks that store session IDs (%N or $N format) instead of session names.
168 lines
4.5 KiB
Go
168 lines
4.5 KiB
Go
package doctor
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/steveyegge/gastown/internal/lock"
|
|
"github.com/steveyegge/gastown/internal/tmux"
|
|
)
|
|
|
|
// IdentityCollisionCheck checks for agent identity collisions and stale locks.
|
|
type IdentityCollisionCheck struct{}
|
|
|
|
// NewIdentityCollisionCheck creates a new identity collision check.
|
|
func NewIdentityCollisionCheck() *IdentityCollisionCheck {
|
|
return &IdentityCollisionCheck{}
|
|
}
|
|
|
|
func (c *IdentityCollisionCheck) Name() string {
|
|
return "identity-collision"
|
|
}
|
|
|
|
func (c *IdentityCollisionCheck) Description() string {
|
|
return "Check for agent identity collisions and stale locks"
|
|
}
|
|
|
|
func (c *IdentityCollisionCheck) CanFix() bool {
|
|
return true // Can fix stale locks
|
|
}
|
|
|
|
func (c *IdentityCollisionCheck) Run(ctx *CheckContext) *CheckResult {
|
|
// Find all locks
|
|
locks, err := lock.FindAllLocks(ctx.TownRoot)
|
|
if err != nil {
|
|
return &CheckResult{
|
|
Name: c.Name(),
|
|
Status: StatusWarning,
|
|
Message: fmt.Sprintf("could not scan for locks: %v", err),
|
|
}
|
|
}
|
|
|
|
if len(locks) == 0 {
|
|
return &CheckResult{
|
|
Name: c.Name(),
|
|
Status: StatusOK,
|
|
Message: "no worker locks found",
|
|
}
|
|
}
|
|
|
|
// Get active tmux sessions for cross-reference
|
|
// Build a set containing both session names AND session IDs
|
|
// because locks may store either format
|
|
t := tmux.NewTmux()
|
|
sessionSet := make(map[string]bool)
|
|
|
|
// Get session names
|
|
sessions, _ := t.ListSessions() // Returns session names
|
|
for _, s := range sessions {
|
|
sessionSet[s] = true
|
|
}
|
|
|
|
// Also get session IDs to handle locks that store ID instead of name
|
|
// Lock files may contain session_id in formats like "%55" or "$55"
|
|
sessionIDs, _ := t.ListSessionIDs() // Returns map[name]id
|
|
for _, id := range sessionIDs {
|
|
sessionSet[id] = true
|
|
// Also add alternate formats
|
|
if len(id) > 0 {
|
|
if id[0] == '$' {
|
|
sessionSet["%"+id[1:]] = true // $55 -> %55
|
|
} else if id[0] == '%' {
|
|
sessionSet["$"+id[1:]] = true // %55 -> $55
|
|
}
|
|
}
|
|
}
|
|
|
|
var staleLocks []string
|
|
var orphanedLocks []string
|
|
var healthyLocks int
|
|
|
|
for workerDir, info := range locks {
|
|
// First check if the session exists in tmux - that's the real indicator
|
|
// of whether the worker is alive. The PID in the lock is the spawning
|
|
// process, which may have exited even though Claude is still running.
|
|
sessionExists := info.SessionID != "" && sessionSet[info.SessionID]
|
|
|
|
if info.IsStale() {
|
|
// PID is dead - but is the session still alive?
|
|
if sessionExists {
|
|
// Session exists, so the worker is alive despite dead PID.
|
|
// This is normal - the spawner exits after launching Claude.
|
|
healthyLocks++
|
|
continue
|
|
}
|
|
// Both PID dead AND session gone = truly stale
|
|
staleLocks = append(staleLocks,
|
|
fmt.Sprintf("%s (dead PID %d)", workerDir, info.PID))
|
|
continue
|
|
}
|
|
|
|
// PID is alive - check if session exists
|
|
if info.SessionID != "" && !sessionSet[info.SessionID] {
|
|
// Lock has session ID but session doesn't exist
|
|
// This could be a collision or orphan
|
|
orphanedLocks = append(orphanedLocks,
|
|
fmt.Sprintf("%s (PID %d, missing session %s)", workerDir, info.PID, info.SessionID))
|
|
continue
|
|
}
|
|
|
|
healthyLocks++
|
|
}
|
|
|
|
// Build result
|
|
if len(staleLocks) == 0 && len(orphanedLocks) == 0 {
|
|
return &CheckResult{
|
|
Name: c.Name(),
|
|
Status: StatusOK,
|
|
Message: fmt.Sprintf("%d worker lock(s), all healthy", healthyLocks),
|
|
}
|
|
}
|
|
|
|
result := &CheckResult{
|
|
Name: c.Name(),
|
|
}
|
|
|
|
if len(staleLocks) > 0 {
|
|
result.Status = StatusWarning
|
|
result.Message = fmt.Sprintf("%d stale lock(s) found", len(staleLocks))
|
|
result.Details = append(result.Details, "Stale locks (dead PIDs):")
|
|
for _, s := range staleLocks {
|
|
result.Details = append(result.Details, " "+s)
|
|
}
|
|
result.FixHint = "Run 'gt doctor --fix' or 'gt agents fix' to clean up"
|
|
}
|
|
|
|
if len(orphanedLocks) > 0 {
|
|
if result.Status != StatusWarning {
|
|
result.Status = StatusWarning
|
|
}
|
|
if result.Message != "" {
|
|
result.Message += ", "
|
|
}
|
|
result.Message += fmt.Sprintf("%d orphaned lock(s)", len(orphanedLocks))
|
|
result.Details = append(result.Details, "Orphaned locks (missing sessions):")
|
|
for _, s := range orphanedLocks {
|
|
result.Details = append(result.Details, " "+s)
|
|
}
|
|
if !strings.Contains(result.FixHint, "doctor") {
|
|
result.FixHint = "Run 'gt doctor --fix' to clean up stale locks"
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func (c *IdentityCollisionCheck) Fix(ctx *CheckContext) error {
|
|
cleaned, err := lock.CleanStaleLocks(ctx.TownRoot)
|
|
if err != nil {
|
|
return fmt.Errorf("cleaning stale locks: %w", err)
|
|
}
|
|
|
|
if cleaned > 0 {
|
|
fmt.Printf(" Cleaned %d stale lock(s)\n", cleaned)
|
|
}
|
|
|
|
return nil
|
|
}
|