The status bar was incorrectly counting rigs and polecats due to: 1. Inconsistent witness session naming (gt-<rig>-witness vs gt-witness-<rig>) caused "witness" to be counted as a rig name 2. Non-polecat sessions (witness, refinery, crew) were counted as polecats Added extractRigFromSession() to handle all session naming patterns and isPolecatSession() to properly identify actual polecat workers. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
195 lines
4.5 KiB
Go
195 lines
4.5 KiB
Go
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/steveyegge/gastown/internal/mail"
|
|
"github.com/steveyegge/gastown/internal/tmux"
|
|
)
|
|
|
|
var (
|
|
statusLineSession string
|
|
)
|
|
|
|
var statusLineCmd = &cobra.Command{
|
|
Use: "status-line",
|
|
Short: "Output status line content for tmux (internal use)",
|
|
Hidden: true, // Internal command called by tmux
|
|
RunE: runStatusLine,
|
|
}
|
|
|
|
func init() {
|
|
rootCmd.AddCommand(statusLineCmd)
|
|
statusLineCmd.Flags().StringVar(&statusLineSession, "session", "", "Tmux session name")
|
|
}
|
|
|
|
func runStatusLine(cmd *cobra.Command, args []string) error {
|
|
t := tmux.NewTmux()
|
|
|
|
// Get session environment
|
|
var rigName, polecat, crew, issue, role string
|
|
|
|
if statusLineSession != "" {
|
|
rigName, _ = t.GetEnvironment(statusLineSession, "GT_RIG")
|
|
polecat, _ = t.GetEnvironment(statusLineSession, "GT_POLECAT")
|
|
crew, _ = t.GetEnvironment(statusLineSession, "GT_CREW")
|
|
issue, _ = t.GetEnvironment(statusLineSession, "GT_ISSUE")
|
|
role, _ = t.GetEnvironment(statusLineSession, "GT_ROLE")
|
|
} else {
|
|
// Fallback to process environment
|
|
rigName = os.Getenv("GT_RIG")
|
|
polecat = os.Getenv("GT_POLECAT")
|
|
crew = os.Getenv("GT_CREW")
|
|
issue = os.Getenv("GT_ISSUE")
|
|
role = os.Getenv("GT_ROLE")
|
|
}
|
|
|
|
// Determine identity and output based on role
|
|
if role == "mayor" || statusLineSession == "gt-mayor" {
|
|
return runMayorStatusLine(t)
|
|
}
|
|
|
|
// Build mail identity
|
|
var identity string
|
|
if rigName != "" {
|
|
if polecat != "" {
|
|
identity = fmt.Sprintf("%s/%s", rigName, polecat)
|
|
} else if crew != "" {
|
|
identity = fmt.Sprintf("%s/%s", rigName, crew)
|
|
}
|
|
}
|
|
|
|
// Build status parts
|
|
var parts []string
|
|
|
|
// Current issue
|
|
if issue != "" {
|
|
parts = append(parts, issue)
|
|
}
|
|
|
|
// Mail count
|
|
if identity != "" {
|
|
unread := getUnreadMailCount(identity)
|
|
if unread > 0 {
|
|
parts = append(parts, fmt.Sprintf("\U0001F4EC %d", unread)) // mail emoji
|
|
}
|
|
}
|
|
|
|
// Output
|
|
if len(parts) > 0 {
|
|
fmt.Print(strings.Join(parts, " | ") + " |")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func runMayorStatusLine(t *tmux.Tmux) error {
|
|
// Count active sessions by listing tmux sessions
|
|
sessions, err := t.ListSessions()
|
|
if err != nil {
|
|
return nil // Silent fail
|
|
}
|
|
|
|
// Count gt-* sessions (polecats) and rigs
|
|
polecatCount := 0
|
|
rigs := make(map[string]bool)
|
|
for _, s := range sessions {
|
|
if !strings.HasPrefix(s, "gt-") || s == "gt-mayor" || s == "gt-deacon" {
|
|
continue
|
|
}
|
|
|
|
// Extract rig name based on session type
|
|
rig := extractRigFromSession(s)
|
|
if rig != "" {
|
|
rigs[rig] = true
|
|
}
|
|
|
|
// Only count actual polecats (not witness, refinery, crew)
|
|
if isPolecatSession(s) {
|
|
polecatCount++
|
|
}
|
|
}
|
|
rigCount := len(rigs)
|
|
|
|
// Get mayor mail
|
|
unread := getUnreadMailCount("mayor/")
|
|
|
|
// Build status
|
|
var parts []string
|
|
parts = append(parts, fmt.Sprintf("%d polecats", polecatCount))
|
|
parts = append(parts, fmt.Sprintf("%d rigs", rigCount))
|
|
if unread > 0 {
|
|
parts = append(parts, fmt.Sprintf("\U0001F4EC %d", unread))
|
|
}
|
|
|
|
fmt.Print(strings.Join(parts, " | ") + " |")
|
|
return nil
|
|
}
|
|
|
|
// getUnreadMailCount returns unread mail count for an identity.
|
|
// Fast path - returns 0 on any error.
|
|
func getUnreadMailCount(identity string) int {
|
|
// Find workspace
|
|
workDir, err := findBeadsWorkDir()
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
|
|
// Create mailbox using beads
|
|
mailbox := mail.NewMailboxBeads(identity, workDir)
|
|
|
|
// Get count
|
|
_, unread, err := mailbox.Count()
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
|
|
return unread
|
|
}
|
|
|
|
// extractRigFromSession extracts the rig name from a tmux session name.
|
|
// Handles different session naming patterns:
|
|
// - gt-<rig>-<worker> (polecats)
|
|
// - gt-<rig>-crew-<name> (crew workers)
|
|
// - gt-<rig>-witness (daemon-style witness)
|
|
// - gt-witness-<rig> (witness.go-style witness)
|
|
// - gt-<rig>-refinery (refinery)
|
|
func extractRigFromSession(s string) string {
|
|
parts := strings.SplitN(s, "-", 4)
|
|
if len(parts) < 3 {
|
|
return ""
|
|
}
|
|
|
|
// Handle gt-witness-<rig> pattern (inconsistent naming from witness.go)
|
|
if parts[1] == "witness" {
|
|
return parts[2]
|
|
}
|
|
|
|
// Standard pattern: gt-<rig>-<something>
|
|
return parts[1]
|
|
}
|
|
|
|
// isPolecatSession returns true if the session is a polecat worker session.
|
|
// Excludes witness, refinery, and crew sessions.
|
|
func isPolecatSession(s string) bool {
|
|
// Not a polecat if it ends with known suffixes or contains crew marker
|
|
if strings.HasSuffix(s, "-witness") {
|
|
return false
|
|
}
|
|
if strings.HasSuffix(s, "-refinery") {
|
|
return false
|
|
}
|
|
if strings.Contains(s, "-crew-") {
|
|
return false
|
|
}
|
|
// Also handle gt-witness-<rig> pattern
|
|
parts := strings.SplitN(s, "-", 3)
|
|
if len(parts) >= 2 && parts[1] == "witness" {
|
|
return false
|
|
}
|
|
return true
|
|
}
|