fix(installer): restore shell theme and plugins from snapshot via RestoreFromSnapshot

Author: fullstackjam

internal/cli/snapshot.go

@@ -766,5 +766,8 @@ func buildImportConfig(edited *snapshot.Snapshot, dryRun bool) *config.Config {
 		}
 	}
 
+	cfg.SnapshotShellTheme = edited.Shell.Theme
+	cfg.SnapshotShellPlugins = edited.Shell.Plugins
+
 	return cfg
 }

internal/config/config.go

@@ -88,11 +88,13 @@ type Config struct {
 
 	SelectedPkgs     map[string]bool    // set by UI package selector
 	OnlinePkgs       []Package          // fetched from packages API
-	SnapshotTaps     []string           // from snapshot capture
-	RemoteConfig     *RemoteConfig      // fetched from openboot.dev at startup
-	SnapshotGit      *SnapshotGitConfig // from snapshot capture
-	SnapshotMacOS    []RemoteMacOSPref  // from snapshot capture
-	SnapshotDotfiles string             // from snapshot capture
+	SnapshotTaps        []string           // from snapshot capture
+	RemoteConfig        *RemoteConfig      // fetched from openboot.dev at startup
+	SnapshotGit         *SnapshotGitConfig // from snapshot capture
+	SnapshotMacOS       []RemoteMacOSPref  // from snapshot capture
+	SnapshotDotfiles    string             // from snapshot capture
+	SnapshotShellTheme  string             // from snapshot capture
+	SnapshotShellPlugins []string          // from snapshot capture
 }
 
 // InstallOptions holds user-supplied inputs set from CLI flags and environment
@@ -118,13 +120,15 @@ type InstallOptions struct {
 // InstallState holds runtime values populated during installation.
 // Fields are written by installer steps and read by subsequent steps.
 type InstallState struct {
-	SelectedPkgs     map[string]bool
-	OnlinePkgs       []Package
-	SnapshotTaps     []string
-	RemoteConfig     *RemoteConfig
-	SnapshotGit      *SnapshotGitConfig
-	SnapshotMacOS    []RemoteMacOSPref
-	SnapshotDotfiles string
+	SelectedPkgs         map[string]bool
+	OnlinePkgs           []Package
+	SnapshotTaps         []string
+	RemoteConfig         *RemoteConfig
+	SnapshotGit          *SnapshotGitConfig
+	SnapshotMacOS        []RemoteMacOSPref
+	SnapshotDotfiles     string
+	SnapshotShellTheme   string
+	SnapshotShellPlugins []string
 }
 
 // ToInstallOptions extracts the read-only input fields from Config.
@@ -151,13 +155,15 @@ func (c *Config) ToInstallOptions() *InstallOptions {
 // ToInstallState extracts the mutable runtime fields from Config.
 func (c *Config) ToInstallState() *InstallState {
 	return &InstallState{
-		SelectedPkgs:     c.SelectedPkgs,
-		OnlinePkgs:       c.OnlinePkgs,
-		SnapshotTaps:     c.SnapshotTaps,
-		RemoteConfig:     c.RemoteConfig,
-		SnapshotGit:      c.SnapshotGit,
-		SnapshotMacOS:    c.SnapshotMacOS,
-		SnapshotDotfiles: c.SnapshotDotfiles,
+		SelectedPkgs:         c.SelectedPkgs,
+		OnlinePkgs:           c.OnlinePkgs,
+		SnapshotTaps:         c.SnapshotTaps,
+		RemoteConfig:         c.RemoteConfig,
+		SnapshotGit:          c.SnapshotGit,
+		SnapshotMacOS:        c.SnapshotMacOS,
+		SnapshotDotfiles:     c.SnapshotDotfiles,
+		SnapshotShellTheme:   c.SnapshotShellTheme,
+		SnapshotShellPlugins: c.SnapshotShellPlugins,
 	}
 }
 
@@ -171,6 +177,8 @@ func (c *Config) ApplyState(s *InstallState) {
 	c.SnapshotGit = s.SnapshotGit
 	c.SnapshotMacOS = s.SnapshotMacOS
 	c.SnapshotDotfiles = s.SnapshotDotfiles
+	c.SnapshotShellTheme = s.SnapshotShellTheme
+	c.SnapshotShellPlugins = s.SnapshotShellPlugins
 }
 
 type SnapshotGitConfig struct {

internal/installer/plan.go

@@ -35,7 +35,9 @@ type InstallPlan struct {
 
 	// Shell
 	InstallOhMyZsh bool
-	DotfilesURL    string // "" = skip dotfiles entirely; any URL = use it (may be DefaultDotfilesURL)
+	ShellTheme     string   // ZSH_THEME to restore; empty = leave as-is
+	ShellPlugins   []string // plugins=(...) to restore; nil = leave as-is
+	DotfilesURL    string   // "" = skip dotfiles entirely; any URL = use it (may be DefaultDotfilesURL)
 
 	// macOS
 	MacOSPrefs []macos.Preference
@@ -319,9 +321,11 @@ func PlanFromSnapshot(opts *config.InstallOptions, st *config.InstallState) Inst
 		plan.DotfilesURL = st.SnapshotDotfiles
 	}
 
-	// Shell: attempt Oh-My-Zsh for snapshot restores unless explicitly skipped.
+	// Shell: restore Oh-My-Zsh and theme/plugins from snapshot unless explicitly skipped.
 	if opts.Shell != "skip" {
 		plan.InstallOhMyZsh = true
+		plan.ShellTheme = st.SnapshotShellTheme
+		plan.ShellPlugins = st.SnapshotShellPlugins
 	}
 
 	// macOS: convert snapshot preferences to macos.Preference values, unless skipped via flag.

internal/installer/step_shell.go

@@ -14,14 +14,26 @@ func applyShell(plan InstallPlan, r Reporter) error {
 	if plan.InstallOhMyZsh {
 		r.Header("Shell Configuration")
 		fmt.Println()
-		if shell.IsOhMyZshInstalled() {
-			r.Muted("Oh-My-Zsh already installed")
-		} else {
-			if err := shell.InstallOhMyZsh(plan.DryRun); err != nil {
-				return fmt.Errorf("install oh-my-zsh: %w", err)
+
+		if plan.ShellTheme != "" || len(plan.ShellPlugins) > 0 {
+			// Restore mode: install OMZ if missing, then write theme/plugins.
+			if err := shell.RestoreFromSnapshot(true, plan.ShellTheme, plan.ShellPlugins, plan.DryRun); err != nil {
+				return fmt.Errorf("restore shell config: %w", err)
 			}
 			if !plan.DryRun {
-				r.Success("Oh-My-Zsh installed")
+				r.Success(fmt.Sprintf("Shell restored (theme: %s, %d plugins)", plan.ShellTheme, len(plan.ShellPlugins)))
+			}
+		} else {
+			// Fresh install mode: just install OMZ.
+			if shell.IsOhMyZshInstalled() {
+				r.Muted("Oh-My-Zsh already installed")
+			} else {
+				if err := shell.InstallOhMyZsh(plan.DryRun); err != nil {
+					return fmt.Errorf("install oh-my-zsh: %w", err)
+				}
+				if !plan.DryRun {
+					r.Success("Oh-My-Zsh installed")
+				}
 			}
 		}
 		fmt.Println()