feat: replace --pretty with --output flag for flexible log control (#32)

Replaces the boolean --pretty flag with an --output enum flag that supports
three modes for better control over bot log output during testing:

- logs: Show all bot logs (default, current behavior)
- bot-cmd: Show only custom bot logs from --bot-cmd, suppress built-in
  bot logs from --spec (useful for focusing on your bot's behavior)
- hand-history: Pretty hand visualization with all bot logs suppressed
  (replaces --pretty)

Implementation adds QuietLogs field to BotSpec, allowing per-bot log
control. Built-in bots are quieted in bot-cmd and hand-history modes,
while custom bots are only quieted in hand-history mode.

This makes it much easier to test custom bots without noise from the
pre-canned opponent bots.

Author: lox

cmd/pokerforbots/spawn.go

@@ -47,8 +47,8 @@ type SpawnCmd struct {
 	WriteStats string `kong:"help='Write stats to file on exit'"`
 	PrintStats bool   `kong:"help='Print stats on exit'"`
 
-	// Display mode
-	Pretty bool `kong:"help='Display hands in pretty format instead of logs'"`
+	// Output format
+	Output string `kong:"default='logs',enum='logs,bot-cmd,hand-history',help='Output format: logs (all logs), bot-cmd (only custom bot logs), hand-history (pretty hand visualization)'"`
 
 	// Logging
 	LogLevel string `kong:"help='Log level (debug|info|warn|error)'"`
@@ -68,8 +68,8 @@ func (c *SpawnCmd) Run() error {
 		level = zerolog.ErrorLevel
 	}
 
-	// In pretty mode, suppress most logs unless explicitly set
-	if c.Pretty && c.LogLevel == "" {
+	// In hand-history mode, suppress most logs unless explicitly set
+	if c.Output == "hand-history" && c.LogLevel == "" {
 		level = zerolog.WarnLevel
 	}
 
@@ -96,7 +96,7 @@ func (c *SpawnCmd) Run() error {
 	wsURL := fmt.Sprintf("ws://%s/ws", listener.Addr())
 
 	// Now parse bot specifications with the WebSocket URL
-	specs, err := parseSpecString(c.Spec, wsURL)
+	specs, err := parseSpecString(c.Spec, wsURL, c.Output)
 	if err != nil {
 		return fmt.Errorf("failed to parse spec: %w", err)
 	}
@@ -109,10 +109,12 @@ func (c *SpawnCmd) Run() error {
 		if len(parts) == 0 {
 			continue
 		}
+		// Custom bot logs are suppressed only in hand-history mode
 		specs = append(specs, spawner.BotSpec{
-			Command: parts[0],
-			Args:    parts[1:], // Don't append wsURL - bot should use POKERFORBOTS_SERVER
-			Count:   c.Count,
+			Command:   parts[0],
+			Args:      parts[1:], // Don't append wsURL - bot should use POKERFORBOTS_SERVER
+			Count:     c.Count,
+			QuietLogs: c.Output == "hand-history",
 		})
 	}
 
@@ -130,7 +132,7 @@ func (c *SpawnCmd) Run() error {
 	minPlayers := c.MinPlayers
 	if minPlayers == 0 {
 		minPlayers = max(2, min(totalBots, c.MaxPlayers))
-		if !c.Pretty {
+		if c.Output != "hand-history" {
 			logger.Info().Int("min_players", minPlayers).Int("total_bots", totalBots).Msg("Auto-setting min-players to match bot count")
 		}
 	}
@@ -168,8 +170,8 @@ func (c *SpawnCmd) Run() error {
 		return fmt.Errorf("server failed to start: %w", err)
 	}
 
-	// Set up pretty printer if requested
-	if c.Pretty {
+	// Set up hand-history monitor if requested
+	if c.Output == "hand-history" {
 		monitor := server.NewPrettyPrintMonitor(os.Stdout)
 		srv.SetHandMonitor(monitor)
 	} else {
@@ -179,16 +181,13 @@ func (c *SpawnCmd) Run() error {
 		}
 	}
 
-	if !c.Pretty {
+	if c.Output != "hand-history" {
 		logger.Info().Str("spec", c.Spec).Int("additional", len(c.BotCmd)).Int("total_bots", totalBots).Msg("Spawning bots")
 	}
 
 	// Create spawner and spawn bots
+	// Note: Per-bot quiet logs are handled by BotSpec.QuietLogs, not here
 	spawnerLogger := logger
-	if c.Pretty {
-		// Create a quiet logger for bot processes in pretty mode
-		spawnerLogger = zerolog.New(io.Discard).Level(zerolog.Disabled)
-	}
 
 	botSpawner := spawner.NewWithSeed(wsURL, spawnerLogger, seed)
 	defer botSpawner.StopAll()
@@ -197,7 +196,7 @@ func (c *SpawnCmd) Run() error {
 		return fmt.Errorf("failed to spawn bots: %w", err)
 	}
 
-	if !c.Pretty {
+	if c.Output != "hand-history" {
 		logger.Info().Int("count", botSpawner.ActiveCount()).Msg("Bots spawned")
 	}
 
@@ -233,7 +232,7 @@ func (c *SpawnCmd) Run() error {
 	case <-ctx.Done():
 		logger.Info().Msg("Shutting down...")
 	case <-srv.DefaultGameDone():
-		if !c.Pretty {
+		if c.Output != "hand-history" {
 			logger.Info().Msg("Hand limit reached")
 		}
 	case err := <-serverErr:
@@ -271,15 +270,15 @@ func (c *SpawnCmd) Run() error {
 	time.Sleep(100 * time.Millisecond)
 
 	// Stop bots (will be done by defer)
-	if !c.Pretty {
+	if c.Output != "hand-history" {
 		logger.Info().Msg("Stopping bots...")
 	}
 
 	return nil
 }
 
 // parseSpecString parses a specification string like "calling-station:2,random:1,aggressive:3"
-func parseSpecString(spec string, wsURL string) ([]spawner.BotSpec, error) {
+func parseSpecString(spec string, wsURL string, outputMode string) ([]spawner.BotSpec, error) {
 	if spec == "" {
 		return nil, nil
 	}
@@ -314,6 +313,7 @@ func parseSpecString(spec string, wsURL string) ([]spawner.BotSpec, error) {
 		// Check if it's a built-in bot or a custom command
 		var command string
 		var args []string
+		var isBuiltIn bool
 
 		if strings.Contains(strategy, "/") || strings.Contains(strategy, ".") {
 			// Custom command (e.g., "./my-bot")
@@ -324,16 +324,29 @@ func parseSpecString(spec string, wsURL string) ([]spawner.BotSpec, error) {
 			command = fields[0]
 			args = fields[1:]
 			args = append(args, wsURL)
+			isBuiltIn = false
 		} else {
 			// Built-in bot - use pokerforbots bot subcommand
 			command = pokerforbotsBin
 			args = []string{"bot", strategy, "--server", wsURL}
+			isBuiltIn = true
+		}
+
+		// Determine if logs should be suppressed for this bot
+		quietLogs := false
+		if isBuiltIn {
+			// Suppress built-in bot logs in bot-cmd and hand-history modes
+			quietLogs = (outputMode == "bot-cmd" || outputMode == "hand-history")
+		} else {
+			// Suppress custom bot logs only in hand-history mode
+			quietLogs = (outputMode == "hand-history")
 		}
 
 		specs = append(specs, spawner.BotSpec{
-			Command: command,
-			Args:    args,
-			Count:   count,
+			Command:   command,
+			Args:      args,
+			Count:     count,
+			QuietLogs: quietLogs,
 		})
 	}
 

sdk/spawner/spawner.go

@@ -30,11 +30,12 @@ type BotSpawner struct {
 
 // BotSpec defines a bot to spawn.
 type BotSpec struct {
-	Command string            // Command to execute (e.g. "go")
-	Args    []string          // Arguments (e.g. ["run", "./sdk/examples/calling-station"])
-	Count   int               // Number to spawn
-	GameID  string            // Target game (default: "default")
-	Env     map[string]string // Additional environment variables
+	Command   string            // Command to execute (e.g. "go")
+	Args      []string          // Arguments (e.g. ["run", "./sdk/examples/calling-station"])
+	Count     int               // Number to spawn
+	GameID    string            // Target game (default: "default")
+	Env       map[string]string // Additional environment variables
+	QuietLogs bool              // Suppress process output logs
 }
 
 // GameStats represents game statistics from the server.
@@ -109,8 +110,14 @@ func (s *BotSpawner) Spawn(specs ...BotSpec) error {
 			// Build environment with deterministic bot ID
 			env := s.buildEnvWithID(spec, botID)
 
+			// Create logger - use quiet logger if requested
+			procLogger := s.logger
+			if spec.QuietLogs {
+				procLogger = zerolog.New(io.Discard).Level(zerolog.Disabled)
+			}
+
 			// Create and start process
-			proc := NewProcess(s.ctx, spec.Command, spec.Args, env, s.logger)
+			proc := NewProcess(s.ctx, spec.Command, spec.Args, env, procLogger)
 			if err := proc.Start(); err != nil {
 				s.logger.Error().Err(err).Int("index", i).Msg("Failed to spawn bot")
 				// Stop previously spawned bots on error