Refactor server management and enhance bootstrapping process

- Adjusted BootstrapConfig struct for improved readability by aligning field declarations.
- Introduced incremental server startup in BootstrapWithContext to allow users to access servers as they become ready.
- Added StartMissing method in TmuxManager to ensure all servers are running, enhancing server management during provisioning.
- Updated install wizard to utilize StartMissing for better server readiness feedback.

Author: sivert-io

src/internal/csm/bootstrap.go

@@ -18,12 +18,12 @@ import (
 // BootstrapConfig mirrors the high-level options used by the original
 // bootstrap_cs2.sh script.
 type BootstrapConfig struct {
-	CS2User           string
-	NumServers        int
-	BaseGamePort      int
-	BaseTVPort        int
-	EnableMetamod     bool
-	FreshInstall      bool
+	CS2User       string
+	NumServers    int
+	BaseGamePort  int
+	BaseTVPort    int
+	EnableMetamod bool
+	FreshInstall  bool
 	// UpdateMaster controls how the master CS2 install is handled:
 	//   - true  → run SteamCMD to install or update the master (fresh or in-place)
 	//   - false → reuse an existing master if present; fail if missing
@@ -191,6 +191,11 @@ func BootstrapWithContext(ctx context.Context, cfg BootstrapConfig) (string, err
 		}
 	}
 
+	// Start servers as soon as each instance is fully provisioned so large
+	// installs become usable incrementally instead of waiting for all N
+	// servers to be ready.
+	mgr := &TmuxManager{CS2User: cfg.CS2User}
+
 	for i := 1; i <= cfg.NumServers; i++ {
 		gamePort := cfg.BaseGamePort + (i-1)*10
 		tvPort := cfg.BaseTVPort + (i-1)*10
@@ -218,6 +223,14 @@ func BootstrapWithContext(ctx context.Context, cfg BootstrapConfig) (string, err
 		}
 
 		log("  [✓] Server-%d ready (port %d, TV %d)", i, gamePort, tvPort)
+
+		// Start this server immediately after it is ready so users can begin
+		// using early servers while later ones are still provisioning.
+		if err := mgr.Start(i); err != nil {
+			log("  [!] Failed to start server-%d via tmux: %v", i, err)
+		} else {
+			log("  [✓] Server-%d started via tmux", i)
+		}
 		log("")
 	}
 

src/internal/csm/tmux.go

@@ -190,6 +190,30 @@ func (m *TmuxManager) Status() (string, error) {
 	return buf.String(), nil
 }
 
+// StartMissing starts any servers that are currently stopped, leaving already
+// running tmux sessions untouched. This is used by flows like the install
+// wizard that may start servers incrementally during provisioning and only
+// need a final "ensure everything is running" pass.
+func (m *TmuxManager) StartMissing() error {
+	if m.NumServers <= 0 {
+		log.Printf("[tmux] StartMissing: no servers to start (NumServers=0, user=%q)", m.CS2User)
+		return fmt.Errorf("no CS2 servers found; run the install wizard first")
+	}
+	log.Printf("[tmux] StartMissing: ensuring %d server(s) are running for user=%q", m.NumServers, m.CS2User)
+	for i := 1; i <= m.NumServers; i++ {
+		session := m.sessionName(i)
+		cmd := m.runAsCS2User("tmux has-session -t " + session)
+		if err := cmd.Run(); err == nil {
+			// Session already exists and is running; skip.
+			continue
+		}
+		if err := m.Start(i); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // StartAll starts all servers (creating tmux sessions if needed).
 func (m *TmuxManager) StartAll() error {
 	if m.NumServers <= 0 {

src/internal/tui/install_wizard.go

@@ -973,20 +973,20 @@ func runInstallStep(cfg installConfig, step installStep) tea.Cmd {
 			// Derive MatchZy Docker behaviour from dbMode.
 			cfg.matchzySkipDocker = strings.EqualFold(cfg.dbMode, "external")
 			bcfg := csm.BootstrapConfig{
-				CS2User:           cfg.cs2User,
-				NumServers:        cfg.numServers,
-				BaseGamePort:      cfg.basePort,
-				BaseTVPort:        cfg.tvPort,
-				EnableMetamod:     cfg.enableMetamod,
-				FreshInstall:      cfg.freshInstall,
-				UpdateMaster:      cfg.updateMaster,
-				RCONPassword:      cfg.rconPassword,
-				MatchzySkipDocker: cfg.matchzySkipDocker,
-				DBMode:            cfg.dbMode,
-				ExternalDBHost:    cfg.externalDBHost,
-				ExternalDBPort:    cfg.externalDBPort,
-				ExternalDBName:    cfg.externalDBName,
-				ExternalDBUser:    cfg.externalDBUser,
+				CS2User:            cfg.cs2User,
+				NumServers:         cfg.numServers,
+				BaseGamePort:       cfg.basePort,
+				BaseTVPort:         cfg.tvPort,
+				EnableMetamod:      cfg.enableMetamod,
+				FreshInstall:       cfg.freshInstall,
+				UpdateMaster:       cfg.updateMaster,
+				RCONPassword:       cfg.rconPassword,
+				MatchzySkipDocker:  cfg.matchzySkipDocker,
+				DBMode:             cfg.dbMode,
+				ExternalDBHost:     cfg.externalDBHost,
+				ExternalDBPort:     cfg.externalDBPort,
+				ExternalDBName:     cfg.externalDBName,
+				ExternalDBUser:     cfg.externalDBUser,
 				ExternalDBPassword: cfg.externalDBPassword,
 			}
 
@@ -1065,7 +1065,7 @@ func runInstallStep(cfg installConfig, step installStep) tea.Cmd {
 			}
 
 		case installStepStartServers:
-			logs = append(logs, "[4/4] Starting all servers...")
+			logs = append(logs, "[4/4] Ensuring all servers are running...")
 			manager, err := csm.NewTmuxManager()
 			if err != nil {
 				logs = append(logs, fmt.Sprintf("Failed to initialize tmux manager: %v", err))
@@ -1075,15 +1075,15 @@ func runInstallStep(cfg installConfig, step installStep) tea.Cmd {
 					err:  err,
 				}
 			}
-			if err := manager.StartAll(); err != nil {
-				logs = append(logs, fmt.Sprintf("Failed to start servers: %v", err))
+			if err := manager.StartMissing(); err != nil {
+				logs = append(logs, fmt.Sprintf("Failed to ensure servers are running: %v", err))
 				return installStepMsg{
 					step: installStepStartServers,
 					out:  strings.Join(logs, "\n"),
 					err:  err,
 				}
 			}
-			logs = append(logs, "[4/4] All servers started via tmux.")
+			logs = append(logs, "[4/4] All servers are running via tmux.")
 			dur := time.Since(start).Round(time.Second)
 			logs = append(logs, fmt.Sprintf("[i] Step 4/4 (start servers) took %s.", dur))
 			appendInstallLog(cfg, installStepStartServers, strings.Join(logs, "\n"))

src/internal/tui/model.go

@@ -1141,7 +1141,10 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 			m.currentInstallStep = installStepStartServers
 			m.installStepStart = time.Now()
-			m.installStatusBase = "Step 4/4: Starting all servers..."
+			// Step 4 starts any remaining stopped servers; most servers will
+			// already be running from the bootstrap step, so emphasise that
+			// we're just ensuring everything is up.
+			m.installStatusBase = "Step 4/4: Ensuring all servers are running..."
 			m.installExpected = "~10–60 seconds"
 			m.status = m.installStatusBase
 			return m, tea.Batch(append(cmds,