feat!: replace primary_template with unified templates list

Dissolve primary_template into a single templates array with a
default: true marker. Add optional label field for TUI display
and short slug names. Wire up ApplyDefaults for safe settings
defaults.

Author: Pairadux

cmd/create.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/Pairadux/muxly/internal/forms"
 	"github.com/Pairadux/muxly/internal/fzf"
-	"github.com/Pairadux/muxly/internal/models"
 	"github.com/Pairadux/muxly/internal/selector"
 	"github.com/Pairadux/muxly/internal/tmux"
 	"github.com/Pairadux/muxly/internal/utility"
@@ -22,15 +21,13 @@ var createCmd = &cobra.Command{
 	Short: "Create a session from a template",
 	Long:  "Create a session from a template\n\nSelect a template, then choose a directory to create the session in.",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		allTemplates := append([]models.SessionTemplate{cfg.PrimaryTemplate}, cfg.Templates...)
-
 		var selectedIdx int
-		form := forms.TemplateSelectForm(allTemplates, &selectedIdx)
+		form := forms.TemplateSelectForm(cfg.Templates, &selectedIdx)
 		if err := form.Run(); err != nil {
 			return fmt.Errorf("template selection failed: %w", err)
 		}
 
-		tmpl := allTemplates[selectedIdx]
+		tmpl := cfg.Templates[selectedIdx]
 
 		var sessionPath string
 		if tmpl.Path != "" {

cmd/kill.go

@@ -21,7 +21,7 @@ var killCmd = &cobra.Command{
 
 If SESSION is provided, the current session is killed and the client switches to SESSION.
 Otherwise, a picker list of active sessions is displayed to choose a replacement.
-If no other sessions exist, a new session is created from the primary template or the tmux server is killed.`,
+If no other sessions exist, a new session is created from the default template or the tmux server is killed.`,
 	Args: cobra.MaximumNArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		if !tmux.IsTmuxServerRunning() {
@@ -79,18 +79,18 @@ If no other sessions exist, a new session is created from the primary template o
 				}
 
 				var createFromTemplate bool
-				form := forms.ConfirmationForm("Create session from primary template?", "Declining will kill the tmux server.", &createFromTemplate)
+				form := forms.ConfirmationForm("Create session from default template?", "Declining will kill the tmux server.", &createFromTemplate)
 
 				if err := form.Run(); err != nil {
 					return fmt.Errorf("failed to run confirmation form: %w", err)
 				}
 
 				if createFromTemplate {
-					if err := tmux.CreateSessionFromPrimaryTemplate(&cfg); err != nil {
+					if err := tmux.CreateSessionFromDefaultTemplate(&cfg); err != nil {
 						if errors.Is(err, tmux.ErrGracefulExit) {
 							return nil
 						}
-						return fmt.Errorf("failed to create session from primary template: %w", err)
+						return fmt.Errorf("failed to create session from default template: %w", err)
 					}
 					if err := tmux.KillSession(currentSession); err != nil {
 						return fmt.Errorf("failed to kill session: %w", err)

cmd/root.go

@@ -53,7 +53,6 @@ var rootCmd = &cobra.Command{
 		if err := validateConfig(); err != nil {
 			return err
 		}
-		warnOnConfigIssues()
 
 		return nil
 	},
@@ -75,7 +74,6 @@ var rootCmd = &cobra.Command{
 			fmt.Printf("scan_dirs: %v\n", cfg.ScanDirs)
 			fmt.Printf("entry_dirs: %v\n", cfg.EntryDirs)
 			fmt.Printf("ignore_dirs: %v\n", cfg.IgnoreDirs)
-			fmt.Printf("primary_template: %v\n", cfg.PrimaryTemplate)
 			fmt.Printf("templates: %v\n", cfg.Templates)
 			fmt.Printf("tmux_base: %v\n", cfg.Settings.TmuxBase)
 			fmt.Printf("default_depth: %v\n", cfg.Settings.DefaultDepth)
@@ -138,7 +136,9 @@ var rootCmd = &cobra.Command{
 			}
 		}
 		if len(sessionLayout.Windows) == 0 {
-			sessionLayout = models.SessionLayout{Windows: cfg.PrimaryTemplate.Windows}
+			if dflt, found := config.DefaultTemplate(&cfg); found {
+				sessionLayout = models.SessionLayout{Windows: dflt.Windows}
+			}
 		}
 
 		sess := models.Session{
@@ -227,6 +227,8 @@ func initConfig() {
 		os.Exit(1)
 	}
 
+	config.ApplyDefaults(&cfg)
+
 	// Sync cfgFilePath with the actual config file that was loaded
 	// This ensures 'muxly config edit' opens the correct file
 	if viper.ConfigFileUsed() != "" {
@@ -258,9 +260,3 @@ func validateConfig() error {
 
 	return config.Validate(&cfg)
 }
-
-func warnOnConfigIssues() {
-	if cfg.Settings.Editor == "" {
-		fmt.Fprintf(os.Stderr, "Warning: editor not set, defaulting to '%s'\n", config.DefaultEditor)
-	}
-}

internal/checks/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/Pairadux/muxly/internal/config"
 	"github.com/Pairadux/muxly/internal/models"
 )
 
@@ -84,38 +85,36 @@ func ValidateConfig(cfg *models.Config) []CheckResult {
 		})
 	}
 
-	if cfg.PrimaryTemplate.Name == "" {
+	dflt, hasDefault := config.DefaultTemplate(cfg)
+	if !hasDefault {
 		results = append(results, CheckResult{
-			Name:    "primary_template",
+			Name:    "default_template",
 			Status:  StatusError,
-			Message: "Primary template name not set",
-			Hint:    "Set primary_template.name in config",
+			Message: "No default template set",
+			Hint:    "Set default: true on one template in the templates list",
 		})
-	}
-
-	windowCount := len(cfg.PrimaryTemplate.Windows)
-	if windowCount == 0 {
+	} else if len(dflt.Windows) == 0 {
 		results = append(results, CheckResult{
-			Name:    "primary_template",
+			Name:    "default_template",
 			Status:  StatusError,
-			Message: "Primary template has no windows",
-			Hint:    "Add at least one window to primary_template.windows",
+			Message: "Default template has no windows",
+			Hint:    "Add at least one window to the default template",
 		})
 	} else {
 		results = append(results, CheckResult{
-			Name:    "primary_template",
+			Name:    "default_template",
 			Status:  StatusOK,
-			Message: "Primary template",
-			Detail:  fmt.Sprintf("(%d window(s))", windowCount),
+			Message: "Default template",
+			Detail:  fmt.Sprintf("(%d window(s))", len(dflt.Windows)),
 		})
 	}
 
-	if len(cfg.Templates) > 0 {
+	if len(cfg.Templates) > 1 {
 		results = append(results, CheckResult{
 			Name:    "templates",
 			Status:  StatusOK,
 			Message: "Additional templates",
-			Detail:  fmt.Sprintf("(%d)", len(cfg.Templates)),
+			Detail:  fmt.Sprintf("(%d)", len(cfg.Templates)-1),
 		})
 	}
 

internal/config/templates.go

@@ -2,10 +2,19 @@ package config
 
 import "github.com/Pairadux/muxly/internal/models"
 
-func FindTemplateByName(cfg *models.Config, name string) (models.SessionTemplate, bool) {
-	if cfg.PrimaryTemplate.Name == name {
-		return cfg.PrimaryTemplate, true
+// DefaultTemplate returns the template marked as default in the config.
+// Returns false if no template has Default set.
+func DefaultTemplate(cfg *models.Config) (models.SessionTemplate, bool) {
+	for _, tmpl := range cfg.Templates {
+		if tmpl.Default {
+			return tmpl, true
+		}
 	}
+	return models.SessionTemplate{}, false
+}
+
+// FindTemplateByName returns the first template matching the given name.
+func FindTemplateByName(cfg *models.Config, name string) (models.SessionTemplate, bool) {
 	for _, tmpl := range cfg.Templates {
 		if tmpl.Name == name {
 			return tmpl, true

internal/config/validation.go

@@ -10,20 +10,18 @@ import (
 
 // Validate ensures that the application configuration is valid and complete.
 // It checks that at least one directory is configured for scanning and that
-// the session layout has at least one window.
+// exactly one template is marked as default with at least one window.
 func Validate(cfg *models.Config) error {
 	if len(cfg.ScanDirs) == 0 && len(cfg.EntryDirs) == 0 {
 		return fmt.Errorf("no directories configured for scanning (scan_dirs or entry_dirs required)")
 	}
 
-	if cfg.PrimaryTemplate.Name == "" {
-		return fmt.Errorf("primary_template.name is required")
-	}
-	if len(cfg.PrimaryTemplate.Windows) == 0 {
-		return fmt.Errorf("primary_template must have at least one window")
+	if len(cfg.Templates) == 0 {
+		return fmt.Errorf("at least one template is required")
 	}
 
-	seenNames := map[string]bool{cfg.PrimaryTemplate.Name: true}
+	seenNames := make(map[string]bool)
+	defaultCount := 0
 	for _, tmpl := range cfg.Templates {
 		if tmpl.Name == "" {
 			return fmt.Errorf("all templates must have a name")
@@ -35,6 +33,16 @@ func Validate(cfg *models.Config) error {
 		if len(tmpl.Windows) == 0 {
 			return fmt.Errorf("template %q must have at least one window", tmpl.Name)
 		}
+		if tmpl.Default {
+			defaultCount++
+		}
+	}
+
+	if defaultCount == 0 {
+		return fmt.Errorf("exactly one template must have default: true")
+	}
+	if defaultCount > 1 {
+		return fmt.Errorf("only one template can have default: true, found %d", defaultCount)
 	}
 
 	seenAliases := make(map[string]string)