feat: complete snapshot restore with git and shell config

Snapshot import now restores git user.name/email, Oh-My-Zsh
theme/plugins, and shows shell/git info in the restore UI.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>

Author: fullstackjam

internal/cli/snapshot.go

@@ -371,6 +371,22 @@ func runSnapshotImport(importPath string, dryRun bool) error {
 		snapBoldStyle.Render("Packages:"),
 		len(snap.Packages.Formulae), len(snap.Packages.Casks),
 		len(snap.Packages.Npm), len(snap.Packages.Taps))
+	if snap.Git.UserName != "" || snap.Git.UserEmail != "" {
+		fmt.Fprintf(os.Stderr, "  %s %s <%s>\n",
+			snapBoldStyle.Render("Git:"), snap.Git.UserName, snap.Git.UserEmail)
+	}
+	if snap.Shell.OhMyZsh {
+		theme := snap.Shell.Theme
+		if theme == "" {
+			theme = "default"
+		}
+		plugins := "none"
+		if len(snap.Shell.Plugins) > 0 {
+			plugins = strings.Join(snap.Shell.Plugins, ", ")
+		}
+		fmt.Fprintf(os.Stderr, "  %s Oh-My-Zsh (theme: %s, plugins: %s)\n",
+			snapBoldStyle.Render("Shell:"), theme, plugins)
+	}
 	fmt.Fprintln(os.Stderr)
 
 	edited, confirmed, err := ui.RunSnapshotEditor(snap)
@@ -425,32 +441,43 @@ func runSnapshotImport(importPath string, dryRun bool) error {
 		}
 	}
 
-	cfg := &config.Config{DryRun: dryRun}
-	cfg.SelectedPkgs = make(map[string]bool)
+	importCfg := &config.Config{DryRun: dryRun}
+	importCfg.SelectedPkgs = make(map[string]bool)
 
 	for _, name := range edited.Packages.Formulae {
 		if catalogSet[name] {
-			cfg.SelectedPkgs[name] = true
+			importCfg.SelectedPkgs[name] = true
 		} else {
-			cfg.OnlinePkgs = append(cfg.OnlinePkgs, config.Package{Name: name})
+			importCfg.OnlinePkgs = append(importCfg.OnlinePkgs, config.Package{Name: name})
 		}
 	}
 	for _, name := range edited.Packages.Casks {
 		if catalogSet[name] {
-			cfg.SelectedPkgs[name] = true
+			importCfg.SelectedPkgs[name] = true
 		} else {
-			cfg.OnlinePkgs = append(cfg.OnlinePkgs, config.Package{Name: name, IsCask: true})
+			importCfg.OnlinePkgs = append(importCfg.OnlinePkgs, config.Package{Name: name, IsCask: true})
 		}
 	}
 	for _, name := range edited.Packages.Npm {
 		if catalogSet[name] {
-			cfg.SelectedPkgs[name] = true
+			importCfg.SelectedPkgs[name] = true
 		} else {
-			cfg.OnlinePkgs = append(cfg.OnlinePkgs, config.Package{Name: name, IsNpm: true})
+			importCfg.OnlinePkgs = append(importCfg.OnlinePkgs, config.Package{Name: name, IsNpm: true})
 		}
 	}
 
-	cfg.SnapshotTaps = edited.Packages.Taps
+	importCfg.SnapshotTaps = edited.Packages.Taps
+
+	importCfg.SnapshotGit = &config.SnapshotGitConfig{
+		UserName:  edited.Git.UserName,
+		UserEmail: edited.Git.UserEmail,
+	}
+
+	importCfg.SnapshotShell = &config.SnapshotShellConfig{
+		OhMyZsh: edited.Shell.OhMyZsh,
+		Theme:   edited.Shell.Theme,
+		Plugins: edited.Shell.Plugins,
+	}
 
-	return installer.RunFromSnapshot(cfg)
+	return installer.RunFromSnapshot(importCfg)
 }

internal/config/config.go

@@ -42,6 +42,21 @@ type Config struct {
 	User         string
 	RemoteConfig *RemoteConfig
 	PackagesOnly bool
+
+	SnapshotShell    *SnapshotShellConfig
+	SnapshotGit      *SnapshotGitConfig
+	SnapshotDotfiles string
+}
+
+type SnapshotShellConfig struct {
+	OhMyZsh bool
+	Theme   string
+	Plugins []string
+}
+
+type SnapshotGitConfig struct {
+	UserName  string
+	UserEmail string
 }
 
 type RemoteConfig struct {

internal/installer/installer.go

@@ -707,8 +707,20 @@ func RunFromSnapshot(cfg *config.Config) error {
 		ui.Error(fmt.Sprintf("npm package installation failed: %v", err))
 	}
 
-	if err := stepShell(cfg); err != nil {
-		ui.Error(fmt.Sprintf("Shell setup failed: %v", err))
+	if cfg.SnapshotGit != nil {
+		if err := stepRestoreGit(cfg); err != nil {
+			ui.Error(fmt.Sprintf("Git restore failed: %v", err))
+		}
+	}
+
+	if cfg.SnapshotShell != nil && cfg.SnapshotShell.OhMyZsh {
+		if err := stepRestoreShell(cfg); err != nil {
+			ui.Error(fmt.Sprintf("Shell restore failed: %v", err))
+		}
+	} else {
+		if err := stepShell(cfg); err != nil {
+			ui.Error(fmt.Sprintf("Shell setup failed: %v", err))
+		}
 	}
 
 	if err := stepMacOS(cfg); err != nil {
@@ -719,6 +731,75 @@ func RunFromSnapshot(cfg *config.Config) error {
 	return nil
 }
 
+func stepRestoreGit(cfg *config.Config) error {
+	ui.Header("Restore: Git Configuration")
+	fmt.Println()
+
+	git := cfg.SnapshotGit
+	if git.UserName == "" && git.UserEmail == "" {
+		ui.Muted("No git config in snapshot, skipping")
+		fmt.Println()
+		return nil
+	}
+
+	existingName, existingEmail := system.GetExistingGitConfig()
+
+	if existingName != "" && existingEmail != "" {
+		ui.Success(fmt.Sprintf("✓ Already configured: %s <%s>", existingName, existingEmail))
+		fmt.Println()
+		return nil
+	}
+
+	if cfg.DryRun {
+		if existingName == "" && git.UserName != "" {
+			fmt.Printf("[DRY-RUN] Would set git user.name = %s\n", git.UserName)
+		}
+		if existingEmail == "" && git.UserEmail != "" {
+			fmt.Printf("[DRY-RUN] Would set git user.email = %s\n", git.UserEmail)
+		}
+		fmt.Println()
+		return nil
+	}
+
+	if existingName == "" && git.UserName != "" {
+		if err := system.ConfigureGit(git.UserName, git.UserEmail); err != nil {
+			return fmt.Errorf("failed to restore git config: %w", err)
+		}
+	}
+
+	ui.Success(fmt.Sprintf("Git restored: %s <%s>", git.UserName, git.UserEmail))
+	fmt.Println()
+	return nil
+}
+
+func stepRestoreShell(cfg *config.Config) error {
+	ui.Header("Restore: Shell Configuration")
+	fmt.Println()
+
+	shellCfg := cfg.SnapshotShell
+
+	if cfg.DryRun {
+		fmt.Println("[DRY-RUN] Would restore shell config from snapshot")
+	}
+
+	ui.Info(fmt.Sprintf("Theme: %s, Plugins: %v", shellCfg.Theme, shellCfg.Plugins))
+	fmt.Println()
+
+	if err := shell.RestoreFromSnapshot(shellCfg.OhMyZsh, shellCfg.Theme, shellCfg.Plugins, cfg.DryRun); err != nil {
+		return err
+	}
+
+	if err := shell.ConfigureZshrc(cfg.DryRun); err != nil {
+		return fmt.Errorf("failed to configure .zshrc: %w", err)
+	}
+
+	if !cfg.DryRun {
+		ui.Success("Shell configuration restored")
+	}
+	fmt.Println()
+	return nil
+}
+
 func runUpdate(cfg *config.Config) error {
 	ui.Header("OpenBoot Update")
 	fmt.Println()