diff --git a/internal/cmd/agents.go b/internal/cmd/agents.go
index 25d163fd..af534321 100644
--- a/internal/cmd/agents.go
+++ b/internal/cmd/agents.go
@@ -99,13 +99,6 @@ func categorizeSession(name string) *AgentSession {
 		return session
 	}
 
-	// Witness uses gt-witness-<rig> naming
-	if strings.HasPrefix(suffix, "witness-") {
-		session.Type = AgentWitness
-		session.Rig = strings.TrimPrefix(suffix, "witness-")
-		return session
-	}
-
 	// Rig-level agents: gt-<rig>-<type> or gt-<rig>-crew-<name>
 	parts := strings.SplitN(suffix, "-", 2)
 	if len(parts) < 2 {
@@ -125,7 +118,6 @@ func categorizeSession(name string) *AgentSession {
 	// Check for other agent types
 	switch remainder {
 	case "witness":
-		// Alternate naming gt-<rig>-witness (for compatibility)
 		session.Type = AgentWitness
 		return session
 	case "refinery":
diff --git a/internal/cmd/statusline.go b/internal/cmd/statusline.go
index 266d486a..f50e5f89 100644
--- a/internal/cmd/statusline.go
+++ b/internal/cmd/statusline.go
@@ -93,17 +93,17 @@ func runMayorStatusLine(t *tmux.Tmux) error {
 		return nil // Silent fail
 	}
 
-	// Count gt-* sessions (polecats) and rigs
+	// Count only actual polecats (not witnesses, refineries, deacon, crew)
 	polecatCount := 0
 	rigs := make(map[string]bool)
 	for _, s := range sessions {
-		if strings.HasPrefix(s, "gt-") && s != "gt-mayor" {
+		agent := categorizeSession(s)
+		if agent == nil {
+			continue
+		}
+		if agent.Type == AgentPolecat {
 			polecatCount++
-			// Extract rig name: gt-<rig>-<worker>
-			parts := strings.SplitN(s, "-", 3)
-			if len(parts) >= 2 {
-				rigs[parts[1]] = true
-			}
+			rigs[agent.Rig] = true
 		}
 	}
 	rigCount := len(rigs)